react-native-gizwits-sdk-v5 1.5.0-beta.9 → 1.5.0

package/android/build.gradle

@@ -64,11 +64,13 @@ dependencies {
     implementation "androidx.startup:startup-runtime:$startup_version"
 
     implementation 'com.github.wendykierp:JTransforms:3.1'
+    // ESPTouch
+    implementation 'com.github.EspressifApp:lib-esptouch-android:1.1.1'
 
-    implementation("io.github.gizwits:sdk:1.3.7")
-    implementation("io.github.gizwits:sdk-bluetooth:1.3.7")
-    implementation("io.github.gizwits:sdk-lan:1.3.7")
-    implementation("io.github.gizwits:sdk-mqtt:1.3.7")
+    implementation("io.github.gizwits:sdk:1.4.2")
+    implementation("io.github.gizwits:sdk-bluetooth:1.4.2")
+    implementation("io.github.gizwits:sdk-lan:1.4.2")
+    implementation("io.github.gizwits:sdk-mqtt:1.4.2")
     //  implementation files('libs/sdk-release.aar', 'libs/sdk-bluetooth-release.aar', 'libs/sdk-lan-release.aar', 'libs/sdk-mqtt-release.aar')
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlin_coroutine_version")
     // retrofit

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

@@ -28,6 +28,7 @@ import com.google.gson.annotations.SerializedName
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.cancel
 import kotlinx.coroutines.launch
 import org.json.JSONArray
 import org.json.JSONObject
@@ -129,7 +130,9 @@ data class GizProvideWiFiCredentialsWithAirLinkParams(
   val timeout: Long,
   @SerializedName("productKeys")
   val productKeys: List<String>,
-): DeviceParams
+): DeviceParams {
+  override val id: String = "airlink" // AirLink 配网不需要设备ID
+}
 
 data class GizStopProvideWiFiCredentialsParams(
   @SerializedName("id")
@@ -300,7 +303,7 @@ class RNGizDeviceManagerModule(reactContext: ReactApplicationContext) : ReactCon
   }
 
   @ReactMethod
-  fun stopProvideWiFiCredentialsWithAirLink(options: ReadableMap, result: Callback) {
+  fun stopProvideWiFiCredentialsWithAirLink(result: Callback) {
       moduleScope.launch {
         val res = GizESPTouchSmartConfig.stopProvideWiFiCredentialsWithAirLink()
         GizRNCallbackManager.callbackWithResult(callback = result, result = res)

package/ios/RNGizDeviceManagerModule.m

@@ -24,7 +24,7 @@ RCT_EXTERN_METHOD(unBind:(NSDictionary *)options result:(RCTResponseSenderBlock)
 RCT_EXTERN_METHOD(stopProvideWiFiCredentials:(NSDictionary *)options result:(RCTResponseSenderBlock)result)
 RCT_EXTERN_METHOD(provideWiFiCredentials:(NSDictionary *)options result:(RCTResponseSenderBlock)result)
 RCT_EXTERN_METHOD(provideWiFiCredentialsWithAirLink:(NSDictionary *)options result:(RCTResponseSenderBlock)result)
-RCT_EXTERN_METHOD(stopProvideWiFiCredentialsWithAirLink:(NSDictionary *)options result:(RCTResponseSenderBlock)result)
+RCT_EXTERN_METHOD(stopProvideWiFiCredentialsWithAirLink:(RCTResponseSenderBlock)result)
 
 RCT_EXTERN_METHOD(startMusicalRhythm:(NSDictionary *)options result:(RCTResponseSenderBlock)result)
 RCT_EXTERN_METHOD(stopMusicalRhythm:(NSDictionary *)options result:(RCTResponseSenderBlock)result)

package/ios/RNGizDeviceManagerModule.swift

@@ -472,7 +472,7 @@ class RNGizDeviceManagerModule: RCTEventEmitter  {
     }
 
     @objc
-    public func stopProvideWiFiCredentialsWithAirLink(_ options: NSDictionary, result: @escaping RCTResponseSenderBlock) {
+    public func stopProvideWiFiCredentialsWithAirLink(_ result: @escaping RCTResponseSenderBlock) {
         Task {
             var data: GizResult<Int?, GizActivatorException?>
             data = await ESPTouchSmartConfig.sharedInstance.stopProvideWiFiCredentialsWithAirLink()

package/package.json

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

package/react-native-gizwits-sdk-v5.podspec

@@ -19,6 +19,6 @@ Pod::Spec.new do |s|
 
   s.dependency 'React'
   s.dependency 'CryptoSwift', '~> 1.8.0'
-  s.dependency 'GizwitsiOSSDK', '~> 1.8.1'
+  s.dependency 'GizwitsiOSSDK', '~> 2.0.7'
 
 end