dyf/APP
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

合并线上代码

Browse Source
This commit is contained in:
liub
2025-11-07 12:16:10 +08:00
parent 2493bb7113
commit 623a47466a
41 changed files with 5293 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
utils/BleReceive.js
View File

@ -44,25 +44,28 @@ class BleReceive {
if (f && f.macAddress && f.device && f.device.id) {
let handler = null;
let keys = Object.keys(this.HandlerMap);
let devKey = f.device.detailPageUrl ? f.device.detailPageUrl.replace(/\//g, '').toLowerCase() : '';
console.log("查找handler - detailPageUrl:", f.device.detailPageUrl, "转换后:", devKey);
for (let index = 0; index < keys.length; index++) {
let key = keys[index].replace(/\//g, "").toLowerCase();
let devKey = f.device.detailPageUrl ? f.device.detailPageUrl.replace(/\//g, "").toLowerCase() : '';
let key = keys[index].replace(/\//g, '').toLowerCase();
if (key == devKey) {
handler = this.HandlerMap[keys[index]];
console.log("找到匹配的handler:", keys[index]);
break;
}
}
if (handler) {
let data = handler(receive, f, path, recArr);
console.log("handler返回的数据:", data);
return data;
} else {
console.log("已收到消息,但无指定处理程序", receive);
console.log("已收到消息,但无指定处理程序, deviceUrl:", f.device.detailPageUrl, "可用handlers:", keys);
}
} else {
console.log("已收到该消息,但无法处理", receive);
console.log("已收到该消息,但无法处理", receive, "f:", f);
}
return receive;
@ -467,12 +470,16 @@ class BleReceive {
formData.battary = batteryLevel;
formData.statu = warn;
formData.xuhang = lightingTime;
console.log("7305解析结果 - 电量:", batteryLevel, "续航:", lightingTime, "完整数据:", formData);
let recCnt = recArr.find(v => {
return v.key.replace(/\//g, "").toLowerCase() === f.device.detailPageUrl.replaceAll(
'/', '').toLowerCase();
});
if (!recCnt) {
if (batteryLevel <= 20) {
@ -488,9 +495,11 @@ class BleReceive {
this.setBleFormData(formData, f);
return formData;
} catch (error) {
console.log('数据解析错误:', error);
console.log('7305数据解析错误:', error);
return null;
}
}
return null;
}
Receive_4877(receive,f,path,recArr){