瀏覽代碼

refactor(更新) :
- 作业已结束弹窗按钮确定返回首页

周文健 5 月之前
父節點
當前提交
f2c3098eae

+ 5 - 2
app/src/main/java/com/grkj/iscs/view/fragment/JobExecutionFragment.kt

@@ -30,12 +30,15 @@ class JobExecutionFragment(val changePageCallback: (PageChangeBO) -> Unit) :
             Menu(fragment = WorkerFragment({ refreshPage(mPageChangeBO!!) }) {
                 changePage(it)
             }),
-            Menu(fragment = JobProgressFragment { refreshPage(mPageChangeBO!!) })
+            Menu(fragment = JobProgressFragment({ refreshPage(mPageChangeBO!!) }) {
+                changePage(it)
+            })
         )
 
         mBinding?.vp?.isUserInputEnabled = false
         mBinding?.vp?.offscreenPageLimit = mMenuList.size
-        mBinding?.vp?.adapter = MenuAdapter(requireActivity().supportFragmentManager, lifecycle, mMenuList)
+        mBinding?.vp?.adapter =
+            MenuAdapter(requireActivity().supportFragmentManager, lifecycle, mMenuList)
 
         (activity as HomeActivity).cardNoLiveData.observeForever {
             if (mBinding?.vp?.currentItem == 2) {

+ 4 - 1
app/src/main/java/com/grkj/iscs/view/fragment/JobProgressFragment.kt

@@ -29,7 +29,7 @@ import com.zhy.adapter.recyclerview.base.ViewHolder
 /**
  * 作业票工作进度页
  */
-class JobProgressFragment(val goBack: () -> Unit) :
+class JobProgressFragment(val goBack: () -> Unit, val changePage: (PageChangeBO) -> Unit) :
     BaseMvpFragment<IJobProgressView, JobProgressPresenter, FragmentJobProgressBinding>() {
 
     private val mPointList = mutableListOf<TicketDetailMonitorRespVO.IsJobTicketPointsVO>()
@@ -202,6 +202,9 @@ class JobProgressFragment(val goBack: () -> Unit) :
                     }
                     mTipDialog?.setType(TipDialog.TYPE_HINT)
                     mTipDialog?.setTip(CommonUtils.getStr(R.string.job_already_finished).toString())
+                    mTipDialog?.setConfirmListener {
+                        changePage(PageChangeBO(-1))
+                    }
                     mTipDialog?.show()
                 }
             }