mini_program_gizwits_sdk 3.4.9 → 3.4.12

package/dist/src/handler/ble.d.ts

@@ -112,7 +112,7 @@ export declare class BleHandle extends EventListener<TBleHandleEvent> {
     private updateCtime;
     private checkDeviceIsChange;
     private handleBluetoothDeviceFound;
-    startScan: (onScanDevice: OnScanDevice, delay?: number, services?: string[]) => Promise<IStartScanResult>;
+    startScan: (delay?: number, services?: string[]) => Promise<IStartScanResult>;
     stopScan: () => Promise<any>;
     disableScan: () => Promise<WechatMiniprogram.BluetoothError>;
     enableScan: () => void;

package/dist/src/sdk.d.ts

@@ -3,6 +3,7 @@ import { OTAEventCallback, OTAProgressEventCallback } from './handler/ble';
 import { TLogType } from './GizLog';
 import { IOpenApiDevice, ISafeRegisterReturn, IUnbindReturn } from './services/devices';
 import { ILoginRes } from './services/login';
+import { ConfigEventData } from './wifiConfig/ConfigBase';
 interface SyncCallBackParams {
     event: TSyncEvnet;
     currentNum?: number;
@@ -29,6 +30,7 @@ export interface ISetCommonDeviceOnboardingDeployProps {
 }
 export interface ISetDeviceOnboardingDeployProps extends ISetCommonDeviceOnboardingDeployProps {
     softAPSSIDPrefix: string;
+    eventCallBack: (event: ConfigEventData) => void;
 }
 export interface IRandomCodesResult {
     random_code: string;
@@ -204,7 +206,7 @@ declare class GizwitsMiniSDK {
     }) => Promise<ISDKResult<IUnbindReturn>>;
     deviceSafetyRegister: ({ mac, productKey, }: IDeviceSafetyRegisterParams) => Promise<ISDKResult<ISafeRegisterReturn>>;
     deviceSafetyUnbind: ({ mac, productKey, }: IDeviceSafetyRegisterParams) => Promise<ISDKResult<ISafeRegisterReturn>>;
-    setDeviceOnboardingDeploy: ({ ssid, bssid, password, mode, timeout, isBind, softAPSSIDPrefix, }: ISetDeviceOnboardingDeployProps) => Promise<ISDKResult<IDevice[]>>;
+    setDeviceOnboardingDeploy: ({ ssid, bssid, password, mode, timeout, isBind, softAPSSIDPrefix, eventCallBack }: ISetDeviceOnboardingDeployProps) => Promise<ISDKResult<IDevice[]>>;
     private setDomain;
     private deviceSafetyApi;
     getBindingList: () => Promise<import("./openApiRequest").IServiceResult<IDevice[]>>;

package/dist/src/wifiConfig/ConfigBase.d.ts

@@ -1,7 +1,12 @@
-import { IRandomCodesResult, IResult } from "../sdk";
+import { IRandomCodesResult, IResult, TimeoutHandle } from "../sdk";
 interface IRejectCallback {
     (result: IResult<unknown>): void;
 }
+export type TConfigEvent = 'GIZ_CONFIG_START' | 'GIZ_DISCOVER_SUCCESS' | 'GIZ_CONNECT_SUCCESS' | 'GIZ_CONFIG_SEND_SUCCESS' | 'GIZ_CONFIG_RECV_SUCCESS' | 'GIZ_CONFIG_SUCCESS';
+export interface ConfigEventData {
+    event: TConfigEvent;
+    deviceID?: string;
+}
 declare class ConfigBase {
     ssid: string;
     bssid: string;
@@ -9,7 +14,8 @@ declare class ConfigBase {
     specialProductKeys: string[];
     disableSearchDevice: boolean;
     specialProductKeySecrets: string[];
-    private timeoutHandler;
+    timeoutHandler: TimeoutHandle;
+    eventCallBack: (event: ConfigEventData) => void;
     private setDeviceOnboardingDeployRej?;
     constructor(ssid: string, bssid: string, password: string, specialProductKeys: string[], specialProductKeySecrets: string[]);
     cleanTimeout: () => void;

package/dist/src/wifiConfig/ble.d.ts

@@ -1,14 +1,21 @@
 import { IRandomCodesResult, IResult } from "../sdk";
 import { BleHandle } from "../handler/ble";
-import ConfigBase from "./ConfigBase";
+import ConfigBase, { ConfigEventData } from "./ConfigBase";
+type EnableAndGetBluetoothDevicesRes = Promise<{
+    success: false;
+    err: IError;
+} | {
+    success: true;
+    bleDevices?: IDevice[];
+}>;
 interface IArgs {
     bleDeviceId: string;
     arrayBuffer: ArrayBuffer;
     serviceUUIDSuffix?: string;
     characteristicUUIDSuffix?: string;
     bleHandle: BleHandle;
+    eventCallBack: (event: ConfigEventData) => void;
 }
-export declare function sendBLEConfigCmd({ bleDeviceId, arrayBuffer, serviceUUIDSuffix, characteristicUUIDSuffix, bleHandle }: IArgs): Promise<boolean | void>;
 interface configBLEDeviceParams {
     ssid: string;
     password: string;
@@ -19,26 +26,22 @@ interface ISetDeviceOnboardingDeployProps {
     timeout: number;
     isBind: boolean;
     softAPSSIDPrefix: string;
+    eventCallBack: (event: ConfigEventData) => void;
 }
 declare class BLEConfig extends ConfigBase {
     bleHandle: BleHandle;
     constructor(ssid: string, bssid: string, password: string, specialProductKeys: string[], specialProductKeySecrets: string[], bleHandle: BleHandle);
+    sendBLEConfigCmd: ({ bleDeviceId, arrayBuffer, serviceUUIDSuffix, characteristicUUIDSuffix, bleHandle, eventCallBack }: IArgs) => Promise<boolean | void>;
     destroy: () => void;
-    isValidBleDevice: (bleDevice: WechatMiniprogram.BlueToothDevice, softAPSSIDPrefix?: string) => boolean;
+    isValidBleDevice: (device: IDevice, softAPSSIDPrefix?: string) => boolean;
     enableBluetoothDevicesDescovery: () => Promise<{
         success: false;
         err: IError;
     } | {
         success: true;
     }>;
-    enableAndGetBluetoothDevices: (softAPSSIDPrefix?: string) => Promise<{
-        success: false;
-        err: IError;
-    } | {
-        success: true;
-        bleDevices?: WechatMiniprogram.BlueToothDevice[];
-    }>;
-    setDeviceOnboardingDeploy: ({ timeout, isBind, softAPSSIDPrefix, }: ISetDeviceOnboardingDeployProps) => Promise<IResult<IDevice[]>>;
+    enableAndGetBluetoothDevices: (softAPSSIDPrefix?: string) => EnableAndGetBluetoothDevicesRes;
+    setDeviceOnboardingDeploy: ({ timeout, isBind, softAPSSIDPrefix, eventCallBack, }: ISetDeviceOnboardingDeployProps) => Promise<IResult<IDevice[]>>;
     configBLEDevice: ({ ssid, password, softAPSSIDPrefix, }: configBLEDeviceParams) => Promise<IResult<IRandomCodesResult[]>>;
 }
 export default BLEConfig;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mini_program_gizwits_sdk",
-  "version": "3.4.9",
-  "description": "修正随机码生成方式",
+  "version": "3.4.12",
+  "description": "增加配网回调",
   "main": "./dist/index.js",
   "scripts": {
     "test": "node_modules/mocha/bin/_mocha -r ts-node/register tests/**/*.spec.ts -file ./tests/setup-wx.js -timeout 60s",

package/src/handler/ble.ts

@@ -419,6 +419,10 @@ export class BleHandle extends EventListener<TBleHandleEvent> {
     }
     const res = await this.getBluetoothAdapterState();
     this.isInitSuccess = true
+
+    wx.onBluetoothDeviceFound((resData) => {
+      this.handleBluetoothDeviceFound(resData);
+    });
     return res;
   }
 
@@ -501,7 +505,6 @@ export class BleHandle extends EventListener<TBleHandleEvent> {
 
   private handleBluetoothDeviceFound = (
     resData: WechatMiniprogram.OnBluetoothDeviceFoundListenerResult,
-    onScanDevice: OnScanDevice
   ) => {
     /**
      * TODO
@@ -565,7 +568,7 @@ export class BleHandle extends EventListener<TBleHandleEvent> {
           this.updateDevice(newDevice);
           // GizLog.debug("GIZ_SDK: same device", newDevice, isChange);
           if (isChange) {
-            onScanDevice(this.scanList);
+            this.notifyDevices();
           }
         }
       } else {
@@ -579,7 +582,7 @@ export class BleHandle extends EventListener<TBleHandleEvent> {
           const newDevice = BTDevice2GDevice(device, this.pks);
           if (newDevice.productKey && newDevice.mac) {
             this.scanList.push(newDevice);
-            onScanDevice(this.scanList);
+            this.notifyDevices();
           }
         }
       }
@@ -587,7 +590,6 @@ export class BleHandle extends EventListener<TBleHandleEvent> {
   };
 
   public startScan = async (
-    onScanDevice: OnScanDevice,
     delay: number = 5000,
     services?: string[]
   ) => {
@@ -597,10 +599,6 @@ export class BleHandle extends EventListener<TBleHandleEvent> {
       }
     }
     return new Promise<IStartScanResult>(async (res) => {
-      wx.onBluetoothDeviceFound((resData) => {
-        this.handleBluetoothDeviceFound(resData, onScanDevice);
-      });
-
       GizLog.debug("GIZ_SDK: start scan", delay);
       await wx.startBluetoothDevicesDiscovery({
         // 如果有传的话，就按传入的方式来搜索

package/src/sdk.ts

@@ -41,6 +41,7 @@ import {
 import ApConfig from './wifiConfig/ap';
 import BLEConfig from './wifiConfig/ble';
 import NFCConfig from './wifiConfig/nfc';
+import { ConfigEventData } from './wifiConfig/ConfigBase';
 
 const version = sdkConfig.version;
 interface SyncCallBackParams {
@@ -73,6 +74,7 @@ export interface ISetCommonDeviceOnboardingDeployProps {
 export interface ISetDeviceOnboardingDeployProps
   extends ISetCommonDeviceOnboardingDeployProps {
   softAPSSIDPrefix: string;
+  eventCallBack: (event: ConfigEventData) => void, // 配网回调
 }
 
 export interface IRandomCodesResult {
@@ -678,13 +680,9 @@ class GizwitsMiniSDK {
       //     this.bleDevices = deviceList;
       //   }, -1);
       // }
-      this.bleHandle.startScan((deviceList) => {
-        this.bleDevices = deviceList;
-      }, -1, services);
+      this.bleHandle.startScan( -1, services);
     }, autoTime);
-    this.bleHandle.startScan((deviceList) => {
-      this.bleDevices = deviceList;
-    }, -1, services);
+    this.bleHandle.startScan(-1, services);
   };
 
   /**
@@ -786,9 +784,7 @@ class GizwitsMiniSDK {
     services?: string[]
   ): Promise<ISDKResult<IDevice[]>> => {
     this.bleHandle.scanList = [];
-    const data = await this.bleHandle.startScan((deviceList) => {
-      this.bleDevices = deviceList;
-    }, delay, services);
+    const data = await this.bleHandle.startScan(delay, services);
     return {
       success: true,
       data: data.scanList,
@@ -1391,6 +1387,7 @@ class GizwitsMiniSDK {
     timeout,
     isBind = true,
     softAPSSIDPrefix,
+    eventCallBack
   }: ISetDeviceOnboardingDeployProps): Promise<ISDKResult<IDevice[]>> => {
     if (this.currentWifiConfigHandle) {
       return {
@@ -1408,13 +1405,14 @@ class GizwitsMiniSDK {
             bssid,
             password,
             this.specialProductKeys,
-            this.specialProductKeySecrets
+            this.specialProductKeySecrets,
           );
           const data =
             await this.currentWifiConfigHandle.setDeviceOnboardingDeploy({
               timeout,
               isBind,
               softAPSSIDPrefix,
+              eventCallBack,
             });
           this.currentWifiConfigHandle = null;
           const eTime = new Date().getTime();
@@ -1436,6 +1434,7 @@ class GizwitsMiniSDK {
               timeout,
               isBind,
               softAPSSIDPrefix,
+              eventCallBack,
             });
           this.currentWifiConfigHandle = null;
           const eTime = new Date().getTime();
@@ -1470,6 +1469,7 @@ class GizwitsMiniSDK {
               timeout,
               isBind,
               softAPSSIDPrefix,
+              eventCallBack,
             });
           this.currentWifiConfigHandle = null;
           const eTime = new Date().getTime();

package/src/wifiConfig/ConfigBase.ts

@@ -8,6 +8,11 @@ import GizLog from "../GizLog";
 interface IRejectCallback {
   (result: IResult<unknown>): void;
 }
+export type TConfigEvent = 'GIZ_CONFIG_START' | 'GIZ_DISCOVER_SUCCESS' | 'GIZ_CONNECT_SUCCESS' | 'GIZ_CONFIG_SEND_SUCCESS' | 'GIZ_CONFIG_RECV_SUCCESS' | 'GIZ_CONFIG_SUCCESS'
+export interface ConfigEventData {
+  event: TConfigEvent;
+  deviceID?: string;
+}
 class ConfigBase {
   ssid = '';
   bssid = '';
@@ -15,7 +20,9 @@ class ConfigBase {
   specialProductKeys: string[] = [];
   disableSearchDevice = false;
   specialProductKeySecrets: string[] = []
-  private timeoutHandler: TimeoutHandle = null;
+  timeoutHandler: TimeoutHandle = null;
+  eventCallBack: (event: ConfigEventData) => void;
+
   private setDeviceOnboardingDeployRej?: (value: unknown) => void = () => {}; // 保存promise的rej，用于临时中断
   // private setDeviceOnboardingDeployRes?: (value: unknown) => void = () => {}; // 保存promise的res，用于临时中断
 
@@ -145,11 +152,14 @@ class ConfigBase {
 
           if (data.err || (data.data as IRandomCodesResult[]).length === 0) {
             // 重新请求
-            GizLog.debug('GIZ_SDK: 大循环没有发现设备');
-            await sleep(1500);
+            // GizLog.debug('GIZ_SDK: 大循环没有发现设备');
+            await sleep(250);
             !this.disableSearchDevice && query();
           } else {
             // 搜索到设备
+            this.eventCallBack?.({
+              event: "GIZ_CONFIG_SUCCESS",
+            });
             GizLog.debug('GIZ_SDK: 大循环搜索到设备', data);
             res({
               success: true,