增加蓝牙设备人员信息登记上传

utils/BleHelper.js

@@ -468,9 +468,14 @@ class BleHelper {
 									this.data.LinkedList.find((v) => {
 										if (v.deviceId == receive
 											.deviceId) {
-											v.macAddress = str.replace(
+											str= str.replace(
 												header, "");
-											console.log("收到mac地址:", str)
+												if(str.includes(':')){
+													v.macAddress =str;
+												}else{
+													v.macAddress=str.replace(/(.{2})/g, '$1:').slice(0, -1)
+												}
+											console.log("收到mac地址:", v.macAddress)
 										}
 									});
 									uni.setStorageSync(this.StorageKey, this.data
@@ -507,22 +512,29 @@ class BleHelper {
 								hexs: hexs
 							};
 							console.log("监听到特征值:" + JSON.stringify(recData));
-							if (this.cfg.receivDataCallback) {
-
-								if (this.cfg.receivDataCallback.length > 0) {
-
-									let path = this.getCurrentPagePath();
-
-									this.cfg.receivDataCallback.forEach((rec) => {
-
-										if (rec.callback) {
-											rec.callback(recData, f, path);
-										}
-									})
+							try{
+								if (this.cfg.receivDataCallback) {
+								
+									if (this.cfg.receivDataCallback.length > 0) {
+										console.log("有人订阅消息")
+										let path = this.getCurrentPagePath();
+								
+										this.cfg.receivDataCallback.forEach((rec) => {
+								
+											if (rec.callback) {
+												rec.callback(recData, f, path);
+											}
+										})
+									}else{
+										console.log("无人订阅消息");
+									}
+								} else {
+									console.log("无人订阅receivDataCallback,不处理数据");
 								}
-							} else {
-								console.log("无人订阅receivDataCallback,不处理数据");
+							}catch(ex){
+								console.log("ex=",ex);
 							}
+							
 						});
 
 
@@ -948,7 +960,7 @@ class BleHelper {
 		var linkDevice = () => {
 		  // 添加重试次数限制
 		  let retryCount = 0;
-		  const maxRetries = 10; // 最大重试次数
+		  const maxRetries = 1; // 最大重试次数
 		  
 		  const connect = () => {
 		    return new Promise((resolve, reject) => {

utils/BleReceive.js

@@ -45,25 +45,27 @@ class BleReceive {
 	
 	
 	ReceiveData(receive,f,path) {
-			if(f && f.macAddress && f.id){		
+			if(f && f.macAddress && f.device && f.device.id){		
 				let data={};
-				if(f.detailPageUrl=='/pages/6155/deviceDetail'){
+				if(f.device.detailPageUrl=='/pages/6155/deviceDetail'){
 					// console.log("该设备是6155");
 					data= this.Receive_6155(receive,f,path);
 				}
 				
-				if(f.detailPageUrl=='/pages/650/HBY650'){
+				if(f.device.detailPageUrl=='/pages/650/HBY650'){
 					// console.log("该设备是650");
 					data= this.Receive_650(receive,f,path);
 				}
-				if(f.detailPageUrl=='/pages/670/HBY670'){
+				if(f.device.detailPageUrl=='/pages/670/HBY670'){
 					// console.log("该设备是670");
 					data= this.Receive_670(receive,f,path);
 				}
 				// console.log("收到数据并处理完毕,",data);
 				return data;
+			}else{
+				console.log("已收到该消息,但无法处理",receive);
 			}
-			 // console.log("已收到该消息,但无法处理",receive);
+			 
 			 return receive;
 		
 	}
@@ -392,8 +394,81 @@ class BleReceive {
 		
 		return data;
 	}
-	Receive_6155() {
-		console.log("通用程序正在处理6155的数据");
+	Receive_6155(receive,f,path) {
+		let bytes=receive.bytes;
+		if (bytes[0] == 0xFB && bytes[1] == 0x64 && bytes.length >= 8) {
+			try {
+		
+				let staticLevelByte = bytes[2];
+				let getName = function(type) {
+					let name = "";
+					switch (type) {
+						case 0x02:
+							name = '弱光';
+							break;
+						case 0x04:
+							name = '工作光';
+							break;
+						case 0x01:
+							name = '强光';
+							break;
+						case 0x03:
+							name = '爆闪';
+							break;
+						case 0x00:
+							name = '关闭';
+							break;
+					}
+					return name;
+				}
+				let staticLevelText = getName(staticLevelByte);
+		
+				// 解析照明档位
+				let lightingLevelByte = bytes[3];
+				let lightingLevelText = getName(lightingLevelByte);
+		
+		
+				// 解析剩余电量
+				let batteryLevelByte = bytes[4];
+				// 电量百分比范围检查
+				let batteryLevel = Math.max(0, Math.min(100, batteryLevelByte));
+		
+		
+		
+		
+				//充电状态
+				let warn = bytes[5];
+				if (warn == 0x00) {
+					warn = '未充电';
+				} else if (warn == 0x01) {
+					warn = '充电中';
+				}
+		
+				// 解析剩余照明时间（第三和第四字节，小端序）
+				let lightingTime = "";
+				let HH = Math.max(0, Math.min(100, bytes[6]));
+				let mm = Math.max(0, Math.min(100, bytes[7]));
+				lightingTime = HH + "小时" + mm + "分钟";
+				let formData={};
+				formData.mode = staticLevelText;
+				formData.fuMode = lightingLevelText;
+				formData.battary = batteryLevel;
+				formData.statu = warn;
+				formData.xuhang = lightingTime;
+		
+				if (batteryLevel <= 20) {
+					uni.showModal({
+						content:"设备电量低",
+						title:"提示"
+					});
+				
+				}
+			this.setBleFormData(formData,f);
+			   return formData;
+			} catch (error) {
+				console.log('数据解析错误:', error);
+			}
+		}
 	}