完成7305，添加在详情页去绑定蓝牙设备

pages/common/addBLE/LinkBle.vue

@@ -12,7 +12,7 @@
 				设备名:{{device.deviceName}}
 			</view>
 			<view class="deviceId">
-				ID:{{device.deviceId}}
+				设备Mac:{{device.macAddress}}
 			</view>
 			<view class="bound" v-bind:class="boundStatu">
 				{{Statu.boundRemark}}
@@ -86,15 +86,16 @@
 		onLoad(option) {
 			these = this;
 			ble = bleTool.getBleTool();
+			console.log("LinkBle")
 			ble.addReceiveCallback((receive, f, path) => {
 				console.log("收到设备消息，", receive);
 				if (these.device.deviceId == receive.deviceId) {
-					// console.log("11111");
+					 console.log("11111:",receive);
 
 					if (receive.bytes[0] == 0xFC || receive.str.indexOf('mac address:') == 0) {
 						if (f && f.macAddress) {
 							these.device.macAddress = f.macAddress;
-							// console.log("222222");
+							 console.log("222222");
 							these.initDevice();
 						}
 					}
@@ -233,7 +234,7 @@
 									v.device[key] = data[key];																						
 								}
 						
-								ble.setBleData();
+                                ble.updateCache();
 							}
 						});
 						

pages/common/addBLE/addEquip.vue

@@ -97,6 +97,7 @@
 	const pagePath="pages/common/addBLE/addEquip";
 	var ble = null;
 	var these = null;
+	var eventChannel=null;
 	export default {
 		data() {
 			return {
@@ -128,7 +129,11 @@
 
 				},
 				PairEquip: [], //已配对设备
-				EquipMents: [] //搜索出来的设备
+				EquipMents: [], //搜索出来的设备
+				device:null,
+				item:{
+					deviceId:''
+				}
 			}
 		},
 		computed: {
@@ -145,7 +150,8 @@
 		},
 		onUnload(){
 			ble.StopSearch();
-			
+			ble.removeDeviceFound(pagePath);
+			ble.removeReceiveCallback(pagePath);	
 		},
 		onLoad() {
 			these = this;
@@ -170,13 +176,23 @@
 
 					}
 				}
-			},pagePath);
-			// ble.addReceiveCallback((receivData) => {
+			}, pagePath);
+			// console.log("addEquip")
+			// ble.addReceiveCallback((receivData,f,path,arr) => {
 			// 	console.log("收到数据了:", receivData);//数据格式:{bytes:[109,97],str:"",hexs:"FA 01"}
+			// 	if (this.item.deviceId == receivData.deviceId) {
+			// 		 console.log("11111:",receivData);
 				
-			// 	//  let data=uni.getStorageSync(ble.StorageKey);
-			// 	 console.log("LinkedList=",ble.data.LinkedList);
-			// },pagePath);
+					
+			// 	}
+				
+			// });
+			eventChannel = this.getOpenerEventChannel();
+			 
+			eventChannel.on('detailData', function(rec) {
+			    console.log("接收到父页面的参数:",rec);
+				these.device=rec.data;
+			  });
 		},
 		
 		onShow: function() {
@@ -223,7 +239,7 @@
 				ble.showBlueSetting(false);
 			},
 			Link: function(item, index) {
-			
+				this.item.deviceId=item.deviceId;
 				showLoading(this,{
 					text: "正在连接"
 				});
@@ -241,6 +257,18 @@
 							these.PairEquip.push(item);
 						}
 						console.log("连接成功");
+						if(these.device){//从设备详情过来的，回设备详情去
+							ble.data.LinkedList.find(v=>{
+								if(v.deviceId==item.deviceId){
+									v.device=these.device;
+									return true;
+								}
+								return false;
+							});
+							ble.updateCache();
+							uni.navigateBack();
+							return;
+						}
 						uni.navigateTo({
 							url:"/pages/common/addBLE/LinkBle",
 							events:{

pages/common/index/index.vue

@@ -144,6 +144,8 @@
 		deviceUnbind, //删除设备
 		deviceReName
 	} from '@/api/common/index.js'
+	import BleHelper from '@/utils/BleHelper.js';
+	var ble=null;
 	export default {
 		onPullDownRefresh() {
 			// 执行下拉刷新时的操作，比如重新获取数据
@@ -388,7 +390,9 @@
 						}, 500);
 						this.deleteShow = false
 						// 关闭所有滑动项
-						this.$refs.swipeAction.closeAll();
+						this.$refs.swipeAction.closeAll();						
+						
+						ble && ble.DropDevice(data.id);
 					} else {
 						uni.showToast({
 							title: res.msg,
@@ -555,6 +559,7 @@
 				console.log('列表收到消息了么');
 				this.onIntall()
 			});
+			ble=BleHelper.getBleTool();
 		},
 		beforeDestroy() {
 			// 组件销毁前移除监听器