From 8c0d8f8af47ef4e55ba132dc5a201215737bb5a0 Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Thu, 24 Aug 2023 16:21:15 +0800
Subject: [PATCH] =?UTF-8?q?[6.0.0]=20refactor:=20=E5=89=8D=E5=BE=80?=
 =?UTF-8?q?=E6=A0=87=E5=AE=9A=E7=AB=99=E7=82=B9=E4=BB=BB=E5=8A=A1=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt     | 5 +++++
 .../com/mogo/och/taxi/ui/task/TaxiCurrentTaskViewModel.kt    | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

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 3e5a693443..972c8a0329 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
@@ -172,6 +172,11 @@ class TaxiCurrentTaskFragment : BaseFragment(),
                     is TaskWithOrderUIState.TaskWithOrder -> {
                         mCurrentTaskWithOrder = taskAndOrderUiState.taskWithOrder
 
+                        //如果在前往标定站点, 显示标定站点
+                        if (mDriveToNearestStationTask != null){
+                            return@collect
+                        }
+
                         if (mCurrentTaskWithOrder == null) {
                             initContainerView(false)
                             removeAllMapMarker()
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 514f9f196e..ea3c90e398 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
@@ -262,7 +262,7 @@ class TaxiCurrentTaskViewModel : BaseViewModel<UnmannedState, UnmannedIntent>()
         sendUiState {
             copy(
                 taskWithOrderUIState = TaskWithOrderUIState.TaskWithOrder(
-                    null,
+                    null
                 )
             )
         }