@jiabaida/tools 1.0.2 → 1.0.6

package/src/core/BleCmdAnalysis/readAndSetParam.js

@@ -1,5 +1,5 @@
-import { decimalToTwoByteHexArray, decimalToHex, getParamBaseValue } from '../BleDataProcess.js'
-import { readExistFactory, getDDA5FAAsync, enterFactory, getDDA5OldAsync, existFactory, setDDA5FAAsync, setDDA5OldAsync } from './BleCmdDD.js'
+import { decimalToHex, decimalToTwoByteHexArray } from '../BleDataProcess.js';
+import { enterFactory, existFactory, getDDA5FAAsync, getDDA5OldAsync, readExistFactory, setDDA5FAAsync, setDDA5OldAsync } from './BleCmdDD.js';
 
 // #region 发指令读取参数 
 /**
@@ -258,16 +258,18 @@ export const setCapacityParamCmd = (chipType, deviceId, paramInfo) => {
       }
     };
     const handleParam = async (paramObj) => {
-      const { address, oldAddress, length } = paramObj;
-      const hexValues = decimalToTwoByteHexArray(Number(paramObj.values) * 100);
+      const { paramNo, oldParamNo, paramLength } = paramObj;
+      const value = Math.round(Number(paramObj.values) / paramInfo.divisor);
+      console.log('value: ', value);
+      const hexValues = decimalToTwoByteHexArray(value);
       /**  地址转换为16进制 */
-      const hexAddress = decimalToTwoByteHexArray(address);
+      const hexAddress = decimalToTwoByteHexArray(paramNo);
       // 长度转换为16进制
-      const hexLength = decimalToHex(length);
+      const hexLength = decimalToHex(paramLength / 2);
       if (chipType) {
         return await handleSet(() => setDDA5FAAsync(deviceId, hexAddress, hexLength, hexValues), 7);
       } else {
-        return await handleSet(() => setDDA5OldAsync(deviceId, oldAddress, hexValues), 4);
+        return await handleSet(() => setDDA5OldAsync(deviceId, oldParamNo, hexValues), 4);
       }
     };
     try {

package/src/core/BleDataProcess.js

@@ -353,3 +353,43 @@
     return binaryString;
   }
 
+
+  /**转BCD*/
+  export const fromBCD = (bcd) => {
+    // 确保只取低 8 位（安全）
+    bcd = bcd & 0xFF;
+    const tens = (bcd >> 4) & 0x0F;   // 高4位
+    const units = bcd & 0x0F;         // 低4位
+    return tens * 10 + units;
+}
+
+  export const parseDateTime = (str) => {
+    const reg = /^(\d{4})-(\d{1,2})-(\d{1,2})\s+(\d{1,2}):(\d{1,2}):(\d{1,2})$/;
+    const match = str.match(reg);
+    if (!match) return null;
+    const [, y, m, d, h, i, s] = match.map(Number);
+    return new Date(y, m - 1, d, h, i, s).getTime();
+  }
+  
+// 判断是否在30分钟内
+  export const isWithin30Minutes = (timeStr) => {
+    const now = Date.now(); // 手机当前时间（毫秒）
+    const targetTime = parseDateTime(timeStr);
+    // console.log('targetTime: ', targetTime);
+    if (targetTime === null) {
+      console.error('时间字符串格式错误:', timeStr);
+      return false;
+    }
+    const diff = Math.abs(now - targetTime); // 毫秒差
+    const thirtyMinutes = 30 * 60 * 1000;   // 30分钟对应的毫秒数
+    return diff >= thirtyMinutes;
+  }
+  
+  export const toBCD = (num) => {
+    if (num < 0 || num > 99) {
+      throw new Error('BCD only supports 0-99');
+    }
+    const tens = Math.floor(num / 10);   // 十位（0～9）
+    const units = num % 10;              // 个位（0～9）
+    return (tens << 4) | units;          // 高4位 + 低4位
+  }

package/src/core/OtaUpgrade.js

@@ -40,7 +40,9 @@ export class OTAUpgrade {
     this.macAddr = macAddr;
     this.platform = platform; // 'APP' | 'MP' | 'H5'
     // 自动判断是否Telink，入参为macAddr
-    this.isTeLink = TelinkApi.isTeLink ? TelinkApi.isTeLink(macAddr) : false;
+    this.isTeLink = TelinkApi.isTeLink ? TelinkApi.isTeLink({
+      macAddr
+    }) : false;
     this.onProgress = onProgress;
     this.onSuccess = onSuccess;
     this.onError = onError;
@@ -52,6 +54,7 @@ export class OTAUpgrade {
     this.ready = true;
     this.timer = null;
     this.s_progress = 0;
+    this.otaStarting = false;
     this.progressType = 'download'; // 当前进度类型: 'download' | 'upgrade'
   }
 
@@ -70,6 +73,7 @@ export class OTAUpgrade {
       const downloadTask = uni.downloadFile({
         url: that.filePath,
         success: ({ tempFilePath }) => {
+          this.addBLECharValueChangeListener();
           that.resolve(tempFilePath).then(resolve).catch(reject);
         },
         fail: (res) => {
@@ -158,7 +162,6 @@ export class OTAUpgrade {
   normalUpgrade() {
     setTimeout(() => {
       BLE.writeATCmd(this.otaInfo, this.deviceId, this.fail.bind(this));
-      this.addBLECharValueChangeListener();
     }, 2600);
   }
 
@@ -236,6 +239,7 @@ export class OTAUpgrade {
   }
 
   addBLECharValueChangeListener() {
+    console.log('添加蓝牙特征值变化监听');
     const that = this;
     uni.notifyBLECharacteristicValueChange({
       deviceId: that.deviceId,
@@ -273,13 +277,19 @@ export class OTAUpgrade {
   }
 
   async doWithResponse(intArr) {
+    console.log('收到设备响应: ', intArr[2]);
     if (intArr[2] == 0x80) {
       let str = String.fromCharCode(...intArr.slice(4, -1));
+      console.log('doWithResponse otaStart1', str);
       if (str.indexOf(this.otaInfo) > -1) {
         this.finishedTimes = 0;
         this.transferFirmwareFile();
       }
-      if (str.indexOf(this.otaStart) > -1) {
+      if (str.indexOf(this.otaStart) > -1 || this.otaStarting) {
+        if (str.indexOf(this.otaStart) > -1) {
+          this.otaStarting = true;
+        }
+        console.log('doWithResponse otaStart2', str);
         if (str.toUpperCase().includes('ERROR')) {
           this.fail(str);
           return;
@@ -313,10 +323,12 @@ export class OTAUpgrade {
     if (timeFor51) {
       const pkg = [0x00];
       BLE.transferFirmwareFileCmd(this.deviceId, pkg, true, this.fail.bind(this));
+      console.log('[OTA]', '=== Send 51 ===', this.finishedTimes, this.totalTimes, pkg);
     } else {
       const pkg = this.fileHexArray.slice(this.finishedTimes * max, nextTime * max);
-      const index = Transfer.decimalToTwoByteHexArray(nextTime);
+      const index = Transfer.decimalToTwoByteHexArray(this.finishedTimes);
       BLE.transferFirmwareFileCmd(this.deviceId, index.concat(pkg), false, this.fail.bind(this));
+      console.log('[OTA]', `S50-${this.finishedTimes}/${this.totalTimes}`);
     }
     this.onProgress && this.onProgress({ type: 'upgrade', percent: Math.floor((this.finishedTimes * 100) / this.totalTimes) });
   }

package/src/core/Transfer.js

@@ -252,7 +252,7 @@ export const BLE = {
   readUUID: '0000FF01-0000-1000-8000-00805F9B34FB',
   TAG: '[BLE_OTA]',
   WRITE_DELAY: 25,
-  PACKAGE_MAX_LENGTH: 240,
+  PACKAGE_MAX_LENGTH: 237,
   // 分包发送
   sendMsgToKey(buffer, deviceId, fail) {
     const { isAndroid, isIOS } = getOS();

package/src/core/commonfun.js

@@ -34,7 +34,8 @@ export function getOS() {
   const os = uni.getSystemInfoSync()?.osName;
   return {
     isIOS: os == 'ios',
-    isAndroid: os == 'android',
+    isAndroid: os == 'android' || os == 'openharmonyos',
+    isHarmony: os === 'harmony' || os === 'openharmonyos',
   };
 }
 export function getPlatform() {

package/src/core/dataJson/baseParamsJson.js

@@ -3,38 +3,42 @@ import { func } from '@/uni_modules/uv-ui-tools/libs/function/test.js';
 import { funcJson } from './baseParamsJson';
  * 电池基础信息参数
  */
-export const batteryInfoJson = [{
-  key: 'barCode',
-  paramNo: 88,
-  paramLength: 32,
-  oldParamNo: '0xA2',
-}, {
-  key: 'manufacturer',
-  paramNo: 56,
-  oldParamNo: '0xA0',
-  paramLength: 32,
-}, {
-  key: 'producedDate',
-  paramNo: 5,
-  oldParamNo: '0x15',
-  paramLength: 2,
-},
-{
-  key: 'model',//电池型号
-  paramNo: 158,
-  oldParamNo: '',
-  paramLength: 24,
-}, {
-  key: 'bmsModel',
-  paramNo: 176,
-  oldParamNo: '',
-  paramLength: 16,
-}, {
-  key: 'bmsAddr',
-  paramNo: 170,
-  oldParamNo: '',
-  paramLength: 12,
-}]
+export const batteryInfoJson = (crsDivisor) => {
+  return [{
+    key: 'barCode',
+    paramNo: 88,
+    paramLength: 32,
+    oldParamNo: '0xA2',
+  }, {
+    key: 'manufacturer',
+    paramNo: 56,
+    oldParamNo: '0xA0',
+    paramLength: 32,
+  }, {
+    key: 'producedDate',
+    paramNo: 5,
+    oldParamNo: '0x15',
+    paramLength: 2,
+  },
+  {
+    key: 'model',//电池型号
+    paramNo: crsDivisor == 0.1 ? 158 : 316,
+    oldParamNo: '',
+    paramLength: 24,
+  }, {
+    key: 'bmsModel',
+    paramNo: crsDivisor == 0.1 ? 176 : 72,
+    oldParamNo: '',
+    paramLength: crsDivisor == 0.1 ? 16 : 32,
+  },
+    // {
+    // key: 'bmsAddr',
+    // paramNo: 170,
+    // oldParamNo: '',
+    // paramLength: 12,
+    // }
+  ]
+}
 /**
  * 电池容量信息参数
  */
@@ -43,16 +47,19 @@ export const capInfoJson = [{
   paramNo: 0,
   oldParamNo: '0x10',
   paramLength: 2,
+  divisor: 10
 }, {
   key: 'cycleCap',
   paramNo: 1,
   oldParamNo: '0x11',
   paramLength: 2,
+  divisor: 10
 }, {
   key: 'fullCap',
   paramNo: 112,
   oldParamNo: '',
   paramLength: 2,
+  divisor: 10
 }]
 /**
  * 电池电压保护参数
@@ -66,6 +73,7 @@ export const voltageInfoJson = [
     paramNo: 16,
     oldParamNo: "0x20",
     paramLength: 2,
+    divisor: 100
   },
   {
     key: "allOverpressureRecovery",
@@ -75,6 +83,7 @@ export const voltageInfoJson = [
     paramNo: 17,
     oldParamNo: "0x21",
     paramLength: 2,
+    divisor: 100
   },
   {
     key: "allLowvoltageProtect",
@@ -84,6 +93,7 @@ export const voltageInfoJson = [
     paramNo: 18,
     oldParamNo: "0x22",
     paramLength: 2,
+    divisor: 100
   },
   {
     key: "allLowvoltageRecover",
@@ -93,6 +103,7 @@ export const voltageInfoJson = [
     paramNo: 19,
     oldParamNo: "0x23",
     paramLength: 2,
+    divisor: 100
   },
   {
     key: "singleOvervoltageProtect",
@@ -102,6 +113,7 @@ export const voltageInfoJson = [
     paramNo: 20,
     oldParamNo: "0x24",
     paramLength: 2,
+    divisor: 1000
   },
   {
     key: "singleOverpressureRecovery",
@@ -111,6 +123,7 @@ export const voltageInfoJson = [
     paramNo: 21,
     oldParamNo: "0x25",
     paramLength: 2,
+    divisor: 1000
   },
   {
     key: "singleLowvoltageProtect",
@@ -120,6 +133,7 @@ export const voltageInfoJson = [
     paramNo: 22,
     oldParamNo: "0x26",
     paramLength: 2,
+    divisor: 1000
   },
   {
     key: "singleLowvoltageRecover",
@@ -129,6 +143,7 @@ export const voltageInfoJson = [
     paramNo: 23,
     oldParamNo: "0x27",
     paramLength: 2,
+    divisor: 1000
   },
   {
     key: "allLowvoltageDelay",
@@ -138,6 +153,7 @@ export const voltageInfoJson = [
     paramNo: 48,
     oldParamNo: "0x3C",
     paramLength: 2,
+    divisor: 1
   },
   {
     key: "allOverpressureDelay",
@@ -147,6 +163,7 @@ export const voltageInfoJson = [
     paramNo: 49,
     oldParamNo: "", // 0x3C 旧协议相同的只读一个
     paramLength: 2,
+    divisor: 1
   },
   {
     key: "singleLowvoltageDelayed",
@@ -156,6 +173,7 @@ export const voltageInfoJson = [
     paramNo: 50,
     oldParamNo: "0x3d",
     paramLength: 2,
+    divisor: 1
   },
   {
     key: "singleOverpressureDelay",
@@ -165,6 +183,7 @@ export const voltageInfoJson = [
     paramNo: 51,
     oldParamNo: "", // 0x3d 旧协议相同的只读一个
     paramLength: 2,
+    divisor: 1
   },
   {
     key: "hardwareOV",
@@ -174,6 +193,7 @@ export const voltageInfoJson = [
     paramNo: 38,
     oldParamNo: "0x36",
     paramLength: 2,
+    divisor: 1000
   },
   {
     key: "hardwareUV",
@@ -183,6 +203,7 @@ export const voltageInfoJson = [
     paramNo: 39,
     oldParamNo: "0x37",
     paramLength: 2,
+    divisor: 1000
   },
 ]
 export const currentInfoJson = [
@@ -194,6 +215,7 @@ export const currentInfoJson = [
     oldParamNo: "0x28",
     paramLength: 2,
     key: "occhg",
+    divisor: 100,
   },
   {
     value: "",
@@ -203,6 +225,7 @@ export const currentInfoJson = [
     oldParamNo: "0x29",
     paramLength: 2,
     key: "dischargeOvercurrentProtect",
+    divisor: 1000,
   },
   {
     value: "",
@@ -212,6 +235,7 @@ export const currentInfoJson = [
     oldParamNo: "0x3E",
     paramLength: 2,
     key: "chargeOvercurrentDelay",
+    divisor: 1,
   },
   {
     value: "",
@@ -221,6 +245,7 @@ export const currentInfoJson = [
     oldParamNo: "", // 0x3E 旧协议相同的只读一个
     paramLength: 2,
     key: "chargeOvercurrentRecoverDelay",
+    divisor: 1,
   },
 
   {
@@ -231,6 +256,7 @@ export const currentInfoJson = [
     oldParamNo: "0x3F",
     paramLength: 2,
     key: "dischargeOvercurrentDelay",
+    divisor: 1,
   },
   {
     value: "",
@@ -240,6 +266,7 @@ export const currentInfoJson = [
     oldParamNo: "", // 0x3F 旧协议相同的只读一个
     paramLength: 2,
     key: "dischargeOvercurrentRecoverDelay",
+    divisor: 1,
   },
 
   {
@@ -414,7 +441,27 @@ export const tempInfoJson = [
     oldParamNo: "", //0x3B
     paramLength: 2,
     key: "dischargingHightempDelay",
-  }
+  },
+  {
+    name: "",
+    value: "",
+    newValue: "",
+    unit: "℃",
+    paramNo: 202,
+    oldParamNo: "0x2E",
+    paramLength: 2,
+    key: "overtempProtect",
+  },
+  {
+    name: "",
+    value: "",
+    newValue: "",
+    unit: "℃",
+    paramNo: 203,
+    oldParamNo: "0x2F",
+    paramLength: 2,
+    key: "overtempRecover",
+  },
 ]
 export const equalizerFunJson = [
   {
@@ -447,6 +494,7 @@ export const capVolInfoJson = [
     paramLength: 2,
     isHidden: false,
     key: "fullVolt",
+    divisor: 1000,
   },
   {
     value: null,
@@ -457,6 +505,7 @@ export const capVolInfoJson = [
     paramLength: 2,
     isHidden: false,
     key: "emptyVolt",
+    divisor: 1000,
   },
   {
     name: "容量80%",
@@ -467,6 +516,7 @@ export const capVolInfoJson = [
     oldParamNo: "0x32",
     paramLength: 2,
     key: "voltage80p",
+    divisor: 1000,
   },
   {
     name: "容量60%",
@@ -477,6 +527,7 @@ export const capVolInfoJson = [
     oldParamNo: "0x33",
     paramLength: 2,
     key: "voltage60p",
+    divisor: 1000,
   },
   {
     name: "容量40%",
@@ -487,6 +538,7 @@ export const capVolInfoJson = [
     oldParamNo: "0x34",
     paramLength: 2,
     key: "voltage40p",
+    divisor: 1000,
   },
   {
     name: "容量20%",
@@ -497,6 +549,7 @@ export const capVolInfoJson = [
     oldParamNo: "0x35",
     paramLength: 2,
     key: "voltage20p",
+    divisor: 1000,
   },
   {
     name: "容量90%",
@@ -507,6 +560,7 @@ export const capVolInfoJson = [
     oldParamNo: "0x42",
     paramLength: 2,
     key: "voltage90p",
+    divisor: 1000,
   },
   {
     name: "容量70%",
@@ -517,6 +571,7 @@ export const capVolInfoJson = [
     oldParamNo: "0x43",
     paramLength: 2,
     key: "voltage70p",
+    divisor: 1000,
   },
   {
     name: "容量50%",
@@ -527,6 +582,7 @@ export const capVolInfoJson = [
     oldParamNo: "0x44",
     paramLength: 2,
     key: "voltage50p",
+    divisor: 1000,
   },
   {
     name: "容量30%",
@@ -537,6 +593,7 @@ export const capVolInfoJson = [
     oldParamNo: "0x45",
     paramLength: 2,
     key: "voltage30p",
+    divisor: 1000,
   },
   {
     name: "容量10%",
@@ -547,6 +604,7 @@ export const capVolInfoJson = [
     oldParamNo: "0x46",
     paramLength: 2,
     key: "voltage10p",
+    divisor: 1000,
   },
   {
     name: "容量100%",
@@ -557,6 +615,7 @@ export const capVolInfoJson = [
     oldParamNo: "0x47",
     paramLength: 2,
     key: "voltage100p",
+    divisor: 1000,
   },
 ]
 export const funcAndTempFuncJson = [{
@@ -685,6 +744,7 @@ export const systemJson = [
     paramLength: 2,
     isHidden: true,
     key: "serialNumber",
+    divisor: 1,
   },
   {
     // 循环次数
@@ -696,6 +756,7 @@ export const systemJson = [
     paramLength: 2,
     isHidden: true,
     key: "cycleCount",
+    divisor: 1,
   },
   {
     name: "检流阻值",
@@ -707,6 +768,7 @@ export const systemJson = [
     paramLength: 2,
     isHidden: false,
     key: "rsnsValue",
+    divisor: 1000,
   },
   {
     name: "串数设置",
@@ -718,6 +780,43 @@ export const systemJson = [
     paramLength: 2,
     isHidden: true,
     key: "strCount",
+    divisor: 1,
+  },
+  {
+    name: "自动关机", // 强制使用时间
+    value: "",
+    newValue: "",
+    unit: "",
+    paramNo: 191,
+    paramLength: 2,
+    notShow: false,
+    switch: true,
+    key: "param1911",
+    divisor: 1,
+  },
+  {
+    name: "低电保护功能", // 强制使用时间
+    value: "",
+    newValue: "",
+    unit: "",
+    paramNo: 198,
+    paramLength: 2,
+    notShow: false,
+    switch: true,
+    key: "param1981",
+    divisor: 1,
+  },
+  {
+    name: "UART协议设定", 
+    value: "",
+    newValue: "",
+    unit: "",
+    paramNo: 195,
+    paramLength: 2,
+    notShow: false,
+    key: "param1951",
+    divisor: 1,
+    method: true,
   },
 
   // {
@@ -729,6 +828,7 @@ export const systemJson = [
   //   paramLength: 2,
   //   isHidden: false,
   //   key: "identifyCurrent",
+  //   divisor: 1000,
   // },
   // {
   //   value: "",
@@ -739,6 +839,7 @@ export const systemJson = [
   //   paramLength: 2,
   //   isHidden: false,
   //   key: "sleepTime",
+  //   divisor: 1,
   // },
   // {
   //   value: "",
@@ -749,6 +850,7 @@ export const systemJson = [
   //   paramLength: 2,
   //   isHidden: false,
   //   key: "capacityInterval",
+  //   divisor: 1,
   // },
 
 ]

package/dist/cjs/core/BleCmdAnalysis.js

@@ -1 +0,0 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var BleDataProcess=require("./BleDataProcess.js"),commonfun=require("./commonfun.js");class BleCmdAnalysis extends BleDataProcess.default{static async _writeAsync(deviceId,value){return console.log("deviceId, value: ",deviceId,value),!(!deviceId||!value)&&new Promise(resolve=>{const characteristicId=this.UUID_WRITE,{isAndroid:isAndroid,isIOS:isIOS}=commonfun.getOS();console.log("isAndroid, isIOS: ",isAndroid,isIOS);const writeType=isAndroid?"writeNoResponse":"write";uni.writeBLECharacteristicValue({deviceId:deviceId,serviceId:this.serviceId,characteristicId:characteristicId,writeType:writeType,value:value,success:res=>{console.error("res: 写入成功",res),resolve(!0)},fail:e=>{console.error("写入失败",e),resolve(!1)}}),isIOS&&setTimeout(()=>resolve(!0),50)})}static async writeAsync(deviceId,value){return console.log("value: ",value),console.log("deviceId: ",deviceId),!(!deviceId||!value)&&new Promise(async resolve=>{const n=Math.ceil(value.byteLength/20);let res;for(let i=0;i<n;i++){const _value=value.slice(20*i,20*(i+1));if(console.log("分包写入_value: ",_value),await this.sleep(150),res=await this._writeAsync(deviceId,_value),console.log(`分包写入结果 ${i+1}/${n} : ${res}`),!res)return resolve(!1)}resolve(res)})}static async getData(deviceId,{command:command,commandVerifyHandler:commandVerifyHandler=hexArr=>({verified:!1,pkgLen:null}),pkgVerifyHandler:pkgVerifyHandler=pkg=>({verified:!1}),maxRetries:maxRetries=2,retryInterval:retryInterval=300},tag=""){if(!deviceId)throw new Error("deviceId is required");if(!command||command.length<=0)throw new Error("command is required");return new Promise((resolve,reject)=>{let isCompleted=!1,timeoutId=null,responsed=!1,len=null,pkg=[];const cmdContent=this.hexArr2ab(command),cleanup=()=>{isCompleted||(isCompleted=!0,clearTimeout(timeoutId),commonfun.eventBus.off("setBleChangedCharacteristicValue",dataHandler))},dataHandler=payload=>{if(!payload||payload.deviceId!==deviceId||!payload.value)return;const hexArr=this.ab2decimalArr(payload.value);if(console.warn(tag,"接收到数据:",this.hexArr2string(hexArr)),0!==hexArr.length){if(null===len){const{verified:verified,pkgLen:pkgLen}=commandVerifyHandler(hexArr);console.log("指令验证结果:",{verified:verified,pkgLen:pkgLen}),verified&&(len=pkgLen)}if(len){if(pkg=[...pkg,...hexArr],console.log("当前数据包:",pkg,`长度: ${pkg.length}/${len}`),pkg.length>=len){pkg=pkg.slice(0,len);const{verified:verified}=pkgVerifyHandler(pkg);console.log("数据包验证结果:",{verified:verified}),verified?(responsed=!0,cleanup(),resolve([...pkg])):(len=null,pkg=[])}}else pkg=[]}},writeToDevice=async(attempt=1)=>{try{console.warn(tag,`第${attempt}次写入指令:`,command.join("").replace(/0x/g,"").toUpperCase());const writeSucceed=await this.writeAsync(deviceId,cmdContent);if(console.warn(tag,`第${attempt}次写入结果:`,writeSucceed?"成功":"失败"),!writeSucceed)return void(attempt<maxRetries?setTimeout(()=>writeToDevice(attempt+1),retryInterval):(cleanup(),resolve(null)));await this.sleep(retryInterval),!responsed&&attempt<maxRetries?(console.log(tag,`未收到响应，准备第${attempt+1}次重试`),writeToDevice(attempt+1)):responsed||(console.warn(tag,`达到最大重试次数(${maxRetries})，未收到响应`),cleanup(),resolve(null))}catch(error){console.error(tag,"写入过程发生错误:",error),cleanup(),reject(error)}};timeoutId=setTimeout(()=>{console.warn(tag,"操作超时"),cleanup(),resolve(null)},(maxRetries+2)*retryInterval),commonfun.eventBus.on("setBleChangedCharacteristicValue",dataHandler),writeToDevice().catch(error=>{cleanup(),reject(error)})})}static async getDDA503Async(deviceId){const hex=await this.getData(deviceId,{command:["0xdd","0xa5","0x03","0x00","0xff","0xfd","0x77"],commandVerifyHandler:hexArr=>({verified:221==hexArr[0]&&3==hexArr[1],pkgLen:hexArr[3]+7}),pkgVerifyHandler:pkg=>{const len=pkg.length,[c1,c2]=this.generateCrcCheckSum(pkg.slice(2,len-3)),[_c1,_c2]=[pkg[len-3],pkg[len-2]];return{verified:c1==_c1&&c2==_c2}}},"DDA5_03");return hex?this.resolveDDA503(hex):null}static resolveDDA503(data){if(!data)return null;const dataStr=this.hexArr2string(data),content=data.slice(4,data.length-3),binArr=data[24].toString(2).padStart(8,"0").split("").reverse(),n=Number(binArr[7])?10:100,fet=data[24],chargeSwitch=1==fet||3==fet,dischargeSwitch=2==fet||3==fet,BMSVersion=this.decimalToHex(data[22]),totalVoltage=(((data[4]<<8)+(255&data[5]))/100).toFixed(2);let current=(data[6]<<8)+(255&data[7]);current=current>32768?(current-65536)/n:current/n;const electricity=Number(current.toFixed(2)),power=(parseFloat(totalVoltage)*electricity).toFixed(2),soc=data[23]??0,volumeHex=this.decimalToHex(data[8])+this.decimalToHex(data[9]),seriesNum=data[25]??0,surplusCapacity=Number((this.hexToDecimal(volumeHex)/n).toFixed(2)),normCapHex=this.decimalToHex(data[10])+this.decimalToHex(data[11]),normCap=Number((this.hexToDecimal(normCapHex)/n).toFixed(2)),humidityIndex=2*data[26]+27,humidity=data[humidityIndex],cycleHex=this.decimalToHex(data[12])+this.decimalToHex(data[13]),cycleIndex=this.hexToDecimal(cycleHex),fccHex=this.decimalToHex(data[humidityIndex+3])+this.decimalToHex(data[humidityIndex+4]),fullChargeCapacity=10*this.hexToDecimal(fccHex)/1e3,SOH=cycleIndex<=100?100:Math.min(100,fullChargeCapacity/normCap*100),isHeating=!!Number(binArr[4]);let heatingCurrent=0;if(isHeating){const i=humidityIndex+9;heatingCurrent=10*parseInt([data[i],data[i+1]].map(o=>o.toString(16)).join(""),16)}const isFactoryMode=!!Number(binArr[6]),equilibriumStatus=!(0===data[16]&&0===data[17]),protectStatus=!(0===data[20]&&0===data[21]),protectStateHex=this.decimalToHex(data[20])+this.decimalToHex(data[21]),protectState=this.hexToDecimal(protectStateHex);let protectStatusIndexs=[];for(let i=0;i<16;i++)protectState&1<<i&&protectStatusIndexs.push(i);const protectStatusIndex=protectStatusIndexs.join(","),ntcNums=255&data[26],temperaturesList=Array.from({length:ntcNums},(_,i)=>((256*(255&data[26+2*i+1])+(255&data[26+2*i+2])-2731)/10).toFixed(1)),fahTempList=[];return temperaturesList.forEach(el=>{const value=1.8*Number(el)+32;fahTempList.push(value.toFixed(1))}),{dataStr:dataStr,status:this.hex2string(data[2]),len:data[3],softwareV:this.hex2string(content[18]),chargeSwitch:chargeSwitch,dischargeSwitch:dischargeSwitch,BMSVersion:BMSVersion,totalVoltage:totalVoltage,electricity:electricity,power:power,soc:soc,surplusCapacity:surplusCapacity,normCap:normCap,humidity:humidity,cycleIndex:cycleIndex,fullChargeCapacity:fullChargeCapacity,SOH:SOH,isHeating:isHeating,heatingCurrent:heatingCurrent,isFactoryMode:isFactoryMode,equilibriumStatus:equilibriumStatus,protectStatus:protectStatus,protectStatusIndex:protectStatusIndex,ntcNums:ntcNums,temperaturesList:temperaturesList,fahTempList:fahTempList,fet:fet,seriesNum:seriesNum}}static getFFAA17Async(deviceId){return this.getData(deviceId,{command:["0xFF","0xAA","0x17","0x00","0x17"],commandVerifyHandler:hexArr=>({verified:255==hexArr[0]&&170==hexArr[1]&&23==hexArr[2],pkgLen:hexArr[3]+5}),pkgVerifyHandler:pkg=>{const _pkg=pkg.map(o=>this.hex2string(o)),len=pkg.length,[c1]=this.generateCheckSum(_pkg.slice(2,len-1));return{verified:c1==pkg[len-1]}}},"FFAA_17(获取随机数)")}static getFFAAKeyAsync(deviceId,code,content,type){const commandCode=[code],data=[...content],dataLength=[`0x${this.decimalToHex(data.length,2)}`],check=this.generateCheckSum([...commandCode,...dataLength,...data]),command=["0xff","0xaa",...commandCode,...dataLength,...data,...check];return console.log("command: ---------------",command),this.getData(deviceId,{command:command,commandVerifyHandler:hexArr=>({verified:255==hexArr[0]&&170==hexArr[1]&&hexArr[2]==this.hexToDecimal(code),pkgLen:hexArr[3]+5}),pkgVerifyHandler:pkg=>{const _pkg=pkg.map(o=>this.hex2string(o)),len=pkg.length,[c1]=this.generateCheckSum(_pkg.slice(2,len-1));return{verified:c1==pkg[len-1]}}},`FFAA_${code}(${type})`)}static resolveFFAAKey(data){if(!data)return null;const dataStr=this.hexArr2string(data),response=data[data.length-2];return{dataStr:dataStr,response:response,status:response}}static getBroadcastDataCmd(deviceId){return this.getFFAAKeyAsync(deviceId,"0x19",["0x01"],"广播数据")}static getDD5AE1Async(deviceId,value){const _command=["0xE1","0x02","0x00",value],checks=this.generateCrcCheckSum(_command),command=["0xDD","0x5A",..._command,...checks,"0x77"];return this.getData(deviceId,{command:command,commandVerifyHandler:hexArr=>({verified:221==hexArr[0]&&225==hexArr[1],pkgLen:hexArr[3]+7}),pkgVerifyHandler:pkg=>({verified:!0})},"DD5A_E1")}}exports.BleCmdAnalysis=BleCmdAnalysis,exports.default=BleCmdAnalysis;

package/dist/esm/core/BleCmdAnalysis.js

@@ -1 +0,0 @@
-import BleDataProcess from"./BleDataProcess.js";import{getOS,eventBus}from"./commonfun.js";class BleCmdAnalysis extends BleDataProcess{static async _writeAsync(deviceId,value){return console.log("deviceId, value: ",deviceId,value),!(!deviceId||!value)&&new Promise(resolve=>{const characteristicId=this.UUID_WRITE,{isAndroid:isAndroid,isIOS:isIOS}=getOS();console.log("isAndroid, isIOS: ",isAndroid,isIOS);const writeType=isAndroid?"writeNoResponse":"write";uni.writeBLECharacteristicValue({deviceId:deviceId,serviceId:this.serviceId,characteristicId:characteristicId,writeType:writeType,value:value,success:res=>{console.error("res: 写入成功",res),resolve(!0)},fail:e=>{console.error("写入失败",e),resolve(!1)}}),isIOS&&setTimeout(()=>resolve(!0),50)})}static async writeAsync(deviceId,value){return console.log("value: ",value),console.log("deviceId: ",deviceId),!(!deviceId||!value)&&new Promise(async resolve=>{const n=Math.ceil(value.byteLength/20);let res;for(let i=0;i<n;i++){const _value=value.slice(20*i,20*(i+1));if(console.log("分包写入_value: ",_value),await this.sleep(150),res=await this._writeAsync(deviceId,_value),console.log(`分包写入结果 ${i+1}/${n} : ${res}`),!res)return resolve(!1)}resolve(res)})}static async getData(deviceId,{command:command,commandVerifyHandler:commandVerifyHandler=hexArr=>({verified:!1,pkgLen:null}),pkgVerifyHandler:pkgVerifyHandler=pkg=>({verified:!1}),maxRetries:maxRetries=2,retryInterval:retryInterval=300},tag=""){if(!deviceId)throw new Error("deviceId is required");if(!command||command.length<=0)throw new Error("command is required");return new Promise((resolve,reject)=>{let isCompleted=!1,timeoutId=null,responsed=!1,len=null,pkg=[];const cmdContent=this.hexArr2ab(command),cleanup=()=>{isCompleted||(isCompleted=!0,clearTimeout(timeoutId),eventBus.off("setBleChangedCharacteristicValue",dataHandler))},dataHandler=payload=>{if(!payload||payload.deviceId!==deviceId||!payload.value)return;const hexArr=this.ab2decimalArr(payload.value);if(console.warn(tag,"接收到数据:",this.hexArr2string(hexArr)),0!==hexArr.length){if(null===len){const{verified:verified,pkgLen:pkgLen}=commandVerifyHandler(hexArr);console.log("指令验证结果:",{verified:verified,pkgLen:pkgLen}),verified&&(len=pkgLen)}if(len){if(pkg=[...pkg,...hexArr],console.log("当前数据包:",pkg,`长度: ${pkg.length}/${len}`),pkg.length>=len){pkg=pkg.slice(0,len);const{verified:verified}=pkgVerifyHandler(pkg);console.log("数据包验证结果:",{verified:verified}),verified?(responsed=!0,cleanup(),resolve([...pkg])):(len=null,pkg=[])}}else pkg=[]}},writeToDevice=async(attempt=1)=>{try{console.warn(tag,`第${attempt}次写入指令:`,command.join("").replace(/0x/g,"").toUpperCase());const writeSucceed=await this.writeAsync(deviceId,cmdContent);if(console.warn(tag,`第${attempt}次写入结果:`,writeSucceed?"成功":"失败"),!writeSucceed)return void(attempt<maxRetries?setTimeout(()=>writeToDevice(attempt+1),retryInterval):(cleanup(),resolve(null)));await this.sleep(retryInterval),!responsed&&attempt<maxRetries?(console.log(tag,`未收到响应，准备第${attempt+1}次重试`),writeToDevice(attempt+1)):responsed||(console.warn(tag,`达到最大重试次数(${maxRetries})，未收到响应`),cleanup(),resolve(null))}catch(error){console.error(tag,"写入过程发生错误:",error),cleanup(),reject(error)}};timeoutId=setTimeout(()=>{console.warn(tag,"操作超时"),cleanup(),resolve(null)},(maxRetries+2)*retryInterval),eventBus.on("setBleChangedCharacteristicValue",dataHandler),writeToDevice().catch(error=>{cleanup(),reject(error)})})}static async getDDA503Async(deviceId){const hex=await this.getData(deviceId,{command:["0xdd","0xa5","0x03","0x00","0xff","0xfd","0x77"],commandVerifyHandler:hexArr=>({verified:221==hexArr[0]&&3==hexArr[1],pkgLen:hexArr[3]+7}),pkgVerifyHandler:pkg=>{const len=pkg.length,[c1,c2]=this.generateCrcCheckSum(pkg.slice(2,len-3)),[_c1,_c2]=[pkg[len-3],pkg[len-2]];return{verified:c1==_c1&&c2==_c2}}},"DDA5_03");return hex?this.resolveDDA503(hex):null}static resolveDDA503(data){if(!data)return null;const dataStr=this.hexArr2string(data),content=data.slice(4,data.length-3),binArr=data[24].toString(2).padStart(8,"0").split("").reverse(),n=Number(binArr[7])?10:100,fet=data[24],chargeSwitch=1==fet||3==fet,dischargeSwitch=2==fet||3==fet,BMSVersion=this.decimalToHex(data[22]),totalVoltage=(((data[4]<<8)+(255&data[5]))/100).toFixed(2);let current=(data[6]<<8)+(255&data[7]);current=current>32768?(current-65536)/n:current/n;const electricity=Number(current.toFixed(2)),power=(parseFloat(totalVoltage)*electricity).toFixed(2),soc=data[23]??0,volumeHex=this.decimalToHex(data[8])+this.decimalToHex(data[9]),seriesNum=data[25]??0,surplusCapacity=Number((this.hexToDecimal(volumeHex)/n).toFixed(2)),normCapHex=this.decimalToHex(data[10])+this.decimalToHex(data[11]),normCap=Number((this.hexToDecimal(normCapHex)/n).toFixed(2)),humidityIndex=2*data[26]+27,humidity=data[humidityIndex],cycleHex=this.decimalToHex(data[12])+this.decimalToHex(data[13]),cycleIndex=this.hexToDecimal(cycleHex),fccHex=this.decimalToHex(data[humidityIndex+3])+this.decimalToHex(data[humidityIndex+4]),fullChargeCapacity=10*this.hexToDecimal(fccHex)/1e3,SOH=cycleIndex<=100?100:Math.min(100,fullChargeCapacity/normCap*100),isHeating=!!Number(binArr[4]);let heatingCurrent=0;if(isHeating){const i=humidityIndex+9;heatingCurrent=10*parseInt([data[i],data[i+1]].map(o=>o.toString(16)).join(""),16)}const isFactoryMode=!!Number(binArr[6]),equilibriumStatus=!(0===data[16]&&0===data[17]),protectStatus=!(0===data[20]&&0===data[21]),protectStateHex=this.decimalToHex(data[20])+this.decimalToHex(data[21]),protectState=this.hexToDecimal(protectStateHex);let protectStatusIndexs=[];for(let i=0;i<16;i++)protectState&1<<i&&protectStatusIndexs.push(i);const protectStatusIndex=protectStatusIndexs.join(","),ntcNums=255&data[26],temperaturesList=Array.from({length:ntcNums},(_,i)=>((256*(255&data[26+2*i+1])+(255&data[26+2*i+2])-2731)/10).toFixed(1)),fahTempList=[];return temperaturesList.forEach(el=>{const value=1.8*Number(el)+32;fahTempList.push(value.toFixed(1))}),{dataStr:dataStr,status:this.hex2string(data[2]),len:data[3],softwareV:this.hex2string(content[18]),chargeSwitch:chargeSwitch,dischargeSwitch:dischargeSwitch,BMSVersion:BMSVersion,totalVoltage:totalVoltage,electricity:electricity,power:power,soc:soc,surplusCapacity:surplusCapacity,normCap:normCap,humidity:humidity,cycleIndex:cycleIndex,fullChargeCapacity:fullChargeCapacity,SOH:SOH,isHeating:isHeating,heatingCurrent:heatingCurrent,isFactoryMode:isFactoryMode,equilibriumStatus:equilibriumStatus,protectStatus:protectStatus,protectStatusIndex:protectStatusIndex,ntcNums:ntcNums,temperaturesList:temperaturesList,fahTempList:fahTempList,fet:fet,seriesNum:seriesNum}}static getFFAA17Async(deviceId){return this.getData(deviceId,{command:["0xFF","0xAA","0x17","0x00","0x17"],commandVerifyHandler:hexArr=>({verified:255==hexArr[0]&&170==hexArr[1]&&23==hexArr[2],pkgLen:hexArr[3]+5}),pkgVerifyHandler:pkg=>{const _pkg=pkg.map(o=>this.hex2string(o)),len=pkg.length,[c1]=this.generateCheckSum(_pkg.slice(2,len-1));return{verified:c1==pkg[len-1]}}},"FFAA_17(获取随机数)")}static getFFAAKeyAsync(deviceId,code,content,type){const commandCode=[code],data=[...content],dataLength=[`0x${this.decimalToHex(data.length,2)}`],check=this.generateCheckSum([...commandCode,...dataLength,...data]),command=["0xff","0xaa",...commandCode,...dataLength,...data,...check];return console.log("command: ---------------",command),this.getData(deviceId,{command:command,commandVerifyHandler:hexArr=>({verified:255==hexArr[0]&&170==hexArr[1]&&hexArr[2]==this.hexToDecimal(code),pkgLen:hexArr[3]+5}),pkgVerifyHandler:pkg=>{const _pkg=pkg.map(o=>this.hex2string(o)),len=pkg.length,[c1]=this.generateCheckSum(_pkg.slice(2,len-1));return{verified:c1==pkg[len-1]}}},`FFAA_${code}(${type})`)}static resolveFFAAKey(data){if(!data)return null;const dataStr=this.hexArr2string(data),response=data[data.length-2];return{dataStr:dataStr,response:response,status:response}}static getBroadcastDataCmd(deviceId){return this.getFFAAKeyAsync(deviceId,"0x19",["0x01"],"广播数据")}static getDD5AE1Async(deviceId,value){const _command=["0xE1","0x02","0x00",value],checks=this.generateCrcCheckSum(_command),command=["0xDD","0x5A",..._command,...checks,"0x77"];return this.getData(deviceId,{command:command,commandVerifyHandler:hexArr=>({verified:221==hexArr[0]&&225==hexArr[1],pkgLen:hexArr[3]+7}),pkgVerifyHandler:pkg=>({verified:!0})},"DD5A_E1")}}export{BleCmdAnalysis,BleCmdAnalysis as default};