From 3ee3340925f802755d4d7e954948e61adb04b7df Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Thu, 2 Jan 2025 14:33:50 +0800
Subject: [PATCH] =?UTF-8?q?[6.9.0]=20[fix]=20[taxi]=20[=E9=80=81=E9=A9=BE?=
 =?UTF-8?q?=E4=B8=8D=E5=85=81=E8=AE=B8=E7=BB=93=E6=9D=9F=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../taxi/ui/task/itinerarycurrent/ItineraryCurrentView.kt    | 5 ++---
 .../src/main/res/layout/unmanned_itinerary_current.xml       | 3 ++-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/itinerarycurrent/ItineraryCurrentView.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/itinerarycurrent/ItineraryCurrentView.kt
index e4d8b14e90..117f79e0b5 100644
--- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/itinerarycurrent/ItineraryCurrentView.kt
+++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/itinerarycurrent/ItineraryCurrentView.kt
@@ -596,10 +596,9 @@ class ItineraryCurrentView: ConstraintLayout, ItineraryCurrentModel.SwtichLineVi
     }
 
     private fun updateOrderUI(order: OrderDetail) {
-        d(TAG,"updateOrderUI")
+        d(TAG,"updateOrderUI${order.orderStatus}")
         gourp_order.visibility = View.VISIBLE
-        cancelOrder.visibility = if (order.orderStatus == TaxiOrderStatusEnum.ArriveAtEnd.code
-        ) View.GONE else View.VISIBLE
+        cancelOrder.visibility = if (order.orderStatus >= TaxiOrderStatusEnum.OnTheWayToEnd.code) View.GONE else View.VISIBLE
         group_itinerary_info.visibility = View.VISIBLE
         aciv_task_type_exercise.visibility = View.GONE
         actv_switch_site.visibility = View.GONE
diff --git a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_itinerary_current.xml b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_itinerary_current.xml
index 7f35be261d..0a9089f5ce 100644
--- a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_itinerary_current.xml
+++ b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_itinerary_current.xml
@@ -20,6 +20,7 @@
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/cancelOrder"
+        android:visibility="gone"
         app:layout_constraintTop_toTopOf="@+id/taskStatus"
         app:layout_constraintBottom_toBottomOf="@+id/taskStatus"
         app:layout_constraintEnd_toEndOf="parent"
@@ -315,7 +316,7 @@
 
     <androidx.constraintlayout.widget.Group
         android:id="@+id/gourp_order"
-        app:constraint_referenced_ids="taskStatus,actv_order_phone,orderPhoneAndNum,aciv_task_type_order,cancelOrder"
+        app:constraint_referenced_ids="taskStatus,actv_order_phone,orderPhoneAndNum,aciv_task_type_order"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>