From f4cc4120dc72e64f90779ed38bfdb381890a7c15 Mon Sep 17 00:00:00 2001
From: aibingbing <aibingbing@zhidaoauto.com>
Date: Tue, 5 Sep 2023 10:55:59 +0800
Subject: [PATCH] =?UTF-8?q?[Taxi=E6=97=A0=E4=BA=BA=E5=8C=96]=20fix:=20?=
 =?UTF-8?q?=E5=BD=93=E8=BD=A6=E4=B8=80=E7=9B=B4=E5=9C=A8=E6=A0=87=E5=AE=9A?=
 =?UTF-8?q?=E7=AB=99=E7=82=B9=E6=97=B6=EF=BC=8CtaskType=3DNone=20=E5=A6=82?=
 =?UTF-8?q?=E6=9E=9C=E6=AD=A4=E6=97=B6=E6=9C=89=E8=BF=90=E8=90=A5=E5=8D=95?=
 =?UTF-8?q?=E8=BF=87=E6=9D=A5=EF=BC=8C=E6=AD=A4=E6=97=B6=E9=9C=80=E8=A6=81?=
 =?UTF-8?q?=E5=BC=B9=E5=87=BA=E9=AA=8C=E8=AF=81=E6=89=8B=E6=9C=BA=E5=8F=B7?=
 =?UTF-8?q?=E5=BC=B9=E6=A1=86=EF=BC=88=E5=90=8E=E7=AB=AF=E4=B8=8D=E4=BC=9A?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=8C=B9=E5=8D=95=E5=B9=B6=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?taskType=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../och/taxi/passenger/model/TaxiPassengerModel.kt  | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 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 e5d04039b0..b51f204e6e 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
@@ -161,9 +161,7 @@ object TaxiPassengerModel {
                     )
                     //目前后端将一个订单拆分成了多个任务，乘客屏只关心 送驾 类型的任务
                     //20230829 后端修改了逻辑，在乘客屏startTask后taskType才会变成3
-                    if (data.data.taskType == TaskType_NONE ||
-                        data.data.taskType == TaskType_VIRTUAL
-                    ) {
+                    if (data.data.taskType == TaskType_VIRTUAL) {
                         d(
                             M_TAXI_P + TAG,
                             "queryInAndWaitOrders data.taskType=${data.data.taskType}, discard data"
@@ -181,6 +179,15 @@ object TaxiPassengerModel {
                             }
                         }
                         return
+                    } else if (data.data.taskType == TaskType_NONE) {
+                        //0905 当车一直在标定站点时，taskType=None 如果此时有运营单过来，此时需要弹出验证手机号弹框（后端不会自动匹单并更新taskType）
+                        if (data.data?.order == null) {
+                            d(
+                                M_TAXI_P + TAG,
+                                "queryInAndWaitOrders data.taskType=${data.data.taskType} and order=null, discard data"
+                            )
+                            return
+                        }
                     }
                     if (data.data?.order == null) {
                         if (currentOCHOrder != null) {