From 843f99d5c28bbc81eea9e949bfb1dcfa49cd6b9a Mon Sep 17 00:00:00 2001 From: EmArrow Date: Sun, 29 Sep 2024 13:32:27 +0800 Subject: [PATCH] [6.7.0] color change --- .../main/res/layout/offline_tap_position.xml | 8 +- .../res/layout/sweeper_cloud_traffic_data.xml | 2 +- .../layout/sweeper_operate_traffic_data.xml | 2 +- .../binding/BindingCarNetWorkManager.kt | 24 ----- .../res/drawable-nodpi/icon_dialog_ask.png | Bin 0 -> 18509 bytes .../src/main/res/drawable/bg_bone_dialog.xml | 2 +- .../main/res/drawable/bg_map_offline_btn.xml | 2 +- .../src/main/res/drawable/bg_tab_car_no.xml | 2 +- .../brakelight_background_daytime.xml | 2 +- .../status_dialog_fsm_status_background.xml | 2 +- .../res/drawable/turnlight_background.xml | 2 +- .../drawable/version_latest_background.xml | 12 --- .../version_upgradeable_background.xml | 11 --- .../drawable/version_upgrading_background.xml | 5 -- .../src/main/res/layout/dialog_ad_upgrade.xml | 66 +++++--------- .../res/layout/dialog_modify_bindingcar.xml | 80 ++++++++--------- .../res/layout/dialog_sweeper_mode_change.xml | 2 +- .../main/res/layout/dialog_to_bindingcar.xml | 83 ++++++++---------- .../main/res/layout/dialog_upgrade_app.xml | 22 ++--- .../res/layout/hmi_steering_wheel_bus.xml | 2 +- .../res/layout/hmi_steering_wheel_taxi.xml | 4 +- .../src/main/res/layout/hmi_tap_position.xml | 8 +- .../src/main/res/layout/hmi_traffic_data.xml | 2 +- .../src/main/res/layout/view_car_info_tab.xml | 2 +- .../src/main/res/layout/view_tool_kit_tab.xml | 2 +- .../src/main/res/values/color.xml | 23 ++--- 26 files changed, 137 insertions(+), 235 deletions(-) create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable-nodpi/icon_dialog_ask.png delete mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable/version_latest_background.xml delete mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable/version_upgradeable_background.xml delete mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable/version_upgrading_background.xml diff --git a/OCH/offline/driver/src/main/res/layout/offline_tap_position.xml b/OCH/offline/driver/src/main/res/layout/offline_tap_position.xml index 0aa49df0bd..ed47843cd8 100644 --- a/OCH/offline/driver/src/main/res/layout/offline_tap_position.xml +++ b/OCH/offline/driver/src/main/res/layout/offline_tap_position.xml @@ -12,7 +12,7 @@ android:gravity="center" android:text="P" android:textAlignment="center" - android:textColor="@color/p_default_txt_color" + android:textColor="@color/color_ff_6E8EC9" android:textSize="@dimen/dp_34" android:textStyle="bold" app:layout_constraintBottom_toBottomOf="parent" @@ -27,7 +27,7 @@ android:gravity="center" android:text="R" android:textAlignment="center" - android:textColor="@color/p_default_txt_color" + android:textColor="@color/color_ff_6E8EC9" android:textSize="@dimen/dp_34" android:textStyle="bold" app:layout_constraintBottom_toBottomOf="parent" @@ -42,7 +42,7 @@ android:gravity="center" android:text="N" android:textAlignment="center" - android:textColor="@color/p_default_txt_color" + android:textColor="@color/color_ff_6E8EC9" android:textSize="@dimen/dp_34" android:textStyle="bold" app:layout_constraintBottom_toBottomOf="parent" @@ -57,7 +57,7 @@ android:gravity="center" android:text="D" android:textAlignment="center" - android:textColor="@color/p_default_txt_color" + android:textColor="@color/color_ff_6E8EC9" android:textSize="@dimen/dp_34" android:textStyle="bold" app:layout_constraintBottom_toBottomOf="parent" diff --git a/OCH/sweeper/driver/src/main/res/layout/sweeper_cloud_traffic_data.xml b/OCH/sweeper/driver/src/main/res/layout/sweeper_cloud_traffic_data.xml index 182aa91c1c..d1ea4e4543 100644 --- a/OCH/sweeper/driver/src/main/res/layout/sweeper_cloud_traffic_data.xml +++ b/OCH/sweeper/driver/src/main/res/layout/sweeper_cloud_traffic_data.xml @@ -48,7 +48,7 @@ app:defaultColor="@color/acc_default_txt_color" app:layout_constraintLeft_toRightOf="@+id/sweeperSpeedImage" app:layout_constraintTop_toTopOf="parent" - app:selectColor="@color/dark_mode_select_txt_color" + app:selectColor="@android:color/white" android:layout_marginTop="@dimen/dp_30"/> Unit, screenType: Int ) { -// String macAddress1 = "48:b0:2d:4d:33:40"; -// String sn = "X2020220417KA94QIN"; val request = BindingCarRequest( macAddress, widevineIDWithMd5, @@ -180,28 +178,6 @@ class BindingCarNetWorkManager private constructor() { return } d(SceneConstant.M_DEVA + TAG, "updateCarVrIconRes : $brandId") - when (brandId) { - "1" -> { //东风 - CallerMapUIServiceManager.getMapUIController()?.changeCurrentIcon(R.raw.chuzuche) - HdMapBuildConfig.currentCarVrIconRes = R.raw.chuzuche - } - "2" -> { //红旗 - CallerMapUIServiceManager.getMapUIController()?.changeCurrentIcon(R.raw.hq_h9) - HdMapBuildConfig.currentCarVrIconRes = R.raw.hq_h9 - } - "3" -> { //金旅 - CallerMapUIServiceManager.getMapUIController()?.changeCurrentIcon(R.raw.xiaoba) - HdMapBuildConfig.currentCarVrIconRes = R.raw.xiaoba - } - "4" -> { //开沃 - CallerMapUIServiceManager.getMapUIController()?.changeCurrentIcon(R.raw.xiaoba) - HdMapBuildConfig.currentCarVrIconRes = R.raw.xiaoba - } - "5" -> { //福田 - CallerMapUIServiceManager.getMapUIController()?.changeCurrentIcon(R.raw.huanwei) - HdMapBuildConfig.currentCarVrIconRes = R.raw.huanwei - } - } } @ChainLog( diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-nodpi/icon_dialog_ask.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-nodpi/icon_dialog_ask.png new file mode 100644 index 0000000000000000000000000000000000000000..23b5882db7a5f633755f416548cac0e098c96ca1 GIT binary patch literal 18509 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 M07*qoM6N<$f - + diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_map_offline_btn.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_map_offline_btn.xml index e4d8d1c248..2423898178 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_map_offline_btn.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_map_offline_btn.xml @@ -1,6 +1,6 @@ - + diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_tab_car_no.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_tab_car_no.xml index 4325856259..3f9e78499a 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_tab_car_no.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_tab_car_no.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/brakelight_background_daytime.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/brakelight_background_daytime.xml index 6c257d12d7..3112bff9ea 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/brakelight_background_daytime.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/brakelight_background_daytime.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/status_dialog_fsm_status_background.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/status_dialog_fsm_status_background.xml index 1ada2120f3..37ef83b63c 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/status_dialog_fsm_status_background.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/status_dialog_fsm_status_background.xml @@ -7,6 +7,6 @@ android:startColor="@color/color_3B3D44" /> + android:color="@color/color_666C6C6C" /> \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/turnlight_background.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/turnlight_background.xml index 63bf5dd935..04949dc3f5 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/turnlight_background.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/turnlight_background.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/version_latest_background.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/version_latest_background.xml deleted file mode 100644 index 7c919f37a6..0000000000 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/version_latest_background.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/version_upgradeable_background.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/version_upgradeable_background.xml deleted file mode 100644 index 8cab4286f1..0000000000 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/version_upgradeable_background.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/version_upgrading_background.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/version_upgrading_background.xml deleted file mode 100644 index 5c5a6b1bb0..0000000000 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/version_upgrading_background.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_ad_upgrade.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_ad_upgrade.xml index a2e114c763..c03357e929 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_ad_upgrade.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_ad_upgrade.xml @@ -2,10 +2,10 @@ - - - - + app:layout_constraintLeft_toLeftOf="parent" /> + android:layout_marginEnd="@dimen/dp_65" + android:layout_marginBottom="@dimen/dp_62" + app:layout_constraintRight_toRightOf="parent"/> \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_modify_bindingcar.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_modify_bindingcar.xml index d5a8d28360..fefa1420e2 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_modify_bindingcar.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_modify_bindingcar.xml @@ -1,80 +1,72 @@ + android:layout_width="@dimen/dp_900" + android:layout_height="@dimen/dp_620" + android:background="@drawable/bg_bone_dialog" + app:roundLayoutRadius="@dimen/dp_50"> + + + app:layout_constraintTop_toBottomOf="@+id/ivChangeBindingCarPos" /> - - - - + app:layout_constraintLeft_toLeftOf="parent" /> - + android:layout_marginEnd="@dimen/dp_65" + android:layout_marginBottom="@dimen/dp_62" + app:layout_constraintRight_toRightOf="parent"/> \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_sweeper_mode_change.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_sweeper_mode_change.xml index 0839d24951..dff443d691 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_sweeper_mode_change.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_sweeper_mode_change.xml @@ -4,7 +4,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="840dp" android:layout_height="470dp" - android:background="@color/dialog_bg_color" + android:background="@color/color_3B4577" app:roundLayoutRadius="32dp" > diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_to_bindingcar.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_to_bindingcar.xml index a50006d7b3..6c3ccb5324 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_to_bindingcar.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_to_bindingcar.xml @@ -1,80 +1,73 @@ + android:layout_width="@dimen/dp_900" + android:layout_height="@dimen/dp_620" + android:background="@drawable/bg_bone_dialog" + app:roundLayoutRadius="@dimen/dp_50"> + + + app:layout_constraintTop_toBottomOf="@+id/ivBindingCarPos" /> - - - - + app:layout_constraintLeft_toLeftOf="parent" /> + android:layout_marginEnd="@dimen/dp_65" + android:layout_marginBottom="@dimen/dp_62" + app:layout_constraintRight_toRightOf="parent"/> \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_upgrade_app.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_upgrade_app.xml index 69f47b707f..916564948f 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_upgrade_app.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_upgrade_app.xml @@ -1,10 +1,10 @@ + android:layout_width="@dimen/dp_900" + android:layout_height="@dimen/dp_620" + android:background="@drawable/bg_bone_dialog" + app:roundLayoutRadius="@dimen/dp_50"> + app:layout_constraintTop_toBottomOf="parent" /> @@ -39,7 +39,7 @@ android:layout_marginEnd="50dp" android:layout_marginBottom="15dp" android:text="" - android:textColor="#FFFFFFFF" + android:textColor="@android:color/white" android:textSize="36dp" android:visibility="visible" app:layout_constraintBottom_toTopOf="@id/view_horizontal_line" diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_steering_wheel_bus.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_steering_wheel_bus.xml index 865f351d02..3f507cf391 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_steering_wheel_bus.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_steering_wheel_bus.xml @@ -87,7 +87,7 @@ android:layout_width="@dimen/dp_390" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/dp_42" - app:defaultColor = "@color/p_default_txt_color" + app:defaultColor = "@color/color_FF6E8EC9" app:selectColor="@color/bus_p_select_txt_color" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_steering_wheel_taxi.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_steering_wheel_taxi.xml index bece0c3b70..84d5417850 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_steering_wheel_taxi.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_steering_wheel_taxi.xml @@ -88,8 +88,8 @@ android:layout_width="@dimen/dp_272" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_30" - app:defaultColor="@color/p_default_txt_color" - app:selectColor="@color/dark_mode_select_txt_color" + app:defaultColor="@color/color_FF6E8EC9" + app:selectColor="@android:color/white" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@+id/steering_circular_alpha" /> diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_tap_position.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_tap_position.xml index 263bee811c..59d969b140 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_tap_position.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_tap_position.xml @@ -12,7 +12,7 @@ android:gravity="center" android:text="P" android:textAlignment="center" - android:textColor="@color/p_default_txt_color" + android:textColor="@color/color_FF6E8EC9" android:textSize="@dimen/dp_46" android:textStyle="bold" app:layout_constraintBottom_toBottomOf="parent" @@ -27,7 +27,7 @@ android:gravity="center" android:text="R" android:textAlignment="center" - android:textColor="@color/p_default_txt_color" + android:textColor="@color/color_FF6E8EC9" android:textSize="@dimen/dp_46" android:textStyle="bold" app:layout_constraintBottom_toBottomOf="parent" @@ -42,7 +42,7 @@ android:gravity="center" android:text="N" android:textAlignment="center" - android:textColor="@color/p_default_txt_color" + android:textColor="@color/color_FF6E8EC9" android:textSize="@dimen/dp_46" android:textStyle="bold" app:layout_constraintBottom_toBottomOf="parent" @@ -57,7 +57,7 @@ android:gravity="center" android:text="D" android:textAlignment="center" - android:textColor="@color/p_default_txt_color" + android:textColor="@color/color_FF6E8EC9" android:textSize="@dimen/dp_46" android:textStyle="bold" app:layout_constraintBottom_toBottomOf="parent" diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_traffic_data.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_traffic_data.xml index 532b8bfefa..730d35701c 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_traffic_data.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_traffic_data.xml @@ -55,7 +55,7 @@ app:layout_constraintLeft_toRightOf="@+id/speedImage" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" - app:selectColor="@color/dark_mode_select_txt_color" /> + app:selectColor="@android:color/white" /> diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_tool_kit_tab.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_tool_kit_tab.xml index 7d4b725376..407f72caf8 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_tool_kit_tab.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_tool_kit_tab.xml @@ -21,7 +21,7 @@ android:layout_marginStart="@dimen/dp_104" android:layout_marginTop="@dimen/dp_55" android:text="@string/tab_tool_kit" - android:textColor="@color/color_CC_FFFFFF" + android:textColor="@color/color_CCFFFFFF" android:textSize="@dimen/dp_40" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml index 570c409a1a..ced58732d4 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml @@ -7,7 +7,6 @@ #5A8EFD #E63B4577 #555C7E - #3B4577 #256BFF #FF1BB7FF @@ -17,7 +16,8 @@ #3700B3 #03DAC5 #000000 - #B3000000 + #4D000000 + #3B4577 #8F0005 #1C1C1C #161618 @@ -35,12 +35,16 @@ #FF1943 #3B3D44 #2E323A - #996C6C6C + #FF6E8EC9 + #666C6C6C #27FFFFFF #1E111111 #FF213757 #335C71AB #FF384D6E + #80FFFFFF + #CCFFFFFF + #E6FFFFFF #FF999900 #FFCC0000 @@ -55,20 +59,9 @@ #FF333333 #FF333333 #FFCCCCCC - #80FFFFFF - #CCFFFFFF - - - #6D7BAF - #3B4577 - #029DFF - #0056FF - #3B4577 #3B4577 - #000000 - #E6FFFFFF #FFCEDCF7 #FFFFA28B @@ -85,8 +78,6 @@ #00FFFFFF #FF343C63 #0043FF - #FF6E8EC9 - #FFFFFFFF #FF282F62 #FFFFFF