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

package/android/build.gradle

@@ -63,10 +63,10 @@ dependencies {
 
     implementation "androidx.startup:startup-runtime:$startup_version"
 
-   implementation("io.github.gizwits:sdk:1.0.51")
-   implementation("io.github.gizwits:sdk-bluetooth:1.0.51")
-   implementation("io.github.gizwits:sdk-lan:1.0.51")
-   implementation("io.github.gizwits:sdk-mqtt:1.0.51")
+   implementation("io.github.gizwits:sdk:1.0.52")
+   implementation("io.github.gizwits:sdk-bluetooth:1.0.52")
+   implementation("io.github.gizwits:sdk-lan:1.0.52")
+   implementation("io.github.gizwits:sdk-mqtt:1.0.52")
 
     //  implementation files('libs/sdk-release.aar', 'libs/sdk-bluetooth-release.aar', 'libs/sdk-lan-release.aar', 'libs/sdk-mqtt-release.aar')
 

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

@@ -23,6 +23,7 @@ import com.gizwits.smart.sdk.lan.subscribeLanDeviceList
 import com.gizwits.smart.sdk.mqtt.mqttCapacity
 import com.gizwits.smart.sdk.mqtt.queryBoundDevices
 import com.gizwits.smart.sdk.mqtt.subscribeBoundDeviceList
+import com.gizwits.smart.sdk.mqtt.subscribeBindEvent
 import com.google.gson.annotations.SerializedName
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -65,7 +66,8 @@ class RNGizSDKManagerModule(reactContext: ReactApplicationContext) : ReactContex
     enum class EventName(val value: String) {
         DeviceDataListener("DeviceDataListener"),
         DeviceListListener("DeviceListListener"),
-        DeviceStateListener("DeviceStateListener")
+        DeviceStateListener("DeviceStateListener"),
+        DeviceBindStateListener("DeviceBindStateListener"),
     }
 
     /** @hide */
@@ -82,6 +84,19 @@ class RNGizSDKManagerModule(reactContext: ReactApplicationContext) : ReactContex
             transform(it.first, it.second, it.third)
         }
     }
+    /** @hide */
+    @OptIn(ExperimentalCoroutinesApi::class)
+    fun <T1, T2, R> combineLatest(
+      flow1: Flow<T1>,
+      flow2: Flow<T2>,
+      transform: suspend (a: T1, b: T2) -> R
+    ): Flow<R> {
+      return combine(flow1, flow2) { value1, value2 ->
+        Pair(value1, value2)
+      }.mapLatest {
+        transform(it.first, it.second)
+      }
+    }
 
     override fun getName() = "RNGizSDKManagerModule"
     private val deviceListState: Flow<List<GizDevice>> =
@@ -97,6 +112,14 @@ class RNGizSDKManagerModule(reactContext: ReactApplicationContext) : ReactContex
 
     override fun initialize() {
         super.initialize()
+        CoroutineScope(Dispatchers.IO).launch {
+            GizSDKManager.subscribeBindEvent().collect { 
+                val data = JSONObject()
+                data.put("did", it.first)
+                data.put("isBind", it.second)
+                sendEvent(EventName.DeviceBindStateListener.name, GizRNCallbackManager.jsonObject2WriteableMap(data))
+            }
+        }
         CoroutineScope(Dispatchers.IO).launch {
             deviceListState.debounce(500).collect { deviceList ->
                 val newDevices = deviceList - devices
@@ -107,9 +130,13 @@ class RNGizSDKManagerModule(reactContext: ReactApplicationContext) : ReactContex
                     // 新增的设备挂监听
                     // 被移除的设备携程会自动销毁
                     scope.launch {
-                        dev.bleCapacity.subscribeStatus().debounce(500).collectLatest{
+                        combineLatest(
+                            dev.bleCapacity.subscribeStatus().debounce(500),
+                            dev.bleCapacity.subscribeIsLogin().debounce(500),
+                        ) { 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 +161,13 @@ class RNGizSDKManagerModule(reactContext: ReactApplicationContext) : ReactContex
 
 
                     scope.launch {
-                        dev.lanCapacity.subscribeStatus().debounce(500).collectLatest{
+                        combineLatest(
+                            dev.lanCapacity.subscribeStatus().debounce(500),
+                            dev.lanCapacity.subscribeIsLogin().debounce(500),
+                        ) { 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 +192,13 @@ class RNGizSDKManagerModule(reactContext: ReactApplicationContext) : ReactContex
 
 
                     scope.launch {
-                        dev.mqttCapacity.subscribeStatus().debounce(500).collectLatest{
+                        combineLatest(
+                            dev.mqttCapacity.subscribeStatus().debounce(500),
+                            dev.mqttCapacity.subscribeIsLogin().debounce(500),
+                        ) { 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.67",
   "description": "Gizwits",
   "homepage": "https://github.com/demchenkoalex/react-native-gizwits-sdk-v5#readme",
   "main": "lib/index.js",

package/react-native-gizwits-sdk-v5.podspec

@@ -19,6 +19,6 @@ Pod::Spec.new do |s|
 
   s.dependency 'React'
   s.dependency 'CryptoSwift', '~> 1.8.0'
-  s.dependency 'GizwitsiOSSDK', '~> 1.2.0'
+  s.dependency 'GizwitsiOSSDK', '~> 1.2.1'
 
 end