diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_bottom_center_normal.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_bottom_center_normal.png index ee0e88287f..859e4950b1 100644 Binary files a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_bottom_center_normal.png and b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_bottom_center_normal.png differ diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_bottom_center_press.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_bottom_center_press.png index 1e0a96b046..bdc4276303 100644 Binary files a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_bottom_center_press.png and b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_bottom_center_press.png differ diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_select_line_bg.png b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_select_line_bg.png index c8c472a681..a70fafb8c1 100644 Binary files a/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_select_line_bg.png and b/OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_select_line_bg.png differ diff --git a/OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_selct_site_bottom_corner.xml b/OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_selct_site_bottom_corner.xml index a779ceb4e3..0ea8182fc7 100644 --- a/OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_selct_site_bottom_corner.xml +++ b/OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_selct_site_bottom_corner.xml @@ -1,7 +1,7 @@ - + - + android:bottomLeftRadius="@dimen/dp_26" + android:topLeftRadius="@dimen/dp_26" /> + + + + \ No newline at end of file diff --git a/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_bottom_go.xml b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_bottom_go.xml index c72c5c29c3..e7fc539809 100644 --- a/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_bottom_go.xml +++ b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_bottom_go.xml @@ -27,6 +27,7 @@ app:layout_constraintEnd_toEndOf="parent" android:textSize="@dimen/dp_48" android:textColor="@android:color/white" + android:layout_marginEnd="@dimen/dp_7" android:text="出发" android:layout_width="wrap_content" android:layout_height="wrap_content"/> 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 792d811673..c1cfd127c5 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 @@ -221,6 +221,7 @@ android:src="@drawable/charter_p_video" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@+id/viewBusPM1MsgBoxButton" + android:layout_marginTop="-20dp" android:layout_width="@dimen/dp_147" android:layout_height="@dimen/dp_149"/> diff --git a/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_fragment.xml b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_fragment.xml index cc7bf855a6..1e4824f86c 100644 --- a/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_fragment.xml +++ b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_order_fragment.xml @@ -56,7 +56,8 @@ android:id="@+id/rv_site_list" android:layout_width="match_parent" android:layout_height="match_parent" - android:paddingTop="@dimen/dp_20" /> + android:layout_marginTop="@dimen/dp_26" + />