From d61483186d7cef01ec03712bf104f5566ed2b823 Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Tue, 5 Sep 2023 17:15:23 +0800
Subject: [PATCH] =?UTF-8?q?[6.0.0]=20=E8=A7=A3=E5=86=B3=E5=81=B6=E7=8E=B0?=
 =?UTF-8?q?=E5=87=BA=E7=8E=B0=E8=AE=A2=E5=8D=95=E8=B5=B7=E7=82=B9=E5=92=8C?=
 =?UTF-8?q?=E7=BB=88=E7=82=B9=E9=83=BD=E6=9C=89=E5=AF=BC=E8=88=AA=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt     | 5 +++--
 1 file changed, 3 insertions(+), 2 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 42cf8f08ea..759a844c0f 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
@@ -723,8 +723,9 @@ class TaxiCurrentTaskFragment : BaseFragment(),
                     naviToStart.visibility = View.VISIBLE
                 }
             }
-            if (currentTaskWithOrder?.currentStatus == TaskStatusEnum.StartTask.code
-            ) {
+            if ((currentTaskWithOrder?.currentStatus == TaskStatusEnum.StartTask.code
+                        && currentTaskWithOrder.order == null)
+                || (currentTaskWithOrder?.order?.orderStatus == TaxiOrderStatusEnum.OnTheWayToEnd.code)) {
                 if (naviToEnd.visibility == View.GONE) {
                     naviToEnd.visibility = View.VISIBLE
                 }