mini_program_gizwits_sdk 3.2.30 → 3.2.32-FeiSiMan

package/src/protocol/dataPoint.ts

@@ -1,5 +1,5 @@
 import productConfigFileManage from "../productConfigFileManage";
-import { arrayToString, checkHeader, fillString, getProtocolLen, hexStrint2byte, completeBlock} from "./tool";
+import { arrayToString, checkHeader, fillString, getProtocolLen, hexStrint2byte, completeBlock } from "./tool";
 
 export interface IDataPointConfig {
   name: string;
@@ -35,7 +35,7 @@ type TDataOptionType = 'status_writable' | 'status_readonly' | 'alert' | 'fault'
 export interface IDataPointAttr {
   display_name: string;
   uint_spec: IUnitSpec;
-  name:string;
+  name: string;
   data_type: TDataType;
   position: IDataPointPosition;
   type: TDataOptionType;
@@ -181,7 +181,7 @@ const DataPointToP = ({ config, data, isAdaptiveDatapoint }: IDataPointToP0Param
    */
   const flag = [0];
   const headerCmd = [0, 147]; // cmd
-  const sn = [0,0,0,0];
+  const sn = [0, 0, 0, 0];
 
   // 业务指令命令字 定长上报是4，变长上报是14
   let cmd = [0x1];
@@ -194,7 +194,7 @@ const DataPointToP = ({ config, data, isAdaptiveDatapoint }: IDataPointToP0Param
 
   // 找到可写
   if (!isAdaptiveDatapoint) {
-    attrsConfig = attrsConfig.filter(item => item.type ==='status_writable')
+    attrsConfig = attrsConfig.filter(item => item.type === 'status_writable')
   }
 
   attrsConfig.map((item) => {
@@ -265,7 +265,7 @@ const DataPointToP = ({ config, data, isAdaptiveDatapoint }: IDataPointToP0Param
   return {
     data: packageData,
     raw: {
-      header: [0,0,0,3],
+      header: [0, 0, 0, 3],
       flag,
       len: lengthArr,
       headerCmd,
@@ -274,7 +274,7 @@ const DataPointToP = ({ config, data, isAdaptiveDatapoint }: IDataPointToP0Param
     }
   };
 };
- 
+
 interface IPToDataPointParams {
   config: IDataPointAttr[];
   data: number[];
@@ -316,7 +316,7 @@ function PToDataPoint({ config = [], data }: IPToDataPointParams) {
   let action: number;
   let message = '';
   let messageType: messageType;
-  const rawData: IRawData = { header: arrayToString(data.slice(0, 4)), flag: '', len: '', cmd: '', sn: '',action: '', payload: '' };
+  const rawData: IRawData = { header: arrayToString(data.slice(0, 4)), flag: '', len: '', cmd: '', sn: '', action: '', payload: '' };
   // 获取数据长度 0,0,0,3 到 0 这一段都是长度 校验长度可以忽略
   const attrs = config;
 
@@ -662,7 +662,7 @@ function calculationCmdData({ attrs, flagString, boolEnumLength, cmdData, accumu
 const unpack = async (data: number[], pk: string) => {
   const productConfig = await productConfigFileManage.getConfigFile(pk);
   if (productConfig) {
-    const resData =  PToDataPoint({config: (await productConfig).entities[0].attrs, data})
+    const resData = PToDataPoint({ config: (await productConfig).entities[0].attrs, data })
     if (resData.kvData) {
       // 格式化binary
       resData.kvData = await formatBinary(resData?.kvData, pk, 'object');
@@ -675,16 +675,16 @@ const pack = async (data: object, pk: string) => {
   const productConfig = await productConfigFileManage.getConfigFile(pk);
   if (productConfig) {
     const isAdaptiveDatapoint = productConfig.protocolType === 'var_len';
-    return DataPointToP({data, config: (await productConfig).entities[0].attrs, isAdaptiveDatapoint});
+    return DataPointToP({ data, config: (await productConfig).entities[0].attrs, isAdaptiveDatapoint });
   }
   return null;
 }
 
 const padBoradcastData = (data: number[]) => {
-  const head = [0,0,0,3];
+  const head = [0, 0, 0, 3];
   const flag = [0];
   const headerCmd = [0, 0x93]; // cmd
-  const sn = [0, 0, 0 ,0];
+  const sn = [0, 0, 0, 0];
   const flagToEnd = flag.concat(headerCmd).concat(sn).concat(data);
   const lengthArr: number[] = getVariableLength(flagToEnd);
   return arrayToString(head.concat(lengthArr).concat(flagToEnd));
@@ -692,10 +692,10 @@ const padBoradcastData = (data: number[]) => {
 
 type TargetType = 'int' | 'string';
 // 格式化enum 兼容sdk 和 socket 之间的差异
-const formatEnum = async (attrs: any, pk: string, targetType: TargetType ) => {
-  for(let key in attrs) {
+const formatEnum = async (attrs: any, pk: string, targetType: TargetType) => {
+  for (let key in attrs) {
     const itemData = await productConfigFileManage.getAttrItem(pk, key);
-    if (itemData && itemData.data_type ==='enum') {
+    if (itemData && itemData.data_type === 'enum') {
       if (targetType === 'int' && typeof attrs[key] === 'string') {
         // 转成int 
         const enumIndex = itemData.enum.findIndex(item => item === attrs[key]);
@@ -710,10 +710,10 @@ const formatEnum = async (attrs: any, pk: string, targetType: TargetType ) => {
 }
 
 type BTargetType = 'string' | 'object';
-const formatBinary = async (attrs: any, pk: string, targetType: BTargetType ) => {
-  for(let key in attrs) {
+const formatBinary = async (attrs: any, pk: string, targetType: BTargetType) => {
+  for (let key in attrs) {
     const itemData = await productConfigFileManage.getAttrItem(pk, key);
-    if (itemData && itemData.data_type ==='binary') {
+    if (itemData && itemData.data_type === 'binary') {
       if (targetType === 'object' && typeof attrs[key] === 'string') {
         attrs[key] = hexStrint2byte(attrs[key])
       }
@@ -725,4 +725,4 @@ const formatBinary = async (attrs: any, pk: string, targetType: BTargetType ) =>
   return attrs
 }
 
-export {pack, unpack, padBoradcastData, formatEnum, formatBinary};
+export { pack, unpack, padBoradcastData, formatEnum, formatBinary };

package/src/sdk.ts

@@ -9,6 +9,8 @@ import { LanHandle } from './handler/lan';
 import productConfigFileManage from './productConfigFileManage';
 import { formatEnum, IDataPointConfig, pack, unpack } from './protocol/DataPoint';
 import Ntp from './protocol/Ntp';
+import Reset from './protocol/Reset';
+import SetReset from './protocol/SetReset';
 import { CancelSync, DeletePackage, RequestSync, SyncPackage } from './protocol/OffLineData';
 import ProtocolBase from './protocol/ProtocolBase';
 import { arrayToString, hexStrint2byte } from './protocol/tool';
@@ -35,6 +37,7 @@ import {
 } from './utils';
 import ApConfig from './wifiConfig/ap';
 import BLEConfig from './wifiConfig/ble';
+import NFCConfig from './wifiConfig/nfc';
 
 const version = sdkConfig.version;
 interface SyncCallBackParams {
@@ -56,10 +59,11 @@ export interface ISDKResult<T> {
 }
 export interface ISetCommonDeviceOnboardingDeployProps {
   ssid: string;
+  bssid?: string;
   password: string;
   timeout: number;
   isBind?: boolean;
-  mode?: 0 | 3; // 0 AP 3 BLE
+  mode?: 0 | 3 | 5; // 0 AP 3 BLE 5 NFC
   softAPSSIDPrefix?: string;
 }
 
@@ -68,6 +72,12 @@ export interface ISetDeviceOnboardingDeployProps
   softAPSSIDPrefix: string;
 }
 
+export interface IConfigResult {
+  mac: string;
+  productKey: string;
+}
+
+
 export interface IRandomCodesResult {
   random_code: string;
   product_key: string;
@@ -126,6 +136,7 @@ export interface IResult<T> {
 
 interface ICloudServiceInfo {
   openAPIInfo: string;
+  aepAPIInfo: string;
 }
 
 export type TimeoutHandle = ReturnType<typeof setTimeout> | null;
@@ -142,6 +153,8 @@ interface GizwitsSdkOption {
   token?: string;
   uid?: string;
   offlineThreshold?: number;
+  accessKey?: string; // 京东平台接口请求参数
+  secretKey?: string;// 京东平台接口请求参数
 }
 
 class GizwitsMiniSDK {
@@ -205,7 +218,8 @@ class GizwitsMiniSDK {
       }
     });
 
-    const connectionMap = this.socketHandle._connections;
+    // const connectionMap = this.socketHandle._connections;
+    const connectionMap = {};
 
     Object.keys(connectionMap).forEach((wsInfo) => {
       const conn = connectionMap[wsInfo];
@@ -292,16 +306,16 @@ class GizwitsMiniSDK {
   }
 
   private get socketHandle() {
-    if (!this._gizSocket) {
-      this._gizSocket = new GizwitsWS({
-        appID: getGlobalData('appID'),
-        token: getGlobalData('token'),
-        uid: getGlobalData('uid'),
-      });
-      this._gizSocket.subscribeDeviceStatus(this.handleSocketDeviceData);
-      this._gizSocket.subscribeBindingChanged(this.getBindingList);
-      this._gizSocket.subscribeSocketStatus(this.handleSocketStatus);
-    }
+    // if (!this._gizSocket) {
+    //   this._gizSocket = new GizwitsWS({
+    //     appID: getGlobalData('appID'),
+    //     token: getGlobalData('token'),
+    //     uid: getGlobalData('uid'),
+    //   });
+    //   this._gizSocket.subscribeDeviceStatus(this.handleSocketDeviceData);
+    //   this._gizSocket.subscribeBindingChanged(this.getBindingList);
+    //   this._gizSocket.subscribeSocketStatus(this.handleSocketStatus);
+    // }
     return this._gizSocket;
   }
 
@@ -314,6 +328,8 @@ class GizwitsMiniSDK {
     token,
     uid,
     offlineThreshold,
+    accessKey,
+    secretKey
   }: GizwitsSdkOption) => {
     this.productInfo = productInfo;
     // 保存相关信息
@@ -321,7 +337,10 @@ class GizwitsMiniSDK {
     setGlobalData('appSecret', appSecret);
     setGlobalData('productInfo', productInfo);
     setGlobalData('token', token);
+    console.log('SDK init', token);
     setGlobalData('uid', uid);
+    setGlobalData('accessKey', accessKey);
+    setGlobalData('secretKey', secretKey);
 
     /**
      * 同时也设置域名信息
@@ -336,7 +355,7 @@ class GizwitsMiniSDK {
      * lan 比较特殊
      * 初始化sdk的时候就要开始扫描设备
      */
-    this.initLan();
+    // this.initLan();
   }
   public reInit(props: GizwitsSdkOption) {
     this.init(props);
@@ -353,7 +372,7 @@ class GizwitsMiniSDK {
         openAPIInfo !== getGlobalData('cloudServiceInfo').openAPIInfo
       ) {
       // 需要重启
-      this.socketHandle.destory();
+      // this.socketHandle.destory();
       this._gizSocket = null;
       // eslint-disable-next-line @typescript-eslint/no-unused-expressions
       this.socketHandle;
@@ -452,6 +471,32 @@ class GizwitsMiniSDK {
           }
           break
         }
+        case '0062': {
+          // 蓝牙重置命令，app代理设备进行重置
+          const resetInfo = new Reset(bleBytesData)
+          GizLog.debug("收到代理重置事件", resetInfo)
+
+          if (resetInfo.status === 1) {
+            // 需要重置
+            this.deviceSafetyApi({
+              mac: target.mac,
+              productKey: target.productKey,
+              isReset: true
+            }).then(async data => {
+              GizLog.debug("代理重置结果", data)
+              if (data.success && data.data.successDevices.length > 0) {
+                // 回写数据
+                GizLog.debug("重置成功，回写数据")
+                await this.bleHandle.write(curDevice.deviceId, numberArray2Uint8Array(SetReset.pack(0)).buffer)
+              }
+            })
+          }
+          break;
+        }
+        case '0064': {
+          // 回写重置结果ack，暂时先忽略
+          break;
+        }
         case '0052': {
           // 设备回复是否允许同步数据
           const requestSyncData = new RequestSync(bleBytesData)
@@ -762,7 +807,7 @@ class GizwitsMiniSDK {
         case 'WAN': {
           // 枚举要转换成枚举值
           const newAttrs = await formatEnum(attrs, target.productKey, 'string')
-
+          return;
           return this.socketHandle.writeData(target, newAttrs);
         }
         case 'LAN': {
@@ -803,6 +848,7 @@ class GizwitsMiniSDK {
           }
         }
         case 'WAN': {
+          return { success: false };
           return this.socketHandle.send(target.did, data);
         }
         case 'LAN': {
@@ -954,7 +1000,7 @@ class GizwitsMiniSDK {
     if (data.success) {
       setGlobalData('token', data.data?.token);
       setGlobalData('uid', data.data?.uid);
-      this.socketHandle.updateToken({token: data.data.token, uid: data.data.uid})
+      // this.socketHandle.updateToken({token: data.data.token, uid: data.data.uid})
     }
     return data;
   };
@@ -975,6 +1021,7 @@ class GizwitsMiniSDK {
         );
       }
       case 'WAN':
+        return { success: false, }
         return this.socketHandle.readStatus(target, attrNames);
       default: {
         return {
@@ -1010,6 +1057,7 @@ class GizwitsMiniSDK {
       // 广播不需要连接
       return {
         success: true,
+        message: '',
       };
     }
 
@@ -1022,7 +1070,7 @@ class GizwitsMiniSDK {
     switch (type) {
       case 'BLE': {
         // 连接BLE
-        const data = await this.bleHandle.connectDevice(target);
+        const data = await this.bleHandle.connectDevice(target) as IResult<any>;
         if (data.success) {
 
           // 蓝牙设备比较特殊，在get 里面从bleHandle里找到连接的设备，再把connectType 设置成BLE，所以这里更新metaData 要强制更新并推送
@@ -1042,11 +1090,12 @@ class GizwitsMiniSDK {
         // const target = this.deviceList.find((item) =>
         //   isSameDevice(item, device)
         // );
-        const data = this.socketHandle.connectDevice(target);
-        if (data.success) {
-          this.setDeviceMeta(device, 'connectType', 'WAN', true);
-        }
-        return data;
+        // const data = this.socketHandle.connectDevice(target);
+        // if (data.success) {
+        //   this.setDeviceMeta(device, 'connectType', 'WAN', true);
+        // }
+        // return data;
+        return { success: false, }
       }
       case 'LAN': {
         const data = await this.lanHandle.connectDevice(target);
@@ -1058,6 +1107,7 @@ class GizwitsMiniSDK {
     }
     return {
       success: false,
+      message: '',
     };
   };
 
@@ -1081,11 +1131,14 @@ class GizwitsMiniSDK {
         return disconnectRes;
       }
       case 'WAN': {
-        const res = this.socketHandle.disConnectDevice(target);
-        if (res.success) {
-          this.setDeviceMeta(target, 'connectType', 'NONE', true);
-        }
-        return res;
+        // const res = this.socketHandle.disConnectDevice(target);
+        // if (res.success) {
+        //   this.setDeviceMeta(target, 'connectType', 'NONE', true);
+        // }
+        // return res;
+        return {
+          success: false,
+        };
       }
       case 'LAN': {
         const res = this.lanHandle.disConnectDevice(target);
@@ -1161,6 +1214,7 @@ class GizwitsMiniSDK {
    */
   setDeviceOnboardingDeploy = async ({
     ssid,
+    bssid = '',
     password,
     mode = 0,
     timeout,
@@ -1174,12 +1228,13 @@ class GizwitsMiniSDK {
       };
     }
     const sTime = new Date().getTime();
-    GizLog.debug('GIZ_SDK: 配网开始时间:' + sTime);
+    GizLog.debug('GIZ_SDK: 配网开始时间:' + sTime, mode);
     try {
       switch (mode) {
         case 0: {
           this.currentWifiConfigHandle = new ApConfig(
             ssid,
+            bssid,
             password,
             this.specialProductKeys,
             this.specialProductKeySecrets
@@ -1199,6 +1254,7 @@ class GizwitsMiniSDK {
         case 3: {
           this.currentWifiConfigHandle = new BLEConfig(
             ssid,
+            bssid,
             password,
             this.specialProductKeys,
             this.specialProductKeySecrets,
@@ -1216,9 +1272,43 @@ class GizwitsMiniSDK {
           GizLog.debug('GIZ_SDK: 配网用时:' + (eTime - sTime));
           return data;
         }
+        case 5: {
+          // 只有安卓支持
+          const sysInfo = await wx.getSystemInfoSync();
+          console.log('sysInfosysInfo', sysInfo)
+          if (sysInfo.platform !== 'android') {
+            return {
+              success: false,
+              message: '只支持安卓'
+            }
+          }
+          const cloudServiceInfo = getGlobalData('cloudServiceInfo');
+
+          console.log('cloudServiceInfo', cloudServiceInfo)
+          
+          this.currentWifiConfigHandle = new NFCConfig(
+            ssid,
+            bssid,
+            password,
+            this.specialProductKeys,
+            this.specialProductKeySecrets,
+            cloudServiceInfo?.openAPIInfo || 'api.gizwits.com',
+          );
+          const data =
+            await this.currentWifiConfigHandle.setDeviceOnboardingDeploy({
+              timeout,
+              isBind,
+              softAPSSIDPrefix,
+            });
+          this.currentWifiConfigHandle = null;
+          const eTime = new Date().getTime();
+          GizLog.debug('GIZ_SDK: 配网结束时间:' + eTime);
+          GizLog.debug('GIZ_SDK: 配网用时:' + (eTime - sTime));
+          return data;
+        }
       }
     } catch (error) {
-      GizLog.error("GIZ_SDK: setDeviceOnboardingDeploy", new Error(JSON.stringify(error)));
+      GizLog.error("GIZ_SDK: setDeviceOnboardingDeploy", error);
       if (
         (error as ISDKResult<IDevice[]>).err &&
         (error as ISDKResult<IDevice[]>).err!.errorCode
@@ -1240,8 +1330,10 @@ class GizwitsMiniSDK {
   private setDomain = (cloudServiceInfo: ICloudServiceInfo) => {
     const openAPIInfo =
       (cloudServiceInfo && cloudServiceInfo.openAPIInfo) || 'api.gizwits.com';
+    const aepAPIInfo =
+      (cloudServiceInfo && cloudServiceInfo.aepAPIInfo) || 'https://mini-dev.viessmann.cn/';
 
-    const newData = { ...(cloudServiceInfo || {}), openAPIInfo };
+    const newData = { ...(cloudServiceInfo || {}), openAPIInfo, aepAPIInfo };
     setGlobalData('cloudServiceInfo', newData);
   };
 
@@ -1268,11 +1360,12 @@ class GizwitsMiniSDK {
 
   // 内部刷新设备列表的方法
   public getBindingList = async () => {
-    const data = await getBindingList();
-    this.deviceList = data.data || [];
-    // 推送
-    this.notiDeviceList();
-    return data;
+    // const data = await getBindingList();
+    // this.deviceList = data.data || [];
+    // // 推送
+    // this.notiDeviceList();
+    // return data;
+    return {}
   };
 
   /**
@@ -1371,7 +1464,7 @@ class GizwitsMiniSDK {
   public destory = () => {
     this.bleHandle.destory();
     this.lanHandle.destory();
-    this.socketHandle.destory();
+    // this.socketHandle.destory();
     this.keepScanTimer && clearInterval(this.keepScanTimer);
   };
 }

package/src/services/devices.ts

@@ -1,10 +1,10 @@
+import { enc, AES, mode, pad } from 'crypto-js';
 import openApiRequest, { IServiceResult } from '../openApiRequest';
 import getRandomCodes from '../randomCode';
 import { IRandomCodesResult } from '../sdk';
 import { psKeySign } from './tool';
 // eslint-disable-next-line import/no-commonjs
 // const CryptoJS = require('crypto-js');
-import {  enc, AES, mode, pad } from 'crypto-js';
 
 export interface IOpenApiDevice {
   product_key: string;
@@ -26,6 +26,58 @@ interface IDeviceRes {
   devices: IOpenApiDevice[];
 }
 
+// 云端aes 特殊解码
+class Padding {
+  /**
+   * Pads data using the algorithm defined in PKCS #5/7.
+   *
+   * @param data The data to pad.
+   * @param blockSize The multiple that the data should be padded to.
+   *
+   * @example
+   *
+   *     CryptoJS.pad.Pkcs7.pad(wordArray, 4);
+   */
+  pad = (data, blockSize) => {
+  }
+  
+
+  /**
+   * Unpads data that had been padded using the algorithm defined in PKCS #5/7.
+   *
+   * @param data The data to unpad.
+   *
+   * @example
+   *
+   *     CryptoJS.pad.Pkcs7.unpad(wordArray);
+   */
+  unpad = (data) => {
+    const AES_BLOCK_LEN = 16;
+    const len = data.sigBytes;
+    let readed = 0;
+    let repeat = 1;
+    const stringData = data.toString(enc.Utf8);
+    while (readed + AES_BLOCK_LEN <= len) {
+      readed += AES_BLOCK_LEN;
+    }
+    for(let i = 0; i < (AES_BLOCK_LEN - 2) / 2; i++)
+    { 
+        const start = readed  - i * 2;
+        if(stringData.substring(start, start - 2) == stringData.substring(start - 2, start - 4))
+        {
+            repeat++;
+        }
+        else
+        {
+            readed -= repeat * 2;
+
+        break;
+      }
+    }
+    data.sigBytes = readed;
+  }
+}
+
 export const getBindingList = async (): Promise<IServiceResult<IDevice[]>> => {
   const data = await openApiRequest<IDeviceRes>(
     '/app/bindings?show_disabled=0&limit=1000&skip=0',
@@ -37,6 +89,7 @@ export const getBindingList = async (): Promise<IServiceResult<IDevice[]>> => {
   if (data.success) {
     const newDevices: IDevice[] = data.data!.devices.map((item) => {
       return {
+        ...item,
         productKey: item.product_key,
         mac: item.mac,
         did: item.did,
@@ -195,12 +248,23 @@ export async function safeRegister({
     false
   );
   if (data.success) {
-    // 解码
+    const successDevices = unPackSafeRegisterRes({ productSecret, iv, data: data.data });
+    const failedDevices = [];
+
+    const targetDevice = successDevices.find(item => item.mac === mac);
+    if (!targetDevice) {
+      // 不存在
+      failedDevices.push({
+        mac,
+      })
+    }
+    
+    // TODO 解码
     return {
       success: true,
       data: {
-        successDevices: [],
-        failedDevices: [],
+        successDevices,
+        failedDevices,
       },
     };
   }
@@ -210,6 +274,30 @@ export async function safeRegister({
   };
 }
 
+const unPackSafeRegisterRes = ({ productSecret, data, iv }: { productSecret: string, data: string, iv: any }) => {
+  const aesKey = enc.Hex.parse(productSecret)
+  const bodyHex = enc.Hex.parse(data)
+  let resEncrypted = AES.decrypt(enc.Base64.stringify(bodyHex), aesKey, { iv: iv, mode: mode.ECB, padding: new Padding() });
+  const resString = resEncrypted.toString(enc.Utf8);
+  const newData = [];
+  resString.split(',').map(item => {
+    const tmp = item.split('&');
+    const mac = tmp[0].replace('mac=', '');
+    const did = tmp[1].replace('did=', '');
+    newData.push({
+      mac, did
+    })
+  })
+  return newData;
+}
+
+// const unPackSafeRegister = unPackSafeRegisterRes({
+//   productSecret: 'aaa0840301e04748adaf9fcd160e7508',
+//   iv: enc.Hex.parse(''),
+//   data: '56ab36690dcb1e42bc3e69dab30c2e670c2188dfb76cb5a2f12986d18eb069f0f63d3c89ab069f3573ef81ca02936ad4'
+// })
+// console.log('unPackSafeRegisterunPackSafeRegister', unPackSafeRegister)
+
 interface IRenameProps {
   name?: string;
   did: string;

package/src/utils.ts

@@ -134,11 +134,12 @@ const parseAdv = (advertisData: ArrayBuffer, pks: string[]) => {
     }
 
     const tmpBytes = advertisData.slice(index + 1, index + len + 1);
-    if (len >= 6 && len <= 8) {
-      mac = ab2hex(tmpBytes);
-      if (mac.length == 16) {
-        mac = mac.substring(0, 15);
-      }
+    if (len >= 6 && len <= 15) {
+      // 菲斯曼的mac需要转化下
+      const nums = Array.prototype.map.call(new Uint8Array(tmpBytes), function (bit) {
+        return bit;
+      });
+      mac = numberArrToASCIIString(nums);
     }
 
     if (len == 16) {
@@ -155,6 +156,15 @@ const parseAdv = (advertisData: ArrayBuffer, pks: string[]) => {
   return {bleWorkStatus, mac, productKey}
 }
 
+// 数值数组转字符串（按AscII码转化）
+function numberArrToASCIIString(nums: number[]) {
+  // 数值数组转字符串（按AscII码转化）
+  let str = '';
+  for (let i = 0; i < nums.length; i++) {
+    str += String.fromCharCode(nums[i]);
+  }
+  return str;
+}
 
 export const advertisData2PkAndMac = (
   advertisData: ArrayBuffer,

package/src/wifiConfig/ConfigBase.ts

@@ -9,6 +9,7 @@ interface IRejectCallback {
 }
 class ConfigBase {
   ssid = '';
+  bssid = '';
   password = '';
   specialProductKeys: string[] = [];
   disableSearchDevice = false;
@@ -17,8 +18,9 @@ class ConfigBase {
   private setDeviceOnboardingDeployRej?: (value: unknown) => void = () => {}; // 保存promise的rej，用于临时中断
   // private setDeviceOnboardingDeployRes?: (value: unknown) => void = () => {}; // 保存promise的res，用于临时中断
 
-  constructor(ssid: string, password: string, specialProductKeys: string[], specialProductKeySecrets: string[]) {
+  constructor(ssid: string, bssid: string, password: string, specialProductKeys: string[], specialProductKeySecrets: string[]) {
     this.ssid = ssid;
+    this.bssid = bssid;
     this.password = password;
     this.specialProductKeys = specialProductKeys;
     this.specialProductKeySecrets = specialProductKeySecrets;