From de456a71d8fa92558a3d94c2e1a472248a3294ec Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Tue, 22 Aug 2023 18:10:16 +0800
Subject: [PATCH] =?UTF-8?q?[6.0.0]=20=E8=BF=90=E8=90=A5=E5=8D=95=E8=87=AA?=
 =?UTF-8?q?=E9=A9=BE=E5=88=B0=E7=AB=99=E5=88=B0=E7=AB=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/mogo/och/taxi/model/TaxiModel.kt | 25 ++++++++++++++-----
 .../och/taxi/model/TaxiUnmannedViewModel.kt   |  2 +-
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/model/TaxiModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/model/TaxiModel.kt
index d9d4fa52e5..79761fa9ed 100644
--- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/model/TaxiModel.kt
+++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/model/TaxiModel.kt
@@ -625,6 +625,10 @@ object TaxiModel {
      * isArriveEndSite true 终点, false 起点
      */
     fun arriveSite(siteId: Long, isArriveEndSite: Boolean) {
+        i(
+            SceneConstant.M_TAXI + TAG,
+            "arriveSite ${siteId}"
+        )
         arriveSite(mContext!!, siteId, object : OchCommonServiceCallback<BaseData> {
             override fun onSuccess(data: BaseData?) {
                 if (data == null || data.code != 0) return
@@ -732,7 +736,8 @@ object TaxiModel {
             ToastUtils.showShort("无任务！")
             return
         }
-        arriveSite(mCurrentTaskAndOrder?.endSite!!.siteId, true)
+//        arriveSite(mCurrentTaskAndOrder?.endSite!!.siteId, true)
+        arriveTerminal()
     }
 
     fun toStartTask() {
@@ -847,9 +852,13 @@ object TaxiModel {
                     SceneConstant.M_TAXI + TAG,
                     "onAutopilotArriveAtStation = " + arrivalNotification.toString()
                 )
-                if (((arrivalNotification == null) || !checkCurrentTask()
-                            || (getCurOrderStatus() === TaxiOrderStatusEnum.ArriveAtEnd))
-                ) {
+                if (arrivalNotification == null || !checkCurrentTask() ||
+                     mCurrentTaskAndOrder!!.currentStatus == TaskStatusEnum.CompleteTask.code) {
+                    i(
+                        SceneConstant.M_TAXI + TAG,
+                        "onAutopilotArriveAtStation = arrivalNotification or task null" +
+                                "or task currentStatus = ${mCurrentTaskAndOrder!!.currentStatus}"
+                    )
                     return
                 }
                 arriveTerminal()
@@ -869,8 +878,12 @@ object TaxiModel {
         }
 
     private fun arriveTerminal() {
-        if (!checkCurrentOrder()) return
-        val endSite = mCurrentTaskAndOrder!!.order!!.orderEndSite
+        if (!checkCurrentTask()) return
+        i(
+            SceneConstant.M_TAXI + TAG,
+            "onAutopilotArriveAtStation = arriveTerminal() = ${mCurrentTaskAndOrder!!.endSite}"
+        )
+        val endSite = mCurrentTaskAndOrder!!.endSite
         if (endSite != null) {
             arriveSite(endSite.siteId, true)
         }
diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/model/TaxiUnmannedViewModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/model/TaxiUnmannedViewModel.kt
index ba0ecf4e75..eebcaf0ea0 100644
--- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/model/TaxiUnmannedViewModel.kt
+++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/model/TaxiUnmannedViewModel.kt
@@ -315,7 +315,7 @@ class TaxiUnmannedViewModel : BaseViewModel<UnmannedState, UnmannedIntent>(){
 
                             }else{
                                 startPrepareTask120S(result.endSite!!.siteId)
-                                d(TAG, "queryCurrentTaskOnce1 = startPrepareTask30S" )
+                                d(TAG, "queryCurrentTaskOnce1 = startPrepareTask120S" )
 
                             }
                         }