react-native-gizwits-sdk-v5 1.3.58 → 1.3.60

package/android/build.gradle

@@ -63,10 +63,10 @@ dependencies {
 
     implementation "androidx.startup:startup-runtime:$startup_version"
 
-   implementation("io.github.gizwits:sdk:1.0.46")
-   implementation("io.github.gizwits:sdk-bluetooth:1.0.46")
-   implementation("io.github.gizwits:sdk-lan:1.0.46")
-   implementation("io.github.gizwits:sdk-mqtt:1.0.46")
+   implementation("io.github.gizwits:sdk:1.0.48")
+   implementation("io.github.gizwits:sdk-bluetooth:1.0.48")
+   implementation("io.github.gizwits:sdk-lan:1.0.48")
+   implementation("io.github.gizwits:sdk-mqtt:1.0.48")
 
     //  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/GizRNCallbackManager.kt

@@ -35,6 +35,7 @@ object GizRNCallbackManager {
             result.exceptionOrNull()?.let {
                 try {
                     data.error = (it as GizException).errorCode
+                    data.message = (it as GizException).localizedMessage
                 } catch (e: Exception) {
 
                 }

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

@@ -336,13 +336,16 @@ class RNGizDeviceManagerModule(reactContext: ReactApplicationContext) : ReactCon
     }
 
     fun handleStartUpgradeProgress(event: OTAProgressData, device: GizDevice) {
-        val jsonObject = JSONObject()
-        jsonObject.put("data", GizRNCallbackManager.convertToMap(event))
-        jsonObject.put("device", device.toJsonObject())
-        sendEvent(
-            EventName.GizOTAProgressEvent.name,
-            GizRNCallbackManager.jsonObject2WriteableMap(jsonObject)
-        )
+      val jsonObject = JSONObject()
+      val dataObject = JSONObject()
+      dataObject.put("percentage", event.percentage)
+      dataObject.put("event", event.event.value)
+      jsonObject.put("data", dataObject)
+      jsonObject.put("device", device.toJsonObject())
+      sendEvent(
+          EventName.GizOTAProgressEvent.name,
+          GizRNCallbackManager.jsonObject2WriteableMap(jsonObject)
+      )
     }
     @ReactMethod
     fun startUpgrade(options: ReadableMap, result: Callback) {
@@ -350,9 +353,11 @@ class RNGizDeviceManagerModule(reactContext: ReactApplicationContext) : ReactCon
         if (config !=null && device !=null) {
             CoroutineScope(Dispatchers.Main).launch {
                 val res = when(config.type) {
-                    CapacityTypes.BLE -> device.bleCapacity.startUpgrade(config.firmwareType, processHandler = {
+                    CapacityTypes.BLE -> {
+                      device.bleCapacity.startUpgrade(config.firmwareType, processHandler = {
                         handleStartUpgradeProgress(it, device)
-                    })
+                      })
+                    }
                     CapacityTypes.LAN -> device.lanCapacity.startUpgrade(config.firmwareType, processHandler = {
                         handleStartUpgradeProgress(it, device)
                     })

package/package.json

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