@jiabaida/tools 1.0.8 → 1.0.10

package/dist/esm/index.js

@@ -1 +1 @@
-export{chunk,unique}from"./core/array.js";export{checkBluetoothStatus,checkLocationStatus,connectAsync,createBLEConnection,disConnect,enhanceDevice,foundScanDevice,getBLEDeviceCharacteristics,getBLEDeviceServices,getBluetoothAdapterState,getBluetoothPermission,initBle,isInit,notify,onBLECharacteristicValueChange,onBLEConnectionStateChange,onBleChangedConnectionState,onBluetoothAdapterStateChange,onBluetoothDeviceFound,onFoundDevice,scanHandle,startDevicesDiscovery,stopBluetoothDevicesDiscovery}from"./core/BleApiManager.js";export{ab2decimalArr,ab2hex,arrayBufferToHexArray,base64ToHexArray,checkSum,crc16modbus,crcCheckSum,decimalToHex,decimalToHex0x,decimalToTwoByteHexArray,extractBits,fromBCD,generateCheckSum,generateCrc16modbusCheck,generateCrcCheckSum,getParamBaseValue,hex2Ascii,hex2Binary,hex2string,hexArr2Assic,hexArr2ab,hexArr2string,hexArrayToModuleArrayBuffer,hexStrAscii,hexStringToBinary,hexToDecimal,isWithin30Minutes,parseDateTime,sleep,string2hexArr,stringToTwoHexArray,toBCD}from"./core/BleDataProcess.js";export{eventBus,formatTimeHHmm,getOS,getPlatform,inArray,isEmpty,isNotEmpty}from"./core/commonfun.js";export{ALLOWED_MAC_PREFIX,APP_KEY_STATUS,extractModuleInfo,getRandomNum,getTypeBuyCmd,handleNewAppKey,handleOldAppKey,sendAppKey,sendEnableOrVerifyKey,sendOldAppKey,sendVerifyPwd,sendWrite1LevelPwd,verify3LevelPassword,verifyMacAddrAndKey}from"./core/keyAndPwdManager.js";export{MqttServer}from"./core/mqttServer.js";export{OTAUpgrade}from"./core/OtaUpgrade.js";export{decrypt,decrypt2,decryptUsername,encrypt}from"./core/rsaEncrypt.js";export{tcpSend,tcpServer}from"./core/tcpServer.js";export{TelinkApi}from"./core/TelinkApi.js";export{BLE,Logger,Observer,Transfer}from"./core/Transfer.js";export{getBaseInfo,getBaseParams,getResistance}from"./core/BleCmdAnalysis/BaseParamProtocol.js";export{getData,setMTUAsync}from"./core/BleCmdAnalysis/BleCmdAnalysis.js";export{activateAsync,enterFactory,existFactory,get3B3CAsync,get3B3CInfo,getChipTypeAsync,getDD5A0AAsync,getDD5A0EAsync,getDD5A17Async,getDD5AAllAsync,getDD5AE0Async,getDD5AE1Async,getDD5AE4Async,getDD5AFAAsync,getDD5AFBAsync,getDDA4F0Async,getDDA503Async,getDDA504Async,getDDA505Async,getDDA506Async,getDDA507Async,getDDA508Async,getDDA5DCAsync,getDDA5FAAsync,getDDA5OldAsync,getProtectCountCmd,readExistFactory,resetCapacity,resolve3B3C,resolveBMSCmd,resolveBaseDD,resolveDD5A0A,resolveDDA4F0,resolveDDA500,resolveDDA503,resolveDDA504,resolveDDA505,resolveDDA506,resolveDDA508,resolveDDA5DC,resolveDDA5FA,resolveProtections,sendBMSAsync,setDD5AE3sync,setDDA5FAAsync,setDDA5OldAsync,set_PlanCMD_3B3C,set_PlanCMD_DD}from"./core/BleCmdAnalysis/BleCmdDD.js";export{getDDA420Async,getDDA421Async,getDDA422Async,getDDA423Async,getDDA425Async,getDDA426Async,getDDA427Async,getDDA429Async,resolveDDA420,resolveDDA421,resolveDDA422,resolveDDA423,resolveDDA425,resolveDDA426,resolveDDA427,resolveDDA429}from"./core/BleCmdAnalysis/BleCmdDDA4.js";export{clearPrimaryKey,getBluetoothName,getBroadcastDataCmd,getFFAA03Async,getFFAA17Async,getFFAA25Async,getFFAA26Async,getFFAA80Async,getFFAAKeyAsync,getWiFiIP,resetFactoryData,resetSecondaryKey,resolveFFAA25,resolveFFAA26,resolveFFAA80,resolveFFAAKey,setBluetoothName,setWiFi,setWiFiSta,set_PlanCMD_FFAA,set_PlanCMD_FFAA80}from"./core/BleCmdAnalysis/BleCmdFFAA.js";export{getCMDESInfoAsync,getHVESInfoAsync,resolveHVESBMUInfo,resolveHVESBaseInfo,resolveHVESCalibrationC1Info,resolveHVESCalibrationC2Info,resolveHVESCalibrationConfigInfo,resolveHVESCalibrationInfo,resolveHVESCtInfo,resolveHVESDisCtInfo,resolveHVESElectrodeHTInfo,resolveHVESEtInfo,resolveHVESInsulationLRInfo,resolveHVESLSocInfo,resolveHVESMonoVolInfo,resolveHVESOeInfo,resolveHVESOtRisingInfo,resolveHVESOtrInfo,resolveHVESOvrInfo,resolveHVESPackInfo,resolveHVESParamsInfo,resolveHVESSumInfo,resolveHVESSumVolInfo,resolveHVESVersionInfo}from"./core/BleCmdAnalysis/BleCmdHVES.js";export{HostProtocol}from"./core/BleCmdAnalysis/ESHostProtocol.js";export{controlSwitch,getE1Cmd,getSysParamCmd,readParamCmd,setCapacityParamCmd,setParamCmd,setSysParamCmd}from"./core/BleCmdAnalysis/readAndSetParam.js";export{batteryInfoJson,capInfoJson,capVolInfoJson,currentInfoJson,equalizerFunJson,funcAndTempFuncJson,funcJson,systemJson,tempFuncJson,tempInfoJson,voltageInfoJson}from"./core/dataJson/baseParamsJson.js";
+export{chunk,unique}from"./core/array.js";export{checkBluetoothStatus,checkLocationStatus,connectAsync,createBLEConnection,disConnect,enhanceDevice,foundScanDevice,getBLEDeviceCharacteristics,getBLEDeviceServices,getBluetoothAdapterState,getBluetoothPermission,initBle,isInit,notify,onBLECharacteristicValueChange,onBLEConnectionStateChange,onBleChangedConnectionState,onBluetoothAdapterStateChange,onBluetoothDeviceFound,onFoundDevice,scanHandle,startDevicesDiscovery,stopBluetoothDevicesDiscovery}from"./core/BleApiManager.js";export{ab2decimalArr,ab2hex,arrayBufferToHexArray,base64ToHexArray,checkSum,crc16modbus,crcCheckSum,decimalToHex,decimalToHex0x,decimalToTwoByteHexArray,extractBits,fromBCD,generateCheckSum,generateCrc16modbusCheck,generateCrcCheckSum,getParamBaseValue,hex2Ascii,hex2Binary,hex2string,hexArr2Assic,hexArr2ab,hexArr2string,hexArrayToModuleArrayBuffer,hexStrAscii,hexStringToBinary,hexToDecimal,isWithin30Minutes,parseDateTime,sleep,string2hexArr,stringToTwoHexArray,toBCD}from"./core/BleDataProcess.js";export{eventBus,formatTimeHHmm,getOS,getPlatform,inArray,isEmpty,isNotEmpty}from"./core/commonfun.js";export{ALLOWED_MAC_PREFIX,APP_KEY_STATUS,extractModuleInfo,getRandomNum,getTypeBuyCmd,handleNewAppKey,handleOldAppKey,sendAppKey,sendEnableOrVerifyKey,sendOldAppKey,sendVerifyPwd,sendWrite1LevelPwd,verify3LevelPassword,verifyMacAddrAndKey}from"./core/keyAndPwdManager.js";export{MqttServer,mqttServer}from"./core/mqttServer.js";export{OTAUpgrade}from"./core/OtaUpgrade.js";export{decrypt,decrypt2,decryptUsername,encrypt}from"./core/rsaEncrypt.js";export{tcpSend,tcpServer}from"./core/tcpServer.js";export{TelinkApi}from"./core/TelinkApi.js";export{BLE,Logger,Observer,Transfer}from"./core/Transfer.js";export{getBaseInfo,getBaseParams,getResistance}from"./core/BleCmdAnalysis/BaseParamProtocol.js";export{getData,setMTUAsync}from"./core/BleCmdAnalysis/BleCmdAnalysis.js";export{activateAsync,enterFactory,existFactory,get3B3CAsync,get3B3CInfo,getChipTypeAsync,getDD5A0AAsync,getDD5A0EAsync,getDD5A17Async,getDD5AAllAsync,getDD5AE0Async,getDD5AE1Async,getDD5AE4Async,getDD5AFAAsync,getDD5AFBAsync,getDDA4F0Async,getDDA503Async,getDDA504Async,getDDA505Async,getDDA506Async,getDDA507Async,getDDA508Async,getDDA5DCAsync,getDDA5FAAsync,getDDA5OldAsync,getProtectCountCmd,readExistFactory,resetCapacity,resolve3B3C,resolveBMSCmd,resolveBaseDD,resolveDD5A0A,resolveDDA4F0,resolveDDA500,resolveDDA503,resolveDDA504,resolveDDA505,resolveDDA506,resolveDDA508,resolveDDA5DC,resolveDDA5FA,resolveProtections,sendBMSAsync,setDD5AE3sync,setDDA5FAAsync,setDDA5OldAsync,set_PlanCMD_3B3C,set_PlanCMD_DD}from"./core/BleCmdAnalysis/BleCmdDD.js";export{getDDA420Async,getDDA421Async,getDDA422Async,getDDA423Async,getDDA425Async,getDDA426Async,getDDA427Async,getDDA429Async,resolveDDA420,resolveDDA421,resolveDDA422,resolveDDA423,resolveDDA425,resolveDDA426,resolveDDA427,resolveDDA429}from"./core/BleCmdAnalysis/BleCmdDDA4.js";export{clearPrimaryKey,getBluetoothName,getBroadcastDataCmd,getFFAA03Async,getFFAA17Async,getFFAA25Async,getFFAA26Async,getFFAA80Async,getFFAAKeyAsync,getWiFiIP,resetFactoryData,resetSecondaryKey,resolveFFAA25,resolveFFAA26,resolveFFAA80,resolveFFAAKey,setBluetoothName,setWiFi,setWiFiSta,set_PlanCMD_FFAA,set_PlanCMD_FFAA80}from"./core/BleCmdAnalysis/BleCmdFFAA.js";export{getCMDESInfoAsync,getHVESInfoAsync,resolveHVESBMUInfo,resolveHVESBaseInfo,resolveHVESCalibrationC1Info,resolveHVESCalibrationC2Info,resolveHVESCalibrationConfigInfo,resolveHVESCalibrationInfo,resolveHVESCtInfo,resolveHVESDisCtInfo,resolveHVESElectrodeHTInfo,resolveHVESEtInfo,resolveHVESInsulationLRInfo,resolveHVESLSocInfo,resolveHVESMonoVolInfo,resolveHVESOeInfo,resolveHVESOtRisingInfo,resolveHVESOtrInfo,resolveHVESOvrInfo,resolveHVESPackInfo,resolveHVESParamsInfo,resolveHVESSumInfo,resolveHVESSumVolInfo,resolveHVESVersionInfo}from"./core/BleCmdAnalysis/BleCmdHVES.js";export{HostProtocol}from"./core/BleCmdAnalysis/ESHostProtocol.js";export{controlSwitch,getE1Cmd,getSysParamCmd,readParamCmd,setCapacityParamCmd,setParamCmd,setSysParamCmd}from"./core/BleCmdAnalysis/readAndSetParam.js";export{batteryInfoJson,capInfoJson,capVolInfoJson,currentInfoJson,equalizerFunJson,funcAndTempFuncJson,funcJson,systemJson,tempFuncJson,tempInfoJson,voltageInfoJson}from"./core/dataJson/baseParamsJson.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jiabaida/tools",
-  "version": "1.0.8",
+  "version": "1.0.10",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "exports": {

package/src/core/BleApiManager.js

@@ -1,6 +1,12 @@
 import { ref } from 'vue';
 import { ab2decimalArr, hexToDecimal } from './BleDataProcess';
 import { eventBus, getOS } from './commonfun'; // 导入eventBus
+// #ifdef MP-WEIXIN
+import { tcpServer } from './tcpServer.js';
+// #endif
+// #ifdef APP-PLUS
+import { mqttServer } from './mqttServer.js';
+// #endif
 const serviceId = '0000FF00-0000-1000-8000-00805F9B34FB';
 const UUID_READ = '0000FF01-0000-1000-8000-00805F9B34FB';
 const UUID_WRITE = '0000FF02-0000-1000-8000-00805F9B34FB';
@@ -40,11 +46,11 @@ export const enhanceDevice = (device) => {
     const productType = advHex.slice(18, 20);
     let protocolVersion = advHex.slice(20, 22);
     if (protocolVersion) {
-        const v = hexToDecimal(protocolVersion)
-        if (macAddr.startsWith("A5:C2") && v <= 0x23) {
-          protocolVersion = '01';
-        }
+      const v = hexToDecimal(protocolVersion)
+      if (macAddr.startsWith("A5:C2") && v <= 0x23) {
+        protocolVersion = '01';
       }
+    }
     const appkeyStatus = advHex.slice(22, 24);
     const tempVoltage = advHex.slice(24, 26);
     const voltage = tempVoltage || tempVoltage == 0 ? hexToDecimal(tempVoltage) : '';
@@ -66,7 +72,7 @@ export const enhanceDevice = (device) => {
  * 105：请授权微信位置信息和蓝牙权限 --- 打开手机内微信权限设置页面 openAppAuthorizeSetting
  * 106：请授权蓝牙和位置权限，并重启小程序 --- 打开小程序设置页面 openSetting
  */
-export const checkBluetoothStatus = async (successCallback = () => {}) => {
+export const checkBluetoothStatus = async (successCallback = () => { }) => {
   return new Promise((resolve, reject) => {
     uni.openBluetoothAdapter({
       success: async (res) => {
@@ -89,7 +95,7 @@ export const checkBluetoothStatus = async (successCallback = () => {}) => {
   });
 }
 
-export const checkLocationStatus = async (successCallback = () => {}) => { 
+export const checkLocationStatus = async (successCallback = () => { }) => {
   // 创建超时Promise
   const timeoutPromise = new Promise((resolve, reject) => {
     setTimeout(() => {
@@ -124,7 +130,7 @@ export const checkLocationStatus = async (successCallback = () => {}) => {
     })
 }
 
-export const getBluetoothPermission = async (successCallback = () => {}) => {
+export const getBluetoothPermission = async (successCallback = () => { }) => {
   try {
     if (isAndroid) {
       return await checkLocationStatus(successCallback);
@@ -147,13 +153,13 @@ export const initBle = async () => {
   const initBluetoothSuccessCb = () => {
     console.log('初始化蓝牙成功initBluetoothSuccessCb1');
     try {
-      if(isInit) return;
+      if (isInit) return;
       onBluetoothDeviceFound();
       onBLECharacteristicValueChange();
       onBLEConnectionStateChange();
       onBluetoothAdapterStateChange()
       isInit = true;
-    } catch (error) { 
+    } catch (error) {
       throw error;
     }
   }
@@ -274,6 +280,15 @@ export const onBLEConnectionStateChange = async () => {
     console.log('onBLEConnectionStateChange', characteristic);
     // 触发事件总线事件
     eventBus.emit('setBleChangedConnectionState', characteristic);
+    if (!characteristic.connected) {
+      // #ifdef APP-PLUS
+      mqttServer.closeMqttByDeviceId(characteristic.deviceId)
+      // #endif
+      // #ifdef MP-WEIXIN
+      // 连接失败
+      tcpServer.closeTcpSocket(characteristic.deviceId);
+      // #endif
+    }
   });
 };
 
@@ -351,10 +366,10 @@ export const getBLEDeviceServices = (deviceId) => {
       await getBLEDeviceCharacteristics(deviceId);
       return res.services;
     },
-    20, // 最大重试次数
-    100,
+    10, // 最大重试次数（减少到10次）
+    300, // 重试间隔增加到300ms
     '获取蓝牙服务'
-  ); // 重试间隔
+  );
 };
 // #region 获取蓝牙特征值
 /** 获取蓝牙特征值 */
@@ -374,10 +389,10 @@ export const getBLEDeviceCharacteristics = async (deviceId) => {
       console.log('获取特征值成功:', res);
       return res.characteristics;
     },
-    20, // 最大重试次数
-    100,
+    10, // 最大重试次数（减少到10次）
+    300, // 重试间隔增加到300ms
     '获取蓝牙特征值'
-  ); // 重试间隔
+  );
 };
 // #region 订阅特征值
 /** 订阅特征值 */
@@ -423,6 +438,8 @@ export const connectAsync = async (deviceId, timeout = 10000) => {
   return new Promise(async (resolve, reject) => {
     try {
       await createBLEConnection(deviceId, timeout);
+      // 连接成功后等待设备准备服务（关键修复）
+      await new Promise(resolve => setTimeout(resolve, 800));
       await getBLEDeviceServices(deviceId);
       await notify(deviceId);
       resolve(true);
@@ -441,6 +458,7 @@ export const scanHandle = (historyConnectedList = [], connectFn = (device) => {
   // 调起条码扫描
   uni.scanCode({
     scanType: ['barCode', 'qrCode'],
+    autoZoom: false,
     success: async ({ result }) => {
       console.log('扫描内容: ' + result);
       let searchKey = result;

package/src/core/BleCmdAnalysis/BaseParamProtocol.js

@@ -55,31 +55,43 @@ function formatBinary(arr) {
   return resultArray
 }
 /**
- * 发送命令序列
- * @param {Object} datasInfo 存储数据的对象
- * @param {string} chipType 芯片类型
- * @param {string} deviceId 设备ID
- * @param {Array<any>} params 参数数组
+ * 批量串行读取设备参数
+ * @param {Object} datasInfo - 结果存储对象
+ * @param {string|null} chipType - 芯片类型
+ * @param {string} deviceId - 设备 ID
+ * @param {Array} params - 参数列表
  */
 const sendCmdSeq = async (datasInfo, chipType, deviceId, params) => {
-  let index = 0;
-  // 读多个参数时统一进出工厂
-  if(!chipType) await enterFactory(deviceId);
-  while (index < params.length) {
-    const item = params[index];
+  // 基础参数校验
+  if (!datasInfo || !deviceId || !Array.isArray(params)) {
+    console.error('sendCmdSeq 参数异常');
+    return;
+  }
+
+  // 无芯片类型 → 进入工厂模式
+  if (!chipType) {
+    await enterFactory(deviceId);
+  }
+
+  // 串行读取所有参数（失败不中断）
+  for (const item of params) {
+    if (!item?.key) continue; // 跳过无效项
+
     try {
-      const basedata = await getSysParamCmd(chipType, deviceId, item, false);
-      datasInfo[item.key] = basedata;
-      index++; // 只有当前操作成功完成后才增加索引
-    } catch (error) {
-      console.error(`获取参数 ${item.key} 失败:`, error);
-      // 可以选择继续执行下一个，或者中断执行
-      // break; // 如果要在失败时中断
-      index++; // 如果希望失败时也继续下一个
+      const baseData = await getSysParamCmd(chipType, deviceId, item, false);
+      datasInfo[item.key] = baseData;
+    } catch (err) {
+      console.error(`获取参数失败 [${item.key}]:`, err);
+      // 失败不重试、不中断，继续下一个
     }
   }
-  if(!chipType) await readExistFactory(deviceId);
-}
+
+  // 无芯片类型 → 退出工厂模式
+  if (!chipType) {
+    await readExistFactory(deviceId);
+  }
+};
+
 let crsDivisor = 0.1;
 /**
  * 解析FA基础参数
@@ -116,23 +128,36 @@ export const getBaseParams = async (chipType, deviceData, index, paramObj) => {
         return dataInfo
       case 2:
         let datasInfo2 = {}
+        // 11 为主动均衡 需取高位
+        const productType = deviceData.productType;
+        const isBalanceDevice = productType === "12"
+        console.log('productType', productType, isBalanceDevice)
         if (chipType) {
+          if (!isBalanceDevice) {
+            /**连续读两个参数 */
+            const capData = await getSysParamCmd(chipType, deviceId, { ...capInfoJson[0], paramLength: 4 })
+            console.warn('capData: ', capData);
+            datasInfo2['normCap'] = capData?.slice(0, 2)
+            datasInfo2['cycleCap'] = capData?.slice(2, 4)
+            const capData2 = await getSysParamCmd(chipType, deviceId, capInfoJson[2])
+            datasInfo2['fullCap'] = capData2?.slice(0, 2)
+          } else {
+            /**读取标称容量：需要读取paramNo 0（低16位）和155（高16位） */
+            const normCapLow = await getSysParamCmd(chipType, deviceId, { paramNo: 0, paramLength: 2 })
+            const normCapHigh = await getSysParamCmd(chipType, deviceId, { paramNo: 155, paramLength: 2 })
+            console.log('normCapLow: ', normCapLow, 'normCapHigh: ', normCapHigh);
+            // 合并高低位，每个都只取前2个字节
+            datasInfo2['normCap'] = [...(normCapLow?.slice(0, 2) || []), ...(normCapHigh?.slice(0, 2) || [])]
 
-          /**读取标称容量：需要读取paramNo 0（低16位）和155（高16位） */
-          const normCapLow = await getSysParamCmd(chipType, deviceId, { paramNo: 0, paramLength: 2 })
-          const normCapHigh = await getSysParamCmd(chipType, deviceId, { paramNo: 155, paramLength: 2 })
-          console.log('normCapLow: ', normCapLow, 'normCapHigh: ', normCapHigh);
-          // 合并高低位，每个都只取前2个字节
-          datasInfo2['normCap'] = [...(normCapLow?.slice(0, 2) || []), ...(normCapHigh?.slice(0, 2) || [])]
-
-          const cycleCapData = await getSysParamCmd(chipType, deviceId, capInfoJson[1])
-          datasInfo2['cycleCap'] = cycleCapData?.slice(0, 2)
+            const cycleCapData = await getSysParamCmd(chipType, deviceId, capInfoJson[1])
+            datasInfo2['cycleCap'] = cycleCapData?.slice(0, 2)
 
-          /**读取满充容量：需要读取paramNo 112（低16位）和156（高16位） */
-          const fullCapLow = await getSysParamCmd(chipType, deviceId, { paramNo: 112, paramLength: 2 })
-          const fullCapHigh = await getSysParamCmd(chipType, deviceId, { paramNo: 156, paramLength: 2 })
-          console.log('fullCapLow: ', fullCapLow, 'fullCapHigh: ', fullCapHigh);
-          datasInfo2['fullCap'] = [...(fullCapLow?.slice(0, 2) || []), ...(fullCapHigh?.slice(0, 2) || [])]
+            /**读取满充容量：需要读取paramNo 112（低16位）和156（高16位） */
+            const fullCapLow = await getSysParamCmd(chipType, deviceId, { paramNo: 112, paramLength: 2 })
+            const fullCapHigh = await getSysParamCmd(chipType, deviceId, { paramNo: 156, paramLength: 2 })
+            console.log('fullCapLow: ', fullCapLow, 'fullCapHigh: ', fullCapHigh);
+            datasInfo2['fullCap'] = [...(fullCapLow?.slice(0, 2) || []), ...(fullCapHigh?.slice(0, 2) || [])]
+          }
         } else {
           await sendCmdSeq(datasInfo2, chipType, deviceId, capInfoJson)
         }

package/src/core/BleCmdAnalysis/BleCmdAnalysis.js

@@ -1,11 +1,57 @@
 import { ab2decimalArr, hexArr2ab, hexArr2string, sleep } from '../BleDataProcess';
 import { eventBus, getOS, getPlatform } from '../commonfun';
+// #ifdef APP-PLUS
+import { mqttServer } from '../mqttServer';
+// #endif
 
 const BLE_RESPONSE_TIMEOUT = 300; // 蓝牙指令响应超时
 const STORE_MUTATION_NAME = 'setBleChangedCharacteristicValue';
 const serviceId = '0000FF00-0000-1000-8000-00805F9B34FB';
 const UUID_READ = '0000FF01-0000-1000-8000-00805F9B34FB';
 const characteristicId = '0000FF02-0000-1000-8000-00805F9B34FB';
+
+// 按设备维度串行执行蓝牙指令，避免并发写入导致回包串线
+const BLE_COMMAND_QUEUE = new Map();
+const BLE_COMMAND_RUNNING = new Set();
+
+const runNextBleCommand = async (queueKey) => {
+  if (BLE_COMMAND_RUNNING.has(queueKey)) return;
+  const queue = BLE_COMMAND_QUEUE.get(queueKey) || [];
+  if (queue.length === 0) {
+    BLE_COMMAND_QUEUE.delete(queueKey);
+    return;
+  }
+
+  BLE_COMMAND_RUNNING.add(queueKey);
+  const currentTask = queue[0];
+
+  try {
+    const result = await currentTask.task();
+    currentTask.resolve(result);
+  } catch (error) {
+    currentTask.reject(error);
+  } finally {
+    const currentQueue = BLE_COMMAND_QUEUE.get(queueKey) || [];
+    currentQueue.shift();
+    BLE_COMMAND_RUNNING.delete(queueKey);
+
+    if (currentQueue.length === 0) {
+      BLE_COMMAND_QUEUE.delete(queueKey);
+    } else {
+      runNextBleCommand(queueKey);
+    }
+  }
+};
+
+const enqueueBleCommand = (deviceId, task) => {
+  const queueKey = deviceId || '__default__';
+  return new Promise((resolve, reject) => {
+    const queue = BLE_COMMAND_QUEUE.get(queueKey) || [];
+    queue.push({ task, resolve, reject });
+    BLE_COMMAND_QUEUE.set(queueKey, queue);
+    runNextBleCommand(queueKey);
+  });
+};
 // #region 发送写入指令
 /** 向蓝牙设备写入特征值 发送指令
  * @param {string} deviceId - 设备ID
@@ -88,7 +134,7 @@ export const getData = async (deviceId, {
   if (!deviceId) throw new Error('deviceId is required');
   if (!command || command.length <= 0) throw new Error('command is required');
 
-  return new Promise((resolve, reject) => {
+  return enqueueBleCommand(deviceId, () => new Promise((resolve, reject) => {
     let isCompleted = false;
     let timeoutId = null;
     let responsed = false;
@@ -135,6 +181,16 @@ export const getData = async (deviceId, {
           if (verified) {
             responsed = true;
             cleanup();
+            // #ifdef APP-PLUS
+            const value = [...pkg].map((o) => `00${o.toString(16)}`.slice(-2)).join('');
+            const cmdCode = mqttServer.currentCommand
+            if (value && cmdCode) {
+              if (mqttServer.setPassthroughType === 0) {
+                mqttServer.publishPassthroughHandle({ value, cmdCode }, deviceId)
+              }
+              mqttServer.setPassthroughType = 0
+            }
+            // #endif
             resolve([...pkg]);
           } else {
             // 验证失败，重置状态
@@ -197,7 +253,7 @@ export const getData = async (deviceId, {
       cleanup();
       reject(error);
     });
-  });
+  }));
 }
 // #region 设置Android MTU 最大传输单元
 /** 设置Android MTU

package/src/core/BleCmdAnalysis/BleCmdDD.js

@@ -1,4 +1,4 @@
-import { decimalToHex, fromBCD, generateCrc16modbusCheck, generateCrcCheckSum, hex2string, hexArr2Assic, hexArr2string, hexToDecimal, isWithin30Minutes, sleep, stringToTwoHexArray, toBCD } from '../BleDataProcess';
+import { decimalToHex, fromBCD, generateCrc16modbusCheck, generateCrcCheckSum, hex2string, hexArr2Assic, hexArr2string, hexToDecimal, isWithin30Minutes, sleep, stringToTwoHexArray, toBCD, decimalToHex0x } from '../BleDataProcess';
 import { getData } from './BleCmdAnalysis.js';
 import { getFFAA80Async, resolveFFAA80 } from './BleCmdFFAA.js';
 import { controlSwitch } from './readAndSetParam.js';
@@ -148,7 +148,16 @@ export const resolve3B3C = (data) => {
   const content = data.slice(12, data.length - 3);
   const CONTENT = [/*产品类型-TYPE*/ '01', /*产品类型标识长度*/ '04', /*产品类型表示*/ '00', /*前端类型标识*/ '02', /*协议版本标识*/ '01', /*层级关系架构*/ '00', /*硬件版本号-TYPE*/ '02', /*硬件版本号长度*/ '00', /*软件版本号-TYPE*/ '03', /*软件版本号长度*/ '0a', /*软件版本号内容ASCII*/ '44', /*软件版本号内容ASCII*/ '48', /*软件版本号内容ASCII*/ '30', /*软件版本号内容ASCII*/ '34', /*软件版本号内容ASCII*/ '2e', /*软件版本号内容ASCII*/ '31', /*软件版本号内容ASCII*/ '2e', /*软件版本号内容ASCII*/ '34', /*软件版本号内容ASCII*/ '2e', /*软件版本号内容ASCII*/ '37', /*PCB-TYPE*/ '04', /*PCB内容长度*/ '00'];
   while (content.length > 0) {
-    const [v1, v2, ...v] = content.splice(0, content[1] + 2);
+    if (content.length < 2) {
+      console.warn('Content too short to parse, remaining:', content);
+      break;
+    }
+    const len = Math.min(content[1] + 2, content.length);
+    const [v1, v2, ...v] = content.splice(0, len);
+    if (v.length !== v2) {
+      console.warn(`Data length mismatch for type ${v1}: expected ${v2}, got ${v.length}`);
+      continue;
+    }
     if (v1 == 0x01) {
       result['productFlag'] = hex2string(v1);
       result['productLen'] = v2;
@@ -387,6 +396,7 @@ export const resolveDDA503 = (data) => {
     heatingState,
     heatingCurrent,
     equilibriumCurrent,
+    eqCurr: equilibriumCurrent,
     isFactoryMode,
     protVal,
     alarmsState,
@@ -771,7 +781,7 @@ export const resolveDDA505 = (data) => {
 export const getDDA5FAAsync = async (deviceId, paramNo, length) => {
   const header = ['0xDD', '0xA5']
   const _values = [...paramNo, length];
-  const lengthHex = decimalToHex(_values.length)
+  const lengthHex = decimalToHex0x(_values.length)
   const _command = ['0xFA', lengthHex, ..._values];
   const checks = generateCrcCheckSum(_command);
   const command = [...header, ..._command, ...checks, '0x77'];
@@ -1212,9 +1222,8 @@ export const get3B3CInfo = ({ deviceId, macAddr, moduleType, productType }) => {
     try {
       if (!deviceId) throw new Error('deviceId required');
       // 发送FFAA_80
-      const _ffaa_80_hex = await getFFAA80Async(deviceId, 'AT^VERSION?');
-      _ffaa_80 = resolveFFAA80(_ffaa_80_hex);
-      console.warn('Report-3B3C    _ffaa_80    ', { _ffaa_80_hex, _ffaa_80 });
+      const _ffaa_80 = await getFFAA80Async(deviceId, 'AT^VERSION?');
+      console.warn('Report-3B3C    _ffaa_80    ', { _ffaa_80 });
       if (_ffaa_80) reportData['moduleVersion'] = _ffaa_80?.moduleVersion;
 
       // 发送3B3C
@@ -1223,6 +1232,7 @@ export const get3B3CInfo = ({ deviceId, macAddr, moduleType, productType }) => {
       console.warn('Report-3B3C    _3b3c    ', { _3b3c_hex, _3b3c });
       if (_3b3c) {
         reportData['cmdContent'] = _3b3c?.dataStr;
+        reportData['bmsVersion'] = _3b3c?.sofewareV;
       } /*3B3C超时 or 不支持3B3C*/ else {
         // 发送DDA5_03
         const _dda5_03_hex = await getDDA503Async(deviceId);