From 51090f871e3cc2ab0c1ce6091307df52c9c923da Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Sun, 23 Apr 2023 15:58:06 +0800 Subject: [PATCH] =?UTF-8?q?[3.2.0]=20taxi=E5=8F=B8=E6=9C=BA=E7=AB=AF?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E9=87=8D=E5=BD=B1=E9=97=AE=E9=A2=98=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...{icon_ai_normal.png => icon_ai_normal_och.png} | Bin ...{icon_ai_select.png => icon_ai_select_och.png} | Bin ...se_normal.png => icon_bad_case_normal_och.png} | Bin ...se_select.png => icon_bad_case_select_och.png} | Bin .../src/main/res/drawable/ai_collect_selector.xml | 8 -------- .../main/res/drawable/ai_collect_selector_och.xml | 8 ++++++++ .../src/main/res/drawable/bad_case_selector.xml | 8 -------- .../main/res/drawable/bad_case_selector_och.xml | 8 ++++++++ .../src/main/res/layout/taxi_base_fragment.xml | 14 +++++++------- 9 files changed, 23 insertions(+), 23 deletions(-) rename OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/{icon_ai_normal.png => icon_ai_normal_och.png} (100%) rename OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/{icon_ai_select.png => icon_ai_select_och.png} (100%) rename OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/{icon_bad_case_normal.png => icon_bad_case_normal_och.png} (100%) rename OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/{icon_bad_case_select.png => icon_bad_case_select_och.png} (100%) delete mode 100755 OCH/mogo-och-taxi/src/main/res/drawable/ai_collect_selector.xml create mode 100755 OCH/mogo-och-taxi/src/main/res/drawable/ai_collect_selector_och.xml delete mode 100755 OCH/mogo-och-taxi/src/main/res/drawable/bad_case_selector.xml create mode 100755 OCH/mogo-och-taxi/src/main/res/drawable/bad_case_selector_och.xml diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/icon_ai_normal.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/icon_ai_normal_och.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/icon_ai_normal.png rename to OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/icon_ai_normal_och.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/icon_ai_select.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/icon_ai_select_och.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/icon_ai_select.png rename to OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/icon_ai_select_och.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/icon_bad_case_normal.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/icon_bad_case_normal_och.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/icon_bad_case_normal.png rename to OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/icon_bad_case_normal_och.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/icon_bad_case_select.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/icon_bad_case_select_och.png similarity index 100% rename from OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/icon_bad_case_select.png rename to OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/icon_bad_case_select_och.png diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/ai_collect_selector.xml b/OCH/mogo-och-taxi/src/main/res/drawable/ai_collect_selector.xml deleted file mode 100755 index 879be14e27..0000000000 --- a/OCH/mogo-och-taxi/src/main/res/drawable/ai_collect_selector.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/ai_collect_selector_och.xml b/OCH/mogo-och-taxi/src/main/res/drawable/ai_collect_selector_och.xml new file mode 100755 index 0000000000..a130b0115b --- /dev/null +++ b/OCH/mogo-och-taxi/src/main/res/drawable/ai_collect_selector_och.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/bad_case_selector.xml b/OCH/mogo-och-taxi/src/main/res/drawable/bad_case_selector.xml deleted file mode 100755 index b0e7932bd4..0000000000 --- a/OCH/mogo-och-taxi/src/main/res/drawable/bad_case_selector.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/bad_case_selector_och.xml b/OCH/mogo-och-taxi/src/main/res/drawable/bad_case_selector_och.xml new file mode 100755 index 0000000000..fbc6c83a08 --- /dev/null +++ b/OCH/mogo-och-taxi/src/main/res/drawable/bad_case_selector_och.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/OCH/mogo-och-taxi/src/main/res/layout/taxi_base_fragment.xml b/OCH/mogo-och-taxi/src/main/res/layout/taxi_base_fragment.xml index bdc8f211c2..0b41b947f6 100644 --- a/OCH/mogo-och-taxi/src/main/res/layout/taxi_base_fragment.xml +++ b/OCH/mogo-och-taxi/src/main/res/layout/taxi_base_fragment.xml @@ -308,17 +308,17 @@ android:layout_width="@dimen/module_mogo_och_operation_status_bg_width" android:layout_height="@dimen/module_mogo_och_operation_status_bg_height" android:layout_marginLeft="40dp" + android:background="@drawable/taxi_operation_status_bg_selector" android:layout_marginBottom="@dimen/module_mogo_och_margin_bottom" android:elevation="@dimen/dp_10" - android:background="@drawable/taxi_operation_status_bg_selector" android:gravity="center" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toRightOf="@id/module_och_taxi_swich_map_layout"> + android:background="@drawable/bad_case_selector_och"/> + android:background="@drawable/ai_collect_selector_och"/>