From 977de6be3b5b72b62374c57c95b6bc1bb6673560 Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Wed, 27 Sep 2023 19:36:43 +0800
Subject: [PATCH] =?UTF-8?q?[6.1.0]=201=E3=80=81=E5=88=B0=E8=BE=BE=E7=AB=99?=
 =?UTF-8?q?=E7=82=B9=E5=8F=96=E6=B6=88=E8=AE=A2=E5=8D=95=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F=202=E3=80=81=E8=A7=A3=E5=86=B3=E8=BF=90?=
 =?UTF-8?q?=E8=90=A5=E5=8D=95=E5=88=B0=E8=BE=BE=E7=AB=99=E7=82=B9,=20?=
 =?UTF-8?q?=E6=9A=82=E5=81=9C=E6=8E=A5=E5=8D=95->=20=E5=BC=80=E5=A7=8B?=
 =?UTF-8?q?=E6=8E=A5=E5=8D=95=20=E5=89=8D=E5=BE=80=E6=A0=87=E5=AE=9A?=
 =?UTF-8?q?=E7=AB=99=E7=82=B9=E5=88=B0=E7=AB=99=E6=8E=A5=E5=8F=A3=E8=AF=B7?=
 =?UTF-8?q?=E6=B1=82=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt | 4 +++-
 .../src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt  | 1 +
 2 files changed, 4 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 b9c0a1276a..1f7b1cf37a 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
@@ -493,7 +493,9 @@ class TaxiCurrentTaskFragment : BaseFragment(),
     }
 
     private fun updateOrderUI(order: OrderDetail) {
-        cancelOrder.visibility = View.VISIBLE
+        cancelOrder.visibility = if (order.orderStatus
+            == TaxiOrderStatusEnum.ArriveAtEnd.code
+        ) View.GONE else View.VISIBLE
         orderPhoneAndNum.visibility = View.VISIBLE
         taskClickBtn.visibility = View.VISIBLE
         taskTypeTv.visibility = View.VISIBLE
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 d6d6f7453f..c1d5857c2f 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
@@ -730,6 +730,7 @@ object TaxiTaskModel {
                         //达到终点后查询全程里程和用时
                         if (QueryCurrentTaskRespBean.isOrderArriveAtEnd(result)) {
                             d(TAG, "queryCurrentTaskOnce ArriveAtEnd")
+                            mIsArrivedSiteStartTag = false
                             mTaxiTaskWithOrderCallbackMap.forEach {
                                 val listener = it.value
                                 listener.onOrderArriveAtEnd(result.order!!.orderNo)