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"/>
     <View
         android:id="@+id/line1"
diff --git a/OCH/sweeper/driver/src/main/res/layout/sweeper_operate_traffic_data.xml b/OCH/sweeper/driver/src/main/res/layout/sweeper_operate_traffic_data.xml
index 0aaabc8faa..60b3316ece 100644
--- a/OCH/sweeper/driver/src/main/res/layout/sweeper_operate_traffic_data.xml
+++ b/OCH/sweeper/driver/src/main/res/layout/sweeper_operate_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"/>
     <View
         android:id="@+id/line1"
diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarNetWorkManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarNetWorkManager.kt
index d12c273caf..0a6de8dc1d 100644
--- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarNetWorkManager.kt
+++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarNetWorkManager.kt
@@ -130,8 +130,6 @@ class BindingCarNetWorkManager private constructor() {
         callBack: (ModifyBindingcarInfo) -> 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 0000000000..23b5882db7
Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-nodpi/icon_dialog_ask.png differ
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_bone_dialog.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_bone_dialog.xml
index f6bce26ddf..3ace186ef8 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_bone_dialog.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_bone_dialog.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
     <gradient android:startColor="@color/color_3B3D44" android:endColor="@color/color_2E323A" android:angle="270"/>
-    <stroke android:color="@color/color_99_6C6C6C" android:width="@dimen/dp_2"/>
+    <stroke android:color="@color/color_666C6C6C" android:width="@dimen/dp_2"/>
     <corners android:radius="@dimen/dp_50"/>
 </shape>
 
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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <solid android:color="@color/color_B3_000000"/>
+    <solid android:color="@color/color_4D_000000"/>
     <corners android:radius="@dimen/dp_30"/>
 </shape>
 
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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <solid android:color="@color/color_B3_000000" />
+    <solid android:color="@color/color_4D_000000" />
     <corners android:radius="@dimen/dp_10" />
 </shape>
\ 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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/brakelight_bg_color_daytime" />
+    <solid android:color="@color/color_E6FFFFFF" />
     <corners android:radius="@dimen/turnlight_bg_corner" />
 </shape>
\ 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" />
     <stroke
         android:width="@dimen/dp_2"
-        android:color="@color/color_99_6C6C6C" />
+        android:color="@color/color_666C6C6C" />
     <corners android:radius="@dimen/dp_50" />
 </shape>
\ 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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/turnlight_bg_color" />
+    <solid android:color="@android:color/black" />
     <corners android:radius="@dimen/turnlight_bg_corner" />
 </shape>
\ 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 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval">
-
-    <gradient
-        android:angle="315"
-        android:startColor="@color/version_latest_start_color"
-        android:endColor="@color/version_latest_end_color"
-        />
-
-
-</shape>
\ 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 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval">
-
-    <gradient
-        android:angle="315"
-        android:startColor="@color/version_upgradeable_start_color"
-        android:endColor="@color/version_upgradeable_end_color"
-        />
-
-</shape>
\ 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 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval">
-    <solid android:color="@color/version_upgrading_color"/>
-</shape>
\ 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 @@
 <com.mogo.eagle.core.widget.RoundConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="840dp"
-    android:layout_height="584dp"
-    android:background="@color/dialog_bg_color"
-    app:roundLayoutRadius="32dp"
+    android:layout_width="@dimen/dp_900"
+    android:layout_height="@dimen/dp_620"
+    android:background="@drawable/bg_bone_dialog"
+    app:roundLayoutRadius="@dimen/dp_50"
     >
 
     <TextView
@@ -53,54 +53,32 @@
         android:layout_marginTop="30dp"
         />
 
-    <View
-        android:id="@+id/view_horizontal_line"
-        android:layout_width="match_parent"
-        android:layout_height="3dp"
-        android:background="#66B8BFE8"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tv_upgrade_tip"
-        android:layout_marginTop="60dp"
-        />
-
-    <View
-        android:id="@+id/view_vertical_line"
-        android:layout_width="3dp"
-        android:layout_height="0dp"
-        android:background="#66B8BFE8"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/view_horizontal_line"
-        app:layout_constraintBottom_toBottomOf="parent"
-        />
-
     <TextView
         android:id="@+id/tv_upgrade_confirm"
-        android:layout_width="400dp"
-        android:layout_height="100dp"
-        android:text="@string/confirm"
-        android:textColor="#FFFFFFFF"
-        android:textSize="46dp"
+        android:layout_width="@dimen/dp_356"
+        android:layout_height="@dimen/dp_120"
         android:gravity="center"
-        app:layout_constraintTop_toBottomOf="@id/view_horizontal_line"
+        android:text="@string/confirm"
+        android:background="@drawable/bg_map_offline_btn"
+        android:textColor="@color/color_2EACFF"
+        android:textSize="@dimen/dp_40"
+        android:layout_marginStart="@dimen/dp_65"
+        android:layout_marginBottom="@dimen/dp_62"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toLeftOf="@id/view_vertical_line"
-        />
+        app:layout_constraintLeft_toLeftOf="parent" />
 
     <TextView
         android:id="@+id/tv_upgrade_cancel"
-        android:layout_width="400dp"
-        android:layout_height="100dp"
-        android:text="@string/upgrade_later"
-        android:textColor="#FFFFFFFF"
-        android:textSize="46dp"
+        android:layout_width="@dimen/dp_356"
+        android:layout_height="@dimen/dp_120"
         android:gravity="center"
-        app:layout_constraintTop_toBottomOf="@id/view_horizontal_line"
+        android:text="@string/cancel"
+        android:textColor="@color/white"
+        android:textSize="@dimen/dp_40"
+        android:background="@drawable/bg_map_offline_btn"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toRightOf="@id/view_vertical_line"
-        app:layout_constraintRight_toRightOf="parent"
-        />
+        android:layout_marginEnd="@dimen/dp_65"
+        android:layout_marginBottom="@dimen/dp_62"
+        app:layout_constraintRight_toRightOf="parent"/>
 
 </com.mogo.eagle.core.widget.RoundConstraintLayout>
\ 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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.mogo.eagle.core.widget.RoundConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="840dp"
-    android:layout_height="470dp"
-    android:background="@color/dialog_bg_color"
-    app:roundLayoutRadius="32dp">
+    android:layout_width="@dimen/dp_900"
+    android:layout_height="@dimen/dp_620"
+    android:background="@drawable/bg_bone_dialog"
+    app:roundLayoutRadius="@dimen/dp_50">
+
+    <ImageView
+        android:id="@+id/ivChangeBindingCarPos"
+        android:layout_width="@dimen/dp_140"
+        android:layout_height="@dimen/dp_140"
+        android:layout_marginTop="@dimen/dp_87"
+        android:scaleType="fitXY"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        android:src="@drawable/icon_dialog_ask"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
         android:id="@+id/tv_bindingcar_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="50dp"
+        android:layout_marginTop="@dimen/dp_30"
         android:text="@string/bindingcar_title"
         android:textColor="#FFFFFFFF"
-        android:textSize="56dp"
+        android:textSize="@dimen/dp_45"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toBottomOf="@+id/ivChangeBindingCarPos" />
 
     <TextView
         android:id="@+id/tv_bindingcar_tips"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="50dp"
+        android:layout_marginTop="@dimen/dp_10"
         android:text="@string/modify_binding_car"
         android:textColor="#FFFFFFFF"
-        android:textSize="43dp"
+        android:textSize="@dimen/dp_36"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tv_bindingcar_title" />
 
-    <View
-        android:id="@+id/view_horizontal_line"
-        android:layout_width="match_parent"
-        android:layout_height="2dp"
-        android:layout_marginTop="80dp"
-        android:background="#66B8BFE8"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tv_bindingcar_tips" />
-
-    <View
-        android:id="@+id/view_vertical_line"
-        android:layout_width="3dp"
-        android:layout_height="0dp"
-        android:background="#66B8BFE8"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/view_horizontal_line" />
-
     <TextView
         android:id="@+id/tv_bindingcar_confirm"
-        android:layout_width="400dp"
-        android:layout_height="100dp"
+        android:layout_width="@dimen/dp_356"
+        android:layout_height="@dimen/dp_120"
         android:gravity="center"
         android:text="@string/confirm"
-        android:textColor="#FFFFFFFF"
-        android:textSize="46dp"
+        android:background="@drawable/bg_map_offline_btn"
+        android:textColor="@color/color_2EACFF"
+        android:textSize="@dimen/dp_40"
+        android:layout_marginStart="@dimen/dp_65"
+        android:layout_marginBottom="@dimen/dp_62"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toLeftOf="@id/view_vertical_line"
-        app:layout_constraintTop_toBottomOf="@id/view_horizontal_line" />
+        app:layout_constraintLeft_toLeftOf="parent" />
 
     <TextView
         android:id="@+id/tv_bindingcar_cancel"
-        android:layout_width="400dp"
-        android:layout_height="100dp"
+        android:layout_width="@dimen/dp_356"
+        android:layout_height="@dimen/dp_120"
         android:gravity="center"
         android:text="@string/cancel"
-        android:textColor="#FFFFFFFF"
-        android:textSize="46dp"
+        android:textColor="@color/white"
+        android:textSize="@dimen/dp_40"
+        android:background="@drawable/bg_map_offline_btn"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toRightOf="@id/view_vertical_line"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/view_horizontal_line" />
-
+        android:layout_marginEnd="@dimen/dp_65"
+        android:layout_marginBottom="@dimen/dp_62"
+        app:layout_constraintRight_toRightOf="parent"/>
 
 </com.mogo.eagle.core.widget.RoundConstraintLayout>
\ 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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.mogo.eagle.core.widget.RoundConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="840dp"
-    android:layout_height="470dp"
-    android:background="@color/dialog_bg_color"
-    app:roundLayoutRadius="32dp">
+    android:layout_width="@dimen/dp_900"
+    android:layout_height="@dimen/dp_620"
+    android:background="@drawable/bg_bone_dialog"
+    app:roundLayoutRadius="@dimen/dp_50">
+
+    <ImageView
+        android:id="@+id/ivBindingCarPos"
+        android:layout_width="@dimen/dp_140"
+        android:layout_height="@dimen/dp_140"
+        android:layout_marginTop="@dimen/dp_87"
+        android:scaleType="fitXY"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        android:src="@drawable/icon_dialog_ask"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
         android:id="@+id/tv_bindingcar_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="50dp"
+        android:layout_marginTop="@dimen/dp_30"
         android:text="@string/bindingcar_title"
-        android:textColor="#FFFFFFFF"
-        android:textSize="56dp"
+        android:textColor="@android:color/white"
+        android:textSize="@dimen/dp_45"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toBottomOf="@+id/ivBindingCarPos" />
 
     <TextView
         android:id="@+id/tv_bindingcar_tips"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="50dp"
+        android:layout_marginTop="@dimen/dp_10"
         android:text="@string/to_binding_car"
-        android:textColor="#FFFFFFFF"
-        android:textSize="43dp"
+        android:textColor="@android:color/white"
+        android:textSize="@dimen/dp_36"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tv_bindingcar_title" />
 
-    <View
-        android:id="@+id/view_horizontal_line"
-        android:layout_width="match_parent"
-        android:layout_height="2dp"
-        android:layout_marginTop="80dp"
-        android:background="#66B8BFE8"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tv_bindingcar_tips" />
-
-    <View
-        android:id="@+id/view_vertical_line"
-        android:layout_width="3dp"
-        android:layout_height="0dp"
-        android:background="#66B8BFE8"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/view_horizontal_line" />
-
     <TextView
         android:id="@+id/tv_to_bindingcar_confirm"
-        android:layout_width="400dp"
-        android:layout_height="100dp"
+        android:layout_width="@dimen/dp_356"
+        android:layout_height="@dimen/dp_120"
         android:gravity="center"
         android:text="@string/confirm"
-        android:textColor="#FFFFFFFF"
-        android:textSize="46dp"
+        android:background="@drawable/bg_map_offline_btn"
+        android:textColor="@color/color_2EACFF"
+        android:textSize="@dimen/dp_40"
+        android:layout_marginStart="@dimen/dp_65"
+        android:layout_marginBottom="@dimen/dp_62"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toLeftOf="@id/view_vertical_line"
-        app:layout_constraintTop_toBottomOf="@id/view_horizontal_line" />
+        app:layout_constraintLeft_toLeftOf="parent" />
 
     <TextView
         android:id="@+id/tv_to_bindingcar_cancel"
-        android:layout_width="400dp"
-        android:layout_height="100dp"
+        android:layout_width="@dimen/dp_356"
+        android:layout_height="@dimen/dp_120"
         android:gravity="center"
         android:text="@string/cancel"
-        android:textColor="#FFFFFFFF"
-        android:textSize="46dp"
+        android:textColor="@color/white"
+        android:textSize="@dimen/dp_40"
+        android:background="@drawable/bg_map_offline_btn"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toRightOf="@id/view_vertical_line"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/view_horizontal_line" />
+        android:layout_marginEnd="@dimen/dp_65"
+        android:layout_marginBottom="@dimen/dp_62"
+        app:layout_constraintRight_toRightOf="parent"/>
 
 
 </com.mogo.eagle.core.widget.RoundConstraintLayout>
\ 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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.mogo.eagle.core.widget.RoundConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="840dp"
-    android:layout_height="530dp"
-    android:background="@color/dialog_bg_color"
-    app:roundLayoutRadius="32dp">
+    android:layout_width="@dimen/dp_900"
+    android:layout_height="@dimen/dp_620"
+    android:background="@drawable/bg_bone_dialog"
+    app:roundLayoutRadius="@dimen/dp_50">
 
     <TextView
         android:id="@+id/tv_upgrade_title"
@@ -12,20 +12,20 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="30dp"
         android:text="@string/application_upgrade"
-        android:textColor="#FFFFFFFF"
-        android:textSize="56dp"
+        android:textColor="@android:color/white"
+        android:textSize="@dimen/dp_45"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toBottomOf="parent" />
 
     <TextView
         android:id="@+id/tv_upgrade_tips"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="30dp"
+        android:layout_marginTop="@dimen/dp_10"
         android:text="@string/application_upgrade_confirm"
-        android:textColor="#FFFFFFFF"
-        android:textSize="43dp"
+        android:textColor="@android:color/white"
+        android:textSize="@dimen/dp_36"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tv_upgrade_title" />
@@ -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" />
 
     <ImageView
         android:id="@+id/brakeStatus"
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_car_info_tab.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_car_info_tab.xml
index 69248b51fc..f56276c683 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_car_info_tab.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_car_info_tab.xml
@@ -22,7 +22,7 @@
         android:layout_marginStart="@dimen/dp_104"
         android:layout_marginTop="@dimen/dp_55"
         android:text="@string/tab_car_info"
-        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/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 @@
     <color name="notice_banner_blue">#5A8EFD</color>
     <color name="notice_check_dialog_bg_color">#E63B4577</color>
     <color name="notice_traffic_line">#555C7E</color>
-    <color name="notice_dialog_back">#3B4577</color>
     <color name="notice_video_progressbar_loading_color">#256BFF</color>
 
     <color name="msg_box_title_color">#FF1BB7FF</color>
@@ -17,7 +16,8 @@
     <color name="colorPrimaryDark">#3700B3</color>
     <color name="colorAccent">#03DAC5</color>
     <color name="color_000000">#000000</color>
-    <color name="color_B3_000000">#B3000000</color>
+    <color name="color_4D_000000">#4D000000</color>
+    <color name="color_3B4577">#3B4577</color>
     <color name="color_8F0005">#8F0005</color>
     <color name="color_1C1C1C">#1C1C1C</color>
     <color name="color_161618">#161618</color>
@@ -35,12 +35,16 @@
     <color name="color_FF1943">#FF1943</color>
     <color name="color_3B3D44">#3B3D44</color>
     <color name="color_2E323A">#2E323A</color>
-    <color name="color_99_6C6C6C">#996C6C6C</color>
+    <color name="color_FF6E8EC9">#FF6E8EC9</color>
+    <color name="color_666C6C6C">#666C6C6C</color>
     <color name="color_27FFFFFF">#27FFFFFF</color>
     <color name="color_1E111111">#1E111111</color>
     <color name="color_FF213757">#FF213757</color>
     <color name="color_CC5C71AB">#335C71AB</color>
     <color name="color_FF384D6E">#FF384D6E</color>
+    <color name="color_80FFFFFF">#80FFFFFF</color>
+    <color name="color_CCFFFFFF">#CCFFFFFF</color>
+    <color name="color_E6FFFFFF">#E6FFFFFF</color>
 
     <color name="background_wtf">#FF999900</color>
     <color name="background_error">#FFCC0000</color>
@@ -55,20 +59,9 @@
     <color name="foreground_debug">#FF333333</color>
     <color name="foreground_info">#FF333333</color>
     <color name="foreground_warn">#FFCCCCCC</color>
-    <color name="color_80FFFFFF">#80FFFFFF</color>
-    <color name="color_CC_FFFFFF">#CCFFFFFF</color>
 
-
-
-    <color name="version_latest_start_color">#6D7BAF</color>
-    <color name="version_latest_end_color">#3B4577</color>
-    <color name="version_upgradeable_start_color">#029DFF</color>
-    <color name="version_upgradeable_end_color">#0056FF</color>
-    <color name="version_upgrading_color">#3B4577</color>
     <color name="dialog_bg_color">#3B4577</color>
 
-    <color name="turnlight_bg_color">#000000</color>
-    <color name="brakelight_bg_color_daytime">#E6FFFFFF</color>
     <color name="turn_light_bg_taxi_p">#FFCEDCF7</color>
 
     <color name="hmi_traffic_light_red_color_up">#FFFFA28B</color>
@@ -85,8 +78,6 @@
     <color name="hmi_clear_00">#00FFFFFF</color>
     <color name="acc_default_txt_color">#FF343C63</color>
     <color name="bus_p_select_txt_color">#0043FF</color>
-    <color name="p_default_txt_color">#FF6E8EC9</color>
-    <color name="dark_mode_select_txt_color">#FFFFFFFF</color>
 
     <color name="hmi_check_keyboard_input_field">#FF282F62</color>
     <color name="bus_autopilot_text_color_normal">#FFFFFF</color>