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

utils/BleHelper.js

@@ -532,6 +532,20 @@ class BleHelper {
 									});
 									this.updateCache();
 								}
+								
+								if (str.indexOf('imei:') == 0) {
+									let imei = str.split(':')[1];
+									
+									
+									this.data.LinkedList.find((v) => {
+										if (v.deviceId == receive
+											.deviceId) {
+											v.imei=imei;
+										}
+									});
+									this.updateCache();
+									
+								} 
 
 								if (bytes[0] == 0xFC) { //6155以0xFC开头代表mac地址
 									console.log("收到mac地址:", bytes)
@@ -669,8 +683,8 @@ class BleHelper {
 			let RunSearch = (serviceId) => {
 				return new Promise((resolve, reject) => {
 					uni.startBluetoothDevicesDiscovery({
-						services: [serviceId],
-						allowDuplicatesKey: false,
+						services:serviceId? [serviceId]:[],
+						allowDuplicatesKey: true,
 						success: (res) => {
 							//console.log('开始搜索蓝牙设备成功');
 							resolve(res);
@@ -689,11 +703,11 @@ class BleHelper {
 
 			return new Promise((resolve, reject) => {
 				let promises = [];
-				for (let i = 0; i < serviceIds.length; i++) {
-
-					promises.push(RunSearch(serviceIds[i]));
-				}
+				// for (let i = 0; i < serviceIds.length; i++) {
 
+				// 	promises.push(RunSearch(serviceIds[i]));
+				// }
+				promises.push(RunSearch());
 				Promise.all(promises).then(resolve).catch(reject);
 
 			});
@@ -1150,7 +1164,7 @@ class BleHelper {
 					console.log("正在连接" + deviceId);
 					uni.createBLEConnection({
 						deviceId: deviceId,
-						timeout: 3000,
+						timeout: 30000,
 						success: (info) => {
 							console.log("新连接成功", this.data.LinkedList);
 							this.getLinkBlue().then((arr) => {

utils/BleReceive.js

@@ -96,7 +96,7 @@ class BleReceive {
 							staticLevelText = '低档';
 							modeCurr = "low";
 							break;
-						case 0x68:
+						case 0x64:
 							staticLevelText = '关闭';
 							modeCurr = "close";
 							break;
@@ -274,7 +274,7 @@ class BleReceive {
 					case 0x67:
 						staticLevelText = 'low';
 						break
-					case 0x68:
+					case 0x64:
 						staticLevelText = 'close';
 						break
 					}

utils/request.js

@@ -1,5 +1,5 @@
 import config from '../config/index.js';
-const env = 'development'; //production development  //开发of线上 改这里就行
+const env = 'production'; //production development  //开发of线上 改这里就行
 const BASE = config[env];
 const request = (options) => {
 	console.log("options"+JSON.stringify(options),BASE.BASE_URL)
@@ -22,7 +22,7 @@ const request = (options) => {
       header: options.header || {},
       timeout: 30000,
       success: (res) => {
-		  console.log("res=",res);
+		  // console.log("res=",res);
         resolve(res.data);
       },
       fail: (err) => {

utils/update.js

@@ -25,7 +25,7 @@ function checkAndUpdateWgt(updateUrl) {
 		
 		let callbck = (res) => {
 			uni.hideLoading();
-			console.log("检查更新成功=", res)
+			// console.log("检查更新成功=", res)
 			if (res.statusCode === 200) {
 		
 				const updateInfo = res.data.data;
@@ -61,10 +61,11 @@ function checkAndUpdateWgt(updateUrl) {
 					method: 'GET',
 					data: {
 						currentVersion: currentVersion,
-						platform: uni.getSystemInfoSync().platform
+						platform: uni.getSystemInfoSync().platform,
+						appId:"xhyc"
 					},
 					success: (res) => {
-						console.log("res=>",res)
+						// console.log("res=>",res)
 						res.type='1';
 						resolve(res);
 					},
@@ -129,18 +130,18 @@ function checkAndUpdateWgt(updateUrl) {
 			let length = results.length;
 			let flag=false;
 			for (var i = 0; i < length; i++) {
-				console.log('results[i]=',results[i]);
-				if (results[i].status == 'fulfilled' && results[i].value.type==='1' ) {
+				console.log('results['+i+']=',results[i]);
+				if (results[i].status == 'fulfilled' && results[i].value.type==='1' && !flag ) {
 					flag=true;
 					callbck(results[i].value)
 					
-					break;
+					// break;
 				}
 				
-				if(results[i].status == 'fulfilled' && results[i].value.type!=='1'){
+				if(results[i].status == 'fulfilled' && results[i].value.type!=='1' && !flag){
 					flag=true;
 					Callback1(results[i].value);
-					break;
+					// break;
 				}
 			}
 			if(!flag){