From d998b4366af1e65527b81bf36bb1bf8249970c46 Mon Sep 17 00:00:00 2001 From: EmArrow Date: Fri, 27 Sep 2024 16:03:47 +0800 Subject: [PATCH] [6.7.0] map ui union --- .../src/main/res/layout/bus_base_fragment.xml | 9 - .../main/res/layout/charter_base_fragment.xml | 9 - .../main/res/layout/offline_base_fragment.xml | 9 - .../main/res/layout/shuttle_base_fragment.xml | 9 - .../res/layout/shuttle_weak_base_fragment.xml | 8 - .../main/res/layout/sweeper_base_fragment.xml | 9 - .../layout/sweeper_cloud_base_fragment.xml | 9 - .../main/res/layout/taxi_base_fragment.xml | 174 ++----------- app/build.gradle | 2 +- .../function/hmi/ui/widget/V2XWarningView.kt | 238 ------------------ .../main/res/layout/view_bone_container.xml | 1 + .../main/res/layout/view_map_container.xml | 94 ++++++- .../src/main/res/layout/view_v2x_warning.xml | 82 ------ .../module_hmi_warning_bkg_bottom.xml | 8 - .../drawable/module_hmi_warning_bkg_left.xml | 8 - .../drawable/module_hmi_warning_bkg_right.xml | 8 - .../module_hmi_warning_bkg_right_bottom.xml | 19 -- .../module_hmi_warning_bkg_right_top.xml | 16 -- .../drawable/module_hmi_warning_bkg_top.xml | 8 - .../main/res/drawable-xhdpi/bottom_left.png | Bin 537763 -> 0 bytes .../main/res/drawable-xhdpi/bottom_right.png | Bin 555124 -> 0 bytes 21 files changed, 99 insertions(+), 621 deletions(-) delete mode 100644 core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/V2XWarningView.kt delete mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_v2x_warning.xml delete mode 100644 core/mogo-core-res/src/main/function-hmi-res/drawable/module_hmi_warning_bkg_bottom.xml delete mode 100644 core/mogo-core-res/src/main/function-hmi-res/drawable/module_hmi_warning_bkg_left.xml delete mode 100644 core/mogo-core-res/src/main/function-hmi-res/drawable/module_hmi_warning_bkg_right.xml delete mode 100644 core/mogo-core-res/src/main/function-hmi-res/drawable/module_hmi_warning_bkg_right_bottom.xml delete mode 100644 core/mogo-core-res/src/main/function-hmi-res/drawable/module_hmi_warning_bkg_right_top.xml delete mode 100644 core/mogo-core-res/src/main/function-hmi-res/drawable/module_hmi_warning_bkg_top.xml delete mode 100644 core/mogo-core-res/src/main/res/drawable-xhdpi/bottom_left.png delete mode 100644 core/mogo-core-res/src/main/res/drawable-xhdpi/bottom_right.png diff --git a/OCH/bus/driver/src/main/res/layout/bus_base_fragment.xml b/OCH/bus/driver/src/main/res/layout/bus_base_fragment.xml index 4f62ea025e..0bd98cd161 100644 --- a/OCH/bus/driver/src/main/res/layout/bus_base_fragment.xml +++ b/OCH/bus/driver/src/main/res/layout/bus_base_fragment.xml @@ -30,15 +30,6 @@ app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" /> - - - - - - - - - - - - - - - - - - - - + android:layout_height="match_parent"> @@ -57,76 +58,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + app:layout_constraintLeft_toRightOf="@id/reportworkorderview" />