From 821cc5bdee4948a5f765c6e9e5790749ceb7019e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Sat, 15 Feb 2020 01:14:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E6=96=B0=E9=B2=9C?= =?UTF-8?q?=E4=BA=8B=E5=84=BF=E7=9A=84=E8=83=8C=E6=99=AF=E8=89=B2=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/service/marker/MapMarkerInfoView.java | 6 +++--- .../module/service/marker/MapMarkerView.java | 14 +++++++------- .../drawable-ldpi/icon_map_marker_shear_news.png | Bin 0 -> 878 bytes ...dark_blue.png => bg_map_marker_blue_dark.png} | Bin ...rk_green.png => bg_map_marker_green_dark.png} | Bin .../icon_map_marker_shear_news.png | Bin 0 -> 1836 bytes 6 files changed, 10 insertions(+), 10 deletions(-) create mode 100644 modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_shear_news.png rename modules/mogo-module-service/src/main/res/drawable-xhdpi/{bg_map_marker_dark_blue.png => bg_map_marker_blue_dark.png} (100%) rename modules/mogo-module-service/src/main/res/drawable-xhdpi/{bg_map_marker_dark_green.png => bg_map_marker_green_dark.png} (100%) create mode 100644 modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_shear_news.png diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerInfoView.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerInfoView.java index 1912d00ff5..386a05742f 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerInfoView.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerInfoView.java @@ -152,9 +152,9 @@ public class MapMarkerInfoView extends MapMarkerBaseView { ivReverseTriangle.setImageResource(R.drawable.bg_shape_reverse_triangle_dark_green); break; default: - ivIcon.setImageResource(R.drawable.icon_map_marker_road_check); - clMarkerContent.setBackgroundResource(R.drawable.bg_map_marker_green_info); - ivReverseTriangle.setImageResource(R.drawable.bg_shape_reverse_triangle_green); + ivIcon.setImageResource(R.drawable.icon_map_marker_shear_news); + clMarkerContent.setBackgroundResource(R.drawable.bg_map_marker_dark_blue_info); + ivReverseTriangle.setImageResource(R.drawable.bg_shape_reverse_triangle_dark_blue); break; } } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerView.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerView.java index 5a72bf418d..cd73724614 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerView.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerView.java @@ -104,7 +104,7 @@ public class MapMarkerView extends MapMarkerBaseView { break; case MarkerPoiTypeEnum.ROAD_CLOSED: ivIcon.setImageResource(R.drawable.icon_map_marker_road_block_off); - ivBg.setImageResource(R.drawable.bg_map_marker_dark_blue); + ivBg.setImageResource(R.drawable.bg_map_marker_blue_dark); break; case MarkerPoiTypeEnum.SHOP_DISCOUNT: ivIcon.setImageResource(R.drawable.icon_map_marker_shop_discount); @@ -116,23 +116,23 @@ public class MapMarkerView extends MapMarkerBaseView { break; case MarkerPoiTypeEnum.FOURS_ROAD_WORK: ivIcon.setImageResource(R.drawable.icon_map_marker_road_work); - ivBg.setBackgroundResource(R.drawable.bg_map_marker_dark_blue); + ivBg.setImageResource(R.drawable.bg_map_marker_blue_dark); break; case MarkerPoiTypeEnum.FOURS_BLOCK_UP: ivIcon.setImageResource(R.drawable.icon_map_marker_road_block_up); - ivBg.setBackgroundResource(R.drawable.bg_map_marker_blue); + ivBg.setImageResource(R.drawable.bg_map_marker_blue); break; case MarkerPoiTypeEnum.FOURS_PONDING: ivIcon.setImageResource(R.drawable.icon_map_marker_pondingl); - ivBg.setBackgroundResource(R.drawable.bg_map_marker_blue); + ivBg.setImageResource(R.drawable.bg_map_marker_blue); break; case MarkerPoiTypeEnum.FOURS_SHOP_FREE: ivIcon.setImageResource(R.drawable.icon_map_marker_shop); - ivBg.setBackgroundResource(R.drawable.bg_map_marker_dark_green); + ivBg.setImageResource(R.drawable.bg_map_marker_green_dark); break; default: -// ivIcon.setImageResource(R.drawable.icon_map_marker_road_check); -// ivBg.setImageResource(R.drawable.bg_map_marker_green); + ivIcon.setImageResource(R.drawable.icon_map_marker_shear_news); + ivBg.setImageResource(R.drawable.bg_map_marker_blue_dark); break; } } diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_shear_news.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_shear_news.png new file mode 100644 index 0000000000000000000000000000000000000000..4ce9272666cd3fc5a3c2098fe4f2918ddceefdcf GIT binary patch literal 878 zcmV-!1CjiRP)Px&C`m*?R9Fe^mb+_IK@^8~eZ?3|jEYLs#0O}n7O}9g5fsGUXKSy2g^mA)rDCuX zJHf_6NE2dVBZ?S^#2Divas9sKo-jLm@7{I6N)P;YX3m_)Z_b%}?=~9$x-@$gpw()P zuzwN^ffmr-QHgo47}~yTHk)tT9wk3pN_45p^M!NmgqeUQhD^$mzWp$b0Al~PN9AP4Zi1bmzIlBiDH5eZ)bk9s-P z62SQu80{6L$KGuYFhdn8Uqr#SGzQL|;sw|V;)3;a3DbCYAuy9F(s^A4u3@}Cb?7nA zTM&fr;4?6R^Ek)li-1u969!7ZbOl)-$#JUisaSUmbrraW^-mBaQs+%9rhp`T_b-7| zg6Pw#yBcJ~YC$0T_+NT9k3Y{Vp?wtkvT?A)rH1Iirxvy5xN=iX278l<8M zEX$>m00DiQc>%}47|_;U3oEw^oCeA%@CukXY}Sdf!uktXfy`INF6knGlL=3NeZc3} zQ%J@nlVC4UJgKlMN5OSq67R!%@CN8>#dZ@{a*Gi8%(x*PcL1Y9?8G}?BMBS-cHDtGXMYp07*qoM6N<$ Ef&)~SJOBUy literal 0 HcmV?d00001 diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_dark_blue.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_blue_dark.png similarity index 100% rename from modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_dark_blue.png rename to modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_blue_dark.png diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_dark_green.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_green_dark.png similarity index 100% rename from modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_dark_green.png rename to modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_green_dark.png diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_shear_news.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_shear_news.png new file mode 100644 index 0000000000000000000000000000000000000000..f446cba15584b754ac685d9c14cce566275b97d1 GIT binary patch literal 1836 zcmV+{2h;e8P)Px*=1D|BRA>e5n#+$>MG(gCsQ3b3fKL#DI=CPi6HSaJqZ>DhiI0dO7qicUrtrjGjd?&e@gPDaqC-Cz<@GfJK!=p?0%OqAW^>U_?j+hoX;)k5-TXudVVX$^d&uK0Z zu8DHjfaK&)0H7;X0oDWmjGo1x$k^lJ66m-@qmL0#9FJ}Eof2ceGcmcE1e$$(L!w}Z z>Q5!@A*zR^mB;FdBP<%g3Jo zJZ{Qx1ROJ*1M2>N^^)E!FWJKeWvBa;xAmDE=MJ6Wy)sY&>|ju~p&6b2yL3_?X(L>c z84R$T+9PATO9m^)_i5f6m2+238w{|tJ}Zuoq*cZ;jhOMKJ^!czdQe$Dn$gj^dl0~K z<_=k$72|A^!|rQx%wv>L48U^lXtZCIx7?^L2LUYO&xx<9bt24*fE|#%3heuRZ(Y3s z%ZW{L_-V11b96Z1DXstmY|8inDSJCA?9%QHSjL_aU*Ey#BtRuK`xM~!lx2RVt)gCl zWt>aFi(+TD%8A0Hbj5IsdqMn8VNQ0~%O)!@X+VIV(D<8TXRS%xV>w$XAm&H;I6g0# z$CTyMO~y)ny)rE2FNw*noh;cKVtk8~u$SMhQI?B(QJ1oNzl1&%8?1H3jC36@*+xI_ z$Fs`vnUZiE?~~zIq^!-}jew&MrFIM;^4rAEi$9>zg`AZxb4JQ87y3iuLEmIrI^h8F zF^%tAov1d$GqS?REGTBc4&{Q`)Q^s?v`2y8B+&ez*P3bplifeXd{iq@3_t`7*e-yr z?~ATraWon)IX@m(bRSXURq^g|XS+%a5}!VQOw&CuZgr_pQJv4Dg9~W zcGU?2eb7(hTg9pDxGo##H0A(sxcvbu5Z0$=d+G#O#sR`z76-SA`A?p)bD^&0m;gvn zu*WZ(sa^E&Pbz@nnd(5Ox7(Xvx*!#%O3p_z-MXBNJ1S#hVxl6o5%yLaZ zs=12zzI3OU!wE1vhOooZWZ6bS{z)+z!*Sk*=ETQV_-B>$N1FtjEwfer5iH)3PYZku zn7S{}M8Hx+WbYPFi_??!f`;W9LAX!M3k4tn20*icvOUy5VKQ-7$R5a`BVMJ8qV0Zoix)wPOPt}lxT91cR%VGKi*X<%u8 zD>g_~$FkHT5jYbsEzCdUj!d~(30n|o_V_Ad$zDVf=Hz8*mdFQDDwhIvzx&)y1CZ7k zkFuWQl9f>+bfh2Z$MTJUH99Ht+D5r5zLM zjo5O)PD&9cUz=!tB)MV$@u#?!u19epL4N#g(|Nc?vXDEdI``|0&2Z#=BX3lRE@xMyW%#)l7(6R+{U6~xpvoJv4?qa zV5u*axn-;IEL8(;(x@P8P`|HvE_o8LXU*vz_CdvxOxbToF8N=rRvDC@by|>vW literal 0 HcmV?d00001