From 11b3927ec4c449c08647fee36bdb586e0c102d50 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Thu, 18 Apr 2024 15:18:47 +0800 Subject: [PATCH] =?UTF-8?q?[6.4.0]=20[=E4=B9=98=E5=AE=A2=E5=B1=8F=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E8=B0=83=E6=95=B4=E3=80=81=E9=AB=98=E7=B2=BE=E5=9C=B0?= =?UTF-8?q?=E5=9B=BEloading]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/layout/bus_base_fragment.xml | 5 ++ .../res/jinlv/layout/bus_p_base_fragment.xml | 4 +- .../main/res/m2/layout/bus_p_m2_fragment.xml | 5 ++ .../main/res/layout/charter_base_fragment.xml | 4 ++ .../res/layout/charter_p_main_fragment.xml | 4 ++ .../biz_login_error_info_1080x1920.xml | 6 ++ .../biz_login_errorinfo_view_1080x1920.xml | 6 +- .../biz_login_errorinfo_view_1920x1080.xml | 2 +- .../biz_login_passenger_view_1080x1920.xml | 2 +- .../biz_login_passenger_view_1920x1080.xml | 16 ++--- .../biz_login_passenger_view_2560x1600.xml | 9 +-- .../module/wigets/LoadingMapStatusView.kt | 61 ++++++++++++++++++ .../res/drawable-nodpi/common_loading_map.png | Bin 0 -> 1490 bytes .../main/res/layout/common_loading_map.xml | 15 +++++ .../main/res/layout/shuttle_base_fragment.xml | 3 + .../layout/shuttle_p_jl_base_fragment.xml | 5 ++ .../res/m2/layout/shuttle_p_m2_fragment.xml | 4 ++ .../main/res/layout/taxi_base_fragment.xml | 5 ++ .../main/res/layout/taxi_p_base_fragment.xml | 5 ++ .../main/res/layout/taxi_base_fragment.xml | 5 ++ .../res/layout/taxt_u_p_base_fragment.xml | 5 ++ .../res/drawable/common_loading_map_bg.xml | 5 ++ .../src/main/res/values/color.xml | 1 + 23 files changed, 157 insertions(+), 20 deletions(-) create mode 100644 OCH/common/biz/src/main/res/drawable/biz_login_error_info_1080x1920.xml create mode 100644 OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/LoadingMapStatusView.kt create mode 100755 OCH/common/common/src/main/res/drawable-nodpi/common_loading_map.png create mode 100644 OCH/common/common/src/main/res/layout/common_loading_map.xml create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable/common_loading_map_bg.xml 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" /> |1-1yF0}tNwf`@*|2n(>F0=nGx&AP- z|1PutFSh?Mwf`=(|1Y@zFth(Nwf`=(|1H1$F0=nIwEs7-|17}#F0=nGv;Qu-|1h-w zG_(IK!2K?>|1Y!uF0=nGv;Qo>{4Bu!F0=nE!2K-0{4cZrEWrFM!2K-1{VufsEx`RV zxc@D)|17}$EWrIPv;Qo={4cZr&>Gqk0000ybW%=J0L-(QfM!P;1`HDqSQa=4d^IUj zL@{12BpqW-Og|FHuar9=7`KRab8uKwsg8zE!h3OPXc>>Kr=x#rg!t%J000D$Nkltb1~v$==vc=0kJC&@CFX5o%)3+Tr41-Z1yIhqLTmCK=(za>>$zbUzO;6kS? zA@4~t)UvH358CjO)G0Y?JXl8#v?)ow(qNE`G|7yW#!pC-#5Z+Wx1`zDQ2XXYCO0zB zyakb2crYL)axn~861gSX$5%vd#qk;3^Egz^iHbQsPPqS@N@y5n@}UNWr)UNx8=_+K z*&OOgUWkepe2}otc*;$qzinLWjNRdhSQomxBiy>c6<->;{I(!a&?hSVn@aQC;bfgz zN9z4s5V-=lr8XQY7?ESZ4TD4|W>?rpIBrNHpeSx>9pTP{Ww{QAvK?u*gCUV*i;rMR z-2I+-v?le|FlqfoasYA7Z$J#wq8+K)Md(0W`7w&o4IUILa95R7sP;G+Ye#h_>NYkPcW^Y(swISVF6SofNnmk zc!on|M$j!{6*IV0rU%_7>{X0w$9`8-1;RLv|6pc3Ci|SAkVeNR3yp3*|fj`PLoc<2B0fl+_O3yv`1WmvPgiyh_~IZ`1BoGpnPc!j!oA z$s92ydvE%Cw#Bq|6@4BnOic=+V}Ha94%*vkBxd2ptrQ+&Hqt+_uZX`qT3}|<@X0XL*2hrkVfHgDW7|RlhHTnh2sKhwF&}`7hVP+9V zxe9`V9tATCFv?jFa`cFp**nHK3epbUGS)#pJR!rUf)t@g!;BoL+=$=R{(${H ze9Lc{$pxyk<}IFtE)=8$eNN2a2t^Wb#f2zYX5@%S^hpg<;z6+pxWyb4x`G?npoF&+FTu~)ev~yA&q_gxxIqeYzcR>lps zn3l&45=_hD1`A9p + + + + \ 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