react-native-gizwits-sdk-v5 1.3.28 → 1.3.29

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

@@ -19,7 +19,9 @@ import com.gizwits.smart.sdk.mqtt.mqttCapacity
 import com.gizwits.smart.sdk.mqtt.queryBoundDevices
 import com.gizwits.smart.sdk.ota.GizOTAFirmwareType
 import com.gizwits.smart.sdk.ota.OTAProgressData
+import com.google.gson.Gson
 import com.google.gson.JsonArray
+import com.google.gson.JsonObject
 import com.google.gson.annotations.SerializedName
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -123,15 +125,12 @@ class RNGizDeviceManagerModule(reactContext: ReactApplicationContext) : ReactCon
         GizProvideWiFiCredentialsEvent("GizProvideWiFiCredentialsEvent"),
     }
 
-    fun jsonObjectToPairs(jsonObject: JSONObject): Array<Pair<String, Any>> {
+    fun jsonObjectToPairs(jsonObject: JsonObject): Array<Pair<String, Any>> {
         val pairs = mutableListOf<Pair<String, Any>>()
-
-        jsonObject.keys().forEach { key ->
-            val value = jsonObject.get(key)
-            val pair = key to value
-            pairs.add(pair)
+        for ((key, value) in jsonObject.entrySet()) {
+          val pair = key to value
+          pairs.add(pair)
         }
-
         return pairs.toTypedArray()
     }
 
@@ -142,7 +141,8 @@ class RNGizDeviceManagerModule(reactContext: ReactApplicationContext) : ReactCon
         if (config !=null && device !=null) {
             CoroutineScope(Dispatchers.Main).launch {
                 try {
-                    val jsonObject = JSONObject(config.data)
+                    val gson = Gson()
+                    val jsonObject = gson.fromJson(config.data, JsonObject::class.java)
                     val attrs = jsonObjectToPairs(jsonObject)
                     val res = when(config.type) {
                         CapacityTypes.BLE -> device.bleCapacity.sendDp(*attrs)
@@ -385,4 +385,4 @@ class RNGizDeviceManagerModule(reactContext: ReactApplicationContext) : ReactCon
             .emit(name, data)
     }
 
-}
+}

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

@@ -3,6 +3,7 @@ package com.gizwits.reactnativegizwitssdkv5
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.Callback
 import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.ReactContext
 import com.facebook.react.bridge.ReactContextBaseJavaModule
 import com.facebook.react.bridge.ReactMethod
 import com.facebook.react.bridge.ReadableMap
@@ -11,7 +12,6 @@ import com.facebook.react.bridge.WritableMap
 import com.facebook.react.modules.core.DeviceEventManagerModule
 import com.gizwits.smart.sdk.GizDevice
 import com.gizwits.smart.sdk.GizSDKManager
-import com.gizwits.smart.sdk.GizUserManager
 import com.gizwits.smart.sdk.bluetooth.bleCapacity
 import com.gizwits.smart.sdk.bluetooth.startBleScan
 import com.gizwits.smart.sdk.bluetooth.stopBleScan
@@ -28,20 +28,17 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.debounce
-import kotlinx.coroutines.flow.drop
 import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.flow.last
 import kotlinx.coroutines.flow.mapLatest
 import kotlinx.coroutines.flow.take
-import kotlinx.coroutines.flow.toList
 import kotlinx.coroutines.launch
 import org.json.JSONArray
 import org.json.JSONObject
 
+
 data class GizGetProductConfig(
     @SerializedName("productKey")
     val productKey: String,
@@ -50,6 +47,10 @@ data class GizGetProductConfig(
 
 class RNGizSDKManagerModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaModule(reactContext) {
 
+    private var mReactContext: ReactContext? = null
+    init {
+      mReactContext = reactContext
+    }
     companion object {
         internal var devices = listOf<GizDevice>()
     }
@@ -197,14 +198,14 @@ class RNGizSDKManagerModule(reactContext: ReactApplicationContext) : ReactContex
     }
 
     fun sendEvent(name:String, data: WritableArray?) {
-        reactApplicationContext
-            .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
-            .emit(name, data)
+      mReactContext!!
+        .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
+        .emit(name, data)
     }
     fun sendEvent(name:String, data: WritableMap?) {
-        reactApplicationContext
-            .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
-            .emit(name, data)
+      mReactContext!!
+        .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
+        .emit(name, data)
     }
 
     @ReactMethod

package/package.json

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