From 8e3d7893d236feae433a031f024def2f2fcf17a6 Mon Sep 17 00:00:00 2001 From: chenfufeng Date: Thu, 1 Dec 2022 15:02:09 +0800 Subject: [PATCH] =?UTF-8?q?[2.13.0]=E5=85=A8=E8=A7=88=E5=9C=B0=E5=9B=BEV2X?= =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E6=B0=94=E6=B3=A1=E9=80=BB=E8=BE=91=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../eagle/core/function/smp/AMapCustomView.java | 6 ++---- .../icon_small_v2x_road_construction.png | Bin 0 -> 8753 bytes 2 files changed, 2 insertions(+), 4 deletions(-) create mode 100644 core/mogo-core-res/src/main/function-hmi-res/drawable-xhdpi/icon_small_v2x_road_construction.png diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/AMapCustomView.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/AMapCustomView.java index 4535ce2b35..c4640c4a4c 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/AMapCustomView.java +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/AMapCustomView.java @@ -260,11 +260,9 @@ public class AMapCustomView public void showV2XEventMarkers(List v2XEvents) { if (v2XEvents == null || v2XEvents.size() <= 0) return; + clearV2XMarkers(); ArrayList markerOptionsList = new ArrayList<>(); for (V2XEvent event : v2XEvents) { - if (event.getType() != 10006) { - continue; - } Center center = event.getCenter(); if (center != null) { center.getLon(); @@ -272,7 +270,7 @@ public class AMapCustomView LatLng latLng = new LatLng(center.getLat(), center.getLon()); markerOption.position(latLng); - markerOption.icon(BitmapDescriptorFactory.fromResource(R.drawable.icon_warning_v2x_road_construction)); + markerOption.icon(BitmapDescriptorFactory.fromResource(R.drawable.icon_small_v2x_road_construction)); markerOptionsList.add(markerOption); } } diff --git a/core/mogo-core-res/src/main/function-hmi-res/drawable-xhdpi/icon_small_v2x_road_construction.png b/core/mogo-core-res/src/main/function-hmi-res/drawable-xhdpi/icon_small_v2x_road_construction.png new file mode 100644 index 0000000000000000000000000000000000000000..932d5c5ea8c83de89eb18de31f33009e5350c1d4 GIT binary patch literal 8753 zcmV-1BF^23P)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91OrQe*1ONa40RR91OaK4?02aB&-~a$2n@L1LRCod1oC}nmReA6C`(0)- zGr5OcC0ryVkxPJMG)2TjZUIzKvQV*rTIJYk52$UA)OH<0&tYkc(uK5oPO(zNuA}7y ziy~DjkPysLfw~Ap4fi5QE?je&%w)dH`TzdUe!rPqArf3&-81jI_kQ-XpZz@l{p@G& z_x-+^BK-$SOP4OK9I<9iacM&&<0^2oO6t^X)$7Qbyp+U<7n^oeukwHwWa)zp4N ztDWYwTg9BB-JX^z?RH8atBaxtrr(kw zzZJmNoi?wp-M@87O6_;a=tZ)AViG7BkA%g50zv{rbphl{cllOZO|2#r5LNCDMQWwu zdEvSuHCx~5Zjbr)wAHJ(zSg+Crhq-OXx5@iD}7k@og=U5H8QG%=THdqfI`+s9juHb z1(D5TFwHDr+x9@ASb16`5{;ucn_? zDwWS2bl*eY+uuuezXG=L)L9GL&EjeyFwc5poGnwVC;rw{ts!*_|aU($X7Y|B|kO&#bT zxKg&9Zv$9I0DyNXDlzBwEC+Jwjm2WXbi9Nl$7Hd&$-MAHRp@B(#oBaVVS#u6p;yu- zfB-zlI5L3MfY;E`R*H4q_d~3eslv(`;zFrPwB;X%{ep;HE&bE zILz7-lrgL#qcwx}AQa^n!>ym%RW=X2>H{t+36C(+NW>z_ooEdi?yLP`c-NFS0VG(L zJQ^Qa#56q3yRzC0s_3Xzc3^Bd{G-iOIrEU!YagfOm8N|HY|Ghmk8U;^w`u&T#>DE% z5D|=wq`AnhN5L6Z(VlraMKyYfhH>^j+N3%B7;f<0H;|!?V~7C^3&omI6WN{V%`C~e z&8o7StWOM}qWdZAtskn@&OGeCUp^4xUjB}(SCqENvxZvjRSFVQtpUbro=OiwAKQjB zyh#bYj2fOMceBU2vsi2t4IDqo;h`u19FGtHa3Lc+2JeA2qvIx(nK8<6y9h0Yrboap z7L`csvJ}~T#ks!OuDtD)dYVr-ma>-{F>5F_Z!0RTsR~C@OB=XGql^I5=Ryk`$U4vx z%2ccDHQ_iD%7PwB1D12ORmM(8sV0dcWbBN+?6YSvR!mSpW*w}ATB^FVEJ49K=COdQ zVo%PUB>*{96qXn@Pm?bHvTokIDWbe=vYmV5VmI78ICQrp&ksk?oY6~4Fkcu;fy_%R zAfu+bF4{DuEj)*+!BD)R4MTcIr%`WNl7I_m!+Vp*3dcJsOsFqVnXS0bX324XU?rJe7W5du=kq!hlai= zrujPOq(ajY6Nep?a~(tS>;^+9Y{6IqUrjZ5EI`I$--JnN%()k)u32+aWmJ!N>Z$1I zN%dK?)A;}T$y7V&5Cu4a4X-t2ylQy2H=RD z0$21b=0EjN<4OzM%WbcK^}l=W5?S^Mk7D(#nFkn_DW%Fm1&Ec^vd}|tfN0H8os^d! z%Tb;BPFkEQeWO!Ruj_4%z^Zp?QfdNDc~5T|^WFO8&@ymHaCF?=6uC^MuoFe=9ua24ho*?Z0zDK~?=N&awbNf|dLLNpV$f?WG zv%Hv1@ce9ffaOBB)nirJRrKNKRTDqq0Dh#7m6xXg_ zaMaY@!^N0;NZYm#T`BYYxD#F@MlkRcYXr*l_OR3$UKc?Z9t@!wmG$dfHo();Rhu$B z0O}S%cvSW<01R)#tCi!wqt!y%d6=BrG_v5i4kp3r zB)hzkNIJN7+EfH=>G`|AI!+kuChY>4j3m%rjYn9%IP6V~jd1p3Xc?#QIDvy=jt2l0 z_)!3uK#4x83rKdz!S&B%uM$WZEIqb^64A}Tm zSBw`~w_KotKJ=j+9)>KJRq!UD!Sv$uDzGr)h}$lJ4ZiOU@08Ga7Gd@*c4Sv;j}+;V zc?cPy2sAA_RZS9alc1$WGWgi}2A_H=ZU5Di0T3RRW0#j>j$w@r>(iFiKhrR5BH^uG zZk{>jQ-kY{+1_L@T$dxI#-#-wvzw1{ID+{^>%{yl$Ly9`%v=A)qu(JBJEUCz6R3Zd zWt*{_niyClS&bq-!?-uJ zHZfJlPE5u4iK#MXLMnRubO3FofnTmk&;4j+Y7FWPiw>*P-+y81nRi^OPCOvB`uo$s zFV>_D*MBv&UV1?X_=+yY@0_zJjS?P2te^(^(n$pCOgmL>s6Py-f`TfvD>S%(9hP7! zAW^5cOYNdsJ!Sem53CTuiN2jQcBro`eu4=)!mlM?gboGz*7GjbwI;2RK_5KhF+=#MHSqL z(=b3tNBGc>UQCaghPDqa(bDQu zH?~&riHqqf%hH$wpW+EIQ@gtkfRb5Eo|@{1A8AkGq)uu#gkn>dj|c2}8iF1(P~}x`l$W3Q{&c&_EEp2vx9` z+qZ<+=miTSaBB%RpMN%OxbDl2Pk`Aw=ZG{}&xJl`mEPrCL*s!0lBa?C>^G#>{ja}H zPkr*DwEf8^3=%-`;~fxv08ZZ1@p#pZ3~HJaCN#7?Xi32!FvVsQwM=0zEFGGL;Qbt8 z=&csza*(ss=Nt4h_)-9Qiy(vojKXC~lqHiYWCXSpw}=vz83z@WnX}{;^`c#^6`NNr zFNTKnG6){^*}mx|fx-b*9!4z79%lf3V2wv3*L!=@0T+H$V6mIUQK9rSJjx0f5S5jC z3E+wTK{@M-^%!1K4M*vnYKkAXM<4I=w%4xU2||*z@Hi?i0wZV!EM0KaJUxU?vSfAi zdc)08u0%+z-j$#=o6?PdpHk0)MR~dDD6nNy+VtQ9si7T6F|KGdTE&F7FD^J+#i117 z%4bK#Fu()Md=cMz7M+%=lO{QCF`f+-5CMSd(g(*X1gb&AaKJ6~0}f2f2$f5Xs-ZQ% z84zkVI)oPkhd2?y1Z7^eP28~Hzvyh50UK(x7aDgMOQ2{qf^?=Vt!Y;l6REr2DAW#` zCC>@No10$rCg8~uS9R>T)O-A*5gt~?G59HS_KMt(M*yc|#<+L9+hd}*ue|hFk~Hu` zikfmO#4S9;O8_OTsq(T&AIjwLs$5<{jmGe%D91?RYYx2)9($NV`4R3351<$r1foDz z5Sm;H7Qb~+K_5M*d%Qlu^OUZxjbzNOPGGnRmMTe@{V2=e2B)@ zqN*c6226U*K|xYE1Fis%G~%66N3qOgV{~TPa_cg)dRfWX?s@amLI3^obl?RaO=C_! zJHXU4p<|Riia54YECcYoY~iaNd2CUiGEDW9oqeWz+;>Fx=j;&G>F*W_vW(Z|b?B`AQ}jiJ>4gYT+8amf~>-V+x|x)x5> z9bd^n5nD1k=rWe2x7%WL34^S92MB7xkFi=IauMx?2(XvZ%Ztf5 zE&_NH5t+F|EC5kv^ii{Bm)q*#-^fU5(;c@t=hpSc1zrwPICRsv?99dv zU9G2bOhZA@%1r?hy3uN-5yH_43a+Zu3HC+=3KBfpa36@Y_!FFV@!00geU+r|l$Kyw zAVJWAvt(p2%TSd?0EL4Y6jAJ)l`?#3<3Hb+w%q=`j;DD;5K!fNuJATuR(Rj`fBQ)> zux`Ekzi{_mDK#1~SWj=!edIjb7jvk=9M8~0V~dLy0R~R`p{@B!APtZD;E^g@Z)jFp zbjq}q_Ci-9?ZZbAmb(mepOi+|YNIM?<3@3Yjz-1BvW^gta!cGGWuZI}1FxU|RA6k^ zeLxNG3ZMi~xhx6r07$%3+VbPO4L)Nu`?sc{`|mZKTko5Xk22uErE!UAj9&tQrlE4y z*#zALTmT3|ZVPFhJ7(>CS(x}ucRoUHt0fO}8t#VYbj~pzh&EE55#@AZmi2rrkeCJX zYRsZ$t+{!Vg1J11ov#Fn+?S3Io>dD?6LbtYVBtxUU>H*W-OHmv_xf>fvaQ~c@$!Z| zYS^hVQeu=BWD`+SNs19NP|S5@7_Yi7bVi5F6B`9>7!-NQ2aiJ_vMhP> z%aO?G-lZ~+sk~L7as9V$NYDI_Po?em-xEvIpv4lj5#lXVq0b`^ zy!zTS`Sdew^hV-R_<^K$gy%7aGd@_3q0B#JZp++kN_GMO9876j_44J*+m{_ZWohOJAqWryKjrMwncuj1u2inb z5S66}Cwnj%_x_KhuHRXdsxuGO2eqfC@p{Y|`uE4u3*WpxwbwnJx(=J|rP|V44L+;9#9w!)$Lx@0N zyvYn0VY40*iaDh21#i=P zYCg19yi6LV!vKu8G33dFr^CUD2mbcJn0`T zZVhn|Mh1RkVZOC67%Ury_@%91My`*C7_%!}w zm!!E@{cRd}>dEwr_q{vy-yDb6ox4>O$XhysaOMK6mcH#X{x3c+&9Q#>sdoGcMc2Gz zy*co@fH$Z+*h5bPQRXHDh$Vz>7d`Xoh3PP0lKJytPZAT>mt&B3gm`XpJK zfbJ7c3fe2Y_nh|5blByeM5$_bntd|(yLIO^Rq zpBm{SM(0CA&D3-1*=h7=v{Xi<=l|-m^wd9IA7E?sANb*m(u6_)_vw;eW1eE35Qc<+6*6Ded3k@E%klu(-)_guDl|( z_4xp)m^i7}7qIA4Ied1}rvowbZId7>l~$k=WehNQqEelX{=#rWj9l3rMTN80pv zS9kcz!q|75)p=^*iGh`{?uM_YXMXSe)OvPf$+pk==->aio)GltB&9val2F=YXjIwV zvh)ng=J3c$=e<)0FnR4VVYt;u06l`a<+3X=l8OQk09EJeng13ov*AN1-Cq3mw+ui{ zk28Q(*Ja>T-*Ce}r1qB0uys=X2>m@53TjYB=Lv$b`yYSo745toK|2+S17{Ya&pyW> zS$!tkvL#-#Qa)4KPS=BGU655N`uloE-&Bh209M@KPj+vzws8wT#+SK3ECa+c^y3G> zi9G6rQ%ZTxn~yz|`q!)$VDc1z$}yx?Q!J79wDoFxVEMo9(5IN7?_nrLjeO9>t{Inn zTHnpk_cUHb>b>Y9ecwZGb_pTaP_EA~Nt5I+WyNIKR2pKyN~^f3xb3#BDHSymX@Lh2OPc^ zK>+28C8muXld5{;8JPxtw9<0J41#Nsrv9nUT=LHSk$NxuklqaR#S?(+a5#}*6$2z@ zo}%wj5O6>3S$_BOl0?1(U=Xyfub`W~2q7bow@eU|)Y7X*y=BMUvGL>OsijZ5`SjYC z`j<-*@BnhsJKrN9;sqjOvQ#$R@voj)3s;}^Fi!m2|kileIEKQ>o zIN8n;tTNYU0m5R(vZ{2^3mgfCt!*_kDCZMzcqqp4*)U+IrfBOy+w|;k-KiOgV z#rL}WfxA5ouxk1eaNkbPfrH=s=QQ~EqnZbPwD3obO5;EICp*a9AC*z(eIOAl?I-f~ z(ivESOq7o`rqfng-Mf6{Ejy393t;Ljh-#OV*ti1%k!gdJ2{*j0GHG(E9DJBrxV1K} zOI!8IS&n2+LJ`L;#V~T}qxo*WzU@<{_LeQ_*)LsX$zem0ChKKjWy&y5$@{AFo}Oa# z2S22FCiePnL%f=7Fb?4}fOh8M60q2L%;9x0qNRT0&sJ<-a?A}{cNcU#ObBTVi^ajf zu(@?hYTma>&vrBYeTyys@MV3Zu0N{t(u?3tEF#4Nu--C1{zz&)_K3FDQK~f4=CA$l z)Ozs+0}5Y7yIIfqAEfx2r23pW28pO@V>n7+3@PV2c6_7f&Xp^IxZ^!@?ntE8K5xO) z#=yWY_0%-p0a8KB&yGT?p<{)9{k_$uo{#+U5MV?@k?^pZ10(~m(BiZmuV(<>uWNE3 zdF&wDk| zK?7^nd^C`Z@Gt>}hvu(H@eGOp@B$NKkz*wpbO1#*6T)+AOM@^;Y!EWg`;U67FD7sg zQ+$`<#2SO4a(Tq5YoqZ&T5F$gH%5%j8kT@ni*vj0Tp8bgV1S)cjItAPWVLb5ao6Y@ z(0_=w7;R%z=Iy5qz{5}?S0A(m{-}<7mm$-5$RPcV58q9Y1hr{~ z1p%BknlHQ*6GSLH`4PD3{v!1_|cD60)XE|BZe4}9f^ z5djz|i|$S~Cx8+;f|I}k8tUrn=RdJIPTI?m3IikO#GswJrc>a+z_>J(o@H-SJ%FMO zS;hL)-1gSbue$H?r81=yxu;y+Up`?oTw6~+>gZaf{sUD5G(L$&QM4+-Q3;Uzp)NGB zpq4#LZSYgKW-zMk%QGN8erOcg@7k0DG(>h#I?B)hOw~Y}LP&BhzG2CXMk5~OzN&|J zN#6QqW8jQ0th#6QWs;<3y6rVZq}(fu6|tZ%eE-1*)Aq&*nz~0&B3z&0t&;D&lf>n% z9X!a^t@Jnpsk);RMySz-sE-Yy?t`x44uM+U!fPRdbzPsd#{)f&ThR0nuV>B3#g_v+ zyQ5zxsW0W&4GH{wogwR2R36t3qrM@%HJ+ihr5-KTGsu6+^tkb_Q*aXl8}d2H25s>cMH zK?DmHQ0fb>lFIjP@85RTt@qrsQQv55UuGso^(f}q(=8dQ|*@#G(0|HKpeL#LE3%N(H@l)a~&M%_E}?pg=WoUgwNPhXX7%Ggm>eabgR5z3g8!Y%RK*{ziSUY$_5Z#bOGlbyH-UW+E zy7@=^!J7H-I0B#fhx@|g;|z3o7@wZ;Y|u($E>lFVy!Y zt`a`vziCi7x=Hq|BSq>^8CQ%2CWs#oiY_LAbxJ68nr ztH0+_U%jAGf?`fFxcGSeRd4z;ouL*8AsaGsq2PhuVQCowL;w;haWDJC7f>><=qh=C z@R%7O_sW3kWBs2>{uR~RZ@)!(rj{DMy4>TuIuU#BJ+%0Qx9fTE!}6GOznz`*6Y`7*CKb^M40Yf|yNP+YF-JJou9*~m|K z#QK_~VNG5W@w*CT$qt=#;ygLdLY*!6bCfwkV2%Ks4sc$;r8fmM_AD)|XT-BsQE+Xm zQvG?orT^c0#~uGU|MBgvu