react-native-gizwits-sdk-v5 1.5.0 → 1.5.1-thirdbluetooth
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/android/build.gradle +5 -5
- package/android/libs/sdk-bluetooth-release.aar +0 -0
- package/android/libs/sdk-lan-release.aar +0 -0
- package/android/libs/sdk-mqtt-release.aar +0 -0
- package/android/libs/sdk-release.aar +0 -0
- package/android/src/main/java/com/gizwits/reactnativegizwitssdkv5/RNGizDeviceManagerModule.kt +60 -0
- package/lib/device.d.ts +2 -0
- package/lib/device.js +19 -1
- package/lib/device.js.map +1 -1
- package/package.json +1 -1
package/android/build.gradle
CHANGED
|
@@ -67,11 +67,11 @@ dependencies {
|
|
|
67
67
|
// ESPTouch
|
|
68
68
|
implementation 'com.github.EspressifApp:lib-esptouch-android:1.1.1'
|
|
69
69
|
|
|
70
|
-
implementation(
|
|
71
|
-
implementation("io.github.gizwits:sdk
|
|
72
|
-
implementation("io.github.gizwits:sdk-
|
|
73
|
-
implementation("io.github.gizwits:sdk-
|
|
74
|
-
//
|
|
70
|
+
implementation files('libs/sdk-release.aar', 'libs/sdk-bluetooth-release.aar', 'libs/sdk-lan-release.aar', 'libs/sdk-mqtt-release.aar')
|
|
71
|
+
// implementation("io.github.gizwits:sdk:1.4.2")
|
|
72
|
+
// implementation("io.github.gizwits:sdk-bluetooth:1.4.2")
|
|
73
|
+
// implementation("io.github.gizwits:sdk-lan:1.4.2")
|
|
74
|
+
// implementation("io.github.gizwits:sdk-mqtt:1.4.2")
|
|
75
75
|
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlin_coroutine_version")
|
|
76
76
|
// retrofit
|
|
77
77
|
implementation("com.squareup.retrofit2:retrofit:$retrofit_version")
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
package/android/src/main/java/com/gizwits/reactnativegizwitssdkv5/RNGizDeviceManagerModule.kt
CHANGED
|
@@ -15,6 +15,8 @@ import com.gizwits.smart.sdk.common.GizConfiguration
|
|
|
15
15
|
import com.gizwits.smart.sdk.common.GizWiFiActivatorEvent
|
|
16
16
|
import com.gizwits.smart.sdk.core.capacity.CapacityTypes
|
|
17
17
|
import com.gizwits.smart.sdk.exception.GizException
|
|
18
|
+
import com.gizwits.smart.sdk.extend.hexToByteArray
|
|
19
|
+
import android.util.Base64
|
|
18
20
|
import com.gizwits.smart.sdk.lan.lanCapability
|
|
19
21
|
import com.gizwits.smart.sdk.mqtt.mqttCapability
|
|
20
22
|
import com.gizwits.smart.sdk.light.MusicalRhythmParseMode
|
|
@@ -79,6 +81,22 @@ data class StopMusicalRhythmParams(
|
|
|
79
81
|
override val id: String,
|
|
80
82
|
): DeviceParams
|
|
81
83
|
|
|
84
|
+
data class SetDeviceMtuParams(
|
|
85
|
+
@SerializedName("id")
|
|
86
|
+
override val id: String,
|
|
87
|
+
@SerializedName("mtu")
|
|
88
|
+
val mtu: Int,
|
|
89
|
+
): DeviceParams
|
|
90
|
+
|
|
91
|
+
data class SendThirdDeviceDpParams(
|
|
92
|
+
@SerializedName("id")
|
|
93
|
+
override val id: String,
|
|
94
|
+
@SerializedName("data")
|
|
95
|
+
val data: String,
|
|
96
|
+
@SerializedName("characteristicUuid")
|
|
97
|
+
val characteristicUuid: String? = null,
|
|
98
|
+
): DeviceParams
|
|
99
|
+
|
|
82
100
|
data class StartMusicalRhythmParams(
|
|
83
101
|
@SerializedName("id")
|
|
84
102
|
override val id: String,
|
|
@@ -535,6 +553,48 @@ fun wiFiCredentialsWithAirLinkEventHandler(event: GizWiFiActivatorEvent) {
|
|
|
535
553
|
}
|
|
536
554
|
}
|
|
537
555
|
|
|
556
|
+
@ReactMethod
|
|
557
|
+
fun setDeviceMtu(options: ReadableMap, result: Callback) {
|
|
558
|
+
val (config, device) = RNGizParamsChecker.checkDeviceAndParams(options, result, SetDeviceMtuParams::class.java)
|
|
559
|
+
if (config !=null && device !=null) {
|
|
560
|
+
moduleScope.launch {
|
|
561
|
+
val res = device.setDeviceMtu(config.mtu);
|
|
562
|
+
GizRNCallbackManager.callbackWithResult(callback = result, result = res)
|
|
563
|
+
}
|
|
564
|
+
}
|
|
565
|
+
}
|
|
566
|
+
|
|
567
|
+
@ReactMethod
|
|
568
|
+
fun sendThirdDeviceDp(options: ReadableMap, result: Callback) {
|
|
569
|
+
val (config, device) = RNGizParamsChecker.checkDeviceAndParams(options, result, SendThirdDeviceDpParams::class.java)
|
|
570
|
+
if (config !=null && device !=null) {
|
|
571
|
+
moduleScope.launch {
|
|
572
|
+
try {
|
|
573
|
+
// 第三方设备直接透传原始数据，使用特殊键 "rawData" 标识原始数据
|
|
574
|
+
// 支持 Base64、十六进制或 UTF-8 字符串格式
|
|
575
|
+
val rawData: ByteArray = try {
|
|
576
|
+
// 首先尝试 Base64 解码
|
|
577
|
+
Base64.decode(config.data, Base64.NO_WRAP)
|
|
578
|
+
} catch (e: Exception) {
|
|
579
|
+
try {
|
|
580
|
+
// 如果 Base64 解码失败，尝试十六进制解码
|
|
581
|
+
config.data.hexToByteArray()
|
|
582
|
+
} catch (e2: Exception) {
|
|
583
|
+
// 如果都失败，使用 UTF-8 编码
|
|
584
|
+
config.data.toByteArray(Charsets.UTF_8)
|
|
585
|
+
}
|
|
586
|
+
}
|
|
587
|
+
|
|
588
|
+
// 使用特殊键 "rawData" 传递原始数据，sendThirdDeviceDp 会识别并直接透传
|
|
589
|
+
val res = device.sendThirdDeviceDp("rawData" to rawData, characteristicUuid = config.characteristicUuid)
|
|
590
|
+
GizRNCallbackManager.callbackWithResult(callback = result, result = res)
|
|
591
|
+
} catch (e: Exception) {
|
|
592
|
+
GizRNCallbackManager.callbackWithResult(callback = result, result = Result.failure<Unit>(e))
|
|
593
|
+
}
|
|
594
|
+
}
|
|
595
|
+
}
|
|
596
|
+
}
|
|
597
|
+
|
|
538
598
|
fun sendEvent(name:String, data: WritableMap?) {
|
|
539
599
|
reactApplicationContext
|
|
540
600
|
.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
|
package/lib/device.d.ts
CHANGED
|
@@ -25,6 +25,8 @@ declare class RNGizDeviceManagerModule extends Base {
|
|
|
25
25
|
stopProvideWiFiCredentials(id: string, type: GizCapability): Promise<GizResult<any, any>>;
|
|
26
26
|
startMusicalRhythm(id: string, sensitivity: number, mode: MusicalRhythmParseMode, onData?: GizMusicalRhythmCallback): Promise<GizResult<any, any>>;
|
|
27
27
|
stopMusicalRhythm(id: string): Promise<GizResult<any, any>>;
|
|
28
|
+
setDeviceMtu(id: string, mtu: number): Promise<GizResult<any, any>>;
|
|
29
|
+
sendThirdDeviceDp(id: string, data: Object, characteristicUuid?: string): Promise<GizResult<GizDeviceData, any>>;
|
|
28
30
|
}
|
|
29
31
|
declare const _default: RNGizDeviceManagerModule;
|
|
30
32
|
export default _default;
|
package/lib/device.js
CHANGED
|
@@ -162,7 +162,7 @@ class RNGizDeviceManagerModule extends Base {
|
|
|
162
162
|
id,
|
|
163
163
|
sensitivity,
|
|
164
164
|
mode,
|
|
165
|
-
needMonitor: !!onData
|
|
165
|
+
needMonitor: !!onData,
|
|
166
166
|
}, callback);
|
|
167
167
|
});
|
|
168
168
|
}
|
|
@@ -174,6 +174,24 @@ class RNGizDeviceManagerModule extends Base {
|
|
|
174
174
|
}, callback);
|
|
175
175
|
});
|
|
176
176
|
}
|
|
177
|
+
async setDeviceMtu(id, mtu) {
|
|
178
|
+
return this.callbackWapper((callback) => {
|
|
179
|
+
NativeModules.RNGizDeviceManagerModule.setDeviceMtu({
|
|
180
|
+
id,
|
|
181
|
+
mtu,
|
|
182
|
+
}, callback);
|
|
183
|
+
});
|
|
184
|
+
}
|
|
185
|
+
async sendThirdDeviceDp(id, data, characteristicUuid) {
|
|
186
|
+
return this.callbackWapper((callback) => {
|
|
187
|
+
const dataString = JSON.stringify(data);
|
|
188
|
+
NativeModules.RNGizDeviceManagerModule.sendThirdDeviceDp({
|
|
189
|
+
id,
|
|
190
|
+
data: dataString,
|
|
191
|
+
characteristicUuid,
|
|
192
|
+
}, callback);
|
|
193
|
+
});
|
|
194
|
+
}
|
|
177
195
|
}
|
|
178
196
|
export default new RNGizDeviceManagerModule();
|
|
179
197
|
export { RNGizDeviceManagerModule };
|
package/lib/device.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"device.js","sourceRoot":"","sources":["../src/device.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AAEhE,OAAO,IAAI,MAAM,QAAQ,CAAA;AAezB,MAAM,YAAY,GAAG,IAAI,kBAAkB,
|
|
1
|
+
{"version":3,"file":"device.js","sourceRoot":"","sources":["../src/device.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED