From 1babe6219740faf999d01a42e006f327e27960b2 Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Thu, 31 Aug 2023 11:28:29 +0800
Subject: [PATCH] =?UTF-8?q?[6.0.0]=20=E5=88=B0=E8=BE=BE=E5=87=BA=E8=BD=A6?=
 =?UTF-8?q?=E7=82=B9=E8=AF=AD=E9=9F=B3=E6=92=AD=E6=8A=A5,=20=E6=8B=BF?=
 =?UTF-8?q?=E5=88=B0=E6=96=B0=E8=AE=A2=E5=8D=95=E8=AF=AD=E9=9F=B3=E6=92=AD?=
 =?UTF-8?q?=E6=8A=A5,=20=E5=8F=96=E6=B6=88=E8=AE=A2=E5=8D=95=E8=AF=AD?=
 =?UTF-8?q?=E9=9F=B3=E6=92=AD=E6=8A=A5=E6=96=87=E6=A1=88=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt   |  5 ++++-
 .../mogo/och/taxi/ui/task/TaxiCurrentTaskViewModel.kt  |  2 +-
 .../java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt    | 10 ++++++++--
 3 files changed, 13 insertions(+), 4 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 5cbdab749e..93316da5b7 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
@@ -24,6 +24,7 @@ import com.mogo.eagle.core.utilcode.util.ToastUtils
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
 import com.mogo.och.common.module.map.AmapNaviToDestinationModel
 import com.mogo.och.common.module.map.ICommonNaviChangedCallback
+import com.mogo.och.common.module.voice.VoiceNotice
 import com.mogo.och.common.module.wigets.OCHCommitDialog
 import com.mogo.och.taxi.R
 import com.mogo.och.taxi.bean.OrderDetail
@@ -325,6 +326,7 @@ class TaxiCurrentTaskFragment : BaseFragment(),
             TaskTypeEnum.VirtualTask.code -> {// 演练任务
                 if (order != null && currentStatus == TaskStatusEnum.CompleteTask.code) {
                     updateOrderUI(order)
+                    VoiceNotice.showNotice("已为您接到订单")
                     return
                 }
                 if (startSite == null || endSite == null) return
@@ -344,8 +346,9 @@ class TaxiCurrentTaskFragment : BaseFragment(),
             }
 
             TaskTypeEnum.None.code -> {
-                if (order != null) {
+                if (order != null && currentStatus == TaskStatusEnum.CompleteTask.code) {
                     updateOrderUI(order)
+                    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 51cee6c1a1..330f6b2b68 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
@@ -208,7 +208,7 @@ class TaxiCurrentTaskViewModel : BaseViewModel<UnmannedState, TaskUiIntent>(),
     }
 
     override fun onOrderCancel() {
-        VoiceNotice.showNotice("订单已经取消")
+        VoiceNotice.showNotice("已取消行程")
 //        updateTaskAndOrderUi(null)
     }
 
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 7b85c8023e..6d697f7a89 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
@@ -53,6 +53,7 @@ import com.mogo.och.common.module.manager.distancemamager.TrajectoryAndDistanceM
 import com.mogo.och.common.module.manager.distancemamager.TrajectoryAndDistanceManager.setStationPoint
 import com.mogo.och.common.module.map.AmapNaviToDestinationModel
 import com.mogo.och.common.module.utils.CoordinateCalculateRouteUtil.coordinateConverterWgsToGcjLocations
+import com.mogo.och.common.module.voice.VoiceNotice
 import com.mogo.och.taxi.bean.PrepareTaskRespBean
 import com.mogo.och.taxi.bean.QueryCarOrderByNoRespBean
 import com.mogo.och.taxi.bean.QueryCurrentTaskRespBean
@@ -523,7 +524,7 @@ object TaxiTaskModel {
             "judgeDriveToNearestStationTaskStation() ${virtualTask.siteName} distance = $distance"
         )
         if (distance <= TaxiUnmannedConst.ARRIVE_AT_START_STATION_DISTANCE) { // 15米内到站
-            submitArriveSite(virtualTask.siteId, true)
+            submitArriveSite(virtualTask.siteId, true, isArrivedNearestStation = true)
         }
     }
 
@@ -560,7 +561,8 @@ object TaxiTaskModel {
      * @siteId : 站点id
      * @isArriveAtEndSite: true 终点, false 起点
      */
-    fun submitArriveSite(siteId: Long, isArriveAtEndSite: Boolean) {
+    fun submitArriveSite(siteId: Long, isArriveAtEndSite: Boolean,
+                         isArrivedNearestStation : Boolean = false) {
         i(TAG, message = "submitArriveSite: siteId=$siteId isArriveAtEndSite=$isArriveAtEndSite")
         TaxiTaskWithOrderServiceManager.arriveSite(
             mContext,
@@ -570,6 +572,10 @@ object TaxiTaskModel {
                     if (data == null || data.code != 0) return
                     d(TAG, "submitArriveSite-onSuccess data=" + GsonUtil.jsonFromObject(data))
                     mDriveToNearestStationTask = null
+                    if (isArrivedNearestStation){// 播报提醒
+                        VoiceNotice.showNotice("已到达出车点")
+                    }
+
                     if (isArriveAtEndSite) {
                         updateLocalCalculateStation()
                         //到站后不再调用取消自驾. 原因是取消自驾,D档位会溜车