修复读取 CCCD 报错的问题，写入时更新特征值 (#50)

* 修复 CCCD 无法读取的问题 * 优化代码 * 调整部分必需参数为可空参数 * 调整接口 * 写入时更新特征值 * 调整接口 * 适配新接口 * 调整依赖项
2024-02-01 19:16:42 +08:00
parent 63bbc1a732
commit 44efce78df
32 changed files with 521 additions and 231 deletions
--- a/bluetooth_low_energy_android/android/src/main/kotlin/dev/yanshouwang/bluetooth_low_energy_android/MyApi.g.kt
+++ b/bluetooth_low_energy_android/android/src/main/kotlin/dev/yanshouwang/bluetooth_low_energy_android/MyApi.g.kt
@ -1077,21 +1077,6 @@ class MyPeripheralManagerFlutterApi(private val binaryMessenger: BinaryMessenger
      } 
    }
  }
-  fun onExecuteWrite(addressArgsArg: String, idArgsArg: Long, executeArgsArg: Boolean, callback: (Result<Unit>) -> Unit) {
-    val channelName = "dev.flutter.pigeon.bluetooth_low_energy_android.MyPeripheralManagerFlutterApi.onExecuteWrite"
-    val channel = BasicMessageChannel<Any?>(binaryMessenger, channelName, codec)
-    channel.send(listOf(addressArgsArg, idArgsArg, executeArgsArg)) {
-      if (it is List<*>) {
-        if (it.size > 1) {
-          callback(Result.failure(FlutterError(it[0] as String, it[1] as String, it[2] as String?)))
-        } else {
-          callback(Result.success(Unit))
-        }
-      } else {
-        callback(Result.failure(createConnectionError(channelName)))
-      } 
-    }
-  }
  fun onCharacteristicNotifyStateChanged(addressArgsArg: String, hashCodeArgsArg: Long, stateNumberArgsArg: Long, callback: (Result<Unit>) -> Unit) {
    val channelName = "dev.flutter.pigeon.bluetooth_low_energy_android.MyPeripheralManagerFlutterApi.onCharacteristicNotifyStateChanged"
    val channel = BasicMessageChannel<Any?>(binaryMessenger, channelName, codec)
@ -1107,4 +1092,49 @@ class MyPeripheralManagerFlutterApi(private val binaryMessenger: BinaryMessenger
      } 
    }
  }
+  fun onDescriptorReadRequest(addressArgsArg: String, hashCodeArgsArg: Long, idArgsArg: Long, offsetArgsArg: Long, callback: (Result<Unit>) -> Unit) {
+    val channelName = "dev.flutter.pigeon.bluetooth_low_energy_android.MyPeripheralManagerFlutterApi.onDescriptorReadRequest"
+    val channel = BasicMessageChannel<Any?>(binaryMessenger, channelName, codec)
+    channel.send(listOf(addressArgsArg, hashCodeArgsArg, idArgsArg, offsetArgsArg)) {
+      if (it is List<*>) {
+        if (it.size > 1) {
+          callback(Result.failure(FlutterError(it[0] as String, it[1] as String, it[2] as String?)))
+        } else {
+          callback(Result.success(Unit))
+        }
+      } else {
+        callback(Result.failure(createConnectionError(channelName)))
+      } 
+    }
+  }
+  fun onDescriptorWriteRequest(addressArgsArg: String, hashCodeArgsArg: Long, idArgsArg: Long, offsetArgsArg: Long, valueArgsArg: ByteArray, preparedWriteArgsArg: Boolean, responseNeededArgsArg: Boolean, callback: (Result<Unit>) -> Unit) {
+    val channelName = "dev.flutter.pigeon.bluetooth_low_energy_android.MyPeripheralManagerFlutterApi.onDescriptorWriteRequest"
+    val channel = BasicMessageChannel<Any?>(binaryMessenger, channelName, codec)
+    channel.send(listOf(addressArgsArg, hashCodeArgsArg, idArgsArg, offsetArgsArg, valueArgsArg, preparedWriteArgsArg, responseNeededArgsArg)) {
+      if (it is List<*>) {
+        if (it.size > 1) {
+          callback(Result.failure(FlutterError(it[0] as String, it[1] as String, it[2] as String?)))
+        } else {
+          callback(Result.success(Unit))
+        }
+      } else {
+        callback(Result.failure(createConnectionError(channelName)))
+      } 
+    }
+  }
+  fun onExecuteWrite(addressArgsArg: String, idArgsArg: Long, executeArgsArg: Boolean, callback: (Result<Unit>) -> Unit) {
+    val channelName = "dev.flutter.pigeon.bluetooth_low_energy_android.MyPeripheralManagerFlutterApi.onExecuteWrite"
+    val channel = BasicMessageChannel<Any?>(binaryMessenger, channelName, codec)
+    channel.send(listOf(addressArgsArg, idArgsArg, executeArgsArg)) {
+      if (it is List<*>) {
+        if (it.size > 1) {
+          callback(Result.failure(FlutterError(it[0] as String, it[1] as String, it[2] as String?)))
+        } else {
+          callback(Result.success(Unit))
+        }
+      } else {
+        callback(Result.failure(createConnectionError(channelName)))
+      } 
+    }
+  }
 }
--- a/bluetooth_low_energy_android/android/src/main/kotlin/dev/yanshouwang/bluetooth_low_energy_android/MyPeripheralManager.kt
+++ b/bluetooth_low_energy_android/android/src/main/kotlin/dev/yanshouwang/bluetooth_low_energy_android/MyPeripheralManager.kt
@ -13,7 +13,6 @@ import android.bluetooth.le.AdvertiseCallback
 import android.bluetooth.le.AdvertiseSettings
 import android.content.Context
 import android.os.Build
-import android.util.Log
 import io.flutter.plugin.common.BinaryMessenger

 class MyPeripheralManager(context: Context, binaryMessenger: BinaryMessenger) :
@ -116,21 +115,9 @@ class MyPeripheralManager(context: Context, binaryMessenger: BinaryMessenger) :
            val characteristicsArgs = serviceArgs.characteristicsArgs.filterNotNull()
            for (characteristicArgs in characteristicsArgs) {
                val characteristic = characteristicArgs.toCharacteristic()
-                val cccDescriptor = BluetoothGattDescriptor(
-                    CLIENT_CHARACTERISTIC_CONFIG_UUID,
-                    BluetoothGattDescriptor.PERMISSION_READ or BluetoothGattDescriptor.PERMISSION_WRITE
-                )
-                val cccDescriptorAdded = characteristic.addDescriptor(cccDescriptor)
-                if (!cccDescriptorAdded) {
-                    throw IllegalStateException()
-                }
                val descriptorsArgs = characteristicArgs.descriptorsArgs.filterNotNull()
                for (descriptorArgs in descriptorsArgs) {
                    val descriptor = descriptorArgs.toDescriptor()
-                    if (descriptor.uuid == CLIENT_CHARACTERISTIC_CONFIG_UUID) {
-                        // Already added.
-                        continue
-                    }
                    val descriptorHashCodeArgs = descriptorArgs.hashCodeArgs
                    val descriptorHashCode = descriptor.hashCode()
                    this.mDescriptorsArgs[descriptorHashCode] = descriptorArgs
@ -235,7 +222,7 @@ class MyPeripheralManager(context: Context, binaryMessenger: BinaryMessenger) :
        val offset = offsetArgs.toInt()
        val sent = mServer.sendResponse(device, requestId, status, offset, valueArgs)
        if (!sent) {
-            throw IllegalStateException("Send read characteristic reply failed.")
+            throw IllegalStateException("Send response failed.")
        }
    }

@ -366,14 +353,13 @@ class MyPeripheralManager(context: Context, binaryMessenger: BinaryMessenger) :
    fun onDescriptorReadRequest(
        device: BluetoothDevice, requestId: Int, offset: Int, descriptor: BluetoothGattDescriptor
    ) {
-        val status = BluetoothGatt.GATT_SUCCESS
+        val addressArgs = device.address
        val hashCode = descriptor.hashCode()
-        val descriptorArgs = mDescriptorsArgs[hashCode] as MyGattDescriptorArgs
-        val value = descriptorArgs.valueArgs
-        val sent = mServer.sendResponse(device, requestId, status, offset, value)
-        if (!sent) {
-            Log.e(TAG, "onDescriptorReadRequest: send response failed.")
-        }
+        val descriptorArgs = mDescriptorsArgs[hashCode] ?: return
+        val hashCodeArgs = descriptorArgs.hashCodeArgs
+        val idArgs = requestId.toLong()
+        val offsetArgs = offset.toLong()
+        mApi.onDescriptorReadRequest(addressArgs, hashCodeArgs, idArgs, offsetArgs) {}
    }

    fun onDescriptorWriteRequest(
@ -385,24 +371,18 @@ class MyPeripheralManager(context: Context, binaryMessenger: BinaryMessenger) :
        offset: Int,
        value: ByteArray
    ) {
+        val addressArgs = device.address
+        val hashCode = descriptor.hashCode()
+        val descriptorArgs = mDescriptorsArgs[hashCode] ?: return
+        val hashCodeArgs = descriptorArgs.hashCodeArgs
+        val idArgs = requestId.toLong()
+        val offsetArgs = offset.toLong()
+        mApi.onDescriptorWriteRequest(
+            addressArgs, hashCodeArgs, idArgs, offsetArgs, value, preparedWrite, responseNeeded
+        ) {}
        if (descriptor.uuid == CLIENT_CHARACTERISTIC_CONFIG_UUID) {
-            val addressArgs = device.address
            val characteristic = descriptor.characteristic
-            val hashCode = characteristic.hashCode()
-            val characteristicArgs = mCharacteristicsArgs[hashCode] ?: return
-            val hashCodeArgs = characteristicArgs.hashCodeArgs
-            val stateArgs = value.toNotifyStateArgs()
-            val stateNumberArgs = stateArgs.raw.toLong()
-            mApi.onCharacteristicNotifyStateChanged(
-                addressArgs, hashCodeArgs, stateNumberArgs
-            ) {}
-        }
-        if (responseNeeded) {
-            val status = BluetoothGatt.GATT_SUCCESS
-            val sent = mServer.sendResponse(device, requestId, status, offset, value)
-            if (!sent) {
-                Log.e(TAG, "onDescriptorReadRequest: send response failed.")
-            }
+            mOnCharacteristicNotifyStateChanged(device, characteristic, value)
        }
    }

@ -464,4 +444,18 @@ class MyPeripheralManager(context: Context, binaryMessenger: BinaryMessenger) :
        mServer.close()
        mOpening = false
    }
+
+    private fun mOnCharacteristicNotifyStateChanged(
+        device: BluetoothDevice,
+        characteristic: BluetoothGattCharacteristic,
+        value: ByteArray
+    ) {
+        val addressArgs = device.address
+        val hashCode = characteristic.hashCode()
+        val characteristicArgs = mCharacteristicsArgs[hashCode] ?: return
+        val hashCodeArgs = characteristicArgs.hashCodeArgs
+        val stateArgs = value.toNotifyStateArgs()
+        val stateNumberArgs = stateArgs.raw.toLong()
+        mApi.onCharacteristicNotifyStateChanged(addressArgs, hashCodeArgs, stateNumberArgs) {}
+    }
 }