From a5c6faa9dac8cadbaf6ea9d745e43bca9d48395c Mon Sep 17 00:00:00 2001
From: liub <itliubiao@qq.com>
Date: Fri, 24 Oct 2025 11:04:36 +0800
Subject: [PATCH] =?UTF-8?q?*=20=E4=BF=AE=E5=A4=8D=E8=93=9D=E7=89=99?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=876155/7305=E5=85=A8=E5=B1=80=E5=BC=B9=E7=AA=97?=
 =?UTF-8?q?=E4=B8=8E=E8=AF=A6=E6=83=85=E5=BC=B9=E7=AA=97=E9=87=8D=E5=A4=8D?=
 =?UTF-8?q?=E5=87=BA=E7=8E=B0=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 修复蓝牙设备6155/7305全局弹窗与详情弹窗重复出现的问题

* 修复蓝牙设备6155/7305全局弹窗与详情弹窗重复出现的问题

* 修复蓝牙设备6155/7305全局弹窗与详情弹窗重复出现的问题

* 修复蓝牙设备6155/7305全局弹窗与详情弹窗重复出现的问题

* 修复蓝牙设备6155/7305全局弹窗与详情弹窗重复出现的问题

* 修复蓝牙设备6155/7305全局弹窗与详情弹窗重复出现的问题

* 修复蓝牙设备6155/7305全局弹窗与详情弹窗重复出现的问题

修复蓝牙设备6155/7305全局弹窗与详情弹窗重复出现的问题
---
 utils/BleHelper.js  | 4 ++--
 utils/BleReceive.js | 6 ++----
 2 files changed, 4 insertions(+), 6 deletions(-)

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 => {