liubiao/APP
1
0
Fork 0
forked from dyf/APP
Code Pull Requests Activity

修复不在控制页时收到蓝牙消息，进入设备页后未同步显示的问题

Browse Source
This commit is contained in:
liub
2026-02-13 11:50:30 +08:00
parent fc88bd6f7d
commit 27097fecc4
2 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
utils/BleReceive.js
View File

@ -49,20 +49,20 @@ class BleReceive {
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 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("设备"+f.device.deviceName+"收到消息,数据:", data);
let data = handler(receive, f, path, recArr);
this.setBleFormData(data, f);
return data;
} else {
console.error("已收到消息,但无指定处理程序, deviceUrl:", f.device.detailPageUrl, "可用handlers:", keys);
@ -159,7 +159,7 @@ class BleReceive {
formData.modeCurr = modeCurr;
formData.warnLevel = warn;
formData.iswarn = iswarn;
this.setBleFormData(formData, f);
let recCnt = recArr.find(v => {
return v.key.replace(/\//g, "").toLowerCase() == f.device.detailPageUrl
@ -208,7 +208,7 @@ class BleReceive {
if (str.indexOf('mac address:') == 0) {
let formData = {};
formData.macAddress = str.split(':')[1];
this.setBleFormData(formData, f);
return formData;
} else {
let receiveData = {
@ -327,7 +327,7 @@ class BleReceive {
receiveData.fourGStrenth = fourGStrenth;
receiveData.SOS = sosTxt;
receiveData.qzwarn = sosTxt === 'sg';
this.setBleFormData(receiveData, f);
console.log("recArr=", recArr);
let recCnt = recArr.find(v => {
return v.key.replace(/\//g, "").toLowerCase() == f.device.detailPageUrl
@ -415,8 +415,7 @@ class BleReceive {
console.log('将数据转文本失败', ex);
}
}
// console.log("todo",receiveData);
this.setBleFormData(receiveData, f);
return receiveData;
}
@ -503,8 +502,6 @@ class BleReceive {
}
}
this.setBleFormData(formData, f);
return formData;
} catch (error) {
console.log('7305数据解析错误:', error);
@ -605,8 +602,6 @@ class BleReceive {
}
}
this.setBleFormData(formData, f);
return formData;
} catch (error) {
console.log('7305数据解析错误:', error);