完善作业进度页按钮显示逻辑

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

@@ -20,6 +20,7 @@ class JobProgressFragment(val goBack: () -> Unit) :
 
     private val mPointList = mutableListOf<TicketDetailMonitorRespVO.IsJobTicketPointsVO>()
     private val mUserList = mutableListOf<TicketDetailMonitorRespVO.IsJobTicketUser>()
+    private var mStep = 0
 
     override val viewBinding: FragmentJobProgressBinding
         get() = FragmentJobProgressBinding.inflate(layoutInflater)
@@ -74,9 +75,25 @@ class JobProgressFragment(val goBack: () -> Unit) :
         presenter?.getStepDetail(pageChangeBO.ticketId!!) {
             mBinding?.tvWorker?.text = "${it?.get(2)?.userNum}/${it?.get(4)?.userNum}/${it?.get(7)?.userNum}"
             mBinding?.tvLock?.text = "${it?.get(2)?.lockNum}/${it?.get(4)?.lockNum}/${it?.get(7)?.lockNum}"
+
+            it?.filter { it.stepStatus == "1" }?.maxByOrNull { it.stepIndex!! }?.stepIndex?.let {
+                mStep = it
+            }
+            if (mStep == 4) {
+                mBinding?.cbAction?.visibility = View.VISIBLE
+            } else if (mStep == 7) {
+                mBinding?.cbAction?.visibility = View.VISIBLE
+                mBinding?.cbAction?.setIcon(R.mipmap.ticket_unlocked)
+                mBinding?.cbAction?.setText(getString(R.string.go_unlocking))
+            }
         }
     }
 
+    override fun onPause() {
+        super.onPause()
+        mStep = 0
+    }
+
     override fun initPresenter(): JobProgressPresenter {
         return JobProgressPresenter()
     }

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

@@ -88,9 +88,7 @@ class StepFragment(val goBack: () -> Unit, val changePage: (PageChangeBO) -> Uni
             }
         }
 
-        mBinding?.cbBack?.setOnClickListener {
-            goBack()
-        }
+        mBinding?.cbBack?.setOnClickListener { goBack() }
 
         mBinding?.cbAction?.setOnClickListener {
             if (mStep in 1..5) {

app/src/main/res/layout/fragment_job_progress.xml

@@ -23,6 +23,7 @@
         android:layout_alignParentBottom="true"
         android:layout_marginRight="@dimen/common_spacing"
         android:layout_toLeftOf="@id/cb_back"
+        android:visibility="gone"
         app:btn_bg="@drawable/common_btn_red_bg"
         app:btn_icon="@mipmap/ticket_lock"
         app:btn_name="@string/go_locking" />