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 15df30481e..da0491e98c 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
@@ -416,4 +416,9 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
+
+
+
\ No newline at end of file
diff --git a/OCH/bus/passenger/src/main/res/jinlv/layout/bus_p_base_fragment.xml b/OCH/bus/passenger/src/main/res/jinlv/layout/bus_p_base_fragment.xml
index 455d781077..88ba1bea28 100644
--- a/OCH/bus/passenger/src/main/res/jinlv/layout/bus_p_base_fragment.xml
+++ b/OCH/bus/passenger/src/main/res/jinlv/layout/bus_p_base_fragment.xml
@@ -96,6 +96,8 @@
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent" />
-
+
\ No newline at end of file
diff --git a/OCH/bus/passenger/src/main/res/m2/layout/bus_p_m2_fragment.xml b/OCH/bus/passenger/src/main/res/m2/layout/bus_p_m2_fragment.xml
index 10375bacb9..f80f6b67a3 100644
--- a/OCH/bus/passenger/src/main/res/m2/layout/bus_p_m2_fragment.xml
+++ b/OCH/bus/passenger/src/main/res/m2/layout/bus_p_m2_fragment.xml
@@ -157,6 +157,11 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
+
+
+
\ No newline at end of file
diff --git a/OCH/charter/driver/src/main/res/layout/charter_base_fragment.xml b/OCH/charter/driver/src/main/res/layout/charter_base_fragment.xml
index fe209b62b2..cbb7a1b508 100644
--- a/OCH/charter/driver/src/main/res/layout/charter_base_fragment.xml
+++ b/OCH/charter/driver/src/main/res/layout/charter_base_fragment.xml
@@ -373,4 +373,8 @@
app:textSize="@dimen/dp_70"
tools:visibility="visible" />
+
+
\ No newline at end of file
diff --git a/OCH/charter/passenger/src/main/res/layout/charter_p_main_fragment.xml b/OCH/charter/passenger/src/main/res/layout/charter_p_main_fragment.xml
index 0ecac10d56..595730e1ae 100644
--- a/OCH/charter/passenger/src/main/res/layout/charter_p_main_fragment.xml
+++ b/OCH/charter/passenger/src/main/res/layout/charter_p_main_fragment.xml
@@ -166,4 +166,8 @@
android:layout_marginBottom="@dimen/dp_m_2"
app:layout_constraintStart_toStartOf="parent" />
+
+
\ No newline at end of file
diff --git a/OCH/common/biz/src/main/res/drawable/biz_login_error_info_1080x1920.xml b/OCH/common/biz/src/main/res/drawable/biz_login_error_info_1080x1920.xml
new file mode 100644
index 0000000000..47c8dfedb1
--- /dev/null
+++ b/OCH/common/biz/src/main/res/drawable/biz_login_error_info_1080x1920.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/OCH/common/biz/src/main/res/layout/biz_login_errorinfo_view_1080x1920.xml b/OCH/common/biz/src/main/res/layout/biz_login_errorinfo_view_1080x1920.xml
index ab9ff629d4..32eb65566f 100644
--- a/OCH/common/biz/src/main/res/layout/biz_login_errorinfo_view_1080x1920.xml
+++ b/OCH/common/biz/src/main/res/layout/biz_login_errorinfo_view_1080x1920.xml
@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="@dimen/dp_751"
android:layout_height="@dimen/dp_568"
- android:background="@drawable/biz_login_error_info">
+ android:background="@drawable/biz_login_error_info_1080x1920">
@@ -43,7 +43,7 @@
android:layout_height="0dp"
android:gravity="center"
android:textColor="@android:color/white"
- android:textSize="@dimen/dp_40"
+ android:textSize="@dimen/dp_44"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/actv_error_head"
diff --git a/OCH/common/biz/src/main/res/layout/biz_login_errorinfo_view_1920x1080.xml b/OCH/common/biz/src/main/res/layout/biz_login_errorinfo_view_1920x1080.xml
index e6c4f2e47a..e1363ccf09 100644
--- a/OCH/common/biz/src/main/res/layout/biz_login_errorinfo_view_1920x1080.xml
+++ b/OCH/common/biz/src/main/res/layout/biz_login_errorinfo_view_1920x1080.xml
@@ -13,7 +13,7 @@
android:layout_marginTop="@dimen/dp_35"
android:layout_marginEnd="@dimen/dp_45"
android:textColor="@color/biz_login_72A7FF"
- android:textSize="@dimen/dp_40"
+ android:textSize="@dimen/dp_42"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="10s" />
diff --git a/OCH/common/biz/src/main/res/layout/biz_login_passenger_view_1080x1920.xml b/OCH/common/biz/src/main/res/layout/biz_login_passenger_view_1080x1920.xml
index fd630b2afd..597527d807 100644
--- a/OCH/common/biz/src/main/res/layout/biz_login_passenger_view_1080x1920.xml
+++ b/OCH/common/biz/src/main/res/layout/biz_login_passenger_view_1080x1920.xml
@@ -24,7 +24,7 @@
android:id="@+id/actv_app_version"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginBottom="@dimen/dp_70"
+ android:layout_marginBottom="@dimen/dp_41"
android:gravity="center"
android:text="版本号:6.4.0"
android:textColor="@color/white"
diff --git a/OCH/common/biz/src/main/res/layout/biz_login_passenger_view_1920x1080.xml b/OCH/common/biz/src/main/res/layout/biz_login_passenger_view_1920x1080.xml
index fb5d552458..9059c48dfa 100644
--- a/OCH/common/biz/src/main/res/layout/biz_login_passenger_view_1920x1080.xml
+++ b/OCH/common/biz/src/main/res/layout/biz_login_passenger_view_1920x1080.xml
@@ -12,13 +12,13 @@
android:id="@+id/actv_connect_status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginEnd="@dimen/dp_10"
- android:layout_marginBottom="@dimen/dp_70"
+ app:layout_constraintBottom_toTopOf="@+id/actv_app_version"
android:text="当前状态:连接司机屏中"
android:textColor="@color/white"
- android:textSize="@dimen/dp_36"
+ android:textSize="@dimen/dp_28"
+ android:gravity="end"
app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toStartOf="@+id/actv_app_version"
+ app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintStart_toStartOf="parent" />
@@ -26,14 +26,14 @@
android:id="@+id/actv_app_version"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginStart="@dimen/dp_10"
- android:layout_marginBottom="@dimen/dp_70"
+ android:layout_marginBottom="@dimen/dp_41"
android:text="版本号:6.4.0"
android:textColor="@color/white"
- android:textSize="@dimen/dp_36"
+ android:textSize="@dimen/dp_28"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toEndOf="@+id/actv_connect_status" />
+ app:layout_constraintStart_toStartOf="parent"
+ />
@@ -26,14 +24,13 @@
android:id="@+id/actv_app_version"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginStart="@dimen/dp_10"
android:layout_marginBottom="@dimen/dp_70"
android:text="版本号:6.4.0"
android:textColor="@color/white"
android:textSize="@dimen/dp_44"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toEndOf="@+id/actv_connect_status" />
+ app:layout_constraintStart_toStartOf="parent" />
+
+
+
+
\ No newline at end of file
diff --git a/OCH/shuttle/driver/src/main/res/layout/shuttle_base_fragment.xml b/OCH/shuttle/driver/src/main/res/layout/shuttle_base_fragment.xml
index 7587498309..eef331ab7b 100644
--- a/OCH/shuttle/driver/src/main/res/layout/shuttle_base_fragment.xml
+++ b/OCH/shuttle/driver/src/main/res/layout/shuttle_base_fragment.xml
@@ -402,5 +402,8 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
/>
+
\ No newline at end of file
diff --git a/OCH/shuttle/passenger/src/main/res/jinlv/layout/shuttle_p_jl_base_fragment.xml b/OCH/shuttle/passenger/src/main/res/jinlv/layout/shuttle_p_jl_base_fragment.xml
index 3c9f183cb0..62f371742b 100644
--- a/OCH/shuttle/passenger/src/main/res/jinlv/layout/shuttle_p_jl_base_fragment.xml
+++ b/OCH/shuttle/passenger/src/main/res/jinlv/layout/shuttle_p_jl_base_fragment.xml
@@ -57,4 +57,9 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
+
+
+
\ No newline at end of file
diff --git a/OCH/shuttle/passenger/src/main/res/m2/layout/shuttle_p_m2_fragment.xml b/OCH/shuttle/passenger/src/main/res/m2/layout/shuttle_p_m2_fragment.xml
index 30b68a11c4..cb409b7a2b 100644
--- a/OCH/shuttle/passenger/src/main/res/m2/layout/shuttle_p_m2_fragment.xml
+++ b/OCH/shuttle/passenger/src/main/res/m2/layout/shuttle_p_m2_fragment.xml
@@ -158,6 +158,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
+
+
\ No newline at end of file
diff --git a/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml b/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml
index 3088f8ac13..1e1b93ecd6 100644
--- a/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml
+++ b/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml
@@ -407,4 +407,9 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
+
+
+
\ No newline at end of file
diff --git a/OCH/taxi/passenger/src/main/res/layout/taxi_p_base_fragment.xml b/OCH/taxi/passenger/src/main/res/layout/taxi_p_base_fragment.xml
index db23d9edd5..40da52ec4b 100644
--- a/OCH/taxi/passenger/src/main/res/layout/taxi_p_base_fragment.xml
+++ b/OCH/taxi/passenger/src/main/res/layout/taxi_p_base_fragment.xml
@@ -209,4 +209,9 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toTopOf="parent" />
+
+
+
\ No newline at end of file
diff --git a/OCH/taxi/unmanned-driver/src/main/res/layout/taxi_base_fragment.xml b/OCH/taxi/unmanned-driver/src/main/res/layout/taxi_base_fragment.xml
index 1355408a0d..c39420febd 100644
--- a/OCH/taxi/unmanned-driver/src/main/res/layout/taxi_base_fragment.xml
+++ b/OCH/taxi/unmanned-driver/src/main/res/layout/taxi_base_fragment.xml
@@ -394,4 +394,9 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
+
+
+
\ No newline at end of file
diff --git a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_base_fragment.xml b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_base_fragment.xml
index 4e1acce56a..821a801951 100644
--- a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_base_fragment.xml
+++ b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_base_fragment.xml
@@ -216,5 +216,10 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toTopOf="parent" />
+
+
+
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/common_loading_map_bg.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/common_loading_map_bg.xml
new file mode 100644
index 0000000000..5a94edcfa2
--- /dev/null
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/common_loading_map_bg.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/core/mogo-core-res/src/main/res/values/color.xml b/core/mogo-core-res/src/main/res/values/color.xml
index e6a9a12ef4..510fbcda51 100644
--- a/core/mogo-core-res/src/main/res/values/color.xml
+++ b/core/mogo-core-res/src/main/res/values/color.xml
@@ -14,6 +14,7 @@
#B3FFFFFF
#E63B4577
+ #1A000000
#FF2966EC
#1F9BFE
#256BFF