react-native-gizwits-sdk-v5 1.0.5 → 1.0.7

package/ios/GizRNCallbackManager.swift

@@ -1,13 +1,13 @@
 
 
 import Foundation
-import GizSDKV5
+import GizwitsiOSSDK
 
 
 public class GizRNCallbackManager {
     
-    public static func callbackWithResult(callback: RCTResponseSenderBlock, result: GizResult<Any, Any>) {
-        var resultData = convertToDictionary(object: result)
+    public static func callbackWithResult<T, U>(callback: RCTResponseSenderBlock, result: GizResult<T, U>) {
+        let resultData = convertToDictionary(object: result)
         if (result.success) {
             callback([NSNull(), resultData])
         } else {
@@ -15,7 +15,7 @@ public class GizRNCallbackManager {
         }
     }
     
-    public static func convertToDictionary<T: Codable>(object: T) -> [String: Any]? {
+    public static func convertToDictionary<T: Encodable>(object: T) -> [String: Any]? {
         let encoder = JSONEncoder()
         guard let data = try? encoder.encode(object) else {
             return nil

package/ios/RNGizSDKManagerModule.m

@@ -11,4 +11,6 @@
 
 RCT_EXTERN_METHOD(initSDK:(NSDictionary *)options result:(RCTResponseSenderBlock)result)
 
+RCT_EXTERN_METHOD(getDevices:(NSDictionary *)options result:(RCTResponseSenderBlock)result)
+
 @end

package/ios/RNGizSDKManagerModule.swift

@@ -6,25 +6,70 @@
 //
 
 import Foundation
-import GizSDKV5
+import React
+import GizwitsiOSSDK
 
 @objc(RNGizSDKManagerModule)
-class RNGizSDKManagerModule: NSObject  {
+class RNGizSDKManagerModule: RCTEventEmitter, GizSdkEventHandlerDelegate  {
+    
+    override func supportedEvents() -> [String]! {
+        return ["DeviceDataListener", "DeviceListListener", "DeviceStateListener"]
+    }
+    
+    func onDeviceListUpdate(devices: Array<GizwitsiOSSDK.GizDevice>) {
+        sendEvent(withName: "DeviceListListener", body: GizRNCallbackManager.convertToDictionary(object: devices))
+    }
+    
+    func onDeviceData(device: GizwitsiOSSDK.GizBaseProfile, result: GizwitsiOSSDK.GizJSON, type: GizwitsiOSSDK.GizCapability) {
+        let data = [
+            "device": GizRNCallbackManager.convertToDictionary(object: device),
+            "data": result,
+            "type": type.rawValue
+        ]
+        sendEvent(withName: "DeviceDataListener", body: data)
+    }
+    
+    func onDeviceState(device: GizwitsiOSSDK.GizBaseProfile, state: GizwitsiOSSDK.GizWifiDeviceNetStatus, type: GizwitsiOSSDK.GizCapability) {
+        let data = [
+            "device": GizRNCallbackManager.convertToDictionary(object: device),
+            "state": state.rawValue,
+            "type": type.rawValue
+        ]
+        sendEvent(withName: "DeviceStateListener", body: data)
+    }
+    override init() {
+        super.init()
+        GizSDKManager.sharedInstance.setDelegate(delegate: self)
+    }
     
     @objc
     public func initSDK(_ options: NSDictionary, result: RCTResponseSenderBlock) {
-        if let jsonData = try? JSONSerialization.data(withJSONObject: options, options: []),
-           let config = try? JSONDecoder().decode(GizConfigStruct.self, from: jsonData) {
-            GizSDKManager.sharedInstance.initSDK(config: config)
-            GizRNCallbackManager.callbackWithResult(callback: result, result: GizResult(data: nil, success: true))
+        if let jsonData = try? JSONSerialization.data(withJSONObject: options, options: []) {
+            
+            if let config = try? JSONDecoder().decode(GizConfigStruct.self, from: jsonData) {
+                 GizSDKManager.sharedInstance.initSDK(config: config)
+                 GizRNCallbackManager.callbackWithResult(callback: result, result: GizResult<Int?, GizAPIException?>(data: nil, success: true))
+             } else {
+                 // 参数错误
+                 GizRNCallbackManager.callbackWithResult(callback: result, result: GizResult<Int?, GizAPIException?>(error: GizAPIException.GIZ_SDK_PARAM_INVALID))
+             }
         } else {
-            // 回调错误
-            GizRNCallbackManager.callbackWithResult(callback: result, result: GizResult(error: APIException.GIZ_SDK_PARAM_INVALID))
+            // 解析json失败
+            GizRNCallbackManager.callbackWithResult(callback: result, result: GizResult<Int?, GizAPIException?>(error: GizAPIException.GIZ_SDK_PARAM_INVALID))
+        }
+    }
+    
+    @objc
+    public func getDevices(result: @escaping RCTResponseSenderBlock) {
+        Task {
+            let data = await GizSDKManager.sharedInstance.getDevices()
+            GizRNCallbackManager.callbackWithResult(callback: result, result: GizResult<Array<GizDevice>?, GizAPIException?>(data: data, success: true))
+
         }
     }
 
     @objc
-    static func requiresMainQueueSetup() -> Bool {
+    override static func requiresMainQueueSetup() -> Bool {
         return true
     }
 }

package/lib/Base.d.ts

@@ -0,0 +1,5 @@
+import { GizCallback, GizResult } from './types';
+declare class Base {
+    callbackWapper(func: (callback: GizCallback<any, any>) => void): Promise<GizResult<any, any>>;
+}
+export default Base;

package/lib/Base.js

@@ -0,0 +1,17 @@
+class Base {
+    callbackWapper(func) {
+        const promise = new Promise((res, _) => {
+            func((error, data) => {
+                if (error) {
+                    res(error);
+                }
+                else {
+                    res(data);
+                }
+            });
+        });
+        return promise;
+    }
+}
+export default Base;
+//# sourceMappingURL=Base.js.map

package/lib/Base.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Base.js","sourceRoot":"","sources":["../src/Base.tsx"],"names":[],"mappings":"AAEA,MAAM,IAAI;IACR,cAAc,CACZ,IAA+C;QAE/C,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE;YACrC,IAAI,CAAC,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;gBACnB,IAAI,KAAK,EAAE;oBACT,GAAG,CAAC,KAAK,CAAC,CAAA;iBACX;qBAAM;oBACL,GAAG,CAAC,IAAI,CAAC,CAAA;iBACV;YACH,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;QAEF,OAAO,OAAuC,CAAA;IAChD,CAAC;CACF;AAED,eAAe,IAAI,CAAA"}

package/lib/index.d.ts

@@ -1,25 +1,27 @@
-export interface RNGizSDKManagerModule {
-    initSDK: (config: GizConfigStruct, callback: GizCallback<any, any>) => void;
-}
-export interface GizResult<T, E> {
-    success: boolean;
-    message: string;
-    data?: T;
-    error?: E;
-}
-export declare type GizCallback<T, E> = (error: GizResult<T, E>, data: GizResult<T, E>) => void;
-export interface ServerInfoStruct {
-    openAPIInfo: string;
-}
-export interface ProductInfoStruct {
-    productKey: string;
-    productSecret: string;
-}
-export interface GizConfigStruct {
-    appID: string;
-    appSecret: string;
-    productInfos: ProductInfoStruct[];
-    serverInfo?: ServerInfoStruct;
+import Base from './Base';
+import { DeviceDataCallback, DeviceDataRes, DeviceListCallback, DeviceStateCallback, DeviceStateRes, GizConfigStruct, IDevice, TRNGizSDKManagerModule } from './types';
+import * as Types from './types';
+declare class RNGizSDKManagerModule extends Base implements TRNGizSDKManagerModule {
+    deviceDataCallbacks: DeviceDataCallback[];
+    deviceListCallbacks: DeviceListCallback[];
+    deviceStateCallbacks: DeviceStateCallback[];
+    constructor();
+    deviceDataCallback: (data: DeviceDataRes) => void;
+    deviceListCallback: (data: IDevice[]) => void;
+    deviceStateCallback: (data: DeviceStateRes) => void;
+    initSDK(config: GizConfigStruct): Promise<Types.GizResult<any, any>>;
+    /**
+     * 查询设备列表
+     */
+    getDevices(): Promise<Types.GizResult<any, any>>;
+    addDeviceDataListener(callback: DeviceDataCallback): void;
+    addDeviceListListener(callback: DeviceListCallback): void;
+    addDeviceStateListener(callback: DeviceStateCallback): void;
+    removeDeviceDataListener(callback: DeviceDataCallback): void;
+    removeDeviceListListener(callback: DeviceListCallback): void;
+    removeDeviceStateListener(callback: DeviceStateCallback): void;
+    private deleteCallBack;
 }
 declare const _default: RNGizSDKManagerModule;
 export default _default;
+export { Types };

package/lib/index.js

@@ -1,3 +1,72 @@
-import { NativeModules } from 'react-native';
-export default NativeModules.RNGizSDKManagerModule;
+import { NativeEventEmitter, NativeModules } from 'react-native';
+import Base from './Base';
+import * as Types from './types';
+const eventEmitter = new NativeEventEmitter(NativeModules.RNGizSDKManagerModule);
+class RNGizSDKManagerModule extends Base {
+    constructor() {
+        super();
+        this.deviceDataCallbacks = [];
+        this.deviceListCallbacks = [];
+        this.deviceStateCallbacks = [];
+        this.deviceDataCallback = (data) => {
+            this.deviceDataCallbacks.map((item) => {
+                item(data);
+            });
+        };
+        this.deviceListCallback = (data) => {
+            this.deviceListCallbacks.map((item) => {
+                item(data);
+            });
+        };
+        this.deviceStateCallback = (data) => {
+            this.deviceStateCallbacks.map((item) => {
+                item(data);
+            });
+        };
+        this.deleteCallBack = (callbacks, callback) => {
+            const index = callbacks.findIndex((item) => item === callback);
+            if (index !== -1) {
+                callbacks.splice(index, 1);
+            }
+        };
+        eventEmitter.addListener('DeviceDataCallback', this.deviceDataCallback);
+        eventEmitter.addListener('DeviceListCallback', this.deviceListCallback);
+        eventEmitter.addListener('DeviceStateCallback', this.deviceStateCallback);
+    }
+    async initSDK(config) {
+        return this.callbackWapper((callback) => {
+            NativeModules.RNGizSDKManagerModule.initSDK(config, callback);
+        });
+    }
+    /**
+     * 查询设备列表
+     */
+    async getDevices() {
+        return this.callbackWapper((callback) => {
+            NativeModules.RNGizSDKManagerModule.getDevices({}, callback);
+        });
+    }
+    // 添加监听
+    addDeviceDataListener(callback) {
+        this.deviceDataCallbacks.push(callback);
+    }
+    addDeviceListListener(callback) {
+        this.deviceListCallbacks.push(callback);
+    }
+    addDeviceStateListener(callback) {
+        this.deviceStateCallbacks.push(callback);
+    }
+    // 解除
+    removeDeviceDataListener(callback) {
+        this.deleteCallBack(this.deviceDataCallbacks, callback);
+    }
+    removeDeviceListListener(callback) {
+        this.deleteCallBack(this.deviceListCallbacks, callback);
+    }
+    removeDeviceStateListener(callback) {
+        this.deleteCallBack(this.deviceStateCallbacks, callback);
+    }
+}
+export default new RNGizSDKManagerModule();
+export { Types };
 //# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AA8B5C,eAAe,aAAa,CAAC,qBAA8C,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.tsx"],"names":[],"mappings":"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"}

package/lib/types.d.ts

@@ -0,0 +1,91 @@
+export declare type AuthenticationMethod = 0 | 1;
+export interface GizBaseCapability {
+    name: string;
+    isActive: boolean;
+}
+export interface GizBaseProfile {
+    mac: string;
+    productKey: string;
+    did?: string;
+    protocolVersion: number;
+    supportOTA: boolean;
+    requiresAuthentication: boolean;
+    authenticationMethod: AuthenticationMethod;
+    rootDid?: string;
+    moduleSoftVer?: string;
+    configured: boolean;
+    mcuSoftVer?: string;
+    isBind: boolean;
+    name: string;
+}
+export declare type BlueToothType = 'Mesh' | 'Beacon' | 'Voice' | 'GATT';
+export declare type BlueToothVersion = 'BLE4' | 'BLE42' | 'BLE50';
+export interface GizLanProfile {
+    ip: string;
+    port: number;
+    cTime: number;
+}
+export interface GizBleProfile {
+    deviceId: string;
+    cTime: number;
+    RSSI: number;
+    blueToothType: BlueToothType;
+    blueToothVersion: BlueToothVersion;
+}
+export interface GizMQTTProfile {
+    host: string;
+    port: number;
+}
+export interface GizBleCapability extends GizBaseCapability {
+    profile: GizBleProfile;
+}
+export interface GizLanCapability extends GizBaseCapability {
+    profile: GizLanProfile;
+}
+export interface GizMQTTCapability extends GizBaseCapability {
+    profile: GizMQTTProfile;
+}
+export interface IDevice extends GizBaseProfile {
+    bleCapability: GizBleCapability;
+    lanCapability: GizLanCapability;
+    mqttCapability: GizMQTTCapability;
+}
+export interface TRNGizSDKManagerModule {
+    initSDK: (config: GizConfigStruct) => Promise<GizResult<any, any>>;
+    getDevices: () => Promise<GizResult<[IDevice], any>>;
+}
+export interface GizResult<T, E> {
+    success: boolean;
+    message: string;
+    data?: T;
+    error?: E;
+}
+export declare type GizCallback<T, E> = (error: GizResult<T, E>, data: GizResult<T, E>) => void;
+export interface ServerInfoStruct {
+    openAPIInfo: string;
+}
+export interface ProductInfoStruct {
+    productKey: string;
+    productSecret: string;
+}
+export interface GizConfigStruct {
+    appID: string;
+    appSecret: string;
+    productInfos: ProductInfoStruct[];
+    serverInfo?: ServerInfoStruct;
+}
+export declare type GizWifiDeviceNetStatus = 0 | 1 | 2 | 3;
+export declare type GizCapability = 0 | 1 | 2;
+export interface DeviceDataRes {
+    device: GizBaseProfile;
+    data: any;
+    type: GizCapability;
+}
+export interface DeviceStateRes {
+    device: GizBaseProfile;
+    state: GizWifiDeviceNetStatus;
+    type: GizCapability;
+}
+export declare type DeviceDataCallback = (data: DeviceDataRes) => void;
+export declare type DeviceStateCallback = (data: DeviceStateRes) => void;
+export declare type DeviceListCallback = (data: IDevice[]) => void;

package/lib/types.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=types.js.map

package/lib/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":""}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-gizwits-sdk-v5",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "description": "Gizwits",
   "homepage": "https://github.com/demchenkoalex/react-native-gizwits-sdk-v5#readme",
   "main": "lib/index.js",