From 551113e4a1cb57cea4a751f80f16d792dbd94c86 Mon Sep 17 00:00:00 2001
From: aibingbing <aibingbing@zhidaoauto.com>
Date: Tue, 29 Aug 2023 12:07:22 +0800
Subject: [PATCH] =?UTF-8?q?[Taxi=E6=97=A0=E4=BA=BA=E5=8C=96]=20fix:=20?=
 =?UTF-8?q?=E4=B9=98=E5=AE=A2=E5=B1=8F=20=E5=85=B3=E4=BA=8E=20taskType?=
 =?UTF-8?q?=E7=9A=84=E5=88=A4=E6=96=AD=20=E6=9B=B4=E6=96=B0=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../och/taxi/passenger/constant/TaxiPassengerConst.kt     | 1 +
 .../mogo/och/taxi/passenger/model/TaxiPassengerModel.kt   | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/constant/TaxiPassengerConst.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/constant/TaxiPassengerConst.kt
index 18dafa30be..49a0680760 100644
--- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/constant/TaxiPassengerConst.kt
+++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/constant/TaxiPassengerConst.kt
@@ -38,6 +38,7 @@ class TaxiPassengerConst {
         const val EVENT_PARAM_UNABLE_START_REASON = "unable_start_reason"
 
         //任务类型
+        const val TaskType_NONE = 0 // 无任务
         const val TaskType_VIRTUAL = 1 // 虚拟任务
         const val TaskType_DRIVE_TO_START = 2 // 接驾任务
         const val TaskType_DRIVE_TO_END = 3 //送驾任务
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 c34839a75f..161ac6e44e 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
@@ -35,6 +35,8 @@ import com.mogo.och.taxi.passenger.bean.TaxiPassengerOrdersInServiceQueryRespBea
 import com.mogo.och.taxi.passenger.callback.IOCHTaxiPassengerOrderStatusCallback
 import com.mogo.och.taxi.passenger.constant.TaxiPassengerConst
 import com.mogo.och.taxi.passenger.constant.TaxiPassengerConst.Companion.TaskType_DRIVE_TO_END
+import com.mogo.och.taxi.passenger.constant.TaxiPassengerConst.Companion.TaskType_NONE
+import com.mogo.och.taxi.passenger.constant.TaxiPassengerConst.Companion.TaskType_VIRTUAL
 import com.mogo.och.taxi.passenger.constant.TaxiPassengerOrderStatusEnum
 import com.mogo.och.taxi.passenger.constant.TaxiPassengerOrderStatusEnum.Companion.valueOf
 import com.mogo.och.taxi.passenger.network.TaxiPassengerServiceManager
@@ -155,8 +157,10 @@ object TaxiPassengerModel {
             object : OchCommonServiceCallback<TaxiPassengerOrdersInServiceQueryRespBean> {
                 override fun onSuccess(data: TaxiPassengerOrdersInServiceQueryRespBean) {
                     d(M_TAXI_P + TAG, "queryInAndWaitOrders data.data=${GsonUtils.toJson(data.data)}")
-                    //目前后端将一个订单拆分成了多个任务，乘客屏只关心 送驾 类型的任务，这里过滤其他任务避免干扰
-                    if (data.data.taskType != TaskType_DRIVE_TO_END) {
+                    //目前后端将一个订单拆分成了多个任务，乘客屏只关心 送驾 类型的任务
+                    //20230829 后端修改了逻辑，在乘客屏startTask后taskType才会变成3
+                    if (data.data.taskType == TaskType_NONE ||
+                        data.data.taskType == TaskType_VIRTUAL) {
                         d(M_TAXI_P + TAG, "queryInAndWaitOrders data.taskType=${data.data.taskType}, discard data")
                         // 如果上一个是 接驾或送驾任务 下一个是演练任务，需要reset页面状态
                         currentOCHOrder = null