@jiabaida/tools 1.0.3 → 1.0.6

package/src/core/BleApiManager.js

@@ -4,11 +4,15 @@ import { eventBus, getOS } from './commonfun'; // 导入eventBus
 const serviceId = '0000FF00-0000-1000-8000-00805F9B34FB';
 const UUID_READ = '0000FF01-0000-1000-8000-00805F9B34FB';
 const UUID_WRITE = '0000FF02-0000-1000-8000-00805F9B34FB';
-
+const { isAndroid, isIOS } = getOS();
 const bluetoothAdapterState = ref({
   available: false,
   discovering: false,
 });
+
+
+export var isInit = false;
+
 // #region 处理广播的设备信息
 /**
  * 处理广播的设备信息
@@ -34,7 +38,13 @@ const enhanceDevice = (device) => {
     const socHex = advHex.slice(16, 18);
     const soc = socHex || socHex == 0 ? hexToDecimal(socHex) : '';
     const productType = advHex.slice(18, 20);
-    const protocolVersion = advHex.slice(20, 22);
+    let protocolVersion = advHex.slice(20, 22);
+    if (protocolVersion) {
+        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) : '';
@@ -46,82 +56,106 @@ const enhanceDevice = (device) => {
   }
   return device;
 }
-// #region 初始化蓝牙
-/** 初始化蓝牙 */
-export const initBle = async () => {
-  const checkBluetoothStatus = async () => {
-    return new Promise((resolve, reject) => {
-      uni.openBluetoothAdapter({
-        success: async (res) => {
-          console.log('openBluetoothAdapter success', res);
-          resolve(res);
-          try {
-            // await startDevicesDiscovery(false);
-            // stopBluetoothDevicesDiscovery();
-            onBluetoothDeviceFound();
-            onBLECharacteristicValueChange();
-            onBLEConnectionStateChange();
-            onBluetoothAdapterStateChange()
-          } catch (error) {
-            console.log('error: ', error);
-            reject(error);
-          }
-        },
-        fail: (err) => {
-          console.log('openBluetoothAdapter fail', err);
-          reject(err);
-        },
-      });
-    });
-  };
-  const checkLocationStatus = async () => {
-    // 创建超时Promise
-    const timeoutPromise = new Promise((resolve, reject) => {
-      setTimeout(() => {
-        reject(new Error('网络信号差或连接异常，请检查网络情况'));
-      }, 10000); // 10秒超时
+
+/**
+ * 状态码：
+ * 101：网络信号差或连接异常，请检查网络情况 --- 打开定位开关
+ * 102：当前手机蓝牙不可用，请检查手机蓝牙状态 --- 打开蓝牙开关 openSystemBluetoothSetting
+ * 103：请授权小程序位置信息权限, 并重启小程序。--- 打开小程序设置页面 openSetting
+ * 104：请授权微信位置信息权限, 并重启小程序。 --- 打开手机内微信权限设置页面 openAppAuthorizeSetting
+ * 105：请授权微信位置信息和蓝牙权限 --- 打开手机内微信权限设置页面 openAppAuthorizeSetting
+ * 106：请授权蓝牙和位置权限，并重启小程序 --- 打开小程序设置页面 openSetting
+ */
+export const checkBluetoothStatus = async (successCallback = () => {}) => {
+  return new Promise((resolve, reject) => {
+    uni.openBluetoothAdapter({
+      success: async (res) => {
+        if (successCallback) {
+          successCallback(res);
+        }
+        resolve(res);
+      },
+      fail: (err) => {
+        console.log('openBluetoothAdapter fail4-----', err);
+        if (err && err?.errno == 3) {
+          reject({ code: 105, message: '请授权微信位置信息和蓝牙权限' });
+        }
+        if (err && err?.errno == 103) {
+          reject({ code: 106, message: '请授权蓝牙和位置权限，并重启小程序' });
+        }
+        reject({ code: 102, message: '当前手机蓝牙不可用，请检查手机蓝牙状态' });
+      },
     });
-    // 创建位置获取Promise
-    const locationPromise = new Promise((resolve, reject) => {
-      uni.getLocation({
-        type: 'wgs84',
-        success: (res) => {
-          console.log('位置信息-----------', res);
-          resolve(res);
-        },
-        fail: (err) => {
-          console.log('位置信息err', err);
-          reject(err);
-        },
-      });
+  });
+}
+
+export const checkLocationStatus = async (successCallback = () => {}) => { 
+  // 创建超时Promise
+  const timeoutPromise = new Promise((resolve, reject) => {
+    setTimeout(() => {
+      reject({ code: 101, message: '网络信号差或连接异常，请检查网络情况' });
+    }, 10000); // 10秒超时
+  });
+  // 创建位置获取Promise
+  const locationPromise = new Promise((resolve, reject) => {
+    uni.getLocation({
+      type: 'wgs84',
+      success: (res) => {
+        console.log('位置信息-----------', res);
+        resolve(res);
+      },
+      fail: (err) => {
+        console.log('位置信息err', err);
+        if (err && err?.errno == 103) {
+          reject({ code: 103, message: '请授权小程序位置信息权限, 并重启小程序。' });
+        }
+        if (err && err?.errCode == 2) {
+          reject({ code: 101, message: '网络信号差或连接异常，请检查网络情况' });
+        }
+        reject({ code: 104, message: '请授权微信位置信息权限, 并重启小程序。' });
+      },
     });
-    // 使用Promise.race实现超时控制
-    Promise.race([locationPromise, timeoutPromise])
-      .then((res) => {
-        // 成功获取位置信息
-        checkBluetoothStatus();
-      })
-      .catch((err) => {
-        console.log('位置获取失败或超时:', err);
-        Promise.reject({
-          code: 1,
-          // message: '请检查手机位置是否开启',
-        });
-      });
-  };
+  });
+  // 使用Promise.race实现超时控制
+  return Promise.race([locationPromise, timeoutPromise])
+    .then(async (res) => {
+      // 成功获取位置信息
+      return await checkBluetoothStatus(successCallback);
+    })
+}
+
+export const getBluetoothPermission = async (successCallback = () => {}) => {
   try {
-    const { isAndroid } = getOS();
     if (isAndroid) {
-      checkLocationStatus();
+      return await checkLocationStatus(successCallback);
     } else {
-      checkBluetoothStatus();
+      return await checkBluetoothStatus(successCallback);
     }
   } catch (error) {
     console.error('初始化蓝牙失败:', error);
-    Promise.reject({
-      code: error.code || error.errCode || -1,
-    });
+    throw (error);
   }
+}
+
+// #region 初始化蓝牙
+/** 初始化蓝牙
+ * 错误码：
+ * 101：网络信号差或连接异常，请检查网络情况
+ * 102：当前手机蓝牙不可用，请检查手机蓝牙状态
+ */
+export const initBle = async () => {
+  const initBluetoothSuccessCb = () => {
+    try {
+      onBluetoothDeviceFound();
+      onBLECharacteristicValueChange();
+      onBLEConnectionStateChange();
+      onBluetoothAdapterStateChange()
+      isInit = true;
+    } catch (error) { 
+      throw error;
+    }
+  }
+  return await getBluetoothPermission(initBluetoothSuccessCb);
 };
 // #region 获取蓝牙适配器状态
 /** 获取蓝牙适配器状态 */
@@ -171,6 +205,10 @@ export const startDevicesDiscovery = async (allowDuplicatesKey = true) => {
 // #region 停止搜索蓝牙设备
 /**停止搜索蓝牙设备 */
 export const stopBluetoothDevicesDiscovery = async () => {
+  bluetoothAdapterState.value = {
+    available: bluetoothAdapterState.value.available,
+    discovering: false,
+  }
   return new Promise((resolve, reject) => {
     uni.stopBluetoothDevicesDiscovery({
       success: (res) => {
@@ -435,8 +473,6 @@ export const scanHandle = (historyConnectedList = [], connectFn = (device) => {
             isMac = true;
           }
         }
-
-        const { isAndroid } = getOS();
         // 检查历史连接列表是否已包含该设备
         const matchedHistoryDevice = historyConnectedList.find((item) => item.macAddr == searchKey);
         if (matchedHistoryDevice) {
@@ -458,6 +494,8 @@ export const scanHandle = (historyConnectedList = [], connectFn = (device) => {
       }
     },
     complete: (err) => {
+    },
+    fail: (err) => {
       console.log('scanCode err', err);
       failScanFn(err)
     }
@@ -466,7 +504,7 @@ export const scanHandle = (historyConnectedList = [], connectFn = (device) => {
 // #region 广播5秒
 export const foundScanDevice = async (result, connectFn) => {
   const deviceList = [];
-  await startDevicesDiscovery();
+  await startDevicesDiscovery(isIOS);
   onFoundDevice((device) => {
     deviceList.push(device)
     const findDevice = device.macAddr === result || device.name === result;
@@ -485,8 +523,6 @@ export const foundScanDevice = async (result, connectFn) => {
     try {
       // 五秒后停止搜索且关闭轮询器
       console.log('stopBluetoothDevicesDiscovery', deviceList);
-      clearInterval(scanTimer);
-      scanTimer = null;
       uni.stopBluetoothDevicesDiscovery();
       const findDevice = deviceList.find((device) => device.macAddr === result || device.name === result);
       connectFn(findDevice);

package/src/core/BleCmdAnalysis/BaseParamProtocol.js

@@ -1,8 +1,8 @@
-
 import { getSysParamCmd } from './readAndSetParam'
 import { decimalToHex, hexToDecimal } from '../BleDataProcess';
-import { batteryInfoJson, capInfoJson, voltageInfoJson, currentInfoJson, tempInfoJson, equalizerFunJson, capVolInfoJson, funcJson, tempFuncJson, systemJson, funcAndTempFuncJson } from '../dataJson/baseParamsJson.js'
+import { batteryInfoJson, capInfoJson, voltageInfoJson,currentInfoJson, tempInfoJson, equalizerFunJson, capVolInfoJson, funcJson, tempFuncJson, systemJson, funcAndTempFuncJson } from '../dataJson/baseParamsJson.js';
 import { readExistFactory, getProtectCountCmd, enterFactory } from './BleCmdDD.js'
+
 /**
  * 
  * @param {*} value 原始十进制值字数组
@@ -111,7 +111,7 @@ export const getBaseParams = async (chipType, deviceData, index, paramObj) => {
     switch (index) {
       case 1:
         let datasInfo1 = {};
-        await sendCmdSeq(datasInfo1, chipType, deviceId, batteryInfoJson)
+        await sendCmdSeq(datasInfo1, chipType, deviceId, batteryInfoJson(crsDivisor))
         dataInfo = getBaseInfo(datasInfo1)
         return dataInfo
       case 2:
@@ -188,9 +188,11 @@ export const getBaseParams = async (chipType, deviceData, index, paramObj) => {
         if (chipType) {
           let tindex = tempInfoJson.findIndex((el) => el.paramNo == 8)
           let tindex1 = tempInfoJson.findIndex((el) => el.paramNo == 44)
+          let tindex2 = tempInfoJson.findIndex((el) => el.paramNo == 202)
           const tempData = await getSysParamCmd(chipType, deviceId, { ...tempInfoJson[tindex], paramLength: 16 })
           const tempData1 = await getSysParamCmd(chipType, deviceId, { ...tempInfoJson[tindex1], paramLength: 8 })
-          console.log('tempData: ', tempData);
+          const tempData2 = await getSysParamCmd(chipType, deviceId, { ...tempInfoJson[tindex2], paramLength: 4 })
+          console.log('tempData: ', tempData, tempData2);
           datasInfo5['chargeHightempProtect'] = tempData?.slice(0, 2)
           datasInfo5['chargeHightempRecover'] = tempData?.slice(2, 4)
           datasInfo5['chargeLowtempProtect'] = tempData?.slice(4, 6)
@@ -203,6 +205,8 @@ export const getBaseParams = async (chipType, deviceData, index, paramObj) => {
           datasInfo5['chargeHightempDelay'] = tempData1?.slice(2, 4)
           datasInfo5['dischargingLowtempDelay'] = tempData1?.slice(4, 6)
           datasInfo5['dischargingHightempDelay'] = tempData1?.slice(6, 8)
+          datasInfo5['overtempProtect'] = tempData2?.slice(0, 2)
+          datasInfo5['overtempRecover'] = tempData2?.slice(2, 4)
         } else {
           await sendCmdSeq(datasInfo5, chipType, deviceId, tempInfoJson)
         }
@@ -433,7 +437,7 @@ const getCurrentInfo = async (datas, chipType) => {
   console.log('datas: ', datas);
   const occhg = format(datas.occhg, 0.01, 0, 3)
   // 采用补码形式传送
-  const dischargeOvercurrentProtect = (datas.dischargeOvercurrentProtect || datas.dischargeOvercurrentProtect == 0) && (format(datas.dischargeOvercurrentProtect, 1, 0, 3) - 0x10000) * 0.01
+  const dischargeOvercurrentProtect = (datas.dischargeOvercurrentProtect || datas.dischargeOvercurrentProtect == 0) && Number(((format(datas.dischargeOvercurrentProtect, 1, 0, 3) - 0x10000) * 0.01).toFixed(3))
 
   let chargeOvercurrentDelay = null
   let chargeOvercurrentRecoverDelay = null
@@ -546,6 +550,8 @@ const getTempInfo = (datas, chipType) => {
   const dischargingHightempRecover = formatTemp(datas.dischargingHightempRecover)
   const dischargingLowtempProtect = formatTemp(datas.dischargingLowtempProtect)
   const dischargingLowtempRecover = formatTemp(datas.dischargingLowtempRecover)
+  const overtempProtect = formatTemp(datas.overtempProtect)
+  const overtempRecover = formatTemp(datas.overtempRecover)
   let chargeHightempDelay = null
   let chargeLowtempDelay = null
   let dischargingHightempDelay = null
@@ -573,7 +579,9 @@ const getTempInfo = (datas, chipType) => {
     chargeHightempDelay,
     chargeLowtempDelay,
     dischargingHightempDelay,
-    dischargingLowtempDelay
+    dischargingLowtempDelay,
+    overtempProtect,
+    overtempRecover
   }
 }
 
@@ -631,11 +639,26 @@ const getFuncAndTempFuncInfo = (datas) => {
   })
   return { func, tempFunc }
 }
+
+const splitNumberTo1Byte = (combined = 0) => {
+  combined = Number(combined);
+  return {
+    val1: combined & 0xFF,
+    val2: (combined >> 8) & 0xFF
+  };
+}
+
 const getSystemInfo = (datas) => {
   const serialNumber = format(datas.serialNumber, 1)
   const cycleCount = format(datas.cycleCount, 1)
   const strCount = format(datas.strCount, 1)
   const rsnsValue = format(datas.rsnsValue, crsDivisor, 0, 2)
+  const param1911 = splitNumberTo1Byte(format(datas.param1911)).val1
+  const param1912 = splitNumberTo1Byte(format(datas.param1911)).val2
+  const param1981 = splitNumberTo1Byte(format(datas.param1981)).val1
+  const param1982 = splitNumberTo1Byte(format(datas.param1981)).val2
+  const param1951 = splitNumberTo1Byte(format(datas.param1951)).val1
+  const param1952 = splitNumberTo1Byte(format(datas.param1951)).val2
   // const identifyCurrent = format(datas.identifyCurrent, 1)
   // const sleepTime = format(datas.sleepTime, 1)
   // const capacityInterval = format(datas.capacityInterval, 1)
@@ -644,6 +667,12 @@ const getSystemInfo = (datas) => {
     cycleCount,
     strCount,
     rsnsValue,
+    param1911,
+    param1912,
+    param1951,
+    param1952,
+    param1981,
+    param1982,
     // identifyCurrent,
     // sleepTime,
     // capacityInterval

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