650添加应答,app图标添加

utils/BleHelper.js

@@ -437,7 +437,7 @@ class BleHelper {
 
 						uni.onBLECharacteristicValueChange((receive) => {
 							//订阅消息
-							// console.log("收到订阅消息",receive);
+							 console.log("收到订阅消息",receive);
 							let f=this.data.LinkedList.find((v) => {
 								return v.deviceId == receive.deviceId;	
 							})
@@ -458,6 +458,7 @@ class BleHelper {
 									// 将每个字节转换为对应的字符
 									str += String.fromCharCode(uint8Array[i]);
 								}
+								
 								let header = "mac address:";
 								if (str.indexOf(header) == 0) { //650以文本传输mac
 
@@ -466,7 +467,7 @@ class BleHelper {
 											.deviceId) {
 											v.macAddress = str.replace(
 												header, "");
-											// console.log("收到mac地址:", str)
+											 console.log("收到mac地址:", str)
 										}
 									});
 									uni.setStorageSync(this.StorageKey, this.data
@@ -474,8 +475,9 @@ class BleHelper {
 								}
 
 								if (bytes[0] == 0xFC) { //6155以0xFC开头代表mac地址
-									// console.log("收到mac地址:", bytes)
+									 console.log("收到mac地址:", bytes)
 									if (bytes.length >= 7) {
+										console.log("hexs=",hexs);
 										let mac = hexs.slice(1, 7).join(":")
 											.toUpperCase();
 										this.data.LinkedList.find((v) => {
@@ -489,8 +491,9 @@ class BleHelper {
 											.data.LinkedList);
 									}
 								}
+								console.log("str=",str);
 							} catch (ex) {
-								////console.log("将数据转文本失败", ex);
+								console.log("将数据转文本失败", ex);
 							}
 							let recData = {
 								deviceId: receive.deviceId,
@@ -500,7 +503,7 @@ class BleHelper {
 								str: str,
 								hexs: hexs
 							};
-							// console.log("监听到特征值:" + JSON.stringify(recData));
+							 console.log("监听到特征值:" + JSON.stringify(recData));
 							if (this.cfg.receivDataCallback) {
 
 								if (this.cfg.receivDataCallback.length > 0) {
@@ -586,7 +589,7 @@ class BleHelper {
 			return new Promise((resolve, reject) => {
 				uni.startBluetoothDevicesDiscovery({
 					services: [],
-					allowDuplicatesKey: true,
+					allowDuplicatesKey: false,
 					success: (res) => {
 						//console.log('开始搜索蓝牙设备成功');
 						resolve(res);
@@ -667,7 +670,7 @@ class BleHelper {
 						return;
 					}
 				}
-				console.log("c=", c);
+				// console.log("c=", c);
 				let startSubScribe = (id, serviceId, characteristicId) => {
 
 					return new Promise((succ, err) => {
@@ -950,7 +953,7 @@ class BleHelper {
 				console.log("正在连接" + deviceId);
 				uni.createBLEConnection({
 					deviceId: deviceId,
-					timeout: 3000,
+					timeout: 30000,
 					success: (info) => {
 
 						console.log("新连接成功", this.data.LinkedList);
@@ -973,22 +976,27 @@ class BleHelper {
 								.LinkedList);
 
 							let os = plus.os.name;
-							if (os == 'android') {
+							console.log("os=",os);
+							if (os == 'Android') {
 								uni.setBLEMTU({
 									deviceId: deviceId,
 									mtu: 512,
 									success: (mtu) => {
-
-										////console.log("mtu设置成功");
+									
+										console.log("mtu设置成功",mtu);
+											resolve(true);
 									},
 									fail: () => {
-										////console.log("mtu设置失败")
+										console.log("mtu设置失败")
+											resolve(true);
+									},
+									finally:()=>{
+										
 									}
 								});
-							}
-
-							resolve(true);
-
+							}else{
+									resolve(true);
+							}					
 						}).catch((ex) => {
 
 							reject(this.getError(ex));
@@ -1149,7 +1157,7 @@ class BleHelper {
 						})); //没有找到指定设备
 						return;
 					}
-					// console.log("device=", device);
+					 console.log("device=", device);
 					uni.writeBLECharacteristicValue({
 						deviceId: device.deviceId,
 						serviceId: device.writeServiceId,
@@ -1181,7 +1189,7 @@ class BleHelper {
 					}
 
 					Promise.race([timeOut(ms), promise]).then(resolve).catch((ex) => {
-						console.log("ex=", ex);
+						// console.log("ex=", ex);
 						if (ex.code == -1) {
 							resolve(ex);
 						} else {
@@ -1244,7 +1252,7 @@ class BleHelper {
 			let a = pixels[i + 3];
 
 			if (type == 'bgr') {
-				result[index++] = (b >> 3) | ((g & 0xFC) << 3) | ((r & 0xF8) << 8);
+				result[index++] = ((b & 0xF8) << 8) | ((g & 0xFC) << 3) | (r >> 3);				
 			} else {
 				result[index++] = ((r & 0xF8) << 8) | ((g & 0xFC) << 3) | (b >> 3);
 			}