refactor(更新)

- 修改预设流程模式中部分步骤的配置项
- 调整`WorkflowStepDao`和`RoleDao`中插入预设数据的冲突策略为`REPLACE`
- 优化`BleQueueDispatcher`中`getConnectedAndConnecting`方法的实现
- 将"流程模式管理"的文本统一修改为"流程模式"

app/src/main/assets/i18n/zh-CN.json

@@ -3037,7 +3037,7 @@
   "workflow_manage_title": {
     "key": "workflow_manage_title",
     "type": "text",
-    "value": "流程模式管理"
+    "value": "流程模式"
   },
   "workflow_mode": {
     "key": "workflow_mode",
@@ -3417,7 +3417,7 @@
   "workflow_manage": {
     "key": "workflow_manage",
     "type": "text",
-    "value": "流程模式管理"
+    "value": "流程模式"
   },
   "create_sop_job": {
     "key": "create_sop_job",

app/src/main/assets/preset/preset_workflow_step.json

@@ -544,7 +544,7 @@
     "enableSetColocker": false,
     "enableAddColocker": true,
     "gotoStepAfterAddingColocker": null,
-    "enableReduceColocker": false,
+    "enableReduceColocker": true,
     "enableLock": false,
     "enableColock": false,
     "enableReleaseColock": false,
@@ -575,9 +575,9 @@
     "enableSetColocker": false,
     "enableAddColocker": true,
     "gotoStepAfterAddingColocker": null,
-    "enableReduceColocker": false,
+    "enableReduceColocker": true,
     "enableLock": true,
-    "enableColock": false,
+    "enableColock": true,
     "enableReleaseColock": false,
     "enableUnlock": false,
     "enableEndJob": false,
@@ -671,7 +671,7 @@
     "enableReduceColocker": false,
     "enableLock": false,
     "enableColock": false,
-    "enableReleaseColock": false,
+    "enableReleaseColock": true,
     "enableUnlock": true,
     "enableEndJob": true,
     "creator": "admin",

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

@@ -104,6 +104,6 @@ interface RoleDao {
     /**
      * 添加预设角色
      */
-    @Insert(onConflict = OnConflictStrategy.IGNORE)
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
     fun insertRoles(presetSysRole: List<SysRole>)
 }

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

@@ -117,12 +117,12 @@ interface WorkflowStepDao {
     /**
      * 添加预设流程模式步骤
      */
-    @Insert(onConflict = OnConflictStrategy.IGNORE)
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
     fun insertPresetSteps(presetWorkflowStep: List<WorkflowStep>)
 
     /**
      * 添加预设流程模式
      */
-    @Insert(onConflict = OnConflictStrategy.IGNORE)
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
     fun insertWorkflowModes(presetWorkflowMode: List<WorkflowMode>)
 }

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

@@ -205,7 +205,7 @@ abstract class BleQueueDispatcher {
      * 工具方法
      */
     fun isConnecting(mac: String): Boolean = activeMacs.containsKey(mac)
-    fun getConnectedAndConnecting(): List<String> = (activeMacs.keys + connectedMacs) as List<String>
+    fun getConnectedAndConnecting(): List<String> = activeMacs.keys.toList() + connectedMacs
     fun isQueued(mac: String): Boolean = taskQueue.any { it.first == mac }
     fun isConnected(mac: String): Boolean = connectedMacs.contains(mac)
     fun canConnect(): Boolean = (activeMacs.size + connectedMacs.size) <= maxConnections