react-native-gizwits-sdk-v5 1.3.14 → 1.3.16

package/android/build.gradle

@@ -4,6 +4,7 @@ buildscript {
     }
     ext {
         gson_version = '2.9.1'
+        startup_version = '1.1.1'
         kotlin_coroutine_version = '1.6.4'
         retrofit_version = '2.9.0'
         room_version = '2.5.0'
@@ -30,21 +31,21 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion safeExtGet('compileSdkVersion', 33)
+    compileSdkVersion safeExtGet('compileSdkVersion', 34)
     buildToolsVersion safeExtGet('buildToolsVersion', '33.0.0')
 
     defaultConfig {
-        minSdkVersion safeExtGet('minSdkVersion', 21)
-        targetSdkVersion safeExtGet('targetSdkVersion', 33)
+        minSdkVersion safeExtGet('minSdkVersion', 26)
+        targetSdkVersion safeExtGet('targetSdkVersion', 34)
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
 
     kotlinOptions {
-        jvmTarget = '17'
+        jvmTarget = '11'
     }
 }
 
@@ -62,11 +63,15 @@ dependencies {
     implementation 'io.sentry:sentry-android:6.29.0'
     implementation "org.eclipse.paho:org.eclipse.paho.client.mqttv3:$mqtt_version"
 
+    implementation "androidx.startup:startup-runtime:$startup_version"
+
+    implementation("io.github.gizwits:sdk:1.0.15")
+    implementation("io.github.gizwits:sdk-bluetooth:1.0.15")
+    implementation("io.github.gizwits:sdk-lan:1.0.15")
+    implementation("io.github.gizwits:sdk-mqtt:1.0.15")
+
+    // implementation files('libs/sdk-release.aar', 'libs/sdk-bluetooth-release.aar', 'libs/sdk-lan-release.aar', 'libs/sdk-mqtt-release.aar')
 
-    implementation("io.github.gizwits:sdk:1.0.14")
-    implementation("io.github.gizwits:sdk-bluetooth:1.0.14")
-    implementation("io.github.gizwits:sdk-lan:1.0.14")
-    implementation("io.github.gizwits:sdk-mqtt:1.0.14")
 
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlin_coroutine_version")
     // retrofit
@@ -82,4 +87,4 @@ dependencies {
     //ktor
     implementation "io.ktor:ktor-network:$ktor_network_version"
 
-}
+}

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

@@ -1,6 +1,7 @@
 package com.gizwits.reactnativegizwitssdkv5
 import com.facebook.react.bridge.Callback
 import com.facebook.react.bridge.ReadableMap
+import com.facebook.react.bridge.ReadableNativeMap
 import com.gizwits.smart.sdk.GizDevice
 import com.gizwits.smart.sdk.GizSDKManager
 import com.gizwits.smart.sdk.exception.GizException
@@ -14,9 +15,17 @@ interface DeviceParams{
 }
 class RNGizParamsChecker {
     companion object {
+
+        private fun convertReadableMapToJson(readableMap: ReadableMap): String {
+          val readableNativeMap = readableMap as ReadableNativeMap
+          val hashMap = readableNativeMap.toHashMap()
+          val gson = Gson()
+          return gson.toJson(hashMap)
+        }
+
         fun <T : Any> check(options: ReadableMap, result: Callback, paramsType: Class<T>): T? {
             val gson = Gson()
-            val jsonString = options.toString()
+            val jsonString = convertReadableMapToJson(options)
             try {
                 return gson.fromJson(jsonString, paramsType)
             } catch (e: JsonSyntaxException) {

package/package.json

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