fix：1、写数据生成taskId时，添加一个3位随机字符串，避免生成相同的taskId，导致被移除队列中相同taskId的数据；2、添加属性stopScanWhenStartConnect，支持连接时可以继续扫描

Author: buhuiming

.idea/sonarlint/issuestore/0/2/0254c09bbc78bfe46588e0739059e691f7f0a967

@@ -11,8 +11,8 @@ android {
         applicationId "com.bhm.ble"
         minSdk 24
         targetSdk 34
-        versionCode 231
-        versionName "2.3.1"
+        versionCode 232
+        versionName "2.3.2"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

.idea/sonarlint/securityhotspotstore/index.pb

@@ -64,6 +64,7 @@ class MainViewModel(private val application: Application) : BaseViewModel(applic
 //                .setMtu(100, true)
                 .setMaxConnectNum(2)
                 .setConnectRetryCountAndInterval(2, 1000)
+                .setStopScanWhenStartConnect(false)
                 .build()
         )
         BleManager.get().registerBluetoothStateReceiver {

app/build.gradle

@@ -6,7 +6,7 @@ plugins {
 
 //ext.GROUP = "com.lute.ble"
 //ext.POM_ARTIFACT_ID = "BleCore"
-//ext.VERSION_NAME = "2.3.1"
+//ext.VERSION_NAME = "2.3.2"
 ////引用gradle_upload.gradle
 //apply from: "${project.rootDir}/maven_upload.gradle"
 
@@ -19,7 +19,7 @@ afterEvaluate {
                 // 这里头是artifacts的配置信息，不填会采用默认的
                 groupId = 'com.github.buhuiming'
                 artifactId = 'BleCore'
-                version = '2.3.1'
+                version = '2.3.2'
 
                 from components.release
                 artifact androidSourcesJar //打包源码，去除这行打的包将看不到源码

app/src/main/java/com/bhm/demo/vm/MainViewModel.kt

@@ -184,7 +184,9 @@ class BleManager private constructor() {
                 bleConnectCallback: BleConnectCallback.() -> Unit
     ) {
         checkInitialize()
-        stopScan()
+        if (getOptions()?.stopScanWhenStartConnect == true) {
+            stopScan()
+        }
         bleBaseRequest?.connect(
             bleDevice,
             connectMillisTimeOut,

ble/build.gradle

@@ -21,6 +21,7 @@ import com.bhm.ble.data.Constants.DEFAULT_SCAN_RETRY_INTERVAL
 import com.bhm.ble.data.Constants.DEFAULT_OPERATE_INTERVAL
 import com.bhm.ble.data.Constants.DEFAULT_TASK_QUEUE_TYPE
 import com.bhm.ble.data.Constants.ENABLE_LOG
+import com.bhm.ble.data.Constants.STOP_SCAN_WHEN_START_CONNECT
 
 
 /**
@@ -67,6 +68,8 @@ class BleOptions private constructor(builder: Builder) {
 
     var taskQueueType = builder.taskQueueType
 
+    var stopScanWhenStartConnect = builder.stopScanWhenStartConnect
+
     companion object {
 
         @JvmStatic
@@ -114,6 +117,8 @@ class BleOptions private constructor(builder: Builder) {
 
         internal var taskQueueType: BleTaskQueueType = DEFAULT_TASK_QUEUE_TYPE
 
+        internal var stopScanWhenStartConnect = STOP_SCAN_WHEN_START_CONNECT
+
         /**
          * 设置扫描过滤规则：只查询对应ServiceUuid的设备
          */
@@ -270,6 +275,14 @@ class BleOptions private constructor(builder: Builder) {
             this.taskQueueType = taskQueueType
         }
 
+        /**
+         * 当连接设备时是否停止扫描，默认为[STOP_SCAN_WHEN_START_CONNECT]
+         * 注意：该参数对startScanAndConnect方法无效
+         */
+        fun setStopScanWhenStartConnect(stopScanWhenStartConnect: Boolean) = apply {
+            this.stopScanWhenStartConnect = stopScanWhenStartConnect
+        }
+
         fun build(): BleOptions {
             return BleOptions(this)
         }

ble/src/main/java/com/bhm/ble/BleManager.kt

@@ -0,0 +1,47 @@
+package com.bhm.ble.data
+
+/**
+ * @description [com.bhm.ble.request.BleWriteRequest.writeQueueData]方法中队列存放的数据结构
+ * @author Buhuiming
+ * @date 2024/10/18/ 18:04
+ */
+internal data class BleWriteQueueData(
+    var operateRandomID: String,
+    var serviceUUID: String,
+    var writeUUID: String,
+    var data: ByteArray,
+    var skipErrorPacketData: Boolean,
+    var retryWriteCount: Int,
+    var retryDelayTime: Long,
+    var writeType: Int?,
+) {
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+
+        other as BleWriteQueueData
+
+        if (operateRandomID != other.operateRandomID) return false
+        if (serviceUUID != other.serviceUUID) return false
+        if (writeUUID != other.writeUUID) return false
+        if (!data.contentEquals(other.data)) return false
+        if (skipErrorPacketData != other.skipErrorPacketData) return false
+        if (retryWriteCount != other.retryWriteCount) return false
+        if (retryDelayTime != other.retryDelayTime) return false
+        if (writeType != other.writeType) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = operateRandomID.hashCode()
+        result = 31 * result + serviceUUID.hashCode()
+        result = 31 * result + writeUUID.hashCode()
+        result = 31 * result + data.contentHashCode()
+        result = 31 * result + skipErrorPacketData.hashCode()
+        result = 31 * result + retryWriteCount
+        result = 31 * result + retryDelayTime.hashCode()
+        result = 31 * result + (writeType ?: 0)
+        return result
+    }
+}

ble/src/main/java/com/bhm/ble/attribute/BleOptions.kt

@@ -44,6 +44,8 @@ object Constants {
 
     val DEFAULT_TASK_QUEUE_TYPE = BleTaskQueueType.Default
 
+    const val STOP_SCAN_WHEN_START_CONNECT = true
+
     //系统提供接受通知自带的UUID
     const val UUID_CLIENT_CHARACTERISTIC_CONFIG_DESCRIPTOR =
         "00002902-0000-1000-8000-00805f9b34fb"

ble/src/main/java/com/bhm/ble/data/BleWriteQueueData.kt

@@ -60,8 +60,6 @@ internal class BleConnectedDevice(val bleDevice: BleDevice) : BluetoothGattCallb
 
     private var bleEventCallback: BleEventCallback? = null
 
-    private val characters = ('a'..'z') + ('A'..'Z') + ('0'..'9')
-
     private fun initBleConnectRequest() {
         if (bleConnectRequest == null) {
             bleConnectRequest = BleConnectRequest(bleDevice, this)
@@ -411,7 +409,7 @@ internal class BleConnectedDevice(val bleDevice: BleDevice) : BluetoothGattCallb
         bleWriteRequest?.writeData(
             serviceUUID,
             writeUUID,
-            System.currentTimeMillis().toString() + generateRandomString(),
+            System.currentTimeMillis().toString(),
             dataArray,
             writeType,
             bleWriteCallback
@@ -436,7 +434,7 @@ internal class BleConnectedDevice(val bleDevice: BleDevice) : BluetoothGattCallb
         bleWriteRequest?.writeQueueData(
             serviceUUID,
             writeUUID,
-            System.currentTimeMillis().toString() + generateRandomString(),
+            System.currentTimeMillis().toString(),
             dataArray,
             skipErrorPacketData,
             retryWriteCount,
@@ -531,13 +529,4 @@ internal class BleConnectedDevice(val bleDevice: BleDevice) : BluetoothGattCallb
         bleConnectRequest = null
         bleEventCallback = null
     }
-
-    /**
-     * 从[characters]中随机生成5个字符组成的字符串
-     */
-    private fun generateRandomString(): String {
-        return (1..5)
-            .map { characters.random() }
-            .joinToString("")
-    }
 }