react-native-gizwits-sdk-v5 1.5.0-beta.15 → 1.5.0-beta.2

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

@@ -8,7 +8,6 @@ import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.modules.core.DeviceEventManagerModule
 import com.gizwits.smart.sdk.GizDevice
-import com.gizwits.smart.sdk.esptouch.GizESPTouchSmartConfig
 import com.gizwits.smart.sdk.GizSDKManager
 import com.gizwits.smart.sdk.bluetooth.bleCapability
 import com.gizwits.smart.sdk.common.GizConfiguration
@@ -27,7 +26,6 @@ import com.google.gson.JsonObject
 import com.google.gson.annotations.SerializedName
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.launch
 import org.json.JSONArray
 import org.json.JSONObject
@@ -119,18 +117,6 @@ data class GizProvideWiFiCredentialsParams(
   @SerializedName("timeout")
   val timeout: Long,
 ): DeviceParams
-
-data class GizProvideWiFiCredentialsWithAirLinkParams(
-  @SerializedName("ssid")
-  val ssid: String,
-  @SerializedName("password")
-  val password: String,
-  @SerializedName("timeout")
-  val timeout: Long,
-  @SerializedName("productKeys")
-  val productKeys: List<String>,
-): DeviceParams
-
 data class GizStopProvideWiFiCredentialsParams(
   @SerializedName("id")
   override val id: String,
@@ -161,8 +147,6 @@ data class StopUpgradeParams(
 
 
 class RNGizDeviceManagerModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaModule(reactContext) {
-  private val moduleScope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
-
   enum class EventName(val value: String) {
     GizOTAProgressEvent("GizOTAProgressEvent"),
     GizProvideWiFiCredentialsEvent("GizProvideWiFiCredentialsEvent"),
@@ -179,17 +163,11 @@ class RNGizDeviceManagerModule(reactContext: ReactApplicationContext) : ReactCon
   }
 
   override fun getName() = "RNGizDeviceManagerModule"
-
-  override fun onCatalystInstanceDestroy() {
-    super.onCatalystInstanceDestroy()
-    moduleScope.cancel() // 取消所有协程
-  }
-
   @ReactMethod
   fun sendDp(options: ReadableMap, result: Callback) {
     val (config, device) = RNGizParamsChecker.checkDeviceAndParams(options, result, GizSendDPParams::class.java)
     if (config !=null && device !=null) {
-      moduleScope.launch {
+      CoroutineScope(Dispatchers.IO).launch {
         try {
           val gson = Gson()
           val jsonObject = gson.fromJson(config.data, JsonObject::class.java)
@@ -210,7 +188,7 @@ class RNGizDeviceManagerModule(reactContext: ReactApplicationContext) : ReactCon
   fun getDp(options: ReadableMap, result: Callback) {
     val (config, device) = RNGizParamsChecker.checkDeviceAndParams(options, result, GizGetDPParams::class.java)
     if (config !=null && device !=null) {
-      moduleScope.launch {
+      CoroutineScope(Dispatchers.IO).launch {
         var res = when(config.type) {
           CapacityTypes.BLE -> device.bleCapability.getDp(config.attrs)
           CapacityTypes.LAN -> device.lanCapability.getDp(config.attrs)
@@ -232,7 +210,7 @@ class RNGizDeviceManagerModule(reactContext: ReactApplicationContext) : ReactCon
   fun getDeviceInfo(options: ReadableMap, result: Callback) {
     val (config, device) = RNGizParamsChecker.checkDeviceAndParams(options, result, GizGetDeviceInfoParams::class.java)
     if (config !=null && device !=null) {
-      moduleScope.launch {
+      CoroutineScope(Dispatchers.IO).launch {
         val res = when(config.type) {
           CapacityTypes.BLE -> device.bleCapability.getDeviceInfo()
           CapacityTypes.LAN -> device.lanCapability.getDeviceInfo()
@@ -247,7 +225,7 @@ class RNGizDeviceManagerModule(reactContext: ReactApplicationContext) : ReactCon
   fun updateDeviceInfo(options: ReadableMap, result: Callback) {
     val (config, device) = RNGizParamsChecker.checkDeviceAndParams(options, result, UpdateDeviceInfoParams::class.java)
     if (config !=null && device !=null) {
-      moduleScope.launch {
+      CoroutineScope(Dispatchers.IO).launch {
         val res = device.updateDeviceInfo(config.alias, config.remark)
         GizRNCallbackManager.callbackWithResult(callback = result, result = res)
         // if (res.isSuccess) {
@@ -261,7 +239,7 @@ class RNGizDeviceManagerModule(reactContext: ReactApplicationContext) : ReactCon
   fun bind(options: ReadableMap, result: Callback) {
     val (config, device) = RNGizParamsChecker.checkDeviceAndParams(options, result, GizBindParams::class.java)
     if (config !=null && device !=null) {
-      moduleScope.launch {
+      CoroutineScope(Dispatchers.IO).launch {
         val res = device.bind(config.alias, config.remark)
         GizRNCallbackManager.callbackWithResult(callback = result, result = res)
         // if (res.isSuccess) {
@@ -275,7 +253,7 @@ class RNGizDeviceManagerModule(reactContext: ReactApplicationContext) : ReactCon
   fun unBind(options: ReadableMap, result: Callback) {
     val (config, device) = RNGizParamsChecker.checkDeviceAndParams(options, result, GizUnBindParams::class.java)
     if (config !=null && device !=null) {
-      moduleScope.launch {
+      CoroutineScope(Dispatchers.IO).launch {
         val res = device.unBind()
         GizRNCallbackManager.callbackWithResult(callback = result, result = res)
         if (res.isSuccess) {
@@ -288,7 +266,7 @@ class RNGizDeviceManagerModule(reactContext: ReactApplicationContext) : ReactCon
   fun stopProvideWiFiCredentials(options: ReadableMap, result: Callback) {
     val (config, device) = RNGizParamsChecker.checkDeviceAndParams(options, result, GizStopProvideWiFiCredentialsParams::class.java)
     if (config !=null && device !=null) {
-      moduleScope.launch {
+      CoroutineScope(Dispatchers.IO).launch {
         val res = when(config.type) {
           CapacityTypes.BLE -> device.bleCapability.stopProvideWiFiCredentials()
           CapacityTypes.LAN -> device.lanCapability.stopProvideWiFiCredentials()
@@ -299,14 +277,6 @@ class RNGizDeviceManagerModule(reactContext: ReactApplicationContext) : ReactCon
     }
   }
 
-  @ReactMethod
-  fun stopProvideWiFiCredentialsWithAirLink(options: ReadableMap, result: Callback) {
-      moduleScope.launch {
-        val res = GizESPTouchSmartConfig.stopProvideWiFiCredentialsWithAirLink()
-        GizRNCallbackManager.callbackWithResult(callback = result, result = res)
-      }
-  }
-
   fun wiFiCredentialsEventHandler(event: GizWiFiActivatorEvent, device: GizDevice) {
     val jsonObject = JSONObject()
     jsonObject.put("data", event.toString())
@@ -316,21 +286,11 @@ class RNGizDeviceManagerModule(reactContext: ReactApplicationContext) : ReactCon
       GizRNCallbackManager.jsonObject2WriteableMap(jsonObject)
     )
   }
-
-fun wiFiCredentialsWithAirLinkEventHandler(event: GizWiFiActivatorEvent) {
-    val jsonObject = JSONObject()
-    jsonObject.put("data", event.toString())
-    sendEvent(
-      EventName.GizProvideWiFiCredentialsEvent.name,
-      GizRNCallbackManager.jsonObject2WriteableMap(jsonObject)
-    )
-  }
-
   @ReactMethod
   fun provideWiFiCredentials(options: ReadableMap, result: Callback) {
     val (config, device) = RNGizParamsChecker.checkDeviceAndParams(options, result, GizProvideWiFiCredentialsParams::class.java)
     if (config !=null && device !=null) {
-      moduleScope.launch {
+      CoroutineScope(Dispatchers.IO).launch {
         val res = when(config.type) {
           CapacityTypes.BLE -> device.bleCapability.provideWiFiCredentials(
             config.ssid,
@@ -362,31 +322,11 @@ fun wiFiCredentialsWithAirLinkEventHandler(event: GizWiFiActivatorEvent) {
     }
   }
 
-  @ReactMethod
-  fun provideWiFiCredentialsWithAirLink(options: ReadableMap, result: Callback) {
-    val config = RNGizParamsChecker.check(options, result, GizProvideWiFiCredentialsWithAirLinkParams::class.java)
-    config?.let {
-      moduleScope.launch {
-        val res = GizESPTouchSmartConfig.provideWiFiCredentialsWithAirLink(
-          reactApplicationContext,
-          config.ssid,
-          config.password,
-          config.timeout,
-          config.productKeys,
-          processHandler = {
-            wiFiCredentialsWithAirLinkEventHandler(it)
-          }
-        )
-        GizRNCallbackManager.callbackWithResult(callback = result, result = res)
-      }
-    }
-  }
-
   @ReactMethod
   fun register(options: ReadableMap, result: Callback) {
     val (config, device) = RNGizParamsChecker.checkDeviceAndParams(options, result, GizRegisterDeviceParams::class.java)
     if (config !=null && device !=null) {
-      moduleScope.launch {
+      CoroutineScope(Dispatchers.IO).launch {
         val res = device.register()
         GizRNCallbackManager.callbackWithResult(callback = result, result = res)
       }
@@ -397,7 +337,7 @@ fun wiFiCredentialsWithAirLinkEventHandler(event: GizWiFiActivatorEvent) {
   fun connect(options: ReadableMap, result: Callback) {
     val (config, device) = RNGizParamsChecker.checkDeviceAndParams(options, result, GizConnectParams::class.java)
     if (config !=null && device !=null) {
-      moduleScope.launch {
+      CoroutineScope(Dispatchers.IO).launch {
         val res = when(config.type) {
           CapacityTypes.BLE -> device.bleCapability.connect()
           CapacityTypes.LAN -> device.lanCapability.connect()
@@ -411,7 +351,7 @@ fun wiFiCredentialsWithAirLinkEventHandler(event: GizWiFiActivatorEvent) {
   fun disConnect(options: ReadableMap, result: Callback) {
     val (config, device) = RNGizParamsChecker.checkDeviceAndParams(options, result, GizDisConnectParams::class.java)
     if (config !=null && device !=null) {
-      moduleScope.launch {
+      CoroutineScope(Dispatchers.IO).launch {
         val res = when(config.type) {
           CapacityTypes.BLE -> device.bleCapability.disConnect()
           CapacityTypes.LAN -> device.lanCapability.disConnect()
@@ -426,7 +366,7 @@ fun wiFiCredentialsWithAirLinkEventHandler(event: GizWiFiActivatorEvent) {
   fun checkUpdate(options: ReadableMap, result: Callback) {
     val (config, device) = RNGizParamsChecker.checkDeviceAndParams(options, result, GizCheckUpdateParams::class.java)
     if (config !=null && device !=null) {
-      moduleScope.launch {
+      CoroutineScope(Dispatchers.IO).launch {
         val res = when(config.type) {
           CapacityTypes.BLE -> device.bleCapability.checkUpdate(config.firmwareType)
           CapacityTypes.LAN -> device.lanCapability.checkUpdate(config.firmwareType)
@@ -453,7 +393,7 @@ fun wiFiCredentialsWithAirLinkEventHandler(event: GizWiFiActivatorEvent) {
   fun startUpgrade(options: ReadableMap, result: Callback) {
     val (config, device) = RNGizParamsChecker.checkDeviceAndParams(options, result, GizCheckUpdateParams::class.java)
     if (config !=null && device !=null) {
-      moduleScope.launch {
+      CoroutineScope(Dispatchers.IO).launch {
         val res = when(config.type) {
           CapacityTypes.BLE -> {
             device.bleCapability.startUpgrade(config.firmwareType, processHandler = {
@@ -475,7 +415,7 @@ fun wiFiCredentialsWithAirLinkEventHandler(event: GizWiFiActivatorEvent) {
   fun cancelUpgrade(options: ReadableMap, result: Callback) {
     val (config, device) = RNGizParamsChecker.checkDeviceAndParams(options, result, StopUpgradeParams::class.java)
     if (config !=null && device !=null) {
-      moduleScope.launch {
+      CoroutineScope(Dispatchers.IO).launch {
         val res = when(config.type) {
           CapacityTypes.BLE -> device.bleCapability.cancelUpgrade()
           CapacityTypes.LAN -> device.lanCapability.cancelUpgrade()
@@ -490,7 +430,7 @@ fun wiFiCredentialsWithAirLinkEventHandler(event: GizWiFiActivatorEvent) {
     val (config, device) = RNGizParamsChecker.checkDeviceAndParams(options, result, StartMusicalRhythmParams::class.java)
     print("startMusicalRhythm ${config}")
     if (config !=null && device !=null) {
-      moduleScope.launch {
+      CoroutineScope(Dispatchers.IO).launch {
         val res = device.startMusicalRhythm(config.sensitivity, config.mode) { data ->
           if (config.needMonitor) {
             val jsonObject = JSONObject()
@@ -525,7 +465,7 @@ fun wiFiCredentialsWithAirLinkEventHandler(event: GizWiFiActivatorEvent) {
   fun stopMusicalRhythm(options: ReadableMap, result: Callback) {
     val (config, device) = RNGizParamsChecker.checkDeviceAndParams(options, result, StopMusicalRhythmParams::class.java)
     if (config !=null && device !=null) {
-      moduleScope.launch {
+      CoroutineScope(Dispatchers.IO).launch {
         val res = device.stopMusicalRhythm();
         GizRNCallbackManager.callbackWithResult(callback = result, result = Result.success(Unit))
       }

package/ios/RNGizDeviceManagerModule.m

@@ -23,8 +23,6 @@ RCT_EXTERN_METHOD(updateDeviceInfo:(NSDictionary *)options result:(RCTResponseSe
 RCT_EXTERN_METHOD(unBind:(NSDictionary *)options result:(RCTResponseSenderBlock)result)
 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(startMusicalRhythm:(NSDictionary *)options result:(RCTResponseSenderBlock)result)
 RCT_EXTERN_METHOD(stopMusicalRhythm:(NSDictionary *)options result:(RCTResponseSenderBlock)result)

package/ios/RNGizDeviceManagerModule.swift

@@ -80,12 +80,6 @@ struct ProvideWiFiCredentialsParams: Decodable {
     var password: String
     var timeout: Int
 }
-struct ProvideWiFiCredentialsWithAirLinkParams: Decodable {
-    var ssid: String
-    var password: String
-    var timeout: Int
-    var productKeys: [String]
-}
 struct StopProvideWiFiCredentialsParams: Decodable {
     var type: GizwitsiOSSDK.GizCapability
     var id: String
@@ -442,7 +436,9 @@ class RNGizDeviceManagerModule: RCTEventEmitter  {
                     case .GizMQTTCapability:
                         data = await device.mqttCapability.provideWiFiCredentials(ssid: params.ssid, password: params.password, timeout: params.timeout, processHandler: progressHandler)
                         break
-                    }
+                    case .GizAirLinkCapability:
+                        data = await device.baseCapability.provideWiFiCredentials(ssid: params.ssid, password: params.password, timeout: params.timeout, processHandler: progressHandler, isAirLink: true)
+                        break
                     GizRNCallbackManager.callbackWithResult(callback: result, result:data)
                 }
             } else {
@@ -452,33 +448,6 @@ class RNGizDeviceManagerModule: RCTEventEmitter  {
             
         }
     }
-
-    @objc
-    public func provideWiFiCredentialsWithAirLink(_ options: NSDictionary, result: @escaping RCTResponseSenderBlock) {
-        if let params = RNGizParamsChecker.check(options: options, result: result, paramsType: ProvideWiFiCredentialsWithAirLinkParams.self) {
-            @Sendable func progressHandler(event: GizWiFiActivatorEvent) {
-                // 推送数据到 GizOTAProgressEvent
-                let data = [
-                    "data": event.rawValue
-                ] as [String : Any]
-                sendEvent(withName: "GizProvideWiFiCredentialsEvent", body: data)
-            }
-            Task {
-                var data: GizResult<GizBaseProfile?, GizActivatorException?>
-                data = await ESPTouchSmartConfig.sharedInstance.provideWiFiCredentialsWithAirLink(ssid: params.ssid, password: params.password, timeout: params.timeout, productKeys: params.productKeys, processHandler: progressHandler)
-                GizRNCallbackManager.callbackWithResult(callback: result, result:data)
-            }
-        }
-    }
-
-    @objc
-    public func stopProvideWiFiCredentialsWithAirLink(_ options: NSDictionary, result: @escaping RCTResponseSenderBlock) {
-        Task {
-            var data: GizResult<Int?, GizActivatorException?>
-            data = await ESPTouchSmartConfig.sharedInstance.stopProvideWiFiCredentialsWithAirLink()
-            GizRNCallbackManager.callbackWithResult(callback: result, result:data)
-        }
-    }
     
     @objc
     public func stopProvideWiFiCredentials(_ options: NSDictionary, result: @escaping RCTResponseSenderBlock) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-gizwits-sdk-v5",
-  "version": "1.5.0-beta.15",
+  "version": "1.5.0-beta.2",
   "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.7'
+  s.dependency 'GizwitsiOSSDK', '~> 1.7.5'
 
 end