From 5a7e2fd29b215e0f09af70a9ec6199033bd612ce Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Fri, 1 Sep 2023 19:01:04 +0800
Subject: [PATCH] =?UTF-8?q?[6.0.0]=20=E6=BC=94=E7=BB=83=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E7=BB=93=E6=9D=9F2=E5=88=86=E9=92=9F=E5=86=85=E6=8E=A5?=
 =?UTF-8?q?=E5=88=B0=E8=BF=90=E8=90=A5=E5=8D=95,=20120s=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E8=B0=83=E7=94=A8=E9=87=8D=E5=A4=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../taxi/ui/task/TaxiCurrentTaskViewModel.kt  |  1 +
 .../mogo/och/taxi/ui/task/TaxiTaskModel.kt    | 20 +++++++++++--------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskViewModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskViewModel.kt
index 320db28402..5a6f2de027 100644
--- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskViewModel.kt
+++ b/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)
diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt
index e57647c228..13249cd386 100644
--- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt
+++ b/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){
-            DebugView.printInfoMsg("[PrepareNextTask] removeCallbacks prepareNextTask120s")
-            UiThreadHandler.removeCallbacks(mPrepareTaskDelay120SRunnable)
-            mTaxiTaskWithOrderCallbackMap.forEach {
-                val listener = it.value
-                listener.onStartPrepareTask120s(false)
-            }
-        }
+        removePrepareTaskDelay120S()
 
         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)
+            }
+        }
+    }
+
     /**
      * 查询当前任务的轨迹
      */