mini_program_gizwits_sdk 3.2.7 → 3.2.10-kuka

package/src/sdk.ts

@@ -404,6 +404,26 @@ class GizwitsMiniSDK {
         case '0094':
         case '0090':
         case '0091': {
+          // 设备上报的指令，上传给后台
+          console.debug('handleBleDeviceData', hexString, target)
+          if (target.passcode) {
+            const productConfig = this.productInfo.find(item => item.productKey === target.productKey)
+            if (productConfig) {
+              uploadP0({
+                device: target, 
+                data: [
+                  {
+                    raw: hexString,
+                    created_at: parseInt(`${Date.now() / 1000}`, 10)
+                  }
+                ],
+                productSecret: productConfig.productSecret,
+              }).then(data => {
+                console.debug('uploadP0 res', data)
+              })
+            }
+            
+          }
           const data = await unpack(hexStrint2byte(hexString), target.productKey);
           // 如果有kydata 则上报
           if (data?.kvData && this.listenerMap['GizDeviceAttrsNotifications']) {
@@ -454,17 +474,21 @@ class GizwitsMiniSDK {
           GizLog.debug("设备上报离线数据:payload", syncPackageData.payload)
           GizLog.debug("设备上报离线数据:timestemp", syncPackageData.timestemp)
 
-          const uploadRes = await uploadP0({
-            device: this.syncDevice,
-            data: [
-              {
-                raw: arrayToString(syncPackageData.payload),
-                created_at: syncPackageData.timestemp
-              }
-            ]
-          })
-
-          GizLog.debug("上传离线数据结果", uploadRes)
+          const productConfig = this.productInfo.find(item => item.productKey === this.syncDevice.productKey)
+          if(productConfig) {
+            const uploadRes = await uploadP0({
+              device: this.syncDevice,
+              data: [
+                {
+                  raw: arrayToString(syncPackageData.payload),
+                  created_at: syncPackageData.timestemp
+                }
+              ],
+              productSecret: productConfig.productSecret
+            })
+            GizLog.debug("上传离线数据结果", uploadRes)
+          }
+          
           this.syncCurrnetNum += 1;
           // 通知设备删除
           this.syncDataCallBack({
@@ -481,8 +505,12 @@ class GizwitsMiniSDK {
             GizLog.debug("查询新数据：", syncPackageData.id + 1)
             await this.bleHandle.write(curDevice.deviceId, numberArray2Uint8Array(SyncPackage.pack(syncPackageData.id + 1)).buffer)
           } else {
-            // 已经同步完数据，等设备回掉
-            GizLog.debug("sync success wait device callback")
+            // 结束同步
+            GizLog.debug("send cancel sync to device")
+            this.bleHandle.write(curDevice.deviceId, numberArray2Uint8Array(CancelSync.pack()).buffer) 
+            this.syncDataCallBack({
+              event: "SYNC_END",
+            })
           }
           break
         }
@@ -929,8 +957,13 @@ class GizwitsMiniSDK {
         // 连接BLE
         const data = await this.bleHandle.connectDevice(target.bleDeviceID);
         if (data.success) {
+          
           // 蓝牙设备比较特殊，在get 里面从bleHandle里找到连接的设备，再把connectType 设置成BLE，所以这里更新metaData 要强制更新并推送
           this.setDeviceMeta(target, 'connectType', 'BLE', true);
+          setTimeout(() => {
+            // 蓝牙设备连接成功之后默认设置一次ntp
+            this.setDeviceTimeStamp(target)
+          }, 250)
           setTimeout(() => {
             this.getDeviceStatus(target);
           }, 500);

package/src/services/uploadP0.ts

@@ -1,4 +1,5 @@
 import openApiRequest from "../openApiRequest";
+import {  enc, AES, mode, pad } from 'crypto-js';
 
 export interface IUploadRes {
 }
@@ -11,9 +12,19 @@ interface IData {
 interface IProps {
   device: IDevice;
   data: IData[];
+  productSecret: string;
 }
-export async function uploadP0 ({device, data}: IProps) {
+export async function uploadP0 ({device, data, productSecret}: IProps) {
   const path = `/v2/products/${device.productKey}/devices/offline-data`;
+
+  let passCode = device.passcode
+
+  const key = enc.Hex.parse(productSecret);
+  const iv = enc.Hex.parse('');
+  const srcs = enc.Utf8.parse(passCode);
+  const encrypted = AES.encrypt(srcs, key, { iv: iv, mode: mode.ECB, padding: pad.Pkcs7 });
+  passCode = encrypted.ciphertext.toString().toUpperCase();
+
   return openApiRequest<IUploadRes>(path, {
     data: {
       data,
@@ -22,7 +33,24 @@ export async function uploadP0 ({device, data}: IProps) {
     method: 'POST',
     headers: {
       'X-Gizwits-Device-Id': device.did,
-      'X-Gizwits-Device-passcode': device.passcode,
+      'X-Gizwits-Device-passcode': passCode,
     },
   }, false)
-}
+}
+
+// setTimeout(() => {
+//   uploadP0({
+//     device: {
+//       productKey: "8da73e49a9c74d6e9321b4383b44e4e9",
+//       did: "SlJJzMGa0MDOmhUTt0PIul",
+//       passcode: "1234567890",
+//     },
+//      data: [
+//       {
+//         raw: "00000003",
+//         created_at: parseInt(`${Date.now() / 1000}`, 10)
+//       }
+//     ],
+//     productSecret: "bf5df28e904b455f85fa5be1805945ad"
+//   })
+// }, 3000)

package/dist/src/GizLog.d.ts

@@ -1,18 +0,0 @@
-export declare type TLogType = 'debug' | 'info' | 'warn' | 'error';
-declare class Log {
-    logMap: {
-        id: string;
-    }[];
-    console: any;
-    debug: (...data: any[]) => void;
-    info: (...data: any[]) => void;
-    log: (...data: any[]) => void;
-    warn: (...data: any[]) => void;
-    error: (info: string, error: Error) => void;
-    setLogLevel: (type: TLogType) => {
-        success: boolean;
-        err: IError;
-    };
-}
-declare const _default: Log;
-export default _default;

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

@@ -1,9 +0,0 @@
-export default class EventListener<T> {
-    listenerMap: any;
-    addEventListener: <K extends keyof T>(type: K, func: T[K]) => Promise<{
-        success: boolean;
-    }>;
-    removeEventListener: <K extends keyof T>(type: K, func: T[K]) => {
-        success: boolean;
-    };
-}

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

@@ -1,93 +0,0 @@
-import DiscoverUDP from "../protocol/DiscoverUdp";
-import { IResult } from "../sdk";
-import EventListener from "./EventListener";
-interface ConnectDevice {
-    mac: string;
-    productKey: string;
-    socketHandle: TCPHandler;
-}
-interface ILanDevice extends IDevice {
-    expandData: DiscoverUDP;
-    ip: string;
-}
-declare type GizLanDeviceListNotifications = (devices: IDevice[]) => void;
-declare type GizLanDeviceDataNotifications = (mac: string, data: string) => void;
-export interface TLanHandleEvent {
-    GizLanDeviceList: GizLanDeviceListNotifications;
-    GizLanDeviceData: GizLanDeviceDataNotifications;
-}
-export declare class LanHandle extends EventListener<TLanHandleEvent> {
-    connectedList: ConnectDevice[];
-    private pks;
-    scanList: ILanDevice[];
-    private boradcastTimer;
-    private UDPSocket;
-    private deviceUDPPort;
-    private appUDPPort;
-    private offlineThreshold;
-    private isActive;
-    private listenDevOfflineTimer;
-    constructor({ pks }: {
-        pks: any;
-    });
-    init: () => void;
-    private onAppShow;
-    private onAppHide;
-    private listenDevOffline;
-    private notifyDevices;
-    private notifyDeviceData;
-    isSameDevice: (deviceA: IDevice, deviceB: IDevice) => boolean;
-    disConnectDevice: (target: IDevice) => {
-        success: boolean;
-        err?: undefined;
-    } | {
-        success: boolean;
-        err: any;
-    };
-    onData: (mac: string, hexString: string) => void;
-    connectDevice: (device: any) => Promise<IResult<any>>;
-    onError: (err: any) => void;
-    isMatchPk: (pk: any) => boolean;
-    onMessage: (res: WechatMiniprogram.UDPSocketOnMessageCallbackResult) => void;
-    onDeviceClose: ({ productKey, mac }: {
-        productKey: any;
-        mac: any;
-    }) => void;
-    write: (device: IDevice, value: ArrayBuffer) => Promise<{
-        success: boolean;
-    } | {
-        success: boolean;
-        message: string;
-    }>;
-    updateDevice: (updateDevice: DiscoverUDP, ip: string) => void;
-    sendBoradCast: () => void;
-    private startDiscover;
-    destory: () => void;
-}
-interface ITCPHandlerProps {
-    ip: string;
-    mac: string;
-    productKey: string;
-    onClose: (ip: any) => void;
-    onData: (mac: string, data: string) => void;
-}
-declare class TCPHandler {
-    private deviceTCPPort;
-    private ip;
-    private productKey;
-    private mac;
-    private tcpHandler;
-    private onData;
-    private onCloseListener;
-    constructor({ ip, onClose, mac, productKey, onData }: ITCPHandlerProps);
-    connect: () => Promise<IResult<any>>;
-    write: (data: ArrayBuffer) => {
-        success: boolean;
-    };
-    onMessage: (message: any) => void;
-    onError: () => void;
-    onClose: () => void;
-    initListener: () => void;
-    destory: () => void;
-}
-export {};

package/dist/src/protocol/DiscoverUdp.d.ts

@@ -1,17 +0,0 @@
-import ProtocolBase from "./ProtocolBase";
-declare type TDecodeType = 'ASCII' | 'HEX';
-declare class DiscoverUDP extends ProtocolBase {
-    did: string;
-    mac: string;
-    productKey: string;
-    deviceType: number;
-    apiUrl: string;
-    protocolVersion: string;
-    mcuVersion: string;
-    moduleVersion: string;
-    constructor(data: number[]);
-    parseEndChat: (index: any, key: any) => any;
-    baseParse: (index: any, key: any, type?: TDecodeType) => any;
-    static pack: () => Uint8Array;
-}
-export default DiscoverUDP;

package/dist/src/protocol/Ntp.d.ts

@@ -1,5 +0,0 @@
-import ProtocolBase from "./ProtocolBase";
-declare class Ntp extends ProtocolBase {
-    static pack: () => number[];
-}
-export default Ntp;

package/dist/src/protocol/OffLineData.d.ts

@@ -1,23 +0,0 @@
-import ProtocolBase from "./ProtocolBase";
-export declare class RequestSync extends ProtocolBase {
-    state: number;
-    len: number;
-    constructor(data: number[]);
-    static pack: () => number[];
-}
-export declare class SyncPackage extends ProtocolBase {
-    id: number;
-    timestemp: number;
-    payloadLen: number;
-    payload: number[];
-    constructor(data: number[]);
-    static pack: (id: number) => number[];
-}
-export declare class DeletePackage extends ProtocolBase {
-    static pack: (id: number) => number[];
-}
-export declare class CancelSync extends ProtocolBase {
-    state: number;
-    constructor(data: number[]);
-    pack: () => number[];
-}

package/dist/src/sentry.d.ts

@@ -1,2 +0,0 @@
-declare const _default: (err: any) => void;
-export default _default;

package/dist/src/services/uploadP0.d.ts

@@ -1,12 +0,0 @@
-export interface IUploadRes {
-}
-interface IData {
-    raw: string;
-    created_at: number;
-}
-interface IProps {
-    device: IDevice;
-    data: IData[];
-}
-export declare function uploadP0({ device, data }: IProps): Promise<import("../openApiRequest").IServiceResult<IUploadRes>>;
-export {};