From fedaf73727e75b855e829c7dfa9ac4a88b953249 Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Wed, 6 Sep 2023 13:30:37 +0800
Subject: [PATCH] =?UTF-8?q?[6.0.0]=20=E6=9A=82=E5=81=9C=E6=8E=A5=E5=8D=95?=
 =?UTF-8?q?=E8=AF=AD=E9=9F=B3=E6=92=AD=E6=8A=A5=E9=97=AE=E9=A2=98=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt | 11 -----------
 .../och/taxi/ui/task/TaxiCurrentTaskViewModel.kt     |  3 ++-
 .../java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt  | 12 ++++++++++++
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt
index c8b1583d07..3ee54ae2d4 100644
--- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt
+++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt
@@ -355,9 +355,6 @@ class TaxiCurrentTaskFragment : BaseFragment(),
                 if (order != null && currentStatus == TaskStatusEnum.CompleteTask.code) {
                     handleOrderView(order)
                     updateOrderUI(order)
-                    if (order.orderStatus <= TaxiOrderStatusEnum.ArriveAtStart.code){
-                        VoiceNotice.showNotice("已为您接到订单")
-                    }
                 }
             }
 
@@ -379,9 +376,6 @@ class TaxiCurrentTaskFragment : BaseFragment(),
 
                 if (order != null && currentStatus == TaskStatusEnum.CompleteTask.code) {
                     updateOrderUI(order)
-                    if (order.orderStatus <= TaxiOrderStatusEnum.ArriveAtStart.code){
-                        VoiceNotice.showNotice("已为您接到订单")
-                    }
                     return
                 }
                 if (startSite == null || endSite == null) return
@@ -401,11 +395,6 @@ class TaxiCurrentTaskFragment : BaseFragment(),
                     updatePathwayPoint(taskType,endSite?.siteName)
                     handleOrderView(it)
                     updateOrderUI(it)
-                    if (taskType == TaskTypeEnum.ToOrderStartTask.code
-                        && currentStatus == TaskStatusEnum.CompleteTask.code
-                        && order.orderStatus == TaxiOrderStatusEnum.ArriveAtStart.code){
-                        VoiceNotice.showNotice("已到达上车地点，等待乘客上车")
-                    }
                 }
             }
         }
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 2f7c1d0ecf..beb22e68c5 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
@@ -268,7 +268,8 @@ class TaxiCurrentTaskViewModel : BaseViewModel<UnmannedState, TaskUiIntent>(),
         currentTaskWithOrder: QueryCurrentTaskRespBean.Result?
     ) {
         if (currentTaskWithOrder?.endSite != null && currentTaskWithOrder.startSite != null
-            && currentTaskWithOrder.currentStatus < TaskStatusEnum.CompleteTask.code
+            && (currentTaskWithOrder.currentStatus < TaskStatusEnum.CompleteTask.code
+                    ||currentTaskWithOrder.order != null)
         ) {
             VoiceNotice.showNotice("暂停接单啦！要完成当前订单哦")
             return
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 732a17cfb9..cf4f690875 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
@@ -701,8 +701,20 @@ object TaxiTaskModel {
                         || !mCurrentTaskWithOrder!!.equals(result)
                     ) {
                         d(TAG, "queryCurrentTaskOnce: 更新本地数据")
+
                         mCurrentTaskWithOrder = result
 
+                        if (result.order != null && result.currentStatus == TaskStatusEnum.CompleteTask.code
+                            && result.servingStatus == 1){
+                            if (result.order!!.orderStatus <= TaxiOrderStatusEnum.ArriveAtStart.code) {
+                                VoiceNotice.showNotice("已为您接到订单")
+                            }
+                            if (result.taskType == TaskTypeEnum.ToOrderStartTask.code
+                                && result.order!!.orderStatus == TaxiOrderStatusEnum.ArriveAtStart.code){
+                                VoiceNotice.showNotice("已到达上车地点，等待乘客上车")
+                            }
+                        }
+
                         // 任务为空
                         if (result.endSite == null && result.order == null) {
                             d(TAG, "queryCurrentTaskOnce: 任务为空")