From 7ff1a3016012936b4fad58e54bbf9da18248a2f1 Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Tue, 29 Aug 2023 16:06:33 +0800
Subject: [PATCH] =?UTF-8?q?[6.0.0]=201=E3=80=81=E6=A0=87=E5=AE=9A=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E4=B8=80=E9=97=AA=E8=80=8C=E8=BF=87bug=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=202=E3=80=81=E5=88=B0=E7=AB=99=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9=203=E3=80=81=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E5=BE=85=E6=9C=8D=E5=8A=A1=E8=AE=A2=E5=8D=95bug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../taxi/ui/task/TaxiCurrentTaskViewModel.kt  |  9 +++++++--
 .../mogo/och/taxi/ui/task/TaxiTaskModel.kt    | 19 ++++++++++---------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskViewModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskViewModel.kt
index 55818d14b4..208cff0afe 100644
--- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskViewModel.kt
+++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskViewModel.kt
@@ -220,7 +220,7 @@ class TaxiCurrentTaskViewModel : BaseViewModel<UnmannedState, TaskUiIntent>(),
 
     override fun onOrderCancel() {
         VoiceNotice.showNotice("订单已经取消")
-        updateTaskAndOrderUi(null)
+//        updateTaskAndOrderUi(null)
     }
 
     override fun onOrderArriveAtEnd(orderNo: String) {
@@ -253,12 +253,17 @@ class TaxiCurrentTaskViewModel : BaseViewModel<UnmannedState, TaskUiIntent>(),
         driveToNearestStationTask: StartServiceRespBean.Result?,
         currentTaskWithOrder: QueryCurrentTaskRespBean.Result?
     ) {
-        if (currentTaskWithOrder?.endSite != null && currentTaskWithOrder.startSite != null && currentTaskWithOrder.currentStatus < TaskStatusEnum.CompleteTask.code) {
+        if (currentTaskWithOrder?.endSite != null && currentTaskWithOrder.startSite != null
+            && currentTaskWithOrder.currentStatus < TaskStatusEnum.CompleteTask.code) {
             VoiceNotice.showNotice("暂停接单啦！要完成当前订单哦")
         } else {
             VoiceNotice.showNotice("暂停接单啦")
         }
         // TODO 如果当前有订单就不要刷新
+        if (currentTaskWithOrder?.startSite != null &&
+            currentTaskWithOrder.endSite != null){
+            return
+        }
         updateDriveToNearestStationTaskUI(driveToNearestStationTask)
     }
 
diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt
index f57b295596..7c70c7a879 100644
--- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt
+++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt
@@ -675,11 +675,12 @@ object TaxiTaskModel {
                         // 任务为空
                         if (result.endSite == null && result.order == null) {
                             d(TAG, "queryCurrentTaskOnce: 任务为空")
-                            mCurrentTaskWithOrder = null
-
-                            mTaxiTaskWithOrderCallbackMap.forEach {
-                                val listener = it.value
-                                listener.onTaskWithOrderDataChanged(null)
+//                            mCurrentTaskWithOrder = null
+                            if (mDriveToNearestStationTask == null) {
+                                mTaxiTaskWithOrderCallbackMap.forEach {
+                                    val listener = it.value
+                                    listener.onTaskWithOrderDataChanged(null)
+                                }
                             }
                             return
                         }
@@ -776,7 +777,7 @@ object TaxiTaskModel {
                     when (data.data.orderStatus) {
                         TaxiOrderStatusEnum.Cancel.code -> {
                             //更新本地标志位
-                            mCurrentTaskWithOrder?.order = null
+                            mCurrentTaskWithOrder = null
                             mTaxiTaskWithOrderCallbackMap.forEach {
                                 val listener = it.value
                                 listener.onOrderCancel()
@@ -795,7 +796,7 @@ object TaxiTaskModel {
 
                         TaxiOrderStatusEnum.JourneyCompleted.code -> {
                             //更新本地标志位
-                            mCurrentTaskWithOrder?.order = null
+                            mCurrentTaskWithOrder = null
                             mTaxiTaskWithOrderCallbackMap.forEach {
                                 val listener = it.value
                                 listener.onOrderJourneyCompleted()
@@ -1109,8 +1110,8 @@ object TaxiTaskModel {
                 "judgeEndStation() stationAngle = $stationAngle"
             )
 
-            if ((!checkCurrentTaskCondition()
-                        || (getCurTaskStatus() == TaskStatusEnum.StartTask.code))
+            if (!checkCurrentTaskCondition()
+                || getCurTaskStatus() != TaskStatusEnum.StartTask.code
             ) {
                 i(TAG, "task null or TaskStatus = ${getCurTaskStatus()}")
                 return