diff --git a/utils/BleHelper.js b/utils/BleHelper.js index 7c9d6dc..c127d69 100644 --- a/utils/BleHelper.js +++ b/utils/BleHelper.js @@ -779,23 +779,23 @@ class BleHelper { str: str, hexs: hexs }; - console.log("监听到特征值:" + JSON.stringify(recData)); + // console.log("监听到特征值:",recData); if (this.cfg.receivDataCallback) { if (this.cfg.receivDataCallback.length > 0) { - console.log("有人订阅消息") + // console.log("有人订阅消息") this.cfg.receivDataCallback.forEach(( rec) => { - console.log("有人订阅消息111", ) + // console.log("有人订阅消息111", ) if (rec.callback) { try { - console.log("正在处理订阅消息",rec); + // console.log("正在处理订阅消息",rec); rec.callback(recData, f, rec.key, this.cfg .receivDataCallback ); - console.log("处理订阅消息完毕"); + // console.log("处理订阅消息完毕"); } catch (err) { console.error( "订阅消息出现异常", diff --git a/utils/BleReceive.js b/utils/BleReceive.js index b31a44b..5a75818 100644 --- a/utils/BleReceive.js +++ b/utils/BleReceive.js @@ -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);