更新虹软ID、Key参数；策略更新：作业票未完成禁止归还钥匙；修复Json解析错误

app/src/main/java/com/grkj/iscs/BusinessManager.kt

@@ -376,25 +376,22 @@ object BusinessManager {
     }
 
     /**
-     * 钥匙归还提示确认弹框
+     * 钥匙归还提示确认弹框，当前策略：作业票未完成禁止归还钥匙
      */
-    private fun showKeyReturnDialog(onConfirm: () -> Unit, onCancel: () -> Unit) {
+    private fun showKeyReturnDialog(onConfirm: () -> Unit) {
         val ctx = ActivityUtils.currentActivity() as BaseActivity<*>
         val dlg = TipDialog(ctx)
         dlg.setTip(ctx.getString(R.string.key_return_tip))
-        // 加个选择判断，如果是直接取消弹框而不是点击“取消”，当成取消
+        dlg.setType(TipDialog.TYPE_CONFIRM)
+        // 加个选择判断，如果是直接取消弹框而不是点击“确定”，当成确定
         var state = 0
         dlg.setConfirmListener {
             state = 1
             onConfirm.invoke()
         }
-        dlg.setCancelListener {
-            state = 2
-            onCancel.invoke()
-        }
         dlg.setOnDismissListener {
             if (state == 0) {
-                onCancel.invoke()
+                onConfirm.invoke()
             }
         }
         dlg.show()
@@ -1154,9 +1151,9 @@ object BusinessManager {
                     handleKeyReturn(bleDevice, workTicketGetBO)
                 }
             } else {
-                showKeyReturnDialog({
-                    handleKeyReturn(bleDevice, workTicketGetBO)
-                }) {
+                // 当前策略：作业票未完成禁止归还钥匙
+                showKeyReturnDialog {
+//                    handleKeyReturn(bleDevice, workTicketGetBO)
                     sendLoadingEventMsg(null, false)
                     ToastUtils.tip(R.string.continue_the_ticket)
                     BleManager.getInstance().disconnect(bleDevice)

app/src/main/java/com/grkj/iscs/model/Constants.kt

@@ -82,8 +82,8 @@ object Constants {
     val mSopTypeList = mutableListOf(SOP_REPAIR, SOP_PRE_MAINTENANCE, SOP_CHANGE_SHIFTS, SOP_CLEAN, SOP_SWITCH_PRODUCT)
 
     /*************************  虹软ArcSoft  *************************/
-    const val APP_ID = "B9dYbnfw5ZDSQjTbN5YTQ16VNUha11vgDQAsqx3t8JLF"
-    const val SDK_KEY = "6qqWaHLhMAqsXtqiBZ7imDyzcc7tYpqeBenbv1HWMicc"
+    const val APP_ID = "6Hkb4JK1E1efeYbqY8T1jQVJqYWHcNcPRZKBf3oVtR5c"
+    const val SDK_KEY = "BpeNqNu9xtsKFKWv9EhYuufXkwQcvKSnTv7PK5B55A9Z"
 
     /*************************  作业票类型  *************************/
     data class TicketType(val type: Int, val key: String)

app/src/main/java/com/grkj/iscs/util/ArcSoftUtil.kt

@@ -50,24 +50,24 @@ object ArcSoftUtil {
         when (activeCode) {
             ErrorInfo.MOK -> {
                 isActivated = true
-                LogUtil.i("initEngine : active success")
+                LogUtil.i("checkActiveStatus : active success")
             }
 
             ErrorInfo.MERR_ASF_ALREADY_ACTIVATED -> {
                 isActivated = true
-                LogUtil.i("initEngine : already activated")
+                LogUtil.i("checkActiveStatus : already activated")
             }
 
             else -> {
                 isActivated = false
-                LogUtil.e("initEngine : active failed $activeCode")
+                LogUtil.e("checkActiveStatus : active failed $activeCode")
                 ToastUtils.tip(R.string.face_active_fail)
             }
         }
         val activeFileInfo = ActiveFileInfo()
         val res = FaceEngine.getActiveFileInfo(context, activeFileInfo)
         if (res == ErrorInfo.MOK) {
-            LogUtil.i("initEngine:  getActiveFileInfo: $activeFileInfo")
+            LogUtil.i("checkActiveStatus:  getActiveFileInfo: $activeFileInfo")
         }
     }
 

app/src/main/java/com/grkj/iscs/util/SPUtils.kt

@@ -152,7 +152,7 @@ object SPUtils {
         }
         try {
             val tempList: MutableList<UpdateKeyReturnBO> =
-                Gson().fromJson(listJson, object : TypeToken<UpdateKeyReturnBO>() {}.type)
+                Gson().fromJson(listJson, object : TypeToken<MutableList<UpdateKeyReturnBO>>() {}.type)
             return tempList
         } catch (e: Exception) {
             LogUtil.e("${e.message}")

app/src/main/res/values/strings.xml

@@ -69,7 +69,7 @@
 
     <string name="make_sure_to_colock">确定要共锁吗？</string>
     <string name="make_sure_to_unlock">确定要解锁吗？</string>
-    <string name="key_return_tip">作业票尚未完成，是否确认归还钥匙？</string>
+    <string name="key_return_tip">作业票尚未完成，禁止归还钥匙</string>
 
     <!--  演示页  -->
     <string name="presentation_select_sop">选择SOP</string>