react-native-gizwits-sdk-v5 1.2.7 → 1.2.8
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-release.aar +0 -0
- package/android/libs/sdk-debug.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 +120 -2
- package/android/src/main/java/com/gizwits/reactnativegizwitssdkv5/RNGizSDKManagerModule.kt +4 -4
- 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 +2 -0
- package/ios/RNGizDeviceManagerModule.swift +79 -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 +24 -0
- package/lib/index.js.map +1 -1
- package/lib/types.d.ts +17 -15
- package/package.json +1 -1
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
package/android/src/main/java/com/gizwits/reactnativegizwitssdkv5/RNGizDeviceManagerModule.kt
CHANGED
|
@@ -5,15 +5,19 @@ 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
|
|
17
21
|
import com.google.gson.JsonArray
|
|
18
22
|
import com.google.gson.annotations.SerializedName
|
|
19
23
|
import kotlinx.coroutines.CoroutineScope
|
|
@@ -66,16 +70,45 @@ data class GizDisConnectParams(
|
|
|
66
70
|
val type: CapacityTypes
|
|
67
71
|
): DeviceParams
|
|
68
72
|
|
|
73
|
+
data class GizProvideWiFiCredentialsParams(
|
|
74
|
+
@SerializedName("id")
|
|
75
|
+
override val id: Int,
|
|
76
|
+
@SerializedName("type")
|
|
77
|
+
val type: CapacityTypes,
|
|
78
|
+
@SerializedName("ssid")
|
|
79
|
+
val ssid: String,
|
|
80
|
+
@SerializedName("password")
|
|
81
|
+
val password: String,
|
|
82
|
+
@SerializedName("timeout")
|
|
83
|
+
val timeout: Long,
|
|
84
|
+
): DeviceParams
|
|
85
|
+
data class GizStopProvideWiFiCredentialsParams(
|
|
86
|
+
@SerializedName("id")
|
|
87
|
+
override val id: Int,
|
|
88
|
+
@SerializedName("type")
|
|
89
|
+
val type: CapacityTypes,
|
|
90
|
+
): DeviceParams
|
|
91
|
+
|
|
69
92
|
data class GizGetDeviceInfoParams(
|
|
70
93
|
@SerializedName("id")
|
|
71
94
|
override val id: Int,
|
|
72
95
|
@SerializedName("type")
|
|
73
96
|
val type: CapacityTypes
|
|
74
97
|
): DeviceParams
|
|
98
|
+
data class GizCheckUpdateParams(
|
|
99
|
+
@SerializedName("id")
|
|
100
|
+
override val id: Int,
|
|
101
|
+
@SerializedName("type")
|
|
102
|
+
val type: CapacityTypes,
|
|
103
|
+
@SerializedName("firmwareType")
|
|
104
|
+
val firmwareType: GizOTAFirmwareType
|
|
105
|
+
): DeviceParams
|
|
106
|
+
|
|
75
107
|
|
|
76
108
|
class RNGizDeviceManagerModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaModule(reactContext) {
|
|
77
109
|
enum class EventName(val value: String) {
|
|
78
110
|
GizOTAProgressEvent("GizOTAProgressEvent"),
|
|
111
|
+
GizProvideWiFiCredentialsEvent("GizProvideWiFiCredentialsEvent"),
|
|
79
112
|
}
|
|
80
113
|
|
|
81
114
|
fun jsonObjectToPairs(jsonObject: JSONObject): Array<Pair<String, Any>> {
|
|
@@ -168,9 +201,64 @@ class RNGizDeviceManagerModule(reactContext: ReactApplicationContext) : ReactCon
|
|
|
168
201
|
}
|
|
169
202
|
}
|
|
170
203
|
@ReactMethod
|
|
171
|
-
fun
|
|
204
|
+
fun stopProvideWiFiCredentials(options: ReadableMap, result: Callback) {
|
|
205
|
+
val (config, device) = RNGizParamsChecker.checkDeviceAndParams(options, result, GizStopProvideWiFiCredentialsParams::class.java)
|
|
206
|
+
if (config !=null && device !=null) {
|
|
207
|
+
CoroutineScope(Dispatchers.Main).launch {
|
|
208
|
+
val res = when(config.type) {
|
|
209
|
+
CapacityTypes.BLE -> device.bleCapacity.stopProvideWiFiCredentials()
|
|
210
|
+
CapacityTypes.LAN -> device.lanCapacity.stopProvideWiFiCredentials()
|
|
211
|
+
CapacityTypes.MQTT -> device.mqttCapacity.stopProvideWiFiCredentials()
|
|
212
|
+
}
|
|
213
|
+
GizRNCallbackManager.callbackWithResult(callback = result, result = res)
|
|
214
|
+
}
|
|
215
|
+
}
|
|
216
|
+
}
|
|
217
|
+
|
|
218
|
+
fun wiFiCredentialsEventHandler(event: ProvideWiFiCredentialsEvent) {
|
|
219
|
+
val jsonObject = JSONObject()
|
|
220
|
+
jsonObject.put("data", event.toString())
|
|
221
|
+
sendEvent(
|
|
222
|
+
EventName.GizProvideWiFiCredentialsEvent.name,
|
|
223
|
+
GizRNCallbackManager.jsonObject2WriteableMap(jsonObject)
|
|
224
|
+
)
|
|
225
|
+
}
|
|
172
226
|
@ReactMethod
|
|
173
|
-
fun
|
|
227
|
+
fun provideWiFiCredentials(options: ReadableMap, result: Callback) {
|
|
228
|
+
val (config, device) = RNGizParamsChecker.checkDeviceAndParams(options, result, GizProvideWiFiCredentialsParams::class.java)
|
|
229
|
+
if (config !=null && device !=null) {
|
|
230
|
+
CoroutineScope(Dispatchers.Main).launch {
|
|
231
|
+
val res = when(config.type) {
|
|
232
|
+
CapacityTypes.BLE -> device.bleCapacity.provideWiFiCredentials(
|
|
233
|
+
config.ssid,
|
|
234
|
+
config.password,
|
|
235
|
+
config.timeout,
|
|
236
|
+
processHandler = {
|
|
237
|
+
wiFiCredentialsEventHandler(it)
|
|
238
|
+
}
|
|
239
|
+
)
|
|
240
|
+
CapacityTypes.LAN -> device.lanCapacity.provideWiFiCredentials(
|
|
241
|
+
config.ssid,
|
|
242
|
+
config.password,
|
|
243
|
+
config.timeout,
|
|
244
|
+
processHandler = {
|
|
245
|
+
wiFiCredentialsEventHandler(it)
|
|
246
|
+
}
|
|
247
|
+
)
|
|
248
|
+
CapacityTypes.MQTT -> device.mqttCapacity.provideWiFiCredentials(
|
|
249
|
+
config.ssid,
|
|
250
|
+
config.password,
|
|
251
|
+
config.timeout,
|
|
252
|
+
processHandler = {
|
|
253
|
+
wiFiCredentialsEventHandler(it)
|
|
254
|
+
}
|
|
255
|
+
)
|
|
256
|
+
}
|
|
257
|
+
GizRNCallbackManager.callbackWithResult(callback = result, result = res)
|
|
258
|
+
}
|
|
259
|
+
}
|
|
260
|
+
}
|
|
261
|
+
|
|
174
262
|
@ReactMethod
|
|
175
263
|
fun register(options: ReadableMap, result: Callback) {}
|
|
176
264
|
|
|
@@ -203,4 +291,34 @@ class RNGizDeviceManagerModule(reactContext: ReactApplicationContext) : ReactCon
|
|
|
203
291
|
}
|
|
204
292
|
}
|
|
205
293
|
|
|
294
|
+
@ReactMethod
|
|
295
|
+
fun checkUpdate(options: ReadableMap, result: Callback) {
|
|
296
|
+
val (config, device) = RNGizParamsChecker.checkDeviceAndParams(options, result, GizCheckUpdateParams::class.java)
|
|
297
|
+
if (config !=null && device !=null) {
|
|
298
|
+
CoroutineScope(Dispatchers.Main).launch {
|
|
299
|
+
val res = when(config.type) {
|
|
300
|
+
CapacityTypes.BLE -> device.bleCapacity.checkUpdate(config.firmwareType)
|
|
301
|
+
CapacityTypes.LAN -> device.lanCapacity.checkUpdate(config.firmwareType)
|
|
302
|
+
CapacityTypes.MQTT -> device.mqttCapacity.checkUpdate(config.firmwareType)
|
|
303
|
+
}
|
|
304
|
+
GizRNCallbackManager.callbackWithResult(callback = result, result = res)
|
|
305
|
+
}
|
|
306
|
+
}
|
|
307
|
+
}
|
|
308
|
+
@ReactMethod
|
|
309
|
+
fun startUpgrade(options: ReadableMap, result: Callback) {
|
|
310
|
+
val (config, device) = RNGizParamsChecker.checkDeviceAndParams(options, result, GizCheckUpdateParams::class.java)
|
|
311
|
+
if (config !=null && device !=null) {
|
|
312
|
+
CoroutineScope(Dispatchers.Main).launch {
|
|
313
|
+
|
|
314
|
+
}
|
|
315
|
+
}
|
|
316
|
+
}
|
|
317
|
+
|
|
318
|
+
fun sendEvent(name:String, data: WritableMap?) {
|
|
319
|
+
reactApplicationContext
|
|
320
|
+
.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
|
|
321
|
+
.emit(name, data)
|
|
322
|
+
}
|
|
323
|
+
|
|
206
324
|
}
|
|
@@ -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
|
|
@@ -178,12 +178,12 @@ class RNGizSDKManagerModule(reactContext: ReactApplicationContext) : ReactContex
|
|
|
178
178
|
|
|
179
179
|
@ReactMethod
|
|
180
180
|
fun startBleScan(options: ReadableMap, result: Callback) {
|
|
181
|
-
GizSDKManager.
|
|
181
|
+
GizSDKManager.startBleScan()
|
|
182
182
|
GizRNCallbackManager.callbackWithResult(callback = result, result = Result.success<Number>(0))
|
|
183
183
|
}
|
|
184
184
|
@ReactMethod
|
|
185
185
|
fun stopBleScan(options: ReadableMap, result: Callback) {
|
|
186
|
-
GizSDKManager.
|
|
186
|
+
GizSDKManager.stopBleScan()
|
|
187
187
|
GizRNCallbackManager.callbackWithResult(callback = result, result = Result.success<Number>(0))
|
|
188
188
|
}
|
|
189
189
|
}
|
|
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
|
|
@@ -18,4 +18,6 @@ RCT_EXTERN_METHOD(startUpgrade:(NSDictionary *)options result:(RCTResponseSender
|
|
|
18
18
|
RCT_EXTERN_METHOD(register:(NSDictionary *)options result:(RCTResponseSenderBlock)result)
|
|
19
19
|
RCT_EXTERN_METHOD(bind:(NSDictionary *)options result:(RCTResponseSenderBlock)result)
|
|
20
20
|
RCT_EXTERN_METHOD(unBind:(NSDictionary *)options result:(RCTResponseSenderBlock)result)
|
|
21
|
+
RCT_EXTERN_METHOD(stopProvideWiFiCredentials:(NSDictionary *)options result:(RCTResponseSenderBlock)result)
|
|
22
|
+
RCT_EXTERN_METHOD(provideWiFiCredentials:(NSDictionary *)options result:(RCTResponseSenderBlock)result)
|
|
21
23
|
@end
|
|
@@ -54,12 +54,24 @@ struct WriteParams: Decodable {
|
|
|
54
54
|
var id: String
|
|
55
55
|
var data: String
|
|
56
56
|
}
|
|
57
|
+
struct ProvideWiFiCredentialsParams: Decodable {
|
|
58
|
+
var type: GizwitsiOSSDK.GizCapability
|
|
59
|
+
var id: String
|
|
60
|
+
var ssid: String
|
|
61
|
+
var password: String
|
|
62
|
+
var timeout: Int
|
|
63
|
+
}
|
|
64
|
+
struct StopProvideWiFiCredentialsParams: Decodable {
|
|
65
|
+
var type: GizwitsiOSSDK.GizCapability
|
|
66
|
+
var id: String
|
|
67
|
+
}
|
|
68
|
+
|
|
57
69
|
|
|
58
70
|
@objc(RNGizDeviceManagerModule)
|
|
59
71
|
class RNGizDeviceManagerModule: RCTEventEmitter {
|
|
60
72
|
|
|
61
73
|
override func supportedEvents() -> [String]! {
|
|
62
|
-
return ["GizOTAProgressEvent"]
|
|
74
|
+
return ["GizOTAProgressEvent", "GizProvideWiFiCredentialsEvent"]
|
|
63
75
|
}
|
|
64
76
|
|
|
65
77
|
private func findDevice(id: String) -> GizwitsiOSSDK.GizDevice? {
|
|
@@ -305,6 +317,72 @@ class RNGizDeviceManagerModule: RCTEventEmitter {
|
|
|
305
317
|
}
|
|
306
318
|
}
|
|
307
319
|
|
|
320
|
+
@objc
|
|
321
|
+
public func provideWiFiCredentials(_ options: NSDictionary, result: @escaping RCTResponseSenderBlock) {
|
|
322
|
+
if let params = RNGizParamsChecker.check(options: options, result: result, paramsType: ProvideWiFiCredentialsParams.self) {
|
|
323
|
+
|
|
324
|
+
|
|
325
|
+
// 先找到设备
|
|
326
|
+
if let device = findDevice(id: params.id) {
|
|
327
|
+
@Sendable func progressHandler(event: GizWiFiActivatorEvent) {
|
|
328
|
+
// 推送数据到 GizOTAProgressEvent
|
|
329
|
+
let data = [
|
|
330
|
+
"data": event.rawValue
|
|
331
|
+
] as [String : Any]
|
|
332
|
+
sendEvent(withName: "GizProvideWiFiCredentialsEvent", body: data)
|
|
333
|
+
}
|
|
334
|
+
Task {
|
|
335
|
+
var data: GizResult<GizBaseProfile?, GizActivatorCombinedException?>
|
|
336
|
+
switch(params.type) {
|
|
337
|
+
case .GizBleCapability:
|
|
338
|
+
data = await device.bleCapability.provideWiFiCredentials(ssid: params.ssid, password: params.password, timeout: params.timeout, processHandler: progressHandler)
|
|
339
|
+
break
|
|
340
|
+
case .GizLanCapability:
|
|
341
|
+
data = await device.lanCapability.provideWiFiCredentials(ssid: params.ssid, password: params.password, timeout: params.timeout, processHandler: progressHandler)
|
|
342
|
+
break
|
|
343
|
+
case .GizMQTTCapability:
|
|
344
|
+
data = await device.mqttCapability.provideWiFiCredentials(ssid: params.ssid, password: params.password, timeout: params.timeout, processHandler: progressHandler)
|
|
345
|
+
break
|
|
346
|
+
}
|
|
347
|
+
|
|
348
|
+
GizRNCallbackManager.callbackWithResult(callback: result, result:data)
|
|
349
|
+
}
|
|
350
|
+
} else {
|
|
351
|
+
// 提示设备不存在
|
|
352
|
+
GizRNCallbackManager.callbackWithResult(callback: result, result: GizResult<Int?, GizAPIException?>(error: GizAPIException.GIZ_OPENAPI_DEVICE_NOT_FOUND))
|
|
353
|
+
}
|
|
354
|
+
|
|
355
|
+
}
|
|
356
|
+
}
|
|
357
|
+
|
|
358
|
+
@objc
|
|
359
|
+
public func stopProvideWiFiCredentials(_ options: NSDictionary, result: @escaping RCTResponseSenderBlock) {
|
|
360
|
+
if let params = RNGizParamsChecker.check(options: options, result: result, paramsType: StopProvideWiFiCredentialsParams.self) {
|
|
361
|
+
// 先找到设备
|
|
362
|
+
if let device = findDevice(id: params.id) {
|
|
363
|
+
Task {
|
|
364
|
+
var data: GizResult<Int?, GizActivatorCombinedException?>
|
|
365
|
+
switch(params.type) {
|
|
366
|
+
case .GizBleCapability:
|
|
367
|
+
data = await device.bleCapability.stopProvideWiFiCredentials()
|
|
368
|
+
break
|
|
369
|
+
case .GizLanCapability:
|
|
370
|
+
data = await device.lanCapability.stopProvideWiFiCredentials()
|
|
371
|
+
break
|
|
372
|
+
case .GizMQTTCapability:
|
|
373
|
+
data = await device.mqttCapability.stopProvideWiFiCredentials()
|
|
374
|
+
break
|
|
375
|
+
}
|
|
376
|
+
GizRNCallbackManager.callbackWithResult(callback: result, result:data)
|
|
377
|
+
}
|
|
378
|
+
|
|
379
|
+
} else {
|
|
380
|
+
// 提示设备不存在
|
|
381
|
+
GizRNCallbackManager.callbackWithResult(callback: result, result: GizResult<Int?, GizAPIException?>(error: GizAPIException.GIZ_OPENAPI_DEVICE_NOT_FOUND))
|
|
382
|
+
}
|
|
383
|
+
}
|
|
384
|
+
}
|
|
385
|
+
|
|
308
386
|
@objc
|
|
309
387
|
override static func requiresMainQueueSetup() -> Bool {
|
|
310
388
|
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
|
};
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AAEhE,OAAO,IAAI,MAAM,QAAQ,CAAA;AACzB,OAAO,wBAAwB,MAAM,UAAU,CAAA;AAW/C,OAAO,KAAK,KAAK,MAAM,SAAS,CAAA;AAChC,OAAO,sBAAsB,MAAM,QAAQ,CAAA;AAE3C,MAAM,YAAY,GAAG,IAAI,kBAAkB,CAAC,aAAa,CAAC,qBAAqB,CAAC,CAAA;AAEhF,MAAM,qBAAsB,SAAQ,IAAI;IAKtC;QACE,KAAK,EAAE,CAAA;QALT,wBAAmB,GAAyB,EAAE,CAAA;QAC9C,wBAAmB,GAAyB,EAAE,CAAA;QAC9C,yBAAoB,GAA0B,EAAE,CAAA;QAShD,yBAAoB,GAAG,CAAC,MAAe,EAAE,EAAE;YACzC,YAAY;YACZ,MAAM,CAAC,aAAa,CAAC,OAAO,GAAG,GAAG,EAAE;gBAClC,OAAO,wBAAwB,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,CAAC,CAAA;YAC3D,CAAC,CAAA;YACD,MAAM,CAAC,aAAa,CAAC,OAAO,GAAG,GAAG,EAAE;gBAClC,OAAO,wBAAwB,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,CAAC,CAAA;YAC3D,CAAC,CAAA;YACD,MAAM,CAAC,cAAc,CAAC,OAAO,GAAG,GAAG,EAAE;gBACnC,OAAO,wBAAwB,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,EAAE,MAAM,CAAC,CAAA;YAC5D,CAAC,CAAA;YAED,MAAM,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC,IAAY,EAAE,EAAE;gBAC7C,OAAO,wBAAwB,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,CAAA;YAChE,CAAC,CAAA;YACD,MAAM,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC,IAAY,EAAE,EAAE;gBAC7C,OAAO,wBAAwB,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,CAAA;YAChE,CAAC,CAAA;YACD,MAAM,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,IAAY,EAAE,EAAE;gBAC9C,OAAO,wBAAwB,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;YACjE,CAAC,CAAA;YAED,MAAM,CAAC,aAAa,CAAC,KAAK,GAAG,CAAC,KAAgB,EAAE,EAAE;gBAChD,OAAO,wBAAwB,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,CAAA;YAChE,CAAC,CAAA;YACD,MAAM,CAAC,aAAa,CAAC,KAAK,GAAG,CAAC,KAAgB,EAAE,EAAE;gBAChD,OAAO,wBAAwB,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,CAAA;YAChE,CAAC,CAAA;YACD,MAAM,CAAC,cAAc,CAAC,KAAK,GAAG,CAAC,KAAgB,EAAE,EAAE;gBACjD,OAAO,wBAAwB,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,CAAC,CAAA;YACjE,CAAC,CAAA;YAED,MAAM,CAAC,aAAa,CAAC,aAAa,GAAG,GAAG,EAAE;gBACxC,OAAO,wBAAwB,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,CAAC,CAAA;YACjE,CAAC,CAAA;YACD,MAAM,CAAC,aAAa,CAAC,aAAa,GAAG,GAAG,EAAE;gBACxC,OAAO,wBAAwB,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,CAAC,CAAA;YACjE,CAAC,CAAA;YACD,MAAM,CAAC,cAAc,CAAC,aAAa,GAAG,GAAG,EAAE;gBACzC,OAAO,wBAAwB,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE,EAAE,MAAM,CAAC,CAAA;YAClE,CAAC,CAAA;YAED,MAAM,CAAC,aAAa,CAAC,YAAY,GAAG,CAClC,YAAsC,EACtC,QAAsC,EACtC,EAAE;gBACF,OAAO,wBAAwB,CAAC,YAAY,CAC1C,MAAM,CAAC,EAAE,EACT,KAAK,EACL,YAAY,EACZ,QAAQ,CACT,CAAA;YACH,CAAC,CAAA;YACD,MAAM,CAAC,aAAa,CAAC,YAAY,GAAG,CAClC,YAAsC,EACtC,QAAsC,EACtC,EAAE;gBACF,OAAO,wBAAwB,CAAC,YAAY,CAC1C,MAAM,CAAC,EAAE,EACT,KAAK,EACL,YAAY,EACZ,QAAQ,CACT,CAAA;YACH,CAAC,CAAA;YACD,MAAM,CAAC,cAAc,CAAC,YAAY,GAAG,CACnC,YAAsC,EACtC,QAAsC,EACtC,EAAE;gBACF,OAAO,wBAAwB,CAAC,YAAY,CAC1C,MAAM,CAAC,EAAE,EACT,MAAM,EACN,YAAY,EACZ,QAAQ,CACT,CAAA;YACH,CAAC,CAAA;YAED,MAAM,CAAC,IAAI,GAAG,CAAC,KAAc,EAAE,MAAe,EAAE,EAAE;gBAChD,OAAO,wBAAwB,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,CAAA;YAChE,CAAC,CAAA;YACD,MAAM,CAAC,MAAM,GAAG,GAAG,EAAE;gBACnB,OAAO,wBAAwB,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;YACnD,CAAC,CAAA;YACD,MAAM,CAAC,QAAQ,GAAG,GAAG,EAAE;gBACrB,OAAO,wBAAwB,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;YACrD,CAAC,CAAA;YAED,MAAM,CAAC,aAAa,CAAC,WAAW,GAAG,CACjC,YAAsC,EACtC,EAAE;gBACF,OAAO,wBAAwB,CAAC,WAAW,CACzC,MAAM,CAAC,EAAE,EACT,KAAK,EACL,YAAY,CACb,CAAA;YACH,CAAC,CAAA;YACD,MAAM,CAAC,aAAa,CAAC,WAAW,GAAG,CACjC,YAAsC,EACtC,EAAE;gBACF,OAAO,wBAAwB,CAAC,WAAW,CACzC,MAAM,CAAC,EAAE,EACT,KAAK,EACL,YAAY,CACb,CAAA;YACH,CAAC,CAAA;YACD,MAAM,CAAC,cAAc,CAAC,WAAW,GAAG,CAClC,YAAsC,EACtC,EAAE;gBACF,OAAO,wBAAwB,CAAC,WAAW,CACzC,MAAM,CAAC,EAAE,EACT,MAAM,EACN,YAAY,CACb,CAAA;YACH,CAAC,CAAA;QACH,CAAC,CAAA;QAED,uBAAkB,GAAG,CAAC,IAAmB,EAAE,EAAE;YAC3C,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;gBACpC,IAAI,CAAC,IAAI,CAAC,CAAA;YACZ,CAAC,CAAC,CAAA;QACJ,CAAC,CAAA;QACD,uBAAkB,GAAG,CAAC,IAAe,EAAE,EAAE;YACvC,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;gBACpC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;oBACb,IAAI,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAA;gBAC9B,CAAC,CAAC,CAAA;gBACF,IAAI,CAAC,IAAI,CAAC,CAAA;YACZ,CAAC,CAAC,CAAA;QACJ,CAAC,CAAA;QACD,wBAAmB,GAAG,CAAC,IAAoB,EAAE,EAAE;YAC7C,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;gBACrC,IAAI,CAAC,IAAI,CAAC,CAAA;YACZ,CAAC,CAAC,CAAA;QACJ,CAAC,CAAA;
|
|
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,37 @@ 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 GizWiFiActivatorEvent = 'GIZ_CONNECT_SUCCESS' | 'GIZ_CONFIG_SEND_SUCCESS' | 'GIZ_CONFIG_RECV_SUCCESS' | 'GIZ_CONFIG_SUCCESS';
|
|
43
|
+
export interface GizLanProfile extends GizBaseProfile {
|
|
51
44
|
ip: string;
|
|
52
45
|
port: number;
|
|
53
46
|
cTime: number;
|
|
54
47
|
}
|
|
55
|
-
export interface GizBleProfile {
|
|
48
|
+
export interface GizBleProfile extends GizBaseProfile {
|
|
56
49
|
deviceId: string;
|
|
57
50
|
cTime: number;
|
|
58
51
|
RSSI: number;
|
|
59
52
|
blueToothType: BlueToothType;
|
|
60
53
|
blueToothVersion: BlueToothVersion;
|
|
61
54
|
}
|
|
62
|
-
export interface GizMQTTProfile {
|
|
55
|
+
export interface GizMQTTProfile extends GizBaseProfile {
|
|
63
56
|
host: string;
|
|
64
57
|
port: number;
|
|
65
58
|
}
|
|
@@ -72,10 +65,19 @@ export interface GizLanCapability extends GizBaseCapability {
|
|
|
72
65
|
export interface GizMQTTCapability extends GizBaseCapability {
|
|
73
66
|
profile: GizMQTTProfile;
|
|
74
67
|
}
|
|
75
|
-
export interface IDevice
|
|
68
|
+
export interface IDevice {
|
|
69
|
+
id: string;
|
|
70
|
+
mac: string;
|
|
71
|
+
productKey: string;
|
|
72
|
+
did?: string;
|
|
73
|
+
isBind: boolean;
|
|
74
|
+
name: string;
|
|
76
75
|
bleCapability: GizBleCapability;
|
|
77
76
|
lanCapability: GizLanCapability;
|
|
78
77
|
mqttCapability: GizMQTTCapability;
|
|
78
|
+
bind: (alias?: string, remark?: string) => Promise<GizResult<any, any>>;
|
|
79
|
+
unBind: () => Promise<GizResult<any, any>>;
|
|
80
|
+
register: () => Promise<GizResult<any, any>>;
|
|
79
81
|
}
|
|
80
82
|
export interface IUpdateAuthorizeDataParams {
|
|
81
83
|
uid: string;
|