@jiabaida/tools 1.0.3 → 1.0.7

package/src/core/BleCmdAnalysis/BleCmdDD.js

@@ -1,4 +1,4 @@
-import { decimalToHex, generateCrc16modbusCheck, generateCrcCheckSum, hex2string, hexArr2Assic, hexArr2string, hexToDecimal, sleep, stringToTwoHexArray } from '../BleDataProcess';
+import { decimalToHex, fromBCD, generateCrc16modbusCheck, generateCrcCheckSum, hex2string, hexArr2Assic, hexArr2string, hexToDecimal, isWithin30Minutes, sleep, stringToTwoHexArray, toBCD } from '../BleDataProcess';
 import { getData } from './BleCmdAnalysis.js';
 import { getFFAA80Async, resolveFFAA80 } from './BleCmdFFAA.js';
 
@@ -244,9 +244,21 @@ export const resolveDDA503 = (data) => {
 
   const binArr = data[24].toString(2).padStart(8, '0').split('').reverse();
 
-  const balances = data.slice(16, 20).flatMap((byte) =>
-    byte.toString(2).padStart(8, "0").split("").reverse()
-  );
+
+  // 获取16-19索引的4个字节
+  const BC1 = (data[16] << 8 | data[17])
+    .toString(2)
+    .padStart(16, "0")
+    .split("")
+    .reverse();
+  console.log('BC1: ', BC1);
+  const BC2 = (data[18] << 8 | data[19])
+    .toString(2)
+    .padStart(16, "0")
+    .split("")
+    .reverse();
+  const BC = BC1.concat(BC2);
+  const balances = BC;
   console.warn("BC: ---------------", balances);
   const fet = data[24];
   /**充电开关 */
@@ -1332,4 +1344,119 @@ export const resetCapacity = (deviceId) => {
     },
     'DD5A_0A'
   );
-}
+}
+
+/**读取BMS系统时间*/
+export const getDDA506Async = async (deviceId) => {
+  const command = ['0xdd', '0xa5', '0x06', '0x00', '0xff', '0xfa', '0x77'];
+  const response = '';
+  return getData(
+    deviceId,
+    {
+      command,
+      commandVerifyHandler: (hexArr) => ({ verified: hexArr[0] == 0xdd && hexArr[1] == 0x06, pkgLen: hexArr[3] + 7 }),
+      pkgVerifyHandler: (pkg) => {
+        const len = pkg.length;
+        const [c1, c2] = generateCrcCheckSum(pkg.slice(2, len - 3));
+        const [_c1, _c2] = [pkg[len - 3], pkg[len - 2]];
+        return { verified: c1 == _c1 && c2 == _c2 };
+      },
+    },
+    'DDA5_06'
+  );
+}
+
+/**解析BMS系统时间*/
+export const resolveDDA506 = (data) => {
+  if (!data) return null;
+  if (data[1] == 6 && data[2] == 0 && data[3] == 6) {
+    //解析各字段       
+    const seconds = fromBCD(data[4]);
+    const minutes = fromBCD(data[5]);
+    const hours = fromBCD(data[6]);
+    const day = fromBCD(data[7]);
+    const month = fromBCD(data[8]);
+    const year = 2000 + fromBCD(data[9]);
+    const timeStr = `${year}-${String(month).padStart(2, 0)}-${String(day).padStart(2, 0)} ${String(hours).padStart(2, 0)}:${String(minutes).padStart(2, 0)}:${String(seconds).padStart(2, 0)}`;
+    console.log('timeStr: ', timeStr, isWithin30Minutes(timeStr));
+    return isWithin30Minutes(timeStr);
+  } else {
+    return false;
+  }
+}
+
+/**设置BMS系统时间*/
+  //verified: hexArr[0] ->响应指令头   hexArr[1] ->指令码 pkgLen -> 响应指令长度
+  export const setDD5AE3sync = async (deviceId) => {
+    const header = ['0xDD', '0x5A']
+    const now = new Date();
+    const year = now.getFullYear();
+    const month = now.getMonth() + 1;
+    const day = now.getDate();
+    const hours = now.getHours();
+    const minutes = now.getMinutes();
+    const seconds = now.getSeconds();
+
+    const values = [toBCD(seconds), toBCD(minutes), toBCD(hours) | 0x80, toBCD(day), toBCD(month), toBCD(year - 2000)].map(b => '0x' + b.toString(16).padStart(2, '0'));
+    const content = ['0xE3', '0x07', '0x06', ...values];
+    const checks = generateCrcCheckSum(content);
+    const command = [...header, ...content, ...checks, '0x77'];
+    console.log('command: ', command);
+    return getData(
+      deviceId,
+      {
+        command,
+        commandVerifyHandler: (hexArr) => ({ verified: hexArr[0] == 0xdd && hexArr[1] == 0xe3, pkgLen: hexArr[3] + 7 }),
+        pkgVerifyHandler: (pkg) => {
+          return { verified: true };
+        },
+      },
+      'SET_DDA5_E3'
+    );
+}
+  
+  /** 读取BMS运行时长 */
+  export const getDDA4F0Async = async (deviceId) => {
+    // 指令：DD A4 F0 00 FF 0B 77
+    const command = ['0xDD', '0xA4', '0xF0', '0x00'];
+    const checks = generateCrcCheckSum(command.slice(2)); // 只对命令码和长度做校验
+    const fullCommand = [...command, ...checks, '0x77'];
+
+    return getData(
+      deviceId,
+      {
+        command: fullCommand,
+        commandVerifyHandler: (hexArr) => ({
+          verified: hexArr[0] == 0xDD && hexArr[1] == 0xF0,
+          pkgLen: hexArr[3] + 7
+        }),
+        pkgVerifyHandler: (pkg) => {
+          const len = pkg.length;
+          const [c1, c2] = generateCrcCheckSum(pkg.slice(2, len - 3));
+          const [_c1, _c2] = [pkg[len - 3], pkg[len - 2]];
+          return { verified: c1 == _c1 && c2 == _c2 };
+        },
+      },
+      'DDA4_F0'
+    );
+}
+  
+  /** 解析BMS运行时长 */
+  export const resolveDDA4F0 = (data) => {
+    if (!data) return null;
+    // 响应格式：DD F0 状态 长度 运行时长[4字节] 校验 0x77
+    if (data[1] == 0xF0 && data[3] == 4) {
+      // 运行时长为4字节，单位一般为秒（具体以协议为准）
+      const runTime =
+        (data[4] << 24) |
+        (data[5] << 16) |
+        (data[6] << 8) |
+        data[7];
+      return {
+        runTime, // 运行时长（秒）
+        runTimeHour: (runTime / 3600).toFixed(2), // 转为小时
+        raw: hexArr2string(data)
+      };
+    }
+    return null;
+  }

package/src/core/BleCmdAnalysis/BleCmdDDA4.js

@@ -1,9 +1,9 @@
-import { decimalToHex, generateCheckSum, generateCrcCheckSum, hex2string, hexArr2string, hexToDecimal } from '../BleDataProcess';
+import { decimalToHex, generateCrcCheckSum, hex2string, hexArr2string, hexToDecimal } from '../BleDataProcess';
 import { getData } from './BleCmdAnalysis.js';
 
 export const getDDA420Async = async (deviceId) => {
     const _command = ['0x20', '0x00'];
-    const checks = generateCheckSum(_command);
+    const checks = generateCrcCheckSum(_command);
     const command = ['0xdd', '0xa4', ..._command, ...checks, '0x77'];
 
     const response = 'DD03002313E10000199D27100000310F00000000000014410310060BB60BC60BC10BBA0BBD0BC1F89777';
@@ -15,7 +15,7 @@ export const getDDA420Async = async (deviceId) => {
         commandVerifyHandler: (hexArr) => ({ verified: hexArr[0] == 0xdd && hexArr[1] == 0x20, pkgLen: hexArr[3] + 7 }),
         pkgVerifyHandler: (pkg) => {
           const len = pkg.length;
-          const [c1, c2] = generateCheckSum(pkg.slice(2, len - 3));
+          const [c1, c2] = generateCrcCheckSum(pkg.slice(2, len - 3));
           const [_c1, _c2] = [pkg[len - 3], pkg[len - 2]];
           return { verified: c1 == _c1 && c2 == _c2 };
         },
@@ -29,7 +29,7 @@ export const getDDA420Async = async (deviceId) => {
    * @param {number[]} data DDA420十六进制数据数组
    * @returns {Object} 解析后的充电器工作信息对象
    * @returns {string} dataStr 十六进制数据数组转换后的字符串
-   * @returns {number} workStatus 工作状态：1=待机，2=就绪，3=激活电池中，4=通讯充电中，5=调试充电中，6=盲充中，7=结束充电
+   * @returns {number} workStatus 工作状态：1=待机，2=就绪，3=激活电池中，4=通讯充电中，5=调试充电中，6=盲充中，7=结束充电 8=停止充电（异常） 9=充电比对中 10=校准中 11=老化中 12=握手充电中 13=小电流充电中
    * @returns {number} chargeStatus 充电状态：1=恒流，2=恒压，3=涓流
    * @returns {number} chargeVoltage 充电电压，单位毫伏(mV)
    * @returns {number} chargeElectricity 充电电流，单位毫安(mA)
@@ -51,7 +51,7 @@ export const getDDA420Async = async (deviceId) => {
    * @returns {number} ratedPower 充电器额定功率，单位瓦特(W)
    * @returns {number} inputVoltage 输入电压，单位毫伏(mV)
    */
-  export const resolveDDA420 = async (data) => {
+  export const resolveDDA420 = (data) => {
     if (!data) return null;
     const dataStr = hexArr2string(data);
     let n = 4; // 起始偏移
@@ -251,7 +251,7 @@ export const getDDA420Async = async (deviceId) => {
    * @param {number[]} data DDA421十六进制数据数组
    * @returns {Object} 解析后的充电电池信息对象
    */
-  export const resolveDDA421 = async (data) => {
+  export const resolveDDA421 = (data) => {
     if (!data) return null;
     const dataStr = hexArr2string(data);
     // 电池电压 4BYTE [4,5,6,7]
@@ -335,7 +335,7 @@ export const getDDA420Async = async (deviceId) => {
       'DDA425'
     );
   }
-  export const resolveDDA425 = async (data) => {
+  export const resolveDDA425 = (data) => {
     if (!data) return null;
     const dataStr = hexArr2string(data);
     return {
@@ -384,7 +384,7 @@ export const getDDA420Async = async (deviceId) => {
    * @param {number[]} data DDA422响应数据
    * @returns {Object} 解析结果
    */
-  export const resolveDDA422 = async (data) => {
+  export const resolveDDA422 = (data) => {
     if (!data) return null;
     const dataStr = hexArr2string(data);
     // 起始地址 2BYTE [4,5]
@@ -447,14 +447,77 @@ export const getDDA420Async = async (deviceId) => {
       'DDA423'
     );
   }
-  export const resolveDDA423 = async (data) => {
+  export const resolveDDA423 = (data) => {
     if (!data) return null;
     const dataStr = hexArr2string(data);
     return {
       dataStr,
       status: hex2string(data[2])
     };
+}
+  /** 充电器充电测试 26 指令
+   * 发送: DD A4 26 09 <测试模式1B> <输出电压4B mV> <输出电流4B mA> CRC_H CRC_L 77
+   * 响应: DD 26 <状态位1B> 00 CRC_H CRC_L 77  (或: DD 26 <状态位> 00 ...)
+   * @param {string} deviceId 设备ID
+   * @param {number} testMode 测试模式 1=调试模式 2=老化模式
+   * @param {number} outputVoltage 输出目标电压(mV) 0~4294967295
+   * @param {number} outputCurrent 输出目标电流(mA) 0~4294967295
+   * @returns {Promise<number[]|null>} 原始响应数据数组; 失败返回 null
+   */
+  export const getDDA426Async = async (deviceId, testMode = 0, outputVoltage = 0, outputCurrent = 0) => {
+    // 保护参数范围（简单防御，防止生成溢出字节/异常写入）
+    const clamp32 = (v) => {
+      v = Number(v) || 0; if (v < 0) v = 0; if (v > 0xFFFFFFFF) v = 0xFFFFFFFF; return v;
+    };
+    testMode = testMode === 2 ? 2 : 0; // 只允许 0 / 2
+    outputVoltage = clamp32(outputVoltage);
+    outputCurrent = clamp32(outputCurrent);
+
+    // 转 4 字节 (大端) 十六进制 -> 数组
+    const to4Bytes = (val) => {
+      const hex = commonfun.decimalToHex(val, 8); // 8位十六进制字符串
+      return [0, 2, 4, 6].map(i => parseInt(hex.slice(i, i + 2), 16));
+    };
+    const voltageArr = to4Bytes(outputVoltage);
+    const currentArr = to4Bytes(outputCurrent);
+
+    // 长度 = 1(模式) +4(电压)+4(电流) = 9
+    const lengthHex = commonfun.decimalToHex(9, 2); // '09'
+    const _command = ['0x26', `0x${lengthHex}`, testMode & 0xFF, ...voltageArr, ...currentArr].map(o => typeof o === 'number' ? `0x${('00' + o.toString(16)).slice(-2)}` : o);
+    // 去掉 0x 前缀转成数值数组生成 CRC
+    const _commandNums = _command.map(h => parseInt(h, 16));
+    const checks = generateCrcCheckSum(_commandNums);
+    const command = ['0xDD', '0xA4', ..._command, ...checks, '0x77'];
+
+    return getData(
+      deviceId,
+      {
+        command,
+        commandVerifyHandler: (hexArr) => ({ verified: hexArr[0] == 0xdd && hexArr[1] == 0x26, pkgLen: hexArr[3] + 7 }),
+        pkgVerifyHandler: (pkg) => {
+          // const len = pkg.length;
+          // const [c1, c2] = this.generateCrcCheckSum(pkg.slice(2, len - 3));
+          // const [_c1, _c2] = [pkg[len - 3], pkg[len - 2]];
+          // return { verified: c1 == _c1 && c2 == _c2 };
+          return { verified: true }
+        },
+      },
+      'DDA426(充电测试)',
+      3000
+    );
+}
+  
+  /** 解析充电器充电测试 26 指令响应
+   * @param {number[]} data
+   * @returns {{dataStr:string,status:string}|null}
+   */
+
+  export const resolveDDA426 = (data) => {
+    if (!data) return null;
+    const dataStr = hexArr2string(data);
+    return { dataStr, status: hex2string(data[2]) };
   }
+  
   /** 查询充电历史数据27指令
    * @param {*} deviceId
    * @param {number} startTime 充电起始时间（秒，4字节）
@@ -509,7 +572,7 @@ export const getDDA420Async = async (deviceId) => {
    * @param {number[]} data DDA427响应数据
    * @returns {Object} 解析结果
    */
-  export const resolveDDA427 = async (data) => {
+  export const resolveDDA427 = (data) => {
     if (!data) return null;
     const dataStr = hexArr2string(data);
     // 充电起始时间 4BYTE [4,5,6,7]
@@ -605,7 +668,7 @@ export const getDDA420Async = async (deviceId) => {
       'DDA429'
     );
   }
-  export const resolveDDA429 = async (data) => {
+  export const resolveDDA429 = (data) => {
     if (!data) return null;
     const dataStr = hexArr2string(data);
     let n = 4; // 起始偏移

package/src/core/BleCmdAnalysis/index.js

@@ -1,7 +1,8 @@
+export * from './BaseParamProtocol';
 export * from './BleCmdAnalysis';
-export * from './BleCmdFFAA';
 export * from './BleCmdDD';
-export * from './readAndSetParam'
-export * from './BaseParamProtocol'
-export * from './BleCmdHVES'
-export * from './ESHostProtocol'
+export * from './BleCmdDDA4';
+export * from './BleCmdFFAA';
+export * from './BleCmdHVES';
+export * from './ESHostProtocol';
+export * from './readAndSetParam';

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() {