npm - react-native-gizwits-sdk-v5 - Versions diffs - 2.1.8-beta → 2.2.0 - Mend

react-native-gizwits-sdk-v5 2.1.8-beta → 2.2.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 (16) hide show

package/README.md +7 -2
package/android/build.gradle +4 -4
package/android/src/main/java/com/gizwits/reactnativegizwitssdkv5/RNGizSDKManagerModule.kt +9 -0
package/harmony/react_native_gizwits_sdk_v5.har +0 -0
package/ios/RNGizSDKManagerModule.swift +37 -1
package/lib/harmony/sdk.d.ts +4 -1
package/lib/harmony/sdk.js +15 -0
package/lib/harmony/sdk.js.map +1 -1
package/lib/index.d.ts +7 -1
package/lib/index.js +18 -0
package/lib/index.js.map +1 -1
package/lib/types.d.ts +25 -0
package/package.json +1 -1
package/react-native-gizwits-sdk-v5.podspec +1 -1
package/scripts/check-harmony-har.js +19 -0
package/scripts/import-harmony-sdk.py +90 -0

package/README.md CHANGED Viewed

@@ -62,8 +62,7 @@ HarmonyOS 同一设备的 Wi-Fi 列表和时间同步共用 BLE 会话，需要
 请求尚未完成时启动另一操作会返回 `E_BLE_REQUEST_BUSY`。
 设备的 `bleCapability.profile.support5GConfig`（别名 `supports5GConfig`）和
 `supportsSecureChannel` 表示其广播中的能力，实际使用仍需固件支持。
-当前版本依赖 Android SDK `1.4.17`、iOS SDK `~> 2.1.14`，HarmonyOS 桥接 HAR 配套原生 SDK `1.0.7`。
-HarmonyOS HAR 内置四个 `1.0.6` 基础版本的 SDK 模块，无需先将原生 SDK 发布到 OHPM。
+当前版本依赖 Android SDK `1.4.19`、iOS SDK `~> 2.1.17`、HarmonyOS SDK `1.1.0` 系列。
 ## 连接的云服务
@@ -158,6 +157,12 @@ await device.bleCapability.provideWiFiCredentials(
 )
 ```
+### 2.1.9
+- iOS SDK 升级至 `~> 2.1.15`，HarmonyOS 桥接 HAR 配套原生 SDK `1.0.8`，Android SDK 继续使用 `1.4.17`。
+- 修复 iOS LAN 透传上报及 HarmonyOS MQTT 数据上报可能乱序的问题。
+- iOS 透传接收日志改为汇总输出，减少连续数据上报时的日志开销。
 ### 2.1.8-beta
 - Android SDK 升级至 `1.4.17`，iOS SDK 升级至 `~> 2.1.14`，HarmonyOS 桥接包配套原生 SDK `1.0.7`。

package/android/build.gradle CHANGED Viewed

@@ -67,10 +67,10 @@ dependencies {
     // ESPTouch
     implementation 'com.github.EspressifApp:lib-esptouch-android:1.1.1'
-    implementation("io.github.gizwits:sdk:1.4.17")
-    implementation("io.github.gizwits:sdk-bluetooth:1.4.17")
-    implementation("io.github.gizwits:sdk-lan:1.4.17")
-    implementation("io.github.gizwits:sdk-mqtt:1.4.17")
+    implementation("io.github.gizwits:sdk:1.4.19")
+    implementation("io.github.gizwits:sdk-bluetooth:1.4.19")
+    implementation("io.github.gizwits:sdk-lan:1.4.19")
+    implementation("io.github.gizwits:sdk-mqtt:1.4.19")
     // implementation files('libs/sdk-release.aar', 'libs/sdk-bluetooth-release.aar', 'libs/sdk-lan-release.aar', 'libs/sdk-mqtt-release.aar')
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlin_coroutine_version")
     // retrofit

package/android/src/main/java/com/gizwits/reactnativegizwitssdkv5/RNGizSDKManagerModule.kt CHANGED Viewed

@@ -79,6 +79,7 @@ class RNGizSDKManagerModule(reactContext: ReactApplicationContext) : ReactContex
     mReactContext = reactContext
   }
   enum class EventName(val value: String) {
+    DeviceBleAdvertisementListener("DeviceBleAdvertisementListener"),
     DeviceDataListener("DeviceDataListener"),
     DeviceListListener("DeviceListListener"),
     DeviceStateListener("DeviceStateListener"),
@@ -165,6 +166,14 @@ class RNGizSDKManagerModule(reactContext: ReactApplicationContext) : ReactContex
   private fun subscribeToDevice(device: GizDevice) = moduleScope.launch {
     supervisorScope {
+      launch {
+        // 初始快照随设备列表返回，后续内容变化使用独立事件。
+        device.subscribeBleAdvertisement().drop(1).collect {
+          val data = JSONObject()
+          data.put("device", device.toJsonObject())
+          sendEvent(EventName.DeviceBleAdvertisementListener.name, GizRNCallbackManager.jsonObject2WriteableMap(data))
+        }
+      }
       launch {
         device.bleCapability.subscribeModuleProfile()
           .drop(1)

package/harmony/react_native_gizwits_sdk_v5.har CHANGED Viewed

Binary file

package/ios/RNGizSDKManagerModule.swift CHANGED Viewed

@@ -6,6 +6,7 @@
 //
 import Foundation
+import Combine
 import React
 import GizwitsiOSSDK
@@ -22,9 +23,42 @@ struct GizFeedbackParams: Decodable {
 class RNGizSDKManagerModule: RCTEventEmitter, GizSdkEventHandlerDelegate  {
     static var devices: Array<GizwitsiOSSDK.GizDevice> = []
+    private var advertisementSubscriptions: [String: (device: GizDevice, token: AnyCancellable)] = [:]
+    private var bridgeInvalidated = false
+    // Called on the main queue. Replace subscriptions when a device object changes.
+    private func synchronizeAdvertisements(_ devices: [GizDevice]) {
+        let activeIDs = Set(devices.map { $0.id })
+        for id in Array(advertisementSubscriptions.keys) where !activeIDs.contains(id) {
+            advertisementSubscriptions.removeValue(forKey: id)?.token.cancel()
+        }
+        for device in devices {
+            if let current = advertisementSubscriptions[device.id], current.device === device { continue }
+            advertisementSubscriptions.removeValue(forKey: device.id)?.token.cancel()
+            let token = device.subscribeBleAdvertisement().dropFirst()
+                .receive(on: DispatchQueue.main)
+                .sink { [weak self, weak device] _ in
+                    guard let self = self, let device = device, !self.bridgeInvalidated,
+                          self.advertisementSubscriptions[device.id]?.device === device else { return }
+                    self.sendEvent(withName: "DeviceBleAdvertisementListener", body: [
+                        "device": GizRNCallbackManager.convertToDictionary(object: device) ?? [:]
+                    ])
+                }
+            advertisementSubscriptions[device.id] = (device, token)
+        }
+    }
+    override func invalidate() {
+        DispatchQueue.main.async { [self] in
+            bridgeInvalidated = true
+            advertisementSubscriptions.values.forEach { $0.token.cancel() }
+            advertisementSubscriptions.removeAll()
+        }
+        super.invalidate()
+    }
     override func supportedEvents() -> [String]! {
-        return ["DeviceDataListener", "DeviceListListener", "DeviceStateListener", "DeviceBindStateListener"]
+        return ["DeviceBleAdvertisementListener", "DeviceDataListener", "DeviceListListener", "DeviceStateListener", "DeviceBindStateListener"]
     }
     override init() {
@@ -34,6 +68,8 @@ class RNGizSDKManagerModule: RCTEventEmitter, GizSdkEventHandlerDelegate  {
     func onDeviceListUpdate(devices: Array<GizwitsiOSSDK.GizDevice>) {
         DispatchQueue.main.async { [self] in
+            guard !bridgeInvalidated else { return }
+            synchronizeAdvertisements(devices)
             var devicesDict: Array<Any> = []
             RNGizSDKManagerModule.devices = devices
             devices.forEach { d in

package/lib/harmony/sdk.d.ts CHANGED Viewed

@@ -1,6 +1,7 @@
 import Base from '../Base';
-import type { DeviceBindCallback, DeviceDataCallback, DeviceListCallback, DeviceStateCallback, GizConfigStruct, GizResult, IDevice } from '../types';
+import type { DeviceBindCallback, DeviceBleAdvertisementCallback, DeviceDataCallback, DeviceListCallback, DeviceStateCallback, GizConfigStruct, GizResult, IDevice } from '../types';
 export declare class RNGizSDKManagerModuleClass extends Base {
+    private readonly deviceBleAdvertisementCallbacks;
     private readonly deviceDataCallbacks;
     private readonly deviceListCallbacks;
     private readonly deviceStateCallbacks;
@@ -16,6 +17,8 @@ export declare class RNGizSDKManagerModuleClass extends Base {
     cleanCache(): Promise<GizResult<unknown, string>>;
     getDevices(): Promise<GizResult<IDevice[], string>>;
     addDeviceDataListener(callback: DeviceDataCallback): void;
+    addDeviceBleAdvertisementListener(callback: DeviceBleAdvertisementCallback): void;
+    removeDeviceBleAdvertisementListener(callback: DeviceBleAdvertisementCallback): void;
     addDeviceListListener(callback: DeviceListCallback): void;
     addDeviceStateListener(callback: DeviceStateCallback): void;
     addDeviceBindStateListener(callback: DeviceBindCallback): void;

package/lib/harmony/sdk.js CHANGED Viewed

@@ -6,6 +6,7 @@ import { SDKNativeModule } from './native';
 export class RNGizSDKManagerModuleClass extends Base {
     constructor() {
         super(...arguments);
+        this.deviceBleAdvertisementCallbacks = new Set();
         this.deviceDataCallbacks = new Set();
         this.deviceListCallbacks = new Set();
         this.deviceStateCallbacks = new Set();
@@ -16,6 +17,13 @@ export class RNGizSDKManagerModuleClass extends Base {
                 return;
             }
             const emitter = new NativeEventEmitter(SDKNativeModule);
+            emitter.addListener('DeviceBleAdvertisementListener', (payload) => {
+                const event = parseNativeEvent(payload);
+                if (event === undefined)
+                    return;
+                this.appendDeviceFunction(event.device);
+                this.deviceBleAdvertisementCallbacks.forEach((callback) => callback(event));
+            });
             emitter.addListener('DeviceDataListener', (payload) => {
                 const event = parseNativeEvent(payload);
                 if (event === undefined) {
@@ -113,6 +121,13 @@ export class RNGizSDKManagerModuleClass extends Base {
         this.registerListener();
         this.deviceDataCallbacks.add(callback);
     }
+    addDeviceBleAdvertisementListener(callback) {
+        this.registerListener();
+        this.deviceBleAdvertisementCallbacks.add(callback);
+    }
+    removeDeviceBleAdvertisementListener(callback) {
+        this.deviceBleAdvertisementCallbacks.delete(callback);
+    }
     addDeviceListListener(callback) {
         this.registerListener();
         this.deviceListCallbacks.add(callback);

package/lib/harmony/sdk.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"sdk.js","sourceRoot":"","sources":["../../src/harmony/sdk.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAA;AAEjD,OAAO,IAAI,MAAM,SAAS,CAAA;~~AAc1B~~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~~IAgFH~~,CAAC;~~IA9EC~~,KAAK,CAAC,OAAO,CAAC,MAAuB;QACnC,IAAI,CAAC,gBAAgB,EAAE,CAAA;QACvB,OAAO,YAAY,CAAC,eAAe,EAAE,SAAS,EAAE,MAAM,CAAC,CAAA;IACzD,CAAC;IAED,yBAAyB,CACvB,UAAkB;QAElB,OAAO,YAAY,CAAC,eAAe,EAAE,2BAA2B,EAAE;YAChE,UAAU;SACX,CAAC,CAAA;IACJ,CAAC;IAED,YAAY;QACV,OAAO,YAAY,CAAC,eAAe,EAAE,cAAc,CAAC,CAAA;IACtD,CAAC;IAED,WAAW;QACT,OAAO,YAAY,CAAC,eAAe,EAAE,aAAa,CAAC,CAAA;IACrD,CAAC;IAED,QAAQ,CACN,SAAkB,EAClB,OAAe,EACf,OAAe;QAEf,OAAO,YAAY,CAAC,eAAe,EAAE,UAAU,EAAE;YAC/C,SAAS;YACT,OAAO;YACP,OAAO;SACR,CAAC,CAAA;IACJ,CAAC;IAED,UAAU;QACR,OAAO,YAAY,CAAC,eAAe,EAAE,YAAY,CAAC,CAAA;IACpD,CAAC;IAED,KAAK,CAAC,UAAU;;QACd,MAAM,MAAM,GAAG,MAAM,YAAY,CAAY,eAAe,EAAE,YAAY,CAAC,CAAA;QAC3E,MAAA,MAAM,CAAC,IAAI,0CAAE,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC,CAAA;QACnE,OAAO,MAAM,CAAA;IACf,CAAC;IAED,qBAAqB,CAAC,QAA4B;QAChD,IAAI,CAAC,gBAAgB,EAAE,CAAA;QACvB,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;IACxC,CAAC;IAED,qBAAqB,CAAC,QAA4B;QAChD,IAAI,CAAC,gBAAgB,EAAE,CAAA;QACvB,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;IACxC,CAAC;IAED,sBAAsB,CAAC,QAA6B;QAClD,IAAI,CAAC,gBAAgB,EAAE,CAAA;QACvB,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;IACzC,CAAC;IAED,0BAA0B,CAAC,QAA4B;QACrD,IAAI,CAAC,gBAAgB,EAAE,CAAA;QACvB,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;IACxC,CAAC;IAED,wBAAwB,CAAC,QAA4B;QACnD,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;IAC3C,CAAC;IAED,wBAAwB,CAAC,QAA4B;QACnD,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;IAC3C,CAAC;IAED,yBAAyB,CAAC,QAA6B;QACrD,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;IAC5C,CAAC;IAED,6BAA6B,CAAC,QAA4B;QACxD,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;IAC3C,CAAC;CACF;AAED,MAAM,qBAAqB,GAAG,IAAI,0BAA0B,EAAE,CAAA;AAE9D,eAAe,qBAAqB,CAAA"}
1	+ {"version":3,"file":"sdk.js","sourceRoot":"","sources":["../../src/harmony/sdk.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAA;AAEjD,OAAO,IAAI,MAAM,SAAS,CAAA;AAgB1B,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAA;AACzD,OAAO,wBAAwB,MAAM,UAAU,CAAA;AAC/C,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAE1C,MAAM,OAAO,0BAA2B,SAAQ,IAAI;IAApD;;QACmB,oCAA+B,GAC9C,IAAI,GAAG,EAAkC,CAAA;QAC1B,wBAAmB,GAAG,IAAI,GAAG,EAAsB,CAAA;QACnD,wBAAmB,GAAG,IAAI,GAAG,EAAsB,CAAA;QACnD,yBAAoB,GAAG,IAAI,GAAG,EAAuB,CAAA;QACrD,wBAAmB,GAAG,IAAI,GAAG,EAAsB,CAAA;QAC5D,8BAAyB,GAAG,KAAK,CAAA;QAEzC,qBAAgB,GAAG,GAAS,EAAE;YAC5B,IAAI,IAAI,CAAC,yBAAyB,IAAI,eAAe,KAAK,IAAI,EAAE;gBAC9D,OAAM;aACP;YACD,MAAM,OAAO,GAAG,IAAI,kBAAkB,CAAC,eAAe,CAAC,CAAA;YACvD,OAAO,CAAC,WAAW,CACjB,gCAAgC,EAChC,CAAC,OAAgB,EAAE,EAAE;gBACnB,MAAM,KAAK,GAAG,gBAAgB,CAA4B,OAAO,CAAC,CAAA;gBAClE,IAAI,KAAK,KAAK,SAAS;oBAAE,OAAM;gBAC/B,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;gBACvC,IAAI,CAAC,+BAA+B,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE,CACxD,QAAQ,CAAC,KAAK,CAAC,CAChB,CAAA;YACH,CAAC,CACF,CAAA;YACD,OAAO,CAAC,WAAW,CAAC,oBAAoB,EAAE,CAAC,OAAgB,EAAE,EAAE;gBAC7D,MAAM,KAAK,GAAG,gBAAgB,CAAgB,OAAO,CAAC,CAAA;gBACtD,IAAI,KAAK,KAAK,SAAS,EAAE;oBACvB,OAAM;iBACP;gBACD,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;gBACvC,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAA;YACjE,CAAC,CAAC,CAAA;YACF,OAAO,CAAC,WAAW,CAAC,oBAAoB,EAAE,CAAC,OAAgB,EAAE,EAAE;gBAC7D,MAAM,OAAO,GAAG,gBAAgB,CAAY,OAAO,CAAC,CAAA;gBACpD,IAAI,OAAO,KAAK,SAAS,EAAE;oBACzB,OAAM;iBACP;gBACD,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC,CAAA;gBAC9D,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAA;YACnE,CAAC,CAAC,CAAA;YACF,OAAO,CAAC,WAAW,CAAC,qBAAqB,EAAE,CAAC,OAAgB,EAAE,EAAE;gBAC9D,MAAM,KAAK,GAAG,gBAAgB,CAAiB,OAAO,CAAC,CAAA;gBACvD,IAAI,KAAK,KAAK,SAAS,EAAE;oBACvB,OAAM;iBACP;gBACD,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;gBACvC,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAA;YAClE,CAAC,CAAC,CAAA;YACF,OAAO,CAAC,WAAW,CAAC,yBAAyB,EAAE,CAAC,OAAgB,EAAE,EAAE;gBAClE,MAAM,KAAK,GAAG,gBAAgB,CAAgB,OAAO,CAAC,CAAA;gBACtD,IAAI,KAAK,KAAK,SAAS,EAAE;oBACvB,OAAM;iBACP;gBACD,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAA;YACjE,CAAC,CAAC,CAAA;YACF,IAAI,CAAC,yBAAyB,GAAG,IAAI,CAAA;QACvC,CAAC,CAAA;QAED,yBAAoB,GAAG,CAAC,MAAe,EAAW,EAAE;YAClD,MAAM,CAAC,kBAAkB,GAAG,CAAC,WAAW,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,CAC1D,wBAAwB,CAAC,kBAAkB,CACzC,MAAM,CAAC,EAAE,EACT,WAAW,EACX,IAAI,EACJ,QAAQ,CACT,CAAA;YACH,MAAM,CAAC,iBAAiB,GAAG,GAAG,EAAE,CAC9B,wBAAwB,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;YACvD,MAAM,CAAC,gBAAgB,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,CAC1C,wBAAwB,CAAC,gBAAgB,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,CAAA;YACrE,MAAM,CAAC,IAAI,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,CAC9B,wBAAwB,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,CAAA;YACzD,MAAM,CAAC,MAAM,GAAG,GAAG,EAAE,CAAC,wBAAwB,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;YAChE,MAAM,CAAC,QAAQ,GAAG,GAAG,EAAE,CAAC,wBAAwB,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;YAEpE,MAAM,cAAc,GAAG,CACrB,UAA6B,EAC7B,IAA4B,EACtB,EAAE;gBACR,UAAU,CAAC,OAAO,GAAG,GAAG,EAAE,CACxB,wBAAwB,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,CAAC,CAAA;gBACnD,UAAU,CAAC,UAAU,GAAG,GAAG,EAAE,CAC3B,wBAAwB,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,CAAC,CAAA;gBACtD,UAAU,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,EAAE,CAC3B,wBAAwB,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,CAAA;gBACxD,UAAU,CAAC,KAAK,GAAG,CAAC,KAAK,EAAE,EAAE,CAC3B,wBAAwB,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,EAAE,KAAK,CAAC,CAAA;gBACxD,UAAU,CAAC,aAAa,GAAG,GAAG,EAAE,CAC9B,wBAAwB,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,CAAC,CAAA;gBACzD,UAAU,CAAC,WAAW,GAAG,CAAC,YAAY,EAAE,EAAE,CACxC,wBAAwB,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,EAAE,YAAY,CAAC,CAAA;gBACrE,UAAU,CAAC,YAAY,GAAG,CAAC,YAAY,EAAE,QAAQ,EAAE,EAAE,CACnD,wBAAwB,CAAC,YAAY,CACnC,MAAM,CAAC,EAAE,EACT,IAAI,EACJ,YAAY,EACZ,QAAQ,CACT,CAAA;gBACH,UAAU,CAAC,aAAa,GAAG,GAAG,EAAE,CAC9B,wBAAwB,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,CAAC,CAAA;gBACzD,UAAU,CAAC,sBAAsB,GAAG,CAClC,IAAI,EACJ,QAAQ,EACR,OAAO,EACP,QAAQ,EACR,WAAW,EACX,EAAE,CACF,wBAAwB,CAAC,sBAAsB,CAC7C,MAAM,CAAC,EAAE,EACT,IAAI,EACJ,IAAI,EACJ,QAAQ,EACR,OAAO,EACP,QAAQ,EACR,WAAW,CACZ,CAAA;gBACH,UAAU,CAAC,0BAA0B,GAAG,GAAG,EAAE,CAC3C,wBAAwB,CAAC,0BAA0B,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,CAAC,CAAA;YACxE,CAAC,CAAA;YAED,MAAM,CAAC,aAAa,CAAC,WAAW,GAAG,CAAC,cAAc,EAAE,EAAE,CACpD,wBAAwB,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,EAAE,cAAc,CAAC,CAAA;YACjE,MAAM,CAAC,aAAa,CAAC,iBAAiB,GAAG,GAAG,EAAE,CAC5C,wBAAwB,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;YACvD,MAAM,CAAC,aAAa,CAAC,QAAQ,GAAG,CAAC,cAAc,EAAE,EAAE,CACjD,wBAAwB,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,EAAE,cAAc,CAAC,CAAA;YAC9D,MAAM,CAAC,aAAa,CAAC,cAAc,GAAG,GAAG,EAAE,CACzC,wBAAwB,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;YACpD,cAAc,CAAC,MAAM,CAAC,aAAa,EAAE,KAAK,CAAC,CAAA;YAC3C,cAAc,CAAC,MAAM,CAAC,aAAa,EAAE,KAAK,CAAC,CAAA;YAC3C,cAAc,CAAC,MAAM,CAAC,cAAc,EAAE,MAAM,CAAC,CAAA;YAC7C,OAAO,MAAM,CAAA;QACf,CAAC,CAAA;IA6FH,CAAC;IA3FC,KAAK,CAAC,OAAO,CAAC,MAAuB;QACnC,IAAI,CAAC,gBAAgB,EAAE,CAAA;QACvB,OAAO,YAAY,CAAC,eAAe,EAAE,SAAS,EAAE,MAAM,CAAC,CAAA;IACzD,CAAC;IAED,yBAAyB,CACvB,UAAkB;QAElB,OAAO,YAAY,CAAC,eAAe,EAAE,2BAA2B,EAAE;YAChE,UAAU;SACX,CAAC,CAAA;IACJ,CAAC;IAED,YAAY;QACV,OAAO,YAAY,CAAC,eAAe,EAAE,cAAc,CAAC,CAAA;IACtD,CAAC;IAED,WAAW;QACT,OAAO,YAAY,CAAC,eAAe,EAAE,aAAa,CAAC,CAAA;IACrD,CAAC;IAED,QAAQ,CACN,SAAkB,EAClB,OAAe,EACf,OAAe;QAEf,OAAO,YAAY,CAAC,eAAe,EAAE,UAAU,EAAE;YAC/C,SAAS;YACT,OAAO;YACP,OAAO;SACR,CAAC,CAAA;IACJ,CAAC;IAED,UAAU;QACR,OAAO,YAAY,CAAC,eAAe,EAAE,YAAY,CAAC,CAAA;IACpD,CAAC;IAED,KAAK,CAAC,UAAU;;QACd,MAAM,MAAM,GAAG,MAAM,YAAY,CAAY,eAAe,EAAE,YAAY,CAAC,CAAA;QAC3E,MAAA,MAAM,CAAC,IAAI,0CAAE,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC,CAAA;QACnE,OAAO,MAAM,CAAA;IACf,CAAC;IAED,qBAAqB,CAAC,QAA4B;QAChD,IAAI,CAAC,gBAAgB,EAAE,CAAA;QACvB,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;IACxC,CAAC;IAED,iCAAiC,CAC/B,QAAwC;QAExC,IAAI,CAAC,gBAAgB,EAAE,CAAA;QACvB,IAAI,CAAC,+BAA+B,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;IACpD,CAAC;IAED,oCAAoC,CAClC,QAAwC;QAExC,IAAI,CAAC,+BAA+B,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;IACvD,CAAC;IAED,qBAAqB,CAAC,QAA4B;QAChD,IAAI,CAAC,gBAAgB,EAAE,CAAA;QACvB,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;IACxC,CAAC;IAED,sBAAsB,CAAC,QAA6B;QAClD,IAAI,CAAC,gBAAgB,EAAE,CAAA;QACvB,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;IACzC,CAAC;IAED,0BAA0B,CAAC,QAA4B;QACrD,IAAI,CAAC,gBAAgB,EAAE,CAAA;QACvB,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;IACxC,CAAC;IAED,wBAAwB,CAAC,QAA4B;QACnD,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;IAC3C,CAAC;IAED,wBAAwB,CAAC,QAA4B;QACnD,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;IAC3C,CAAC;IAED,yBAAyB,CAAC,QAA6B;QACrD,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;IAC5C,CAAC;IAED,6BAA6B,CAAC,QAA4B;QACxD,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;IAC3C,CAAC;CACF;AAED,MAAM,qBAAqB,GAAG,IAAI,0BAA0B,EAAE,CAAA;AAE9D,eAAe,qBAAqB,CAAA"}

package/lib/index.d.ts CHANGED Viewed

@@ -1,9 +1,11 @@
 import Base from './Base';
 import RNGizDeviceManagerModule, { RNGizDeviceManagerModule as RNGizDeviceManagerModuleClass } from './device';
-import { DeviceBindCallback, DeviceBindRes, DeviceDataCallback, DeviceDataRes, DeviceListCallback, DeviceStateCallback, DeviceStateRes, GizConfigStruct, IDevice } from './types';
+import { DeviceBindCallback, DeviceBindRes, DeviceBleAdvertisementCallback, DeviceBleAdvertisementRes, DeviceDataCallback, DeviceDataRes, DeviceListCallback, DeviceStateCallback, DeviceStateRes, GizConfigStruct, IDevice } from './types';
 import * as Types from './types';
 import RNGizUserManagerModule, { RNGizUserManagerModule as RNGizUserManagerModuleClass } from './user';
 declare class RNGizSDKManagerModuleClass extends Base {
+    private nativeListenersRegistered;
+    private readonly deviceBleAdvertisementCallbacks;
     deviceDataCallbacks: DeviceDataCallback[];
     deviceListCallbacks: DeviceListCallback[];
     deviceStateCallbacks: DeviceStateCallback[];
@@ -11,6 +13,7 @@ declare class RNGizSDKManagerModuleClass extends Base {
     constructor();
     registerListener: () => void;
     appendDeviceFunction: (device: IDevice) => void;
+    deviceBleAdvertisementCallback: (data: DeviceBleAdvertisementRes) => void;
     deviceDataCallback: (data: DeviceDataRes) => void;
     deviceListCallback: (data: IDevice[]) => void;
     deviceStateCallback: (data: DeviceStateRes) => void;
@@ -25,6 +28,9 @@ declare class RNGizSDKManagerModuleClass extends Base {
      * 查询设备列表
      */
     getDevices(): Promise<Types.GizResult<[IDevice], any>>;
+    /** 广播内容变化时回调；初始快照通过设备列表或 getDevices 获取。 */
+    addDeviceBleAdvertisementListener(callback: DeviceBleAdvertisementCallback): void;
+    removeDeviceBleAdvertisementListener(callback: DeviceBleAdvertisementCallback): void;
     addDeviceDataListener(callback: DeviceDataCallback): void;
     addDeviceListListener(callback: DeviceListCallback): void;
     addDeviceStateListener(callback: DeviceStateCallback): void;

package/lib/index.js CHANGED Viewed

@@ -7,11 +7,17 @@ const eventEmitter = new NativeEventEmitter(NativeModules.RNGizSDKManagerModule)
 class RNGizSDKManagerModuleClass extends Base {
     constructor() {
         super();
+        this.nativeListenersRegistered = false;
+        this.deviceBleAdvertisementCallbacks = new Set();
         this.deviceDataCallbacks = [];
         this.deviceListCallbacks = [];
         this.deviceStateCallbacks = [];
         this.deviceBindCallbacks = [];
         this.registerListener = () => {
+            if (this.nativeListenersRegistered)
+                return;
+            this.nativeListenersRegistered = true;
+            eventEmitter.addListener('DeviceBleAdvertisementListener', this.deviceBleAdvertisementCallback);
             eventEmitter.addListener('DeviceDataListener', this.deviceDataCallback);
             eventEmitter.addListener('DeviceListListener', this.deviceListCallback);
             eventEmitter.addListener('DeviceStateListener', this.deviceStateCallback);
@@ -138,6 +144,10 @@ class RNGizSDKManagerModuleClass extends Base {
                 return RNGizDeviceManagerModule.checkUpdate(device.id, 'MQTT', firmwareType);
             };
         };
+        this.deviceBleAdvertisementCallback = (data) => {
+            this.appendDeviceFunction(data.device);
+            this.deviceBleAdvertisementCallbacks.forEach((callback) => callback(data));
+        };
         this.deviceDataCallback = (data) => {
             this.appendDeviceFunction(data.device);
             this.deviceDataCallbacks.map((item) => {
@@ -211,6 +221,14 @@ class RNGizSDKManagerModuleClass extends Base {
         }
         return data;
     }
+    /** 广播内容变化时回调；初始快照通过设备列表或 getDevices 获取。 */
+    addDeviceBleAdvertisementListener(callback) {
+        this.registerListener();
+        this.deviceBleAdvertisementCallbacks.add(callback);
+    }
+    removeDeviceBleAdvertisementListener(callback) {
+        this.deviceBleAdvertisementCallbacks.delete(callback);
+    }
     // 添加监听
     addDeviceDataListener(callback) {
         this.deviceDataCallbacks.push(callback);

package/lib/index.js.map CHANGED Viewed

	@@ -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 Viewed

@@ -143,6 +143,27 @@ export interface GizLanCapability extends GizBaseCapability {
 export interface GizMQTTCapability extends GizBaseCapability {
     profile: GizMQTTProfile;
 }
+/** 最新一次通过原生 SDK 校验的 BLE 广播快照；Hex 为大写。 */
+export interface GizBleAdvertisement {
+    source: 'android-scan-record' | 'ios-corebluetooth' | 'harmonyos-scan-result';
+    /** Unix 毫秒时间戳。 */
+    receivedAt: number;
+    /** Android/HarmonyOS 的系统原始扫描数据；iOS 不提供此字段。 */
+    rawHex?: string;
+    /** 以下为 iOS CoreBluetooth 公开的广播字段。 */
+    manufacturerDataHex?: string;
+    localName?: string;
+    serviceUUIDs?: string[];
+    serviceData?: Record<string, string>;
+    overflowServiceUUIDs?: string[];
+    solicitedServiceUUIDs?: string[];
+    txPowerLevel?: number;
+    isConnectable?: boolean;
+}
+export interface DeviceBleAdvertisementRes {
+    device: IDevice;
+}
+export type DeviceBleAdvertisementCallback = (data: DeviceBleAdvertisementRes) => void;
 export interface IDevice {
     id: string;
     mac: string;
@@ -151,6 +172,8 @@ export interface IDevice {
     isBind: boolean;
     name: string;
     remark?: string;
+    /** 未开启或尚未收到有效广播时缺省；只保存最新快照。 */
+    bleAdvertisement?: GizBleAdvertisement;
     bleCapability: GizBleCapability;
     lanCapability: GizLanCapability;
     mqttCapability: GizMQTTCapability;
@@ -187,6 +210,8 @@ export interface GizConfigStruct {
     appSecret: string;
     productInfos: ProductInfoStruct[];
     serverInfo?: ServerInfoStruct;
+    /** 默认 false；首次原生 SDK 初始化后固定，需重启 App 进程才能切换。 */
+    enableBleAdvertisementData?: boolean;
 }
 export type GizDeviceNetStatus = 0 | 1 | 2;
 export type GizCapability = 'BLE' | 'LAN' | 'MQTT';

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "react-native-gizwits-sdk-v5",
-  "version": "2.1.8-beta",
+  "version": "2.2.0",
   "description": "Gizwits Smart SDK v5 bridge for React Native on Android, iOS and HarmonyOS",
   "homepage": "https://github.com/demchenkoalex/react-native-gizwits-sdk-v5#readme",
   "main": "lib/index",

package/react-native-gizwits-sdk-v5.podspec CHANGED Viewed

@@ -18,6 +18,6 @@ Pod::Spec.new do |s|
   s.dependency 'React'
   s.dependency 'CryptoSwift', '~> 1.8.0'
-  s.dependency 'GizwitsiOSSDK', '~> 2.1.14'
+  s.dependency 'GizwitsiOSSDK', '~> 2.1.17'
 end

package/scripts/check-harmony-har.js CHANGED Viewed

@@ -75,6 +75,25 @@ const snapshot = JSON.parse(
     encoding: 'utf8',
   })
 )
+const workspaceSnapshot = JSON.parse(
+  fs.readFileSync(
+    path.join(
+      repositoryDir,
+      'harmony/react_native_gizwits_sdk_v5/libs/sdk-snapshot.json'
+    ),
+    'utf8'
+  )
+)
+for (const module of Object.values(bundledModules)) {
+  if (
+    snapshot.modules[module]?.sha256 !==
+    workspaceSnapshot.modules[module]?.sha256
+  ) {
+    throw new Error(
+      `Bridge HAR contains an outdated ${module}; run npm run build:harmony`
+    )
+  }
+}
 const temporary = fs.mkdtempSync(path.join(os.tmpdir(), 'gizwits-har-check-'))
 try {
   let coreBytes

package/scripts/import-harmony-sdk.py ADDED Viewed

@@ -0,0 +1,90 @@
+#!/usr/bin/env python3
+"""Vendor four existing native HARs without compiling or publishing anything."""
+import argparse
+import hashlib
+import io
+import json
+from pathlib import Path
+import shutil
+import tarfile
+import tempfile
+MODULES = ['sdk', 'sdk_bluetooth', 'sdk_lan', 'sdk_mqtt']
+def main():
+    parser = argparse.ArgumentParser(description=__doc__)
+    parser.add_argument('--sdk-root', type=Path, required=True,
+                        help='Native SDK repository containing existing build/default/outputs/default HARs')
+    parser.add_argument('--version', required=True, help='Expected core release version, e.g. 1.1.0')
+    args = parser.parse_args()
+    destination = Path(__file__).resolve().parents[1] / 'harmony/react_native_gizwits_sdk_v5/libs'
+    archives = {}
+    manifests = {}
+    for module in MODULES:
+        path = args.sdk_root / module / 'build/default/outputs/default' / f'{module}.har'
+        data = path.read_bytes()
+        with tarfile.open(fileobj=io.BytesIO(data)) as archive:
+            manifest = json.load(archive.extractfile('package/oh-package.json5'))
+            suffix = '' if module == 'sdk' else '-' + module.removeprefix('sdk_')
+            expected_name = '@gizwits/smart-sdk' + suffix
+            if manifest['name'] != expected_name or manifest['version'] != args.version + suffix:
+                raise ValueError(f'{path}: unexpected name/version')
+            if 'package/ets/modules.abc' not in archive.getnames():
+                raise ValueError(f'{path}: compiled ArkTS missing')
+            if module == 'sdk':
+                for abi in ['arm64-v8a', 'x86_64']:
+                    if f'package/libs/{abi}/libgiz_parser.so' not in archive.getnames():
+                        raise ValueError(f'{path}: parser missing for {abi}')
+            elif manifest.get('dependencies', {}).get('@gizwits/smart-sdk') != args.version:
+                raise ValueError(f'{path}: core dependency does not match {args.version}')
+        archives[module] = data
+        manifests[module] = manifest
+    # Preserve compiled payloads. Only transport manifests and nested core change,
+    # matching bundle-harmony-sdk.py and the existing published package layout.
+    core = archives['sdk']
+    with tempfile.TemporaryDirectory(prefix='gizwits-har-import-') as temporary:
+        work = Path(temporary)
+        (work / 'sdk.har').write_bytes(core)
+        for module in MODULES[1:]:
+            with tarfile.open(fileobj=io.BytesIO(archives[module])) as original, \
+                    tarfile.open(work / f'{module}.har', 'w:gz') as output:
+                for member in original.getmembers():
+                    if member.name == 'package/vendor/sdk.har':
+                        continue
+                    stream = original.extractfile(member) if member.isfile() else None
+                    if member.name == 'package/oh-package.json5':
+                        manifest = json.loads(json.dumps(manifests[module]))
+                        manifest['dependencies']['@gizwits/smart-sdk'] = 'file:./vendor/sdk.har'
+                        data = (json.dumps(manifest, indent=2) + '\n').encode()
+                        member.size = len(data)
+                        stream = io.BytesIO(data)
+                    output.addfile(member, stream)
+                member = tarfile.TarInfo('package/vendor/sdk.har')
+                member.size = len(core)
+                member.mode = 0o644
+                output.addfile(member, io.BytesIO(core))
+        metadata = {
+            'baseVersion': args.version,
+            'sourceDigest': hashlib.sha256(b''.join(archives[m] for m in MODULES)).hexdigest()[:12],
+            'sourceType': 'prebuilt-har',
+            'modules': {
+                m: {'version': manifests[m]['version'],
+                    'sha256': hashlib.sha256((work / f'{m}.har').read_bytes()).hexdigest(),
+                    'originalSha256': hashlib.sha256(archives[m]).hexdigest()}
+                for m in MODULES
+            }
+        }
+        (work / 'sdk-snapshot.json').write_text(json.dumps(metadata, indent=2) + '\n')
+        backup = Path(tempfile.mkdtemp(prefix='gizwits-har-before-import-'))
+        if destination.exists():
+            shutil.copytree(destination, backup / 'libs')
+        destination.mkdir(parents=True, exist_ok=True)
+        for path in work.iterdir():
+            shutil.copy2(path, destination / path.name)
+        print(f'Imported native SDK {args.version} into {destination}; backup: {backup}')
+        print('Rebuild the bridge HAR before publishing npm; no compilation was performed here.')
+if __name__ == '__main__':
+    main()