更新隐私协议文本

pages/6170/deviceControl/index.vue

@@ -680,7 +680,7 @@
 						})
 					}
 
-					if (ble) {
+					if (ble && this.itemInfo.deviceMac) {
 						let f = this.getDevice();
 						if (f) {
 							let json = {
@@ -738,7 +738,7 @@
 				}
 
 
-				if (ble) {
+				if (ble && this.itemInfo.deviceMac) {
 					let f = this.getDevice();
 					if (f) {
 						let json = {
@@ -859,7 +859,7 @@
 					});
 				}
 
-				if (ble) {
+				if (ble && this.itemInfo.deviceMac) {
 					let f = this.getDevice();
 					if (f) {
 						let json = {
@@ -929,7 +929,7 @@
 					})
 				}
 
-				if (ble) {
+				if (ble && this.itemInfo.deviceMac) {
 					let f = this.getDevice();
 					if (f) {
 						let json = {
@@ -1129,12 +1129,12 @@
 											iconUrl: "/static/images/common/success.png",
 										}, these);
 
-										setTimeout(()=>{
+										setTimeout(() => {
 											ble.sendString(f.deviceId, "transmit complete", f
-											.writeServiceId, f
-											.wirteCharactId);
-										},1000);
-										
+												.writeServiceId, f
+												.wirteCharactId);
+										}, 1000);
+
 										these.rgb565Data = null;
 										resolve();
 										return;
@@ -1253,7 +1253,7 @@
 						});
 					}, 0)
 				}
-				if (ble) {
+				if (ble && this.itemInfo.deviceMac) {
 					let f = this.getDevice();
 					if (f) {
 						bleSend();
@@ -1499,7 +1499,7 @@
 					}, 0);
 				}
 
-				if (ble) {
+				if (ble && this.itemInfo.deviceMac) {
 					let f = this.getDevice();
 					if (f) {
 						bleSend();
@@ -1796,8 +1796,7 @@
 		},
 		onLoad(options) {
 			these = this;
-			rec = BleReceive.getBleReceive();
-			ble = BleTool.getBleTool();
+
 
 			const eventChannel = this.getOpenerEventChannel();
 			// 监听 'detailData' 事件，获取传过来的数据
@@ -1807,6 +1806,8 @@
 			eventChannel.on('detailData', (data) => {
 				console.log(data, 'data');
 				this.itemInfo = data.data;
+
+
 				this.deviceID = data.data.id;
 				this.navTitle = data.data.deviceName;
 				this.apiType = data.apiType
@@ -1890,22 +1891,31 @@
 					this.fetchSharedDeviceDetail(data.data.id)
 				}
 
-				let f = ble.data.LinkedList.find((v) => {
-					if (v.macAddress == this.itemInfo.deviceMac) {
-						console.log("找到设备了", v);
-						these.formData.deviceId = v.deviceId;
-						return true;
-					}
-					return false;
-				});
 
-				if (f) {
-					these.formData.bleStatu = 'connecting';
-					ble.LinkBlue(f.deviceId, f.writeServiceId, f.wirteCharactId, f.notifyCharactId).then(res => {
-						these.formData.bleStatu = true;
+				if (this.itemInfo.deviceMac) {
+					rec = BleReceive.getBleReceive();
+					ble = BleTool.getBleTool();
+
+					let f = ble.data.LinkedList.find((v) => {
+						if (v.macAddress == this.itemInfo.deviceMac) {
+							console.log("找到设备了", v);
+							these.formData.deviceId = v.deviceId;
+							return true;
+						}
+						return false;
 					});
+
+					if (f) {
+						these.formData.bleStatu = 'connecting';
+						ble.LinkBlue(f.deviceId, f.writeServiceId, f.wirteCharactId, f.notifyCharactId).then(
+						res => {
+							these.formData.bleStatu = true;
+						});
+					}
 				}
 
+
+
 			});
 			eventChannel.emit('ack', {