From c2f258c3c45183804a55e5ee40c6c292d131346f Mon Sep 17 00:00:00 2001 From: EmArrow Date: Fri, 28 Jun 2024 16:29:40 +0800 Subject: [PATCH] [6.5.0] passenger cross road ui --- .../main/res/layout/taxi_p_base_fragment.xml | 11 +++++++++-- .../function/hmi/ui/camera/RoadCrossLiveView.kt | 1 - .../src/main/res/drawable/bg_light.9.png | Bin 0 -> 20537 bytes .../src/main/res/drawable/bg_nor_light.9.png | Bin 14444 -> 0 bytes .../drawable/bg_road_cross_live_light_empty.xml | 4 ++-- .../res/layout/view_road_cross_live_light.xml | 16 +++++++++------- .../src/main/res/values/color.xml | 1 + .../function/call/msgbox/CallerMsgBoxManager.kt | 4 ++-- 8 files changed, 23 insertions(+), 14 deletions(-) create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_light.9.png delete mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_nor_light.9.png 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 c96dafc3ab..058ba4b9d4 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 @@ -193,6 +193,15 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" /> + + + - - R.layout.view_road_cross_live -// 0 -> R.layout.view_road_cross_live_light //todo test 1 -> R.layout.view_road_cross_live_light else -> R.layout.view_road_cross_live } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_light.9.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_light.9.png new file mode 100644 index 0000000000000000000000000000000000000000..d1f2517625ec105d25c0fe379bcfe212b2323e12 GIT binary patch literal 20537 zcmXVXcRbte_kJSw2&(pMJ!os!rif~3t46E#9<`}Gi=akZF{-u@^(boZpjK^-2n~YR zD~Q$FqkeflzwaMO{>m#S=Q{Vf&$+Ja{oX)Nn}L>#761S+Jbm)$CF!%_zZW$n>0Nb% z@;(4y0C@UH<5jTr4%{`x$|R)9FkLCA0}mmi8ES`0r%CtHzwe=tD7P zwQc^5>9)m!byz{TUcs+VJmp)Jjp)tY`uHP)>fZVBp`ZH6jQaIn`p@UpSAVYmuKvA< zw3d^VJ*I>E&jr|A_mx(wzrbQJSDn3~t)&bns;57#Bb8;3MZXnB%ZIQ1wb506RlelgMTqVSRls*f^TFVDlycJ}yoHK1^ggUbqvEqa%0 z9U+Dr>xI$EQFz7#Re^TGI-K#cBw{eqOY-;Zlsa-YYG)uwwJ-^C!JmQUbLw1Xr*c%! zatGpKGPi9D*3=_CyDoMld%_R8j~^V71-K(5!KeuB$tb)H=@(<7noQ1)w!prfHaUx4 zbWQx~1bdA+T7qy&TWpA`#&L|92;&phFLmZl!!W0g*Z-ub?7O#U=`;mM8T;wo|1I#2(exUFSc2zK%cA!h-*C+^^&u$n8y z6NWADK@l54nG~6s!oTcU7j$*}gbb#zE-nGy&zHYdqIR3B$&m~C))DFoq?A;%V1;T_ zwP6O_HLA^z5f=>g3pE-s_@VczfB-;Pjq+xHVdQzWd+POfJ#+5G9n0ChlZfb@kc0nn zMB(DT`4=QXk#z-@j3H801D7QL#{gm2k=frrv%m#P?@k*rd_<&tRQOYfRRTXJh8?v2 zk<6DaLG`&2K_X*DW1hyVvw)KB_*{cG%8RPr#-Ld$Xm2YxGFw*yZ zS?w90sUmHV+hYOgHXSyd%3W8-PTm(+SP(AayBJQ_AgpFqb8foK4>3huf4yK59U@+Z z=USyy@B;Zr?t5{Co_3yS{`K3&g7-s_xuie7;ML`|F=M@$WQN@C#ak=iHCvD^hSIN+cIoT*QRH>; z2xePGb5LpX@ttcW*y6>JJK#GXF?7m{Do~|)H?RDHE`WmIWqS;%=0;gX=d@H=c#9sageKr`E8l@5!PtHrQ{wy2<=I}X zF#+!8ckM1tM({|oVR@sD`Q`6qh54+>#aKd-;Bkg#zSE=9oi7)|=k-=$)(f!91?^2= zRNYnR-Am8K$){7JRrOx+UhGY^40v7Ji>rD1fayvqVB^NCvjB+A z+bq>VzV%O{%|OnWTn!Hh((2K^mwwm%2EjM`=S0lz!V|9Yt)EuI*Q$5LdnEbmwoA7w zXYHCte&|Aj7y{pT?F@vpBjh1dJr$5@1(Z9*nP2m=yD6l9Q5jm8>&0jQY3tx+wL7mf ziQez`q>A{nUfBMI=iiz{o``0(y8OVofH0!`4czTHew;!$FbrOJY#HkH5ptpaTS^2m z#j<|6jfts{V(F#*ZNf4*6w7}Zz~@gX&{`F<*6+!9Eew5WhLN8;u2e8OOxL_hy~YbL zhK%=gZceEvDK0v7)sD1YF%zqWYgoNH)yoZJaN9JE|J53AR8=w;2-+fV?;p5!V{ogV z!+=r=aJlijG5k$**3t-2IBOSgGUf?Xo@9KYu=keOOnK|-tyR7a<4aR*Mr16{?2}op zCeGQai|*Dyk(zCMD_J8jEX5$`10O45w%d}TbwO(CaiV#Ov=pTy?*m7jXpSEMDj}%Z z6xBvs#74J*mdn$4Q|NIAzznk!M=L^N1a`e1%gegSA9 z{X8N!DCu#qxTD4H{FO>YIO|;SlxAnxFW#`fB~$DwgV$>BMt>KKF0ai7d`O88Xqtt3 zj_>p|885O;9ouRWadmHE9*}z34z5xJn?I$6P({%YZlLH75w;T1VpW#ggF-1m!Xiz8 zHywVXZx+}Vp<)ftZMqi@UluaZ+H}8}^Pe*PI?Axq@x^#nduHewo@&E4sWC;h{dKzx zA-akaW>jc`FU{w+1hU}N;wnV2?dzN7i1Poci`!{$IOMw`#E6dK?9Z#0<A%Hua0dP{0FaS&sc0|oEzPy4cgg%li<9qk2YJr;>|0H}nY-ef z+z*ontNKsq&L#%J9B00-ES->GSGmYGrOYV)*{5u4RikIBP*LJuu`5a z>~JgjUa#HNJot`0(|5sDq=LunpIz?gG%qsbtX9=bP5RQsWmCIJdnmw+<(tpj4>VBKF@5cJAIF72XOkvPBJTqZOFtWY% zwz!3p*f3Lo&rhqOPO4a9=*UP=l2!fd?Ln&H(0_|B7i#yXP2(gOe@-5C{SP8j6Gr3@ znCCyp9(jk^N_Xv=+G;NRjI(=UU#P~M&fy@`i^?yzbSy8oEvn_F^s}mp1G11>=G8W7 zP8p^>+$a+$$RufCXT#$xWM)`F8NyT^wb!ibq;3_bi@V{HXZG#13|Wnw6cf>ye;c zp(zSQ8r%|KU6Xz(aPr7PySn|w;n_~nl-IQMWqd_#sqU<{+PK#7n?t|-?DMk*F*Av4 z?O?(QYiNbwwRTT)-@JPb1CDLxYmFxn-?qTwK-1OH6EpJSU*hD#@LVfh=?+IwTx(9r z_Lq37nTK%T92y>$z{M*Z)!zL*S#MS2uc67;m+7tdU$2r4s>ChShlmQS-zjAJV{+NS zNOmLI1TgbX>nKr+4Nz`80dhhS0jS}OMerI&& z1L?3Od@u1Vc8J}^O!;hF^k+$;UPrJU=UyTFfnUVy-+gqVA{Z?zgz?ST{g<{ zZOYg9vUEdzzHIdb&q9|+==RLt3QcAt47y02uv_he7w<9e@vY<6k_OtD88MP<1oD6- z`gU5ZyWb`mroGKi{ficNmZ!BIGiZX2hx~;}zvG+h3;D4}`n;THS#zh=f7jpZtDar9 z%t_{1!@&j;`HmZMH*7(sA|M06*+2fm-P{%+IlP&ba@6)MCB)#+S$@7n5W4=zuHpknW?|KnyKF%EvDS^Sq)Vr zVGO3DjnLV}duDr8N^NVT$xFFgqi<8z-3LR-seYIc`xl?kthST?R*k$^Es1>lcC&Wh zC_)}U&2IgPLnB9am)=>=K1evYQj>)+BSI~jM7%JnS;ElYf6Vafr42NRv`W#qM04)Y zZXyXd)bKPv4?L2X-x>1z7ri`BE-7zI=koV%=T&-=k6F&KZAGkZDkF3xtYULW({1Kl z3z%>lB@RszS!cJMlv!)Yc|j$E*6K+*VeVigJw(bH-B!3F06<m#9MdtI)JnAd% zR%*;mNdD_gN(@WAMj=DmuuSsX$a8m`2u^`G8K(9wyx-u@yIQbYZke?Fs}it-QEmwp zalBZ}6S^Ct(hO}`MF+HGZ=)t?Y-!fHn|XsfVI1CH+WwxmMPB|&6O9MG{ph`R12aL) z(*{SIebJKVlpS8G)S|mq{>VjJyQ8z3u#%Pb6ikf z3~DhEdv0Kh-`}1nqZ=#wT(Yxf=^oVz(=mZsvj_dXXX844SK-$ZF8HvT(+RaGEp@8g zM}Hlqt?!{EA7+=d919G&ADuXus`=nO_3hm}U2-}mkaq*$^6DVFvEIuT^Z=9Ri7+-%ejav@AaF+9}v=Zk`PNG?FaysB>YdN(ny(JQ_-a&CedqIBz zzNq2FzTGc2%x^O3I0O;yVU02+$ii#!*+p8zBcaxDl}@(fFQd)=-0#rqygJlbpcZ&( z+*FmP4I^*Z5v|Eq`4x8NnDRx7(t8(0@8`xzBtLz3$=jFI!sAv%?vEOuEbc3Frf}Q9 zFuM(n|3en``XJbQ3vfIQ(r-UyAj*tP2$j~3dLC(xUJw5E7YeoH$@C&`CI4d%J(ikk zsb60YCN}`*AS&Kv2eY6S!jAC@AXz%L^@=xmvp>G%%E~f5&%eFr1mKnbJl&GP86~u9 z{<)xygucqlo||s<_jPf7?VB*gyk+L&Mkgzf1gY2Tfe#fl2C;;HLRaC7eSvtGlUwDZdjEp331>P8>(rv?=r7vjVUz}-{q)$qcJDyb!pY~A6O2SZVwmdbC;c01 z-x)!T^Y^4V=2*d2uB9s}l@e+Gy&4~wq5LLC86YQpUHqH{q%x8m4 z$I=_WX+TK-HG64%9;RgPvR&wiQ0+1fz4M^KkL-T8JCt-{#08ovTk8Wh&8QBEbv~{+ z^k2nz{pk&ge%}H!q|kT(7)tWZhVpU{8Cz5nWj!5|YnxvQsjprAE@~ryR=%6m{<%W} zJt#~vfG{7~sUyk)-Ph2Yw{^zeux6Lh95V_m9D!|7OBaLaiOpZD|&WsC1S#q@PC zESr5gMdq_$$$ZI%jTh|#t_9}NVd+9pl^{I{-gM!3a=F{_z2G==x3QZ_93Ds+MBMVK zLEibP?6zqFfARyl69zR8w2&&%o#==DPPlka3sUT?G|q zmzzf zGvQb)**fM29H!|`P7}gqP;fO+dmwH;UgQTM^a?9I*9!?HK2tuD)k^-R!-A#AH0Ems zwayn`t=3Tc)2u6#c)sIZ{Aal9?clwl`^*(u47s_|KHX73?91d)>#TBQ-NT(cGY85e zA-6}`!dax5G)gZ`E!G@Th4k@V`@sEk`vbO6m)kDM+agoX+pjoAQ2PVl7Mha4*$d8i zltNzrkPi{DboiTxG_pw_2V|7cjl~Ej_`>YrIzjMa6@XQ2s}4d(D#&+(x&bLO0F%I< z?P{91y_a|l`<&~8`3Hmq$hOo2Dhv!!kn$HX%ar^_e*^}IJQ~(=M)awWyaAdB&s$EV zCJx+i^9wH3C!b23MQu0IG!+|=vZPzs{Pq)nm&yAYx@nKPbeRkzgiDiOOvHQ{xUHw( z7^0la7d8*8J&=IA{W8j&R4MqT6GYzXo*4)U%W9))rLRxso`?IG@DHOYg1&~mGB9$G zgp+-H0petguh;MJFI*m08Vqql+h!2+(h0OxJVH_f6+CdImb!-)A2^xq=|Vhs@d~w2zN(Wk-l(8zEs~`uz7GC#z_BS^3XVYNuM29@rKc8`rwMEAxpi zP6x#?mt~Zw^IL0S16_GEdW0$At`jxNeC)}-FLs|5=4LFR{UIxR*DJ z&YTp3)lT>{rS(`_&eUzR5NQbLT@)#4su=&sb*-R?l(}p#8L8WH8*gtXRCkw%WH5%9 zprOLfXb~v651Y(jfGE?2T1;YAq3y>0Hy!6)R9DqQ-~+a!5%*1PoGO+}V-dSL>FpA@ zxiViSYM`?Uz{*rmAJOZHvc_kyRnxd^U|l*RSMj&hj${i2UV17gGWUP5G6y$dk+S{s zAgj1mT7T|L3Ba61K+zEVR(SqXIj=?IrU#tZR=)|jkH&UKuq>0vw}p!n{fN*TMhx7N z6@njGSOzJA^s-xMrJSAqX8+*U2t4?*ilG&c`TmS)HX?c^8h&$by2&7spSBTbagT>K z0Pw=x$0ce;MNUAthQ>S4t>Km%6Mk?E5c)QBO$=SKuG4mS=eA{N17X}e(+M$6I&n2NmyaOgi|`b_3*51*0-2ix{xShGW2C)43&)(~{K?zn3Ul{&{^o%rim`OF{7iQ3 zt&v-QW^J5e#OmC^RL(gMPc1h@EtaMNn!HeZq^-2tHI0QEDq7`PxIV?a3aDw775FOu zU0a}p`il|Fv}1(_j_0(cdLoGXl*@qAQNq%z=zBW;OZIyV*^=ip?zVVGLRIu5>VsieWnJ55#*ei5;`K^PTIDbue8 zVWHE};r$QWxeCEdzM=tyJ3ek*9)-g3@&^35FEg!$gM@Dxel*n7)|Z6$ty$(2OAB*w zCo;FlP84fb-O&f9=~QbIO<6EPK}nF0Dl4K|QIi|ly-1(YzYG1IHV$~)Uji#KmNn_g zlGfd~3-p1`sHRB&L%dg@efdq9`zbW`RDZI6ztM#pTr|Knn5dD?g!kB51B zfMY7eDnvKv>e+Zj=luVf1!dk{8#rFUkwU{W(XN$;=SJbbjy{dw1 zbbf`a2MPoxwsSkg)&9aoNf&e1a3iFTY5fyd^7~mkc=rUmZhs_8OAlvnPt@i`cGbKio}WZmL=0+pVIqPXnr*G zJ2btG1UB?D0^m=(__W=-;w<>{^9uSoFs7Jr^<(Rvw4N&`U*xr?TA*zOtBYzQ7BnXv z$Z?zljk^cQw3TS_D?vu3_ZjL=!#Q2hqh+mjqe1;9Y`b}`E0nqrg0NK4)ZdLF7`=#5psb8I1?7mRT2HP;geqUj=f|sa`Odg*mkH zc9%1@%p^@yyIJ10C|0MZmclDKbOy@c++<);)5u`P)%*k@I@ptic{JAxPK3jFIc7Oj zRyDL}Wn27#goxfGIWjAL1@Fi>a(^W+mw=czviZxD!aVX`whw)Sea{ejhxb!F-9+u`Fdes62IjNf8G;e$av2XO)*-6m^mjHCz*^A=K) zLsS8C7pnm9p65HV8{70AJ5;5N`V#r$xbBnjG+b@E`#6Ut1(!oP!~rFUY1{w)s3m0* zFn3esb6XT(XNB_B2kvIJC^ZOV<%MIgZ(6?a2km?R)^BN5{n)XSPFv>|NwWTEVWo?< z%Bo&{ote)1iqQuwqYZoY351y#vR=nHztv--o^bsLP)YTh%@B@w@j08u4O))Q`|bZO zR0}aVR2bmO++9)G+MpPi0H&8UkK%yvPpGx)8O;72D_aXmq!nI>bt^)df4H(}%sJN6U=Irbz%_1B4*#Bq@R4Jh=V3^w`XPX3}!;cj+ z;1c+H^iezGZdCo$q<}vvDJKf`zw(n+y@LhljtXbKw@c&=M~%4yTKyt~5kb>crW`ss;7qlnrlnR$}gRA(mmhI#}x1G z(&MPNXuBw9mM>^Mj^vi#c?KvQnnR3{td3Mocjt;vyS+CIs6?#a8_?lamd96CvA^?y zvrXD1s{zpSgN?tQ1?w(}sUu??nu*0E@O5ir_*QuAsi5;~&|Qb5U0RntH0?-h%jP(cjklUSUR4`AnkE1IPHPy$A0W5k&4FO;Fre_W6U_-+H- z2$DYT_?&+Xs34q9vC0jrD1T_*ogW_QJrz6pdScJVM&^5Pwuw^4<{dp8_F|ikLJw$6 zqQDN;sIlHBtc1o@LJ}l%MN2n=EvN}n0=nn=FbjA^(lLr?mL_BN9-MdHbzO>COCyk|O*2 zQO^5ITlT~}-BR^83}+$RgW5HJ^iWoc>_Fif9}$D?UK;D|;jwJ-8eu0>(x%6%<<%}Y z^@x52)xxdfJlWAT0*w!hvsBSaqOR`;ANExa71MYHI*-dXGrNf|0Np6KrOGWn8d}7o z5o}py>1wudI-TBbn>?zI1rixxFE~U)@3YT!A1<~@WpEfKR#y8%qo@zVuK=yI0m%@B z4d;s0I19$hP_j@lvJsXaa}RF)Ti(j)^1$>{0VoSxYB1tAJ2(KsAiuN`dWTZ|x`xt4 z1=3LmofmHJQvkK@%Chw!0@+A&k`!5ZrXGFJuU;vjc(Wq4 z2a_O}@G^<-4#rdX9h-~9v^3_~RziBrVsd*~%m9-g-pFRXic4=MigLNyT zJ-5au%LGx`JcGrjg?izkAv6xrwPVky7M#ta`aQuME{Q(h{Qp68KT?1=Q<&NbL2Dd_b=@-WzDL(c;^ImCZN;R01U z`x1+!uZCahqAHy@Ih8f0Id<-8Bu=puM&|KMpBNt6HV1nD?7n$NxzWd!a`q8pz)o;O z%H!~WE!VhK>Lx!|GAEb1${X7mfRQ~T;M|x`{A?&~Xv=NPt z+HwStWlSKXB4W{%3`$Wy*6F! zz@Ek|-|}`P>gfv1o&rltLZUeY7?_Hz z%y|{Sx&qua;#kb-XNZS+EIY(dJsPeFlP-J~4}eJ*)y_tZ&qbNG{(<<3pF=7h$D~$8 z?HX*lkk1S-(E0y*mjdmO1nQn;L;q@!bJg48pIb!r_srB9dMl1F#3qWW?6i7Xg(0mM)-E8&6% zqpC|k#Y}+B@&(6GowF&GM*pH`b;+YLAmd_0^vYb+nWh@aE)KI1R(siqEW&ZU9t?^O zu<3^$ixVdv;bw59kL+9hN)6}v9m1(H7AY(ksL8Fb9UUc1qJvnIOzW>~kaEqUVzq%3 z4%H`yM-t)WJ2z(@Q<~?^@H=*AVR|&^AP!=J800m)@-a7}yT27MB2~@cqWp{_Dub3v z-brK%am3?7nX}g!1&?a`v-rT`Ch;J_mMoMTv}0v{%c*`Xb~`uw<1&ZCr@z zl9+qCkmQJmR%fd^ispk=c@VTi+`1#3&o`NRO_n@a;A)HrpC!NaK0g$UTvR9PN;D98 zvfU*VZyY?vm2xD9cpR3vs4G?fFw)%8+#&8GFRj17)5`ee47B2kQ&Bbs#%7UqwE zn6GHxQg>G;8}W9w)pxyoBH*kv1JOnESebXJ!A=XoBejB5pw zCC^bb1qE}TJf=DnSILQTlA1^_N7HB3f3kds(?~*UOmhMX_6*)Q)yN>q#7fY4-?(Ti zN6@rBlr2F{t};mHmxqYbLR*kagw+T}IIz@^WpEkI?82?opl{&kG}#fKWgV|(t2Ik5 z+dobQtL+erYGMUftQPG2h^;+>{3;SAJWJOUhZ-lapv;G!yjFV8yZJrwb3u_xbxzh& zx`}K`rh`|1B$?sJ{x0`ICe4>O$+PB1Je|TcgOhMjO6}{?%+cg>6`c&@pr#KJs>KrG zQt`*7{orl%tFLL3PMg1$v9$HkVg^M!E$5h^p)Y?yF9?r<+!Nkas6+KGQhiFaV0a}>L}H$V zgEHP14w6}=BI^TOqs`1IIpe=i6zcLSxBj`&n3E~zgky8~0{J7(Knardp9aFx%#=YR zm<%3eCr3KpcS_e*62FY*kYut)CbC|=H{d@!3%^b()wb4#@7N_(2Dng|+a}d&F2^a$ z{)^62Y9Om*(M&5WmXsC@+C1$b6Hj%pEYd<@=qjQ8Ssj%Af|zcrxo#F;m$b}ZEu54d z+nCeDid_$U_I=+_Msx)jo@a*sRl}kV$Ccf5gPKEetpV$3vg%_Rr(exd+Rc**c13Xz zhAbU0yf5(w^TU8mLGr+f?8a*@j5~Rb9VM2wE@R(=wMWsHd2d;$~5?Eubb>ejf~EGX;}myA=2H1%0;$CIf#L|KCcBtL!nPtMCO85w(+L;Y+a z3Uw7b1+^B%sA&!mErF)IEtq7mCw^MFLD}~M*TJBzuQRABb_VD%`%>M{dDbLIUfgj` z>6oGS&M#M;a39xbQ~b0O;nkcJ7-l?|ZC>WaQEF5ToCEmJKD}kBl(9v=C}xj5O@->+ zQ*Manoipq6F4xpYJ+X*3TeB8nm*01~dKe)ODaWRN1oM`2tv3QjcEunC*3UW30ZHNE zy3=M>TvC2c!tjTkR&gC-BC*?MO&?QxG)DAx=B9_gCwC^lZd)B@InM`J2Dq>&QM&<+ zzj3d2$Q}Gp@uyfd%Rd|oqqN<_j=>qQuY=+QMKP0bAzzM^>GZj!T~s0a^HruAnk^I8 z>8b)qvr^3`ME}(%!wd;+hClOpKrXN@hAYUpv@cs6^RLaLMR`9}<~ ztpMM344dP2KW*b3AVa)U){zUXbJ0ov0cq zRLH6%-~z_+#|C~w5-WWgzG6@s+!dWdB4q1jfUP_?S3ONku5YGt~P9t37zDzA`fK{Ic4dUyo(9$C5JRg z_jXwTEo|lYe29yL)b5HZxW@N9l}6+@C)ce^OY^QqWx}%su_E zJ2|I!agkL^CT+rFe1E8I&QGpg? zj=`JFWWoE=IUSV^K6S}U`C%7{&so7EKe0KYFK-WOl#KtAa%&w=Qka4!kLy~=f42Hp zLo{g!jW+*;Me|+OyRCLn{+rU;7_dPtf1RW(uT%|qF2#))OWyV9qQw3KRE`!m2u*SL zZUBAUmt_YvPGOe2qo5)(dCI(y`~q~fMtxtKA#j~T@}`FhGdWUPvR*}78!T>Vwn7OE zSF-wNRv&Q@z#T*FGx;oEIHl51w72Ya%9?5yN9UQB4o-R(-?5~gvWCFvXCfaCXA~Rz8Gwq>ViLR;P_8k}EGm4&{ee_-|UCfT^%qX7F)VlhSpR6fkGdJMREIAivzUP73Ay+?-wPYrX+bCO; zo5_9x@?|O~J_aXT`0}aqbYanMt4x{shMDU+IRNR#!JlB;=uqLtvBJJ$apc&0y5akN ziQMPPvav2A~`O8V|i z5^JnFU*WTiIxD7ksy_Yu;k)n@D?&Gp4ch*Iq{eP)m*futll8<8Kuq@*+2+6dF1;3x zBx}(7D{Bv-v8QW!#NgxX=v1jBIyhN84IBIF7I#PYk_UBYZl~5#b9p(`XEHFt^#?b` zM~J}d1=)KA6jC4HX&YIvv?$;f4UpSFUop6zUbXFc<&V)Z!R|!k^cLB3sD;1fMLkq9 zsxrL%v_rYJ0eBv4g&0AF^bR^u@}k)iSO(?oZ{|&F(KA*Lp^RdYK5jl|XG5_jQ#<~Z zItsee< z{90>Ce(|M^)l^J{`p24;H)dO?vGhtA(Lpj9{$(eG_+X1Dx3kuFYGt?IzTklQxCPci z_0CJ;>W?*_o5c+WJHkX zyZjVgZvL@gY*+c0&OGFg>*DC3*23#bh>XI`{ z>X9vnke!{S6*8P3^uGR!5!fCVLTvlW@`@9u9Oi^G!Sz4M+yFT-+`xR+gkpX;*WUI5 z$kcH=T7`;<)y2mh^hb;zQxneUEezN?XSUoi{JCp6G$ifxubQ(HWJG|!hz0f%mThGQ zpLTTOmZl#Jyq&cii@XnDGZD@z4&NG_HW_l5yC(q$?Kn^wH`y@GUmnz+g^O5QT0JwU zw+K^c@*-^#dc1k;wO?rKsq%zBBOOGv8CfAowo_es?atk7DTY`~(@n`l8Ewoj^8Kt; z$A-I3xYBM&n#@4y3pE3KE2TcV71Y7e@_10>`S0?L?%ZPB3t*@VQ?iy?y=YhKO$Y^6 zN8|}!oo_LY+CG-Oa+8W_CG6BHLOsYK+LV{8@^Gad!1{!)Bt(}<^gG$NW50x!=+v0J zHs3_{-+Uy!Q5&c)=?F0q$X~v2C7Ah<*HKM@c3i~}Y+rCm9m&Aw^cM8lxyN1Fo(2deU!#In^l&Y=6 zh7AAkIZHR;hkW2aK~34&v*gl86sy$D*z6^A2(~o)GCLSp3cODaT^h!c5ez?Oj`VC> zfGQ1|hsRhE{7FjZP5Vago`Tj0l5srkeuq02|7b5DJ&A7l9BQX_j&j%s$$FJ}!YO@a z;y9O~kfHZQAQ6)cwW#VnkjH!e*Uoy?V84T(=6Hl2SKxmjJ_3f;vFT4%k&@l;Zorc6iNZ+V+y z=L8KeK(Ljl>DAn8Ageu;sexHI+lpew`~Ql01(w>%;InTMIRovy`rfa#KMj z2qC@BOz0xZ;&>FX3&I>Jaf#+Y`zh)L-v}T!nS!%8=37Mc=zVgQ)(bxuHNMq0dFa7g zh&y1sNQzkRC2rXRK568$3S|{p@aI|$`}(bq%K%I*&KRYB>YEs4Htl*?ajA>M!;&LP z$tuu4D_iSAMv=8JE}!2e5-?+{Y2|t!2a5??=ZxQZiZ%ToA4po5IK40q1h6-p28AU> z#H~>NhL}Hc}W}&BV|`K+0I-@c3A19viFUHZ5wa{m(CLCa2Z=dLp7us=*FkQ#IPtaWW(dqv3Xboh&A ziEyB;aJ!F++jv;@Re5LlvLTC%sI$mTHy?YtKyovi_=Q_$DeW@cHO#7mW$mJ(I5w{U zSD#4^nfoU4UU_}=f@CVZXK5Bpj_Bu7biHPQUr!XBF#pu74*T1ueqPZ#_*dT|a19S@ zG*VS*@n*Z=bAZ-%W#Nz-6AUa0QeUOLs4*O26kN}tu!sSeIbs{(Mb>&Z&{oiE?ymrR zs$1zCsPy_hfMH6 z%(5puFjx{<`OTq@KAb^ef;pv_rFUk-->Op%F4%LP-*;d*7!-h>6W z$5%fUt?KrZy@E@U_y|>ov~kSM0Cc55j-mS2X*zT`nFp?7Kg6qG#AlG%tU~WL;{|6# zU+q#|w$28Ny4Qh92r8k9=%DqEWDSMq+G(Kc>U^AIag&+#?-4K#fHIUGQJ~W3eVpHU zJ*Drk;6Q(vLBYZ8yYXLFgK@u_yMvVJ=cDgMzSu^$4=_+2Hiwe6p5Riy@!k!5@I*xP zaprutoGXdVlDJA~JuC!ZZj+aSpoK!I79v@Fg^lp1dc5%I)`sJfG((W_@J|UZ%msA5 zVGDPf+?6DD(B1SqB2ZfpsN}Rx9q3D-u74)rB(7LWvHn4(B&!?!VDv^pa;YdcMUYzW zZX)RJg<3-G;*h{pzO=Fb{g)hVZupd~e&s#}DLk!9oVj|J=+@x zY?Qc?YB}uhl$_7}{8k z5J46*5{4RSyrT2&v7MVQ7B7qlpf9{vZpsATpmw!Beo?eM{s|V2!sJ~>17~_J@vGz6 zl5-b>B62DY^f>sLL35CE;;sH04&Qd4lZ*mkq{mV+qnd~z5*DDH!d>F{YZB}exEH>z zYQ=|6EjCnb4I|@>FZxzy)pM@6l>DJ)7QU{E3N5mAjef4bsIV&ue3a`1bkl@~r%VII zR5STzT|I#1T|6lA9I0~^pDw<4^I`d3@} zwDWWRa+%2E;0}S{{}H^kDw)DDLvU7-fd)U@{rNU#iWzexF~>=0k{A)WG7*kf`Fl1J zAkm)c<-^pmUMit_UYP3`eR?@m+ygaRTOL@JhE%@Lym_%YuJaQ*(^l_hS@`wuZIyB$ zk~R?B{KFmC$1Q2aIp`m$~&CsH&<(W_h_L>MZ?G z8|WC|uoc_Fb2^yj)AJFg;j@5BshFin$kcz2k6LJ3pR`n~No)kZvIB;bb{1Pp`$#~-NB^)jz7 zVpe8uVDH)+&`GIw%{1@nY!~XKsZ%P9qG&vFb7kU_($oW;eO(MkO8F?BOZO<(9Tyhp ziJ|6>rWURohz>;enGHMA36WysNc%*BS~^20=&PRs8OXMf6~k-0OG{8L)qw>0ZoVWE zhKpCsf*GyWL=s3o*lZbvCIj^#-zB1YZ1{)pZINgWP$Iz4a=0jzeWPBNXT{Tp(A;B0-V z1@+XprRJ2EV?A1qio!J>;S;)qW%hoaJj_WUUt8S!h~=|A*ZzqB#Qd5~PPGW`v!Xf^`L zZ`)Q+#YH~_m>Vi?1I@Jg8)i6VY8{>iCh`^Z+&Y*YsKWayEZj$}yV4yc4~#NUm9k+; zLWsjyapwJ$Mn*)Dp}yn?nWAclUxCGq0WiR9c_Bk&YF z!phL_=jF6FiOmS4dM<`7v^t$~9tAr~&EgYt{BS2EI3IuDTKM|jHccf64sQdP+f`At zqKkLpD=FLy>?k#p z!4Vp_-o$}|kh{u$%3Q%vbbwyV8B>qgix}Z(f1n4rKFFEQU)@#$SSdyFDT24Gqa<1y z^3BcJRXrvI*IXsmCNyBr!yi1qIZ<3hhFKy1Gd`{eG43v=@P&lSA{+V>OYa7{^0-l= zPE{4}YBPG(KY8)a)M{G)eB7^*bN%dr0$s1mrc@IYH9XgnCc|y=m1eQK#HnM9Tn4@^ z)-r7@m-B_PAKUYQBgl*9Fcj&3SH~jr*od*9M90AWvg=>UiR2>Esn01cB6rzFL307@ zQ+kkcnUA6%C$brm8`B6-Wqe-@$E9%CP9B&?{>kyi6S?)bWP=9ofs^tRxwkC*j;E*B z*PZpnPu^{jO1 zC7JL&G_9|Y+kOZa-|GJSvdq9bqr-xWtDcOXN>*xaxe-jK8_tV4afUGBi)Bg~Z+;nQ zp1(OMw7&WF6Y}E24Q$zYw~#6iN7vM5P=xIN3lk6Q@cXs#nUymc*l=oz92RT8OKbGVs~#y& zV@JmGrfZ?*>IZ74I3S?88egk8q3M}p3x@)m4^K&O?Lbw?I_Uuzf&mF>v zMsQ`#%h*TQS6aEb@$SMMw%Xk1QpBy@O7NF^U72Tak z!KECWIdv8>1m;R+)_Z3N$lj@K+<@ZIK#~9*1el+jTsZr~qvsyO`OJI@=-z8>#Nhin zk6q1o4jq0E_96DA#*BKHt5Kr_^B~>13N-T@fgTzf`;{h_)(`Yh7lB>_)OC5f1huVx zpsa+O1>yjJ9wxVLoxsMUE=E3rONyR);pN@Wom!j@AXD{2qsP(HaA-dH$3h%qMtsdb zr#3ou1TSWTVTKvhxx#=gL{n_rn`kN;{ z#UPJHkaJg-!`XD@$$@ubAKGe0TbN6^xm%cpGse=voPcHyN#lCh+r*_f1({DU;v2)LE8B>X4w`fiGmRNw?$MnsJ09q6+_?ehKDl%c zP}@A+4r)F4^59!ES91hOZcW*mu6%(r?R!68EHEZfWY35AW;O|KxEtWWZDaXKTw@=D z@F)g6Ujz@$f$(@UJhKlEqQuix@eFLMo9-BEl>dEv27MMjGkkVjPFN^nUI$aUs+Fb^_nbnDJVpgXyA z*H9av`v>(tD(UHYAM_9+ldIu0IK2_hgA>tlbwvUj7v7@8H~c=n@5kP2)V2Bfh{)L% z@V(dKZuJ|svV-GcIS}3S`;Os{;Q^FYF?j9e|9<#m_-rggmxpCz9q7*aVVxqt1o1<^ z&-a>RH^w&6eKW!~(zb?eR*>nYieaB%-_R+b#+CU7i+s?8>daJ{OVx~i!0dr;4|8XC z&Vc^Y3efdXH%E_Vs4dWIgZf)SU4Oa_;_(9zJ7?9AD z1OU0XIE2TU(St#QJ`YFVG5m+Du_(A_8`;0n&%tNv=hLzxxC-y^hp}$-j6iYX9AZ>1 zM&FBV#I}||wys05LKt1%p8>z$npg(m>8Wr=2EHVK*GB&DSoBR1mZ8g2aOsIt^o_#n zh;?NrMx;m(^R{6gQ4g}s%6cff5;5eUiJbth6=v_wo}XT#hVmPM-f-W8zgz~o^8|4{ zptf#JP&c@B1RK}6Wngm@;fy_U1@6a&0mq#)6>g0s7I565o(|Xug9irZVw=z<3FE-EF9JW>*4|Cn~gKX*cO5~Y#X)_+iIgl1X->D#J*~BWyrendco|Y zM$<%4fd<0_vjw^gb;+gMM2`a09VUr&P&Y-8l3Uvt;=#7AO<)V$eAD%@D**+{S@d;H z2Wt+#3(w%ggC$u3^r45Y!o%95c8z4BD{ETF|DF9zECb8Z_PVN!n<-~#OM-c544533FvO4MiJ=lp>7{N)(mxa@Wn-tqFX1htz&CN z#KVmnb@Pqa0k;5t$LQPnk#hn$DL}OIJMX|l+9A4kh|?`Qa@`c1)XM+d|2?Fik7dy^ zW%*batP|Fa0G9RD_4g3R%0}4=s`x0woohB6{u?> zNHJSCf;~*GjoZFf;ePNfc<2p;+)4WK{3t}$^V^^Umn&$*GJ)1 zfa!TPLF~o>;;?NBF+b;|3NoZ1W8W#rog&7?fw{9gXFv}PJ^f1_YWv4^P?z%bxPF@FtB{*(;RMo?#u4q0Temp3G^=nkW>WM9c9tvvxWTMMd3-TW?2?o z3omOoKhMNL%pe2egY=);?u#nO$(8MuCKm(dHc_MG&S1C}=n~XEdgM^&dAi?F*Me=b zbsNV{u8l#)EqxQ*3OF7`h6hH5b$PRjK~Jz-0WNh*t1ott|9$#a$UwE?<=b__I$~Wd zz$}IMVCKeUkdq@fWn~3W)HN7xd^m}x;}ag2I^`_uL`!^!SO-?6GL*xHekyw z6Fl4ucyexbZv**Pen8JvRLE5~1fWzFvVO>Zwq2&K2iD2LtLx1G=T00UhGai@kfS3T zSGJc;)wyz|G`Eg0d!Uuy3efGL&Ve2T)KCfPMzC>169cy1sR^R{QybT&C!5N1UswmC z@F-se#p*U(7DoC3!@d&^*?;Nh>+<}1kmzy4X`OXDbi1q@W7~B<#OItuM{WkW1hXBZ ze!^S=x-HDDfL5sOhYl3#77?W6)=gmRolg~R%;Yh^cnGAHsT6`7@&wDx!TD4KyBDDA zhy3RT*=2ix{d&i;Ti7<*Mygsc#CiwNHXxT>xdvu4c7udjf%bfM1iB5>byKax&Ms?$OOD=O;E|mwl z3UeMY)&ph_bSIb{(D!FQ@KD!BkHJFS53mVt1^ae>#)nRVEZ{oZ59|4Ql{%hP1fDcj zRR&=T`M)QnW%%W@1E+P=^|k=3bbEFC{eI~gxA*fnq~ z;7#&y^-F#^UUnUuAYLoTC08!N?8kBaU~T~V(t^4H?1EeO0(Kj?J>YF1@3;K&{rXkb zzW{O1Aot+P7YpVh(A`39S7KeE?g8wc;4T1Of_$y8`_HL`w+7(uA?^<3^@Lf0_Plu> zJ*mg(u0(KQ{9q2l^8v$;2b}xXdJb=B*e{P*R1Dqf(fo%7Y-+zApHi7J6wh?2HFc*Oi4Cg@i z0csC+3F<1?RjB&{wt?FZXj`~F;N3vpFZt#B^=k`p2D0BzYXsTDTn4!ebGH+~I+)8q zH$v?f&<^SZb`#WPu>DS4E7Yn5MqZvf{Y`~BqQ_j5l%9u&-tKttBj z{RegfwFTR6WGATm4|X%)9*$ahz-r{-Y=pEVzuX%6?eG8(0_0v`_FQxgb0KC}H3ALQ z0X-O~y92vdxS=+1cMbVE$**5k?E!}T{>vfm4&;HtY=HKhsyYG9?0h%XJ0`vo%?&VarY zpzamye!<-@z}HiL{k{D5cL#BMkS{jOMWFiybq==Qn8AYGPq zlzmSsUY3&VQYvdG>v!It$M5(5_xs0vU-#p2U-xy+eO=GTIgfMB^Td)anhEkt^8)|? zK?`#eTkhEVzYE60y_Y$bKLr4EPgLu z!nBMN1!+SH|5A(%&l_%E+PRwjP|W(ooo9phJ(9lMmpw`MxMujrDw<>~{no4G;{{CD zMRBVeH~Xs;Kc|#tax&GwaOzDOD^g0IZmySZh9CTJ3aJQv_j0JoA*3z8cI(XI(~x(c z-di6Yz8E!JJQzBjP&T@3;H6bpmEe2RQ|9x>Zk_*kkDn{Q>{he902?-Pm z+bj0C>FIMTTi>9K?<{)xg4CWalaUjC`{6HzTiNjRY0ODRYJ>9D&rchf&-uc#Go}}P zcv_aJ4}CLr35$yg`{-YVI1nSkoSWj^q+{HX~=gThFGP_-MjPTpXP4*hU z3cmeV=QJmVWLi_<7eN;@uAy{oWIW$L1&80wn(n!gs7L5n@ifx#3~5cUHisM1@8tPn zuSL_vb_h_T<0pf2{{=}H3M*lS^VS~AGp!|_d@#i7y2nLifnhoOKXdkKgCIt?d{%#W z^InU%8htA4MS>VnCCU1hIRC{*bex~)?w{10iJa-FvjD}gCJ9_wH)6j- znbrpgwC>;Y2;Jhl`a20tE&5igbLoSCcN(n^**7!0Z+rZ`woM;=E|HBmhW|}(tYq8SLTeH?4q zJbjrF{w~gt_UEqyU5dZog&=j=dhYa1pSEvNc``AYh&zl!@A!O~0_jtGJ5lZJD=Wk7 z)xUCt;@UH)ySnox!#;4sD$Qr~JRTFli1!Bv_YN{TS0vX`Rf$GI2SNw?+TI$JKX=C{ zGuwmEmMLY7RGJ#*DAtoX%47DNdL9^cH3!9izT6OnqV?p2F5DiQ-LO8gbC$>mmtz8@ zK^IPILk|5qwaB;|&) zk*vMdNWSzH%J6WWK%6F81EpIfA2MU68n*q?;ov}np48Ry9GWHi=$7MB$&fIAj*37^ z$-?a3{f2Rb?zlbEp)iUu2r^ZH^FZA8z8r3<>un9Fu6t&!-obMfqO9aic!-}}t7xWn=eN{v%l`wNas$afo>66M(W~60K$auH z39R#>GW>j`;9p@8r=I7?pNho z0i@w=_!~d-f3Ak${L;uJKscCR3(Hm^ZO>9&%?uks+kJ%^MDAX*nP9;2M?Bu9S%O}6Xoh5Ft!3k!_m>n z(!L5ms2%ruN*Nm%6|v!cujX%?JKeoap`@+rp5VhQXGhWD+p37BbSe!_= ziOds<5NxL>8Sd~-?JjDDExtU_{O9*U_@MZMaLM)i@KoA=yypca1dwFpgX318(|uBd z2(|!Qe0Bb10a+lzwTv3cv}eZqUDAfZujU`^OZk}!G(C*~MmevCAGGXEyIJnN`%h2q zkm+!cE`DEr&ne6W!keo_*PB_#3{NY_nXHII5dkji8$Q2G(k1td^7RO+JtnHH^R&M}r zFqvf|H~og~mBys@DM-@KK9VE90v-(qwPhY%i&WX(mr*y|etR#xR{75&X2MfIA1(;W z7eCq#dXwV*ofrBeH7o0_K#KcjZ=#QMq9{u=5ybj;y3*bgfwDMeS%^ndaS;$B)@;0W z^LiDcV(0!(pWQ=WtKR*E#WgJ{wBQAvD0h*oRrZBKmKQEuqjy3&X$1fiLUq2hzQ34I zC0ScHFZg#`+h&w+aSgR#_A>zdgWo1zG>(mcLE6y>zr66};+4a*l5SZi<`@6^L*)dd zh2dCuhhhn1lb@Lq7eu^3&9E9%Hee0gahK)TnRF=7kbb`%IZo5xE(w-uIcg!`*X>EF z8dwx8Vp_mDbbBiLV-DADyk3`gc~Go1fA9yj-T+Gyd!sSbghbC>I_ur6ihUu(tl(_~%NjpV6LEkbYDT zD9W866IEgh?rJi-LYG5of=JD;wORAyCK_WJtTZ)`F(nwx z*p}DpvatvFL|JfUZOV~#vTj^3QzN}l+SU_>df)8#=fB%e9Y2RGt$!)B@TfS6kh~2; z-BUU2pAzi5-P*cwLpFq$N3G{?-&`d7FDT{1S!F(|D4KxV(;b*f?725)t#M0pzeTKm z%g`VwK^p0hKRg0CCON9yf&MpozjvR^C!(D zb%d--2g+=ZtfLk|xWS8Bh@zvKgT?jT%2;XG&kbF53qH$;j%_`O@`;z5Tc2t>mbI-C zY%ht`xeyhSH?9+guGdC!dh4jGolzw{6raM(fG@GFjMrQ#YF66K>w7%G@lJ^; zPb8_el_XRC#XMsI%P#r;WG33Emijjfw=yU$1N@=@ScWm<$!y;jZMPXa8M@vW#QPNQpR6G!rgaCEWWlJ`kvu`f6KKK*^0-RZ$U(UrGvrJpu?m1+V;kdrnTi1-cJhFyRz@Y4wXXv zba(w$pU50{eSPitm@^xO%9D)@{5z%rpD%nRz{L`oohbKnREGIZE zGAOz>?rwCn(lU!v=mJjUg6da``DPTKnO!^^B?2os?MxUX^Y@IOn`v+kgkeFZAZT}~ zoGQG~-0!BEHzEzzwsJLKPe*JnG32^|?Uj+N3#N5a=v5O%*-+Z=;^?boUL$X6 z$fUFlL*5RN^o|a9V-cmBJ1=(|lwAOwU&wSC0gtW;_O8Y2n&_oDo1ogO@Msc6c+QIh zV?lsLyb+-G&Hlk_rZkC+TNRHjjdwAP-t}b}O(oioNbbwH2S!^oHivl4~e2}{?#!5Ip?{tb|O#s^iTZ_OWH9l|vB!~p$ zX!~rc5%;Y(sX!vRp=oRUvV+@v`bYAZO3y}4*hTmxPl}iQ@_j+2y|p%Iz}1(D zj~>|#wUN^Sy6rzICI4mUGp0o|>@h1hBBmiL&h3JLv>rH+sTij~O}-5_1;B zVZdj(N$_!O#e-6E(pziOaiFU2DA;G8#>NErPu2$5w*r?2sb$#?hGFg-4Ip5*r9sgs zZe*6nEzi{$&GK@@QSA8>%bbb9g$O8e?NKhv6QX1+G7Ju}jk*6b*P@Q9^kwm;?5l&1 z?c@F&xnifXWkyrDDW~h2uMvJWwQ3smOb!-PCRf{@U6ww4q@pSGSLBjVkVg9kHGS=6 zf~KQBU^Kf39L-}g%uslPHu1K#uCyDOt&4)>0&#oyKRK!CC6fEA?E&$C*&eIMKX?;0 zT3A0s`l;#Ake0Z#T}7h3$>&nuq3U2bI3hl<$tQ7F?%ngcA}-=4BBK|}zr0!&(?42q zqu5+8t;{y|_#7^&qzy42WWIMwXrlXjh|b@y|H+YP#jtqk^(p9G*Q*x?T&!A^-T;uIv=_6 zQP-|0N&rAiBcdtThDm(ahdI`;?l}|$T_~rU5g}oYiW=8<*0{=1M8Oj9immJbUFBG6 zUK#^wTFgreoF9IpQ0H8#xSV|XupsyguSvdNs9b3WIp_p+&8C`2k#ebOMIL9Ve@`(ePY5s2|;0$>=mJ zK3DAsfPGShC=6T?+8D}l8h7!}QE9U;Ba0`CAG1j=j^7*)Sh+)+usS?HH7izB6fGFz zTX80SBQc$m75w^M*hVG5e{Io8`_6 z5v>Dr+$=<8gq~f}3pu#dkM?YL|LqH`^RvC*(>p@dhU)UJO8$89xs>qB5Ij^BJaV;S z;t&@$CcAAAJUsWw$YAfg#rlplDA=5&Wum>Og`8%iVLS{H*!cZt7N!f2_IkK6`s>zD zF$1~yGcZ{gKRwy5qZq>BO(YObVA#@`76#^o*KsbBuNMrPKj$e{A6ICTR34t(-lk#+ujhW69SS0;a?E3C zOG;QaX51Nw)Voq&@1FW=Th*0T$XwB#3x^8Nvgc>3C#@ z1*E}Em;Im4=&F-C^#mh%OrXXj>dw`#Cf!Q6Kb0PwDbN_^t#ty% zw%7q@pMHcO>KsVn=Y1+14Il_|(qYy1aK7Z1X0u#ry%~FvTTbdwp0FsTR<^=-o^y0j zcLdFH6UQc%(Eo|U6DTB8MZm!$aR`CyuP)3gyo9qW8LVIkMQ7}b1An@j$4dG8n=ep^ zoO=qwR(Kx52{*i>!Ol|B(pPrXw)-db3GHn+4aCUYmp~a_|8z?0_MrP)PbhlYmeBK}cL` zT<>zD=IDQmV<9&)HuXd}LZ57CXOA zlo5|EUeD{n&U$yrS;^&WzbeDBfviHIPYSe}5&2^r2knr}C7J&B&#$^v$Zo&3{kVJN zuj6M`vd}{~zZ@^AU29x@TOWysSph9{$$owS7(dT9n`0ktRav4nKJNNa{0!iajm>k)&d#^a^VBlkLj{Xr|BC>Rq(7ta?mm$hQ_yoAF$2tA-)OzhRt;Z8sl-P|DYEX^JLu2IiM@L%vNWi}dJ zBs=MGVTT)W90^=3sBsF?w(^y}=oEcNa!KKMZQQB)An=I-{NfG~JY*j}{S`f~e(%J^ z<6o}WQ2rgD)1ja)3b{PTdX13gY+{@g`p5@yJA-5EqN-G~|{Vh%58Y zVUWu{Ff${jDIgqoZDuL@G}Y3kLJtJHe|bkfhq6{HNJ}0DC5a(xpU%M06bN?K7m$Qc znL$U!D8yEPzMe#j2my|^wat7L#J_Wiqv3U-dM_KoI-ZDCIotkJRd!cG9)8dkI`|vSmum~^11SPm` z4uzu2Hd~>*6`ru5dRLVEv26w4+0CqI72p>k(Qc;fKGrdg%K^2+Al+g=qP)yfc3k8HKuQOCri z7?4u3Ww0zKW&;*0%?tC&Zo`|tOhwz!05FinnM6;Zib~7Fj$a@kab}qrmx3qYkNWSV z#FwIl(8eAP%mwjbyI-n5ew>P#`n{k2*^hO=1?p`)t5S9s=K7^SvT>fzwV~l8P>cWf4RR$F+BnJm#pttArPBJN zm0k-Z=zRtToNRC0k@6J<0V=DS1j$FVE4R=Tadtg6HxR5l%H_GT`a-}S0KUHga8xb& z5=&o5r~ipqIk9nzNTr>Bl~St&P!;$MFdyS5JF%m8zyf#5jV9cJ#WyLqo16H;4@>TZ z*%asE=y=@<0s#dO&HM<80{CmU=i(J8*;JEFgt(LAq+flP;*;jzg1<7rZOXcvDZedL z0my%?C~RuyK}}K5iH8QVYg@2~XH~8qX^-3iz97{D`qZ6#GqZn^@b_cuLwK7w_{@Fb z?dM4+(HXUGsB}*VIM+OmFb83R!0GfPRpVc*Ur0v{Iy2oQ5-+-(e=Gy6Tw-2~l45vh zpi!YBAijqNXxnfYX6@q>v3s}f8+B?7C!}lmn1%M*t|USu1b#P*mo|gGfY;ypK7xZTno7|9g!`+*YTN*weD@$vS)U;bB*@Q)_3n7>bmFpxZ4Z z1CZ=37c7)Uf8$;pWs3krmWeYMqn7PYQk&B?0?qcf*E8ST1&RigOb8_FcN!ajhv0oW z(1?utW$O3K#7hC@GzH~53}|i))g5nxoV?M@O{@Yrb| zx;$wvD`B>Z0mS2RmDVH^aSQ(0oh~*S$l9^Y0OXOYy^FUM0GI~?rjqC`IrFQrk`>bn z;u>}c-xrp;=Sc_{ADvB$=mGE!q{k)Cv{nIfOC=bJo`A@18$#r7al2#%Gx8_(UQ1Z(^fz zh`KtbFJ3@)K1mg2y&mqT_1fM(jdnk70;t+DuG2;@^VI=7j;#rO;X>8*-iewfwRAAy z!xG_xd3C?m`#?W`IdZ0Vt>tC)@{`C@rLt8Hm914^(?kQbs3Q{qDZ)Upw>0SWKv=*l zhH;{bCvWr%$K~u*+ZFvS;~jtn>*p!_eaR+q#3Z;1`0211faim56+80&z_8LtC|vJ; zdd1h;Jy@Z+%P(-OjK8Q?Ia*rlS5oi9T3H`jg)oNx0bUV zX=xz}9YCqZ$ITqT_g8Ua;}{b>Nm&>5$XEf1s;v^S(VNiyX+3|2h-794{C(7hD8wR_ zBA<%kA^g1jTNcV{$-Z{7#GF<%rMl@2tzj|}8q?%dRIwC_1@diCeSoS2K)*NvM&ded zSQPMR!Z)AN+(gRRz=1YIZ>W=tZS7@glk!yPZqPxd_sZII&wal=e`f zAK=A_zr#T}WW@c<;4|?pr6k8Vj97MZZVEs}NC=6j+-HboLjZ`O^hP1qj@biZwx+Oq z`RSXcT2Y>YRz-RbG#abQ3EhfKK-O;U+sh1*?vmq-ui~hn@8rZ!7ZtE!nl8(^b{!mI z*TpIZlA@8h$)g@q?Fc^yY2SoJV4;lJ9w-bBDd}#kwwFpNBU;-2*c0C5X-&Qlz0e}*MtLA zHwAS80Bu-y!}-8e&qCCxcTMCtyFdVvj|U}5GC8XpDBm!ryVyNfc$5bXvXDn#_OJ2) z8G~}CJtLyhK#QqV7j=gcRNC-aXs(9~vVbH6P~H^f!9p>BI9?MZMlG60xfQ+9xcp(% zk~YYOqQhuvg;B^1D7a+7LLh72PMlSR3F~OY%ct#n7VI$N&rq zAOtbN$80=f0FX1yFW(_#l(~7flGE(fK6&n8HZB7Y5Ps~NCWgtTpO)+LB&0WVuQd(d z#;){u#AX+!zz|68V!6UO^HzZ(Db54AgucFZVv70R`B^nM?s33_TiX;l8 z`T2n!qR+c*`B0Xo6ZPc+a7vlxRdEY71%tN>;~?KlJjQ8?91F7Wclp_*iAD*)C$if( z1xPobu@VJHkf@vWY0i&m^A(c>Y|2QZXxu+GU>*}Tj!v8G0Mg6{l7AvqO&c$Km6hdV z-K+p1XHf3bpf5}opsz9}puy8dR8n{?Q>Q`40DXD0*2o@PY3&C?zLZSIvT3f%J#lm# zmXrb3`0&{8jxjwn>v|V{1c8OXzRkUkBC>ncZ7mGYe^2T=t3pJp$b5)E$CfQeY3lmD@o8><9uqs}QeHUf?9T;y4I3714O*Ls==6%vLT zr@FT_GPZT>%G?Q;TJzGCRQtMW6H+C|x{p^pXDC+ ziz}&{(Y!+UHh6#0CUT6}FDf4_KC80_5qZv~7=gul*22T>eHu(M{j<%wNONg>Qt+H_ zY+2Ab;CYC`h&U{2LSm5{22&dl<{s-RA>wWBxHM|#eCDhRrS&hIk2%*G<9B{%PI9!{ zhjoHWut~B;i?u&iTMpo(qW_48~w61O9Yw_s$M?D!`Z}@>F(@ATyMBieB ztYm7i5^%0Zl6*SxSZQK-=Ou9UbN=2_>Q3Y%wo^9m!+D&=X8;zGh&SZFhDOTf(ff4th&L>jL>n!op^dtDvakA5`|Ot*4|9 z;WYx={l~;DXsF0w*S_i>2w*{rP~Wb?#WzV$UB6@=Bbz^{a|9y4w~-Z2iNM7Y-()k6 zG6s30vxp>pgjCuD7=ELa(CS%3&gDh*dO#7stD^EG*s_Koj8WK%H-+|ff{bWG# znEZdGlpwrEbASZ5Dh{xH;dF%-GoS|e{?VplCEDxp-RXqF#afTF+DM~|mh=+$%UCEK zuYl{sWL9x=J!BFLuC;cxG#3W&#??^03SogD)0j$i%?~}epgTG|5x(S0M@~czocZV0FE(>7I|)Fr*P>*z zV?2432@Ez2UA5@14M74i?eq`q;BQp`k?tZn{ce(WG)**@q-_R8id$HK(6*1Pk`KQ2 zxyfdCyI!yl|B1wdFv}KFV_t%##BtvY*MWdT&;9pJ&*col7v42m*$MNML}J3TGv|BE z@qfIMLeD>dfW*PXucTudXcMWFtWNVl5dDYetV$O^AhI^PC~`$Izji&e=7LCsG^At_ z0kcg2-ZlH#6if^F)6h_Na6LS1$!0=!euR^|MJ4UeY-rBAt9_7%qsz6>FGdxv==5_{ zkg+D1x?WHVSQ`3jOG^GcNmZ?-I70Yo=NL&B{(qww?9R{Jm>#ENcrA}4wd7&&*J=;^ z7hp1;Hg~h$lA`;;xj0KnE&9ilL49M|h>~meM{f4?dd0Oeqf=<+_#UA6lSa_2oTwOU zy}j#Q|HU&pf;OgMJ8f@VuUFv)|0-4S3jy7wasivP2s1=O&wS<_95|s#BIT4_f?I@r z>;GGX(v&!f3V4e^WBE{097TQEe#`Vp_^GsxuD{~-uV2;M35NuJaA^XCC~ro8R2M+J z)e=DTz4zracRQk}Hbi|vl{`LMsInYh{`~Ow>ht%T^?r`5{rwcmI8zF5N1rJ@_cXP1>JG7?3VeO!e6J19d8|rwc;C+fYOR9M9#d6h{Nl zcrUDps-po$5tF&en{@)2hs=|cg1sCdOa}|%`Am!D$YlyM8G(WeF-vQs#pxZ)5l^)c z`wFA4g1rxq9e6-vd|xcxHLr6TrAmxzXpX+Jn@?&9nm;MfU+<6>2LKQ*uPn871!XqzFAe%u@Z$lAQVx}0M^2$L;(7&ESqOBQ4#%~0ySR5r;kj&{ z+zCxQ4$TUJf|EpqB7k4h?;7LoKh2HVIP(__Fa8Qpw#cxYj@cgUlNX(wfSmdzUPkUh z#7C};^41G&7Mor6pS)e+{3FR1+N*z4;+FL2mI=wU)Y)XqbRu@=%|=DIhx^}mckP5A z-H{9^+8uR%vsDiQ2C%9oo~F7bDd$2{?zp_o_n5D8;G>y{zIMI+tykU7n={Kp$*j%l zj1`a>Ygykr+>Z!(|6j9N;TC0cx+y6j(9d;ii4K?@KSdk9If@gnqKZshxfgJlUtjSW zXW`LuJTJ{l&sdS<=m~~h(z-81Q%y4t&iVb=S!>9#!v>TrPTbPF|Ily#!<*?I?<%~3 z#sY~HQ`=bC7&hIzF0kA*`s(YsUs{pDr#^FB@p6v+|A#}4Q&U%PQrz_N8Rs%F$0ucMY`JWm)ZS^p8io8IjQL;)21(AefN)}Kk`GhhYJ>?8vsgJTC`o|U+qj(=(Q((XtagKLSS4H+Vt zcP+H`K6b5b_>4XM+x;VHxOAj4og)>u@dVUc^S|TIk4sZ`zTt*hF278+BG`hE6W-_!r@Fkef_+FYVXXc{9o1Vb->kPGdKT9P_It0kqZYnbnV60Ld8&W|C8Ra z@P9VDEY>S>gS|27T zy|{uH+WBe6-L_=)<6j%|r<@1M<$SlOyPy;K151}gCMDNi{YYmRI33HE3;HoUka^Ui z<>^hbo$$|e1`H_zA`96iLEsD^*Ne^TCMaR}cx11ur?=wGxdc~REKe(qnmf~KsK$$h zUFP)d?c{EU9i-Ubdo;?=ANWaIa?@||j{0zZje{@}F-BGM0Jp2nPD1QNoYsHYC6|m; z{}73o|Mvaz?t9G(=vXxdEuxACEDjz~d`N7+e%YRpi^rui)7n8qs&Jt!Ji3)dpmbGE zlinmxqj8LY(!=@v$GZZ$4;%BZmF)~OjkX6bXUouTDs8gJ-~u6woVeAvjGyr}j>oPf zePrEN=GNJ){2B_bk>KVj9tHjlIUli5%Lse|F!2=G4{rh+)@=iZ$ny)u!03X!4-Js6 zM-*j6OTIdu-J3jaxe()5)R^DpJlJeD_QswQ{1c16W}lojGRwH~zpWE7cLDaX8nV3d zFdR@s5-e_)D$A`eBBelfa9GaXxhKhqGfSV8=}Q`^WjPFEuTmM&FY0Q#3jm;j0iLwSl_g{#^eW%&W^@{tmP zBIok+Or46{fEa0Rv<;^B(GaKjVr=z9HTdBWWh|rma=97FBW;xbSNhup*S2;FE#O{!jmt`}NiV zdwV-;7RD9%SrILbHBZH+=s<0lT2zr~b3z(n+I++NNqbdM#Kf}^<6C1($vz3CqTU?c z->>V)upz6&GpamzcawNt6 zSh-o0@$BeoSHR1D+jkmM&C9LkYI*Ipf{&7D7!-Rf&fWAz{!liEXhu#PA}@p{=xf@6 z6(#3>jJchy-eWkHRKC}O%98F4JCr?hNIK$G;lfnW<`w@Q1t}vJnKgK?L}HEsUk!9t z&MhB2zay!8@nBK^&d&N*OH%S(QVJ}RR{`9H_R<~%6mVTf2#`PrRu(m&e1vVdWEPrf zaTMny+sMCdL@Mm{`d0DfXl`XYPx?SW>*$Jz=E6U1ZKgp^_Z&G~_S^=EYuICal+pi{ zm}ictDSXO|+cGr2p9A?JYA3cGl#(yNiB`c+h??@TBfNx5fH_}cdiaEBJR#6?5SkAn zfsIcoo=rt<;;PFF&=C*I5^3*VC4`|6e* zJlu3tFse-2qj=~jx{a=FCL`-RO4Zr?m_ch8h4%W1yK}S+FqPJ#_a+7doTyxuU#QQt z*!z{kd7s;wM%!C`mv<-6w*2$6b9QHzH(uuS(dmh7eDw*7ubXfSfC2yzr=Vs`!Jb_p zRygKbPJjG$C&$I*^1rfE`e9+4-64x)$)u-O^!}Oe90)bKzp);;`~&|bu!25V$W_QI zTK`wzTYwp-)`MGsy@{{$WvbjTo^_qTnSZ3(E6^9*?&ZB1DTBveeQ9!`5uYsG6}nQ| zI@|npDsq>pr8$vf_)mDw`^a6Z3d5&C13h!r%ONJS|CbGp**6ebjy6(HQb{`A@_zqT zklgxf2>*6=VfQyszFor2VyfRf z5-YfN6~1p&eHiO(e?nu~I`LEMgY7Y5gb8`|6wg7a{!?f~h!8xo$h2IGk-h}VCkYmv zzAsj3s+YC&KRg}zAD&A2EFQ-V|41gAQ*tn_8AD}9%h)j`X_a??9n*ddUOm&Fr6M%Z zR8oxdDf(cpbiiNOa^QL4=qvYr+HSI*0Y%LD#lO={?7UoAnEpuW5Ij!vtCU2IyD|Fcqe_JFFerY7j3a4lSZN=VwckYRp2z=F9&GNzEGU$_ z5smrTaPM+C`)DZJJi&t#SN4AjwZ^W(%zcbcU99X$2<}S!BK_M-o+rY6-2r2jQ z&lvM1jPvc5QG^0DTg9%5`8}x_~6Aejb z-muAtO4R03M4`+hNCID?xaQ2=q00(r99$dS$S$HQ+&z~=#mVMLZ_qj*5gRwSaXi5m z9I3#^hV<1_#RQObu95qSj=}WU502AsrPmw&yrSZV*}Xa?Q(dkseo%BfR8Sw83oT5C^hPsUUa_fy=6@d!#A_u=A&3h7I2 zHh^mN&rEs*f$({R&k~xUh7H}DUDan5T0OJo(reK7isQ`*BV%V;=eeQUTc#057 z9}~!P6{`V154->|GZt;+5mjjh;TdxB;q^QoDC7o&IYYrcV|qG(XUF#xEZ8Vk4XwTF zftUv5yr4AS`RR+SGom>PtfID7Je=NMZF?7IsrzT|p&y)j8D;@R>J<|S-x*z??x=Gh zv7n6JB&SvqG*76Dgo`TbhV=~l!Y~m2<{53$e8B~vrMiaHBOz~qY}ECv)}Gm^4jc~Q zOF9oc7f&_OMLiTrd^alGS3@1*wHyfEY#ZV-__Hq3q?z*1g?VIR!my}^CFvzJo7Ta6 zX(ibwzG1Al{M;36Y9DnfEHsB-8jcn6&S-XOQPd@`6|Ae$xQB^MVk( z7NhEyOiNpL>^I2OgGzI(xAgSCKC3IfGy=nI1%XAuxeZe&;exftN0`=d`UzNu5G4xV z(Pp9VyE<3L(~>BSAhJ;|$w9*mi?ww5u0>rF0tgBn zGzHS!gRw3TeR)qA-atNR_w-}j0V}of6){u)acygP4&R>mIX!k-2BFzq$CSxAucWJh z){WKG{k!CU`(o8|)jvT2t3PCUBI2ul4RxzDie{hUwx`uXR04cf=V~BEZYTfTb@03? z>_6xAjqhSLu+3sZ`v2eS=6iD>A@zFPbi@d*uI1bKU>V-D>^Z g6pib?R&yw9E2)32Q!6=~+eHYlFuiC}ZcJhPKeGn1LI3~& diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_road_cross_live_light_empty.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_road_cross_live_light_empty.xml index 8e1b504558..1c02c83dcc 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_road_cross_live_light_empty.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_road_cross_live_light_empty.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_road_cross_live_light.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_road_cross_live_light.xml index 3a511c827b..0a70f9abdd 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_road_cross_live_light.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_road_cross_live_light.xml @@ -4,13 +4,14 @@ android:layout_height="match_parent" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" - android:background="@drawable/bg_nor_light"> + android:background="@drawable/bg_light"> #50E8E4 #252B3F #131415 + #B2BED9 #27FFFFFF #1E111111 #FF213757 diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/msgbox/CallerMsgBoxManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/msgbox/CallerMsgBoxManager.kt index 0ee40a2d7e..4a2cf0669e 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/msgbox/CallerMsgBoxManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/msgbox/CallerMsgBoxManager.kt @@ -26,14 +26,14 @@ object CallerMsgBoxManager { */ fun saveMsgBox(bean: MsgBoxBean) { CallerTrace.write(TAG,bean) - providerApi?.saveMsg(bean) + providerApi?.saveMsg(bean) //todo emArrow test } /** * 存储含有pb的数据到消息盒子(区别与上述方法中的trace write) */ fun saveMsgBoxHasPB(bean: MsgBoxBean){ - providerApi?.saveMsg(bean) +// providerApi?.saveMsg(bean) //todo emArrow test } /**