From 3a329de9f0d30b2978a7fbaa72257a1f10a675e0 Mon Sep 17 00:00:00 2001
From: aibingbing <aibingbing@zhidaoauto.com>
Date: Wed, 6 Sep 2023 20:13:43 +0800
Subject: [PATCH] =?UTF-8?q?[Taxi=E6=97=A0=E4=BA=BA=E5=8C=96]=20fix:=20?=
 =?UTF-8?q?=E8=BF=90=E8=90=A5=E5=8D=95=20=E8=BE=BE=E5=88=B0=E7=BB=88?=
 =?UTF-8?q?=E7=82=B9=E5=90=8E=E9=9C=80=E8=A6=81=E7=AB=8B=E5=8D=B3=E6=B8=85?=
 =?UTF-8?q?=E9=99=A4=E8=BD=A8=E8=BF=B9=EF=BC=8C=E5=90=8C=E6=97=B6=E4=B8=8D?=
 =?UTF-8?q?=E8=83=BD=E5=A4=9A=E6=AC=A1=E8=A7=A6=E5=8F=91=E9=81=BF=E5=85=8D?=
 =?UTF-8?q?=E5=A4=9A=E6=AC=A1=E5=BC=B9=E5=87=BA=E9=A1=B5=E9=9D=A2=EF=BC=9B?=
 =?UTF-8?q?=20fix:=20=E7=A9=BA=E6=8C=87=E9=92=88=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=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/network/TaxiPassengerServiceManager.kt  |  4 +++-
 2 files changed, 13 insertions(+), 2 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 b0841a67dc..8320f4bc6a 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
@@ -70,6 +70,9 @@ object TaxiPassengerModel {
     @Volatile
     var currentTrajectoryInfo: TaxiPassengerGetTrajectoryByLineIdRespBean.TrajectoryInfo? = null
 
+    // 当前任务的状态
+    var currentTaskStatus: Int = -1
+
     private val mOrderStatusCallbackMap: MutableMap<String, IOCHTaxiPassengerOrderStatusCallback> =
         ConcurrentHashMap()
 
@@ -171,6 +174,7 @@ object TaxiPassengerModel {
                             currentOCHOrder = null
                             currentLineId = null
                             currentTrajectoryInfo = null
+                            currentTaskStatus = -1
                             orderStatusChange()
                         } else {
                             // 当前一直是演练，到终点后清除轨迹信息
@@ -219,9 +223,13 @@ object TaxiPassengerModel {
                             currentOCHOrder = currentOrder
                             // 到终点后需要清除轨迹信息
                             if (data.data.currentStatus == TaxiPassengerConst.TaskStatus_CompleteTask) {
-                                orderStatusChange()
+                                if (data.data.currentStatus != currentTaskStatus) {
+                                    currentTaskStatus = data.data.currentStatus
+                                    orderStatusChange()
+                                }
                             }
                         }
+                        currentTaskStatus = data.data.currentStatus
                     } else {
                         if (currentOCHOrder != null) {
                             queryCurrentOrderStatus()
@@ -270,6 +278,7 @@ object TaxiPassengerModel {
                                 currentOCHOrder = null
                                 currentLineId = null
                                 currentTrajectoryInfo = null
+                                currentTaskStatus = -1
                             } else {
                                 currentOCHOrder = data.data
                                 orderStatusChange()
diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceManager.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceManager.kt
index 9f58353d33..330ee4ba1f 100644
--- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceManager.kt
+++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceManager.kt
@@ -73,7 +73,9 @@ object TaxiPassengerServiceManager {
                 if (ordersInServiceQueryResp.data == null
                     || ordersInServiceQueryResp.data.lineId == -1L
                 ) {
-                    ordersInServiceQueryResp.data.trajectoryInfoByQuery = null
+                    if (ordersInServiceQueryResp.data != null) {
+                        ordersInServiceQueryResp.data.trajectoryInfoByQuery = null
+                    }
                     return@flatMap Observable.just(ordersInServiceQueryResp)
                 }
                 val lineId = ordersInServiceQueryResp.data.lineId