From 03003eaea937c00fa052de057cf5bb90afc9b824 Mon Sep 17 00:00:00 2001
From: aibingbing <aibingbing@zhidaoauto.com>
Date: Wed, 30 Aug 2023 16:20:32 +0800
Subject: [PATCH] =?UTF-8?q?[Taxi=E6=97=A0=E4=BA=BA=E5=8C=96]=20fix:=20?=
 =?UTF-8?q?=E6=BC=94=E7=BB=83=E7=B1=BB=E5=9E=8B=E8=AE=A2=E5=8D=95=20?=
 =?UTF-8?q?=E4=B9=98=E5=AE=A2=E5=B1=8F=E9=A1=B5=E9=9D=A2=E6=B2=A1=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0=E9=97=AE=E9=A2=98=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../och/taxi/passenger/model/TaxiPassengerModel.kt    | 11 +++++++----
 .../passenger/presenter/BaseTaxiPassengerPresenter.kt | 10 ++++++++++
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.kt
index 6e5a910e77..31c9433bf2 100644
--- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.kt
+++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.kt
@@ -170,8 +170,11 @@ object TaxiPassengerModel {
                             "queryInAndWaitOrders data.taskType=${data.data.taskType}, discard data"
                         )
                         // 如果上一个是 接驾或送驾任务 下一个是演练任务，需要reset页面状态
-                        currentOCHOrder = null
-                        orderStatusChange()
+                        if (currentOCHOrder != null) {
+                            currentOCHOrder?.orderStatus = TaxiPassengerOrderStatusEnum.None.code
+                            orderStatusChange()
+                            currentOCHOrder = null
+                        }
                         return
                     }
                     if (data.data?.order == null) {
@@ -194,8 +197,8 @@ object TaxiPassengerModel {
                             if (currentOCHOrder?.orderStatus == TaxiPassengerOrderStatusEnum.UserArriveAtStart.code
                                 && currentOrder.orderStatus < TaxiPassengerOrderStatusEnum.UserArriveAtStart.code
                             ) {
-                              // 0830 UserArriveAtStart 状态是乘客屏本地在用户验证后本地设置，而且因为后端查询数据有延迟
-                              // 这里过下过滤，如果当前是UserArriveAtStart 且后端返回是之前状态，不更新数据
+                                // 0830 UserArriveAtStart 状态是乘客屏本地在用户验证后本地设置，而且因为后端查询数据有延迟
+                                // 这里过下过滤，如果当前是UserArriveAtStart 且后端返回是之前状态，不更新数据
                             } else {
                                 currentOCHOrder = currentOrder
                                 orderStatusChange()
diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.kt
index 88c3ad387a..185ba822d9 100644
--- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.kt
+++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.kt
@@ -66,6 +66,14 @@ class BaseTaxiPassengerPresenter(view: TaxiPassengerBaseFragment?) :
         order?.let {
             setItineraryVisibility()
             when (TaxiPassengerModel.curOrderStatus) {
+                TaxiPassengerOrderStatusEnum.OnTheWayToStart -> {
+                    // 10 接驾中
+                    mView?.showOrHideStartAutopilotView(isShow = false)
+                    mView?.showOrHidePressengerCheckPager(isShow = false)
+                    mView?.showOrHideArrivedEndLayout(isShow = false)
+                    overMapViewClear()
+                }
+
                 TaxiPassengerOrderStatusEnum.ArriveAtStart -> {
                     // 20 司机到达上车点
                     mView?.showOrHideArrivedEndLayout(isShow = false)
@@ -104,6 +112,7 @@ class BaseTaxiPassengerPresenter(view: TaxiPassengerBaseFragment?) :
                     mView?.showOrHideArrivedEndLayout(false)
                     overMapViewClear()
                 }
+
                 TaxiPassengerOrderStatusEnum.Cancel -> {
                     // 70 取消订单
                     mView?.showOrHideStartAutopilotView(isShow = false)
@@ -111,6 +120,7 @@ class BaseTaxiPassengerPresenter(view: TaxiPassengerBaseFragment?) :
                     mView?.showOrHideArrivedEndLayout(isShow = false)
                     overMapViewClear()
                 }
+
                 TaxiPassengerOrderStatusEnum.None -> {
                     // 00 默认状态，在不同任务之间切换时使用
                     mView?.showOrHideStartAutopilotView(isShow = false)