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"