650/670增加关闭探测功能，删除一些跟供应商调试的页面

pages/common/addBLE/LinkBle.vue

@@ -17,6 +17,9 @@
 			<view class="deviceId">
 				设备Mac:{{device.macAddress}}
 			</view>
+			<view class="deviceId">
+				设备IMEI:{{device.imei}}
+			</view>
 			<view class="bound" v-bind:class="boundStatu">
 				{{Statu.boundRemark}}
 			</view>
@@ -63,7 +66,8 @@
 					],
 					"linkStatu": false,
 					"macAddress": "",
-					"communicationMode":""
+					"communicationMode":"",
+					"imei":""
 				},
 				serverDevice:null
 			}
@@ -118,7 +122,7 @@
 				console.log("收到设备消息，", receive);
 				if (these.device.deviceId == receive.deviceId) {
 					 console.log("11111:",receive);
-
+					 these.device.imei=f.imei;
 					if (receive.bytes[0] == 0xFC || receive.str.indexOf('mac address:') == 0) {
 						if (f && f.macAddress) {
 							these.device.macAddress = f.macAddress;
@@ -153,11 +157,14 @@
 				}
 			})
 
-			// let inteval = setInterval(this.initDevice, 5000);
+			 let inteval = setInterval(this.initDevice, 5000);
 		},
 		methods: {
 
 			initDevice: function() {
+				if(!these.device.macAddress){
+					return;
+				}
 				clearTimeout(this.Statu.timeInteval);
 
 				this.Statu.timeInteval = setTimeout(() => {
@@ -251,7 +258,7 @@
 					data: {
 						deviceImei: '',
 						deviceMac: these.device.macAddress,
-						communicationMode: '1', //0是4g,1是蓝牙
+						communicationMode: 1, //0是4g,1是蓝牙,2蓝牙&4G
 					}
 				});
 				promise.then((res) => {

pages/common/addBLE/addEquip.vue

@@ -141,7 +141,6 @@
 		},
 		onHide: function() {
 			ble.StopSearch();
-
 		},
 
 		onUnload() {
@@ -173,11 +172,11 @@
 
 					}
 				}
-				console.log("equip=", these.EquipMents)
+				 // console.log("equip=", these.EquipMents)
 			}, pagePath);
 			// console.log("addEquip")
 			ble.addReceiveCallback((receivData, f, path, arr) => {
-				if (f.macAddress) {
+				if (f.macAddress && these.device) {
 					showLoading(these, {
 						text: '正在验证设备'
 					});
@@ -200,7 +199,7 @@
 		onShow: function() {
 
 
-			this.EquipMents = [];
+			// this.EquipMents = [];
 			this.PairEquip = [];
 			ble && ble.StartSearch().catch((ex) => {
 				if (ex.code == 10001) {