react-native-gizwits-sdk-v5 1.4.85-light → 1.4.89-light

package/android/build.gradle

@@ -65,10 +65,10 @@ dependencies {
 
     implementation 'com.github.wendykierp:JTransforms:3.1'
 
-    implementation("io.github.gizwits:sdk:1.4.4-light")
-    implementation("io.github.gizwits:sdk-bluetooth:1.4.4-light")
-    implementation("io.github.gizwits:sdk-lan:1.4.4-light")
-    implementation("io.github.gizwits:sdk-mqtt:1.4.4-light")
+    implementation("io.github.gizwits:sdk:1.4.6-light")
+    implementation("io.github.gizwits:sdk-bluetooth:1.4.6-light")
+    implementation("io.github.gizwits:sdk-lan:1.4.6-light")
+    implementation("io.github.gizwits:sdk-mqtt:1.4.6-light")
     //  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

@@ -13,6 +13,7 @@ import com.gizwits.smart.sdk.bluetooth.bleCapability
 import com.gizwits.smart.sdk.common.GizConfiguration
 import com.gizwits.smart.sdk.common.ProvideWiFiCredentialsEvent
 import com.gizwits.smart.sdk.core.capacity.CapacityTypes
+import com.gizwits.smart.sdk.core.network.model.GizDeviceLocalTimerParams
 import com.gizwits.smart.sdk.exception.GizException
 import com.gizwits.smart.sdk.lan.lanCapability
 import com.gizwits.smart.sdk.mqtt.mqttCapability
@@ -76,6 +77,33 @@ data class StopMusicalRhythmParams(
   override val id: String,
 ): DeviceParams
 
+data class QueryTimerParams(
+  @SerializedName("id")
+  override val id: String,
+  @SerializedName("type")
+  val type: CapacityTypes,
+): DeviceParams
+
+data class DeleteTimerParams(
+  @SerializedName("id")
+  override val id: String,
+  @SerializedName("type")
+  val type: CapacityTypes,
+  @SerializedName("timerId")
+  val timerId: Int,
+): DeviceParams
+
+data class CreateTimerParams(
+  @SerializedName("id")
+  override val id: String,
+  @SerializedName("type")
+  val type: CapacityTypes,
+  @SerializedName("data")
+  val data: GizDeviceLocalTimerParams,
+): DeviceParams
+
+
+
 data class StartMusicalRhythmParams(
   @SerializedName("id")
   override val id: String,
@@ -472,6 +500,68 @@ class RNGizDeviceManagerModule(reactContext: ReactApplicationContext) : ReactCon
     }
   }
 
+  @ReactMethod
+  fun queryTimer(options: ReadableMap, result: Callback) {
+    val (config, device) = RNGizParamsChecker.checkDeviceAndParams(options, result, QueryTimerParams::class.java)
+    if (config !=null && device !=null) {
+      CoroutineScope(Dispatchers.IO).launch {
+        val res = when(config.type) {
+          CapacityTypes.BLE -> device.bleCapability.queryTimer()
+          CapacityTypes.LAN -> device.lanCapability.queryTimer()
+          CapacityTypes.MQTT -> device.mqttCapability.queryTimer()
+        }
+        GizRNCallbackManager.callbackWithResult(callback = result, result = res)
+      }
+    }
+  }
+
+  @ReactMethod
+  fun deleteTimer(options: ReadableMap, result: Callback) {
+    val (config, device) = RNGizParamsChecker.checkDeviceAndParams(options, result, DeleteTimerParams::class.java)
+    if (config !=null && device !=null) {
+      CoroutineScope(Dispatchers.IO).launch {
+        val res = when(config.type) {
+          CapacityTypes.BLE -> device.bleCapability.deleteTimer(config.timerId)
+          CapacityTypes.LAN -> device.lanCapability.deleteTimer(config.timerId)
+          CapacityTypes.MQTT -> device.mqttCapability.deleteTimer(config.timerId)
+        }
+        GizRNCallbackManager.callbackWithResult(callback = result, result = res)
+      }
+    }
+  }
+
+  @ReactMethod
+  fun createTimer(options: ReadableMap, result: Callback) {
+    val (config, device) = RNGizParamsChecker.checkDeviceAndParams(options, result, CreateTimerParams::class.java)
+    if (config !=null && device !=null) {
+      CoroutineScope(Dispatchers.IO).launch {
+        val res = when(config.type) {
+          CapacityTypes.BLE -> device.bleCapability.createTimer(config.data)
+          CapacityTypes.LAN -> device.lanCapability.createTimer(config.data)
+          CapacityTypes.MQTT -> device.mqttCapability.createTimer(config.data)
+        }
+        GizRNCallbackManager.callbackWithResult(callback = result, result = res)
+      }
+    }
+  }
+
+
+  @ReactMethod
+  fun editTimer(options: ReadableMap, result: Callback) {
+    val (config, device) = RNGizParamsChecker.checkDeviceAndParams(options, result, CreateTimerParams::class.java)
+    if (config !=null && device !=null) {
+      CoroutineScope(Dispatchers.IO).launch {
+        val res = when(config.type) {
+          CapacityTypes.BLE -> device.bleCapability.editTimer(config.data)
+          CapacityTypes.LAN -> device.lanCapability.editTimer(config.data)
+          CapacityTypes.MQTT -> device.mqttCapability.editTimer(config.data)
+        }
+        GizRNCallbackManager.callbackWithResult(callback = result, result = res)
+      }
+    }
+  }
+
+
   fun sendEvent(name:String, data: WritableMap?) {
     reactApplicationContext
       .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)

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

@@ -5,7 +5,6 @@ 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
-import com.gizwits.smart.sdk.exception.GizParseException
 import com.google.gson.Gson
 import com.google.gson.JsonSyntaxException
 import com.google.gson.annotations.SerializedName

package/ios/RNGizDeviceManagerModule.swift

@@ -502,28 +502,36 @@ class RNGizDeviceManagerModule: RCTEventEmitter  {
     // 开始音乐律动
     @objc
     public func startMusicalRhythm(_ options: NSDictionary, result: @escaping RCTResponseSenderBlock) {
-        
         if let params = RNGizParamsChecker.check(options: options, result: result, paramsType: StartMusicalRhythmParams.self) {
             // 先找到设备
             
             if let device = self.findDevice(id: params.id) {
+                var lastExecutionTime: Date? = nil
+                
                 let res = device.startMusicalRhythm(sensitivity: params.sensitivity, mode: params.mode) { [params] data in
-                    if (params.needMonitor) {
-                        let data = [
-                            "deviceID": params.id,
-                            "data": GizRNCallbackManager.convertToDictionary(object: data) as Any
-                        ] as [String : Any]
-                        self.sendEvent(withName: "GizMusicalRhythmEvnet", body: data)
+                    let now = Date()
+                    let isBeat = data.isBeat ?? false
+                    
+                    if isBeat || lastExecutionTime == nil || now.timeIntervalSince(lastExecutionTime!) >= 0.03 {
+                        lastExecutionTime = now
+
+                        if params.needMonitor {
+                            var data = [
+                                "deviceID": params.id,
+                                "data": GizRNCallbackManager.convertToDictionary(object: data) as Any
+                            ] as [String : Any]?
+                            self.sendEvent(withName: "GizMusicalRhythmEvnet", body: data)
+                            data = nil
+                        }
                     }
                 }
-                GizRNCallbackManager.callbackWithResult(callback: result, result:GizResult<Int?, GizAPIException?>(successMessage: "", data: nil))
+                
+                GizRNCallbackManager.callbackWithResult(callback: result, result: GizResult<Int?, GizAPIException?>(successMessage: "", data: nil))
             } else {
                 // 提示设备不存在
                 GizRNCallbackManager.callbackWithResult(callback: result, result: GizResult<Int?, GizAPIException?>(error: GizAPIException.GIZ_OPENAPI_DEVICE_NOT_FOUND))
             }
-            
         }
-        
     }
     @objc
     public func stopMusicalRhythm(_ options: NSDictionary, result: @escaping RCTResponseSenderBlock) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-gizwits-sdk-v5",
-  "version": "1.4.85-light",
+  "version": "1.4.89-light",
   "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 'GizwitsiOSSDKLight', '~> 1.7.22'
+  s.dependency 'GizwitsiOSSDKLight', '~> 1.7.23'
 
 end