修改 discover service 和 read

Author: xiaoyunfei

bluetooth/src/main/java/com/shon/ble/call/DiscoverCall.kt

@@ -0,0 +1,6 @@
+package com.shon.ble.call
+
+import android.bluetooth.BluetoothGatt
+import com.shon.ble.call.callback.DiscoverCallback
+
+class DiscoverCall(address:String,val gatt: BluetoothGatt):BleCall<DiscoverCallback>(address)

bluetooth/src/main/java/com/shon/ble/call/callback/DiscoverCallback.kt

@@ -0,0 +1,3 @@
+package com.shon.ble.call.callback
+
+abstract class DiscoverCallback:BleCallback<Boolean>

bluetooth/src/main/java/com/shon/ble/call/callback/ReadCallback.kt

@@ -1,3 +1,5 @@
 package com.shon.ble.call.callback
 
-interface ReadCallback:BleCallback<ByteArray>
+interface ReadCallback:BleCallback<ByteArray>{
+ fun onExecute()
+}

bluetooth/src/main/java/com/shon/ble/call/data/CharacteristicData.kt

@@ -47,4 +47,9 @@ internal data class MTUDataMessage(
  val address: String,
  val mtu: Int,
  val status: Int = 10000
+)
+
+internal data class DiscoverMessage(
+ val gatt: BluetoothGatt?,
+ val status: Int,
 )

bluetooth/src/main/java/com/shon/ble/call/executor/BaseExecutor.kt

@@ -0,0 +1,16 @@
+package com.shon.ble.call.executor
+
+import org.greenrobot.eventbus.EventBus
+
+abstract class BaseExecutor<T, M> constructor(val callback: T) {
+
+ open fun execute(){
+ EventBus.getDefault().register(this)
+ }
+
+ open fun onReceiverMessage(message: M) {
+
+ EventBus.getDefault().unregister(this)
+ }
+
+}

bluetooth/src/main/java/com/shon/ble/call/executor/DiscoverExecutor.kt

@@ -0,0 +1,40 @@
+package com.shon.ble.call.executor
+
+import android.annotation.SuppressLint
+import android.bluetooth.BluetoothGatt
+import android.text.TextUtils
+import com.shon.ble.call.callback.DiscoverCallback
+import com.shon.ble.call.data.DiscoverMessage
+import org.greenrobot.eventbus.Subscribe
+import org.greenrobot.eventbus.ThreadMode
+
+internal class DiscoverExecutor(
+ private val address: String,
+ private val gatt: BluetoothGatt,
+ private val discoverCallback: DiscoverCallback
+) :
+ BaseExecutor<DiscoverCallback, DiscoverMessage>(discoverCallback) {
+ @SuppressLint("MissingPermission")
+ override fun execute() {
+ super.execute()
+ gatt.discoverServices()
+ }
+
+ @Subscribe(threadMode = ThreadMode.BACKGROUND)
+ override fun onReceiverMessage(message: DiscoverMessage) {
+ message.gatt?.let {
+ val mac = it.device.address
+ if (TextUtils.equals(address, mac)) {
+ super.onReceiverMessage(message)
+ if (message.status == BluetoothGatt.GATT_SUCCESS) {
+ discoverCallback.onResult(true)
+ } else {
+ discoverCallback.onResult(false)
+ }
+
+ }
+ }
+
+
+ }
+}

bluetooth/src/main/java/com/shon/ble/call/executor/ReadExecutor.kt

@@ -4,58 +4,36 @@ import android.annotation.SuppressLint
 import android.bluetooth.BluetoothGatt
 import android.bluetooth.BluetoothGattCharacteristic
 import android.text.TextUtils
+import com.shon.ble.call.callback.ReadCallback
 import com.shon.ble.call.data.ReadDataMessage
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
 import java.util.*
 
+
 internal class ReadExecutor(
  private val address: String,
- private val gatt: BluetoothGatt?,
- private val gattCharacteristic: BluetoothGattCharacteristic?,
-) : IEventBus<ByteArray, ReadDataMessage>() {
-
+ private val gatt: BluetoothGatt,
+ private val gattCharacteristic: BluetoothGattCharacteristic,
+ private val readCallback: ReadCallback
+) : BaseExecutor<ReadCallback, ReadDataMessage>(readCallback) {
 
  @SuppressLint("MissingPermission")
- override suspend fun execute(): ByteArray? {
- if (gatt == null || gattCharacteristic == null) {
- channel.send(null)
- channel.close()
- return channel.receive()
- }
-
+ override fun execute() {
+ super.execute()
+ readCallback.onExecute()
  gatt.readCharacteristic(gattCharacteristic)
-
- return channel.receive()
  }
 
  @Subscribe(threadMode = ThreadMode.BACKGROUND)
- override fun receiverMessage(message: ReadDataMessage) {
- super.receiverMessage(message)
- CoroutineScope(Dispatchers.IO).launch {
- onCharacteristicRead(
- message.gatt, message.characteristic,
- message.status
- )
- }
- }
-
- private suspend fun onCharacteristicRead(
- gatt: BluetoothGatt?,
- characteristic: BluetoothGattCharacteristic?,
- status: Int
- ) {
+ override fun onReceiverMessage(message: ReadDataMessage) {
+ val status = message.status
+ val gattResult = message.gatt
+ val characteristic = message.characteristic
  if (status != BluetoothGatt.GATT_SUCCESS) {
- channel.send(null)
- channel.close()
  return
  }
- if (gatt == null || characteristic == null) {
- channel.send(null)
- channel.close()
+ if (gattResult == null || characteristic == null) {
  return
  }
  val mac = gatt.device.address
@@ -64,14 +42,16 @@ internal class ReadExecutor(
  return
  }
 
- val mUuid: String = gattCharacteristic?.uuid.toString().lowercase(Locale.getDefault())
+ val mUuid: String = gattCharacteristic.uuid.toString().lowercase(Locale.getDefault())
  val uuid: String = characteristic.uuid.toString().lowercase(Locale.getDefault())
 
  if (!TextUtils.equals(mUuid, uuid)) {
  return
  }
+ super.onReceiverMessage(message)
  val value: ByteArray = characteristic.value
- channel.send(value)
- channel.close()
+ readCallback.onResult(value)
+
  }
-}
+
+}

bluetooth/src/main/java/com/shon/ble/dispatcher/BleDispatcher.kt

@@ -1,9 +1,11 @@
 package com.shon.ble.dispatcher
 
+import android.bluetooth.BluetoothGatt
 import android.bluetooth.BluetoothGattCharacteristic
 import android.bluetooth.BluetoothManager
 import com.shon.ble.util.BleLog
 import com.shon.ble.call.*
+import com.shon.ble.call.callback.ReadCallback
 import com.shon.ble.call.callback.SendCallback
 import com.shon.ble.call.executor.*
 import com.shon.ble.getGattCharacteristic
@@ -12,6 +14,8 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.launch
+import kotlin.coroutines.resume
+import kotlin.coroutines.suspendCoroutine
 
 internal class BleDispatcher internal constructor(private val manager: BluetoothManager) {
  private val channel = Channel<BleCall<*>>(Channel.Factory.UNLIMITED)
@@ -48,6 +52,7 @@ internal class BleDispatcher internal constructor(private val manager: Bluetooth
  val execute = MTUExecutor(address, call.gatt, call.mtu).execute()
  call.getCallBack().onResult(execute)
  }
+ is DiscoverCall -> discoverService(call)
  is EnableNotifyCall -> enableNotifyService(call)
  is ReadDataCall -> readData(call)
  is WriteDataCall -> {
@@ -71,12 +76,23 @@ internal class BleDispatcher internal constructor(private val manager: Bluetooth
  call.getCallBack().onResult(execute)
  }
 
+
+ private suspend fun discoverService(call: DiscoverCall) {
+ val address = call.address
+ val gatt = call.gatt
+ val discoverResult = executeDiscoverCall(address, gatt)
+ call.getCallBack().onResult(discoverResult)
+ }
+
+
  private suspend fun readData(call: ReadDataCall) {
  val gattCharacteristic = call.getCharacteristic()
- val readExecutor = ReadExecutor(call.address, call.gatt, gattCharacteristic)
- val readData = readExecutor.execute()
  val callBack = call.getCallBack()
- callBack.onResult(readData)
+ gattCharacteristic ?: return
+ val executeReadCallResult = executeReadCall(call.address, call.gatt, gattCharacteristic) {
+ callBack.onExecute()
+ }
+ callBack.onResult(executeReadCallResult)
  }
 
  private suspend fun writeData(call: WriteDataCall): Boolean? {

bluetooth/src/main/java/com/shon/ble/dispatcher/ExecutorExt.kt

@@ -0,0 +1,48 @@
+package com.shon.ble.dispatcher
+
+import android.bluetooth.BluetoothGatt
+import android.bluetooth.BluetoothGattCharacteristic
+import com.shon.ble.call.callback.DiscoverCallback
+import com.shon.ble.call.callback.ReadCallback
+import com.shon.ble.call.executor.DiscoverExecutor
+import com.shon.ble.call.executor.ReadExecutor
+import kotlin.coroutines.resume
+import kotlin.coroutines.suspendCoroutine
+
+
+internal suspend fun executeDiscoverCall(address: String, gatt: BluetoothGatt): Boolean {
+ return suspendCoroutine { coroutine ->
+ val discoverExecutor = DiscoverExecutor(address, gatt, object : DiscoverCallback() {
+ override fun onResult(value: Boolean?) {
+ value?.let {
+ coroutine.resume(it)
+ }
+ }
+
+ })
+ discoverExecutor.execute()
+ }
+}
+
+internal suspend fun executeReadCall(
+ address: String,
+ gatt: BluetoothGatt,
+ gattCharacteristic: BluetoothGattCharacteristic,
+ onExecute: () -> Unit = {}
+): ByteArray {
+
+ return suspendCoroutine { coroutine ->
+ val readExecutor = ReadExecutor(address, gatt, gattCharacteristic, object : ReadCallback {
+ override fun onResult(value: ByteArray?) {
+ value?.let {
+ coroutine.resume(it)
+ }
+ }
+
+ override fun onExecute() {
+ onExecute.invoke()
+ }
+ })
+ readExecutor.execute()
+ }
+}