From e70a66fff493c9e557eb16d73825066ed468a300 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Mon, 29 May 2023 20:41:49 +0800
Subject: [PATCH] =?UTF-8?q?[bugfix]=20[=E5=B0=9D=E8=AF=95=E6=BC=8F?=
 =?UTF-8?q?=E4=B8=80=E6=9D=A1=E5=9C=B0=E5=9B=BE]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mogo/och/bus/passenger/ui/MainFragment.kt |   4 +
 .../src/main/res/layout/m1_main_fragment.xml  |  12 +-
 .../src/main/res/layout/m1_order_end.xml      | 108 ++++++++++--------
 3 files changed, 73 insertions(+), 51 deletions(-)

diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/MainFragment.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/MainFragment.kt
index cba9be6266..5d04b2cce5 100644
--- a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/MainFragment.kt
+++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/MainFragment.kt
@@ -145,6 +145,10 @@ class MainFragment :
             }
 
         }
+
+        debug_show_endview.setOnClickListener {
+            showOpenAndCloseDoor()
+        }
     }
 
     private fun openSettingPage(tab: String) {
diff --git a/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_main_fragment.xml b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_main_fragment.xml
index 60cc4b0319..3551248589 100644
--- a/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_main_fragment.xml
+++ b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_main_fragment.xml
@@ -278,9 +278,19 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>
 
+    <TextView
+        android:text="显示结束页面"
+        android:id="@+id/debug_show_endview"
+        app:layout_constraintTop_toBottomOf="@+id/debug_change_modle"
+        android:layout_marginTop="@dimen/dp_17"
+        app:layout_constraintEnd_toEndOf="@+id/mapBizView"
+        android:visibility="gone"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
     <androidx.constraintlayout.widget.Group
         android:id="@+id/group_debug"
-        app:constraint_referenced_ids="debug_arrive_dest,debug_show_noviceGuidance,debug_change_modle"
+        app:constraint_referenced_ids="debug_arrive_dest,debug_show_noviceGuidance,debug_change_modle,debug_show_endview"
         android:visibility="gone"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>
diff --git a/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_end.xml b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_end.xml
index f62bec70d3..4cd2d81173 100644
--- a/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_end.xml
+++ b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_end.xml
@@ -4,64 +4,72 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/m1_function_bg"
+
     tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:background="@drawable/charter_end_order_openclosedoor"
-        android:clickable="true"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintDimensionRatio="1031:500"
-        app:layout_constraintEnd_toEndOf="parent"
-        android:layout_marginBottom="@dimen/dp_181"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintWidth_percent="0.53698">
-        <!-- 结束包车 后展示的界面 根据车辆状态来显示 -->
-
-        <ImageView
-            android:id="@+id/iv_end_order_opendoor"
-            android:layout_width="@dimen/dp_108"
-            android:layout_height="@dimen/dp_108"
-            android:layout_marginBottom="@dimen/dp_100"
-            android:src="@drawable/m1_order_end_opendoor_selecotr"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@+id/iv_end_order_closedoor"
-            app:layout_constraintStart_toStartOf="parent" />
-
-        <ImageView
-            android:id="@+id/iv_end_order_closedoor"
-            android:layout_width="@dimen/dp_108"
-            android:layout_height="@dimen/dp_108"
-            android:layout_marginBottom="@dimen/dp_100"
-            android:src="@drawable/m1_order_end_closedoor_selecotr"
+        android:layout_width="match_parent"
+        android:background="@drawable/m1_function_bg"
+        android:layout_marginEnd="@dimen/dp_5"
+        android:layout_height="match_parent">
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:background="@drawable/charter_end_order_openclosedoor"
+            android:clickable="true"
             app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintDimensionRatio="1031:500"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@+id/iv_end_order_opendoor" />
+            android:layout_marginBottom="@dimen/dp_181"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintWidth_percent="0.53698">
+            <!-- 结束包车 后展示的界面 根据车辆状态来显示 -->
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/dp_19"
-            android:text="开车门"
-            android:textColor="@color/bus_p_m1_23293b"
-            android:textSize="@dimen/dp_28"
-            app:layout_constraintEnd_toEndOf="@+id/iv_end_order_opendoor"
-            app:layout_constraintStart_toStartOf="@+id/iv_end_order_opendoor"
-            app:layout_constraintTop_toBottomOf="@+id/iv_end_order_opendoor" />
+            <ImageView
+                android:id="@+id/iv_end_order_opendoor"
+                android:layout_width="@dimen/dp_108"
+                android:layout_height="@dimen/dp_108"
+                android:layout_marginBottom="@dimen/dp_100"
+                android:src="@drawable/m1_order_end_opendoor_selecotr"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toStartOf="@+id/iv_end_order_closedoor"
+                app:layout_constraintStart_toStartOf="parent" />
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/dp_19"
-            android:text="关车门"
-            android:textColor="@color/bus_p_m1_23293b"
-            android:textSize="@dimen/dp_28"
-            app:layout_constraintEnd_toEndOf="@+id/iv_end_order_closedoor"
-            app:layout_constraintStart_toStartOf="@+id/iv_end_order_closedoor"
-            app:layout_constraintTop_toBottomOf="@+id/iv_end_order_closedoor" />
+            <ImageView
+                android:id="@+id/iv_end_order_closedoor"
+                android:layout_width="@dimen/dp_108"
+                android:layout_height="@dimen/dp_108"
+                android:layout_marginBottom="@dimen/dp_100"
+                android:src="@drawable/m1_order_end_closedoor_selecotr"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@+id/iv_end_order_opendoor" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/dp_19"
+                android:text="开车门"
+                android:textColor="@color/bus_p_m1_23293b"
+                android:textSize="@dimen/dp_28"
+                app:layout_constraintEnd_toEndOf="@+id/iv_end_order_opendoor"
+                app:layout_constraintStart_toStartOf="@+id/iv_end_order_opendoor"
+                app:layout_constraintTop_toBottomOf="@+id/iv_end_order_opendoor" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/dp_19"
+                android:text="关车门"
+                android:textColor="@color/bus_p_m1_23293b"
+                android:textSize="@dimen/dp_28"
+                app:layout_constraintEnd_toEndOf="@+id/iv_end_order_closedoor"
+                app:layout_constraintStart_toStartOf="@+id/iv_end_order_closedoor"
+                app:layout_constraintTop_toBottomOf="@+id/iv_end_order_closedoor" />
 
 
+        </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>
+
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file