refactor(蓝牙):

- 调整蓝牙连接超时时间为5秒
- 设置蓝牙扫描超时时间为3秒

fix(作业票):
- 修复虚拟冲突点位查询逻辑，确保查询进行中且非异常的作业

data/src/main/java/com/grkj/data/dao/JobTicketDao.kt

@@ -469,6 +469,7 @@ interface JobTicketDao {
 
     /**
      * 获取虚拟冲突点位
+     * 进行中的非异常作业
      */
     @Query(
         """
@@ -478,8 +479,8 @@ interface JobTicketDao {
             is_job_ticket_points p
                 LEFT JOIN is_job_ticket t ON t.ticket_id = p.ticket_id
                 LEFT JOIN is_job_ticket_key k ON k.ticket_id = p.ticket_id and k.ticket_type = "1"
-        WHERE
-            (t.ticket_status < 5 or t.ticket_status = 7)
+        WHERE t.ticket_status in ('1','2','3','4','7')
+          AND t.ex_status is null
           AND p.point_status = "1"
           AND p.unlocked_by_key_id IS NULL
           AND p.point_id =:pointId
@@ -487,7 +488,8 @@ interface JobTicketDao {
           AND p.ticket_id != :ticketId
     """
     )
-    fun getVirtualLockConflictPoint(
+    fun
+            getVirtualLockConflictPoint(
         pointId: Long?, lockId: Long?, ticketId: Long
     ): List<IsJobTicketPoints>
 

ui-base/src/main/java/com/grkj/ui_base/utils/ble/BleUtil.kt

@@ -38,7 +38,7 @@ class BleUtil private constructor() {
         try {
             BleManager.getInstance().init(application)
             BleManager.getInstance().enableLog(false)
-                .setConnectOverTime(10 * 1000L)
+                .setConnectOverTime(5 * 1000L)
                 .setReConnectCount(0, 0)
                 .setSplitWriteNum(500)
                 .operateTimeout =
@@ -47,6 +47,7 @@ class BleUtil private constructor() {
                 //Android 12及以上不允许添加过滤器
                 val bleScanRuleConfig = BleScanRuleConfig.Builder()
                     .setAutoConnect(false)
+                    .setScanTimeOut(3_000L)
                     .setDeviceName(true, BleConst.BLE_LOCAL_NAME)
                     .build()
                 BleManager.getInstance().initScanRule(bleScanRuleConfig)