react-native-gizwits-sdk-v5 1.5.2-thirdbluetooth → 1.5.3-thirdbluetooth

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

@@ -16,7 +16,6 @@ import com.gizwits.smart.sdk.common.GizWiFiActivatorEvent
 import com.gizwits.smart.sdk.core.capacity.CapacityTypes
 import com.gizwits.smart.sdk.exception.GizException
 import com.gizwits.smart.sdk.extend.hexToByteArray
-import android.util.Base64
 import com.gizwits.smart.sdk.lan.lanCapability
 import com.gizwits.smart.sdk.mqtt.mqttCapability
 import com.gizwits.smart.sdk.light.MusicalRhythmParseMode
@@ -571,20 +570,26 @@ fun wiFiCredentialsWithAirLinkEventHandler(event: GizWiFiActivatorEvent) {
       moduleScope.launch {
         try {
           // 第三方设备直接透传原始数据，使用特殊键 "rawData" 标识原始数据
-          // 支持 Base64、十六进制或 UTF-8 字符串格式
-          val rawData: ByteArray = try {
-            // 首先尝试 Base64 解码
-            Base64.decode(config.data, Base64.NO_WRAP)
-          } catch (e: Exception) {
-            try {
-              // 如果 Base64 解码失败，尝试十六进制解码
-              config.data.hexToByteArray()
-            } catch (e2: Exception) {
-              // 如果都失败，使用 UTF-8 编码
-              config.data.toByteArray(Charsets.UTF_8)
-            }
+          // 只支持十六进制字符串格式（只包含 0-9A-Fa-f，且长度为偶数）
+          if (!config.data.matches(Regex("^[0-9A-Fa-f]+$"))) {
+            GizRNCallbackManager.callbackWithResult(
+              callback = result, 
+              result = Result.failure<Unit>(IllegalArgumentException("Data must be a valid hexadecimal string (0-9A-Fa-f only)"))
+            )
+            return@launch
+          }
+          
+          if (config.data.length % 2 != 0) {
+            GizRNCallbackManager.callbackWithResult(
+              callback = result, 
+              result = Result.failure<Unit>(IllegalArgumentException("Hex string length must be even"))
+            )
+            return@launch
           }
           
+          // 使用十六进制解码
+          val rawData: ByteArray = config.data.hexToByteArray()
+          
           // 使用特殊键 "rawData" 传递原始数据，sendThirdDeviceDp 会识别并直接透传
           val res = device.sendThirdDeviceDp("rawData" to rawData, characteristicUuid = config.characteristicUuid)
           GizRNCallbackManager.callbackWithResult(callback = result, result = res)

package/package.json

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