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

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 {

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,20 +6,49 @@
 //
 
 import Foundation
-import GizSDKV5
+import GizwitsiOSSDK
 
 @objc(RNGizSDKManagerModule)
-class RNGizSDKManagerModule: NSObject  {
+class RNGizSDKManagerModule: NSObject, GizSdkEventHandlerDelegate  {
+    func onDeviceListUpdate(devices: Array<GizwitsiOSSDK.GizDevice>) {
+        
+    }
+    
+    func onDeviceData(device: GizwitsiOSSDK.GizBaseProfileProvider, result: GizwitsiOSSDK.GizJSON, type: GizwitsiOSSDK.GizCapability) {
+        
+    }
+    
+    func onDeviceState(device: GizwitsiOSSDK.GizBaseProfileProvider, state: GizwitsiOSSDK.GizWifiDeviceNetStatus, type: GizwitsiOSSDK.GizCapability) {
+        
+    }
+    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))
+
         }
     }
 

package/lib/Base.d.ts

@@ -0,0 +1,5 @@
+import { GizCallback, GizResult } from './index';
+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,5 +1,9 @@
-export interface RNGizSDKManagerModule {
-    initSDK: (config: GizConfigStruct, callback: GizCallback<any, any>) => void;
+import Base from './Base';
+export interface IDevice {
+}
+export interface TRNGizSDKManagerModule {
+    initSDK: (config: GizConfigStruct) => Promise<GizResult<any, any>>;
+    getDevices: () => Promise<GizResult<[IDevice], any>>;
 }
 export interface GizResult<T, E> {
     success: boolean;
@@ -21,5 +25,9 @@ export interface GizConfigStruct {
     productInfos: ProductInfoStruct[];
     serverInfo?: ServerInfoStruct;
 }
+declare class RNGizSDKManagerModule extends Base implements TRNGizSDKManagerModule {
+    initSDK(config: GizConfigStruct): Promise<GizResult<any, any>>;
+    getDevices(): Promise<GizResult<any, any>>;
+}
 declare const _default: RNGizSDKManagerModule;
 export default _default;

package/lib/index.js

@@ -1,3 +1,16 @@
 import { NativeModules } from 'react-native';
-export default NativeModules.RNGizSDKManagerModule;
+import Base from './Base';
+class RNGizSDKManagerModule extends Base {
+    async initSDK(config) {
+        return this.callbackWapper((callback) => {
+            NativeModules.RNGizSDKManagerModule.initSDK(config, callback);
+        });
+    }
+    async getDevices() {
+        return this.callbackWapper((callback) => {
+            NativeModules.RNGizSDKManagerModule.getDevices({}, callback);
+        });
+    }
+}
+export default new RNGizSDKManagerModule();
 //# 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":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AAE5C,OAAO,IAAI,MAAM,QAAQ,CAAA;AA+BzB,MAAM,qBAAsB,SAAQ,IAAI;IACtC,KAAK,CAAC,OAAO,CAAC,MAAuB;QACnC,OAAO,IAAI,CAAC,cAAc,CAAC,CAAC,QAA+B,EAAE,EAAE;YAC7D,aAAa,CAAC,qBAAqB,CAAC,OAAO,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;QAC/D,CAAC,CAAC,CAAA;IACJ,CAAC;IACD,KAAK,CAAC,UAAU;QACd,OAAO,IAAI,CAAC,cAAc,CAAC,CAAC,QAAqC,EAAE,EAAE;YACnE,aAAa,CAAC,qBAAqB,CAAC,UAAU,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAA;QAC9D,CAAC,CAAC,CAAA;IACJ,CAAC;CACF;AAED,eAAe,IAAI,qBAAqB,EAAE,CAAA"}

package/package.json

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