feart： 1、打开notify/indicate添加超时参数；2、检测GPS开关配置成可选项

buhuiming · buhuiming · commit 89db4bad5ed0 · 2025-04-16T15:27:26.000+08:00
diff --git a/.idea/sonarlint/issuestore/0/2/0254c09bbc78bfe46588e0739059e691f7f0a967 b/.idea/sonarlint/issuestore/0/2/0254c09bbc78bfe46588e0739059e691f7f0a967
diff --git a/.idea/sonarlint/securityhotspotstore/index.pb b/.idea/sonarlint/securityhotspotstore/index.pb
diff --git a/app/build.gradle b/app/build.gradle
@@ -11,8 +11,8 @@ android {
         applicationId "com.bhm.ble"
         minSdk 24
         targetSdk 34
-        versionCode 240
-        versionName "2.4.0"
+        versionCode 250
+        versionName "2.5.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
diff --git a/app/src/main/java/com/bhm/demo/ui/OptionSettingActivity.kt b/app/src/main/java/com/bhm/demo/ui/OptionSettingActivity.kt
@@ -23,6 +23,7 @@ import com.bhm.ble.data.Constants.DEFAULT_SCAN_MILLIS_TIMEOUT
 import com.bhm.ble.data.Constants.DEFAULT_SCAN_RETRY_COUNT
 import com.bhm.ble.data.Constants.DEFAULT_SCAN_RETRY_INTERVAL
 import com.bhm.ble.data.Constants.ENABLE_LOG
+import com.bhm.ble.data.Constants.SCAN_NEED_CHECK_GPS
 import com.bhm.demo.BaseActivity
 import com.bhm.demo.R
 import com.bhm.demo.databinding.ActivitySettingBinding
@@ -99,6 +100,7 @@ class OptionSettingActivity : BaseActivity<BaseViewModel, ActivitySettingBinding
             viewBinding.etMTU.setText(it.mtu.toString())
             viewBinding.cbContainScanDeviceName.isChecked = it.containScanDeviceName
             viewBinding.cbLogger.isChecked = it.enableLog
+            viewBinding.cbNeedCheckGPS.isChecked = it.needCheckGps
             viewBinding.cbMtu.isChecked = it.autoSetMtu
             viewBinding.cbAutoConnect.isChecked = it.autoConnect
             viewBinding.spTaskQueueType.setSelection(getTaskQueueType(it.taskQueueType))
@@ -126,6 +128,7 @@ class OptionSettingActivity : BaseActivity<BaseViewModel, ActivitySettingBinding
             viewBinding.etMTU.setText(DEFAULT_MTU.toString())
             viewBinding.cbContainScanDeviceName.isChecked = CONTAIN_SCAN_DEVICE_NAME
             viewBinding.cbLogger.isChecked = ENABLE_LOG
+            viewBinding.cbNeedCheckGPS.isChecked = SCAN_NEED_CHECK_GPS
             viewBinding.cbMtu.isChecked = DEFAULT_AUTO_SET_MTU
             viewBinding.cbAutoConnect.isChecked = AUTO_CONNECT
             viewBinding.spTaskQueueType.setSelection(0)
@@ -170,6 +173,7 @@ class OptionSettingActivity : BaseActivity<BaseViewModel, ActivitySettingBinding
                 .setMaxConnectNum(viewBinding.etMaxConnectNum.text.toString().toInt())
                 .setMtu(viewBinding.etMTU.text.toString().toInt(), viewBinding.cbMtu.isChecked)
                 .setTaskQueueType(getTaskQueueType(viewBinding.spTaskQueueType.selectedItemPosition))
+                .setNeedCheckGps(viewBinding.cbNeedCheckGPS.isChecked)
             BleManager.get().init(application, builder.build())
             BleManager.get().disConnectAll()
             finish()
diff --git a/app/src/main/java/com/bhm/demo/vm/DetailViewModel.kt b/app/src/main/java/com/bhm/demo/vm/DetailViewModel.kt
@@ -122,7 +122,7 @@ class DetailViewModel(application: Application) : BaseViewModel(application) {
     fun notify(bleDevice: BleDevice,
                node: CharacteristicNode
     ) {
-        BleManager.get().notify(bleDevice, node.serviceUUID, node.characteristicUUID, BleDescriptorGetType.AllDescriptor) {
+        BleManager.get().notify(bleDevice, node.serviceUUID, node.characteristicUUID, 2000, BleDescriptorGetType.AllDescriptor) {
             onNotifyFail { _, _, t ->
                 addLogMsg(LogEntity(Level.OFF, "notify失败：${t.message}"))
                 node.enableNotify = false
@@ -274,19 +274,34 @@ class DetailViewModel(application: Application) : BaseViewModel(application) {
         //mtu长度包含了ATT的opcode一个字节以及ATT的handle2个字节
         val maxLength = mtu - 3
         val listData: SparseArray<ByteArray> = BleUtil.subpackage(data, maxLength)
-        BleManager.get().writeData(bleDevice, node.serviceUUID, node.characteristicUUID, listData) {
-            onWriteFail { _, currentPackage, _, t ->
-                addLogMsg(LogEntity(Level.OFF, "第${currentPackage}包数据写失败：${t.message}"))
-            }
-            onWriteSuccess { _, currentPackage, _, justWrite ->
-                addLogMsg(LogEntity(Level.FINE, "${node.characteristicUUID} -> 第${currentPackage}包数据写成功：" +
-                        BleUtil.bytesToHex(justWrite)
-                ))
-            }
-            onWriteComplete { _, allSuccess ->
-                //代表所有数据写成功，可以在这个方法中处理成功的逻辑
-                addLogMsg(LogEntity(Level.FINE, "${node.characteristicUUID} -> 写数据完成，是否成功：$allSuccess"))
+        BleManager.get()
+            .writeData(bleDevice, node.serviceUUID, node.characteristicUUID, listData) {
+                onWriteFail { _, currentPackage, _, t ->
+                    addLogMsg(
+                        LogEntity(
+                            Level.OFF,
+                            "第${currentPackage}包数据写失败：${t.message}"
+                        )
+                    )
+                }
+                onWriteSuccess { _, currentPackage, _, justWrite ->
+                    addLogMsg(
+                        LogEntity(
+                            Level.FINE,
+                            "${node.characteristicUUID} -> 第${currentPackage}包数据写成功：" +
+                                    BleUtil.bytesToHex(justWrite)
+                        )
+                    )
+                }
+                onWriteComplete { _, allSuccess ->
+                    //代表所有数据写成功，可以在这个方法中处理成功的逻辑
+                    addLogMsg(
+                        LogEntity(
+                            Level.FINE,
+                            "${node.characteristicUUID} -> 写数据完成，是否成功：$allSuccess"
+                        )
+                    )
+                }
             }
-        }
     }
 }
diff --git a/app/src/main/java/com/bhm/demo/vm/MainViewModel.kt b/app/src/main/java/com/bhm/demo/vm/MainViewModel.kt
@@ -65,6 +65,7 @@ class MainViewModel(private val application: Application) : BaseViewModel(applic
                 .setMaxConnectNum(2)
                 .setConnectRetryCountAndInterval(2, 1000)
                 .setStopScanWhenStartConnect(false)
+                .setNeedCheckGps(true)
                 .build()
         )
         BleManager.get().registerBluetoothStateReceiver {
diff --git a/app/src/main/res/layout/activity_setting.xml b/app/src/main/res/layout/activity_setting.xml
@@ -397,6 +397,29 @@
 
             </androidx.appcompat.widget.LinearLayoutCompat>
 
+            <androidx.appcompat.widget.LinearLayoutCompat
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:gravity="center_vertical"
+                android:layout_marginVertical="10dp"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="扫描设备是否需要检测GPS开关："
+                    android:textSize="16sp"
+                    android:textColor="@color/black"
+                    android:layout_marginEnd="12dp"/>
+
+                <CheckBox
+                    android:id="@+id/cbNeedCheckGPS"
+                    android:layout_width="40dp"
+                    android:layout_height="40dp"
+                    android:checked="true"/>
+
+            </androidx.appcompat.widget.LinearLayoutCompat>
+
             <androidx.appcompat.widget.LinearLayoutCompat
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
diff --git a/ble/build.gradle b/ble/build.gradle
@@ -6,7 +6,7 @@ plugins {
 
 //ext.GROUP = "com.lute.ble"
 //ext.POM_ARTIFACT_ID = "BleCore"
-//ext.VERSION_NAME = "2.4.0"
+//ext.VERSION_NAME = "2.5.0"
 ////引用gradle_upload.gradle
 //apply from: "${project.rootDir}/maven_upload.gradle"
 
@@ -19,7 +19,7 @@ afterEvaluate {
                 // 这里头是artifacts的配置信息，不填会采用默认的
                 groupId = 'com.github.buhuiming'
                 artifactId = 'BleCore'
-                version = '2.4.0'
+                version = '2.5.0'
 
                 from components.release
                 artifact androidSourcesJar //打包源码，去除这行打的包将看不到源码
diff --git a/ble/src/main/java/com/bhm/ble/BleManager.kt b/ble/src/main/java/com/bhm/ble/BleManager.kt
@@ -366,13 +366,33 @@ class BleManager private constructor() {
     fun notify(bleDevice: BleDevice,
                serviceUUID: String,
                notifyUUID: String,
+               timeoutMillis: Long? = bleOptions?.operateMillisTimeOut,
                bleDescriptorGetType: BleDescriptorGetType = BleDescriptorGetType.Default,
                bleNotifyCallback: BleNotifyCallback.() -> Unit) {
         checkInitialize()
         bleBaseRequest?.notify(
             bleDevice,
             serviceUUID,
             notifyUUID,
+            timeoutMillis,
+            bleDescriptorGetType,
+            bleNotifyCallback
+        )
+    }
+
+    /**
+     * notify
+     */
+    fun notify(bleDevice: BleDevice,
+               serviceUUID: String,
+               notifyUUID: String,
+               bleDescriptorGetType: BleDescriptorGetType = BleDescriptorGetType.Default,
+               bleNotifyCallback: BleNotifyCallback.() -> Unit) {
+        notify(
+            bleDevice,
+            serviceUUID,
+            notifyUUID,
+            null,
             bleDescriptorGetType,
             bleNotifyCallback
         )
@@ -454,13 +474,33 @@ class BleManager private constructor() {
     fun indicate(bleDevice: BleDevice,
                  serviceUUID: String,
                  indicateUUID: String,
+                 timeoutMillis: Long? = bleOptions?.operateMillisTimeOut,
                  bleDescriptorGetType: BleDescriptorGetType = BleDescriptorGetType.Default,
                  bleIndicateCallback: BleIndicateCallback.() -> Unit) {
         checkInitialize()
         bleBaseRequest?.indicate(
             bleDevice,
             serviceUUID,
             indicateUUID,
+            timeoutMillis,
+            bleDescriptorGetType,
+            bleIndicateCallback
+        )
+    }
+
+    /**
+     * indicate
+     */
+    fun indicate(bleDevice: BleDevice,
+                 serviceUUID: String,
+                 indicateUUID: String,
+                 bleDescriptorGetType: BleDescriptorGetType = BleDescriptorGetType.Default,
+                 bleIndicateCallback: BleIndicateCallback.() -> Unit) {
+        indicate(
+            bleDevice,
+            serviceUUID,
+            indicateUUID,
+            null,
             bleDescriptorGetType,
             bleIndicateCallback
         )
diff --git a/ble/src/main/java/com/bhm/ble/attribute/BleOptions.kt b/ble/src/main/java/com/bhm/ble/attribute/BleOptions.kt
@@ -14,13 +14,14 @@ import com.bhm.ble.data.Constants.DEFAULT_CONNECT_RETRY_COUNT
 import com.bhm.ble.data.Constants.DEFAULT_CONNECT_RETRY_INTERVAL
 import com.bhm.ble.data.Constants.DEFAULT_MAX_CONNECT_NUM
 import com.bhm.ble.data.Constants.DEFAULT_MTU
+import com.bhm.ble.data.Constants.DEFAULT_OPERATE_INTERVAL
 import com.bhm.ble.data.Constants.DEFAULT_OPERATE_MILLIS_TIMEOUT
 import com.bhm.ble.data.Constants.DEFAULT_SCAN_MILLIS_TIMEOUT
 import com.bhm.ble.data.Constants.DEFAULT_SCAN_RETRY_COUNT
 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.SCAN_NEED_CHECK_GPS
 import com.bhm.ble.data.Constants.STOP_SCAN_WHEN_START_CONNECT
 
 
@@ -70,6 +71,8 @@ class BleOptions private constructor(builder: Builder) {
 
     var stopScanWhenStartConnect = builder.stopScanWhenStartConnect
 
+    var needCheckGps = builder.needCheckGps
+
     companion object {
 
         @JvmStatic
@@ -119,6 +122,8 @@ class BleOptions private constructor(builder: Builder) {
 
         internal var stopScanWhenStartConnect = STOP_SCAN_WHEN_START_CONNECT
 
+        internal var needCheckGps = SCAN_NEED_CHECK_GPS
+
         /**
          * 设置扫描过滤规则：只查询对应ServiceUuid的设备
          */
@@ -283,6 +288,14 @@ class BleOptions private constructor(builder: Builder) {
             this.stopScanWhenStartConnect = stopScanWhenStartConnect
         }
 
+        /**
+         * 设置是否需要打开GPS，默认为[SCAN_NEED_CHECK_GPS]
+         *  有些设备不具备GPS模块，如果需要打开或关闭GPS，请调用该方法设置
+         */
+        fun setNeedCheckGps(needCheckGps: Boolean) = apply {
+            this.needCheckGps = needCheckGps
+        }
+
         fun build(): BleOptions {
             return BleOptions(this)
         }
diff --git a/ble/src/main/java/com/bhm/ble/data/Constants.kt b/ble/src/main/java/com/bhm/ble/data/Constants.kt
@@ -77,4 +77,6 @@ object Constants {
 
     //设置通知失败，SetCharacteristicNotificationFail
     const val EXCEPTION_CODE_SET_CHARACTERISTIC_NOTIFICATION_FAIL = 101
+
+    const val SCAN_NEED_CHECK_GPS = true
 }
diff --git a/ble/src/main/java/com/bhm/ble/device/BleConnectedDevice.kt b/ble/src/main/java/com/bhm/ble/device/BleConnectedDevice.kt
@@ -291,13 +291,15 @@ internal class BleConnectedDevice(val bleDevice: BleDevice) : BluetoothGattCallb
     @Synchronized
     fun enableCharacteristicNotify(serviceUUID: String,
                                    notifyUUID: String,
+                                   timeoutMillis: Long?,
                                    bleDescriptorGetType: BleDescriptorGetType,
                                    bleNotifyCallback: BleNotifyCallback
     ) {
         initBleNotifyRequest()
         bleNotifyRequest?.enableCharacteristicNotify(
             serviceUUID,
             notifyUUID,
+            timeoutMillis,
             bleDescriptorGetType,
             bleNotifyCallback
         )
@@ -325,13 +327,15 @@ internal class BleConnectedDevice(val bleDevice: BleDevice) : BluetoothGattCallb
     @Synchronized
     fun enableCharacteristicIndicate(serviceUUID: String,
                                      indicateUUID: String,
+                                     timeoutMillis: Long?,
                                      bleDescriptorGetType: BleDescriptorGetType,
                                      bleIndicateCallback: BleIndicateCallback
     ) {
         initBleIndicateRequest()
         bleIndicateRequest?.enableCharacteristicIndicate(
             serviceUUID,
             indicateUUID,
+            timeoutMillis,
             bleDescriptorGetType,
             bleIndicateCallback
         )
diff --git a/ble/src/main/java/com/bhm/ble/request/BleIndicateRequest.kt b/ble/src/main/java/com/bhm/ble/request/BleIndicateRequest.kt
@@ -62,6 +62,7 @@ internal class BleIndicateRequest(
      */
     fun enableCharacteristicIndicate(serviceUUID: String,
                                      indicateUUID: String,
+                                     timeoutMillis: Long?,
                                      bleDescriptorGetType: BleDescriptorGetType,
                                      bleIndicateCallback: BleIndicateCallback) {
         if (!BleUtil.isPermission(getBleManager().getContext())) {
@@ -77,6 +78,7 @@ internal class BleIndicateRequest(
             var mContinuation: Continuation<Throwable?>? = null
             val task = getTask(
                 getTaskId(indicateUUID),
+                durationTimeMillis = timeoutMillis?: getOperateTime(),
                 block = {
                     suspendCoroutine<Throwable?> { continuation ->
                         mContinuation = continuation
diff --git a/ble/src/main/java/com/bhm/ble/request/BleNotifyRequest.kt b/ble/src/main/java/com/bhm/ble/request/BleNotifyRequest.kt
@@ -62,6 +62,7 @@ internal class BleNotifyRequest(
      */
     fun enableCharacteristicNotify(serviceUUID: String,
                                    notifyUUID: String,
+                                   timeoutMillis: Long?,
                                    bleDescriptorGetType: BleDescriptorGetType,
                                    bleNotifyCallback: BleNotifyCallback) {
         if (!BleUtil.isPermission(getBleManager().getContext())) {
@@ -77,6 +78,7 @@ internal class BleNotifyRequest(
             var mContinuation: Continuation<Throwable?>? = null
             val task = getTask(
                 getTaskId(notifyUUID),
+                durationTimeMillis = timeoutMillis?: getOperateTime(),
                 block = {
                     suspendCoroutine<Throwable?> { continuation ->
                         mContinuation = continuation
diff --git a/ble/src/main/java/com/bhm/ble/request/BleReadRequest.kt b/ble/src/main/java/com/bhm/ble/request/BleReadRequest.kt
@@ -153,5 +153,6 @@ internal class BleReadRequest(
     override fun close() {
         super.close()
         removeAllReadCallback()
+        getTaskQueueList()?.forEach { it?.removeAllTask() }
     }
 }
diff --git a/ble/src/main/java/com/bhm/ble/request/BleScanRequest.kt b/ble/src/main/java/com/bhm/ble/request/BleScanRequest.kt
@@ -115,7 +115,8 @@ internal class BleScanRequest private constructor() : Request() {
             bleScanCallback.callScanFail(BleScanFailType.UnSupportBle)
             return
         }
-        if (!BleUtil.isGpsOpen(bleManager.getContext()?.applicationContext)) {
+        val needGps = getBleOptions()?.needCheckGps?: true
+        if (!BleUtil.isGpsOpen(bleManager.getContext()?.applicationContext) && needGps) {
             BleLogger.e("设备未打开GPS定位")
             bleScanCallback.callScanFail(BleScanFailType.GPSDisable)
             return
diff --git a/ble/src/main/java/com/bhm/ble/request/base/BleBaseRequest.kt b/ble/src/main/java/com/bhm/ble/request/base/BleBaseRequest.kt
diff --git a/ble/src/main/java/com/bhm/ble/request/base/BleRequestImp.kt b/ble/src/main/java/com/bhm/ble/request/base/BleRequestImp.kt

Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,7 @@ class MainViewModel(private val application: Application) : BaseViewModel(applic`
`65`	`65`	`.setMaxConnectNum(2)`
`66`	`66`	`.setConnectRetryCountAndInterval(2, 1000)`
`67`	`67`	`.setStopScanWhenStartConnect(false)`
	`68`	`+ .setNeedCheckGps(true)`
`68`	`69`	`.build()`
`69`	`70`	`)`
`70`	`71`	`BleManager.get().registerBluetoothStateReceiver {`