react-native-gizwits-sdk-v5 1.1.0 → 1.1.2

package/ios/RNGizDeviceManagerModule-Bridging-Header.h

@@ -0,0 +1,5 @@
+//
+//  Use this file to import your target's public headers that you would like to expose to Swift.
+//
+
+#import <React/RCTBridgeModule.h>

package/ios/RNGizDeviceManagerModule.m

@@ -0,0 +1,14 @@
+//
+//  RNGizSDKManagerModule.m
+//  RNGizSDKManagerModule
+//
+//  Copyright © 2022 Gizwits. All rights reserved.
+//
+
+#import <React/RCTBridgeModule.h>
+
+@interface RCT_EXTERN_MODULE(RNGizDeviceManagerModule, NSObject)
+
+RCT_EXTERN_METHOD(connect:(NSDictionary *)options result:(RCTResponseSenderBlock)result)
+
+@end

package/ios/RNGizDeviceManagerModule.swift

@@ -0,0 +1,101 @@
+//
+//  RNGizUserManagerModule.swift
+//  RNGizUserManagerModule
+//
+//  Copyright © 2022 Gizwits. All rights reserved.
+//
+
+import Foundation
+import React
+import GizwitsiOSSDK
+
+struct ConnectParams: Decodable {
+    var type: GizwitsiOSSDK.GizCapability
+    var id: String
+}
+
+struct WriteParams: Decodable {
+    var type: GizwitsiOSSDK.GizCapability
+    var id: String
+    var data: String
+}
+
+@objc(RNGizDeviceManagerModule)
+class RNGizDeviceManagerModule: RCTEventEmitter  {
+    
+    override func supportedEvents() -> [String]! {
+        return []
+    }
+    
+    private func findDevice(id: String) -> GizwitsiOSSDK.GizDevice? {
+        let device = RNGizSDKManagerModule.devices.first { d in
+            d.id == id
+        }
+        return device
+    }
+    
+    @objc
+    public func sendDp(_ options: NSDictionary, result: @escaping RCTResponseSenderBlock) {
+        if let params = RNGizParamsChecker.check(options: options, result: result, paramsType: WriteParams.self) {
+            // 先找到设备
+            if let device = findDevice(id: params.id) {
+                Task {
+                    var data: GizResult<GizJSON?, GizCtrlException?>
+                    switch(params.type) {
+                    case .GizBleCapability:
+                        data = await device.bleCapability.sendDp(data: GizJSON(parseJSON: params.data))
+                        break
+                    case .GizLanCapability:
+                        data = await device.lanCapability.sendDp(data: GizJSON(parseJSON: params.data))
+                        break
+                    case .GizMQTTCapability:
+                        data = await device.mqttCapability.sendDp(data: GizJSON(parseJSON: params.data))
+                        break
+                    }
+                    
+                    GizRNCallbackManager.callbackWithResult(callback: result, result:data)
+                    
+                }
+            } else {
+                // 提示设备不存在
+                GizRNCallbackManager.callbackWithResult(callback: result, result: GizResult<Int?, GizAPIException?>(error: GizAPIException.GIZ_OPENAPI_DEVICE_NOT_FOUND))
+            }
+            
+        }
+    }
+    
+    @objc
+    public func connect(_ options: NSDictionary, result: @escaping RCTResponseSenderBlock) {
+        if let params = RNGizParamsChecker.check(options: options, result: result, paramsType: ConnectParams.self) {
+            // 先找到设备
+            if let device = findDevice(id: params.id) {
+                Task {
+                    var data: GizResult<Int?, GizConnectException?>
+                    switch(params.type) {
+                    case .GizBleCapability:
+                        data = await device.bleCapability.connect()
+                        break
+                    case .GizLanCapability:
+                        data = await device.lanCapability.connect()
+                        break
+                    case .GizMQTTCapability:
+                        data = await device.mqttCapability.connect()
+                        break
+                    }
+                    
+                    GizRNCallbackManager.callbackWithResult(callback: result, result:data)
+                    
+                }
+            } else {
+                // 提示设备不存在
+                GizRNCallbackManager.callbackWithResult(callback: result, result: GizResult<Int?, GizAPIException?>(error: GizAPIException.GIZ_OPENAPI_DEVICE_NOT_FOUND))
+            }
+            
+        }
+    }
+    
+    @objc
+    override static func requiresMainQueueSetup() -> Bool {
+        return true
+    }
+}

package/ios/RNGizSDKManagerModule.swift

@@ -12,48 +12,49 @@ import GizwitsiOSSDK
 @objc(RNGizSDKManagerModule)
 class RNGizSDKManagerModule: RCTEventEmitter, GizSdkEventHandlerDelegate  {
     
+    static var devices: Array<GizwitsiOSSDK.GizDevice> = []
+    
     override func supportedEvents() -> [String]! {
         return ["DeviceDataListener", "DeviceListListener", "DeviceStateListener"]
     }
     
     func onDeviceListUpdate(devices: Array<GizwitsiOSSDK.GizDevice>) {
-        
-        var devicesDict: Array<Any> = []
-        devices.forEach { d in
-            let dev = GizRNCallbackManager.convertToDictionary(object: d)
-            if (dev != nil) {
-                devicesDict.append(dev!)
+        DispatchQueue.main.async { [self] in
+            var devicesDict: Array<Any> = []
+            RNGizSDKManagerModule.devices = devices
+            devices.forEach { d in
+                let dev = GizRNCallbackManager.convertToDictionary(object: d)
+                if (dev != nil) {
+                    devicesDict.append(dev!)
+                }
             }
+            sendEvent(withName: "DeviceListListener", body: devicesDict)
         }
-        sendEvent(withName: "DeviceListListener", body: devicesDict)
+        
     }
     
-    func onDeviceData(device: GizwitsiOSSDK.GizBaseProfile, result: GizwitsiOSSDK.GizJSON, type: GizwitsiOSSDK.GizCapability) {
+    func onDeviceData(device: GizwitsiOSSDK.GizDevice, result: GizwitsiOSSDK.GizJSON, type: GizwitsiOSSDK.GizCapability) {
         let data = [
             "device": GizRNCallbackManager.convertToDictionary(object: device) ?? [:],
-            "data": result,
+            "data": GizRNCallbackManager.convertToDictionary(object: result) ?? [:],
             "type": type.rawValue
         ] as [String : Any]
         sendEvent(withName: "DeviceDataListener", body: data)
     }
     
-    func onDeviceState(device: GizwitsiOSSDK.GizBaseProfile, state: GizwitsiOSSDK.GizWifiDeviceNetStatus, type: GizwitsiOSSDK.GizCapability) {
+    func onDeviceState(device: GizwitsiOSSDK.GizDevice, state: GizwitsiOSSDK.GizWifiDeviceNetStatus, type: GizwitsiOSSDK.GizCapability) {
         let data = [
-            "device": GizRNCallbackManager.convertToDictionary(object: device),
+            "device": GizRNCallbackManager.convertToDictionary(object: device) ?? [:],
             "state": state.rawValue,
             "type": type.rawValue
         ] as [String : Any]
         sendEvent(withName: "DeviceStateListener", body: data)
     }
-    override init() {
-        super.init()
-        GizSDKManager.sharedInstance.setDelegate(delegate: self)
-    }
-    
     @objc
     public func initSDK(_ options: NSDictionary, result: @escaping RCTResponseSenderBlock) {
         if let config = RNGizParamsChecker.check(options: options, result: result, paramsType: GizConfigStruct.self) {
             GizSDKManager.sharedInstance.initSDK(config: config)
+            GizSDKManager.sharedInstance.setDelegate(delegate: self)
             GizRNCallbackManager.callbackWithResult(callback: result, result: GizResult<Int?, GizAPIException?>(data: nil, success: true))
         }
     }

package/lib/device.d.ts

@@ -0,0 +1,8 @@
+import Base from './Base';
+import { AttrsData, GizCapability, GizResult } from './types';
+declare class RNGizDeviceManagerModule extends Base {
+    sendDp(id: string, type: GizCapability, data: Object): Promise<GizResult<AttrsData, any>>;
+    connect(id: string, type: GizCapability): Promise<GizResult<any, any>>;
+}
+declare const _default: RNGizDeviceManagerModule;
+export default _default;

package/lib/device.js

@@ -0,0 +1,24 @@
+import { NativeModules } from 'react-native';
+import Base from './Base';
+class RNGizDeviceManagerModule extends Base {
+    sendDp(id, type, data) {
+        return this.callbackWapper((callback) => {
+            const dataString = JSON.stringify(data);
+            NativeModules.RNGizDeviceManagerModule.sendDp({
+                id,
+                type,
+                data: dataString,
+            }, callback);
+        });
+    }
+    connect(id, type) {
+        return this.callbackWapper((callback) => {
+            NativeModules.RNGizDeviceManagerModule.connect({
+                id,
+                type,
+            }, callback);
+        });
+    }
+}
+export default new RNGizDeviceManagerModule();
+//# sourceMappingURL=device.js.map

package/lib/device.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"device.js","sourceRoot":"","sources":["../src/device.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AAE5C,OAAO,IAAI,MAAM,QAAQ,CAAA;AAGzB,MAAM,wBAAyB,SAAQ,IAAI;IACzC,MAAM,CACJ,EAAU,EACV,IAAmB,EACnB,IAAY;QAEZ,OAAO,IAAI,CAAC,cAAc,CAAC,CAAC,QAA+B,EAAE,EAAE;YAC7D,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;YACvC,aAAa,CAAC,wBAAwB,CAAC,MAAM,CAC3C;gBACE,EAAE;gBACF,IAAI;gBACJ,IAAI,EAAE,UAAU;aACjB,EACD,QAAQ,CACT,CAAA;QACH,CAAC,CAAC,CAAA;IACJ,CAAC;IACD,OAAO,CAAC,EAAU,EAAE,IAAmB;QACrC,OAAO,IAAI,CAAC,cAAc,CAAC,CAAC,QAA+B,EAAE,EAAE;YAC7D,aAAa,CAAC,wBAAwB,CAAC,OAAO,CAC5C;gBACE,EAAE;gBACF,IAAI;aACL,EACD,QAAQ,CACT,CAAA;QACH,CAAC,CAAC,CAAA;IACJ,CAAC;CACF;AAED,eAAe,IAAI,wBAAwB,EAAE,CAAA"}

package/lib/index.d.ts

@@ -1,4 +1,5 @@
 import Base from './Base';
+import RNGizDeviceManagerModule from './device';
 import { DeviceDataCallback, DeviceDataRes, DeviceListCallback, DeviceStateCallback, DeviceStateRes, GizConfigStruct, IDevice } from './types';
 import * as Types from './types';
 import RNGizUserManagerModule from './user';
@@ -7,6 +8,7 @@ declare class RNGizSDKManagerModule extends Base {
     deviceListCallbacks: DeviceListCallback[];
     deviceStateCallbacks: DeviceStateCallback[];
     constructor();
+    appendDeviceFunction: (device: IDevice) => void;
     deviceDataCallback: (data: DeviceDataRes) => void;
     deviceListCallback: (data: IDevice[]) => void;
     deviceStateCallback: (data: DeviceStateRes) => void;
@@ -25,4 +27,4 @@ declare class RNGizSDKManagerModule extends Base {
 }
 declare const _default: RNGizSDKManagerModule;
 export default _default;
-export { RNGizUserManagerModule, Types };
+export { RNGizDeviceManagerModule, RNGizUserManagerModule, Types };

package/lib/index.js

@@ -1,5 +1,6 @@
 import { NativeEventEmitter, NativeModules } from 'react-native';
 import Base from './Base';
+import RNGizDeviceManagerModule from './device';
 import * as Types from './types';
 import RNGizUserManagerModule from './user';
 const eventEmitter = new NativeEventEmitter(NativeModules.RNGizSDKManagerModule);
@@ -9,6 +10,27 @@ class RNGizSDKManagerModule extends Base {
         this.deviceDataCallbacks = [];
         this.deviceListCallbacks = [];
         this.deviceStateCallbacks = [];
+        this.appendDeviceFunction = (device) => {
+            // 补充对应的设备方法
+            device.bleCapability.connect = () => {
+                return RNGizDeviceManagerModule.connect(device.id, 'BLE');
+            };
+            device.lanCapability.connect = () => {
+                return RNGizDeviceManagerModule.connect(device.id, 'LAN');
+            };
+            device.mqttCapability.connect = () => {
+                return RNGizDeviceManagerModule.connect(device.id, 'MQTT');
+            };
+            device.bleCapability.sendDp = (data) => {
+                return RNGizDeviceManagerModule.sendDp(device.id, 'BLE', data);
+            };
+            device.lanCapability.sendDp = (data) => {
+                return RNGizDeviceManagerModule.sendDp(device.id, 'LAN', data);
+            };
+            device.mqttCapability.sendDp = (data) => {
+                return RNGizDeviceManagerModule.sendDp(device.id, 'MQTT', data);
+            };
+        };
         this.deviceDataCallback = (data) => {
             this.deviceDataCallbacks.map((item) => {
                 item(data);
@@ -16,6 +38,9 @@ class RNGizSDKManagerModule extends Base {
         };
         this.deviceListCallback = (data) => {
             this.deviceListCallbacks.map((item) => {
+                data.map((d) => {
+                    this.appendDeviceFunction(d);
+                });
                 item(data);
             });
         };
@@ -43,9 +68,17 @@ class RNGizSDKManagerModule extends Base {
      * 查询设备列表
      */
     async getDevices() {
-        return this.callbackWapper((callback) => {
+        var _a;
+        const data = await this.callbackWapper((callback) => {
             NativeModules.RNGizSDKManagerModule.getDevices({}, callback);
         });
+        if (data.success) {
+            (_a = data.data) === null || _a === void 0 ? void 0 : _a.map((item) => {
+                // 补充一些方法
+                this.appendDeviceFunction(item);
+            });
+        }
+        return data;
     }
     // 添加监听
     addDeviceDataListener(callback) {
@@ -69,5 +102,5 @@ class RNGizSDKManagerModule extends Base {
     }
 }
 export default new RNGizSDKManagerModule();
-export { RNGizUserManagerModule, Types };
+export { RNGizDeviceManagerModule, RNGizUserManagerModule, Types };
 //# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.tsx"],"names":[],"mappings":"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"}

package/lib/types.d.ts

@@ -1,8 +1,13 @@
 export declare type AuthenticationMethod = 0 | 1;
+export interface AttrsData {
+    [keyof: string]: any;
+}
 export interface GizBaseCapability {
     name: string;
     isActived: boolean;
     netStatus: NetStatus;
+    connect: () => Promise<GizResult<any, any>>;
+    sendDp: (data: Object) => Promise<GizResult<AttrsData, any>>;
 }
 export interface GizBaseProfile {
     id: string;
@@ -78,17 +83,27 @@ export interface GizConfigStruct {
     serverInfo?: ServerInfoStruct;
 }
 export declare type GizWifiDeviceNetStatus = 0 | 1 | 2 | 3;
-export declare type GizCapability = 0 | 1 | 2;
+export declare type GizCapability = 'BLE' | 'LAN' | 'MQTT';
 export interface DeviceDataRes {
-    device: GizBaseProfile;
-    data: any;
+    device: IDevice;
+    data: GizDeviceData;
     type: GizCapability;
 }
 export interface DeviceStateRes {
-    device: GizBaseProfile;
+    device: IDevice;
     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;
+export interface GizDeviceDataItem {
+    [keyof: string]: number | Array<number> | boolean;
+}
+export interface GizDeviceData {
+    sn: number;
+    cmd: number;
+    data: GizDeviceDataItem;
+    alerts: GizDeviceDataItem;
+    faults: GizDeviceDataItem;
+}

package/package.json

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