flutter/universal_ble
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Implement readRSSI on Android and Darwin (#203)

Browse Source
This commit is contained in:
EricKwok
2026-01-06 00:25:19 +08:00
committed by Foti Dim
parent a5b6af6168
commit 1adfa9b485
25 changed files with 456 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/src/main/kotlin/com/navideck/universal_ble/UniversalBle.g.kt
+21
View File
@@ -529,6 +529,7 @@ interface UniversalBlePlatformChannel {
fun unPair(deviceId: String)
fun getSystemDevices(withServices: List<String>, callback: (Result<List<UniversalBleScanResult>>) -> Unit)
fun getConnectionState(deviceId: String): Long
fun readRssi(deviceId: String, callback: (Result<Long>) -> Unit)
fun setLogLevel(logLevel: UniversalBleLogLevel)
companion object {
@@ -919,6 +920,26 @@ interface UniversalBlePlatformChannel {
channel.setMessageHandler(null)
}
}
run {
val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.universal_ble.UniversalBlePlatformChannel.readRssi$separatedMessageChannelSuffix", codec)
if (api != null) {
channel.setMessageHandler { message, reply ->
val args = message as List<Any?>
val deviceIdArg = args[0] as String
api.readRssi(deviceIdArg) { result: Result<Long> ->
val error = result.exceptionOrNull()
if (error != null) {
reply.reply(UniversalBlePigeonUtils.wrapError(error))
} else {
val data = result.getOrNull()
reply.reply(UniversalBlePigeonUtils.wrapResult(data))
}
}
}
} else {
channel.setMessageHandler(null)
}
}
run {
val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.universal_ble.UniversalBlePlatformChannel.setLogLevel$separatedMessageChannelSuffix", codec)
if (api != null) {
android/src/main/kotlin/com/navideck/universal_ble/UniversalBleHelper.kt
+5
View File
@@ -343,4 +343,9 @@ class SubscriptionResultFuture(
val characteristicId: String,
val serviceId: String,
val result: (Result<Unit>) -> Unit,
)
class RssiResultFuture(
val deviceId: String,
val result: (Result<Long>) -> Unit,
)
android/src/main/kotlin/com/navideck/universal_ble/UniversalBlePlugin.kt
+161 -89
View File
@@ -60,6 +60,7 @@ class UniversalBlePlugin : UniversalBlePlatformChannel, BluetoothGattCallback(),
private val writeResultFutureList = mutableListOf<WriteResultFuture>()
private val subscriptionResultFutureList = mutableListOf<SubscriptionResultFuture>()
private val pairResultFutures = mutableMapOf<String, (Result<Boolean>) -> Unit>()
private val rssiResultFutureList = mutableListOf<RssiResultFuture>()
override fun onAttachedToEngine(flutterPluginBinding: FlutterPlugin.FlutterPluginBinding) {
UniversalBlePlatformChannel.setUp(flutterPluginBinding.binaryMessenger, this)
@@ -279,6 +280,49 @@ class UniversalBlePlugin : UniversalBlePlatformChannel, BluetoothGattCallback(),
UniversalBleLogger.setLogLevel(logLevel)
}
override fun readRssi(deviceId: String, callback: (Result<Long>) -> Unit) {
try {
val gatt = deviceId.toBluetoothGatt()
if (gatt.readRemoteRssi()) {
rssiResultFutureList.add(RssiResultFuture(deviceId, callback))
} else {
callback(
Result.failure(
createFlutterError(
UniversalBleErrorCode.FAILED,
"Failed to read RSSI"
)
)
)
}
} catch (e: FlutterError) {
callback(Result.failure(e))
}
}
override fun onReadRemoteRssi(gatt: BluetoothGatt?, rssi: Int, status: Int) {
val deviceId = gatt?.device?.address ?: return
rssiResultFutureList.removeAll {
if (it.deviceId == deviceId) {
if (status == BluetoothGatt.GATT_SUCCESS) {
it.result(Result.success(rssi.toLong()))
} else {
it.result(
Result.failure(
createFlutterError(
UniversalBleErrorCode.FAILED,
"Failed to read RSSI"
)
)
)
}
true
} else {
false
}
}
}
override fun discoverServices(
deviceId: String,
withDescriptors: Boolean,
@@ -311,36 +355,44 @@ class UniversalBlePlugin : UniversalBlePlatformChannel, BluetoothGattCallback(),
override fun onServicesDiscovered(gatt: BluetoothGatt, status: Int) {
if (status != BluetoothGatt.GATT_SUCCESS) {
discoverServicesFutureList.filter { it.deviceId == gatt.device.address }.forEach {
discoverServicesFutureList.remove(it)
it.result(
Result.failure(
createFlutterError(
UniversalBleErrorCode.FAILED,
"Failed to discover services"
discoverServicesFutureList.removeAll {
if (it.deviceId == gatt.device.address) {
it.result(
Result.failure(
createFlutterError(
UniversalBleErrorCode.FAILED,
"Failed to discover services"
)
)
)
)
true
} else {
false
}
}
return
}
setCachedServices(gatt.device.address, gatt.services.map { it.uuid.toString() })
discoverServicesFutureList.filter { it.deviceId == gatt.device.address }.forEach {
discoverServicesFutureList.remove(it)
it.result(Result.success(gatt.services.map { service ->
UniversalBleService(
uuid = service.uuid.toString(),
characteristics = service.characteristics.map { char ->
UniversalBleCharacteristic(
uuid = char.uuid.toString(),
properties = char.getPropertiesList(),
descriptors = if (it.withDescriptors) char.descriptors.map { descriptor ->
UniversalBleDescriptor(descriptor.uuid.toString())
} else listOf()
)
}
)
}))
discoverServicesFutureList.removeAll {
if (it.deviceId == gatt.device.address) {
it.result(Result.success(gatt.services.map { service ->
UniversalBleService(
uuid = service.uuid.toString(),
characteristics = service.characteristics.map { char ->
UniversalBleCharacteristic(
uuid = char.uuid.toString(),
properties = char.getPropertiesList(),
descriptors = if (it.withDescriptors) char.descriptors.map { descriptor ->
UniversalBleDescriptor(descriptor.uuid.toString())
} else listOf()
)
}
)
}))
true
} else {
false
}
}
}
@@ -517,29 +569,31 @@ class UniversalBlePlugin : UniversalBlePlatformChannel, BluetoothGattCallback(),
value: ByteArray,
status: Int,
) {
readResultFutureList.filter {
it.deviceId == gatt.device.address &&
it.characteristicId == characteristic.uuid.toString() &&
it.serviceId == characteristic.service.uuid.toString()
}.forEach {
readResultFutureList.remove(it)
if (status == BluetoothGatt.GATT_SUCCESS) {
it.result(Result.success(value))
} else {
UniversalBleLogger.logError(
"READ_FAILED <- ${gatt.device.address} ${characteristic.uuid} status=$status"
)
it.result(
Result.failure(
createFlutterError(
gattStatusToUniversalBleErrorCode(status),
"Failed to read",
status.toString()
readResultFutureList.removeAll {
if (it.deviceId == gatt.device.address &&
it.characteristicId == characteristic.uuid.toString() &&
it.serviceId == characteristic.service.uuid.toString()
) {
if (status == BluetoothGatt.GATT_SUCCESS) {
it.result(Result.success(value))
} else {
UniversalBleLogger.logError(
"READ_FAILED <- ${gatt.device.address} ${characteristic.uuid} status=$status"
)
it.result(
Result.failure(
createFlutterError(
gattStatusToUniversalBleErrorCode(status),
"Failed to read",
status.toString()
)
)
)
)
}
true
} else {
false
}
}
}
@@ -640,27 +694,30 @@ class UniversalBlePlugin : UniversalBlePlatformChannel, BluetoothGattCallback(),
characteristic: BluetoothGattCharacteristic,
status: Int,
) {
writeResultFutureList.filter {
it.deviceId == gatt?.device?.address &&
it.characteristicId == characteristic.uuid.toString() &&
it.serviceId == characteristic.service.uuid.toString()
}.forEach {
writeResultFutureList.remove(it)
if (status == BluetoothGatt.GATT_SUCCESS) {
it.result(Result.success(Unit))
} else {
UniversalBleLogger.logError(
"WRITE_FAILED <- ${gatt?.device?.address} ${characteristic.uuid} status=$status"
)
it.result(
Result.failure(
createFlutterError(
gattStatusToUniversalBleErrorCode(status),
"Failed to write",
status.toString()
writeResultFutureList.removeAll {
if (it.deviceId == gatt?.device?.address &&
it.characteristicId == characteristic.uuid.toString() &&
it.serviceId == characteristic.service.uuid.toString()
) {
if (status == BluetoothGatt.GATT_SUCCESS) {
it.result(Result.success(Unit))
} else {
UniversalBleLogger.logError(
"WRITE_FAILED <- ${gatt?.device?.address} ${characteristic.uuid} status=$status"
)
it.result(
Result.failure(
createFlutterError(
gattStatusToUniversalBleErrorCode(status),
"Failed to write",
status.toString()
)
)
)
)
}
true
} else {
false
}
}
}
@@ -679,19 +736,23 @@ class UniversalBlePlugin : UniversalBlePlatformChannel, BluetoothGattCallback(),
override fun onMtuChanged(gatt: BluetoothGatt?, mtu: Int, status: Int) {
val deviceId = gatt?.device?.address ?: return
mtuResultFutureList.filter { it.deviceId == deviceId }.forEach {
mtuResultFutureList.remove(it)
if (status == BluetoothGatt.GATT_SUCCESS) {
it.result(Result.success(mtu.toLong()))
} else {
it.result(
Result.failure(
createFlutterError(
UniversalBleErrorCode.FAILED,
"Failed to change MTU"
mtuResultFutureList.removeAll {
if (it.deviceId == deviceId) {
if (status == BluetoothGatt.GATT_SUCCESS) {
it.result(Result.success(mtu.toLong()))
} else {
it.result(
Result.failure(
createFlutterError(
UniversalBleErrorCode.FAILED,
"Failed to change MTU"
)
)
)
)
}
true
} else {
false
}
}
}
@@ -941,6 +1002,14 @@ class UniversalBlePlugin : UniversalBlePlatformChannel, BluetoothGattCallback(),
false
}
}
rssiResultFutureList.removeAll {
if (it.deviceId == gatt.device.address) {
it.result(Result.failure(deviceDisconnectedError))
true
} else {
false
}
}
}
private fun onBondStateUpdate(deviceId: String, bonded: Boolean, error: String? = null) {
@@ -1116,24 +1185,27 @@ class UniversalBlePlugin : UniversalBlePlatformChannel, BluetoothGattCallback(),
service: String,
status: Int,
) {
subscriptionResultFutureList.filter {
it.deviceId == deviceId &&
it.characteristicId == characteristic &&
it.serviceId == service
}.forEach {
subscriptionResultFutureList.remove(it)
if (status != BluetoothGatt.GATT_SUCCESS) {
it.result(
Result.failure(
createFlutterError(
gattStatusToUniversalBleErrorCode(status),
"Failed to update subscription state",
status.toString()
subscriptionResultFutureList.removeAll {
if (it.deviceId == deviceId &&
it.characteristicId == characteristic &&
it.serviceId == service
) {
if (status != BluetoothGatt.GATT_SUCCESS) {
it.result(
Result.failure(
createFlutterError(
gattStatusToUniversalBleErrorCode(status),
"Failed to update subscription state",
status.toString()
)
)
)
)
} else {
it.result(Result.success(Unit))
}
true
} else {
it.result(Result.success(Unit))
false
}
}
}