[6.0.0] 演练任务结束2分钟内接到运营单, 120s任务调用重复问题

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

@@ -215,6 +215,7 @@ class TaxiCurrentTaskViewModel : BaseViewModel<UnmannedState, TaskUiIntent>(),
     override fun onTaskCompleted(isOrderArrivedAtStart: Boolean, siteId: Long) {
         d(TAG, "onTaskCompleted: isOrderArrivedAtStart=$isOrderArrivedAtStart, siteId=$siteId")
         if (isOrderArrivedAtStart) {
+            TaxiTaskModel.removePrepareTaskDelay120S()
             TaxiTaskModel.prepareNextTask(siteId)
         } else {
             TaxiTaskModel.startPrepareTaskDelay120S(siteId)

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

@@ -909,14 +909,7 @@ object TaxiTaskModel {
     }
 
     fun startPrepareTaskDelay120S(siteId: Long) {
-        if (mPrepareTaskDelay120SRunnable != null){
+        removePrepareTaskDelay120S()
-            DebugView.printInfoMsg("[PrepareNextTask] removeCallbacks prepareNextTask120s")
-            UiThreadHandler.removeCallbacks(mPrepareTaskDelay120SRunnable)
-            mTaxiTaskWithOrderCallbackMap.forEach {
-                val listener = it.value
-                listener.onStartPrepareTask120s(false)
-            }
-        }
 
         if (mPrepareTaskDelay120SRunnable == null){
             mPrepareTaskDelay120SRunnable = Runnable {
@@ -932,6 +925,17 @@ object TaxiTaskModel {
         UiThreadHandler.postDelayed(mPrepareTaskDelay120SRunnable, TaxiUnmannedConst.TIMER_PREPARE_TASK_INTERVAL_120S)
     }
 
+    fun removePrepareTaskDelay120S() {
+        if (mPrepareTaskDelay120SRunnable != null){
+            DebugView.printInfoMsg("[PrepareNextTask] removeCallbacks prepareNextTask120s")
+            UiThreadHandler.removeCallbacks(mPrepareTaskDelay120SRunnable)
+            mTaxiTaskWithOrderCallbackMap.forEach {
+                val listener = it.value
+                listener.onStartPrepareTask120s(false)
+            }
+        }
+    }
+
     /**
      * 查询当前任务的轨迹
      */