react-native-gizwits-sdk-v5 1.2.4 → 1.2.5

package/android/build.gradle

@@ -7,6 +7,7 @@ buildscript {
         kotlin_coroutine_version = '1.6.4'
         retrofit_version = '2.9.0'
         room_version = '2.5.0'
+        mqtt_version = '1.2.5'
     }
 
     repositories {
@@ -58,6 +59,8 @@ dependencies {
     implementation 'io.sentry:sentry-android-timber:6.29.0'
     implementation 'com.jakewharton.timber:timber:5.0.1'
     implementation 'io.sentry:sentry-android:6.29.0'
+    implementation "org.eclipse.paho:org.eclipse.paho.client.mqttv3:$mqtt_version"
+
 
     implementation files('libs/sdk-debug.aar', 'libs/sdk-bluetooth-debug.aar', 'libs/sdk-lan-debug.aar', 'libs/sdk-mqtt-debug.aar')
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlin_coroutine_version")

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

@@ -5,6 +5,41 @@ import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactContextBaseJavaModule
 import com.facebook.react.bridge.ReactMethod
 import com.facebook.react.bridge.ReadableMap
+import com.gizwits.smart.sdk.GizDevice
+import com.gizwits.smart.sdk.GizSDKManager
+import com.gizwits.smart.sdk.bluetooth.bleCapacity
+import com.gizwits.smart.sdk.common.GizConfiguration
+import com.gizwits.smart.sdk.core.capacity.CapacityTypes
+import com.gizwits.smart.sdk.exception.GizException
+import com.gizwits.smart.sdk.lan.lanCapacity
+import com.gizwits.smart.sdk.mqtt.mqttCapacity
+import com.gizwits.smart.sdk.mqtt.queryBoundDevices
+import com.google.gson.annotations.SerializedName
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+
+data class GizBindParams(
+    @SerializedName("id")
+    override val id: Int,
+    @SerializedName("alias")
+    val alias: String,
+    @SerializedName("remark")
+    val remark: String,
+) : DeviceParams
+
+data class GizUnBindParams(
+    @SerializedName("id")
+    override val id: Int,
+): DeviceParams
+
+data class GizConnectParams(
+    @SerializedName("id")
+    override val id: Int,
+    @SerializedName("type")
+    val type: CapacityTypes
+): DeviceParams
+
 
 class RNGizDeviceManagerModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaModule(reactContext) {
     enum class EventName(val value: String) {
@@ -20,10 +55,32 @@ class RNGizDeviceManagerModule(reactContext: ReactApplicationContext) : ReactCon
     fun getDeviceInfo(options: ReadableMap, result: Callback) {}
 
     @ReactMethod
-    fun bind(options: ReadableMap, result: Callback) {}
+    fun bind(options: ReadableMap, result: Callback) {
+        val (config, device) = RNGizParamsChecker.checkDeviceAndParams(options, result, GizBindParams::class.java)
+        if (config !=null && device !=null) {
+            CoroutineScope(Dispatchers.Main).launch {
+                val res = device.bindDevice(config.alias, config.remark)
+                GizRNCallbackManager.callbackWithResult(callback = result, result = res)
+                if (res.isSuccess) {
+                    GizSDKManager.queryBoundDevices()
+                }
+            }
+        }
+    }
 
     @ReactMethod
-    fun unBind(options: ReadableMap, result: Callback) {}
+    fun unBind(options: ReadableMap, result: Callback) {
+        val (config, device) = RNGizParamsChecker.checkDeviceAndParams(options, result, GizUnBindParams::class.java)
+        if (config !=null && device !=null) {
+            CoroutineScope(Dispatchers.Main).launch {
+                val res = device.unbindDevice()
+                GizRNCallbackManager.callbackWithResult(callback = result, result = res)
+                if (res.isSuccess) {
+                    GizSDKManager.queryBoundDevices()
+                }
+            }
+        }
+    }
     @ReactMethod
     fun checkUpdate(options: ReadableMap, result: Callback) {}
     @ReactMethod
@@ -32,7 +89,19 @@ class RNGizDeviceManagerModule(reactContext: ReactApplicationContext) : ReactCon
     fun register(options: ReadableMap, result: Callback) {}
 
     @ReactMethod
-    fun connect(options: ReadableMap, result: Callback) {}
+    fun connect(options: ReadableMap, result: Callback) {
+        val (config, device) = RNGizParamsChecker.checkDeviceAndParams(options, result, GizConnectParams::class.java)
+        if (config !=null && device !=null) {
+            CoroutineScope(Dispatchers.Main).launch {
+                val res = when(config.type) {
+                    CapacityTypes.BLE -> device.bleCapacity.connect()
+                    CapacityTypes.LAN -> device.lanCapacity.connect()
+                    CapacityTypes.MQTT -> device.mqttCapacity.connect()
+                }
+//                GizRNCallbackManager.callbackWithResult(callback = result, result = res)
+            }
+        }
+    }
     @ReactMethod
     fun disConnect(options: ReadableMap, result: Callback) {}
 }

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

@@ -1,11 +1,17 @@
 package com.gizwits.reactnativegizwitssdkv5
 import com.facebook.react.bridge.Callback
 import com.facebook.react.bridge.ReadableMap
+import com.gizwits.smart.sdk.GizDevice
+import com.gizwits.smart.sdk.GizSDKManager
 import com.gizwits.smart.sdk.exception.GizException
 import com.gizwits.smart.sdk.exception.GizParseException
 import com.google.gson.Gson
 import com.google.gson.JsonSyntaxException
+import com.google.gson.annotations.SerializedName
 
+interface DeviceParams{
+    val id: Int
+}
 class RNGizParamsChecker {
     companion object {
         fun <T : Any> check(options: ReadableMap, result: Callback, paramsType: Class<T>): T? {
@@ -22,5 +28,22 @@ class RNGizParamsChecker {
                 return null
             }
         }
+
+        fun <T : DeviceParams> checkDeviceAndParams(options: ReadableMap, result: Callback, paramsType: Class<T>): Pair<T?, GizDevice?> {
+            val config = check(options, result, paramsType)
+            var dev: GizDevice? = null
+            config?.let {
+                dev = GizSDKManager.getRegisteredDevice(config.id)
+                if (dev == null) {
+                    GizRNCallbackManager.callbackWithResult(
+                        callback = result,
+                        result = Result.failure<Number>(GizException.GIZ_OPENAPI_DEVICE_NOT_FOUND)
+                    )
+                }
+            }
+            return Pair(config, dev)
+        }
+
+
     }
 }

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

@@ -38,7 +38,9 @@ import org.json.JSONObject
 
 class RNGizSDKManagerModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaModule(reactContext) {
 
-    internal var devices = listOf<GizDevice>()
+    companion object {
+        internal var devices = listOf<GizDevice>()
+    }
     enum class EventName(val value: String) {
         DeviceDataListener("DeviceDataListener"),
         DeviceListListener("DeviceListListener"),

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

@@ -9,6 +9,9 @@ import com.gizwits.smart.sdk.GizUserManagerImpl
 import com.gizwits.smart.sdk.common.GizConfiguration
 import com.gizwits.smart.sdk.core.data.model.UserToken
 import com.google.gson.annotations.SerializedName
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 import java.util.Date
 
 data class UpdateAuthorizeDataParams(
@@ -33,10 +36,22 @@ class RNGizUserManagerModule(reactContext: ReactApplicationContext) : ReactConte
         config?.let {
             // Date 暂时没有用到
             GizUserManagerImpl.updateAuthorizeData(UserToken(config.token, config.uid, Date()))
+            GizRNCallbackManager.callbackWithResult(callback = result, result = Result.success(0))
         }
+
     }
     @ReactMethod
     fun loginByAnonymous(options: ReadableMap, result: Callback) {
-
+        CoroutineScope(Dispatchers.Main).launch {
+            val res = GizUserManagerImpl.loginByAnonymous()
+            GizRNCallbackManager.callbackWithResult(callback = result, result = res)
+        }
+    }
+    @ReactMethod
+    fun logout(options: ReadableMap, result: Callback) {
+        CoroutineScope(Dispatchers.Main).launch {
+            val res = GizUserManagerImpl.logout()
+            GizRNCallbackManager.callbackWithResult(callback = result, result = res)
+        }
     }
 }

package/package.json

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