react-native-gizwits-sdk-v5 1.2.7 → 1.2.9
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/libs/sdk-bluetooth-debug.aar +0 -0
- package/android/libs/sdk-bluetooth-release.aar +0 -0
- package/android/libs/sdk-debug.aar +0 -0
- package/android/libs/sdk-lan-debug.aar +0 -0
- package/android/libs/sdk-lan-release.aar +0 -0
- package/android/libs/sdk-mqtt-debug.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/GizRNCallbackManager.kt +1 -1
- package/android/src/main/java/com/gizwits/reactnativegizwitssdkv5/RNGizDeviceManagerModule.kt +187 -5
- package/android/src/main/java/com/gizwits/reactnativegizwitssdkv5/RNGizSDKManagerModule.kt +82 -15
- package/ios/GizwitsiOSSDK.framework/GizwitsiOSSDK +0 -0
- package/ios/GizwitsiOSSDK.framework/Modules/GizwitsiOSSDK.swiftmodule/Project/arm64-apple-ios.swiftsourceinfo +0 -0
- package/ios/GizwitsiOSSDK.framework/Modules/GizwitsiOSSDK.swiftmodule/arm64-apple-ios.swiftdoc +0 -0
- package/ios/GizwitsiOSSDK.framework/Modules/GizwitsiOSSDK.swiftmodule/arm64-apple-ios.swiftmodule +0 -0
- package/ios/RNGizDeviceManagerModule.m +3 -0
- package/ios/RNGizDeviceManagerModule.swift +111 -1
- package/lib/device.d.ts +5 -1
- package/lib/device.js +32 -0
- package/lib/device.js.map +1 -1
- package/lib/index.js +33 -0
- package/lib/index.js.map +1 -1
- package/lib/types.d.ts +20 -15
- package/package.json +1 -1
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
@@ -107,7 +107,7 @@ object GizRNCallbackManager {
|
|
|
107
107
|
null
|
|
108
108
|
}
|
|
109
109
|
}
|
|
110
|
-
|
|
110
|
+
public inline fun <reified T : Any> convertToMap(obj: T): WritableMap? {
|
|
111
111
|
val gson = Gson()
|
|
112
112
|
val jsonString = gson.toJson(obj)
|
|
113
113
|
return try {
|
package/android/src/main/java/com/gizwits/reactnativegizwitssdkv5/RNGizDeviceManagerModule.kt
CHANGED
|
@@ -5,15 +5,20 @@ import com.facebook.react.bridge.ReactApplicationContext
|
|
|
5
5
|
import com.facebook.react.bridge.ReactContextBaseJavaModule
|
|
6
6
|
import com.facebook.react.bridge.ReactMethod
|
|
7
7
|
import com.facebook.react.bridge.ReadableMap
|
|
8
|
+
import com.facebook.react.bridge.WritableMap
|
|
9
|
+
import com.facebook.react.modules.core.DeviceEventManagerModule
|
|
8
10
|
import com.gizwits.smart.sdk.GizDevice
|
|
9
11
|
import com.gizwits.smart.sdk.GizSDKManager
|
|
10
12
|
import com.gizwits.smart.sdk.bluetooth.bleCapacity
|
|
11
13
|
import com.gizwits.smart.sdk.common.GizConfiguration
|
|
14
|
+
import com.gizwits.smart.sdk.common.ProvideWiFiCredentialsEvent
|
|
12
15
|
import com.gizwits.smart.sdk.core.capacity.CapacityTypes
|
|
13
16
|
import com.gizwits.smart.sdk.exception.GizException
|
|
14
17
|
import com.gizwits.smart.sdk.lan.lanCapacity
|
|
15
18
|
import com.gizwits.smart.sdk.mqtt.mqttCapacity
|
|
16
19
|
import com.gizwits.smart.sdk.mqtt.queryBoundDevices
|
|
20
|
+
import com.gizwits.smart.sdk.ota.GizOTAFirmwareType
|
|
21
|
+
import com.gizwits.smart.sdk.ota.OTAProgressData
|
|
17
22
|
import com.google.gson.JsonArray
|
|
18
23
|
import com.google.gson.annotations.SerializedName
|
|
19
24
|
import kotlinx.coroutines.CoroutineScope
|
|
@@ -66,16 +71,56 @@ data class GizDisConnectParams(
|
|
|
66
71
|
val type: CapacityTypes
|
|
67
72
|
): DeviceParams
|
|
68
73
|
|
|
74
|
+
data class GizRegisterDeviceParams(
|
|
75
|
+
@SerializedName("id")
|
|
76
|
+
override val id: Int,
|
|
77
|
+
): DeviceParams
|
|
78
|
+
|
|
79
|
+
data class GizProvideWiFiCredentialsParams(
|
|
80
|
+
@SerializedName("id")
|
|
81
|
+
override val id: Int,
|
|
82
|
+
@SerializedName("type")
|
|
83
|
+
val type: CapacityTypes,
|
|
84
|
+
@SerializedName("ssid")
|
|
85
|
+
val ssid: String,
|
|
86
|
+
@SerializedName("password")
|
|
87
|
+
val password: String,
|
|
88
|
+
@SerializedName("timeout")
|
|
89
|
+
val timeout: Long,
|
|
90
|
+
): DeviceParams
|
|
91
|
+
data class GizStopProvideWiFiCredentialsParams(
|
|
92
|
+
@SerializedName("id")
|
|
93
|
+
override val id: Int,
|
|
94
|
+
@SerializedName("type")
|
|
95
|
+
val type: CapacityTypes,
|
|
96
|
+
): DeviceParams
|
|
97
|
+
|
|
69
98
|
data class GizGetDeviceInfoParams(
|
|
70
99
|
@SerializedName("id")
|
|
71
100
|
override val id: Int,
|
|
72
101
|
@SerializedName("type")
|
|
73
102
|
val type: CapacityTypes
|
|
74
103
|
): DeviceParams
|
|
104
|
+
data class GizCheckUpdateParams(
|
|
105
|
+
@SerializedName("id")
|
|
106
|
+
override val id: Int,
|
|
107
|
+
@SerializedName("type")
|
|
108
|
+
val type: CapacityTypes,
|
|
109
|
+
@SerializedName("firmwareType")
|
|
110
|
+
val firmwareType: GizOTAFirmwareType
|
|
111
|
+
): DeviceParams
|
|
112
|
+
data class StopUpgradeParams(
|
|
113
|
+
@SerializedName("id")
|
|
114
|
+
override val id: Int,
|
|
115
|
+
@SerializedName("type")
|
|
116
|
+
val type: CapacityTypes,
|
|
117
|
+
): DeviceParams
|
|
118
|
+
|
|
75
119
|
|
|
76
120
|
class RNGizDeviceManagerModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaModule(reactContext) {
|
|
77
121
|
enum class EventName(val value: String) {
|
|
78
122
|
GizOTAProgressEvent("GizOTAProgressEvent"),
|
|
123
|
+
GizProvideWiFiCredentialsEvent("GizProvideWiFiCredentialsEvent"),
|
|
79
124
|
}
|
|
80
125
|
|
|
81
126
|
fun jsonObjectToPairs(jsonObject: JSONObject): Array<Pair<String, Any>> {
|
|
@@ -116,12 +161,20 @@ class RNGizDeviceManagerModule(reactContext: ReactApplicationContext) : ReactCon
|
|
|
116
161
|
val (config, device) = RNGizParamsChecker.checkDeviceAndParams(options, result, GizGetDPParams::class.java)
|
|
117
162
|
if (config !=null && device !=null) {
|
|
118
163
|
CoroutineScope(Dispatchers.Main).launch {
|
|
119
|
-
|
|
164
|
+
var res = when(config.type) {
|
|
120
165
|
CapacityTypes.BLE -> device.bleCapacity.getDp(config.attrs)
|
|
121
166
|
CapacityTypes.LAN -> device.lanCapacity.getDp(config.attrs)
|
|
122
167
|
CapacityTypes.MQTT -> device.mqttCapacity.getDp(config.attrs)
|
|
123
168
|
}
|
|
124
|
-
|
|
169
|
+
if (res.isSuccess) {
|
|
170
|
+
var jsonObject = res.getOrNull() ?: JSONObject()
|
|
171
|
+
val newRes = JSONObject()
|
|
172
|
+
newRes.put("success", true)
|
|
173
|
+
newRes.put("data", JSONObject(jsonObject.toString()))
|
|
174
|
+
result.invoke(null, GizRNCallbackManager.jsonObject2WriteableMap(newRes))
|
|
175
|
+
} else {
|
|
176
|
+
GizRNCallbackManager.callbackWithResult(callback = result, result = res)
|
|
177
|
+
}
|
|
125
178
|
}
|
|
126
179
|
}
|
|
127
180
|
}
|
|
@@ -168,11 +221,75 @@ class RNGizDeviceManagerModule(reactContext: ReactApplicationContext) : ReactCon
|
|
|
168
221
|
}
|
|
169
222
|
}
|
|
170
223
|
@ReactMethod
|
|
171
|
-
fun
|
|
224
|
+
fun stopProvideWiFiCredentials(options: ReadableMap, result: Callback) {
|
|
225
|
+
val (config, device) = RNGizParamsChecker.checkDeviceAndParams(options, result, GizStopProvideWiFiCredentialsParams::class.java)
|
|
226
|
+
if (config !=null && device !=null) {
|
|
227
|
+
CoroutineScope(Dispatchers.Main).launch {
|
|
228
|
+
val res = when(config.type) {
|
|
229
|
+
CapacityTypes.BLE -> device.bleCapacity.stopProvideWiFiCredentials()
|
|
230
|
+
CapacityTypes.LAN -> device.lanCapacity.stopProvideWiFiCredentials()
|
|
231
|
+
CapacityTypes.MQTT -> device.mqttCapacity.stopProvideWiFiCredentials()
|
|
232
|
+
}
|
|
233
|
+
GizRNCallbackManager.callbackWithResult(callback = result, result = res)
|
|
234
|
+
}
|
|
235
|
+
}
|
|
236
|
+
}
|
|
237
|
+
|
|
238
|
+
fun wiFiCredentialsEventHandler(event: ProvideWiFiCredentialsEvent, device: GizDevice) {
|
|
239
|
+
val jsonObject = JSONObject()
|
|
240
|
+
jsonObject.put("data", event.toString())
|
|
241
|
+
jsonObject.put("device", device.toJsonObject())
|
|
242
|
+
sendEvent(
|
|
243
|
+
EventName.GizProvideWiFiCredentialsEvent.name,
|
|
244
|
+
GizRNCallbackManager.jsonObject2WriteableMap(jsonObject)
|
|
245
|
+
)
|
|
246
|
+
}
|
|
172
247
|
@ReactMethod
|
|
173
|
-
fun
|
|
248
|
+
fun provideWiFiCredentials(options: ReadableMap, result: Callback) {
|
|
249
|
+
val (config, device) = RNGizParamsChecker.checkDeviceAndParams(options, result, GizProvideWiFiCredentialsParams::class.java)
|
|
250
|
+
if (config !=null && device !=null) {
|
|
251
|
+
CoroutineScope(Dispatchers.Main).launch {
|
|
252
|
+
val res = when(config.type) {
|
|
253
|
+
CapacityTypes.BLE -> device.bleCapacity.provideWiFiCredentials(
|
|
254
|
+
config.ssid,
|
|
255
|
+
config.password,
|
|
256
|
+
config.timeout,
|
|
257
|
+
processHandler = {
|
|
258
|
+
wiFiCredentialsEventHandler(it, device)
|
|
259
|
+
}
|
|
260
|
+
)
|
|
261
|
+
CapacityTypes.LAN -> device.lanCapacity.provideWiFiCredentials(
|
|
262
|
+
config.ssid,
|
|
263
|
+
config.password,
|
|
264
|
+
config.timeout,
|
|
265
|
+
processHandler = {
|
|
266
|
+
wiFiCredentialsEventHandler(it, device)
|
|
267
|
+
}
|
|
268
|
+
)
|
|
269
|
+
CapacityTypes.MQTT -> device.mqttCapacity.provideWiFiCredentials(
|
|
270
|
+
config.ssid,
|
|
271
|
+
config.password,
|
|
272
|
+
config.timeout,
|
|
273
|
+
processHandler = {
|
|
274
|
+
wiFiCredentialsEventHandler(it, device)
|
|
275
|
+
}
|
|
276
|
+
)
|
|
277
|
+
}
|
|
278
|
+
GizRNCallbackManager.callbackWithResult(callback = result, result = res)
|
|
279
|
+
}
|
|
280
|
+
}
|
|
281
|
+
}
|
|
282
|
+
|
|
174
283
|
@ReactMethod
|
|
175
|
-
fun register(options: ReadableMap, result: Callback) {
|
|
284
|
+
fun register(options: ReadableMap, result: Callback) {
|
|
285
|
+
val (config, device) = RNGizParamsChecker.checkDeviceAndParams(options, result, GizRegisterDeviceParams::class.java)
|
|
286
|
+
if (config !=null && device !=null) {
|
|
287
|
+
CoroutineScope(Dispatchers.Main).launch {
|
|
288
|
+
val res = device.register()
|
|
289
|
+
GizRNCallbackManager.callbackWithResult(callback = result, result = res)
|
|
290
|
+
}
|
|
291
|
+
}
|
|
292
|
+
}
|
|
176
293
|
|
|
177
294
|
@ReactMethod
|
|
178
295
|
fun connect(options: ReadableMap, result: Callback) {
|
|
@@ -203,4 +320,69 @@ class RNGizDeviceManagerModule(reactContext: ReactApplicationContext) : ReactCon
|
|
|
203
320
|
}
|
|
204
321
|
}
|
|
205
322
|
|
|
323
|
+
@ReactMethod
|
|
324
|
+
fun checkUpdate(options: ReadableMap, result: Callback) {
|
|
325
|
+
val (config, device) = RNGizParamsChecker.checkDeviceAndParams(options, result, GizCheckUpdateParams::class.java)
|
|
326
|
+
if (config !=null && device !=null) {
|
|
327
|
+
CoroutineScope(Dispatchers.Main).launch {
|
|
328
|
+
val res = when(config.type) {
|
|
329
|
+
CapacityTypes.BLE -> device.bleCapacity.checkUpdate(config.firmwareType)
|
|
330
|
+
CapacityTypes.LAN -> device.lanCapacity.checkUpdate(config.firmwareType)
|
|
331
|
+
CapacityTypes.MQTT -> device.mqttCapacity.checkUpdate(config.firmwareType)
|
|
332
|
+
}
|
|
333
|
+
GizRNCallbackManager.callbackWithResult(callback = result, result = res)
|
|
334
|
+
}
|
|
335
|
+
}
|
|
336
|
+
}
|
|
337
|
+
|
|
338
|
+
fun handleStartUpgradeProgress(event: OTAProgressData, device: GizDevice) {
|
|
339
|
+
val jsonObject = JSONObject()
|
|
340
|
+
jsonObject.put("data", GizRNCallbackManager.convertToMap(event))
|
|
341
|
+
jsonObject.put("device", device.toJsonObject())
|
|
342
|
+
sendEvent(
|
|
343
|
+
EventName.GizOTAProgressEvent.name,
|
|
344
|
+
GizRNCallbackManager.jsonObject2WriteableMap(jsonObject)
|
|
345
|
+
)
|
|
346
|
+
}
|
|
347
|
+
@ReactMethod
|
|
348
|
+
fun startUpgrade(options: ReadableMap, result: Callback) {
|
|
349
|
+
val (config, device) = RNGizParamsChecker.checkDeviceAndParams(options, result, GizCheckUpdateParams::class.java)
|
|
350
|
+
if (config !=null && device !=null) {
|
|
351
|
+
CoroutineScope(Dispatchers.Main).launch {
|
|
352
|
+
val res = when(config.type) {
|
|
353
|
+
CapacityTypes.BLE -> device.bleCapacity.startUpgrade(config.firmwareType, processHandler = {
|
|
354
|
+
handleStartUpgradeProgress(it, device)
|
|
355
|
+
})
|
|
356
|
+
CapacityTypes.LAN -> device.lanCapacity.startUpgrade(config.firmwareType, processHandler = {
|
|
357
|
+
handleStartUpgradeProgress(it, device)
|
|
358
|
+
})
|
|
359
|
+
CapacityTypes.MQTT -> device.mqttCapacity.startUpgrade(config.firmwareType, processHandler = {
|
|
360
|
+
handleStartUpgradeProgress(it, device)
|
|
361
|
+
})
|
|
362
|
+
}
|
|
363
|
+
GizRNCallbackManager.callbackWithResult(callback = result, result = res)
|
|
364
|
+
}
|
|
365
|
+
}
|
|
366
|
+
}
|
|
367
|
+
@ReactMethod
|
|
368
|
+
fun cancelUpgrade(options: ReadableMap, result: Callback) {
|
|
369
|
+
val (config, device) = RNGizParamsChecker.checkDeviceAndParams(options, result, StopUpgradeParams::class.java)
|
|
370
|
+
if (config !=null && device !=null) {
|
|
371
|
+
CoroutineScope(Dispatchers.Main).launch {
|
|
372
|
+
val res = when(config.type) {
|
|
373
|
+
CapacityTypes.BLE -> device.bleCapacity.cancelUpgrade()
|
|
374
|
+
CapacityTypes.LAN -> device.lanCapacity.cancelUpgrade()
|
|
375
|
+
CapacityTypes.MQTT -> device.mqttCapacity.cancelUpgrade()
|
|
376
|
+
}
|
|
377
|
+
GizRNCallbackManager.callbackWithResult(callback = result, result = res)
|
|
378
|
+
}
|
|
379
|
+
}
|
|
380
|
+
}
|
|
381
|
+
|
|
382
|
+
fun sendEvent(name:String, data: WritableMap?) {
|
|
383
|
+
reactApplicationContext
|
|
384
|
+
.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
|
|
385
|
+
.emit(name, data)
|
|
386
|
+
}
|
|
387
|
+
|
|
206
388
|
}
|
|
@@ -13,8 +13,8 @@ import com.gizwits.smart.sdk.GizDevice
|
|
|
13
13
|
import com.gizwits.smart.sdk.GizSDKManager
|
|
14
14
|
import com.gizwits.smart.sdk.GizUserManager
|
|
15
15
|
import com.gizwits.smart.sdk.bluetooth.bleCapacity
|
|
16
|
-
import com.gizwits.smart.sdk.bluetooth.
|
|
17
|
-
import com.gizwits.smart.sdk.bluetooth.
|
|
16
|
+
import com.gizwits.smart.sdk.bluetooth.startBleScan
|
|
17
|
+
import com.gizwits.smart.sdk.bluetooth.stopBleScan
|
|
18
18
|
import com.gizwits.smart.sdk.bluetooth.subscribeBluetoothDeviceList
|
|
19
19
|
import com.gizwits.smart.sdk.common.GizConfiguration
|
|
20
20
|
import com.gizwits.smart.sdk.common.combineLatest
|
|
@@ -30,6 +30,9 @@ import kotlinx.coroutines.Dispatchers
|
|
|
30
30
|
import kotlinx.coroutines.flow.Flow
|
|
31
31
|
import kotlinx.coroutines.flow.collect
|
|
32
32
|
import kotlinx.coroutines.flow.collectLatest
|
|
33
|
+
import kotlinx.coroutines.flow.debounce
|
|
34
|
+
import kotlinx.coroutines.flow.drop
|
|
35
|
+
import kotlinx.coroutines.flow.first
|
|
33
36
|
import kotlinx.coroutines.flow.last
|
|
34
37
|
import kotlinx.coroutines.flow.take
|
|
35
38
|
import kotlinx.coroutines.flow.toList
|
|
@@ -69,14 +72,16 @@ class RNGizSDKManagerModule(reactContext: ReactApplicationContext) : ReactContex
|
|
|
69
72
|
override fun initialize() {
|
|
70
73
|
super.initialize()
|
|
71
74
|
CoroutineScope(Dispatchers.Main).launch {
|
|
72
|
-
deviceListState.collect { deviceList ->
|
|
73
|
-
// 保存一份缓存
|
|
75
|
+
deviceListState.debounce(500).collect { deviceList ->
|
|
74
76
|
val newDevices = deviceList - devices
|
|
77
|
+
devices = deviceList
|
|
75
78
|
newDevices.forEach{dev ->
|
|
76
79
|
val devJob = dev.getDeviceJob()
|
|
77
80
|
val scope = CoroutineScope(devJob)
|
|
81
|
+
// 新增的设备挂监听
|
|
82
|
+
// 被移除的设备携程会自动销毁
|
|
78
83
|
scope.launch {
|
|
79
|
-
dev.bleCapacity.subscribeStatus().
|
|
84
|
+
dev.bleCapacity.subscribeStatus().drop(1).debounce(500).collectLatest{
|
|
80
85
|
val data = JSONObject()
|
|
81
86
|
data.put("state", it.toInt())
|
|
82
87
|
data.put("type", "BLE")
|
|
@@ -85,7 +90,25 @@ class RNGizSDKManagerModule(reactContext: ReactApplicationContext) : ReactContex
|
|
|
85
90
|
}
|
|
86
91
|
}
|
|
87
92
|
scope.launch {
|
|
88
|
-
dev.
|
|
93
|
+
dev.bleCapacity.subscribeModuleProfile().drop(1).debounce(500).collectLatest{
|
|
94
|
+
if (it != null) {
|
|
95
|
+
emitDeviceListChange()
|
|
96
|
+
}
|
|
97
|
+
}
|
|
98
|
+
}
|
|
99
|
+
scope.launch {
|
|
100
|
+
dev.bleCapacity.subscribeDp().drop(1).collect{
|
|
101
|
+
val data = JSONObject()
|
|
102
|
+
data.put("data", JSONObject(it.toString()))
|
|
103
|
+
data.put("type", "BLE")
|
|
104
|
+
data.put("device", dev.toJsonObject())
|
|
105
|
+
sendEvent(EventName.DeviceDataListener.name, GizRNCallbackManager.jsonObject2WriteableMap(data))
|
|
106
|
+
}
|
|
107
|
+
}
|
|
108
|
+
|
|
109
|
+
|
|
110
|
+
scope.launch {
|
|
111
|
+
dev.lanCapacity.subscribeStatus().drop(1).debounce(500).collectLatest{
|
|
89
112
|
val data = JSONObject()
|
|
90
113
|
data.put("state", it.toInt())
|
|
91
114
|
data.put("type", "LAN")
|
|
@@ -94,7 +117,25 @@ class RNGizSDKManagerModule(reactContext: ReactApplicationContext) : ReactContex
|
|
|
94
117
|
}
|
|
95
118
|
}
|
|
96
119
|
scope.launch {
|
|
97
|
-
dev.
|
|
120
|
+
dev.lanCapacity.subscribeModuleProfile().drop(1).debounce(500).collectLatest{
|
|
121
|
+
if (it != null) {
|
|
122
|
+
emitDeviceListChange()
|
|
123
|
+
}
|
|
124
|
+
}
|
|
125
|
+
}
|
|
126
|
+
scope.launch {
|
|
127
|
+
dev.lanCapacity.subscribeDp().drop(1).collect{
|
|
128
|
+
val data = JSONObject()
|
|
129
|
+
data.put("data", JSONObject(it.toString()))
|
|
130
|
+
data.put("type", "LAN")
|
|
131
|
+
data.put("device", dev.toJsonObject())
|
|
132
|
+
sendEvent(EventName.DeviceDataListener.name, GizRNCallbackManager.jsonObject2WriteableMap(data))
|
|
133
|
+
}
|
|
134
|
+
}
|
|
135
|
+
|
|
136
|
+
|
|
137
|
+
scope.launch {
|
|
138
|
+
dev.mqttCapacity.subscribeStatus().drop(1).debounce(500).collectLatest{
|
|
98
139
|
val data = JSONObject()
|
|
99
140
|
data.put("state", it.toInt())
|
|
100
141
|
data.put("type", "MQTT")
|
|
@@ -102,17 +143,43 @@ class RNGizSDKManagerModule(reactContext: ReactApplicationContext) : ReactContex
|
|
|
102
143
|
sendEvent(EventName.DeviceStateListener.name, GizRNCallbackManager.jsonObject2WriteableMap(data))
|
|
103
144
|
}
|
|
104
145
|
}
|
|
146
|
+
scope.launch {
|
|
147
|
+
dev.mqttCapacity.subscribeModuleProfile().drop(1).debounce(500).collectLatest{
|
|
148
|
+
if (it != null) {
|
|
149
|
+
emitDeviceListChange()
|
|
150
|
+
}
|
|
151
|
+
}
|
|
152
|
+
}
|
|
153
|
+
scope.launch {
|
|
154
|
+
dev.mqttCapacity.subscribeDp().drop(1).collect{
|
|
155
|
+
val data = JSONObject()
|
|
156
|
+
data.put("data", JSONObject(it.toString()))
|
|
157
|
+
data.put("type", "MQTT")
|
|
158
|
+
data.put("device", dev.toJsonObject())
|
|
159
|
+
sendEvent(EventName.DeviceDataListener.name, GizRNCallbackManager.jsonObject2WriteableMap(data))
|
|
160
|
+
}
|
|
161
|
+
}
|
|
105
162
|
}
|
|
106
|
-
|
|
107
|
-
val deviceListJson = JSONArray()
|
|
108
|
-
deviceList.forEach{ item ->
|
|
109
|
-
deviceListJson.put(item.toJsonObject())
|
|
110
|
-
}
|
|
111
|
-
sendEvent(EventName.DeviceListListener.name, GizRNCallbackManager.jsonArray2WriteableArray(deviceListJson))
|
|
163
|
+
emitDeviceListChange()
|
|
112
164
|
}
|
|
113
165
|
}
|
|
114
166
|
}
|
|
115
167
|
|
|
168
|
+
/**
|
|
169
|
+
* RN的场景下
|
|
170
|
+
* module profile 变更 相当于设备列表变更
|
|
171
|
+
*/
|
|
172
|
+
suspend fun emitDeviceListChange() {
|
|
173
|
+
val deviceList = deviceListState.first()
|
|
174
|
+
// 缓存变更
|
|
175
|
+
val deviceListJson = JSONArray()
|
|
176
|
+
deviceList.forEach{ item ->
|
|
177
|
+
val state = item.bleCapacity.subscribeStatus().value
|
|
178
|
+
deviceListJson.put(item.toJsonObject())
|
|
179
|
+
}
|
|
180
|
+
sendEvent(EventName.DeviceListListener.name, GizRNCallbackManager.jsonArray2WriteableArray(deviceListJson))
|
|
181
|
+
}
|
|
182
|
+
|
|
116
183
|
fun sendEvent(name:String, data: WritableArray?) {
|
|
117
184
|
reactApplicationContext
|
|
118
185
|
.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
|
|
@@ -178,12 +245,12 @@ class RNGizSDKManagerModule(reactContext: ReactApplicationContext) : ReactContex
|
|
|
178
245
|
|
|
179
246
|
@ReactMethod
|
|
180
247
|
fun startBleScan(options: ReadableMap, result: Callback) {
|
|
181
|
-
GizSDKManager.
|
|
248
|
+
GizSDKManager.startBleScan()
|
|
182
249
|
GizRNCallbackManager.callbackWithResult(callback = result, result = Result.success<Number>(0))
|
|
183
250
|
}
|
|
184
251
|
@ReactMethod
|
|
185
252
|
fun stopBleScan(options: ReadableMap, result: Callback) {
|
|
186
|
-
GizSDKManager.
|
|
253
|
+
GizSDKManager.stopBleScan()
|
|
187
254
|
GizRNCallbackManager.callbackWithResult(callback = result, result = Result.success<Number>(0))
|
|
188
255
|
}
|
|
189
256
|
}
|
|
Binary file
|
|
Binary file
|
package/ios/GizwitsiOSSDK.framework/Modules/GizwitsiOSSDK.swiftmodule/arm64-apple-ios.swiftdoc
CHANGED
|
Binary file
|
package/ios/GizwitsiOSSDK.framework/Modules/GizwitsiOSSDK.swiftmodule/arm64-apple-ios.swiftmodule
CHANGED
|
Binary file
|
|
@@ -15,7 +15,10 @@ RCT_EXTERN_METHOD(getDp:(NSDictionary *)options result:(RCTResponseSenderBlock)r
|
|
|
15
15
|
RCT_EXTERN_METHOD(getDeviceInfo:(NSDictionary *)options result:(RCTResponseSenderBlock)result)
|
|
16
16
|
RCT_EXTERN_METHOD(checkUpdate:(NSDictionary *)options result:(RCTResponseSenderBlock)result)
|
|
17
17
|
RCT_EXTERN_METHOD(startUpgrade:(NSDictionary *)options result:(RCTResponseSenderBlock)result)
|
|
18
|
+
RCT_EXTERN_METHOD(cancelUpgrade:(NSDictionary *)options result:(RCTResponseSenderBlock)result)
|
|
18
19
|
RCT_EXTERN_METHOD(register:(NSDictionary *)options result:(RCTResponseSenderBlock)result)
|
|
19
20
|
RCT_EXTERN_METHOD(bind:(NSDictionary *)options result:(RCTResponseSenderBlock)result)
|
|
20
21
|
RCT_EXTERN_METHOD(unBind:(NSDictionary *)options result:(RCTResponseSenderBlock)result)
|
|
22
|
+
RCT_EXTERN_METHOD(stopProvideWiFiCredentials:(NSDictionary *)options result:(RCTResponseSenderBlock)result)
|
|
23
|
+
RCT_EXTERN_METHOD(provideWiFiCredentials:(NSDictionary *)options result:(RCTResponseSenderBlock)result)
|
|
21
24
|
@end
|
|
@@ -23,6 +23,11 @@ struct StartUpgradeParams: Decodable {
|
|
|
23
23
|
var firmwareType: GizwitsiOSSDK.GizOTAFirmwareType
|
|
24
24
|
var id: String
|
|
25
25
|
}
|
|
26
|
+
struct CancelUpgradeParams: Decodable {
|
|
27
|
+
var type: GizwitsiOSSDK.GizCapability
|
|
28
|
+
var id: String
|
|
29
|
+
}
|
|
30
|
+
|
|
26
31
|
|
|
27
32
|
struct RegisterParams: Decodable {
|
|
28
33
|
var id: String
|
|
@@ -54,12 +59,24 @@ struct WriteParams: Decodable {
|
|
|
54
59
|
var id: String
|
|
55
60
|
var data: String
|
|
56
61
|
}
|
|
62
|
+
struct ProvideWiFiCredentialsParams: Decodable {
|
|
63
|
+
var type: GizwitsiOSSDK.GizCapability
|
|
64
|
+
var id: String
|
|
65
|
+
var ssid: String
|
|
66
|
+
var password: String
|
|
67
|
+
var timeout: Int
|
|
68
|
+
}
|
|
69
|
+
struct StopProvideWiFiCredentialsParams: Decodable {
|
|
70
|
+
var type: GizwitsiOSSDK.GizCapability
|
|
71
|
+
var id: String
|
|
72
|
+
}
|
|
73
|
+
|
|
57
74
|
|
|
58
75
|
@objc(RNGizDeviceManagerModule)
|
|
59
76
|
class RNGizDeviceManagerModule: RCTEventEmitter {
|
|
60
77
|
|
|
61
78
|
override func supportedEvents() -> [String]! {
|
|
62
|
-
return ["GizOTAProgressEvent"]
|
|
79
|
+
return ["GizOTAProgressEvent", "GizProvideWiFiCredentialsEvent"]
|
|
63
80
|
}
|
|
64
81
|
|
|
65
82
|
private func findDevice(id: String) -> GizwitsiOSSDK.GizDevice? {
|
|
@@ -144,6 +161,32 @@ class RNGizDeviceManagerModule: RCTEventEmitter {
|
|
|
144
161
|
}
|
|
145
162
|
}
|
|
146
163
|
@objc
|
|
164
|
+
public func cancelUpgrade(_ options: NSDictionary, result: @escaping RCTResponseSenderBlock) {
|
|
165
|
+
if let params = RNGizParamsChecker.check(options: options, result: result, paramsType: CancelUpgradeParams.self) {
|
|
166
|
+
// 先找到设备
|
|
167
|
+
if let device = findDevice(id: params.id) {
|
|
168
|
+
Task {
|
|
169
|
+
var data: GizResult<Int?, GizOTAException?>
|
|
170
|
+
switch(params.type) {
|
|
171
|
+
case .GizBleCapability:
|
|
172
|
+
data = await device.bleCapability.cancelUpgrade()
|
|
173
|
+
break
|
|
174
|
+
case .GizLanCapability:
|
|
175
|
+
data = await device.lanCapability.cancelUpgrade()
|
|
176
|
+
break
|
|
177
|
+
case .GizMQTTCapability:
|
|
178
|
+
data = await device.mqttCapability.cancelUpgrade()
|
|
179
|
+
break
|
|
180
|
+
}
|
|
181
|
+
|
|
182
|
+
GizRNCallbackManager.callbackWithResult(callback: result, result:data)
|
|
183
|
+
}
|
|
184
|
+
} else {
|
|
185
|
+
GizRNCallbackManager.callbackWithResult(callback: result, result: GizResult<Int?, GizAPIException?>(error: GizAPIException.GIZ_OPENAPI_DEVICE_NOT_FOUND))
|
|
186
|
+
}
|
|
187
|
+
}
|
|
188
|
+
}
|
|
189
|
+
@objc
|
|
147
190
|
public func startUpgrade(_ options: NSDictionary, result: @escaping RCTResponseSenderBlock) {
|
|
148
191
|
if let params = RNGizParamsChecker.check(options: options, result: result, paramsType: StartUpgradeParams.self) {
|
|
149
192
|
|
|
@@ -305,6 +348,73 @@ class RNGizDeviceManagerModule: RCTEventEmitter {
|
|
|
305
348
|
}
|
|
306
349
|
}
|
|
307
350
|
|
|
351
|
+
@objc
|
|
352
|
+
public func provideWiFiCredentials(_ options: NSDictionary, result: @escaping RCTResponseSenderBlock) {
|
|
353
|
+
if let params = RNGizParamsChecker.check(options: options, result: result, paramsType: ProvideWiFiCredentialsParams.self) {
|
|
354
|
+
|
|
355
|
+
|
|
356
|
+
// 先找到设备
|
|
357
|
+
if let device = findDevice(id: params.id) {
|
|
358
|
+
@Sendable func progressHandler(event: GizWiFiActivatorEvent) {
|
|
359
|
+
// 推送数据到 GizOTAProgressEvent
|
|
360
|
+
let data = [
|
|
361
|
+
"device": GizRNCallbackManager.convertToDictionary(object: device) ?? [:],
|
|
362
|
+
"data": event.rawValue
|
|
363
|
+
] as [String : Any]
|
|
364
|
+
sendEvent(withName: "GizProvideWiFiCredentialsEvent", body: data)
|
|
365
|
+
}
|
|
366
|
+
Task {
|
|
367
|
+
var data: GizResult<GizBaseProfile?, GizActivatorCombinedException?>
|
|
368
|
+
switch(params.type) {
|
|
369
|
+
case .GizBleCapability:
|
|
370
|
+
data = await device.bleCapability.provideWiFiCredentials(ssid: params.ssid, password: params.password, timeout: params.timeout, processHandler: progressHandler)
|
|
371
|
+
break
|
|
372
|
+
case .GizLanCapability:
|
|
373
|
+
data = await device.lanCapability.provideWiFiCredentials(ssid: params.ssid, password: params.password, timeout: params.timeout, processHandler: progressHandler)
|
|
374
|
+
break
|
|
375
|
+
case .GizMQTTCapability:
|
|
376
|
+
data = await device.mqttCapability.provideWiFiCredentials(ssid: params.ssid, password: params.password, timeout: params.timeout, processHandler: progressHandler)
|
|
377
|
+
break
|
|
378
|
+
}
|
|
379
|
+
|
|
380
|
+
GizRNCallbackManager.callbackWithResult(callback: result, result:data)
|
|
381
|
+
}
|
|
382
|
+
} else {
|
|
383
|
+
// 提示设备不存在
|
|
384
|
+
GizRNCallbackManager.callbackWithResult(callback: result, result: GizResult<Int?, GizAPIException?>(error: GizAPIException.GIZ_OPENAPI_DEVICE_NOT_FOUND))
|
|
385
|
+
}
|
|
386
|
+
|
|
387
|
+
}
|
|
388
|
+
}
|
|
389
|
+
|
|
390
|
+
@objc
|
|
391
|
+
public func stopProvideWiFiCredentials(_ options: NSDictionary, result: @escaping RCTResponseSenderBlock) {
|
|
392
|
+
if let params = RNGizParamsChecker.check(options: options, result: result, paramsType: StopProvideWiFiCredentialsParams.self) {
|
|
393
|
+
// 先找到设备
|
|
394
|
+
if let device = findDevice(id: params.id) {
|
|
395
|
+
Task {
|
|
396
|
+
var data: GizResult<Int?, GizActivatorCombinedException?>
|
|
397
|
+
switch(params.type) {
|
|
398
|
+
case .GizBleCapability:
|
|
399
|
+
data = await device.bleCapability.stopProvideWiFiCredentials()
|
|
400
|
+
break
|
|
401
|
+
case .GizLanCapability:
|
|
402
|
+
data = await device.lanCapability.stopProvideWiFiCredentials()
|
|
403
|
+
break
|
|
404
|
+
case .GizMQTTCapability:
|
|
405
|
+
data = await device.mqttCapability.stopProvideWiFiCredentials()
|
|
406
|
+
break
|
|
407
|
+
}
|
|
408
|
+
GizRNCallbackManager.callbackWithResult(callback: result, result:data)
|
|
409
|
+
}
|
|
410
|
+
|
|
411
|
+
} else {
|
|
412
|
+
// 提示设备不存在
|
|
413
|
+
GizRNCallbackManager.callbackWithResult(callback: result, result: GizResult<Int?, GizAPIException?>(error: GizAPIException.GIZ_OPENAPI_DEVICE_NOT_FOUND))
|
|
414
|
+
}
|
|
415
|
+
}
|
|
416
|
+
}
|
|
417
|
+
|
|
308
418
|
@objc
|
|
309
419
|
override static func requiresMainQueueSetup() -> Bool {
|
|
310
420
|
return true
|
package/lib/device.d.ts
CHANGED
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
import Base from './Base';
|
|
2
|
-
import { GizCapability, GizDeviceData, GizDeviceInfoProfile, GizOTAFirmwareType, GizOtaProgressCallback, GizOtaProgressEventCallback, GizResult } from './types';
|
|
2
|
+
import { GizCapability, GizDeviceData, GizDeviceInfoProfile, GizOTAFirmwareType, GizOtaProgressCallback, GizOtaProgressEventCallback, GizProvideWiFiCredentialsCallback, GizResult } from './types';
|
|
3
3
|
declare class RNGizDeviceManagerModule extends Base {
|
|
4
4
|
otaEventCallbacks: GizOtaProgressEventCallback[];
|
|
5
|
+
provideWiFiCredentialsCallbacks: GizProvideWiFiCredentialsCallback[];
|
|
5
6
|
constructor();
|
|
6
7
|
otaEventCallback: GizOtaProgressEventCallback;
|
|
8
|
+
provideWiFiCredentialsCallback: GizProvideWiFiCredentialsCallback;
|
|
7
9
|
sendDp(id: string, type: GizCapability, data: Object): Promise<GizResult<GizDeviceData, any>>;
|
|
8
10
|
getDp(id: string, type: GizCapability, attrs?: string[]): Promise<GizResult<GizDeviceData, any>>;
|
|
9
11
|
getDeviceInfo(id: string, type: GizCapability): Promise<GizResult<GizDeviceInfoProfile, any>>;
|
|
@@ -13,6 +15,8 @@ declare class RNGizDeviceManagerModule extends Base {
|
|
|
13
15
|
register(id: string): Promise<GizResult<any, any>>;
|
|
14
16
|
checkUpdate(id: string, type: GizCapability, firmwareType: GizOTAFirmwareType): Promise<GizResult<any, any>>;
|
|
15
17
|
startUpgrade(id: string, type: GizCapability, firmwareType: GizOTAFirmwareType, callback: GizOtaProgressCallback): Promise<GizResult<any, any>>;
|
|
18
|
+
provideWiFiCredentials(id: string, type: GizCapability, ssid: string, password: string, timeout: number, processHandler: GizProvideWiFiCredentialsCallback): Promise<GizResult<any, any>>;
|
|
19
|
+
stopProvideWiFiCredentials(id: string, type: GizCapability): Promise<GizResult<any, any>>;
|
|
16
20
|
}
|
|
17
21
|
declare const _default: RNGizDeviceManagerModule;
|
|
18
22
|
export default _default;
|
package/lib/device.js
CHANGED
|
@@ -5,12 +5,19 @@ class RNGizDeviceManagerModule extends Base {
|
|
|
5
5
|
constructor() {
|
|
6
6
|
super();
|
|
7
7
|
this.otaEventCallbacks = [];
|
|
8
|
+
this.provideWiFiCredentialsCallbacks = [];
|
|
8
9
|
this.otaEventCallback = (data) => {
|
|
9
10
|
this.otaEventCallbacks.map((item) => {
|
|
10
11
|
item(data);
|
|
11
12
|
});
|
|
12
13
|
};
|
|
14
|
+
this.provideWiFiCredentialsCallback = (data) => {
|
|
15
|
+
this.provideWiFiCredentialsCallbacks.map((item) => {
|
|
16
|
+
item(data);
|
|
17
|
+
});
|
|
18
|
+
};
|
|
13
19
|
eventEmitter.addListener('GizOTAProgressEvent', this.otaEventCallback);
|
|
20
|
+
eventEmitter.addListener('GizProvideWiFiCredentialsEvent', this.provideWiFiCredentialsCallback);
|
|
14
21
|
}
|
|
15
22
|
sendDp(id, type, data) {
|
|
16
23
|
return this.callbackWapper((callback) => {
|
|
@@ -96,6 +103,31 @@ class RNGizDeviceManagerModule extends Base {
|
|
|
96
103
|
this.deleteCallBack(this.otaEventCallbacks, wapperCallback);
|
|
97
104
|
return data;
|
|
98
105
|
}
|
|
106
|
+
async provideWiFiCredentials(id, type, ssid, password, timeout, processHandler) {
|
|
107
|
+
const wapperCallback = (data) => {
|
|
108
|
+
processHandler(data);
|
|
109
|
+
};
|
|
110
|
+
this.provideWiFiCredentialsCallbacks.push(wapperCallback);
|
|
111
|
+
const data = await this.callbackWapper((callback) => {
|
|
112
|
+
NativeModules.RNGizDeviceManagerModule.provideWiFiCredentials({
|
|
113
|
+
id,
|
|
114
|
+
type,
|
|
115
|
+
ssid,
|
|
116
|
+
password,
|
|
117
|
+
timeout,
|
|
118
|
+
}, callback);
|
|
119
|
+
});
|
|
120
|
+
this.deleteCallBack(this.provideWiFiCredentialsCallbacks, wapperCallback);
|
|
121
|
+
return data;
|
|
122
|
+
}
|
|
123
|
+
async stopProvideWiFiCredentials(id, type) {
|
|
124
|
+
return this.callbackWapper((callback) => {
|
|
125
|
+
NativeModules.RNGizDeviceManagerModule.stopProvideWiFiCredentials({
|
|
126
|
+
id,
|
|
127
|
+
type,
|
|
128
|
+
}, callback);
|
|
129
|
+
});
|
|
130
|
+
}
|
|
99
131
|
}
|
|
100
132
|
export default new RNGizDeviceManagerModule();
|
|
101
133
|
//# sourceMappingURL=device.js.map
|
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;
|
|
1
|
+
{"version":3,"file":"device.js","sourceRoot":"","sources":["../src/device.tsx"],"names":[],"mappings":"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"}
|
package/lib/index.js
CHANGED
|
@@ -57,6 +57,30 @@ class RNGizSDKManagerModule extends Base {
|
|
|
57
57
|
device.mqttCapability.startUpgrade = (firmwareType, callback) => {
|
|
58
58
|
return RNGizDeviceManagerModule.startUpgrade(device.id, 'MQTT', firmwareType, callback);
|
|
59
59
|
};
|
|
60
|
+
/**
|
|
61
|
+
* 配网相关
|
|
62
|
+
*/
|
|
63
|
+
device.bleCapability.provideWiFiCredentials = (ssid, password, timeout, callback) => {
|
|
64
|
+
return RNGizDeviceManagerModule.provideWiFiCredentials(device.id, 'BLE', ssid, password, timeout, callback);
|
|
65
|
+
};
|
|
66
|
+
device.lanCapability.provideWiFiCredentials = (ssid, password, timeout, callback) => {
|
|
67
|
+
return RNGizDeviceManagerModule.provideWiFiCredentials(device.id, 'LAN', ssid, password, timeout, callback);
|
|
68
|
+
};
|
|
69
|
+
device.mqttCapability.provideWiFiCredentials = (ssid, password, timeout, callback) => {
|
|
70
|
+
return RNGizDeviceManagerModule.provideWiFiCredentials(device.id, 'MQTT', ssid, password, timeout, callback);
|
|
71
|
+
};
|
|
72
|
+
device.bleCapability.stopProvideWiFiCredentials = () => {
|
|
73
|
+
return RNGizDeviceManagerModule.stopProvideWiFiCredentials(device.id, 'BLE');
|
|
74
|
+
};
|
|
75
|
+
device.lanCapability.stopProvideWiFiCredentials = () => {
|
|
76
|
+
return RNGizDeviceManagerModule.stopProvideWiFiCredentials(device.id, 'LAN');
|
|
77
|
+
};
|
|
78
|
+
device.mqttCapability.stopProvideWiFiCredentials = () => {
|
|
79
|
+
return RNGizDeviceManagerModule.stopProvideWiFiCredentials(device.id, 'MQTT');
|
|
80
|
+
};
|
|
81
|
+
/**
|
|
82
|
+
* 配网相关
|
|
83
|
+
*/
|
|
60
84
|
device.bind = (alias, remark) => {
|
|
61
85
|
return RNGizDeviceManagerModule.bind(device.id, alias, remark);
|
|
62
86
|
};
|
|
@@ -75,6 +99,15 @@ class RNGizSDKManagerModule extends Base {
|
|
|
75
99
|
device.mqttCapability.checkUpdate = (firmwareType) => {
|
|
76
100
|
return RNGizDeviceManagerModule.checkUpdate(device.id, 'MQTT', firmwareType);
|
|
77
101
|
};
|
|
102
|
+
device.bleCapability.provideWiFiCredentials = (ssid, password, timeout, processHandler) => {
|
|
103
|
+
return RNGizDeviceManagerModule.provideWiFiCredentials(device.id, 'BLE', ssid, password, timeout, processHandler);
|
|
104
|
+
};
|
|
105
|
+
device.lanCapability.provideWiFiCredentials = (ssid, password, timeout, processHandler) => {
|
|
106
|
+
return RNGizDeviceManagerModule.provideWiFiCredentials(device.id, 'LAN', ssid, password, timeout, processHandler);
|
|
107
|
+
};
|
|
108
|
+
device.mqttCapability.provideWiFiCredentials = (ssid, password, timeout, processHandler) => {
|
|
109
|
+
return RNGizDeviceManagerModule.provideWiFiCredentials(device.id, 'MQTT', ssid, password, timeout, processHandler);
|
|
110
|
+
};
|
|
78
111
|
};
|
|
79
112
|
this.deviceDataCallback = (data) => {
|
|
80
113
|
this.deviceDataCallbacks.map((item) => {
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.tsx"],"names":[],"mappings":"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"}
|
package/lib/types.d.ts
CHANGED
|
@@ -9,6 +9,8 @@ export interface GizBaseCapability {
|
|
|
9
9
|
getDp: (attrs?: string[]) => Promise<GizResult<GizDeviceData, any>>;
|
|
10
10
|
checkUpdate: (firmwareType: GizOTAFirmwareType) => Promise<GizResult<GizCheckUpdateResultInfo, any>>;
|
|
11
11
|
startUpgrade: (firmwareType: GizOTAFirmwareType, callback: GizOtaProgressCallback) => Promise<GizResult<GizCheckUpdateResultInfo, any>>;
|
|
12
|
+
provideWiFiCredentials: (ssid: string, password: string, timeout: number, callback: GizProvideWiFiCredentialsCallback) => Promise<GizResult<any, any>>;
|
|
13
|
+
stopProvideWiFiCredentials: () => Promise<GizResult<any, any>>;
|
|
12
14
|
}
|
|
13
15
|
export declare type GizOTAEvent = 'GizOTAEventCheckingDeviceVersion' | 'GizOTAEventDownloading' | 'GizOTAEventTransferring' | 'GizOTAEventFinish';
|
|
14
16
|
export interface GizOTAProgressData {
|
|
@@ -20,46 +22,40 @@ export declare type GizOtaProgressEventCallback = (data: {
|
|
|
20
22
|
data: GizOTAProgressData;
|
|
21
23
|
}) => void;
|
|
22
24
|
export declare type GizOtaProgressCallback = (event: GizOTAProgressData) => void;
|
|
25
|
+
export declare type GizProvideWiFiCredentialsCallback = (event: GizWiFiActivatorEvent) => void;
|
|
23
26
|
export interface GizCheckUpdateResultInfo {
|
|
24
27
|
downloadUrl: string;
|
|
25
28
|
softVersion: string;
|
|
26
29
|
currentSoftVersion: string;
|
|
27
30
|
}
|
|
28
31
|
export interface GizBaseProfile {
|
|
29
|
-
id: string;
|
|
30
|
-
mac: string;
|
|
31
|
-
productKey: string;
|
|
32
|
-
did?: string;
|
|
33
32
|
protocolVersion: number;
|
|
34
33
|
supportOTA: boolean;
|
|
35
34
|
requiresAuthentication: boolean;
|
|
36
35
|
authenticationMethod: AuthenticationMethod;
|
|
37
36
|
rootDid?: string;
|
|
38
|
-
moduleSoftVer?: string;
|
|
39
37
|
configured: boolean;
|
|
40
|
-
mcuSoftVer?: string;
|
|
41
|
-
isBind: boolean;
|
|
42
|
-
name: string;
|
|
43
|
-
bind: (alias?: string, remark?: string) => Promise<GizResult<any, any>>;
|
|
44
|
-
unBind: () => Promise<GizResult<any, any>>;
|
|
45
|
-
register: () => Promise<GizResult<any, any>>;
|
|
46
38
|
}
|
|
47
39
|
export declare type BlueToothType = 'Mesh' | 'Beacon' | 'Voice' | 'GATT';
|
|
48
40
|
export declare type BlueToothVersion = 'BLE4' | 'BLE42' | 'BLE50';
|
|
49
41
|
export declare type NetStatus = 0 | 1 | 2;
|
|
50
|
-
export
|
|
42
|
+
export declare type GizWiFiActivatorEventType = 'GIZ_CONNECT_SUCCESS' | 'GIZ_CONFIG_SEND_SUCCESS' | 'GIZ_CONFIG_RECV_SUCCESS' | 'GIZ_CONFIG_SUCCESS';
|
|
43
|
+
export interface GizWiFiActivatorEvent {
|
|
44
|
+
data: GizWiFiActivatorEventType;
|
|
45
|
+
}
|
|
46
|
+
export interface GizLanProfile extends GizBaseProfile {
|
|
51
47
|
ip: string;
|
|
52
48
|
port: number;
|
|
53
49
|
cTime: number;
|
|
54
50
|
}
|
|
55
|
-
export interface GizBleProfile {
|
|
51
|
+
export interface GizBleProfile extends GizBaseProfile {
|
|
56
52
|
deviceId: string;
|
|
57
53
|
cTime: number;
|
|
58
54
|
RSSI: number;
|
|
59
55
|
blueToothType: BlueToothType;
|
|
60
56
|
blueToothVersion: BlueToothVersion;
|
|
61
57
|
}
|
|
62
|
-
export interface GizMQTTProfile {
|
|
58
|
+
export interface GizMQTTProfile extends GizBaseProfile {
|
|
63
59
|
host: string;
|
|
64
60
|
port: number;
|
|
65
61
|
}
|
|
@@ -72,10 +68,19 @@ export interface GizLanCapability extends GizBaseCapability {
|
|
|
72
68
|
export interface GizMQTTCapability extends GizBaseCapability {
|
|
73
69
|
profile: GizMQTTProfile;
|
|
74
70
|
}
|
|
75
|
-
export interface IDevice
|
|
71
|
+
export interface IDevice {
|
|
72
|
+
id: string;
|
|
73
|
+
mac: string;
|
|
74
|
+
productKey: string;
|
|
75
|
+
did?: string;
|
|
76
|
+
isBind: boolean;
|
|
77
|
+
name: string;
|
|
76
78
|
bleCapability: GizBleCapability;
|
|
77
79
|
lanCapability: GizLanCapability;
|
|
78
80
|
mqttCapability: GizMQTTCapability;
|
|
81
|
+
bind: (alias?: string, remark?: string) => Promise<GizResult<any, any>>;
|
|
82
|
+
unBind: () => Promise<GizResult<any, any>>;
|
|
83
|
+
register: () => Promise<GizResult<any, any>>;
|
|
79
84
|
}
|
|
80
85
|
export interface IUpdateAuthorizeDataParams {
|
|
81
86
|
uid: string;
|