完成共锁人共锁/解锁功能；登录初始化时间拉长到50秒

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

@@ -181,4 +181,9 @@ object UrlConsts {
      * 八大步骤执行
      */
     const val UPDATE_STEP = "/iscs/step/updateJobStep"
+
+    /**
+     * 共锁人上锁/解锁
+     */
+    const val UPDATE_COLOCKER_STATUS = "/iscs/hardware-api/updateColockerStatus"
 }

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

@@ -699,4 +699,26 @@ object NetApi {
             }, isGet = false, isAuth = true
         )
     }
+
+    /**
+     * 共锁人上锁/解锁
+     */
+    fun updateColockerStatus(ticketId: Long, cardNfc: String, jobStatus: String, callBack: (Boolean) -> Unit) {
+        NetHttpManager.getInstance().doRequestNet(
+            UrlConsts.UPDATE_COLOCKER_STATUS,
+            false,
+            mapOf(
+                "ticketId" to ticketId,
+                "cardNfc" to cardNfc,
+                "jobStatus" to jobStatus
+            ),
+            { res, _, _ ->
+                res?.let {
+                    callBack.invoke(true)
+                } ?: run {
+                    callBack.invoke(false)
+                }
+            }, isGet = false, isAuth = true
+        )
+    }
 }

app/src/main/java/com/grkj/iscs/view/activity/LoginActivity.kt

@@ -3,9 +3,12 @@ package com.grkj.iscs.view.activity
 import android.content.Intent
 import android.widget.ImageView
 import com.bumptech.glide.Glide
+import com.grkj.iscs.BusinessManager
 import com.grkj.iscs.R
 import com.grkj.iscs.databinding.ActivityLoginBinding
+import com.grkj.iscs.modbus.ModBusController
 import com.grkj.iscs.util.AppUtils
+import com.grkj.iscs.util.Executor
 import com.grkj.iscs.view.base.BaseMvpActivity
 import com.grkj.iscs.view.dialog.LoginDialog
 import com.grkj.iscs.view.iview.ILoginView
@@ -43,11 +46,11 @@ class LoginActivity : BaseMvpActivity<ILoginView, LoginPresenter, ActivityLoginB
             }
 
         // TODO 只适配armeabi-v7a
-//        handleLoading(true, resources.getString(R.string.device_is_initializing))
-//        BusinessManager.connectDock(true)
-//        Executor.delayOnMain(2000) {
-//            handleLoading(false)
-//        }
+        handleLoading(true, resources.getString(R.string.device_is_initializing))
+        BusinessManager.connectDock(true)
+        Executor.delayOnMain(50000) {
+            handleLoading(false)
+        }
     }
 
     /**

app/src/main/java/com/grkj/iscs/view/fragment/JobProgressFragment.kt

@@ -123,7 +123,9 @@ class JobProgressFragment(val goBack: () -> Unit) :
                 mTipDialog?.setTip(getString(R.string.confirm_to_uncolock, it.userName))
             }
             mTipDialog?.setConfirmListener {
-                // TODO 共锁人刷卡接口
+                presenter?.updateColockerStatus(mPageChangeBO?.ticketId!!, cardNo, if (jobStatus < 4) "4" else "5") {
+
+                }
             }
             mTipDialog?.showCancelCountdown(10)
         }

app/src/main/java/com/grkj/iscs/view/presenter/JobProgressPresenter.kt

@@ -60,6 +60,14 @@ class JobProgressPresenter : BasePresenter<IJobProgressVIew>() {
             }
         }
     }
+
+    fun updateColockerStatus(ticketId: Long, cardNfc: String, jobStatus: String, callBack: (Boolean) -> Unit) {
+        NetApi.updateColockerStatus(ticketId, cardNfc, jobStatus) {
+            Executor.runOnMain {
+                callBack(it)
+            }
+        }
+    }
     
     /**
      * 上锁人上锁流程