[charter]

[3.2.0]
[结束订单样式修改]

OCH/mogo-och-charter-passenger/src/main/res/drawable/m1_order_end_closedoor_selecotr.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/m1_order_closedoor_press" android:state_pressed="true"/>
-    <item android:drawable="@drawable/m1_order_closedoor_normal" android:state_pressed="false"/>
-    <item android:drawable="@drawable/m1_order_closedoor_normal"/>
+    <item android:drawable="@drawable/charter_p_order_closedoor_press" android:state_pressed="true"/>
+    <item android:drawable="@drawable/charter_p_order_closedoor_normal" android:state_pressed="false"/>
+    <item android:drawable="@drawable/charter_p_order_closedoor_normal"/>
 </selector>

OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_end.xml

@@ -10,7 +10,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:background="@drawable/bus_p_function_setting_soft_b_shape"
+        android:background="@drawable/charter_end_order_openclosedoor"
         android:clickable="true"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintDimensionRatio="1031:500"
@@ -19,38 +19,6 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintWidth_percent="0.53698">
         <!-- 结束包车 后展示的界面 根据车辆状态来显示 -->
-        <ImageView
-            android:id="@+id/iv_early_end"
-            android:layout_width="@dimen/dp_252"
-            android:layout_height="@dimen/dp_172"
-            android:layout_marginStart="@dimen/dp_56"
-            android:layout_marginTop="@dimen/dp_63"
-            android:src="@drawable/m1_order_end_car"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <TextView
-            android:id="@+id/tv_end_title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="本次包车旅程已结束。"
-            android:textColor="@color/bus_p_m1_23293b"
-            android:textSize="@dimen/dp_44"
-            app:layout_constraintBottom_toTopOf="@+id/tv_next_cloud"
-            app:layout_constraintStart_toEndOf="@+id/iv_early_end"
-            app:layout_constraintTop_toTopOf="@+id/iv_early_end"
-            app:layout_constraintVertical_chainStyle="packed" />
-
-        <TextView
-            android:id="@+id/tv_next_cloud"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="蘑菇车联祝您旅途愉快，欢迎下次乘坐！"
-            android:textColor="@color/bus_p_m1_485173"
-            android:textSize="@dimen/dp_31"
-            app:layout_constraintBottom_toBottomOf="@+id/iv_early_end"
-            app:layout_constraintStart_toEndOf="@+id/iv_early_end"
-            app:layout_constraintTop_toBottomOf="@+id/tv_end_title" />
 
         <ImageView
             android:id="@+id/iv_end_order_opendoor"