react-native-ble-nitro 1.10.0 → 1.10.2
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.
|
@@ -46,7 +46,7 @@ class BleNitroBleManager : HybridNativeBleNitroSpec() {
|
|
|
46
46
|
private var bleScanner: BluetoothLeScanner? = null
|
|
47
47
|
private var isCurrentlyScanning = false
|
|
48
48
|
private var scanCallback: ScanCallback? = null
|
|
49
|
-
private var deviceFoundCallback: ((device:
|
|
49
|
+
private var deviceFoundCallback: ((device: Variant_NullType_BLEDevice?, error: Variant_NullType_String?) -> Unit)? = null
|
|
50
50
|
private val discoveredDevicesInCurrentScan = mutableSetOf<String>()
|
|
51
51
|
|
|
52
52
|
// Device connections
|
|
@@ -443,7 +443,7 @@ class BleNitroBleManager : HybridNativeBleNitroSpec() {
|
|
|
443
443
|
}
|
|
444
444
|
|
|
445
445
|
// Scanning operations
|
|
446
|
-
override fun startScan(filter: com.margelo.nitro.co.zyke.ble.ScanFilter, callback: (device:
|
|
446
|
+
override fun startScan(filter: com.margelo.nitro.co.zyke.ble.ScanFilter, callback: (device: Variant_NullType_BLEDevice?, error: Variant_NullType_String?) -> Unit) {
|
|
447
447
|
try {
|
|
448
448
|
initializeBluetoothIfNeeded()
|
|
449
449
|
val adapter = bluetoothAdapter ?: return
|
|
@@ -481,7 +481,7 @@ class BleNitroBleManager : HybridNativeBleNitroSpec() {
|
|
|
481
481
|
discoveredDevicesInCurrentScan.add(device.id)
|
|
482
482
|
}
|
|
483
483
|
|
|
484
|
-
callback(device, null)
|
|
484
|
+
callback(Variant_NullType_BLEDevice.create(device), null)
|
|
485
485
|
}
|
|
486
486
|
|
|
487
487
|
override fun onBatchScanResults(results: MutableList<ScanResult>) {
|
|
@@ -501,7 +501,7 @@ class BleNitroBleManager : HybridNativeBleNitroSpec() {
|
|
|
501
501
|
discoveredDevicesInCurrentScan.add(device.id)
|
|
502
502
|
}
|
|
503
503
|
|
|
504
|
-
callback(device, null)
|
|
504
|
+
callback(Variant_NullType_BLEDevice.create(device), null)
|
|
505
505
|
}
|
|
506
506
|
}
|
|
507
507
|
|
|
@@ -515,7 +515,7 @@ class BleNitroBleManager : HybridNativeBleNitroSpec() {
|
|
|
515
515
|
ScanCallback.SCAN_FAILED_SCANNING_TOO_FREQUENTLY -> "Scanning too frequently"
|
|
516
516
|
else -> "Scan failed with error code: $errorCode"
|
|
517
517
|
}
|
|
518
|
-
callback(null, errorMessage)
|
|
518
|
+
callback(null, Variant_NullType_String.create(errorMessage))
|
|
519
519
|
stopScan()
|
|
520
520
|
}
|
|
521
521
|
}
|
|
@@ -111,7 +111,7 @@ public class BleNitroBleManager: HybridNativeBleNitroSpec {
|
|
|
111
111
|
}
|
|
112
112
|
|
|
113
113
|
// MARK: - Scanning Operations
|
|
114
|
-
public func startScan(filter: ScanFilter, callback: @escaping (
|
|
114
|
+
public func startScan(filter: ScanFilter, callback: @escaping (Variant_NullType_BLEDevice?, Variant_NullType_String?) -> Void) throws {
|
|
115
115
|
ensureCentralManager()
|
|
116
116
|
guard centralManager.state == .poweredOn else {
|
|
117
117
|
throw NSError(domain: "BleNitroError", code: 1, userInfo: [
|
|
@@ -119,9 +119,8 @@ public class BleNitroBleManager: HybridNativeBleNitroSpec {
|
|
|
119
119
|
])
|
|
120
120
|
}
|
|
121
121
|
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
callback(device, nil)
|
|
122
|
+
func scanCallbackWrapper(device: BLEDevice) {
|
|
123
|
+
callback(.second(device), nil)
|
|
125
124
|
}
|
|
126
125
|
self.scanCallback = scanCallbackWrapper
|
|
127
126
|
self.currentScanFilter = filter
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "react-native-ble-nitro",
|
|
3
|
-
"version": "1.10.
|
|
3
|
+
"version": "1.10.2",
|
|
4
4
|
"description": "High-performance React Native BLE library built on Nitro Modules",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"types": "lib/index.d.ts",
|
|
@@ -81,7 +81,7 @@
|
|
|
81
81
|
},
|
|
82
82
|
"peerDependencies": {
|
|
83
83
|
"react-native": ">=0.76.0",
|
|
84
|
-
"react-native-nitro-modules": "
|
|
84
|
+
"react-native-nitro-modules": ">=0.33.0"
|
|
85
85
|
},
|
|
86
86
|
"devDependencies": {
|
|
87
87
|
"@expo/config-plugins": "^54.0.4",
|