From 8948ff5ffe31344d57083b1da0b1a1a224bc2e47 Mon Sep 17 00:00:00 2001 From: aibingbing Date: Fri, 27 Sep 2024 18:36:32 +0800 Subject: [PATCH] =?UTF-8?q?[6.7.0][FSM]=20refactor:FSM&=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E5=BC=B9=E6=A1=86=20UI=20=E8=B5=B0=E6=9F=A5=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/layout/bus_base_fragment.xml | 4 +- .../main/res/layout/shuttle_base_fragment.xml | 4 +- .../res/layout/shuttle_weak_base_fragment.xml | 4 +- .../main/res/layout/taxi_base_fragment.xml | 4 +- .../layout/unmanned_taxi_base_fragment.xml | 4 +- .../hmi/ui/v2n/RoadV2NEventWindowView.kt | 39 ++++++++++----- .../hmi_v2n_event_bg_driver.9.png | Bin 15028 -> 0 bytes .../hmi_v2n_event_bg_driver.png | Bin 0 -> 16742 bytes .../drawable/bg_fsm_status_detail_close.xml | 2 +- .../layout/view_status_fsm_item_layout.xml | 45 +++++++++++------- .../res/layout/view_status_fsm_layout.xml | 1 + 11 files changed, 66 insertions(+), 41 deletions(-) delete mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/hmi_v2n_event_bg_driver.9.png create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/hmi_v2n_event_bg_driver.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 fbba636209..4f62ea025e 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 @@ -105,8 +105,8 @@ android:id="@+id/roadV2NEventWindowView" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginRight="@dimen/dp_23" - android:layout_marginTop="@dimen/dp_39" + android:layout_marginRight="@dimen/dp_3" + android:layout_marginTop="@dimen/dp_24" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" android:visibility="gone"/> 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 b66b6090fb..01bd3f07ef 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 @@ -102,8 +102,8 @@ android:id="@+id/roadV2NEventWindowView" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginRight="@dimen/dp_23" - android:layout_marginTop="@dimen/dp_39" + android:layout_marginRight="@dimen/dp_3" + android:layout_marginTop="@dimen/dp_24" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" android:visibility="gone"/> diff --git a/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_base_fragment.xml b/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_base_fragment.xml index 0092351e4a..99437f779d 100644 --- a/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_base_fragment.xml +++ b/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_base_fragment.xml @@ -95,8 +95,8 @@ android:id="@+id/roadV2NEventWindowView" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginRight="@dimen/dp_23" - android:layout_marginTop="@dimen/dp_39" + android:layout_marginRight="@dimen/dp_3" + android:layout_marginTop="@dimen/dp_24" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" android:visibility="gone"/> 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 ae38e5beab..99d848f0f6 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 @@ -120,8 +120,8 @@ android:id="@+id/roadV2NEventWindowView" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginRight="@dimen/dp_23" - android:layout_marginTop="@dimen/dp_39" + android:layout_marginRight="@dimen/dp_3" + android:layout_marginTop="@dimen/dp_24" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" android:visibility="gone"/> diff --git a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml index ffa90b553b..455dfdd732 100644 --- a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml +++ b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml @@ -168,8 +168,8 @@ android:id="@+id/roadV2NEventWindowView" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginRight="@dimen/dp_23" - android:layout_marginTop="@dimen/dp_39" + android:layout_marginRight="@dimen/dp_3" + android:layout_marginTop="@dimen/dp_24" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" android:visibility="gone"/> diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/v2n/RoadV2NEventWindowView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/v2n/RoadV2NEventWindowView.kt index fbca9dc9e9..2bf68e4695 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/v2n/RoadV2NEventWindowView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/v2n/RoadV2NEventWindowView.kt @@ -173,7 +173,8 @@ class RoadV2NEventWindowView @JvmOverloads constructor( val containerImageAndLiveVideoLayoutParams = containerImageAndLiveVideo.layoutParams as ConstraintLayout.LayoutParams - containerImageAndLiveVideoLayoutParams.width = AutoSizeUtils.dp2px(context, 480f + 18f) //乘客屏视频加载里面背景切图包含了白边 + containerImageAndLiveVideoLayoutParams.width = + AutoSizeUtils.dp2px(context, 480f + 18f) //乘客屏视频加载里面背景切图包含了白边 containerImageAndLiveVideoLayoutParams.height = AutoSizeUtils.dp2px(context, 280f) containerImageAndLiveVideoLayoutParams.setMargins( AutoSizeUtils.dp2px(context, 40f), @@ -253,7 +254,10 @@ class RoadV2NEventWindowView @JvmOverloads constructor( containerIconHintLayoutParams.width = LayoutParams.MATCH_PARENT containerIconHintLayoutParams.height = LayoutParams.WRAP_CONTENT containerIconHintLayoutParams.setMargins( - AutoSizeUtils.dp2px(context, 20f - 19.4f * (54f / 69f)), //乘客屏icon ivV2XImage带了白边, 高度、margin需要计算调整 + AutoSizeUtils.dp2px( + context, + 20f - 19.4f * (54f / 69f) + ), //乘客屏icon ivV2XImage带了白边, 高度、margin需要计算调整 AutoSizeUtils.dp2px(context, 27f - 10.7f * (54f / 69f)), AutoSizeUtils.dp2px(context, 20f), 0 @@ -276,7 +280,10 @@ class RoadV2NEventWindowView @JvmOverloads constructor( val tvV2XHintContentLayoutParams = tvV2XHintContent.layoutParams as RelativeLayout.LayoutParams tvV2XHintContentLayoutParams.setMargins( - AutoSizeUtils.dp2px(context, 21f - 19.7f * (54f / 69f)), //乘客屏icon ivV2XImage带了白边, 高度、margin需要计算调整 + AutoSizeUtils.dp2px( + context, + 21f - 19.7f * (54f / 69f) + ), //乘客屏icon ivV2XImage带了白边, 高度、margin需要计算调整 AutoSizeUtils.dp2px(context, (20f + 14f * (54f / 69f)) - (40f / 2f)), AutoSizeUtils.dp2px(context, 5f), 0 @@ -292,7 +299,8 @@ class RoadV2NEventWindowView @JvmOverloads constructor( val containerImageAndLiveVideoLayoutParams = containerImageAndLiveVideo.layoutParams as ConstraintLayout.LayoutParams - containerImageAndLiveVideoLayoutParams.width = AutoSizeUtils.dp2px(context, 350f + 18f * (350f / 480f)) //乘客屏视频加载里面背景切图包含了白边 + containerImageAndLiveVideoLayoutParams.width = + AutoSizeUtils.dp2px(context, 350f + 18f * (350f / 480f)) //乘客屏视频加载里面背景切图包含了白边 containerImageAndLiveVideoLayoutParams.height = AutoSizeUtils.dp2px(context, 197f) containerImageAndLiveVideoLayoutParams.setMargins( AutoSizeUtils.dp2px(context, 20f), @@ -348,13 +356,18 @@ class RoadV2NEventWindowView @JvmOverloads constructor( private fun setDriverScreenView() { val layoutParam = roundRoadV2NEventContainer.layoutParams as ConstraintLayout.LayoutParams - layoutParam.width = AutoSizeUtils.dp2px(context, (654 + 0 + 0).toFloat()) + layoutParam.width = AutoSizeUtils.dp2px(context, (654 + 20 + 20).toFloat()) layoutParam.height = ConstraintLayout.LayoutParams.WRAP_CONTENT roundRoadV2NEventContainer.layoutParams = layoutParam + // 切图 694*613px, 标注的实际内容 654*573px 其余为白边,白边 左上右下 20px 15px 20px 25px roundRoadV2NEventContainer.background = ContextCompat.getDrawable(context, R.drawable.hmi_v2n_event_bg_driver) - val padding = AutoSizeUtils.dp2px(context, 0f) - roundRoadV2NEventContainer.setPadding(padding, padding, padding, padding) + roundRoadV2NEventContainer.setPadding( + AutoSizeUtils.dp2px(context, 20f), + AutoSizeUtils.dp2px(context, 15f), + AutoSizeUtils.dp2px(context, 20f), + AutoSizeUtils.dp2px(context, 25f) + ) val containerIconHintLayoutParams = containerIconHint.layoutParams as ConstraintLayout.LayoutParams @@ -364,19 +377,19 @@ class RoadV2NEventWindowView @JvmOverloads constructor( AutoSizeUtils.dp2px(context, 30f - 16f), AutoSizeUtils.dp2px(context, 30f - 14f), AutoSizeUtils.dp2px(context, 30f - 16f), - 0 + AutoSizeUtils.dp2px(context, 20f - 18f) ) containerIconHint.layoutParams = containerIconHintLayoutParams val ivV2XImageLayoutParams = ivV2XImage.layoutParams as RelativeLayout.LayoutParams ivV2XImageLayoutParams.width = AutoSizeUtils.dp2px(context, 120f + 16f + 16f) - ivV2XImageLayoutParams.height = AutoSizeUtils.dp2px(context, 120f + 16f + 16f) + ivV2XImageLayoutParams.height = AutoSizeUtils.dp2px(context, 120f + 14f + 18f) ivV2XImage.layoutParams = ivV2XImageLayoutParams val tvV2XHintContentLayoutParams = tvV2XHintContent.layoutParams as RelativeLayout.LayoutParams tvV2XHintContentLayoutParams.setMargins( - AutoSizeUtils.dp2px(context, 30f - 14f), + AutoSizeUtils.dp2px(context, 20f - 16f), AutoSizeUtils.dp2px(context, (60f + 16f) - (50f / 2f)), AutoSizeUtils.dp2px(context, 5f), 0 @@ -395,7 +408,7 @@ class RoadV2NEventWindowView @JvmOverloads constructor( containerImageAndLiveVideoLayoutParams.height = AutoSizeUtils.dp2px(context, 330f) containerImageAndLiveVideoLayoutParams.setMargins( AutoSizeUtils.dp2px(context, 30f), - AutoSizeUtils.dp2px(context, 20f - 16f), + AutoSizeUtils.dp2px(context, 0f), AutoSizeUtils.dp2px(context, 30f), 0 ) @@ -409,9 +422,9 @@ class RoadV2NEventWindowView @JvmOverloads constructor( tvV2XTimeStrLayoutParams.height = LayoutParams.WRAP_CONTENT tvV2XTimeStrLayoutParams.setMargins( AutoSizeUtils.dp2px(context, 30f), - AutoSizeUtils.dp2px(context, 12f), + AutoSizeUtils.dp2px(context, 20f), AutoSizeUtils.dp2px(context, 30f), - AutoSizeUtils.dp2px(context, 24f) + AutoSizeUtils.dp2px(context, 30f) ) tvV2XTimeStr.layoutParams = tvV2XTimeStrLayoutParams tvV2XTimeStr.setTextColor(Color.parseColor("#999999")) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/hmi_v2n_event_bg_driver.9.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/hmi_v2n_event_bg_driver.9.png deleted file mode 100644 index b74233c31fdf2c1035510a65eddf17b400533489..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15028 zcmeHO`&W|L*Eh4Yt2RzKmWnl(rmv|rR$daZES;t)Yr2@AVd-cSUL(9A5IK`gsZ8I} z(o}MsNlO85fM}wPDNQQqNv_ptFfB;zL&v-u{#&qmOO-%I8{dthq#)|B>Osp0P>+WCgI zSATwBV&dg+=)k^{$xGye0s>ALZ1a{|MELZ;VOZu7rz86wTkZbO=3Ae+Habom*wKBs zare+D@pl{l#$)GqT`KNA5Pp8w6|?ovemHT#dDovL|Irzjr8o-hrr{SWWN`f1e(@IB-@N8c+Zcqf}=We!dss1m5p$HLcS zY}G)Hn|}^`v&7Uaab<|svX%U0S7^JMF^N;t-gjAI8uazsv2+D;RodNYtjk2E)13ZB zT;6;K3#;T6rgtsM?Kd7`iH9hoZ~u)b6}L_g{7_ui_7mB-QHp0_D4Fr@>? zfuzZA8=_VrSVc)39T-iU<}~7D{ag#H_k)vt;^BUBoPpyMJ;sjdQWdL6Q7e8#a~M=b z4;AbhA?rtv(=$Fi*fBo#%0RuohdO(jR&-q5SUbDTyc!$@6ClUZo?M}#xo6o`8eUO& z(L(dCRd$=U&{Y(Y{a!eyE-`L!@-JEGXY93wKgD2n2{}rU8T>v+IjSCer0E6b^?o>q zSB$OrF9JO~gSCsY>x}7?sHur?a#NRX+b>kVC|i;m$;w{Z(6kla%ugc|`4BEL5KPc4 zbY@v6R}9lt1Knwmq%n`nv*^?+Kbck+U<>)>H`M5A?JRe?hx$ye;LMC!k|aLh_i#G; z4*y`9v0rqdkytK*vTS8_TrK~C9a1S(P!NQ(O&t#sM{6`nFXl=6W@YdSpZsZV88^;Om(fLn~5c7yPjh8%WC|E?ZwJ&a1^JpB8;YFXrcB5X(JN9n}7d0Dh5Hu z9UbpAbamNQxnXU5MT*Xh$wT9q zgoQo}|Qm7k(eCS+H8w?4_0cJ~^ zt>^M~vYm)T(M>hM{x4b)oL9~EVRl!PP*CJv1{h`5r>3ilxXe;&lCXDOM5uvu5=X0j z>JubwB!b8&hj3>tp4e_LfzV><0|O@%HyL#_acq+JT)qaxJ{xui|JIZM^*%4}M`2G& zLZ+zMmd_bpL?j9DzFg3VEZP& zTe{qx46b2Efu*vLp8nS*)#Dm9jS3O)iLuUDOYXr1*Wnm{#u1yLj)G|{NtoZMt4SDP z?gj+PMRpu6`JK!=*b-y*?C@Cxr+hM)$D{;^?#Tq8SR`Z!I`ZT=MLCoGtf&KpqT_`~1ZHk%41Phbfqw9s z^U#GH9S#zd=nf(#G_)l_IY9iZK zAYYu&DvJYOX! z)5o>sc+Ey9T&XDGSlvfu3%j|xM8rhkt9s)y6+QGd6HF_J*hf?fJ=c?x;~tc$DW7-B zYPH;f_(^mCr~pY-$UX~bw}Q#;p@R@OI`zsWBeLExcttczV+~-%(Tp^dMCxvyBPnv@ z>b>By`mItD6|3l+?hD&Hd!?Wp17~^gp=DXb9$g`q+3>H~*qO$~vgV4pSSEG)@0gIh zrJC8uiShOefragjC5#Z*lw`SJuJSktiD?gmX{ML`Gp$?-c@+A@!P?+Wwz^uqQY|HE zLl6^^rq?f`llMaP`I=d*HajaP{Avs~%!iy^!cO2~;4RS=tsZ<~bf>T^#=@{J&3~9q zAXZEu{%ktNhS!|SJ9~%WYO^*ADg3?ZKxL;T0bAZ1c3%mPRZq*zZ}QGxUD$Cu3Y!}Q zzruxlN^S1U+k0`Z@1PyLadDM$$k(iS(4ww%da=3#9%MD0kS!9)!E~au*@wrc2r+x} zEM-YNz3e3c=ZJ62+y)3*v@z0ZQDKDzp zQ}0+$ZYs z>|A%=nLHL3(4N2+s?k^FTJgSaTv)WNeJxx2tzdF#dQ{%O$9qe;WwLj*$779RkE$Te zekD!Yf-JzK#rIIN#IKRRH#Sm<*Vh=ZG{HwXTjjY{!^O?{Hg1Qr#ioA(B&HN_Cen4s zDlwIeP52yAh}3fjcJgdcHxQ%5Qp zx#m)hC2b8P-~G*s_sI+3YKj_tBbuIH!MIe2e4i)uq_l>F^b521Fk_bqNE!cRfTW_C zer%e^E_adjrM?l(9qHYm7X$|L;W}B1lLJ%o!aM>}zm@m90ybxwFc<2!xY%ocqLnQSi<6A2<1!vs;+4!Oe?5-YPK~ws@d+O=#6#}u*UnVcQ z_WEU8tW}-~yU5>FF*RO$`r6WEOD+{)fYd06ch~EA!F)`6JN?So3f1fk&illb1tIA$5rg%dl85g=Y7ayzy?hCG&*j> za`?OSYL2s~gA!73e`;a30hzL^Re$^)Tcisf7y~;_#WEA<_RZ`=Xz%maK>CCc-y6dk z)%4by&p#)RunHh6E(BI)S&mW)+L>et{=_?p(fW;gHek%Mym%3&=)}{h{{@kKEKRh*LUl0 zkSe)bggwjIb37Kens0MH&~zclfAd_4&xZ$E+oN2}4P5 zIhfY;nvo+j=RAp+iU50kjzAE;82lV}SY5BUhqK+B>lPSEM0T@sCc7zTONf23gTEpA zc|h3PEBzzikcV7p_H}d%k9=PLrKFmI2zKTAKi%W5kc*0EhDV#i6RZ+_h?AMR(dW|7gkK%))^vK^EhF9 zp&g8|$$j0d5E@qJjN1QiqgHuUoV+|&%}gB_m=57d9uR|UE;goy5B5mwU3Hh!jhpmJ zbFOb^=I+B{Fj{g+|FkI_-Bh){B!iX8j?#-$Z~rfR#xx|vq?UQGau6dLygjSkNq&Q# zz<*_QQx?1MvzEKQ_?GC5#FB88dVsZ4mVe(b;drTfX4hzsv>ErKnHN6a7Li-wS;J1E zyJn!%p(^~LD6_&!J-s3|u2?jb{VyTp`Y zF$GNcj&?d{Z_wjLNL45Uv(w%@S$>}TF9v6r-m)dErC5R{;xETm+S@-26k0;MuP+jy z{Os-*nI+K-!NpIbHRdW&cZ;m3+buwSZ{Zc(!m94<`yq!|zfn(#O0Xjuc&Gf6|1;Yndw{LQE~zo&^)_?_q_I;A@(%PkON%B9@3Rf&`o!))=g^`pptfB z-c*6reA{DYCMZ?;7Z~2@eTTnT@>KQ39(UtL@ZJr4@ThT}WV6AR$D!eYu!h<8hOLEd zM~uVbZI3@q8`uzeI+sa`ISmz??1V94?9f0vmF?#`K} zc^kOU{G*wRZFG|M`t&y})u%=aQCs4xR;T(e}lt;O06o>JSoyZoF%5GnggTDuNfU&7<9?gM1GKD*hr#NzLlhn z7Y!ZoKLL#V30|0Pbjl}}Jf&S+Oa>mVw~8*spw=EWIQL^fhsVW63f?>ITUn^;_4F_> z+85~XaR46?_=vzq1U@405rK~gd_>?Q0v{3hh`>h#J|gfDfsY9MA4dRhL8FkZjVB26 zr%uzq$}{6S^NbaQ4W?J+SDzVADVsBa|35ak^8XlzyQ^u!v)+S7N|@kd@Hc;aet5aS z`(5kWyOur1^C$1U^XJGc3mWI>p!)&Csngr3Wvb-@zhCRgIN2MV;OMu;FaEpiVq`_| zrOOq5GI#aZ8d{0vbw+narkFeK9%yJ3Uuas=;gK&OA%P=uOqYAWZSmsK{-+DiQ?g!+ zjD2S~7+YehHnrho64piIB)YnliywzCG`G=Lz3cmHyW!ZY`PqDP*i%&xd`R2&tU23w zVD|RB+0o9-a$A&hA9<)!r14h%w$~wMm9eASI*+YxYip#?%FxM;K7R=2l(Esq>G?je z>AP*Kj^Jn{4x6GCaoZ1So6DL`bMF|>^UVB#3V_DWlTSyFAFCvRaxJqM-Dzap?o|eX z7f|O~k0*81<+{_q87*JCOpt?&J{o6#Y103u(Mr(g@e>`%-&e}5-|?s0gC@PwN{ru? zu8fEbX}>cwfCWozv|snB+|{C1KmLKi+ZlFpw*UjkzK&+^SK>&i@FjtxJN0wxQo$i+ zZQ{mBqb0L(GylAVJI+bzS=jRp8u8OMj}DvVlMfdc11KbBMlI`~tt<;%LDMdoov_hZ z?lc}YI(Ds?f~=Oi{RkP4g|7up*TI%-FcF5$v|U^uOEVvw`-{~xVO5*P`jJzC(UZm9 zQT9ZbY&yIFV@d!Ui{nd7H(Lc)=}OM-KFlo$mRP<}LaM-0v1$s7%Z6ay-i|Sr4eCzg zJ8tCJzbpnx=Aim894ML>dt=7jJvR#|(QU^(tZ*`VK8ut1{Pk{rk#P0F#yvvC-sy6S z5_9|fn@Wz$|0+E0KEd_MQn5#Lny?0xh!5>hBRt95=5#HeE&`VC8`;{C{p){cs)+<; zLA#HF0f%W${j9rY7uA$}Y^L&zCc-`2(^#N0!9Tx!YyISlv^)$ufVfapgRi2cyo3rN z71<@aR0I*)(7#xI=v{fhKeM7w!dm$QPdXQg`5w?%lwr6Nn~zI8X5m?f{$+WKm2FjI zTSfTc9?x;j8R3)c6*PpU)bh8C=|27%u@M3CX-Bu$&}-i7#l0nA_n%&#>I!LRjsrqG zTrD+@yT%wd@Z}q>M}KBp#mNGHM~)IwSjkm;R??Jhb(>*qiQgq3%^5&3GtK(~`{h># zr5dnh@_i#(o?qYXw)}hh0Q(?Su%zgIYxiAJ7!2Tj1?LQmGc$^-8hT)4Ox;EN^J}}E zmiuR0i|4DW`lRRp%SPeJ8*>l%0gZcf@i2`)1AfTBVZc$`TJia&ww##+XFu+YU@x~x zJY@bf5u<6z(cA|e6@qp=3=gcO)T$=`rLZEy-k0q=el0#O`;6zr&93JHMLnOdA@MO} zI0w_O?>N4-dO^Ml=q){0Mts$gc}7#F$z6_OvVX(~Da!rE#qB!{q>3E z$Np6@pY?%UkX=DJ|B$NNIiw3-ELd`a9KQ*Rc$&Y4F8%GgvV`K($IX~Rfqm1Ck$E#z z#yveRfXH5BWMs{%xpLK-sgwj~w>EV>^)yeD%7Y(#p26x&83|E&f-oIfe3oF2)3)45 zo#s;(2UHp%DXaQihcbx$Bb*n2L}7v|G4X!3&sqpE6DI_&IZQXn->@53y61jA)`zlUkdNLZlre-?^ld`f94r zGnL4vFE)#}DHCSl|dtZ8I*B_Q)ThdEl=X&&j(nJ{G=hIH0+7ZqqO zIsxK3HBHR>WaCwXRN(E;%Y3@oD)qdoc6Nt=;8y1kLZCv@5p23M3!ZT`#(SsVMISJ$ zq>`@yM13B_TbvFb-FUw%O%+O-v3&8vLBq~VhMG=*ZfHeZDFsyVOMd~UD<6{<5F7;p zHmrw1;x(_IOa69EIVP-=TCWhNyEC7;>tAtS2jUy!!iirR!WiBLSX)7W?lNMc{100w zZ+3MB0)w0Nd9IS(7lEJdaoDl4!c$1;1=ja?b0>q(LqoXBC(xTf(J=~7nRe01wy!ww zTNW^eGGabYo_n6jLK&4=_L1{j@BG4AbMucXs~f%9ar+*#dY%zbyUN^hN!bu zxQ9pDC|^Aj)@#T67WF5|uS_Q-!TNoOiFB4v4>tiG;L*w0cpfoG8wkPt);Tk%9Rg@O z=J!)}4F?R!g^(#D%x>tot#SgCbFfYeA+=Jzdcypd;!w0I?Gfg{+#Qv$RyD%Ccr2@# zPtaK1NBi%i4Puca(AB@cmzrEEn6#WdY$iw^E~o>Db{CX|a#<=X_6h9I=r0fsf&g+A+a8@BHujLS(n%kqkM+8=pavw8h*IqX#WrH3x0jt$Y2H1uMtb z0yzw-kxmJ>b0#y{jQg$czEt0RlwiAgq7QL7klo9i|E2{&LXuU~A^s-BgnOJm0)cz7 zyD42@Ww432H=T&Hct%Op-R1fWLa%jh3=5Cl<(j$m(-X%i&{~+$e3bLsPSqgh4=Nl` zO1HY{{IshJF`wE0!s`whA|kZN^L9bw`i$+CT>54cxCP@w^5mF3}bU5E^%K_|TDnUq{w&zbDidmC)oOg^* z2zTZIU8Ny~1TSa^0!1E-{tx^e^BZbtk@b|nTKqxe3tLrDGSeO6BRQtOrpi;qI_tiQ ztxck-z@)}TBh`jIEz*iH*2JIWH6*RDL3N)*&|7RzA1Puk?*-K68gzE;cwbwg_%3jPZ^-P z(tLD7(LeL&4n;fJK(^U0>jcz!%ekrKMwHK1jdwt1jf0Y2PKP7o3I(SEM)#^WfXg(Qv~=<0W@xiaBJ+@q(xoAAndZtS z4Ul@ei8Klspa%w|n!4K*UQwEaxk(hi&J=+gW&7SlU%ZKydJsKVK0(28@ND{Q{RULX zM28=*2%J%LuJD8Mr|u{oj3*0Eu!7^1Ri}B#0dBizlJ!(y(@AMF21bFLGU+oDYRHund`L*kMP%;R}IHr&)j`-OEPl z8S`nps6v?s$R7c5`IC2s#n|yokyV;`F$0WXB;;3KEDCoaYEqwz57~Ll?^& zb}t0U;ZO0@N*;%o0GHIw-yWa>5^NYj;iQgue~Ur+B8tbjEu(fNzFVq@4ME2ia=d`M z0t?qBGQ|O$b_Q^5Vb-fHVMH>J?V?v!5pgrt=q(@2$9Ko?8MXsAv9qKfNZy?s|ViZVtlH1Mm z;zePtH3&HZoIuDW;r) zn7^9wZpM?Dtl#3-$B$A@q6$z#^8+2qNrVV^AuJ&{DH`mZSs7wvsKHWQZ8OwyOd_kJ zXc7u`0(h`vs`2Av<_^itT!|6^SX52y45lbcz!~E6U~-yR zeql!0HT!O@+d^=_i_F&k@)X;cUBmYA0TNc=_CT%{(B1s_vaq01U z=sT7hy{EdO)G}1sBd_dJ#2l7g=Ll4;9xqoLwLdUZ^wL)s;E*8J-N&LaWpIgNq-%Dx zs76w>f5+a-*RU8wniRTUrIw_rGPp>h(ba6j`)y9B9pdyRkVKiN5E(XRS2iP6spe4w zD8wI*?Y*4aojQL*?TQBd2`0ve7bpkG7^Oul%m);jMJv2dcfru(7nsDoiFRIEaARMw z600xCB%Xinb@?Gx30!dF5v)-_*Aih(>3ERg?8xQI%B>z``5Ota9tpeXyNN*Niec#X zYfA07s)CppPSqrynaJU<@=Vn8ksXF^src}vBCd`~4VTDldE+GX*<|ox4*{A@!jzKb zDcfM2A!HNSutdm~*IaEWxtCt8%&b@Z*;})$I-JuGr7r@*Tt^2q^rDyrNhBaZN4AKH zG{6NvDQldfW_G2jjwQaB31n)=Zn3<5DiPJ2Ot1Q;Iw0h9j<#NiGoWeN&if%3P^@ zOLGC2KygD`L{lVZ1XOS-63U$j5D@r1R^YtX_5J<*{^K89!1El=^EvltIp=xKeRKWz zG4~bAHZ0T8(OL1!&xd~3(a|LXuL#2>z!94#m9fCvBE;|R2XqKs<{yABha!A`i9C8# zXDjg8P-oHAKXmlwngFj2z)MGG@%=?Qi-Gq=bI0!MYR>AC?=RMVj+kqR3dtGL(b=c- z%c1=zk&7kueXt`2$q0}W$}W%Uohsc?3QAo;y&LOL<3a%um^n^aOD zfGD3(W{wpN4Nj%vZ|E%2)iX4)+IPO$&Sd5<*t9G6ZNPAX(cvlJ(A>E}56lqC20Z&? zn#5!28JiJB+A?)+mBE)E4gaysMKP@4>JIH_!Ur_){!lUc2%me?!3Z`d+^9&ok?gXR zJ#dhFP@?`5_O`-O&b{pvmHV}C@>*onOj;Yl_#FS2;mNfu!oZaEn2jG|w8By``y@Gc z(-#wh?>2`W9I<9Vs~(p?>zmvZ1WEGJh^$FbPu+gAxkVRg3^!PK>~mv7lY9Dv6*r4mAbL;$G1Vo7 zOgP6@c-rRWbN=a`EpcP>6EA?62)BL@R*zWz1t=X%z|z3g-{V-F;&bMyfy`q}kz#Mk zPQegU^5bO^BGr%1Ai-%ESMY6vgp&-}RdW1TqwxSv@D-PuEz{%+L*1zmG3D%p(-}T2 zvJxQ@$!m6_mTes4TJmKlcvriuCuh@G)vk{Cv8VGF%`?g@l~H_XBv5J@uOBb);T1FC zsHUz)u`1QHrz>6J0;ScA8YHAcE)b*lKsX+3ChXJFuecQH?ObuSGzn3Tjc4K-*~#Ti zSqM=n%rYpIc%knJBVRCzWKy55^(`e`_Z1vt@}=+mcYFXH3!Ok zn_4Pn)}qv+{=HHkdFd{xkK23IqawHXf>Pc%%#7Hf@~Zbo5Y~zkN1UgQD90!=)um;c zzV>1eEeQq0xrX>WWekLr*KwBgnDr0@2|`283C5mKl6?m5OXHS2Eo9`3CFLn8nendC z2xXKDk&*Z`aRiZE=;j7toYNY|(sgf1Ah3m8Jgt&eR^DHh?++0G-K9?wPD{nb!EBd0 zutA+Wb$VFe9e-l16vf*42L$dz;)ZsmM}6al=HeYE8KzPgPEp;eH07y2C8B4Vl*3Wr z1T=ayiic7wEvDoaJnXiiRL75ZzNSmU_CGOGHLbVatNBW$Sz)GvJvrrxl|X39ZPE#v zyTXH~dYPzxR*R0~s^hu%^~r&P=VEj+kK_FGf6N zOK6*j1y2}c5Rg(Z%sT@w;B_LtccCAm)wrEQqq~aDYO%$gfmf#+1FMc?MA9 zxKO)E;s)uIX|kJR-A+v%xM6b5N_Ly4dXuPrU8`2q@`|X5F9Vm*$MGA81?~QT4@3wx z^PMuQ?lB9*LbD5+^C;{XSGg_tYJXrZ{B#pJ>1a8)7LS>3vGH|5e(LgPs7lI7 z?*$g1J4%YO%64w>G@1p~VC=gu32$iPWMe{ouE^)9l6fj&A}lJOW6R`6?@*MISr4Ja z+$$WzYc&nnLC9Diae@oYEOZ#6qI;SmxWdvUno;Xut{S}{ZcS6vqC>cdihP>zN0JY1 zu01X>*wLuQ)JpUc_Xlq9jyQ&A_YlwX2E*NBX9vge7E%b7bNFj9u}W~pfJ}*U7!Nx{ zD}N(C33hW82vAtKnKEVIdv0WHnGNb^w79^(LsgRLUoLR!pIPIdWRAWv7C=+dd1qIB ztzm`@t{Amburij11#i3iz`lR>pKy}HtN5~Z;b$zw?-Oz{yP-3Go)u$1_tkHmtjCSt zAcby7o;3)aA5@KviTYF@c!M-KBlX)Tcx}F-vVM6fB0%sE4YVbmYGPK`loK*ap{eXStpn^)+4cRQU|3wD~E zG46PqBN_-2(}|SGU?@#|y{?JHkbpL9fPj4A-3(y~h_t+V4~X}k22NM7TP@VYX05NL zpX$9O{+`}mtLD`5K&jVe??U)><}hbsd&<+Konxi`T^8h;Wn}U5YEbN8C1%_`ccX)1 zkBVz6b);FSzaeO+PGA;1RFSDxeNeP2+Y@13W&;pNh5$}rCQdLIK`yADD}vG!SkcbX zF!SUqz5TfUbvQ*l&iQ`e*PLFY>lrXCYL%$kYN=>0h&mL_r>e<$X;td~D`>_yPQR(7$FG+r_{iaPqEsw4Vn z`AEO_4uQX-HzXHCjt1i2GzM-)J#S7$4R0Y$AivQ#+B4Yd*#sn0QQvBTR&676UP&(G z5h-zTIJ}cB;%EikxRcFH{Dc6Ca``C-eyF(=3aX)cIh$xkf;p=Hmc9Bd`&VkwI5qP5 z?{NcxS!)EX6auNnkSu%CT~G(FpsS$k88c%B6TaHZa+aorkIyXTsag_YZVmigWSd=l zgZl3fXY_F_9Dprv5db{aK{s|b-+w*~L?+k3`VtXObzKp^MRZCziK<_Dgi2^fktt^^ zVaiMgU49r*zP}qfAlzf$(+a+=$O0)^3btsf2J*D-P2qQA%<(Lx_p#3S`;o88f|#vW z^XmD=?TKVz+9%wkJTqKP%n;+(8qeoK!JU2K4Q(kmSJ)}&O7FPeF5SDajZ^Ohf+>?y zf2l}sM0RI`cik;>@P`lm#7diZ8}zHz&5VOqRl(s+Ig21lS$(FxaZ{H*M>evj%fZb_ zE)HhCMZ8swC!*oo6SQ@}1&(P;yQ$o5z-qYXciP+Nuf4#uQB}Zm>_@anGGG2<<#=nv z9A-Avg(9QldfevrW8p*LYJo6itBX1>fBl-rRNp;a1is z{Q2E2dm`R-8CiCVZR7zXJwcGbCkoisS_k>*-qdG|ykySa{Jkue?Nw23Bx;En3zQ&s z_RCa_g%WSdaSu)9oqntLozaoad5BQ@pYA_om7NohTepx=KQ{sOgia^T6d^QI=ptR4 z0IS_^^436jCEtkFLD@?<$i#tt*y?gbHx4YCriK1JUn3ssf4Am{L!Kx!gI5wupyX1f z$F}zJJp{)0pnl+83WQ<>?}2fr@rE@T*c+TMZI^DY5H#H5={!-c7kn$Ot;$yrH$z$^ z%olGxP{+xX?`fqHGsMk#)L$AMatMrQEwet3t)|P{B{?C^)E~g_i3rwD zn6@i7SK&T}u|RrfegV9Bk60EFAV3@xN?#2^w`f;;dcjZkg+G@&#=@Ak1|-sN3X zIm9aZf!i)1oswN{i~Kqq1hW^HZ+xSjMT>QBu40U|`QrO_bJE=1a^Y2j7beE8+vTU7 zLcJ~#*T5N8Ih()wrePnZ?ON&hJ(AUR6_ZVY9`f_t2ftqgIHoI`_ zRLNLEE}|TW5%Hr^;}TLo&iI;eU5)4O8n{iY61JH5+3pStwD(}C2F7zmq`OM?gcp#A zA>HjqJ5Nw<7Ng&|{PCM6PWBB4TUCeBadur^{5*D}B|9Xw{W;|^xf@SIg(`AmaoL?$j1EU-+iE7I&%^vrwsrN1k#b|3;xQ&ja)ntFd|b<+4MO zWv06o#!D!hd-+$H4vI?5d)frs z52Sxx1_E6gVRB62cQYP|kV2%51yHIY_H>b(euVd-BJ+E+Wz?#|q^26NlTm*1k zP~MD?`kYRGvg~10;azEZ0`Cet*~YN>q2K;| zVOE~s*gw2<T&Y+tD+kMVbKo! z@84@mnAJ44InPw^+aBD|xsUggKX}F%TgH#{HW!gg{$-b={&#l47QsVlFLMiNOE}C( z{wF1W%LZ+YH9-z3e6kbo?64vG18%r1LW)1uMT)zacG23o#RhUevNgvVcZhEvoNPP}|1y=)Q{d=q;gO?GfYE$e0S(*^vQ* ziPrgcHh#lieINf0Nu4~{MW?=7{IOA6Z1dJSWmz-m)D*>|7Re`{PVLNUg2d_TailXk zX)c=BYL3;5GmWv4uM)^CMc$u9P(nqq1arF$WE zlb5!n^?L2A7!dZ1XKT{>{!&A7<{^ycYl!=zmb0`I)iAARHe2;Ntk&0lwE)bs@T3=L z9RuLS`B}T%(pxZK0f7Ys77$oKU;%*z1QrljKwtrZ1q2olSU_L_fdvE>5LiH90f7Ys z77$oKU;%*z1QrljKwtrZ{{sY?cU+u^uc_IlVfF$^M$a8ufJgR== z*1jGeP*sVAD^WuXwwm6p4{W-6*ZT@80p`_yDrIYlwr7(cbR8KP@tb;Cplw-=WB=M3 z-0{^AB6X0kQnNj%gCRB3?RXqRvZK24WB&mSjdWi~7$z6i3b1P)P#Y9*v&Edfnx8b+ zZ<>DHiM;29yD;%)@wzm;@xVKMBKeYL6L2`&&}FmT&be(<*N^^9;r_Gjf5d19xG!XF z?e})Uw_KrAX@7`9-tzYo(0ZlkUweWyn}myWw_(~c5ZJ)-`r5NQds)UES-_SrLk6W| zwZxS3&6wsVoyfl&JtJOA^Nq*`3MW4|Qu}S=9PI`-(sm9AfIzTkBPbKB3dKHm{8fwc zaZG21d-m=jX9ld1R2t$8cENExjyxc=A0@D!%wuWznP=egcQ(6|=dRv*AoWdeyA5dK zNWNyQ=bIawx7rb^MqY-L;(^`$>CjU#{B`S+tmg;gZMBy_-I{|DeOl#e|`pTx8CmEM<_H@cXi zDi~+WkMkK&yXIP%uU*7MQTHQKpn7j_LCSR0&QVby7QPIvJhgYeyDOiseEpW}G=Y}J zs-nY!85YW|&t?IhQ>@Ka&{_m|Pi7%sOa8GkIk&qiG&tL)nx67>jvK@mmdd><=vT4* zvWO&er6*QVgthe15;>5S09$C&wk}!ag&vAOxQ`0ZO$>S*6vB<&08Jab`mmO#r-S*< z#I!Q9b)0tVy#N^(rh1ojw8Ax|y8**}fwOSEKc8=*`nxw-Mzk3`FS`)Cu*&L3O?$jLY|FA-kTM&q&_TlTsd`PD=eI25NI}F9oxm0Xj+R!-1bE3T5ZD zDLnjg>7lh5zul8nkTJHn!nKedn>p4Yv!m*6EXp?nH;K-_F;Bj-Ic8Ng>~$FLLk|eD_EI;^hxTXt`9=Y5LzSKC-r~Z~7$o`%u*=d?i_IjiAO^ zx&0u3&k?=Q=fsmPS}sgQeKU3aP;=fo-0rY6ViA9ImP>t4{O(-`?@a?>4y!P;e^m9p z7!CUu0kXjm(}q$bxTP`cNwQb|tM4-$=q%^LAk7j5UMZ%DH4kV8{7z|+@b z4(0S0Ryf~ntmDhd@G*j+%FLJc)-W(fUNzgCwwWgASMRo*0f`UK)3X@AT2&3AEu@q{ zU%_H4S~n5W!+UjhlA05!&w;Gj()7-Ne*+#MsG|P*UVWwkj7phjt|NnWg`R>VEayA= zK(w1&Lk0SE2!q5Ih^5fO*JvNv2GL-6H{U{(Sk6CvG!`+j<;WJ4^_#K6VQu0f9dy;< zXkHbr(_iN?*$r8wZ$;tC{N{sPM?1fmD;|HT8)j^HB1P_A-WLeu#1g@mN$d^TUVVtJ~@@4fV8?^?K5XfPQETjxDS0g)z-MVx3$CW&&ULNVtxmz zi%IgkVV^h>ID7e$VGYzd?#)>%tt`RJFuYhPt7I>K#Jha>3u84a7+a#z({*;+CE0aUCUaqGpal=cEW@maiLl#m-X6njnk<&%^Q(Fkl zzBV#_J4Lm3T?{YN^moz3p5V*ObIOLzG#NGxMiwSBnv%JAaGZL-UrCfEemy;`R0k{3 zPLuL61NT!7W2XMqnNvR~`i|@%tfv7~++tj{sw6$8A~UO}Vy^)!uXHRpefqkMkPbk@ z^Tedft|vX#&OU?b7__t7M-CvC_%-K&xR~CY($iIszc}uKKAi@TN7t34bY`TQjYK4mDmD18bxQ&VC1H5LBH^&tH5ePT(3|L*ZQrA%H%T<87w)^1H-QyH3t9FBxad z>n^4x`lxehhi3nhKr(tp7xMyf2mx|yD*=y$W4L}j8b8ky$>f2IptOcGeM=-W5J$%FCE%CuxAZ!NULn_{4Y*eE9K*J;($cDvaB&@JM?t=kLC5NRudb2 z7~$n)1h_R3hAdZ>G076o@=VH1ZVmbj7qAm$kUXCZ>kMB|H=0mKW%yR59j~jxZ*feI z56`=tkgt$U3hUVT+sghUU?P(LcH4nB2MIFD-Y(SBb2L~uxPN)MyD|?)mf%=|dT@G~ zdNdKOtffYB*{YJ4$QPQa7|GJ5?rEwAZIDUo%WUr*cm_r0YKz^* zW(o&72LPUTtOb6;-72k(ltN(bj%uxkD2pRP=rVIy0Q*p^Hy%$I8-L>FUu13$&j4+vbDLk4M z!v#A}su5`Qrzjp+w$CDoY%n-2m(#t0GYtSEJeKKHU30$sHPgeWgy^v`K{ z7*ekU*Akj2DGmiqi+3mG-N26@sa19+qFJ@zG&H(33jEXLjQC0vIF?)KFgf$>)%EVV zc>Kf2wn5tQYveP#BTvTt$wC?~se~7ge%s%9*fe za1+g(CKSaV2Df(5w#J;SYa9&lOLj7orFMVl!b zLX{VZp6S!Kvs~Bb-Z1gyAUv1&yPTLpKE{gjOPd4ObjHZcNkEDOf;5P@N$oj^sa>95 z?j0I_!+7WpG(5&uqf0U=d+|IKPeSaVkzAR0L1@~UmoRM@vke1p-FTZWs@oe3bQ?P;D=;UrdMJge*#aQ% zVg;xS(JR+?Gc6Mw!%+9BGBKdY^1p!^6dsL4GYNe74n<$9^T)lTw6y#VanWc}rrX!M z%i)c>?x*7CM3aofxn6M5dy;Kb@2feuL&@zk*RueXJ98@kr!l}g$DCHT*>GH51lw6c*I z7+2o}CyW3kJ(uTR6L0sk#k?+&9$C(+_5q~HfP&LMR{<0Ouqf_~e9Rv1Np0W$#q8-o zeZtbSr6dx06c)>5^>e}Y*y?Mty3O$J);oxQYZ5t&#(NZiP^3CDeygIJ1Ptof$))ylNir(0f8`AIq&HTNE@_l*y`L}V0v$q> z9`F{De{M$7&uU}8BU{tQyY^ziN>${Z}pWvX*hJ1p3{7l|Wzr|4E=vEQ=OMs&epfHg+)* zwYeKNx<~z565A+!pb(mW4Iqi$pwDaPlqo>iO|ZDyHQTxUY#b_B?bGUM8$Pf2erWk$ z72oFnRq=h5~hg}8!=%12f8z+VD`|9{XQ&X$E zb`A)hBpK(|zdL@cQE^L9zVYiFl8eLkf)o|bQvM&{F9BZ6{TILkg!tsK#zI0WLtd|6 z1(&9_%RN|md+*cS(4zzVFOwZ6%X+$Z8rd$&Dtj`@CJ-4-rOJVWeP0Ck#{t28ead~e zj4wCO$h*46E3%BwO>ShkEd3-{%Zd{!xo<5z-zLOf_}W6ETVwd321&bp9`)nK$wz5; z&$sB44*S2=5BV$c6t0(+!C| literal 0 HcmV?d00001 diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_fsm_status_detail_close.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_fsm_status_detail_close.xml index 1d9b7398e3..830917c1b7 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_fsm_status_detail_close.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_fsm_status_detail_close.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_status_fsm_item_layout.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_status_fsm_item_layout.xml index ad87fa36f5..6044325daa 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_status_fsm_item_layout.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_status_fsm_item_layout.xml @@ -1,29 +1,40 @@ - + android:layout_height="wrap_content"> - + + + + + android:textSize="@dimen/sp_34" + app:layout_constraintLeft_toRightOf="@id/imageContainer" + app:layout_constraintRight_toRightOf="parent" + app:layout_constraintTop_toTopOf="@id/imageContainer" + tools:text="未收到全局轨迹状态 + 档位不是D + 主车制动未释放 + 未收到SsmPilotState未收到" /> - \ No newline at end of file + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_status_fsm_layout.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_status_fsm_layout.xml index 3e0d736fcb..be6e83f206 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_status_fsm_layout.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_status_fsm_layout.xml @@ -20,6 +20,7 @@ android:text="" android:textColor="#FF4E41" android:textSize="@dimen/sp_46" + android:textStyle="bold" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent"