From 2ab70ff0532d6652385accb0f932f09dfa66ed9d Mon Sep 17 00:00:00 2001
From: aibingbing <aibingbing@zhidaoauto.com>
Date: Mon, 28 Aug 2023 12:44:35 +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=E6=97=A0=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E6=97=B6=20=E9=A1=B5=E9=9D=A2=E5=88=B7=E6=96=B0=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...PassengerOrdersInServiceQueryRespBean.java |  2 +-
 .../passenger/model/TaxiPassengerModel.kt     | 20 +++++++++++--------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerOrdersInServiceQueryRespBean.java b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerOrdersInServiceQueryRespBean.java
index aa6b88d15f..59847c1c65 100644
--- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerOrdersInServiceQueryRespBean.java
+++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerOrdersInServiceQueryRespBean.java
@@ -15,7 +15,7 @@ public class TaxiPassengerOrdersInServiceQueryRespBean extends BaseData {
     public static class Result {
         public String sn; // sn
         public long lineId = -1; //路线id，默认-1
-        public int serviceStatus;//控制接单的状态（0:暂停 1:开始）
+        public int servingStatus;//控制接单的状态（0:暂停 1:开始）
         public int currentStatus;//车当前状态（0: 空闲 1:加载任务 2:开始任务 3:到站（任务结束））
         public int taskType;//任务类型（1:虚拟任务 2:接驾任务 3:送驾任务）
         public SiteBean endSite;
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 de8e63a465..c34839a75f 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
@@ -154,13 +154,6 @@ object TaxiPassengerModel {
         TaxiPassengerServiceManager.queryOrdersInAndWaitService(
             object : OchCommonServiceCallback<TaxiPassengerOrdersInServiceQueryRespBean> {
                 override fun onSuccess(data: TaxiPassengerOrdersInServiceQueryRespBean) {
-                    if (data.data == null) {
-                        if (currentOCHOrder != null) {
-                            d(M_TAXI_P + TAG, "queryInAndWaitOrders queryCurrentOrderStatus()")
-                            queryCurrentOrderStatus()
-                        }
-                        return
-                    }
                     d(M_TAXI_P + TAG, "queryInAndWaitOrders data.data=${GsonUtils.toJson(data.data)}")
                     //目前后端将一个订单拆分成了多个任务，乘客屏只关心 送驾 类型的任务，这里过滤其他任务避免干扰
                     if (data.data.taskType != TaskType_DRIVE_TO_END) {
@@ -170,6 +163,13 @@ object TaxiPassengerModel {
                         orderStatusChange()
                         return
                     }
+                    if (data.data?.order == null) {
+                        if (currentOCHOrder != null) {
+                            d(M_TAXI_P + TAG, "queryInAndWaitOrders queryCurrentOrderStatus()")
+                            queryCurrentOrderStatus()
+                        }
+                        return
+                    }
                     //1. 处理进行中订单
                     if (data.data != null && data.data.order != null) {
                         // 1.1. 当存在进行中单时：对本地currentOrder进行更新
@@ -381,7 +381,11 @@ object TaxiPassengerModel {
                 clearStation()
             }
 
-            TaxiPassengerOrderStatusEnum.None -> TODO()
+            TaxiPassengerOrderStatusEnum.None -> {
+                //AutopilotManager.clearAutopilotControlParameters()
+                //startOrStopQueryOrderRemaining(false)
+                clearStation()
+            }
         }
     }