react-native-gizwits-sdk-v5 1.2.0 → 1.2.2

package/android/build.gradle

@@ -10,7 +10,7 @@ buildscript {
 
     dependencies {
         classpath 'com.android.tools.build:gradle:7.0.4'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${safeExtGet('kotlinVersion', '1.6.10')}"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${safeExtGet('kotlinVersion', '1.8.0')}"
     }
 }
 
@@ -22,12 +22,21 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion safeExtGet('compileSdkVersion', 31)
-    buildToolsVersion safeExtGet('buildToolsVersion', '31.0.0')
+    compileSdkVersion safeExtGet('compileSdkVersion', 33)
+    buildToolsVersion safeExtGet('buildToolsVersion', '33.0.0')
 
     defaultConfig {
         minSdkVersion safeExtGet('minSdkVersion', 21)
-        targetSdkVersion safeExtGet('targetSdkVersion', 31)
+        targetSdkVersion safeExtGet('targetSdkVersion', 33)
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+
+    kotlinOptions {
+        jvmTarget = '17'
     }
 }
 
@@ -39,4 +48,10 @@ repositories {
 dependencies {
     //noinspection GradleDynamicVersion
     implementation 'com.facebook.react:react-native:+'
-}
+
+    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'
+
+    compileOnly files('libs/sdk-release.aar', 'libs/sdk-bluetooth-release.aar', 'libs/sdk-lan-release.aar', 'libs/sdk-mqtt-release.aar')
+}

package/android/src/main/AndroidManifest.xml

@@ -1,2 +1,31 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.gizwits.reactnativegizwitssdkv5"></manifest>
+    package="com.gizwitsrn.reactnativegizwitssdkv5" xmlns:tools="http://schemas.android.com/tools">
+
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <uses-permission
+        android:name="android.permission.BLUETOOTH"
+        android:maxSdkVersion="30"/>
+    <uses-permission
+        android:name="android.permission.BLUETOOTH_ADMIN"
+        android:maxSdkVersion="30"/>
+    <uses-permission
+        android:name="android.permission.ACCESS_FINE_LOCATION"
+        android:maxSdkVersion="30"/>
+    <uses-permission
+        android:name="android.permission.ACCESS_COARSE_LOCATION"
+        android:maxSdkVersion="30"/>
+    <uses-permission
+        android:name="android.permission.BLUETOOTH_SCAN"
+        android:usesPermissionFlags="neverForLocation"
+        tools:targetApi="s" />
+    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT"/>
+    <meta-data
+        android:name="io.sentry.auto-init"
+        android:value="false" />
+    <application>
+        <meta-data
+            android:name="io.sentry.auto-init"
+            android:value="false" />
+    </application>
+</manifest>

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

@@ -1,13 +1,29 @@
-package com.gizwits.reactnativegizwitssdkv5
+package com.gizwitsrn.reactnativegizwitssdkv5
 
+import com.facebook.react.bridge.Callback
 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.GizSDKManager
+import com.gizwits.smart.sdk.common.GizConfiguration
+import com.gizwits.smart.sdk.common.ProductInfoStruct
 
 class RNGizSDKManagerModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaModule(reactContext) {
 
     override fun getName() = "RNGizSDKManagerModule"
 
-    override fun getConstants(): MutableMap<String, Any> {
-        return hashMapOf("count" to 1)
+    @ReactMethod
+    fun initSDK(params: ReadableMap, callback: Callback) {
+        GizSDKManager.initSDK(
+            GizConfiguration(
+                appId = "8f187b1deb9e44b6aa1374b8f13bccb1",
+                appSecret = "d73fa6d6d7c04d37b6b2cc13a18a9f37",
+                productInfoList = listOf(
+                    ProductInfoStruct("f0ca03ad778543148e0f0e52a5513ef4","70671689c3644716aa6dc581a738315a"),
+                ),
+                serverInfo = null
+            )
+        )
     }
 }

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

@@ -1,9 +1,10 @@
-package com.gizwits.reactnativegizwitssdkv5
+package com.gizwitsrn.reactnativegizwitssdkv5
 
 import com.facebook.react.ReactPackage
 import com.facebook.react.bridge.NativeModule
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.uimanager.ViewManager
+import kotlin.collections.mutableListOf
 
 class RNGizSDKManagerPackage : ReactPackage {
 

package/ios/RNGizDeviceManagerModule.swift

@@ -154,7 +154,7 @@ class RNGizDeviceManagerModule: RCTEventEmitter  {
                     // 推送数据到 GizOTAProgressEvent
                     let data = [
                         "device": GizRNCallbackManager.convertToDictionary(object: device) ?? [:],
-                        "event": GizRNCallbackManager.convertToDictionary(object: event) as Any
+                        "data": GizRNCallbackManager.convertToDictionary(object: event) as Any
                     ] as [String : Any]
                     sendEvent(withName: "GizOTAProgressEvent", body: data)
                 }

package/package.json

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