完成步骤更新相关操作

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

@@ -95,11 +95,11 @@ class StepFragment(val goBack: () -> Unit, val changePage: (PageChangeBO) -> Uni
         mBinding?.cbAction?.setOnClickListener {
             if (mStep in 1..5) {
                 presenter?.cancelTicket(mChangePage?.ticketId!!) {
-                    changePage(PageChangeBO(-1))
+                    if (it) changePage(PageChangeBO(-1))
                 }
             } else if (mStep == 8) {
                 presenter?.finishTicket(mChangePage?.ticketId!!) {
-
+                    if (it) changePage(PageChangeBO(-1))
                 }
             }
         }
@@ -154,23 +154,44 @@ class StepFragment(val goBack: () -> Unit, val changePage: (PageChangeBO) -> Uni
     private fun handleStep(step: Int) {
         when (step) {
             3 -> {
+                if (mStep == 0 || mStep > 5) return
                 changePage(PageChangeBO(1, mChangePage?.workstationId, mChangePage?.ticketId, mChangePage?.machineryId, mChangePage?.machineryName))
             }
             4 -> {
-                if (mStep == 0) {
-                    return
-                }
-                mTipDialog.setTip(getString(R.string.action_confirm_shut_down))
-                mTipDialog.setConfirmListener {
-                    presenter?.updateStep(mStepList[2].stepDetail?.stepId!!, "1") {
-                        presenter?.updateStep(mStepList[3].stepDetail?.stepId!!, "1") {
-                            refreshPage(mChangePage!!)
-                        }
+                if (mStep == 0 || mStep >= 4) return
+                updateStep(4)
+            }
+            5, 6, 7, 8 -> {
+                if (mStep == 0 || mStep != step - 1) return
+                updateStep(step)
+            }
+        }
+    }
+
+    private fun updateStep(step: Int) {
+        val str = when (step) {
+            4 -> getString(R.string.action_confirm_shut_down)
+            5 -> getString(R.string.action_confirm_lock)
+            6 -> getString(R.string.action_confirm_power_isolation)
+            7 -> getString(R.string.action_confirm_check_before_unlocking)
+            8 -> getString(R.string.action_confirm_restore)
+            else -> ""
+        }
+        mTipDialog.setTip(str)
+        mTipDialog.setConfirmListener {
+            if (step == 4) {
+                presenter?.updateStep(mStepList[2].stepDetail?.stepId!!, "1") {
+                    presenter?.updateStep(mStepList[3].stepDetail?.stepId!!, "1") {
+                        refreshPage(mChangePage!!)
                     }
                 }
-                mTipDialog.show()
+            } else {
+                presenter?.updateStep(mStepList.find { it.index == step }?.stepDetail?.stepId!!, "1") {
+                    refreshPage(mChangePage!!)
+                }
             }
-         }
+        }
+        mTipDialog.show()
     }
 
     override fun onPause() {