[6.0.0] 取消2分钟倒计时

OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt

@@ -69,7 +69,7 @@ class TaxiCurrentTaskFragment : BaseFragment(),
 
     private lateinit var mViewModel: TaxiCurrentTaskViewModel
 
-    private var prepareTasCountDownTimer: CountDownTimer? = null
+    private var mPrepareTasCountDownTimer: CountDownTimer? = null
 
     companion object {
         const val TAG = M_TAXI + "TaxiCurrentTaskFragment"
@@ -163,9 +163,7 @@ class TaxiCurrentTaskFragment : BaseFragment(),
                         if (taskAndOrderUiState.driveToNearestStationTask != null) {
                             updateViewByDriveToNearestStationTask(taskAndOrderUiState.driveToNearestStationTask)
                         } else {
-                            prepareTaskCountdownTv.visibility = View.GONE
-                            prepareTasCountDownTimer?.cancel()
-                            prepareTasCountDownTimer = null
+                            updatePrepareTaskDelay120SUI(false)
                             initContainerView(false)
                             removeAllMapMarker()
                         }
@@ -193,7 +191,7 @@ class TaxiCurrentTaskFragment : BaseFragment(),
 
                     is TaskWithOrderUIState.UpdatePrepareTaskDelay120S -> {
                         if (taskAndOrderUiState.isStart){
-                            updatePrepareTaskDelay120SUI()
+                            updatePrepareTaskDelay120SUI(true)
                         }
                     }
                 }
@@ -204,9 +202,17 @@ class TaxiCurrentTaskFragment : BaseFragment(),
     /**
      * 更新120s倒计时
      */
-    private fun updatePrepareTaskDelay120SUI() {
+    private fun updatePrepareTaskDelay120SUI(isStart: Boolean) {
+
+        if (!isStart){
+            prepareTaskCountdownTv.visibility  = View.GONE
+            mPrepareTasCountDownTimer?.cancel()
+            mPrepareTasCountDownTimer = null
+            return
+        }
+
         prepareTaskCountdownTv.visibility  = View.VISIBLE
-        prepareTasCountDownTimer = object : CountDownTimer(TIMER_PREPARE_TASK_INTERVAL_120S, 1000L) {// 5倒计时后开启自驾
+        mPrepareTasCountDownTimer = object : CountDownTimer(TIMER_PREPARE_TASK_INTERVAL_120S, 1000L) {// 5倒计时后开启自驾
 
             @SuppressLint("SetTextI18n")
             override fun onTick(millisUntilFinished: Long) {
@@ -222,11 +228,11 @@ class TaxiCurrentTaskFragment : BaseFragment(),
                 UiThreadHandler.post {
                     prepareTaskCountdownTv.visibility  = View.GONE
                 }
-                prepareTasCountDownTimer?.cancel()
+                mPrepareTasCountDownTimer?.cancel()
             }
         }
 
-        prepareTasCountDownTimer?.start()
+        mPrepareTasCountDownTimer?.start()
     }
 
     private fun updateViewByDriveToNearestStationTask(driveToNearestStationTask: StartServiceRespBean.Result?) {
@@ -379,6 +385,7 @@ class TaxiCurrentTaskFragment : BaseFragment(),
                 taskTypeTv.text = resources.getString(R.string.task_exercise)
                 startStationName.text = startSite.siteName
                 endStationName.text = endSite.siteName
+                updatePrepareTaskDelay120SUI(false)
                 updateStartAndEndStationPointByStatus(true)
             }
 
@@ -459,6 +466,7 @@ class TaxiCurrentTaskFragment : BaseFragment(),
     }
 
     private fun updateOrderUI(order: OrderDetail) {
+        updatePrepareTaskDelay120SUI(false)
         taskTypeTv.text = resources.getString(R.string.task_order)
         taskTypeTv.background =
             ContextCompat.getDrawable(
@@ -587,8 +595,7 @@ class TaxiCurrentTaskFragment : BaseFragment(),
 
     override fun onDestroyView() {
         AmapNaviToDestinationModel.getInstance(context).destroyAmaNavi()
-        prepareTasCountDownTimer?.cancel()
-        prepareTasCountDownTimer = null
+        updatePrepareTaskDelay120SUI(false)
         super.onDestroyView()
     }