diff --git a/utils/BleHelper.js b/utils/BleHelper.js index 6f329ac..8c3f445 100644 --- a/utils/BleHelper.js +++ b/utils/BleHelper.js @@ -769,10 +769,10 @@ class BleHelper { } }) } else { - // console.log("无人订阅消息"); + console.log("无人订阅消息"); } } else { - // console.log("无人订阅receivDataCallback,不处理数据"); + console.log("无人订阅receivDataCallback,不处理数据"); } } catch (ex) { console.error("处理订阅消息失败,ex=", ex); diff --git a/utils/BleReceive.js b/utils/BleReceive.js index aec8ca6..1f9552c 100644 --- a/utils/BleReceive.js +++ b/utils/BleReceive.js @@ -461,12 +461,10 @@ class BleReceive { let formData = {}; formData.mode = staticLevelText; formData.fuMode = lightingLevelText; - formData.battary = 20; // batteryLevel; + formData.battary = batteryLevel; formData.statu = warn; formData.xuhang = lightingTime; - - batteryLevel = 20; - console.log("recArr=", recArr); + let recCnt = recArr.find(v => {