From 1ea966db58bb2e38ee1ed801f82a36c706d1067c Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Tue, 5 Sep 2023 12:08:49 +0800
Subject: [PATCH] =?UTF-8?q?[6.0.0]=20=E5=A4=84=E7=90=86=E8=BF=90=E8=90=A5?=
 =?UTF-8?q?=E5=8D=95=E5=AE=8C=E6=88=90,=20=E6=9A=82=E5=81=9C=E6=8E=A5?=
 =?UTF-8?q?=E5=8D=95,=20=E5=80=92=E8=AE=A1=E6=97=B6=E4=B8=8D=E6=B6=88?=
 =?UTF-8?q?=E5=A4=B1=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../taxi/ui/task/TaxiCurrentTaskFragment.kt   | 29 +++++++++----------
 .../taxi/ui/task/TaxiCurrentTaskViewModel.kt  |  8 ++---
 2 files changed, 16 insertions(+), 21 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 9af8999448..6e8b75a4b1 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
@@ -214,7 +214,6 @@ class TaxiCurrentTaskFragment : BaseFragment(),
         prepareTaskCountdownTv.visibility  = View.VISIBLE
         mPrepareTasCountDownTimer = object : CountDownTimer(TIMER_PREPARE_TASK_INTERVAL_120S, 1000L) {// 5倒计时后开启自驾
 
-            @SuppressLint("SetTextI18n")
             override fun onTick(millisUntilFinished: Long) {
                 // 倒计时
                 UiThreadHandler.post {
@@ -413,23 +412,23 @@ class TaxiCurrentTaskFragment : BaseFragment(),
     }
 
     private fun updateMapMarkers(taskAndOrder: QueryCurrentTaskRespBean.Result?) {
-        if (taskAndOrder != null && taskAndOrder!!.startSite != null
-            && taskAndOrder!!.endSite != null
+        if (taskAndOrder?.startSite != null
+            && taskAndOrder.endSite != null
         ) {
             when (taskAndOrder.currentStatus) {
                 TaskStatusEnum.GetTask.code -> {
                     setOrRemoveMapMaker(
                         true,
                         TAXI_START_MAP_MAKER,
-                        taskAndOrder!!.startSite!!.wgs84Lat,
-                        taskAndOrder!!.startSite!!.wgs84Lon,
+                        taskAndOrder.startSite!!.wgs84Lat,
+                        taskAndOrder.startSite!!.wgs84Lon,
                         R.raw.star_marker
                     )
                     setOrRemoveMapMaker(
                         true,
                         TAXI_END_MAP_MAKER,
-                        taskAndOrder!!.endSite!!.wgs84Lat,
-                        taskAndOrder!!.endSite!!.wgs84Lon,
+                        taskAndOrder.endSite!!.wgs84Lat,
+                        taskAndOrder.endSite!!.wgs84Lon,
                         R.raw.end_marker
                     )
                 }
@@ -438,15 +437,15 @@ class TaxiCurrentTaskFragment : BaseFragment(),
                     setOrRemoveMapMaker(
                         false,
                         TAXI_START_MAP_MAKER,
-                        taskAndOrder!!.startSite!!.wgs84Lat,
-                        taskAndOrder!!.startSite!!.wgs84Lon,
+                        taskAndOrder.startSite!!.wgs84Lat,
+                        taskAndOrder.startSite!!.wgs84Lon,
                         R.raw.star_marker
                     )
                     setOrRemoveMapMaker(
                         true,
                         TAXI_END_MAP_MAKER,
-                        taskAndOrder!!.endSite!!.wgs84Lat,
-                        taskAndOrder!!.endSite!!.wgs84Lon,
+                        taskAndOrder.endSite!!.wgs84Lat,
+                        taskAndOrder.endSite!!.wgs84Lon,
                         R.raw.end_marker
                     )
                 }
@@ -455,15 +454,15 @@ class TaxiCurrentTaskFragment : BaseFragment(),
                     setOrRemoveMapMaker(
                         false,
                         TAXI_START_MAP_MAKER,
-                        taskAndOrder!!.startSite!!.wgs84Lat,
-                        taskAndOrder!!.startSite!!.wgs84Lon,
+                        taskAndOrder.startSite!!.wgs84Lat,
+                        taskAndOrder.startSite!!.wgs84Lon,
                         R.raw.star_marker
                     )
                     setOrRemoveMapMaker(
                         false,
                         TAXI_END_MAP_MAKER,
-                        taskAndOrder!!.endSite!!.wgs84Lat,
-                        taskAndOrder!!.endSite!!.wgs84Lon,
+                        taskAndOrder.endSite!!.wgs84Lat,
+                        taskAndOrder.endSite!!.wgs84Lon,
                         R.raw.end_marker
                     )
                 }
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 5a6f2de027..2f7c1d0ecf 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
@@ -271,15 +271,11 @@ class TaxiCurrentTaskViewModel : BaseViewModel<UnmannedState, TaskUiIntent>(),
             && currentTaskWithOrder.currentStatus < TaskStatusEnum.CompleteTask.code
         ) {
             VoiceNotice.showNotice("暂停接单啦！要完成当前订单哦")
+            return
         } else {
             VoiceNotice.showNotice("暂停接单啦")
         }
-        // TODO 如果当前有订单就不要刷新
-        if (currentTaskWithOrder?.startSite != null &&
-            currentTaskWithOrder.endSite != null
-        ) {
-            return
-        }
+
         updateDriveToNearestStationTaskUI(driveToNearestStationTask)
     }