refactor(更新) :

- 提示增加，版本修改

app/build.gradle

@@ -19,7 +19,7 @@ android {
         minSdk 24
         targetSdk 34
         versionCode 1
-        versionName "1.0"
+        versionName "1.0.0"
 
         multiDexEnabled true
 

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

@@ -9,9 +9,9 @@ import com.grkj.iscs.model.vo.system.SystemAttributePageRespVO
 import com.grkj.iscs.model.vo.ticket.LockPointUpdateReqVO
 import com.grkj.iscs.model.vo.user.UserInfoRespVO
 import com.grkj.iscs.util.log.LogUtil
+import com.grkj.iscs.view.step_mode.StepModeEnums
 import com.sik.sikcore.extension.getMMKVData
 import com.sik.sikcore.extension.saveMMKVData
-import com.sik.sikcore.extension.toJson
 import com.tencent.mmkv.MMKV
 
 object SPUtils {
@@ -127,7 +127,7 @@ object SPUtils {
 
     fun getStepMode(context: Context): Int {
         val sp = context.getSharedPreferences(SP_CONFIG_NAME, Context.MODE_PRIVATE)
-        return sp.getInt(KEY_STEP_MODE, 0)
+        return sp.getInt(KEY_STEP_MODE, StepModeEnums.STEP_MODE_TWO.type)
     }
 
     fun saveUpdateLockPoint(context: Context, list: MutableList<LockPointUpdateReqVO>) {

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

@@ -18,6 +18,7 @@ import com.grkj.iscs.model.Constants.USER_ROLE_DRAWER
 import com.grkj.iscs.model.Constants.USER_ROLE_GUARD
 import com.grkj.iscs.model.Constants.USER_ROLE_LOCKER
 import com.grkj.iscs.model.DeviceConst
+import com.grkj.iscs.model.ISCSDomainData
 import com.grkj.iscs.model.eventmsg.DeviceExceptionMsg
 import com.grkj.iscs.model.eventmsg.MsgEvent
 import com.grkj.iscs.model.eventmsg.MsgEventConstants.MSG_EVENT_DEVICE_EXCEPTION
@@ -54,6 +55,7 @@ class HomeActivity : BaseMvpActivity<IHomeView, HomePresenter, ActivityHomeBindi
         get() = ActivityHomeBinding.inflate(layoutInflater)
 
     override fun initView() {
+        ISCSDomainData.isDeviceRegistration = false
         presenter?.registerStatusListener()
         presenter?.updateKeyData()
         presenter?.getAndSaveCabinetId()
@@ -191,7 +193,7 @@ class HomeActivity : BaseMvpActivity<IHomeView, HomePresenter, ActivityHomeBindi
                 }
                 if (cardNo == null) {
                     ToastUtils.tip(R.string.card_invalid)
-                    return  super.dispatchKeyEvent(event)
+                    return super.dispatchKeyEvent(event)
                 }
                 LogUtil.i("Swipe card home: $cardNo")
                 cardNoLiveData.postValue(cardNo)

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

@@ -241,15 +241,6 @@ class JobProgressFragment(val goBack: () -> Unit, val changePage: (PageChangeBO)
         }
     }
 
-    private fun clearPage() {
-        mPointList.clear()
-        mBinding?.rvPoint?.adapter?.notifyDataSetChanged()
-        mUserList.clear()
-        mBinding?.rvColocker?.adapter?.notifyDataSetChanged()
-        mBinding?.tvWorker?.text = "0/0/0"
-        mBinding?.tvLock?.text = "0/0/0"
-    }
-
     /**
      * 共锁和解除共锁
      */
@@ -411,7 +402,7 @@ class JobProgressFragment(val goBack: () -> Unit, val changePage: (PageChangeBO)
 
             6 -> {
                 mBinding?.llTip?.visibility = View.VISIBLE
-                mBinding?.tvTip?.text = getString(R.string.please_do_colock)
+                mBinding?.tvTip?.text = getString(R.string.please_do_colock_and_remove_colock)
             }
 
             7 -> {

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

@@ -20,17 +20,16 @@ import com.grkj.iscs.model.vo.ticket.LotoMapRespVO
 import com.grkj.iscs.model.vo.ticket.StepDetailRespVO
 import com.grkj.iscs.model.vo.ticket.TicketDetailRespVO
 import com.grkj.iscs.util.BitmapUtil
+import com.grkj.iscs.util.CommonUtils
 import com.grkj.iscs.util.SPUtils
 import com.grkj.iscs.util.ToastUtils
 import com.grkj.iscs.util.log.LogUtil
-import com.grkj.iscs.util.release
 import com.grkj.iscs.view.base.BaseMvpFragment
 import com.grkj.iscs.view.dialog.TipDialog
 import com.grkj.iscs.view.iview.IStepView
 import com.grkj.iscs.view.presenter.StepPresenter
 import com.grkj.iscs.view.widget.CustomStationLayer
 import com.onlylemi.mapview.library.MapViewListener
-import com.sik.sikcore.thread.ThreadUtils
 import com.zhy.adapter.recyclerview.CommonAdapter
 import com.zhy.adapter.recyclerview.base.ViewHolder
 
@@ -109,7 +108,6 @@ class StepFragment(val goBack: () -> Unit, val changePage: (PageChangeBO) -> Uni
                     }
                 }
             }
-
         mBinding?.cbBack?.setOnClickListener { goBack() }
         initMap()
         mBinding?.cbAction?.setOnClickListener {
@@ -254,6 +252,8 @@ class StepFragment(val goBack: () -> Unit, val changePage: (PageChangeBO) -> Uni
                 "${it?.get(2)?.lockNum}/${it?.get(4)?.lockNum}/${it?.get(7)?.lockNum}"
             mStepList.forEach { step ->
                 step.stepDetail = it?.find { it.stepIndex == step.index }
+                step.title =
+                    it?.find { it.stepIndex == step.index }?.androidStepContent ?: step.title
             }
             mBinding?.rvStep?.adapter?.notifyDataSetChanged()
             it?.filter { it.stepStatus == "1" }?.maxByOrNull { it.stepIndex!! }?.stepIndex?.let {
@@ -371,7 +371,7 @@ class StepFragment(val goBack: () -> Unit, val changePage: (PageChangeBO) -> Uni
         when (step) {
             3 -> {
                 if (presenter?.canModifyColocker(requireContext(), step) == false) {
-                    ToastUtils.tip(R.string.current_step_can_not_be_process)
+                    ToastUtils.tip(R.string.current_step_can_not_modify_colocker)
                     return
                 }
                 changePage(
@@ -387,7 +387,6 @@ class StepFragment(val goBack: () -> Unit, val changePage: (PageChangeBO) -> Uni
 
             4 -> {
                 if (mStep != 3) {
-                    ToastUtils.tip(R.string.current_step_can_not_be_process)
                     return
                 }
                 updateStep(4)
@@ -395,7 +394,12 @@ class StepFragment(val goBack: () -> Unit, val changePage: (PageChangeBO) -> Uni
 
             5, 6, 7, 8 -> {
                 if (mStep != step - 1) {
-                    ToastUtils.tip(R.string.current_step_can_not_be_process)
+                    ToastUtils.tip(
+                        getString(
+                            R.string.please_done_operation,
+                            mStepList.find { it.index == mStep+1 }?.title
+                        )
+                    )
                     return
                 }
                 updateStep(step)
@@ -562,7 +566,7 @@ class StepFragment(val goBack: () -> Unit, val changePage: (PageChangeBO) -> Uni
 
     data class StepBO(
         val pic: Int,
-        val title: String,
+        var title: String,
         val index: Int,
         val indexStr: String,
         var stepDetail: StepDetailRespVO? = null

app/src/main/java/com/grkj/iscs/view/step_mode/StepMode2.kt

@@ -9,6 +9,7 @@ import com.grkj.iscs.model.vo.ticket.TicketDetailMonitorRespVO
 import com.grkj.iscs.model.vo.ticket.TicketDetailRespVO
 import com.grkj.iscs.model.vo.ticket.TicketUserReqVO
 import com.grkj.iscs.model.vo.user.UserListRespVO
+import com.grkj.iscs.util.CommonUtils
 import com.grkj.iscs.util.NetApi
 import com.grkj.iscs.util.log.LogUtil
 
@@ -41,30 +42,29 @@ class StepMode2 : IStepMode {
     override fun checkCanContinue(step: Int, mTicketDetailData: TicketDetailRespVO?): String {
         return when (step) {
             5 -> {
-                if (mTicketDetailData?.ticketUserVOList?.filter { it.userRole == Constants.USER_ROLE_COLOCKER }
-                        ?.all { it.jobStatus!! >= 4 } == true) {
-                    ""
+                if (mTicketDetailData?.ticketPointsVOList?.any { it.pointStatus == "0" } == true) {
+                    CommonUtils.getStr(R.string.please_go_locking).toString()
+                } else if (mTicketDetailData?.ticketUserVOList?.filter { it.userRole == Constants.USER_ROLE_COLOCKER }
+                        ?.any { it.jobStatus!! < 4 } == true) {
+                    CommonUtils.getStr(R.string.please_do_colock)
+                        .toString()
                 } else {
-                    ContextCompat.getString(
-                        MyApplication.instance?.applicationContext!!,
-                        R.string.please_done_lock_action_and_colock_action
-                    )
+                    ""
                 }
             }
 
             8 -> {
-                //交叉作业要检查非不可解锁的区域外的所有区域的锁状态
                 if (mTicketDetailData?.ticketUserVOList?.filter { it.userRole == Constants.USER_ROLE_COLOCKER }
-                        ?.all { it.jobStatus!! == 5 } == true && mTicketDetailData.ticketPointsVOList?.filter {
+                        ?.any { it.jobStatus!! != 5 } == true) {
+                    CommonUtils.getStr(R.string.please_do_remove_colock)
+                        .toString()
+                } else if (mTicketDetailData?.ticketPointsVOList?.filter {
                         it.pointId !in (mTicketDetailData.noUnlockTicketPointsVOSet?.map { it.pointId }
                             ?: mutableListOf())
-                    }?.all { it.pointStatus == "2" } == true) {
-                    ""
+                    }?.any { it.pointStatus != "2" } == true) {
+                    CommonUtils.getStr(R.string.please_go_unlocking).toString()
                 } else {
-                    ContextCompat.getString(
-                        MyApplication.instance?.applicationContext!!,
-                        R.string.please_done_all_unlock_action
-                    )
+                    ""
                 }
             }
 
@@ -182,7 +182,7 @@ class StepMode2 : IStepMode {
     }
 
     override fun canPreOpenKeyCharge(step: Int): Boolean {
-        return when(step){
+        return when (step) {
             4, 5, 7 -> true
             else -> false
         }

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

@@ -268,7 +268,9 @@
     <string name="allocating_worker_tip">Please assign locker and co-locker</string>
     <string name="please_go_locking">Please have locker perform locking operation</string>
     <string name="please_return_key_after_locking">Please have locker return the key after locking</string>
-    <string name="please_do_colock">Please have co-locker perform co-lock and remove co-lock after work</string>
+    <string name="please_do_colock_and_remove_colock">Please have co-locker perform co-lock and remove co-lock after work</string>
+    <string name="please_do_colock">Please have co-locker perform co-lock</string>
+    <string name="please_do_remove_colock">Please have co-locker remove co-lock</string>
     <string name="please_go_unlocking">Please have locker perform unlocking operation</string>
     <string name="please_return_key_after_unlocking">Please have locker return the key after unlocking</string>
     <string name="face_active_fail">Face recognition activation failed</string>
@@ -382,4 +384,6 @@
     <string name="already_registration_device_tip">%1$d keys and %2$d padlocks have been entered</string>
     <string name="registration_device_error">entered error</string>
     <string name="device_registration_scan_result_tip">Identified unrecorded keys (%1$d) and padlocks (%2$d).</string>
+    <string name="current_step_can_not_modify_colocker">Current step can not modify co-locker</string>
+    <string name="please_done_operation">Please done operation %s first</string>
 </resources>

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

@@ -268,7 +268,9 @@
     <string name="allocating_worker_tip">请设置上锁人和共锁人</string>
     <string name="please_go_locking">请上锁员执行去上锁操作</string>
     <string name="please_return_key_after_locking">请上锁员完成上锁后，归还钥匙</string>
-    <string name="please_do_colock">请共锁人进行共锁，并在工作完成后解除共锁</string>
+    <string name="please_do_colock_and_remove_colock">请共锁人进行共锁，并在工作完成后解除共锁</string>
+    <string name="please_do_colock">请共锁人进行共锁</string>
+    <string name="please_do_remove_colock">请共锁人解除共锁</string>
     <string name="please_go_unlocking">请上锁员执行去解锁操作</string>
     <string name="please_return_key_after_unlocking">请上锁员完成解锁后，归还钥匙</string>
     <string name="face_active_fail">人脸识别激活失败</string>
@@ -382,4 +384,6 @@
     <string name="already_registration_device_tip">已录入%1$d把钥匙与%2$d把挂锁</string>
     <string name="registration_device_error">录入失败</string>
     <string name="device_registration_scan_result_tip">已识别未录入的钥匙 （%1$d把）与挂锁（%2$d把）。</string>
+    <string name="current_step_can_not_modify_colocker">当前步骤无法修改共锁人</string>
+    <string name="please_done_operation">请先完成%s</string>
 </resources>

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

@@ -268,7 +268,9 @@
     <string name="allocating_worker_tip">请设置上锁人和共锁人</string>
     <string name="please_go_locking">请上锁员执行去上锁操作</string>
     <string name="please_return_key_after_locking">请上锁员完成上锁后，归还钥匙</string>
-    <string name="please_do_colock">请共锁人进行共锁，并在工作完成后解除共锁</string>
+    <string name="please_do_colock_and_remove_colock">请共锁人进行共锁，并在工作完成后解除共锁</string>
+    <string name="please_do_colock">请共锁人进行共锁</string>
+    <string name="please_do_remove_colock">请共锁人解除共锁</string>
     <string name="please_go_unlocking">请上锁员执行去解锁操作</string>
     <string name="please_return_key_after_unlocking">请上锁员完成解锁后，归还钥匙</string>
     <string name="face_active_fail">人脸识别激活失败</string>
@@ -382,4 +384,6 @@
     <string name="already_registration_device_tip">已录入%1$d把钥匙与%2$d把挂锁</string>
     <string name="registration_device_error">录入失败</string>
     <string name="device_registration_scan_result_tip">已识别未录入的钥匙 （%1$d把）与挂锁（%2$d把）。</string>
+    <string name="current_step_can_not_modify_colocker">当前步骤无法修改共锁人</string>
+    <string name="please_done_operation">请先完成%s</string>
 </resources>