From 1d0842adc13b3fe9181c3640fd5c2e2ffb638f3d Mon Sep 17 00:00:00 2001 From: chenfufeng Date: Mon, 24 Jul 2023 15:35:29 +0800 Subject: [PATCH] =?UTF-8?q?[3.4.0][Opt]=E8=B0=83=E6=95=B4=E5=85=A8?= =?UTF-8?q?=E8=A7=88=E6=A8=A1=E5=BC=8FV2X=E4=BA=8B=E4=BB=B6=E7=9A=84UI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../eagle/core/function/view/OverMapView.kt | 4 ++-- .../src/main/res/layout/layout_v2x_maker.xml | 11 ++++++----- .../drawable-xhdpi/icon_v2x_marker.png | Bin 5560 -> 3694 bytes 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/OverMapView.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/OverMapView.kt index cd64f3d899..fbd634cfa3 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/OverMapView.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/OverMapView.kt @@ -591,7 +591,7 @@ class OverMapView @JvmOverloads constructor( ) } markerOption.position(latLng) - markerOption.anchor(0.13f, 1f) + markerOption.anchor(0f, 1f) markerOption.icon( BitmapDescriptorFactory.fromBitmap( getV2XBitmap( @@ -615,7 +615,7 @@ class OverMapView @JvmOverloads constructor( val marker = V2XMarkerView(context, null, 0, poiType) marker.measure( MeasureSpec.makeMeasureSpec(AutoSizeUtils.dp2px(mContext, 229f), MeasureSpec.EXACTLY), - MeasureSpec.makeMeasureSpec(AutoSizeUtils.dp2px(mContext, 96f), MeasureSpec.EXACTLY) + MeasureSpec.makeMeasureSpec(AutoSizeUtils.dp2px(mContext, 115f), MeasureSpec.EXACTLY) ) marker.layout(0, 0, marker.measuredWidth, marker.measuredHeight) val bitmap = Bitmap.createBitmap(marker.width, marker.height, Bitmap.Config.ARGB_8888) diff --git a/core/function-impl/mogo-core-function-map/src/main/res/layout/layout_v2x_maker.xml b/core/function-impl/mogo-core-function-map/src/main/res/layout/layout_v2x_maker.xml index d105f5057d..b84362305c 100644 --- a/core/function-impl/mogo-core-function-map/src/main/res/layout/layout_v2x_maker.xml +++ b/core/function-impl/mogo-core-function-map/src/main/res/layout/layout_v2x_maker.xml @@ -1,7 +1,7 @@ @@ -12,7 +12,7 @@ android:layout_height="64dp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - android:layout_marginTop="8dp" + android:layout_marginTop="7dp" android:layout_marginStart="11dp" android:background="@drawable/icon_small_v2x_road_construction" android:visibility="visible" @@ -20,14 +20,15 @@ kgzdq0B>-l=U>y(zH;PE(H>=7PG9smGv#L@zD zf%Bf_SP zZkC|vd7Q}6Q<~ifWSVIWE32RXNvvu9f^7Z9rh$t#i|C{MK0I_|$uqPu6cKcSy=G9v z7%vF#-Fh5k=@4LVb+nk=Vk+-IvUoFREZ<^i;)Xb-W(MnqS!p@-VMMMx0B=fL{~Mvz zvcXElX<|%2$Xl3iMkX=o4>h}Q&$$@p^E=Y!eC$1Hak|4Q6vHcN3{%BFc(JLZ&da2J zG+YNrERX5lnE9+cfh=1|7jvGXh^Opr9Rv_XI@}o-Ds)J{m!LW!e-h~ zIM>bXt=pz%EI7^t#AVvyVgPD*F{4aVZXRSjGy1_axB4P^cb2lkHo2;0hK^U*ja=!; znC;&WWV+U%f|aVueoKq7v7LC>GJrfPkKW0YdC5x;yQcV-UmmKViMp>}n;yDCBd)8J zOGd52aRT7YZy66}TDgt`gO1NPtI%!Dd1(exd+Gv2*WRNdkFl@M${vTa?&tALOBUN(OR3hM59>8Ga4NuYQV!xEY zK>_<$C|3KLWXNgbm&K<_m*F@turRex$gX8%W4+$RslmT_`koCV zvwhvs_v+~YULj5rLtittU+z-OoLIT zhQE`NRM-Y=FXx_=0HdjISR9kil2UqxAVOv^~4ZjBMgdn_KDXvZ_tH3=BkYH zT7K4)6sJHfyEOnS8=(%zRRRHU)D_52$F;DG4-XAu^sYpTF#G-mhcTxk@H_<5j{^Vz zEC&G&JI#zA75T)2414j}%gvw*Kz=8mO6)Hcu`_lfp)4XuYRX-n34$27+C@9r(bvNoecDe=Qpd@PuN;(qqcr+)Z7Mw`!rdN{5TJiXJL^sM;Xnv3-yCm<2f=pubbEt@-;kR9%s zq43u6kTWl64NGbSujf^ZHo7g}d?Ft_Z=}tE;`~~(MEN{QLlk0E*C{qD`Zru1nIU+XK z@ciVjLGuL@0QmGdw6BYP_IHa+eT0n%%kDP!r~}}?XxXMjqXQMj8#Vl4@or}ORqo!3 z{}|L10s1}%U1hf^6bNBK1O90k|PPF@$_ zc*TH{GF8%DSvzuggzTwz3NANXIrLLJ0TjAzhV>q(_R;ec^+Zj~yKPX%ZxF3X-kefB zWM26(Z+iM7gO@JFR&nKF_d@?HHEv5BPo4e5PcBp$si@ToF zolN?6FnhP6apt62IV!j$dA*{Mrt{@vy*gTgb9^q4)xv7;#(0{lxh;OK^NuleEY)Ga4lxUNt|k8|RH1nGC_X)|QtJOZ+2)h~;tLa~aADq4*HE9HlxxO!X z{9UPBMV`oOFW%seYPjK0HMRvyp_lJUTDZIiZyM0#7EY*md!PR7#^oVcQNbD+VJGI3 zUoO|No$5lFF7IRTdJtXNCc8x9divI0>xzLbPqC5E+%x^7l(^>%oGo6*!Zh!2}3BQP6; zQ7yNvhH7{WCYuEBK1m1?PV|rnY&G^9Iv01+GJO`zrH27X)^fvM6 z(+s|;(p^Gakov~}eo&@7T6Pz+p`RF#+P)Vekxnn@pPL`Z&^_(l{-ggX!sd!$ZOK_b zxyTbAzx*yv){!4{|M2`;OMs~y2jBkGfQF5@m~LXf#4>dLMaI}}_%r!tALBTMu~sWr zchsOp&Zcy>W0K-Q`~LPge~;h3lRVMK{3smf1#%Sj>_smiWV|w`c$EGW^lJJI-XSLs zoCHD!A>^kJS~xsJG{ryilb~$jtr^e zQXW(<`ut%`${nAKLcb7t@?>g@?tecM{_c~Ya(U!2jc&)sNCf5=MC#;-I+>WT)_G?> zB_b|@=eN>*u>^fZ`EMWI3>`Qix#AY#I6iU$gr*>6WCq5u6kG4>v@7Su z%4gcGKl~7<^rr$&h`=`0Y7zZhF#xi@!o+2EN=SX_`JFUV%qQf`fY^~D-t)s--{R&( zZJIL0XyNQHQp*x4e_nM!>y`1?bzS1=4Q|`)_0O3K9NI`jC=rFzN`6n=v9XMJQDYr( zI6txb;-q@vz`AR77=(*_Rt`5T7G&M1-;e!s&7Zrc*%kG6WlNAwJm^^unG_TLD>Mjl z4PpQ8qJ4Matx1_k!^f8?7;Z{UW2v!1kr$+gqXunIO8E*_wZ#J?JYOfjAknKo_3&qF zorIovN!LV_J*>l&IxS}3TgBOjHkLQ0?LMbBHrxnM+O`ilbItC?a;@Vlj%H2E;?hxT z1)X26?}kKH5_cWwQM&h4?Jx{&=Ing8Sn^*vWI-u%U4<5I$PMWiU0GVS=|s(xRbuEL zAAJf^Y6J}cS0He2P-Z`vLm#v|S~F^9MXLxB)ASxvJ>i0c3TMX>!B7?PafgMnYuuYg z)U78jri-iAG`8|iEOqjI)Z^6p11z=C86wa|>=nK-o^uHdy*HQ?tE#waKb-rE(*|&q zZBtsbiJx2u-D9Po6IyhJx~I)M^vGkfy}LyaqA5m>ie(w-E(f@Dk9gl$Q5s!xN4I&SYRdDS0puM=X_AWKDYc#{_lVc6zWjwS|aXm zeu^4INIxs6;+=gNwkRZa<(QAo!4+GxRB;HYNtayk*mx|oeYCEWokmgI8VaN>>NuHD zrT_t8&>dJ#P3r<7cr%**Kzi!?@D$cs&#sXElKC Zo@fnuMQ?iN(DU~mXlZVXsW!bH^*^RGsR951 delta 5538 zcmV;T6n;jQ{`@B1uF+RCodHoeOvsMV5f8y6+=5$xUu<5*`VU$V23z z;OGnvGD=WUS@}TZ3nHTft}?s(&Cagl=Q8uTIE*untKaC%=&lcR9K``*a7Gk$R}@fQ zqLCpQA4KF8Py-1haBq_P=&ss-bGmOgHz5fmxw)5w(~xvm)j4&l{_d0NuCA`)>@3*+ zv`c!!5q7@H*eD%-m}G@QGOvUmA*7cv=@CL0CB>bD1PLM7F^t8%)Xj7q6O1?r<9|rB zWKc;$#(GTOl0$txrf8^R7$ZT^vZYH5;D7iBg+#fN`GSp@zHTU)dYHd|9+Sm-OLjBm&+V4^;SehZU{m3&Ol1lmiSUr0aq_?;!=bPUH8-(vD8xdcCIwFr zo_I`0NxWc;Bh-t<<7Hsz8^0hPgz#dtW#PcIfpTUBrhM$;09i|a-;zTG`vQ(-gfdo~ zSqM|#xWHnCvhp?dM!u%amSICUW;3n~MqLdhBh9u2%9j2~Tb6B;gK0h{2j#TtVeGN~ zW`yAkc!&Zjx)96~zXuy=B%xFJz+qmU>L ze1{gESD5{g77h=4&r!UZWkewRpp%XNwLJg4;JI)rx+moA?g z`vVY#R`pHr3g%WGVJ}{}uM^pI zTC~TU^T|qoIR)+_?uA>0tA)_SuJUsE_xIK}eX?~+P~d|YZA73K5s<1&(ef|!>Urbb z!ds}qEwsiIxe^}99%QSEclAV767HPORLap&!Ttv_F4nY&`0$-|`i7TQHq_VF(yeMw zoI%Pn=>$Y(fje3_DNE0RK1{eHhTGj2m{1n8)mPMiCbBRIbI#>8G9!3|E#ZRQtxHYW z`o>yqW7*1v6ZH+$OeXS-QC?>a0g=(q6)pThww^o60fjma&!vmm=qb;zrQih#*b?HL z%PQrhs4hzt&Ij-L^b_&&6OYv&sXmaDhvoz@pe%?$w+LvyVd>Ff*Jet0j>;K-U#2;4 zX3HmkS9dE@Q0|sFU4f_Ml!60Ar>=Vr&z4LaUyM-csBGB6iV2^Kf&<}F7 z!bvW0s{m8g+gRz9uXU#$U3SjD?3P)m+F;fGwa?XQ6Z>)@s>3?fi-i>zJIiIeS!(sT=J22d0=$d6uHg8$G=6HhY zMA;C5K0^S<2S$cppQrbm;Dpge>!sIuBYSRgrylt_<(%l4nvmOsrsb7B`f%gUP45PO z`wUI02odN30+At8{O}x#;{!jG?%b)J83uU9&WX3O5nXPVx;Erb_b&-l{e4GM57dRS zBm#YoK(yd8Uv%hH5A@`|C4Jr*Y}uvJGpQsFM>_3>oj;l`--40BLsvqJNsf71WF$ZY zYy!@2wl_Gw`5+8q$**O{gU`c|@-u3G6i@4%___ppWhLk1@fov%Ze?xgbU*~olz{8N z`eSNsWfVS@x`oYq_m^j)cUtGf_n0t7cKVjJuSBTx=S+~23=wFXfa|N*>y*GD_?T5L zVe{Ub+P2im*bbc&NB+RT!3Pe)d(79KefsE0H98^!M4+<-@Pkoz)howXq**e5O<%?4 zZSUVv9_>0Oj+KR;+0t+z$Z>!Hy~pebBc&06Gb6yG0nPQ*+914X$>)00a~)~5>zs{8 z*nKbzY49sBB#%b^bcB%7h(PBEI2yica@6dI!d>ZfHut^R?P<5^ocP%nw7@^x3xn8c ztZaMeD4qy(oq)4?V?B#B!gMHq`eW?Yk2BiJsZHm^?=f{A`So9R&J*_C(d91FJX$ezPVPT&%WA1MsY+SF$5fSl>sG)y|?G#D5^j?LXX-m+#pC(gufO!y4*%36uECjvwu zIRqR>K92dFew$^{a86vigmX3tXJV&edKMbm6M^IrP?~BZyy>vuQrIJg4Cll}g`nl+ zxI{woibIx&01=2MpdQ~3x3;W^-LiEk#+$dbu-X^rQtpDaOX7up>6i!*f#eZT8V;C^ zqaK}#R!!#=@~W@*?vqWls8I6G1X&^itq7=r{f)+gs1laNgiXPPYo)?R;4*xzWGP4l zh(Hnva9v}(xfZ6om6xJfB^qU;aJ^AnA2W&NAX7wu2(&>!X+8?8WwPO{OsWbTj6#_s zhYr%(CT+l?C?b%5OaeSqkBy|0z4q>T_{=#98ctRND@rG`5M+x85P?$(C{0JrJ6KH} zh0a+B?^a~}VOr|_R8$m01d>aDN1)}z){<$33Je{}3^#`ovYudat3lR?K;I((A7Sgz zBLp9*aIXSR>Wze&`(7=nMns?&65v`G8cOg=g@JQQ<_(8`!@aN?RAeI12MK7gyI2V= zCp4fgEfR$tZA5?wq@I8H)6&c! z{U!oLAf*JP>c$0k;nQjvP+;cipv#j+x3wufC1jik#0WTIEhlFI?5(YFIo*mUGs9|5 zi4zeZ0x2SYAY2({%gK~_bk03kj{bv(xKdOeGD`%AK#YL&_)R~Qa<`(WY!CJZtr1>322^?uv3KwiQK5*s@8cNQY+Veuzi2#%CTm@#qJi=C7c0yS+j_rkS zRO*W^xWM#S0z?FeK*|V+%zPLfq*P)76b@f@s+@0s89ZVX_1LEDl#pQ}0K;k1`?;6{ zI)pfX4|y0pv@p(gTUvU$GHB!oH$fr-L?AT;bYD@rF|JmK4OjxxITf}ZJB7wgyc`l~ zBLYMq6$JF`A{RVwHZfn;hiKn$&PC&Rxs>wIn2D3W58$o1A(VhqpfgU3u-PsP| z#amil#(qD^p83FbPP7awGCY>y^Qo5a~rhM8`y+hX_b#hN|aXq=Ik0&0d;P9&e_FbCwL|&64xq4Jay7 zsP&A;M8`y+X9z?KzVCw`TKE7(`AusJEu0e*o%!q!Qn15U&%4#5sPydF8W@F%K%xkL z2)ECn4ZPUF6~393UAd`szNa|nj|+GcSJ+Zt{s8rgS#x}?6(~#uh(KZpM9#a`&$yFG zRo>NBj;A;$3XQv1c~(kMQ9O6P+fSd8wZ)C%h(NapXgTL+ik#svj#hb!t(>}}t<2hV z&SK6r#p$@+p}NHEf4M8CEk%kW0z{yHYXqdjqeO>amkvYq>X=8~+g>hhIwuPMbOPTA zU#vVlWb`=oirFP}d)ppCiYEe{BoH1sBTqUrRi>(o*z?5=?WwoxoTyNcuKWs?Q7NB# z^N-xaE}VcP7-%B`M4%f4q6L@vgl`1&v?`CW(kZWWlvRh$Su&PK6xDeXJb%`I&;IFR zZ+31zeURM|O-dsI9T3p6&+|lwTf>GxM!ksgH+@#IsFF8 z+wObFPc3LG@)RTj9S{(1zcVy{dTusT-Houw!ZcP|yuSl+JL!y^6QzIteRmlM&&}@F zU;c2(Lwt1}i>GRF&1D!Qa@L#{E_tPN@E@~PQ{GQRJrm}fSeOSl%bXKU z!H0Ay?+{U4R+VoOZDb5*RiGP2kenLcu84x!E zT=7z=>##(BC}VmwEDn8MAvQ1nW0$+0Ej#%m#;3czeuw4iFr%QA#L$-cM*wE&g?Kv! z4$R}&Zw#A7)tSSwoFXdv}a~v=wZIG94%Q4p3DQJB$UmPijzkn)P+BA z_SPZ~jJ4!rvW8$R&d$@;Hsx_rMteg8a2496G{Uie)c9jdp>%u zmky^Q-8l-ZD$S(R3oRo8Fe=grY&OB+dggGw%vN50z^ZmK_VK4B8TMM(Sp4>}?Bn&~ z62atLDa4}BHm(gFULa%pqQ*G}kj|DK<2pdwZepw2= zP#+hp<;oXu%UT7cuVO-ZpN*B}iR|EM1?#kb!FDm9Rx^PDcb3&Y0>c4+_Qs=&j~=f% z)TN<-g%?foUNG$zkLpTO;TB{WT*NO}MYOxmVh8s79nFle(?LPA6HVXec%LDVa_6jBeRPWCV&H*_59~D}&XjK9#go0Gueljo%XIA4e$thj z@gJ*8`qAj5GX+R;XElM8JEtzie0UarlKXbNcg9ZT$;xqzy=;sJ3e|m3<|?0UY$MWnmN!~dSHM6f21I5;F8~$ z@J{#W_T5uQHS6mHQs$gYm$yViA#w22@)ozW>HdC>@61}5n_Dyn#xu$)g{uozEgZ1D zub&929}#FxASKTElUHjCnj6KGL!a${Hz6lGX-7<&mOb{WIceOT1|6|~{9!j6@XO~H z@=)tSQP{Dvu>PYdjKh( z2=o+zqz`;AE0gM5T5aTc@O~Kl4>zy=AtP0IJ@Tod$^|dXFKBZS(VnV2=Ma>#;$eHlvmIk-C4-Rt<_|4K1-leZm&Stn&HX_g+0x5A$Y(4*1tDEd}sQZ?c k_^Z290n#M`eU-rf0}-HhcL)_PyZ`_I07*qoM6N<$f{XfuZU6uP