react-native-gizwits-sdk-v5 1.3.98 → 1.4.0

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.
Files changed (6) hide show
  1. package/README.md +1 -1
  2. package/android/build.gradle +4 -8
  3. package/android/src/main/java/com/gizwits/reactnativegizwitssdkv5/RNGizDeviceManagerModule.kt +33 -33
  4. package/android/src/main/java/com/gizwits/reactnativegizwitssdkv5/RNGizSDKManagerModule.kt +15 -15
  5. package/package.json +1 -1
  6. package/react-native-gizwits-sdk-v5.podspec +1 -1
package/README.md CHANGED
@@ -19,7 +19,7 @@
19
19
 
20
20
  ![img](https://goms-1251025085.cos.ap-guangzhou.myqcloud.com/gizwits_docs/tuozhan.png)
21
21
 
22
- 这三个能力都继承于 GizBaseCapability，都实现了控制、连接等功能。在开发的过程中您可以自由的选择连接某个通道，对某个通道下发指令。
22
+ 这三个能力都继承于 BaseCapability，都实现了控制、连接等功能。在开发的过程中您可以自由的选择连接某个通道，对某个通道下发指令。
23
23
 
24
24
  ```javascript
25
25
  // ble
package/android/build.gradle CHANGED
@@ -63,14 +63,11 @@ dependencies {
63
63
 
64
64
  implementation "androidx.startup:startup-runtime:$startup_version"
65
65
 
66
- implementation("io.github.gizwits:sdk:1.0.69")
67
- implementation("io.github.gizwits:sdk-bluetooth:1.0.69")
68
- implementation("io.github.gizwits:sdk-lan:1.0.69")
69
- implementation("io.github.gizwits:sdk-mqtt:1.0.69")
70
-
66
+ implementation("io.github.gizwits:sdk:1.0.70")
67
+ implementation("io.github.gizwits:sdk-bluetooth:1.0.70")
68
+ implementation("io.github.gizwits:sdk-lan:1.0.70")
69
+ implementation("io.github.gizwits:sdk-mqtt:1.0.70")
71
70
  // implementation files('libs/sdk-release.aar', 'libs/sdk-bluetooth-release.aar', 'libs/sdk-lan-release.aar', 'libs/sdk-mqtt-release.aar')
72
-
73
-
74
71
  implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlin_coroutine_version")
75
72
  // retrofit
76
73
  implementation("com.squareup.retrofit2:retrofit:$retrofit_version")
@@ -81,7 +78,6 @@ dependencies {
81
78
  implementation("androidx.room:room-ktx:$room_version")
82
79
  // gson
83
80
  implementation("com.google.code.gson:gson:$gson_version")
84
-
85
81
  //ktor
86
82
  implementation "io.ktor:ktor-network:$ktor_network_version"
87
83
 
package/android/src/main/java/com/gizwits/reactnativegizwitssdkv5/RNGizDeviceManagerModule.kt CHANGED
@@ -9,13 +9,13 @@ import com.facebook.react.bridge.WritableMap
9
9
  import com.facebook.react.modules.core.DeviceEventManagerModule
10
10
  import com.gizwits.smart.sdk.GizDevice
11
11
  import com.gizwits.smart.sdk.GizSDKManager
12
- import com.gizwits.smart.sdk.bluetooth.bleCapacity
12
+ import com.gizwits.smart.sdk.bluetooth.bleCapability
13
13
  import com.gizwits.smart.sdk.common.GizConfiguration
14
14
  import com.gizwits.smart.sdk.common.ProvideWiFiCredentialsEvent
15
15
  import com.gizwits.smart.sdk.core.capacity.CapacityTypes
16
16
  import com.gizwits.smart.sdk.exception.GizException
17
- import com.gizwits.smart.sdk.lan.lanCapacity
18
- import com.gizwits.smart.sdk.mqtt.mqttCapacity
17
+ import com.gizwits.smart.sdk.lan.lanCapability
18
+ import com.gizwits.smart.sdk.mqtt.mqttCapability
19
19
  import com.gizwits.smart.sdk.mqtt.queryBoundDevices
20
20
  import com.gizwits.smart.sdk.ota.GizOTAFirmwareType
21
21
  import com.gizwits.smart.sdk.ota.OTAProgressData
@@ -145,9 +145,9 @@ class RNGizDeviceManagerModule(reactContext: ReactApplicationContext) : ReactCon
145
145
  val jsonObject = gson.fromJson(config.data, JsonObject::class.java)
146
146
  val attrs = jsonObjectToPairs(jsonObject)
147
147
  val res = when(config.type) {
148
- CapacityTypes.BLE -> device.bleCapacity.sendDp(*attrs)
149
- CapacityTypes.LAN -> device.lanCapacity.sendDp(*attrs)
150
- CapacityTypes.MQTT -> device.mqttCapacity.sendDp(*attrs)
148
+ CapacityTypes.BLE -> device.bleCapability.sendDp(*attrs)
149
+ CapacityTypes.LAN -> device.lanCapability.sendDp(*attrs)
150
+ CapacityTypes.MQTT -> device.mqttCapability.sendDp(*attrs)
151
151
  }
152
152
  GizRNCallbackManager.callbackWithResult(callback = result, result = res)
153
153
  }catch (e: Exception) {
@@ -162,9 +162,9 @@ class RNGizDeviceManagerModule(reactContext: ReactApplicationContext) : ReactCon
162
162
  if (config !=null && device !=null) {
163
163
  CoroutineScope(Dispatchers.IO).launch {
164
164
  var res = when(config.type) {
165
- CapacityTypes.BLE -> device.bleCapacity.getDp(config.attrs)
166
- CapacityTypes.LAN -> device.lanCapacity.getDp(config.attrs)
167
- CapacityTypes.MQTT -> device.mqttCapacity.getDp(config.attrs)
165
+ CapacityTypes.BLE -> device.bleCapability.getDp(config.attrs)
166
+ CapacityTypes.LAN -> device.lanCapability.getDp(config.attrs)
167
+ CapacityTypes.MQTT -> device.mqttCapability.getDp(config.attrs)
168
168
  }
169
169
  if (res.isSuccess) {
170
170
  var jsonObject = res.getOrNull() ?: JSONObject()
@@ -184,9 +184,9 @@ class RNGizDeviceManagerModule(reactContext: ReactApplicationContext) : ReactCon
184
184
  if (config !=null && device !=null) {
185
185
  CoroutineScope(Dispatchers.IO).launch {
186
186
  val res = when(config.type) {
187
- CapacityTypes.BLE -> device.bleCapacity.getDeviceInfo()
188
- CapacityTypes.LAN -> device.lanCapacity.getDeviceInfo()
189
- CapacityTypes.MQTT -> device.mqttCapacity.getDeviceInfo()
187
+ CapacityTypes.BLE -> device.bleCapability.getDeviceInfo()
188
+ CapacityTypes.LAN -> device.lanCapability.getDeviceInfo()
189
+ CapacityTypes.MQTT -> device.mqttCapability.getDeviceInfo()
190
190
  }
191
191
  GizRNCallbackManager.callbackWithResult(callback = result, result = res)
192
192
  }
@@ -226,9 +226,9 @@ class RNGizDeviceManagerModule(reactContext: ReactApplicationContext) : ReactCon
226
226
  if (config !=null && device !=null) {
227
227
  CoroutineScope(Dispatchers.IO).launch {
228
228
  val res = when(config.type) {
229
- CapacityTypes.BLE -> device.bleCapacity.stopProvideWiFiCredentials()
230
- CapacityTypes.LAN -> device.lanCapacity.stopProvideWiFiCredentials()
231
- CapacityTypes.MQTT -> device.mqttCapacity.stopProvideWiFiCredentials()
229
+ CapacityTypes.BLE -> device.bleCapability.stopProvideWiFiCredentials()
230
+ CapacityTypes.LAN -> device.lanCapability.stopProvideWiFiCredentials()
231
+ CapacityTypes.MQTT -> device.mqttCapability.stopProvideWiFiCredentials()
232
232
  }
233
233
  GizRNCallbackManager.callbackWithResult(callback = result, result = res)
234
234
  }
@@ -250,7 +250,7 @@ class RNGizDeviceManagerModule(reactContext: ReactApplicationContext) : ReactCon
250
250
  if (config !=null && device !=null) {
251
251
  CoroutineScope(Dispatchers.IO).launch {
252
252
  val res = when(config.type) {
253
- CapacityTypes.BLE -> device.bleCapacity.provideWiFiCredentials(
253
+ CapacityTypes.BLE -> device.bleCapability.provideWiFiCredentials(
254
254
  config.ssid,
255
255
  config.password,
256
256
  config.timeout,
@@ -258,7 +258,7 @@ class RNGizDeviceManagerModule(reactContext: ReactApplicationContext) : ReactCon
258
258
  wiFiCredentialsEventHandler(it, device)
259
259
  }
260
260
  )
261
- CapacityTypes.LAN -> device.lanCapacity.provideWiFiCredentials(
261
+ CapacityTypes.LAN -> device.lanCapability.provideWiFiCredentials(
262
262
  config.ssid,
263
263
  config.password,
264
264
  config.timeout,
@@ -266,7 +266,7 @@ class RNGizDeviceManagerModule(reactContext: ReactApplicationContext) : ReactCon
266
266
  wiFiCredentialsEventHandler(it, device)
267
267
  }
268
268
  )
269
- CapacityTypes.MQTT -> device.mqttCapacity.provideWiFiCredentials(
269
+ CapacityTypes.MQTT -> device.mqttCapability.provideWiFiCredentials(
270
270
  config.ssid,
271
271
  config.password,
272
272
  config.timeout,
@@ -297,9 +297,9 @@ class RNGizDeviceManagerModule(reactContext: ReactApplicationContext) : ReactCon
297
297
  if (config !=null && device !=null) {
298
298
  CoroutineScope(Dispatchers.IO).launch {
299
299
  val res = when(config.type) {
300
- CapacityTypes.BLE -> device.bleCapacity.connect()
301
- CapacityTypes.LAN -> device.lanCapacity.connect()
302
- CapacityTypes.MQTT -> device.mqttCapacity.connect()
300
+ CapacityTypes.BLE -> device.bleCapability.connect()
301
+ CapacityTypes.LAN -> device.lanCapability.connect()
302
+ CapacityTypes.MQTT -> device.mqttCapability.connect()
303
303
  }
304
304
  GizRNCallbackManager.callbackWithResult(callback = result, result = res)
305
305
  }
@@ -311,9 +311,9 @@ class RNGizDeviceManagerModule(reactContext: ReactApplicationContext) : ReactCon
311
311
  if (config !=null && device !=null) {
312
312
  CoroutineScope(Dispatchers.IO).launch {
313
313
  val res = when(config.type) {
314
- CapacityTypes.BLE -> device.bleCapacity.disconnect()
315
- CapacityTypes.LAN -> device.lanCapacity.disconnect()
316
- CapacityTypes.MQTT -> device.mqttCapacity.disconnect()
314
+ CapacityTypes.BLE -> device.bleCapability.disconnect()
315
+ CapacityTypes.LAN -> device.lanCapability.disconnect()
316
+ CapacityTypes.MQTT -> device.mqttCapability.disconnect()
317
317
  }
318
318
  GizRNCallbackManager.callbackWithResult(callback = result, result = res)
319
319
  }
@@ -326,9 +326,9 @@ class RNGizDeviceManagerModule(reactContext: ReactApplicationContext) : ReactCon
326
326
  if (config !=null && device !=null) {
327
327
  CoroutineScope(Dispatchers.IO).launch {
328
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)
329
+ CapacityTypes.BLE -> device.bleCapability.checkUpdate(config.firmwareType)
330
+ CapacityTypes.LAN -> device.lanCapability.checkUpdate(config.firmwareType)
331
+ CapacityTypes.MQTT -> device.mqttCapability.checkUpdate(config.firmwareType)
332
332
  }
333
333
  GizRNCallbackManager.callbackWithResult(callback = result, result = res)
334
334
  }
@@ -354,14 +354,14 @@ class RNGizDeviceManagerModule(reactContext: ReactApplicationContext) : ReactCon
354
354
  CoroutineScope(Dispatchers.IO).launch {
355
355
  val res = when(config.type) {
356
356
  CapacityTypes.BLE -> {
357
- device.bleCapacity.startUpgrade(config.firmwareType, processHandler = {
357
+ device.bleCapability.startUpgrade(config.firmwareType, processHandler = {
358
358
  handleStartUpgradeProgress(it, device)
359
359
  })
360
360
  }
361
- CapacityTypes.LAN -> device.lanCapacity.startUpgrade(config.firmwareType, processHandler = {
361
+ CapacityTypes.LAN -> device.lanCapability.startUpgrade(config.firmwareType, processHandler = {
362
362
  handleStartUpgradeProgress(it, device)
363
363
  })
364
- CapacityTypes.MQTT -> device.mqttCapacity.startUpgrade(config.firmwareType, processHandler = {
364
+ CapacityTypes.MQTT -> device.mqttCapability.startUpgrade(config.firmwareType, processHandler = {
365
365
  handleStartUpgradeProgress(it, device)
366
366
  })
367
367
  }
@@ -375,9 +375,9 @@ class RNGizDeviceManagerModule(reactContext: ReactApplicationContext) : ReactCon
375
375
  if (config !=null && device !=null) {
376
376
  CoroutineScope(Dispatchers.IO).launch {
377
377
  val res = when(config.type) {
378
- CapacityTypes.BLE -> device.bleCapacity.cancelUpgrade()
379
- CapacityTypes.LAN -> device.lanCapacity.cancelUpgrade()
380
- CapacityTypes.MQTT -> device.mqttCapacity.cancelUpgrade()
378
+ CapacityTypes.BLE -> device.bleCapability.cancelUpgrade()
379
+ CapacityTypes.LAN -> device.lanCapability.cancelUpgrade()
380
+ CapacityTypes.MQTT -> device.mqttCapability.cancelUpgrade()
381
381
  }
382
382
  GizRNCallbackManager.callbackWithResult(callback = result, result = res)
383
383
  }
package/android/src/main/java/com/gizwits/reactnativegizwitssdkv5/RNGizSDKManagerModule.kt CHANGED
@@ -12,15 +12,15 @@ import com.facebook.react.bridge.WritableMap
12
12
  import com.facebook.react.modules.core.DeviceEventManagerModule
13
13
  import com.gizwits.smart.sdk.GizDevice
14
14
  import com.gizwits.smart.sdk.GizSDKManager
15
- import com.gizwits.smart.sdk.bluetooth.bleCapacity
15
+ import com.gizwits.smart.sdk.bluetooth.bleCapability
16
16
  import com.gizwits.smart.sdk.bluetooth.startBleScan
17
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.exception.GizException
21
- import com.gizwits.smart.sdk.lan.lanCapacity
21
+ import com.gizwits.smart.sdk.lan.lanCapability
22
22
  import com.gizwits.smart.sdk.lan.subscribeLanDeviceList
23
- import com.gizwits.smart.sdk.mqtt.mqttCapacity
23
+ import com.gizwits.smart.sdk.mqtt.mqttCapability
24
24
  import com.gizwits.smart.sdk.mqtt.queryBoundDevices
25
25
  import com.gizwits.smart.sdk.mqtt.subscribeBoundDeviceList
26
26
  import com.gizwits.smart.sdk.mqtt.subscribeBindEvent
@@ -132,8 +132,8 @@ class RNGizSDKManagerModule(reactContext: ReactApplicationContext) : ReactContex
132
132
  // 被移除的设备携程会自动销毁
133
133
  scope.launch {
134
134
  combineLatest(
135
- dev.bleCapacity.subscribeStatus(),
136
- dev.bleCapacity.subscribeIsLogin(),
135
+ dev.bleCapability.subscribeStatus(),
136
+ dev.bleCapability.subscribeIsLogin(),
137
137
  ) { status, isLogin ->
138
138
  Pair(status, isLogin)
139
139
  }.collectLatest {
@@ -146,14 +146,14 @@ class RNGizSDKManagerModule(reactContext: ReactApplicationContext) : ReactContex
146
146
  }
147
147
  }
148
148
  scope.launch {
149
- dev.bleCapacity.subscribeModuleProfile().debounce(500).collectLatest{
149
+ dev.bleCapability.subscribeModuleProfile().debounce(500).collectLatest{
150
150
  if (it != null) {
151
151
  emitDeviceListChange()
152
152
  }
153
153
  }
154
154
  }
155
155
  scope.launch {
156
- dev.bleCapacity.subscribeDp().collect{
156
+ dev.bleCapability.subscribeDp().collect{
157
157
  val data = JSONObject()
158
158
  data.put("data", JSONObject(it.toString()))
159
159
  data.put("type", "BLE")
@@ -165,8 +165,8 @@ class RNGizSDKManagerModule(reactContext: ReactApplicationContext) : ReactContex
165
165
 
166
166
  scope.launch {
167
167
  combineLatest(
168
- dev.lanCapacity.subscribeStatus(),
169
- dev.lanCapacity.subscribeIsLogin(),
168
+ dev.lanCapability.subscribeStatus(),
169
+ dev.lanCapability.subscribeIsLogin(),
170
170
  ) { status, isLogin ->
171
171
  Pair(status, isLogin)
172
172
  }.collectLatest {
@@ -179,14 +179,14 @@ class RNGizSDKManagerModule(reactContext: ReactApplicationContext) : ReactContex
179
179
  }
180
180
  }
181
181
  scope.launch {
182
- dev.lanCapacity.subscribeModuleProfile().debounce(500).collectLatest{
182
+ dev.lanCapability.subscribeModuleProfile().debounce(500).collectLatest{
183
183
  if (it != null) {
184
184
  emitDeviceListChange()
185
185
  }
186
186
  }
187
187
  }
188
188
  scope.launch {
189
- dev.lanCapacity.subscribeDp().collect{
189
+ dev.lanCapability.subscribeDp().collect{
190
190
  val data = JSONObject()
191
191
  data.put("data", JSONObject(it.toString()))
192
192
  data.put("type", "LAN")
@@ -198,8 +198,8 @@ class RNGizSDKManagerModule(reactContext: ReactApplicationContext) : ReactContex
198
198
 
199
199
  scope.launch {
200
200
  combineLatest(
201
- dev.mqttCapacity.subscribeStatus(),
202
- dev.mqttCapacity.subscribeIsLogin(),
201
+ dev.mqttCapability.subscribeStatus(),
202
+ dev.mqttCapability.subscribeIsLogin(),
203
203
  ) { status, isLogin ->
204
204
  Pair(status, isLogin)
205
205
  }.collectLatest {
@@ -212,14 +212,14 @@ class RNGizSDKManagerModule(reactContext: ReactApplicationContext) : ReactContex
212
212
  }
213
213
  }
214
214
  // scope.launch {
215
- // dev.mqttCapacity.subscribeModuleProfile().debounce(500).collectLatest{
215
+ // dev.mqttCapability.subscribeModuleProfile().debounce(500).collectLatest{
216
216
  // if (it != null) {
217
217
  // emitDeviceListChange()
218
218
  // }
219
219
  // }
220
220
  // }
221
221
  scope.launch {
222
- dev.mqttCapacity.subscribeDp().collect{
222
+ dev.mqttCapability.subscribeDp().collect{
223
223
  val data = JSONObject()
224
224
  data.put("data", JSONObject(it.toString()))
225
225
  data.put("type", "MQTT")
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "react-native-gizwits-sdk-v5",
3
- "version": "1.3.98",
3
+ "version": "1.4.0",
4
4
  "description": "Gizwits",
5
5
  "homepage": "https://github.com/demchenkoalex/react-native-gizwits-sdk-v5#readme",
6
6
  "main": "lib/index.js",
package/react-native-gizwits-sdk-v5.podspec CHANGED
@@ -19,6 +19,6 @@ Pod::Spec.new do |s|
19
19
 
20
20
  s.dependency 'React'
21
21
  s.dependency 'CryptoSwift', '~> 1.8.0'
22
- s.dependency 'GizwitsiOSSDK', '~> 1.3.1'
22
+ s.dependency 'GizwitsiOSSDK', '~> 1.3.2'
23
23
 
24
24
  end