From 6a31f56ddae4d487fd1a4616914763fc3dc41012 Mon Sep 17 00:00:00 2001
From: aibingbing <aibingbing@zhidaoauto.com>
Date: Fri, 17 Nov 2023 20:21:56 +0800
Subject: [PATCH] =?UTF-8?q?[=E8=87=AA=E4=B8=BB=E7=AE=97=E8=B7=AF=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81]=20feat:=20=E9=80=89=E6=8B=A9=E8=B7=AF=E7=BA=BF=20?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D=E9=80=89=E6=8B=A9=E9=80=BB=E8=BE=91=EF=BC=8C?=
 =?UTF-8?q?UI=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/routing/TaxiRoutingChooseLineAdapter.kt   |  5 +++--
 .../src/main/res/layout/routing_fragment.xml     | 16 ++++++++--------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/routing/TaxiRoutingChooseLineAdapter.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/routing/TaxiRoutingChooseLineAdapter.kt
index 4514478d16..ae43cb3930 100644
--- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/routing/TaxiRoutingChooseLineAdapter.kt
+++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/routing/TaxiRoutingChooseLineAdapter.kt
@@ -50,11 +50,12 @@ class TaxiRoutingChooseLineAdapter(
                     notifyItemChanged(index)
                 }
             }
-            mData[currentPosition].isChoosed = currentPosition != mLastChoosedLineIndex
+            val isCurrentItemSelected = !mData[currentPosition].isChoosed
+            mData[currentPosition].isChoosed = isCurrentItemSelected
             notifyItemChanged(currentPosition)
             mItemClickListener?.onItemClick(
                 currentPosition,
-                currentPosition != mLastChoosedLineIndex
+                isCurrentItemSelected
             )
             mLastChoosedLineIndex = currentPosition
         }
diff --git a/OCH/taxi/unmanned-driver/src/main/res/layout/routing_fragment.xml b/OCH/taxi/unmanned-driver/src/main/res/layout/routing_fragment.xml
index 5647175544..7e48169c62 100644
--- a/OCH/taxi/unmanned-driver/src/main/res/layout/routing_fragment.xml
+++ b/OCH/taxi/unmanned-driver/src/main/res/layout/routing_fragment.xml
@@ -43,7 +43,7 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="0dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
@@ -67,7 +67,7 @@
                 android:textColor="#FFFFFF"
                 android:textSize="@dimen/dp_44"
                 app:layout_constraintBottom_toBottomOf="parent"
-                tools:visibility="gone"/>
+                tools:visibility="gone" />
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/btnStartTask"
@@ -78,23 +78,23 @@
                 android:text="@string/routing_verify_btn_start_task"
                 android:textColor="#FFFFFF"
                 android:textSize="@dimen/dp_44"
-                tools:visibility="gone"
-                app:layout_constraintBottom_toBottomOf="parent" />
+                app:layout_constraintBottom_toBottomOf="parent"
+                tools:visibility="gone" />
 
             <TextView
                 android:id="@+id/btnFinishTask"
                 android:layout_width="0dp"
                 android:layout_height="@dimen/dp_116"
+                android:layout_weight="1"
                 android:background="@drawable/routing_btn_bg_finish_task"
                 android:gravity="center"
                 android:text="结束任务"
                 android:textColor="@android:color/white"
                 android:textSize="@dimen/dp_44"
                 android:visibility="visible"
-                android:layout_weight="1"
+                app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintWidth_percent="0.55"
-                app:layout_constraintBottom_toBottomOf="parent"/>
+                app:layout_constraintWidth_percent="0.55" />
 
             <TextView
                 android:id="@+id/btnSummitIssue"
@@ -123,7 +123,7 @@
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/mCurrentTaskLayout"
             android:layout_width="@dimen/module_och_taxi_panel_width"
-            android:layout_height="match_parent"
+            android:layout_height="0dp"
             android:visibility="gone"
             app:layout_constraintBottom_toTopOf="@+id/bottomBtnContainer"
             app:layout_constraintLeft_toLeftOf="parent"