完成跳转回首页的跳转链

app/src/main/java/com/grkj/iscs/model/bo/PageChangeBO.kt

@@ -1,7 +1,7 @@
 package com.grkj.iscs.model.bo
 
 data class PageChangeBO(
-    val pageIdx: Int,
+    val pageIdx: Int,   // -1为回首页，连续跳转，即车间岗位页
     val workstationId: Long? = null,
     val ticketId: Long? = null,
     val machineryId: Long? = null,

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

@@ -12,7 +12,7 @@ import com.grkj.iscs.view.presenter.JobExecutionPresenter
 /**
  * 作业执行页
  */
-class JobExecutionFragment :
+class JobExecutionFragment(val changePageCallback: (PageChangeBO) -> Unit) :
     BaseMvpFragment<IJobExecutionView, JobExecutionPresenter, FragmentJobExecutionBinding>() {
 
     private lateinit var mMenuList: MutableList<Menu>
@@ -49,6 +49,10 @@ class JobExecutionFragment :
 
     private fun changePage(pageChangeBO: PageChangeBO) {
         LogUtil.i("$pageChangeBO")
+        if (pageChangeBO.pageIdx == -1) {
+            changePageCallback(pageChangeBO)
+            return
+        }
         mBinding?.vp?.currentItem = pageChangeBO.pageIdx
     }
 }

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

@@ -32,7 +32,9 @@ class JobManagementFragment :
             Menu(getString(R.string.technology_sop), R.mipmap.technology, TechnologySopFragment { pageChangeBO ->
                 changePage(pageChangeBO)
             }),
-            Menu(getString(R.string.job_execution), R.mipmap.job_execution, JobExecutionFragment())
+            Menu(getString(R.string.job_execution), R.mipmap.job_execution, JobExecutionFragment { pageChangeBO ->
+                changePage(pageChangeBO)
+            })
         )
 
         mBinding?.vp?.isUserInputEnabled = false
@@ -58,10 +60,11 @@ class JobManagementFragment :
     private fun changePage(pageChangeBO: PageChangeBO) {
         LogUtil.i("$pageChangeBO")
         when (pageChangeBO.pageIdx) {
+            -1 -> (mMenuList[0].fragment as WorkshopFragment).refreshPage()
             1 -> (mMenuList[1].fragment as TechnologySopFragment).refreshPage(pageChangeBO)
             2 -> (mMenuList[2].fragment as JobExecutionFragment).refreshPage(pageChangeBO)
         }
-        mBinding?.vp?.currentItem = pageChangeBO.pageIdx
+        mBinding?.vp?.currentItem = if (pageChangeBO.pageIdx == -1) 0 else pageChangeBO.pageIdx
         mBinding?.rvTab?.adapter?.notifyDataSetChanged()
     }
 

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

@@ -81,7 +81,7 @@ class StepFragment(val goBack: () -> Unit, val changePage: (PageChangeBO) -> Uni
 
         mBinding?.cbCancel?.setOnClickListener {
             presenter?.cancelTicket(mChangePage?.ticketId!!) {
-                // TODO 跳转车间岗位页
+                changePage(PageChangeBO(-1))
             }
         }