react-native-gizwits-sdk-v5 1.3.65 → 1.3.66

package/android/src/main/java/com/gizwits/reactnativegizwitssdkv5/RNGizSDKManagerModule.kt

@@ -97,6 +97,14 @@ class RNGizSDKManagerModule(reactContext: ReactApplicationContext) : ReactContex
 
     override fun initialize() {
         super.initialize()
+        CoroutineScope(Dispatchers.IO).launch {
+            GizSDKManager.subscribeBindEvent().collect { data ->
+                val data = JSONObject()
+                data.put("did", data.first)
+                data.put("isBind", data.second)
+                sendEvent(EventName.DeviceBindStateListener.name, GizRNCallbackManager.jsonObject2WriteableMap(data))
+            }
+        }
         CoroutineScope(Dispatchers.IO).launch {
             deviceListState.debounce(500).collect { deviceList ->
                 val newDevices = deviceList - devices
@@ -107,9 +115,13 @@ class RNGizSDKManagerModule(reactContext: ReactApplicationContext) : ReactContex
                     // 新增的设备挂监听
                     // 被移除的设备携程会自动销毁
                     scope.launch {
-                        dev.bleCapacity.subscribeStatus().debounce(500).collectLatest{
+                        combineLatest(
+                            dev.bleCapacity.subscribeStatus(),
+                            dev.bleCapacity.subscribeIsLogin(),
+                        ).debounce(500).collectLatest { status, isLogin ->
                             val data = JSONObject()
-                            data.put("state", it.toInt())
+                            data.put("state", status.toInt())
+                            data.put("isLogin", isLogin)
                             data.put("type", "BLE")
                             data.put("device", dev.toJsonObject())
                             sendEvent(EventName.DeviceStateListener.name, GizRNCallbackManager.jsonObject2WriteableMap(data))
@@ -134,9 +146,13 @@ class RNGizSDKManagerModule(reactContext: ReactApplicationContext) : ReactContex
 
 
                     scope.launch {
-                        dev.lanCapacity.subscribeStatus().debounce(500).collectLatest{
+                        combineLatest(
+                            dev.lanCapacity.subscribeStatus(),
+                            dev.lanCapacity.subscribeIsLogin(),
+                        ).debounce(500).collectLatest { status, isLogin ->
                             val data = JSONObject()
-                            data.put("state", it.toInt())
+                            data.put("state", status.toInt())
+                            data.put("isLogin", isLogin)
                             data.put("type", "LAN")
                             data.put("device", dev.toJsonObject())
                             sendEvent(EventName.DeviceStateListener.name, GizRNCallbackManager.jsonObject2WriteableMap(data))
@@ -161,9 +177,13 @@ class RNGizSDKManagerModule(reactContext: ReactApplicationContext) : ReactContex
 
 
                     scope.launch {
-                        dev.mqttCapacity.subscribeStatus().debounce(500).collectLatest{
+                        combineLatest(
+                            dev.mqttCapacity.subscribeStatus(),
+                            dev.mqttCapacity.subscribeIsLogin(),
+                        ).debounce(500).collectLatest { status, isLogin ->
                             val data = JSONObject()
-                            data.put("state", it.toInt())
+                            data.put("state", status.toInt())
+                            data.put("isLogin", isLogin)
                             data.put("type", "MQTT")
                             data.put("device", dev.toJsonObject())
                             sendEvent(EventName.DeviceStateListener.name, GizRNCallbackManager.jsonObject2WriteableMap(data))

package/ios/RNGizSDKManagerModule.swift

@@ -58,12 +58,11 @@ class RNGizSDKManagerModule: RCTEventEmitter, GizSdkEventHandlerDelegate  {
         sendEvent(withName: "DeviceDataListener", body: data)
     }
     
-    func onDeviceState(device: GizwitsiOSSDK.GizDevice, state: GizwitsiOSSDK.GizWifiDeviceNetStatus, isOnline: Bool, isLogin: Bool, type: GizwitsiOSSDK.GizCapability) {
+    func onDeviceState(device: GizwitsiOSSDK.GizDevice, state: GizwitsiOSSDK.GizWifiDeviceNetStatus, isLogin: Bool, type: GizwitsiOSSDK.GizCapability) {
         let data = [
             "device": GizRNCallbackManager.convertToDictionary(object: device) ?? [:],
             "state": state.rawValue,
             "type": type.rawValue,
-            "isOnline": isOnline,
             "isLogin": isLogin
         ] as [String : Any]
         sendEvent(withName: "DeviceStateListener", body: data)

package/lib/types.d.ts

@@ -2,7 +2,6 @@ export declare type AuthenticationMethod = 0 | 1;
 export interface GizBaseCapability {
     name: string;
     isActive: boolean;
-    isOnline: boolean;
     isLogin: boolean;
     netStatus: NetStatus;
     connect: () => Promise<GizResult<any, any>>;
@@ -119,7 +118,6 @@ export interface DeviceDataRes {
 export interface DeviceStateRes {
     device: IDevice;
     state: GizDeviceNetStatus;
-    isOnline: boolean;
     isLogin: boolean;
     type: GizCapability;
 }

package/package.json

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