mini_program_gizwits_sdk 3.4.1 → 3.4.2

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

@@ -1,4 +1,4 @@
-import DiscoverUDP from "../protocol/DiscoverUdp";
+import DiscoverUDP from "../protocol/DiscoverUDP";
 import { IResult } from "../sdk";
 import EventListener from "./EventListener";
 interface ConnectDevice {

package/dist/src/sdk.d.ts

@@ -1,5 +1,6 @@
-import { TLogType } from './GizLog';
 import { IDataPointConfig } from './protocol/DataPoint';
+import { OTAEventCallback, OTAProgressEventCallback } from './handler/ble';
+import { TLogType } from './GizLog';
 import { IOpenApiDevice, ISafeRegisterReturn, IUnbindReturn } from './services/devices';
 import { ILoginRes } from './services/login';
 interface SyncCallBackParams {
@@ -171,6 +172,19 @@ declare class GizwitsMiniSDK {
         success: boolean;
     }>;
     bindRemoteDevice: ({ mac, productKey, alias, beOwner, }: IBindRemoteDeviceParams) => Promise<ISDKResult<IOpenApiDevice>>;
+    checkUpdate: ({ device, type }: {
+        device: IDevice;
+        type: IOTAType;
+    }) => Promise<import("./openApiRequest").IServiceResult<import("./services/ota").OTARes>>;
+    getDeviceInfo: ({ device }: {
+        device: IDevice;
+    }) => Promise<IResult<import("./protocol/DeviceInfo").default>>;
+    startUpgrade: ({ device, type, onProgress, onEvent }: {
+        device: IDevice;
+        type: IOTAType;
+        onProgress: OTAProgressEventCallback;
+        onEvent: OTAEventCallback;
+    }) => Promise<import("./openApiRequest").IServiceResult<import("./services/ota").OTARes>>;
     unbindDevice: ({ devices, }: {
         devices: IDevice[];
     }) => Promise<ISDKResult<IUnbindReturn>>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mini_program_gizwits_sdk",
-  "version": "3.4.1",
+  "version": "3.4.2",
   "description": "ota",
   "main": "./dist/index.js",
   "scripts": {

package/src/handler/lan.ts

@@ -1,6 +1,6 @@
 import GizLog from "../GizLog";
 import Bind from "../protocol/Bind";
-import DiscoverUDP from "../protocol/DiscoverUdp";
+import DiscoverUDP from "../protocol/DiscoverUDP";
 import Login from "../protocol/Login";
 import ProtocolBase from "../protocol/ProtocolBase";
 import { arrayToUint8, hexStrint2byte } from "../protocol/tool";

package/src/sdk.ts

@@ -1,10 +1,6 @@
 import { getGlobalData, setGlobalData } from './globalData';
-import { BleHandle } from './handler/ble';
-import GizwitsWS from './handler/socket';
 
-import { errorCode } from '..';
 import sdkConfig from '../package.json';
-import GizLog, { TLogType } from './GizLog';
 import { LanHandle } from './handler/lan';
 import productConfigFileManage from './productConfigFileManage';
 import { formatEnum, IDataPointConfig, pack, unpack } from './protocol/DataPoint';
@@ -12,6 +8,14 @@ import Ntp from './protocol/Ntp';
 import { CancelSync, DeletePackage, RequestSync, SyncPackage } from './protocol/OffLineData';
 import ProtocolBase from './protocol/ProtocolBase';
 import { arrayToString, hexStrint2byte } from './protocol/tool';
+import { BleHandle, OTAEventCallback, OTAProgressEventCallback } from './handler/ble';
+import GizwitsWS from './handler/socket';
+import Reset from './protocol/Reset';
+import SetReset from './protocol/SetReset';
+
+import GizLog, { TLogType } from './GizLog';
+import errorCode from './errorCode';
+
 import {
   bindMac,
   editBindInfo,
@@ -454,6 +458,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 '0072': {
           // 设备回复是否允许同步数据
           const requestSyncData = new RequestSync(bleBytesData)
@@ -1133,6 +1163,96 @@ class GizwitsMiniSDK {
     };
   };
 
+  checkUpdate = async ({
+    device, type
+  }: {device: IDevice, type: IOTAType}) => {
+    const target = this.allDevices.find((item) => isSameDevice(item, device));
+    if (target) {
+      if (!target.did) {
+        // 设备没有绑定
+        return {
+          success: false,
+          err: errorCode.GIZ_OPENAPI_DEVICE_NOT_BOUND,
+        }
+      }
+      switch(target.connectType) {
+        case 'BLE': {
+          return this.bleHandle.checkUpdate({device,type})
+        }
+        default: {
+          return {
+            success: false,
+            err: errorCode.GIZ_SDK_OTA_DEVICE_NOT_SUPPORT,
+          }
+        }
+      }
+    }
+    return {
+      success: false,
+      err: errorCode.GIZ_SDK_DEVICE_NOT_SUBSCRIBED,
+    };
+  }
+
+  getDeviceInfo = async ({
+    device
+  }: {device: IDevice}) => {
+    const target = this.allDevices.find((item) => isSameDevice(item, device));
+    if (target) {
+      if (!target.did) {
+        // 设备没有绑定
+        return {
+          success: false,
+          err: errorCode.GIZ_OPENAPI_DEVICE_NOT_BOUND,
+        }
+      }
+      switch(target.connectType) {
+        case 'BLE': {
+          return this.bleHandle.getDeviceInfo({deviceId: device.bleDeviceID})
+        }
+        default: {
+          return {
+            success: false,
+            err: errorCode.GIZ_SDK_OTA_DEVICE_NOT_SUPPORT,
+          }
+        }
+      }
+    }
+    return {
+      success: false,
+      err: errorCode.GIZ_SDK_DEVICE_NOT_SUBSCRIBED,
+    };
+  }
+  
+  startUpgrade = async ({
+    device, type, onProgress, onEvent
+  }: {device: IDevice, type: IOTAType, onProgress: OTAProgressEventCallback, onEvent: OTAEventCallback}) => {
+    const target = this.allDevices.find((item) => isSameDevice(item, device));
+    if (target) {
+      if (!target.did) {
+        // 设备没有绑定
+        return {
+          success: false,
+          err: errorCode.GIZ_OPENAPI_DEVICE_NOT_BOUND,
+        }
+      }
+      switch(target.connectType) {
+        case 'BLE': {
+          return this.bleHandle.startUpgrade({device,type, productKey: device.productKey, onProgress, onEvent})
+        }
+        default: {
+          return {
+            success: false,
+            err: errorCode.GIZ_SDK_OTA_DEVICE_NOT_SUPPORT,
+          }
+        }
+      }
+    }
+    return {
+      success: false,
+      err: errorCode.GIZ_SDK_DEVICE_NOT_SUBSCRIBED,
+    };
+  }
+
   unbindDevice = async ({
     devices,
   }: {