From 77f957e88d6b640cb65caf311a894605ca268fc4 Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Mon, 2 Nov 2020 15:36:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0poi=E7=82=B9=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E7=AB=AF=E5=8F=AF=E9=85=8D=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/misc.xml | 2 +- .../module/common/utils/CloudPoiManager.java | 106 ++++++++++++++++++ .../module_common_ic_rc_accident3.png | Bin 0 -> 5444 bytes .../module_common_ic_rc_accident3_white.png | Bin 0 -> 4526 bytes .../module_common_ic_rc_dark_frog2.png | Bin 0 -> 1912 bytes .../module_common_ic_rc_dark_frog2_white.png | Bin 0 -> 1391 bytes .../module_common_ic_rc_freeze2.png | Bin 0 -> 5568 bytes .../module_common_ic_rc_freeze2_white.png | Bin 0 -> 4893 bytes .../module_common_ic_rc_illegal_park.png | Bin 0 -> 4522 bytes ...module_common_ic_rc_illegal_park_white.png | Bin 0 -> 3223 bytes .../module_common_ic_rc_parking2.png | Bin 0 -> 3543 bytes .../module_common_icon_map_marker_4s.png | Bin 0 -> 2108 bytes .../module_common_icon_map_marker_living.png | Bin 0 -> 2514 bytes ...le_common_icon_map_marker_living_white.png | Bin 0 -> 2107 bytes ...odule_common_icon_map_marker_pondingl2.png | Bin 0 -> 4754 bytes ...common_icon_map_marker_pondingl2_white.png | Bin 0 -> 3478 bytes .../module_common_icon_map_marker_refuel.png | Bin 0 -> 1156 bytes ...common_icon_map_marker_road_block_off2.png | Bin 0 -> 4453 bytes ..._icon_map_marker_road_block_off2_white.png | Bin 0 -> 2778 bytes ..._common_icon_map_marker_road_block_up2.png | Bin 0 -> 4895 bytes ...n_icon_map_marker_road_block_up2_white.png | Bin 0 -> 3679 bytes ...ule_common_icon_map_marker_road_check2.png | Bin 0 -> 4740 bytes ...mmon_icon_map_marker_road_check2_white.png | Bin 0 -> 2900 bytes ...dule_common_icon_map_marker_road_work2.png | Bin 0 -> 4073 bytes ...ommon_icon_map_marker_road_work2_white.png | Bin 0 -> 3136 bytes ...dule_common_icon_map_marker_shear_news.png | Bin 0 -> 1836 bytes .../module_common_icon_map_marker_shop.png | Bin 0 -> 2809 bytes ...e_common_icon_map_marker_shop_discount.png | Bin 0 -> 3123 bytes .../module_common_icon_seek_help.png | Bin 0 -> 3302 bytes .../service/marker/MapMarkerInfoView.java | 5 +- .../service/marker/MapMarkerManager.java | 71 +----------- .../module/service/marker/MapMarkerView.java | 5 +- .../com/mogo/module/share/ShareControl.java | 17 +-- .../mogo/module/share/bean/FixableButton.kt | 4 +- .../mogo/module/v2x/utils/EventTypeUtils.java | 10 ++ 35 files changed, 129 insertions(+), 91 deletions(-) create mode 100644 modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/CloudPoiManager.java create mode 100644 modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_ic_rc_accident3.png create mode 100644 modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_ic_rc_accident3_white.png create mode 100644 modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_ic_rc_dark_frog2.png create mode 100644 modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_ic_rc_dark_frog2_white.png create mode 100644 modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_ic_rc_freeze2.png create mode 100644 modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_ic_rc_freeze2_white.png create mode 100644 modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_ic_rc_illegal_park.png create mode 100644 modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_ic_rc_illegal_park_white.png create mode 100644 modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_ic_rc_parking2.png create mode 100644 modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_map_marker_4s.png create mode 100644 modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_map_marker_living.png create mode 100644 modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_map_marker_living_white.png create mode 100644 modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_map_marker_pondingl2.png create mode 100644 modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_map_marker_pondingl2_white.png create mode 100644 modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_map_marker_refuel.png create mode 100644 modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_map_marker_road_block_off2.png create mode 100644 modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_map_marker_road_block_off2_white.png create mode 100644 modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_map_marker_road_block_up2.png create mode 100644 modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_map_marker_road_block_up2_white.png create mode 100644 modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_map_marker_road_check2.png create mode 100644 modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_map_marker_road_check2_white.png create mode 100644 modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_map_marker_road_work2.png create mode 100644 modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_map_marker_road_work2_white.png create mode 100644 modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_map_marker_shear_news.png create mode 100644 modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_map_marker_shop.png create mode 100644 modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_map_marker_shop_discount.png create mode 100644 modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_seek_help.png diff --git a/.idea/misc.xml b/.idea/misc.xml index e082ea7475..a2da5c6cd8 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -4,7 +4,7 @@ - + \ No newline at end of file diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/CloudPoiManager.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/CloudPoiManager.java new file mode 100644 index 0000000000..efcb4cdc9c --- /dev/null +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/CloudPoiManager.java @@ -0,0 +1,106 @@ +package com.mogo.module.common.utils; + +import android.content.Context; +import android.util.ArrayMap; + +import com.mogo.module.common.R; +import com.mogo.module.common.entity.MarkerPoiTypeEnum; +import com.mogo.module.common.marker.PoiWrapper; +import com.mogo.utils.logger.Logger; +import com.mogo.utils.network.utils.GsonUtil; +import com.mogo.utils.storage.SharedPrefsMgr; + +import java.util.List; +import java.util.Map; + +/** + * 云端配置poi数据管理公共类 + * + * @author tongchenfei + */ +public class CloudPoiManager { + private static final String TAG = "CloudPoiManager"; + + private Map poiWrapper = new ArrayMap<>(); + private static CloudPoiManager instance = null; + public static CloudPoiManager getInstance(){ + if (instance == null) { + synchronized (CloudPoiManager.class) { + if (instance == null) { + instance = new CloudPoiManager(); + } + } + } + return instance; + } + + public void generateDefault(){ + if (poiWrapper.isEmpty()) { + poiWrapper.put(MarkerPoiTypeEnum.GAS_STATION, new PoiWrapper(MarkerPoiTypeEnum.GAS_STATION,R.drawable.module_common_icon_map_marker_refuel, + R.drawable.module_common_icon_map_marker_refuel, "加油站")); + poiWrapper.put(MarkerPoiTypeEnum.TRAFFIC_CHECK, new PoiWrapper(MarkerPoiTypeEnum.TRAFFIC_CHECK, + R.drawable.module_common_icon_map_marker_road_check2,R.drawable.module_common_icon_map_marker_road_check2_white, "交通检查")); + poiWrapper.put(MarkerPoiTypeEnum.ROAD_CLOSED, new PoiWrapper(MarkerPoiTypeEnum.ROAD_CLOSED, + R.drawable.module_common_icon_map_marker_road_block_off2,R.drawable.module_common_icon_map_marker_road_block_off2_white, "封路")); + poiWrapper.put(MarkerPoiTypeEnum.SHOP_DISCOUNT, new PoiWrapper(MarkerPoiTypeEnum.SHOP_DISCOUNT, + R.drawable.module_common_icon_map_marker_shop_discount,R.drawable.module_common_icon_map_marker_shop_discount, "商场打折")); + poiWrapper.put(MarkerPoiTypeEnum.FOURS_4S, new PoiWrapper(MarkerPoiTypeEnum.FOURS_4S, + R.drawable.module_common_icon_map_marker_4s,R.drawable.module_common_icon_map_marker_4s, "4S店")); + poiWrapper.put(MarkerPoiTypeEnum.FOURS_ROAD_WORK, new PoiWrapper(MarkerPoiTypeEnum.FOURS_ROAD_WORK, + R.drawable.module_common_icon_map_marker_road_work2,R.drawable.module_common_icon_map_marker_road_work2_white, "施工")); + poiWrapper.put(MarkerPoiTypeEnum.FOURS_BLOCK_UP, new PoiWrapper(MarkerPoiTypeEnum.FOURS_BLOCK_UP, + R.drawable.module_common_icon_map_marker_road_block_up2,R.drawable.module_common_icon_map_marker_road_block_up2_white, "拥堵")); + poiWrapper.put(MarkerPoiTypeEnum.FOURS_PONDING, new PoiWrapper(MarkerPoiTypeEnum.FOURS_PONDING, + R.drawable.module_common_icon_map_marker_pondingl2,R.drawable.module_common_icon_map_marker_pondingl2_white, "积水")); + poiWrapper.put(MarkerPoiTypeEnum.FOURS_SHOP_FREE, new PoiWrapper(MarkerPoiTypeEnum.FOURS_SHOP_FREE, + R.drawable.module_common_icon_map_marker_shop,R.drawable.module_common_icon_map_marker_shop, "超时打折")); + poiWrapper.put(MarkerPoiTypeEnum.FOURS_FOG, new PoiWrapper(MarkerPoiTypeEnum.FOURS_FOG, + R.drawable.module_common_ic_rc_dark_frog2,R.drawable.module_common_ic_rc_dark_frog2_white, "浓雾")); + poiWrapper.put(MarkerPoiTypeEnum.FOURS_ICE, new PoiWrapper(MarkerPoiTypeEnum.FOURS_ICE, + R.drawable.module_common_ic_rc_freeze2,R.drawable.module_common_ic_rc_freeze2_white, "结冰")); + poiWrapper.put(MarkerPoiTypeEnum.FOURS_PARKING, new PoiWrapper(MarkerPoiTypeEnum.FOURS_PARKING, + R.drawable.module_common_ic_rc_parking2,R.drawable.module_common_ic_rc_parking2, "停车场")); + poiWrapper.put(MarkerPoiTypeEnum.FOURS_ACCIDENT, new PoiWrapper(MarkerPoiTypeEnum.FOURS_ACCIDENT, + R.drawable.module_common_ic_rc_accident3,R.drawable.module_common_ic_rc_accident3_white, "事故")); + poiWrapper.put(MarkerPoiTypeEnum.FOURS_NEALY, new PoiWrapper(MarkerPoiTypeEnum.FOURS_NEALY, + R.drawable.module_common_icon_map_marker_shear_news,R.drawable.module_common_icon_map_marker_shear_news, "身边")); + poiWrapper.put(MarkerPoiTypeEnum.FOURS_LIVING, new PoiWrapper(MarkerPoiTypeEnum.FOURS_LIVING, + R.drawable.module_common_icon_map_marker_living,R.drawable.module_common_icon_map_marker_living_white, "实时路况")); + poiWrapper.put(MarkerPoiTypeEnum.ILLEGAL_PARK_LIVING, new PoiWrapper(MarkerPoiTypeEnum.ILLEGAL_PARK_LIVING, + R.drawable.module_common_ic_rc_illegal_park,R.drawable.module_common_ic_rc_illegal_park_white, "违章停车")); + // 分享里用到的故障求助 + poiWrapper.put("9999", new PoiWrapper("9999", + R.drawable.module_common_icon_seek_help,R.drawable.module_common_icon_seek_help, "故障求助")); + } + } + + public void updateFromConfig(Context context) { + generateDefault(); + // 从sp中获取config属性，将服务端配置内容合并到本地 + String config = SharedPrefsMgr.getInstance(context).getString("SHARE_BUTTON_CONFIG", ""); + if (!config.isEmpty()) { + List configWrappers = GsonUtil.arrayFromJson(config, PoiWrapper.class); + if(configWrappers!=null) { + for (PoiWrapper wrapper : configWrappers) { + wrapper.setIconInfoRes(R.drawable.module_common_icon_map_marker_road_block_up2_white); + wrapper.setIconRes(R.drawable.module_common_icon_map_marker_road_block_up2); + if(poiWrapper.containsKey(wrapper.getPoiType())) { + PoiWrapper defWrapper = poiWrapper.get(wrapper.getPoiType()); + if(defWrapper!=null) { + wrapper.setIconRes(defWrapper.getIconRes()); + wrapper.setIconInfoRes(defWrapper.getIconInfoRes()); + } + } + poiWrapper.put(wrapper.getPoiType(), wrapper); + } + }else{ + Logger.e(TAG, "解析configWrapper异常: " + config); + } + } + } + + public PoiWrapper getWrapperByPoiType(String poiType) { + return poiWrapper.get(poiType); + } + +} diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_ic_rc_accident3.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_ic_rc_accident3.png new file mode 100644 index 0000000000000000000000000000000000000000..fe68bc7cba1f4864b70c4833f3f0a7bbc8a3a0aa GIT binary patch literal 5444 zcmaKQXEYlQ)P9H=BUNIL*s4m+)(%>uX3f$lT3ZpjcBoNQrBX%gQmyT0l%O_Es9GgP z%m%I9SV7gl@Biz2&imm$_uD<^-uv8fo)il+0~Qc32mk=E7#ZHN{O6zjk1^2wLseIm z2><}XWOPTz`q|u00iy+x5dDP!g+XZ;W*lW^zfn9_rvo1j*lgktQzxHc0u(~ol?4ds z8KZoakUUDxudKoQnGw8%&F>ZHi0%IWWT;kAsD2jeeikM}2F7|Bd?xJ0TIYbU%kQ)3 z^S`mjv7cKm@9I8U{+zoc!}+rMG?pT;7j_}Q8cup`Aozbm5YEhidv@!uicv_UA!eTG z8r17rmuS&fZ)Bce7b9#KkiCqiXgi|CG}nU2j5V&UUMT^9*~+-hOV?Nx@86@;WMnt2)Yh<|N51$d|=v7yQO*aod!By2svOgd%Dz${Ub>cr( z*hYf8J^ig*qjHhiZwnN0#%yziGN24WumHT?8?w3Le&0yMwd(+SE$|LrlBW_Gi|$}^ z-s;B;$K}=F{+0!L231F4Nl&Z1gz=TQn{+m`^8XCeyuUvwF0ja#IZpI{IA5!iBjAXng( zKu;?iN&W16>NOHxJ+QeZ!~YgrZw%cff!%s!E&V>sJ4SUkil3ydlt4QN4&{x+P$30%;iw-_IY z1;k&{wfHRx9|VX@LFH=c*1ozL=nGOXda<#URD4gAxmtwpmq(jeeKlq)h8ywWsYgYi z3i|}w0QZwocTgRI8(Xvo@nAISV6sboW5j1Q>k6&3sNVF0GMEJHExjM+T&G)LrLTD( zdt}b0z_26WX9*1hknLf+@e+|PwaGlowboR`+jQAf5@k}m5ThUNeWoFc^dBEZVydtk zmR<99tT<)lHWkU%2WKans%)3|kejLdzlA1c0(r@vcT42`xVqu}LxD`pj;Ct4BJY}P z&a%6w@~v6^8&<06N$HCsx@R`HbPy>Nrd0~tr6rYgV}_R%t`RBXnlndXXi@pDq^~+x zItC73r+$nS{|rN%JT-~8-{tVA$UGf*j@C{9YgNN!fh2EQasZ2~=N{#nHc_K?{p|g- z=h<(bQY5Y|>~kR9(Gxl048MCcud;M&dA*^zi?|3V=}TO;7~ z3Y3eQ%tjjsgbGe#F+?mfr}r0zh6da zm^0?&=UJGTk#Xy{jR6Fj)}3c=?pV%H-He?)ZlhZ+_e1BhLK!}(dCLrJ8z#{3E68RN z&i2_!W$Ym*INuz&9}@E$IvWL<@b;T*#9hz$?@cM_bn|wxhBFJn6T?KSMfe$(fvDA6 z+xlQs@#J}#SNv84wev>E6Y(Ajajs4(_oEAtq^gT4TF<&*CX@h9h?(4Rqc#_^SyHn{ zCCOVcG)Rx^vHWk#f)^T9toOScFL-h6GDi;ryXMk`_p$#)bosPx4ZdLKNkc^cZOJC7 zKNhnu8Z|v-E;gI1{N<3lHZfYiIrg2FLNw;Z>6!3`BEB~KtLqdzYLC0Y*#ot?{YOxE z>LdqPNxoZ;l9I@JeJQ=NYa9;1sPkLTnlrT^u3x7z%XjBB5uW6gW2yBlXj$XYaWmWs zYep(-o&1zUE$F(eih6H)Fk)GYw7`?Gn_i0W8_V|$ZAelTAx|CpPTfuxkn`=Xt>GsP z`Q({vw#SpYg>)qLQF_^P2x1p&J!Iv~v&l1ddYukOY5Uc9ufMuCo!ob1BnCD3{7Ge{ zTw;m!qmb;#hA!(;9P@WAPdldTr|AXXVfxW6KiteCyTNYM%F(RI zy}*7YoYm`U!N*^a`g;@65jZ;tE)7#1N4#ho+|c(1oG&X>INEg#0i_LYlZRD}^ClPi zwel`m#kJ;M$Enq}7=lk%1-siX2Fb$$OJ5*NgzDL0kZT=vIIIq@hO^7Dy>;0s=$HO) z^v^;vYP+4Ut&NVYP&mc7)a64bju^{}0>&DO&KHma!22=SGkMQ@DsA$C9Jo^u$?{J) zuk(WVF*fcinK2k{CVE!*>l1zWA|Sjqp%e>RRx2Xa@YlDqUquz;SS`o_@pGh%kNa>BDe_hz9pI4xA=)6F9I) zh&<)uW4cShFvw0V+XsGSV>?559X!NrCHR4}{HoI1nU=LGx})vE1iXJH`&4j-CcWaz zn6=tqZC6lBu+Kh0_y%!Md$1XF^7DGDgJ~=dIx2dAJ(eg=2yUi5hr`q7Vrg(cJAayajQm;y&myl&34ZtM zn*y2cTeYe?ox;HOQ>0lxy71kG9=Ir_t=zkTE^vdjaeX>bvDKP)I$EWP>cjg#jZQv} zoO8qT-ak0@263!o-g@F(v32yF4Up4iQ83+PzMrh1b@bI3_MTa>-4Uw-I@|^`hB(p` z{_P{46D9XY9SHXrgA2hcd)UBoxw7ZG`)+VizKS72T#Riq&i=js} zW_x?oFPD_TkA2dPdpN*Ni0iwL?JF6@^d-!_py=ubzA~!2@R$Bv7J@1;de() zfFJEVF*|QByt}+}j@4^n)2#6yok1DFauG3$P;D8j%gJz#lohHx) zCR35^Sx8I~IIh@k`C*W=`Ao8ftE@lY}oEhZWi=VLh^O88ZS_5=FQK*%@%F8=r`Lc#OpGpoM=d{J$VV9~=r&p>s zpx2??^gY%%>r$r7(;AhI3gDc9aza;7D?BcW1Nr+TLmH!DJDPf|HO7gG#+Wq1cOr0# z^|CGA!`wR#~x8@9E-0>JM=H9QldzJtT7 z_2Y=$Q1fR>7-l>9_qtkmXa-bgHQ+Z;x@eT;i+{Itp7*|ENkir$llSu~Ov#Wztj(5o z{WWbN*QdR|bQD%8VH~Y|BbZ^PkCpO0%ZYcnyXA%eGQH5LRgrRh-}?w$DIM;|Q3MVx zO|qqn;3)4rmHl_9YI|=uHP-?6(<9v_FEonn*GuFCw`U{ zxv1Bj)Lo;^g*@Q)yp9u}zKED0|dr~k_KChiI7|978`d^;*+OGTboULQKK z{6M`b2_ILs2iy$_a`QyHJm0cRqvsuYZ(n&(r!Yy(u8Cu|yN$?+D@P@B;QBx$HW1bX z91dr~#zjYyGpOAvzM<8=%so6eXO)NsI&b*;AsjL56X7N62KISAa@5NHoYy5Ra2H4o zn6O?ReL5yYA;Kp{smwX3q$T(YJ@R~fXk3*p;oCalJ%tMlg2?9xtqvV5O z8Dr(UyrO@{gfpmBZ@KURT9~E}<_@rf*CN#hXOWS6Zg)mMM{>K?fq3SK=E5F)P$66B zh9XY%-%fS{(S*HHsyz=fnquG)NCaHy0Sc7Q;XNcO|K3OHALdWI4x*a}A*gLBOBs!Xdt##SpRWwh@)-NT5Cy-x|F-k(QCq*q}R^Y7?i^Jn05 z61rq^?T_h!M!GbdTk?=%K&n>Y+;YBT)_=b@fGqy9|GPn&Qdpc)vbHGW9BsPe@Yphe z%{rZ-9coOI=lhcVIIEu7*BrX?yPW5LcyT2rd><)9z6o{GSA^+Rw{8=-kKdJj;uy<% zre}YjXf?LTZ`l+OXcP$z(VGbdF!vBEy5dzXQ+0N4>3%!b+r7~4HvaCE%*#AC&wtEr zw7E`d5~Vsa0_=REC){*#a^YU9rfU7x6{m8Uq$3F1SBB|$$m5#Iw~W{b!Fj!lC|5s~ zpA9Tvx;pIE4TM|KhbEwUOLz*9nPI1w`@(yp4non?ynf z*pKJpZb~;(R7VStt@tR20v9;&m--d)^fdtd>cIopNHg*26Xg$80vk;^Tn$N)ZwBcy z`va-88eEEIWDL3(TbB|>HQgSSIAiJweUAAW%Mh@ikIrxB(z1FuBJFVjGIEM$W-n;6 zS*{mAGNAfIbgf>U72F~g{734~wlQ+P&)4iEp@53$kDuyl(MWyO29{7|cQ(&V&ADuS{bKs0 zEsXgQI_U)$;E#=U{G+((znTtDKj9^BWN46aqNA0ErNNDkp{bK63V7xXmCW1*0W>&H z{7Y@WuK{+vkfZAA6Z4^+d;Ou7?+ruxRfu2qM3q@LDt%%kXY*E#FhTU3r8~XO&*UGa z1Tjt~Gfg-44HD`k=kwee4pQ@-c_}aD<`^oy2d+J(+*-JS!r+WsYa!@1oFgTIUd_RF zx@rff9_HLOc0uiI>taj6xCmonZfg_(XTHr32i`%ZN2;#^tF5n^h`t>pK3f}-zT7cy zfa@taCB7}@(rq&mY%kPidDc!9FxccJIprN@P@iUh`+C+>Do$Sj16kZI4g+dZ-Irbw zv8=i?%zCmxcf}ve1Qjmt#5rf;O%7FU10ytCMhLuN&6WtDdn5fy$|l)gf#}G z2kkT(y>0PspC5TqrM!Ka(Hy==aC^NO0YPkh-D0{SHsXE$YI5;dpvtt7h?U^ug*yi! zMi$i>PLatDT+^`ZRYWdk$;-Scb&&HPg^i+$!S_Q4G(;O_Jnps9rR4BEd=+3 zRl1ZqR?c_yS{z1~fLYg5`|V9CmB+Eh5Bwjv{zw%&?79D#ePoHpcfX4hX@j$N=v{29 zFpZs&IOkpZ!@G;^*!vKmvg|fvpZQj7Y?Wh;b2gzRKjwy|V1mBvz%Ft*Av$WC@?hEe`PwkX+| zVXWD=FqZImo{#T&KiuW~KHT%W=iGbGy*JL>%#fLZj{yV%F&i7{-#xeC{}npuxz_Md z`warIJ~Gz7ZWTVUj(u#79eo^I`3zjo_^G2V4PSSc;J+5?r(WxzUd7*F>YyGbh%?JB z+LqeJH>5TN&4wF)_m`+5O#}_f)UDaNvBrl{L*h*RAjU>FDj@9&x)3mg+O3hYEKGU2 zMN0ZB&mHq4cq&7=O_;4s>*v3zkbVNmA;6;8B;&GYPnxvl|LgRl4*_*FQy#-BTD5X) zh9Dvut)EAWX9%To(!H>iH}N5ZSsm1+3anFCy&7inyLU}B1T1Nk_OaEUR)I<$V1J17 z5+X{9BUJao=zw=2b>QvEi(#9l50emxS%EBYkT15By2k{a!ow=pKxu?Ad1aE05fZ%HyzJi8Mb2R;PL%9C?g zKhlLeuJ1}xA$zIGIiqDbN4bo1A_lXXuzS}cLT0o*w?`VxtB#u!&e4)cOTd^+y_Gq! zmqklaq_OfwRO3eOo<5b#Kr$tBEJ-{jDRrLJW>tj@b0OkG5sZ;@0JP!Q5>82a!59X` zQLHYE`^FkO!MYlB>i3TCV1S+8C+|3-My;hQxMZZS=LUMYWb^aTOhJAlh=E zO>Txnc%+jn=A=)SZGmrQF)p*(n=^qQj{JfskcTPjO5>Ww9o}@Bs}Tz zf{;4U2TcUSjZVJ{gJRJfB2e3+rSUdquB>utO8y-SnSv-dKc_&sO$`*MTjI=1H2E;A zNaX@?rh>)Sc)dQ*;0-rq{q%BGQmw-Cn`l=t&Y{SA3mhF)-!iNa)OQ(g2SGqFPyw1m zBeDd&>alc6F#a}L3r2QU@_5-i*IVVgz~RTU3v!mQL42EFZMyZ-n7lX+nAS%ge-M+7 zC4dgXqeQ#5yQ6cIt>-KFQ<|2vWSvyRtqx0xq0uN$1RO$<&77O*rVfZrJH222m}>m~2ZIex zT1v|ji#+x>xC^5c(Wg!Lyensz*jbS}o8~%lkd?oz7lx4hNc_WTtU=t&l)?>MpQw&X zK~B7SjbP^l)8`82pXjF>JRMiSxFQ#eGl6Hk@2hSwBhyPo^VLhEYY7hssA)4>pdq6 zXTQ{Z7hP#w*aS{{ zACK2_mNoh)lIYd0nE)Bw=xX_;>~DQ+2<0W;9*M)&fFwf}XHlrR+lzR4C-uydLcJqLd(%@>OM{?-2 zwc9=2H(PXk^Gm}D_VpnqX#_)Y5jJ$m9~mND?Kr#T#(hIh4GI%xZIfPIh>7EY&WG8- zvynw5S4Fr76U7sAged7`k9kZrq7V@0vevE@{0kDG$wD8~uZq9!ri@jIapIvJ9dS%FJ*a#^!?jT~`)eCha8Z5bybu0~ zjOG!gz{nCQ`!Tf(5(gkrw>gvvG!aXqEq}TWml#-Ae>+(DxGpv7Fud%Fdg%Kc%LQ1v zY?31GB6ik%jE)xK`usemf_3ej zGDt?-$fmAmOMDthyB7Zn!ce|HCqs`-g7|a z6~9J!Vzf`u2VikhV^@HyoRYSr(noiSomQdCl?mz=8??a3L6X+Rwz>6|wB&ZZ}d0(i({N=8rfo~IxNgWyFWJ3kdt zWxi$E@A_JGfEQ(^1jR&RGj(CH`MEhNj^%F<)0wO^AV6?-$313pMafl%%O&7(OCNhW z8>=+)R;z9xFfjAW+TvldW>UKg%#k_c zg=fjog$N(?F{NJg_Pk`&S{S?Ig8#*m&CS11ImcaXiwstNs6n;L?aZ3WRN6{muGEGh zt;|QaTvm)t!pm&KxNhf|e6K&)`Xb2msdH(nQFxggAwt$xp4@4klpIo4L3~JQeiZGj zaFhqiW`R7&BJlERx*~cRAD>`ywVxV@G+e@CeLk4HN(+Zzo&Y;##QFAJ) z7Bypw8j?l!R;)f`xl@Yto4i#>ijXhLK8}?wgc39ru7XlV;6WS15`vE2&zeYfFXm~O zLQD!dlpBcKY=OX>NH0VfJT=qXzBjt0FzybqvD}CUzKv%NFmy z_HMuu1*2>k=jvfb`xh-()Ql1pyw_|yPN!tdIM5B^`m>pd;XpdVR_7`{yy4lPdJ1=X|^yNU@8J)0>C*33^zg-w_KT4*f%ZW+uAyFKgJkefsqv zwnxjg!11x3?XY{Fz$lfo67t6y|ZgDQ)|`mxq1lE%p8vR?4Q%5kWyI-|PQ^B<;@q*Bj2 z#or89@3&X*xn~_rH2;*&+>d*mOPBZ6^|z(AaE(4hL4V7c z*oBj1E(8wpypZlH?H6eHbs%%CRQFEqh7pqOk>Xnmo-0=vu6QT6TAwp%L^dc7vHGWK z9;D=}ZQJe_%xYzb^(~{w6AAKsz6%1)*+zYDgA=E(s+`J=fX!SO#`&9gecm*5FP}Du zJ(}xZHq?LFQx@EpRYRKvH{a`H2tIjPtQv_J?Hyj6L5`-M{dCb37p|X#}Ao zUtTf((;8N*vJm0IteiDLel<*OQ{ek~rAB>qUpb_AQvc4dn1S00=&T*OL20);$w3oF zp#h(miR)MKI`>jnin#*v&<~&#m%Tq?TjzsU0^!cILUIjR{CcUxP?#hRJTJJ0Ozrqh z{`zplUH1FsXD)!sw_(b15Bc=w8%5Y%>SCd-miJN=ZorN9Oo!(n6U6N~xLzVnxwuCH z)Zts$S2F=oZw+URY-ews_c1Cuh zb-)3Z*DC*a@Omw4H1W`}2Q3gfo>)7yDB871+9CNzoKp4(DSLL^6XJGAzLA^VM}n!3 zVqN`N8aDttZW<~``|)`$W9AjUis^gsRc}vT!dWG>KJCyvYBlszN~+=%f=xjcc9F!; z40-AlPQJoDwSt8sT_4yqKbDGu@gQHRsPE*K6r}QQxIy06h)4 zDF6w}zrP3DH*G!2eu$i`vzBRXJ8`?w6Z^186M$p2vpoB-7V7pzt4@jM)xx~+p;S|szFKZ`5y*kY+$Be Jb>n{2e*iw(x5xkh literal 0 HcmV?d00001 diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_ic_rc_dark_frog2.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_ic_rc_dark_frog2.png new file mode 100644 index 0000000000000000000000000000000000000000..787101fbb14ac853544e43fe3637ce2173d9905d GIT binary patch literal 1912 zcmaKseLPh89>b}hlIMpp zd74av8DnO|Y+Xz@UBy}%k(AsrX#MUv?7sG&eckWtbg536f*LhICxSL2U}FKB2zXfV7y=dQpi&)F zlR>pQs38No3TPsMW+l){1g%PdNdONCfJFe0yIlUgce26stDR)g2Flk57-+79Oy*@0U8KV2muyA2nZ3GAqHmoklM!=OEbbf`@Fe<~8%~fpn6kZPvsdobU$5Hi=O=cOQgW?S zY|rU6c4O?qS{tq75)^H^6iDdu9Xo3ShC@`trtF4Z-M#T4Y0x*%Eh5Qa&dqDxz;p53E#Ik;45r?WF6AWPhG+X2J<%F| zZM#Pl^%*TyJjuVAmCfwd8K(kULzy%aW^PbAr$-h--6P~sp)fJOs^rjOocqle10`V^ z0*9`yxH@bqVRLc5pU_w5XpOH<7GcYD)BukteKKM8 zrES6Na!fTH`8_U|>|EEs}T{-`Zh#OLM6F(6<*V{kXKJkTiRtlb2&|lRTJP z(QFf*x##vH(_sq=?Yh~}c^xxDkB-FE2rZ0GH!jabPstE^9vD*kGGnm%#p(2!^ZUrG z-m%i9(iu`8Bo{eDkc82!9PP?^xZ}DglzK+Iu1IeTAO+i$&bJ;A3pn znD<+}TZW3AOLk^CF_&MTb-f-Znh1^xHIQa0n@6dJZo%0dFqwW)Z_nKi1bsM(%n1n0`1Y+vRXX8V^Kz`rE7)qe~WZ1ze*|Y zn$P(O-+g<+kbCDrVg6!hhs4qQ3{@@V<>TapW7UiNAI0G&M)|wxo2;gMPJg+anm64y zJ(n;f(iyj}S{gF@bQ2%-;S#al%rvAeaM?{7)oL+1K#SkEBrt@q0py;4$jE8Y3ZcVO zyL=&6s6TqS>4apkDQM!i_@% literal 0 HcmV?d00001 diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_ic_rc_dark_frog2_white.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_ic_rc_dark_frog2_white.png new file mode 100644 index 0000000000000000000000000000000000000000..b6164bcfdd0ca460e0dc4990e79bb3eded0b0300 GIT binary patch literal 1391 zcmeAS@N?(olHy`uVBq!ia0vp^6(G#P3?%t>9ecpQz&JI)C&U%V{XYr@SqMCE?~(&X zOnXU?UoeBXgru~LoV=ovs#->7ZeD&tbxmzudq-Dy&xFZSrcR$RbJpxRbLY)puyE1h zB}NRWEt>3V5)8;K(w{73CbJy-Yd-v@>aPZLKBS()NKXLNZ=`&}~oxgDL z(&Z~xuU)@!^VaPo;%Tz5np>)8{W=zkUDl^Vjb`fB)T1 zyez=Lz|7?7;uw-~@9m7A;X;8T$8!U_%{JSbq)LjWhAL=(_c`^=B#>KRitmg>&H$z> z*Y@w0l$d>RrupYM-n8d;&Yw4aUi_~5{l4F}>(}xE{Raa7SfBeIbg_}^&dYT>B)u@< z!Q=L?TSNb!`u%iidH(%9bzeUn{d_dtzn0tonf&>)=PK6Ey?RFahTo@0AKaYxw2Arq z@7!WE`|`@SE=tG3Wu9oqId-YS}x^X z`{q$Wmu(E^y8>6GKM$kgZTps*ZGMzuBiEa^NwnRG@oLv@(`@y!l^cIoRAq(ib~9u9 z_&ee-Hw)0Q7KJa~%sl_}?%be_A2jEmPLpU0n{k|byVb1!dHdhZoKx}T!@(c5>yO)- zy(+SLbLFaWMBJ_@!6Q3)oG*8Mu2^^S&bwzq9-D8Zna(*TV4b~ZM~Fs&X!?w*XHMrI z&wjK&|ICR__gw}@enxFQ)mh%PXNKQ$(c-Ure!MT-c;j&A+_KrZM>-Vm32WKiNuC;` z`>#4|-=jpG!nHvw-y7~exie?lU7&EUP<7?TyIDsCpG$e~J*{6l?S68}IyZe&^)kzX z>A$`|w8~MBQVq{8-BEHzaAT5u_6@(Y;vG@)r(+b}+3#@x`mjOx3~Twz*VCJuZ7)^o ze7>VH^Y~%0(-##qiBZ?+Q+Koxap%SZwNe zRINGgVZp>_SyLkBtlnvxW*+&j;N#mXm+Z_=Zxya@+_I&=`iUMe;W0eeUv)Yq;PZ|9 z)qa0ckLSwYn_y6yXw&o}V`=3c6{GTBAD$P^-*t1PO@DQZ{`*O19&20V&-D6S5&5HN zVv5}N$NN*2ine}GjTBH2@h&bseWdbf%-vl}%e0wMRsY}bv-BqTJ>_R`#@JP{F@cOcgBfQ7F%Nt5ZBYy&t;ucLK6UF%ZL^L literal 0 HcmV?d00001 diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_ic_rc_freeze2.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_ic_rc_freeze2.png new file mode 100644 index 0000000000000000000000000000000000000000..d34779845ed9e0d24671e307be510d8af2f65107 GIT binary patch literal 5568 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 JPDHLkV1jX_J1qbJ literal 0 HcmV?d00001 diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_ic_rc_parking2.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_ic_rc_parking2.png new file mode 100644 index 0000000000000000000000000000000000000000..8026654bdf49945a2a44695884ebe1cf630fdf78 GIT binary patch literal 3543 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 literal 0 HcmV?d00001 diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_map_marker_living_white.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_map_marker_living_white.png new file mode 100644 index 0000000000000000000000000000000000000000..1b87f0ce860e74340d042e3de586f846d77d0f21 GIT binary patch literal 2107 zcmV-B2*me^P)Px+^+`lQRA>e5T3d)!WfWd#W=`7Z=%_P}p;L&Mb}?%jFDZ0^)Y5`_sKAFF&9|VJ zh=`*1o(i(tLlg$0WZ*5r5)si5QYpzWGP|0$an#J~?)&!M-`@ZJ_uglYg@myeth4@q z-M)XV{qM`!=a~Ilsxd(j1b;ycfKN!)YPH1}TMIuxp`)$po*s{D2>OTyIRuQ>Cgp;B_Fm?oy9!!zYDVVC-zeDUo67q?dGkq;usSY{xecmm?pTi5Q6cO9oT` z)Hh?Nf0)C)WI>mZ53JP|1FW2Iqb>gIpmokTgAC0qfO+_U(hd$6kA*D5IC;F{n8f>I zdXEfM&PVIznr*&+vhm`?>&$gQU~{+bwUK?N94`*tf<|M`1!Ty-gfPHmIY)~jSO|I< zz~Ht^HQPOBX1Itt7SR`MR)8Z_h@&d5m=12`oJSRe*Kq*0qHFa_f%R|y#zx$I8uqY_ zaUA_gMSzK}sNyJ0V46`b+<(x9_3#P9-2<+NT1)_qi|o1En_FqJx+HQ~4|<(clD8+0 zDJVA6QmEIZrf8H|70zQOR@*39nWS%%Ub4_$b~;7y)o0a#ssmLAuB8qnmrPtP$710- z!Mq0ZGDy~CP_j(#+i?ps-b|juCA085feXwF`9iRg`%>3!=?UiQ+%bJ<-vZ#*A#+sx z6)1m8V;7P|#$#8fv3w|{%Yjni11pe0E=eybyQK7rkv^0-j8A~y1^3Fqe-Mz~mw|n; zbiB3VdFS5ue}d5m^8IC>3a}4h)ZvjnSFu)_IK&xicIHsse%sh#Yw-Pd=TphbeMD!@ z9OIpNX6Uz?Mjw>AXhAhTZ((?3Q>T5}(Pz6Kn?j>Q^i#Y$c3h%i5il(gQ0iW@mKc;$ zJg{k;ZL80-?-t*Zx@JbD;6=bbXq2f1>ed*XRfpizfd@Bs+mRJ&D-;>>=b^FL%@qNJ zfH7DbB^EMv!BLyGaUZhrJQfj5Etf7M%Ygl$z*up}ajUx)ov_z6|WXt-o5!a8^goCGrAf zr_>@cF8=0{lLF<8iie}zE22_RX7Pck^FgUo%Ot5QBG=CGcJMRc^S-lxjAdt#OAS}= zI(p*(cPDvR!J$tyt+9zr2%g#B; zkB_wJr|d4KJ61lPe*DMOA~63-HXKY0olX-mJ_JsvQNeB(Io2YQ;CLYL)V}V4Nj7-k zy6DvberTMy@RZ&D{2w-Y#-D!h5c4!=-jTNX;CsMotQwm4jx~)6Rv`*@!Tn}rfoRn$ zsFt8+hc}F}qw7aS4M5|177W2E!spl}>P2~M zSxV$kN0H^cXlU2>>+H#f(MlPrrrhiB!r z@F(*zvlHS`FrUDWiOkk{cb!w3ODM^|~v-DH;R1=NlFT3WxALp4y zpm_c<_=A{f&k+}yBXp`2%H`nMU>!XsCpg(1`*Yc}7DLskF)002ovPDHLkV1mz*56S=l literal 0 HcmV?d00001 diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_map_marker_pondingl2.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_map_marker_pondingl2.png new file mode 100644 index 0000000000000000000000000000000000000000..478232ac790d80a575367e692647b097a6a16535 GIT binary patch literal 4754 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 WKJJxMg4oOe0000mMg literal 0 HcmV?d00001 diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_map_marker_road_block_off2.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_map_marker_road_block_off2.png new file mode 100644 index 0000000000000000000000000000000000000000..2fb4ef553e55c1c9a8e1ce2b56ad54458142f371 GIT binary patch literal 4453 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 literal 0 HcmV?d00001 diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_map_marker_road_block_off2_white.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_map_marker_road_block_off2_white.png new file mode 100644 index 0000000000000000000000000000000000000000..9b424494ee635f30363e190fe6e2c2fed0838c6e GIT binary patch literal 2778 zcmZWrc{tP$6JIQAMeFz>Irc}WmPm3|o7iqrm&JIH`AWAEs6|x++d!1xg<(H|H6Qn)aEiazV+Y2MOwj zeN#)5;kKFEhAbYxoyW#x8@Pr*ne_Gq}7UT{Pb&K^`M7J?}QJ&BAf#o&Nwl*UIyEzc+J-;h+*^^ehpCCRlZ zu{sB3ARAoK@wx5U_#dZi#<--3HL3dL9->A;HS6nl0?Yf3u@oA_B8)K!=YWkQ7hlsZ zdPqk>FuX=5*~6v>$rZ+Pi7OiWWEDPOvK&o3K})oGn4jn)+Pb_@#4+rPxTI$Z{i%wUlpHXkp-OkwITeaz*IeA=+z)v z9d={g3X?juPVn1}(rIK`i$s&d7@BIj6$%Q0u_BR?=3=#!T<-3ZM#+%`pDF@=+EXyX z7E^qzX~178lXC%t8{Kp^%DOz);l~h_*Q+a?Q0x8~eU4^~o6?=z@0rfk%_V{P2b1za z4Q222VClIvJ^OYRWxASj?h45b*Cn*s*l6&GF{w0k<>3XN8om~}O%i1zObehyX*Qg& zO$$r1UoqJ76q>X`H1067{BdgZRKD3e$*B!HTvypI zXko-JVIXp%+5CaTiL>hOGc%x#wH{{4bj)Fg5Y7Z{y@;X`p~Cv2P52)28xXxQ@oMe^ zUn_H<)?Z?D0ufVT5KyFs)~((VryWI^H0aH-c}O)9!|qvZ;62p}clD|zP;!LY+h~q% zUPSA{3j-K3;B^{IEPDUP$nbhaS z@v%2Ff-XK)NkS$4@DmpndU+-ANnF+v|0nq2WfgPF{^*b(C&oflLm;b3zp*=^wZtCj zTGg*}pUpUYm4bs?xjvv ztK8u;p%P?{H=mQK=~$&G&MA_**`uc6E)qE4d9*o8RIY+P#Pr@-K_8r2M;p5qto+4) zzzVv4A4x1eYctDQb;xq^H*ImBwuqVVjhXpZy|MX_f|6lOPOD1kOl|s~pyjGQ^F#Le zb0iRb;OC1Lgp4eOPO+W1?HJ`%ATfsZ{vlf~U^#wNM)YmMwhRZnSURc&IK;5>0}b4Z z5}x=NIZ{srHbp6Y(Ge~2uJqh;^MKvYk(Jl)~o_3(v|Ye7ARXj%y)uXPQ_caP(%NBov{)4g?R#E)?x% zRMuT`^cb>k@pVj?^aGF3(U#Cm?P!wYjIQ@BePu(xJWr-^~cxC>sD<$&Ph3KNI+n-5oGTtlSLn?5Zeoey;-&^Wp@UoL*Wi_%p%gd%VxE;= zSjV#R@ITJ$OJ#e<6^uNEcMjo)IN%V06&$&1>qY9HD>&1MP#cA%b4Q!YGePS$vc)>U z!FW8mNGegBVK%dYt=>J0X~STVfJ&{s95zs~30}o~bE}3*@5n^-bKDk$77^I60n7cV z`Bs0UnbipNF$I{uVFPf<#&(&2Z?xa*D2sb63@A5oI@y3#4C}Y{ytLZRn{Z9!YDp)e zb&+hsKkraE3zZH~B82pDzzqUx4g0OXS6Edckysy%44}ihz1~Va%_MQXJh1!+O?`ln z@_v=qz(Vg2oI6A!hmv@D}%7Tz6a5rjPuqg+jTFJb$ukW4ck05VVc}o zpKIUB9mf~@4dqlP2qb(Hry0>anO)~!46|YHvg1TIUnVUtVqC`bt)J@Y-9EzV`G*Z8 z64k@*OQCMo=%tx%P2(U%Wv6{780onBlIB1{?*^OT5Y9*#ozh<0fK~iIWit+wa<6<#kzGQ zbzY{o*D3yXUjv0#JC6yH*P`17WNX5p~inXx_8_ ztJ!sD+esk*XU+IfgY$S^AmqH333~HbgCrBSTy6gKbOk(3J_e1~W8EY$37RoPIPJ78K$VHxK)ZVpfixs<8?JY{t(xUdJ_NIs#Y8SC%#i&^;h*10f z@5}q+7nK5i<}2001%#b!CJ9KJb4>i2om@93*A{0LonrWuQ^u@^N0s zXXg2^VTE33KtT5z#;x0p(VhS;*c_axD$6%z+5oUSq>O`*h!5g(Elk5wgw5mrS zF7Ha`*W_e;!MmYwR6tMfa25%4J4H+2|G^(hmpR5+HJS3aBIOV>(!NpLW%Jwm__d%X zt`yPdsDsDx#Z;btT_K8*gs3Z@ND6`q3cvh>S5}Y_pDEEOyKC~Fq2-%!Kygv|r=KfH zPXV)f&)0`dnd)}r_6#;&OG#YhdF)kyb!xm?mQd?ad0TPtDS*l57+ z{8GHO9wbw8Loy}E**7oU_fs2riZU-?PBRyHO)J(OxClee%ul{Y+s|1#i1$ita17#q z6wjcpO_IHN0>x(~_CkS(_w6gJw-=$pUk-lA_miicr_~KnO*0{QJW@`F#Ur zgYmir#TO8xO>F9wvwQ08Ya^$Qi zPv{UYYD5uiqoFw;oMFgi;XLagl4&TBD5FuI@rLcdUF7Ed$~JK<+H3HeQqxUz1V9v_ zk&C^Q+yq=W36qW6C7cBzMcnXlS=qjSO5?CBcsupI$$vd!uYoC^Lu)Y-gw>{*@bHS@ zN*&)6q9cB#vL%1C^7$fECT@!m&lHt&uZA1^zW+yMc>0R3h#!ZWSCo!%*q2n^dEiut zFL#nYZLJ0O^WdMN`Y&YJGB6k0`b?GY4Qv-Q)3%DU8AWEX0{-cx<1v#a*Ql9(^pO@~ zB~1CoZ=jUrs;9{j2&^C*?p|>(e5R-gd%o|fXk7+-V>yFvAq<{_YTST^@3}M72u(bm ztZ%)OOWfY|id~x-rr2wJJJqYUbEqhDfGvb4E2uv&FTHuGu5h*`zO#JJfQQzBZo~AF z7$Px6F3r<_ZWXos0L73?xX)4#qv36P`5~#%34zoPiAT9eZ9D{aOf?cA@-J5~awLNC zs8iQON0;ZYP`hPK8Rp`v_hv$g_=mst{x=dpur2QD{x9C*fU?Wpph+iTcf2eYJVX`? zX`9CQ+yY760H7Afl3rB2=&=$?o7bb*cHC=}F0%NQp~hl2|C2BRVvRRmv zOF>)qd?(#jk&S@t@OY8oDvc~oqgkD*f7vF#y)ktde~%tR0jbmZSl`r(waLR*S(1wN z)zMnZh0=ZPqW78;k5LD?&JlL>ri`B6QM~C`S7N_6(d=Q;b%L!SDW?TF7hK1O48)*r z&&gh_Ha6*(Sk~t9lJaPrj;t9p`&EaG6TPd6(L~9zw&Tv5?8*T<9`@lx3p7<&!VeLS zT==C~vwf<@woFx=1nt`k#A+R*K3Y8Br(IR6Dy#K2*bG>Jwo{du=j>J%H|9Z~4`3QV zG}?Krc$#F+mFM;VL$?y6e7^Zd<8U?kVL1PM_&bI27Q^TnA<{6yko>sKwLoQ;PR)ROW{>}(n&N?L2l2T zlgv7&MCk<-(!kQQ%7^J@qTJrb!N|rQ$Oy{y(A;ki7_S%r=^99z4sldLsj*1x=#AkV zHHarl{#ZR)++a|MtWn^^FLcCiPfBdFEnFl%)&f0N3t+!aF8CQi9$X+V>*iJI<;bDI z8bFU-mw^fK%=ro%VNNVle9Y!4iifN$q+KR zr?9)a$nMuc)6-%4WjEmh3Bx=`ACJRkHy`IkI&xNv5bjb_tffKQmc;2+LERqwYIo(Q z!{G%$^NE-pZ$GVfGHe;9IJm|7?r~7MvJW6Th#Wq-aEhbd@IcEde(=I_UAhJhmyJjH zB1Cxp$5*mc;sze9;&+{rzGs=CF6(PVovF4^(hpU$ZSp51`pz2DAijZ5%bwN#Lt-K# zZ`~E`oc=uZ^*lm2%e~pf=nTFS5P?D z{@~;%y(wID1~hCPHnU2bZ@dCwUk|2HG+sB2{WD*mX45jS!^_=m^{!X^Zvdd@Q*4WyWA|+j- zvgIRsDkWbET?}EsFqZSe~PU_sz( zu9v%aHr9saAt!D6J>=RtCb|`JvkoL)0ijK~!ee3+L%>jNO(UM64sqSC)7R?*O;!RE zb+TJ?RO%Cw!w9g2wjzf5EB}r5?>{#P5Sc^~&$M4#@HZ@F6k2T3&F$LKRZ{TJ$ghMj zPfrBY1)+Y^vz4S^|H7J+s6xESF=b;|Jmd&fw&bXqH#PM+)HnC*D;@6YLu}JFeZ`6S zw>~skz~nLWbp~+OJ3I+`Xd{6rn`p<(n(XgivgOXD!F7!TpR)bVKeM~iN;Y%js;o3Q zM}%v9xtpl=Buh7=GprN$cSrHfZ{3p5n_ex#2qzH&?V%edkKQ>>U$FknsORWaODMc9 z?RLePc5p~$D%E>KTQo=TBm8l%?c*mm6VD2HD*mR?d^nzRfY;v#uEW#!h!3P`Bdth{qBIAmK{uk3*AaJi5pL?vb{y8yryQz!G?f zs_UD3#XVP{TWezxD0ajT028WSAs+V3ZIBjT)&xDHGexY3&ij|Rr#17>lg(^C zv2}50U~(0JwxchFZbY0rS=;^QL=xjv=d2`;rJkmaW~RyWYo%h$iBIv_-|Usrz6!4G zi*59waeeDLcxAhvk`$($NlZE%ivfMf2|1=SU}y~GETb!>;u4igC~d9J$sx;9h+ z>AaUG>>zeF9OGugy6C%rg`;k#X!{K=utILh)apu2@^!iyPCkBJdu=>i`NG=9kZbiX z!4Lg-+c2+PB5DZcnP?vNih~Y3X5r`{d6%!GRIjXFrA`SWEg5Gv%0@4PD>~lsPdACQ z`N(tOmYYT|-7&0_6L;ece+TqXB?jJs#LXx;3jSLGrZ8PL&va(pd)N$attvYMRA29P z`bNsn9uJWbG* zC>s!08t{dAqX^Ta;Tg}Sf5iVMa3Hek#$u?u<_m+27Jzn?^4l>D5+yX0CS3g;cMl%FqPGV8IM z3d;4!RlHgG_^|SiFZreJ-50yrT`Dc9XeXWdXqj=H0`aJaSioyOoo2e@xd}slp=Djd z6DE7}n4rwo0XuO%j7cly!v1aTCu(}?725?ojesf-jbnz%Z`l*o{7!Jc*OXMZjF81l5GUCWyiV1CdtM@vMKHQqm0nq!npznr@L zsY)dQ7nk_>A&L$wVFJxCq--&vv;1x&4gUbuD+Y3c{g7vq!Kvl2MrQNA(4j8wWVC#t z&#bYOiGPXR{Vf=q<;$~uFGmBuC`eduU5Vbu&2FK8J$YDHJv2yp23Aui4RU|7WLC)w z;EWu@15B8R>4l~!VOapv^=@pU!=TO=Q%eSZ0^!(>`_7w7U*KAB><5sH(52MP( zbi1dBw^Ob4$W?Z4_AO#euen%6E_B7g+lgD|;8+kGJ_aP`3aMM|{R>&M0T1*uFEkX1 zy*@K;bP0O5adidDS?{}%{vqrY=ie{bL;9=J5TB#IXrySmg5+ofLMokSlr*rw#YVreV=PmeA4mPTRWS5fnw6fs%sVZ=iQ32 z(VoSDbW%!QyWV@5cNBJXs;d!`d@l9kr8!B0djWz#ha+-}o4lAOB79nREBb4vYc zk}=fdn?Tf@Y-L#cf+stW2kL}j6o`<7E*FlRU( zie!^weesBA4A2kjWK287aPhp44b$BL8qRl$YTes^O{vO%b6g@5w}c8))td&AL-B?w z`y~R@nd*Z}fk+NkI?(FoXo*g$_-*E{>I}%X;GMW*yVX*NcI2|`Ox|dwhd^FYxi>&y zj6|`r4io`fuvc<{?^r2Y2h0{UAVksS3yReX8Xp4Kko#-FR_~Z=Eq_a6)@*~Hp1JIK8Xt@sqCWQ z{p>9d*&+)?aGV?;k++~+4 zv!5+SLfhrZW>{>Xv4E^y$vz{{xDY Bn0^2N literal 0 HcmV?d00001 diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_map_marker_road_block_up2_white.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_map_marker_road_block_up2_white.png new file mode 100644 index 0000000000000000000000000000000000000000..0ac89f4decde3ba29f1e23c95629ce88c4e77945 GIT binary patch literal 3679 zcmai%`8N~})W(NlY{|Z)P*e7Z2}71CjeVENE|P4?mUWDsuYE7FRg-mOD@$W1Wsn(J zBJ0Fh8U|yR!Q1->yytz+dG7Pe=bU?gcz(G_W+uAqtU{~+0DxUz4{q@ptg&{vh2u}>YeS}zeQs&_Bc(Rf#j*xW^^wmQY){taOpP3-KYB8ZTnsUYL z5WMj<>~ObF^e)Bnjq|-%7(AT_KrSD>FbBLTkoEp{G4VTZ+R3ogjbK2?;j^p328z~* zI{FBqPsg0wiX)60EglvWCWI`e6$(C*swAT@ttN=|n(=aho)+EAnQDwrV|GCasTo6# zik>w`bl?m;|8j@lk2{F?Y2XpYLyL=^m0S0zfMTn`udczKlqq(woFzxk-a~kQvMA^z zJw*g&L=)dwOCc^!Sf_OIs^ERkkSyXu^h8RxYqv+qy0qDLdwSQQD2JE8fly2FdEf;> zP;2yRbbpi^9A0f)Z+R~k3b0Bj+60+!W@+^)6-1c=Md=DqrLXQg&7PGv`ZQW0mbVpK_L6`FE@V0dNpaa?q!L30_SzT4s*YY#4~0hYDAT(O`u+VG*f*bk(aUVk52Ax9(4*xOZPLsGZ}eov z-Oa1pQao6>pYhpj^{DF`M{^2dH=AP|N9k|6j?|yIEFSMN^=3_uFM9EQgV45Iss+^^ zf6QIQV2oZTJ)C$5wN-Y$T(3b45m8}&28sZK{RW@UJFCwG*6HRijyZ~AwQvf>M%nNw zXk8$)r@+t14|OHL!xz4@X-F;FZa8#;wwlX%!9M=DIjc~cl%C74vjVV+n~6I0-LB$1 zP>fTDRf%iSk3M9{2SlH;FNwBBnge>~)x*5YnA2U*#&iVOD0uR#>s`aOUvn8z{PfJX zvsSO$hKpPEio@@|rF1nf2>h3JKFUKOWfVL?rDL8}o77`!8Sn~<$Bu&wtDZ~0HkpL~ zR7LWc$DEe+U6B2HSHv$I8)qbP=;Ew0^p2g9V2NQ2S+;cF4g@K%(^YxzV}tL+E$}Lb z@g8XM6CZuOTX_p|Q0QoMFON5pKS$XMN1~=8k6Kc|lrCPVXrlxRhlsPb#mn`ir{4M1U@FIq!h(hV%mqeR1~GS{0* ze=W}$HY%V+^M~i8}o|qn&eeEOt>%c@Y~08ChO!cCQ|$Betc@U{rF#3Fq|7d^*Vly zY%zheO{qwGmbk(SRK^$gH@aRZHV*DA`lM>=V@QYjX>59RXn3T^T#JV}pke-@*Q{m3 zV(9in!YtHZbP{UguTnTC3rg{GC=ET}P6^=`(NZ)9)BfDZRsvgG9H`Doh3zcbJN_L~ zU#X#pg}|^P))g4L`?Nj55eaa|GWRnG;a>xe1^bi%!GJ9#km(Nrf93-@_CyIBq)Z3> zTPVrHyssX|C6vT;>|K1t`;Zo%W#}t7uiqE(5wi(YPQ;BR88>1&=~ZS%R_F7_!!K4O zcs{pLE?>PQ7?S03S$Qec_en{00ugsBBxz)xb0^Ili6i|%ejdB>n~Q4{I6@b0hEOx4 z_G~F6KF>UAiRe_~lkg`FEXJpGtKYsWqut9W3{P+>;q)`=`jOY>{onamFYc^WP~YAX zotO4WC7bHuqYOSgZA!e7q(8i9$tO7>XuYbInh&K`-EY z`L?0cH?df@0Z%Q_n{;DjpYAUWYOUCfu%Uk{}HEwa5eW|W@HYAmVJ-%kk5Q260! z#wy9no0X)QQ%h+M{*Hqq15fTKImRzGZ=TrCNTyX>yc!sq{cB(C~p>3V#+8B9IR+TOivl3MZLX znFLoa+!$ncaIpE69dxJ{%91UZ`5PG0K9O0j52t4K}2Oadd%*JHsuOa3Td zC0vK1nE#T=tVNTdf&3SbgTtj>3(){`iW_3y+V!@*;UQDrXylds+@og%Bfh3Xh9bz@ z#->I~?lH2c8@DIx=_9*AVa|zh;<}8YqwNh#uuc}FZi&+MHka5~!0>43J6vh3sgG)i zC^_1!b?j&_#iPz+H42Gqa=78><7(#tZL>*xin=vVQK9?o`m!wGWdTV0`{<1#bz`@^ zkK5!^5`XHqwT!x9PsA`>W3rUYur!;Uec^h?_Mx5ANu795*0--C@}l^^ibZ?)>ET#i z4$@ld*^`T~Sr%#SLXNqXG+&zR`Qw4V#Vn|hoNCGQ8YP|%IR$Kn{l#0)ijKVJA-{fq z+3qvG)I2Yz@H9f|%zTIp3z8pt)l`RG{r$Bck33}l_LuxCbp7?l(ONQh=edWH8#-Dk z$rcvMwije9m$Sbh*Sa6%{6kf1)s|hs!@!y0K+}RibUe(*AS=4=1aAmXbg*q&jD+;8 zlf5WvGsXZlBPg7=Z!u}kJWgC)2xg6)DNHVpf`oE}EjY+{sGeWltyAY5gU3F2XRF3g zO@_SH$Rf;9s{xNuZPaufHoGm{2v&JYVwovU_m+40A=dt*#zLlYKhC`J4Q#N$_`KX> z!i;O+l%VW?^e(--_wPV2S5Tyf>xGz(5Stq9A8z8F9mt%vmj-&n4O^!@!@cgf^U0}Q zv*P=;guft!1BS4ypI;HUka{rw17+1;s=#sPPq%dJX&wD0IJL)3ARCrzn5o->JwK>> z%53s599r*%uAH+IUxyNwge-7uz_u8aYlP%%Vf@RUFc^GJAqxgME}8#b%>H#jNm@sS z`MyIM%W1fm>`D(cvzW(TTqa_7BTzA|hdVXTfHCuf{vBQ@UXfq?Fwb`gaMjqnh3;h$ z-?&K6uGPtt#V&{O$lMVWQ1W>|%qF?S;bEVF zOU1{(ODj#J<;nDV+B8)UN;#b!;J7{9v>f`&duFOR!j%LclofpZi{hX#_WlyOhxoy) zn3|NSKE+`rTHpik8xE$^qOX8Eh_PW^0V>?o1!q8 z*ES5mqBFnGN1E2*B2OSZT@B8fAHrew2bH5iVX84z8xh+{k7jxXPnzYoK8W=3Fp&y$ z-Mdy8O^{^5_qMlrtX31GO4k=9tF*LE1|ah446||n(%;$XNXHi^eE)fLq5o^Re<`7P zBFFoR3qJW?six_jLviDPn2h7)(2>^c@O^EI(=_Q;ZzgNTeRlb>CwTUkA5d&__s z|A$=ac4V}hdnO`uXROt+Y#r@Z1Ikm|m1z;R2NtM}DTS0zXcG*0Gz$MwWgtRx>za)h z+Re~mFV%Jpx1;_b(N3Tz+r%?Z~@(UFJ34xO5LAmkn&mO3%`i9xoB$ z(3tjbjV7!bwQZCz9P1X6sUo{Wv=Gto4SAJ`Y=rNCJd=oBt>%8*>hdxhbvVr;HzzS_ z57VM1Lya^;3hp^^m!*})wEF1JFn>63E#oy)1|6&t!(*DsZ6Cjz+g5+4Fjj?tK6@M^ zF^$iC;lYJ}a6tHWJPA6Z?@}PD5(U5?JH%NIX!)+)o=)!y|LY=oQUbsbKb~ARVopM`Qn#>;^&qmq?qQz zv?SSeO>{r1((67+D#!%}}LB59C$!zA2wZkNlSUXt=HqvNqZ0DUo&ojQ@HDvM_b$>Nl@``s?sfepI8$ z(3RpA#OIJ;S5{&ut0_&XxC9A6<&)QdV>|%#2QIKd{EVC1K!d(=|En;o-(7iy^gAxa zp`KSg)P;}*lH)FTO@eK{W{CWJW%rbpLC{!_XqH5|q0)C(*SSH!Uh^}M(*@iuiXub# z(@(y!nRxWKQG`&EV^qkR32=|zTM&5?mbOoQBF=y-sk+cHY$)z9GMg4pw2gV{;N#;V}Q?xplZ)B-k`#aet#N9nNtKGD^Dg2z_W{Y2?%4>f^o)|lY9XGVG<~{!MH$VP4L-|ssCSYBVZ^2t88O?AF!azPx z@*!BN3uFd3`y0cF5FOL_vV$tzs={-#stdYCFiY+}U2Hyp_PpzBWc;I)$}*khM>&uQ z0Ex%QkkKE}^Z?wFM*q^pbxTk}iZ?2mgXCoGjYqnBE&s3ulf(!)Oq<~W2!?M;G)M_)fL+lc^Sm!5*QDFRr7*QBkLq63K^>P%Ywgo^YfvKQmL3F~hnoS0 zF6>ofa;kU=121e^A1#mpb$dOo@m@`#^+ozKoz(}*;-wb}g_?v|tFk+j;qHp@kqjvt z6EnkN#9$>0;(BZp8k941(gz;Wavj>;mL(Vu?mTl{bqCNMb@c1}N-NnacG~@iwWgJqc5=OJm$N;t}FkcF~hW{RwpMH#!b?iLOa9E$d zD&O5@C`bYGDmPcN`{xFgZk7GM-s?Lo&wD`RX=?hT(> z#XQ{*dKd)AMZ_d{iaz`+KRh=UTa(IxY2v#3dT*dffO|U~iXVoV3OpOp0pN3@vZ%u{ zW9=sF)woq5WbJv5*=J#H&xE+q(S3A~G<|AcR}SCSO7k8g*V^xk`AG%pMQrn92q2u1 ze3HJ3k5`YD=MV_VSS2v$+vsh>R{lDciQ5Z73U+ztz5|qmkaGRVS|6`3Tmy`*sg47e zomxI40P7>T$b>ezaMlbQG-*+SV2CX_$|^`oQ)GvfSry%MEKo1#1j4VvsGI_`8n0em zAbWvGV=+-8l+HbPi0Q+*ekac; z0)L)QD>SPZ({xZfyQ6J{_Yu!CLwDG=VlW8C-X?b&cFKse28LFyWk!#+1lxf~f`m=M z$*HGR4HwfO2LIMV2>tQ#&6#I#oYf5-|@ZV6Obc#l^SC<-T=)V;JAi32&40{xwhGE1xk3!sW=)bR=cM zCV+J7#~N>bHkY~*M|#76oVdqblAk%~OlYtJ!JUGGBXr6d5eXCBHDt#M6}1XV-2<@? z5c>IV5X(BKRNccG6Z(+D%j9c7h#Coebc>8-B+0@0dt>*gbY7wmKUp%dH8>sMB|e;1 zRN9+d+GCpj$pP;*yx4ONdvS}!rNdvRhD=tuJanlIIzpYVm;opuUXEs468XBbYE8fS zz!y>6aBA^TVpBo8jj(B(m2q__fH*~u!yv60do_})3*ua87u3sU+Zjkn?E^XeGEnqJ z5YnL~WZe{479gz9#_-KLKa9cP68eK8#DoyGzcw%$=l7>Xsp`wx2f^at3$SV&0^kF0 zK7*-hkyAK>gesDoVw!~q=T|~Zk6eDBA-h*?DkBlsd^6kP0k(>cn@%ED{zfa1uk^Ac zzvAhFi=umGKBcv0N>qtwhE3>>>4KPsKb~d_l&#yaesmRX3awZ25ogVWYe&-fNjr~6 z_or@+TX1w|X<*=YBT~WZrSN4j{9;yClOGOmerb|}&N7s(#w4xk9lmj+t|Rc#PgAV? zV>aC33x;_LOt{#19;;leN}8@yHz=t&=7Z&S92}&xP(2DLB*z_>`vfpA&)LLQ9cdlz zeh{g;Z^1YgOK`}9a7~m#DoSgSv)mi?&z0E3bxgmY!oIB8NKq)8#)A#IB-3|%y2jO; zkJYVD=?RA9C!z1AEl`a;sZHe$IS@?N0pap!w!k&y5#Ou042V=s(Ea)B*Ba3i@%}3Y zi7q}@+T$YJt8skdFU53HFTv6F__Jm0@(^D8wgy|%GxNm?n;&NcBxn{O8|>G5)84Dq zg8mxqEK0b{<9^~Eh!y7*`3G_xGVYjmEn91U1Mj%$t5 zSnhko%fv0OKV1ou-^iy9m&BEQDWBswdPMs7#LKtccTh(M`}d%hivj!G5nF+(K%4zX zKCLl$`8Dm{qkY4>%zRNBb+SC&sV0(jR!PGKz5IXlB6Q-1oE`KM!f&I%I|-V4oC4n> z*laQNPKBt721}(sH;X5m0&h~h4mnjq^vjEHjEp2k_R{lnBG`pKAG%si=L5)7xb0dJ zMI~Fq^1J3DHc7sE_{1TfRSdF$)SIy^9m6`ZP4Y|3Knz^&%3`Gi z1$DrGy+TP_^eWRP#XKY{CPvCQv*2ur3*_A2`v5>TBkE1SV69wBQdZz(_%Mup*qRNV z31WLK-&9!!AfZ~L1}DLtaX*&V?xfs1Yzn}bm%ERM0^p#npZ^4=d>*_6Y`t+`XC2Ri zOUEqKsM>Bcrmm_qtoCtLx-ZsfV`UDyNB`b_tER5JjBGZ9h#$rerZXCYF7LD%_>BfY+cFwy0!A$WQzlk{saNsGhGd^ zpcqwv`E(lfxu-_11Ce+n?bdE!n&2`K*s%a;;CPsLnC<6E*a52eF@qZhN(bkl6#M#P zTPp8xu55QoTFdOG0oP*u{IpmIB>CfGG>^hX>&n5;honRk4AobqF>DP#+xGXP()NM7 zTTe4zuL-67&tv2{uU}_i6x?p?REn2AVf+JC5jIK3)NpBStv7sZ?WzKz zAzkY|R!$A1;+&%9l%9Q>q~ByRJ!$_q`5B$*^1)y*4xFW2SmM0+Kr63$kG%6`et)Cd~d zDZbZy!;?@09b_1{1Fk7m_-}Z8LJLTGtAr?}MkXBiWJN4kua^tMK)G@*_uklK^yeJL zT~$!B!o%~7hGTj6#QeOYmtZ0Mbbr+bZkxEYgz0(aM(iRNGMY+RYPs3fJ{6b19QFlR z$B%OUohmpJnnkG0tN5X7Dq!W|*dFey+uNvIgn>;ZaLaz#^)1j&;`V(WWR2P?zsH!I z`FUFwb3|wKR#TL8$g$JD!EOH&cURYwXpJ@82y$~fzV6EB>Oi4?(yOwo>a2O3{-nKu z(ttM1>A+h^rOb`HsKdbL{EdeD{2mBs^z?*l2Q0+qL}yj`U&3q@HUe7|btJWV{kqC& z;E$7Y+K(2h`3a5aLN)A^3HyE>Qh~I!k{uD0-pXkevz(ZH!eJScHguHMj-N{iTYH^kn;(Bcufw39BN&Ak|h&MpKjupy|)P*tv_7qhFxJoQUd@+T(PQOaK zctg!zq`LbFW_D$ac?RsvUHy9JG<->70{ZlI%>!6ifYA|vN))6L+k~ed>I+x6RVrHb z8k9nm0DFm783J<`^i#KPO@1f$4;2CT3-N*aXBos)Jf*6&c_y(H#V71Q)qt^7qH zZkbC_u=CX=i*4TuTI-t%aB6@p(wQp4-&ktt5g%INSkGj7bNfZd^ttqkk#!lUHO$Xb z8aOBe?;oZ;?D%=&q2%f)of_u9cjYtFwfFjVxhZi}AtuS2n*xdW(S+X;IJFP~c&c&g z?1?k1fjE_w(l~Xp@S$_CUTEk&|1Zl{>RXIeSU%$WT4{ntj|}&n+2ARUrt8I@`~({Z zkKa1hUoc$&O(nN-enp}c@wQVK6=FvE6$GoSSxrq}J@qHDfFMZ!A)R|B1y-wF#Wns> z8$Z#3O;8?F5SchnM%;U2Ws3W`m(Vk*E@9>q@E%vo+2P*LmFyPB2{o5PgJ=zFql9#P1!8LxFdiUZe|kevq3L@16*UY_ZQNd*g4A zUT#|a;LBg z-q2G1?`92X>JnDrx@O_pLme^2v=GJlP40l@4X&&Cy*jqF+VqWHlVhk9?{13>i(I>& z_=c~L9jEUq3M+Q84I1m4qo2n6c#AaZ`LD^#6A!`=0f z_e1VEJ3_xM;hKxKO}`64()>!{Y1Onu0CR=nsoSiUMiLW7U*2)WVLOGAaHY;^3%0DL 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 ScqSZ6c!0$fTQi)A59WV{ujjM? literal 0 HcmV?d00001 diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_map_marker_road_work2_white.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_map_marker_road_work2_white.png new file mode 100644 index 0000000000000000000000000000000000000000..7875086c3ed6fdce0d93bb4a6285fc01615abd5a GIT binary patch literal 3136 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 literal 0 HcmV?d00001 diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_map_marker_shear_news.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_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 diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_map_marker_shop.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_map_marker_shop.png new file mode 100644 index 0000000000000000000000000000000000000000..d8be56fd4772d6042b977aca29d9ce36964684f5 GIT binary patch literal 2809 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 N002ovPDHLkV1i?)=i&eW literal 0 HcmV?d00001 diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_seek_help.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_seek_help.png new file mode 100644 index 0000000000000000000000000000000000000000..79ee716a3fe07651cbb6b1401d2c7a4cfece9582 GIT binary patch literal 3302 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 poiIconMap = new ArrayMap<>(); - public void updateIconWithPoiType(){ - // 先生成本地默认map - poiIconMap.put(MarkerPoiTypeEnum.GAS_STATION, new PoiWrapper(MarkerPoiTypeEnum.GAS_STATION,R.drawable.icon_map_marker_refuel, - R.drawable.icon_map_marker_refuel, "加油站")); - poiIconMap.put(MarkerPoiTypeEnum.TRAFFIC_CHECK, new PoiWrapper(MarkerPoiTypeEnum.TRAFFIC_CHECK, - R.drawable.icon_map_marker_road_check2,R.drawable.icon_map_marker_road_check2_white, "交通检查")); - poiIconMap.put(MarkerPoiTypeEnum.ROAD_CLOSED, new PoiWrapper(MarkerPoiTypeEnum.ROAD_CLOSED, - R.drawable.icon_map_marker_road_block_off2,R.drawable.icon_map_marker_road_block_off2_white, "封路")); - poiIconMap.put(MarkerPoiTypeEnum.SHOP_DISCOUNT, new PoiWrapper(MarkerPoiTypeEnum.SHOP_DISCOUNT, - R.drawable.icon_map_marker_shop_discount,R.drawable.icon_map_marker_shop_discount, "商场打折")); - poiIconMap.put(MarkerPoiTypeEnum.FOURS_4S, new PoiWrapper(MarkerPoiTypeEnum.FOURS_4S, - R.drawable.icon_map_marker_4s,R.drawable.icon_map_marker_4s, "4S店")); - poiIconMap.put(MarkerPoiTypeEnum.FOURS_ROAD_WORK, new PoiWrapper(MarkerPoiTypeEnum.FOURS_ROAD_WORK, - R.drawable.icon_map_marker_road_work2,R.drawable.icon_map_marker_road_work2_white, "施工")); - poiIconMap.put(MarkerPoiTypeEnum.FOURS_BLOCK_UP, new PoiWrapper(MarkerPoiTypeEnum.FOURS_BLOCK_UP, - R.drawable.icon_map_marker_road_block_up2,R.drawable.icon_map_marker_road_block_up2_white, "拥堵")); - poiIconMap.put(MarkerPoiTypeEnum.FOURS_PONDING, new PoiWrapper(MarkerPoiTypeEnum.FOURS_PONDING, - R.drawable.icon_map_marker_pondingl2,R.drawable.icon_map_marker_pondingl2_white, "积水")); - poiIconMap.put(MarkerPoiTypeEnum.FOURS_SHOP_FREE, new PoiWrapper(MarkerPoiTypeEnum.FOURS_SHOP_FREE, - R.drawable.icon_map_marker_shop,R.drawable.icon_map_marker_shop, "超时打折")); - poiIconMap.put(MarkerPoiTypeEnum.FOURS_FOG, new PoiWrapper(MarkerPoiTypeEnum.FOURS_FOG, - R.drawable.module_service_ic_rc_dark_frog2,R.drawable.module_service_ic_rc_dark_frog2_white, "浓雾")); - poiIconMap.put(MarkerPoiTypeEnum.FOURS_ICE, new PoiWrapper(MarkerPoiTypeEnum.FOURS_ICE, - R.drawable.module_service_ic_rc_freeze2,R.drawable.module_service_ic_rc_freeze2_white, "结冰")); - poiIconMap.put(MarkerPoiTypeEnum.FOURS_PARKING, new PoiWrapper(MarkerPoiTypeEnum.FOURS_PARKING, - R.drawable.module_service_ic_rc_parking2,R.drawable.module_service_ic_rc_parking2, "停车场")); - poiIconMap.put(MarkerPoiTypeEnum.FOURS_ACCIDENT, new PoiWrapper(MarkerPoiTypeEnum.FOURS_ACCIDENT, - R.drawable.module_service_ic_rc_accident3,R.drawable.module_service_ic_rc_accident3_white, "事故")); - poiIconMap.put(MarkerPoiTypeEnum.FOURS_NEALY, new PoiWrapper(MarkerPoiTypeEnum.FOURS_NEALY, - R.drawable.icon_map_marker_shear_news,R.drawable.icon_map_marker_shear_news, "身边")); - poiIconMap.put(MarkerPoiTypeEnum.FOURS_LIVING, new PoiWrapper(MarkerPoiTypeEnum.FOURS_LIVING, - R.drawable.icon_map_marker_living,R.drawable.icon_map_marker_living_white, "实时路况")); - poiIconMap.put(MarkerPoiTypeEnum.ILLEGAL_PARK_LIVING, new PoiWrapper(MarkerPoiTypeEnum.ILLEGAL_PARK_LIVING, - R.drawable.module_service_ic_rc_illegal_park,R.drawable.module_service_ic_rc_illegal_park_white, "违章停车")); - // 从sp中获取config属性，将服务端配置内容合并到本地 - String config = SharedPrefsMgr.getInstance(mContext).getString("SHARE_BUTTON_CONFIG", ""); - if (!config.isEmpty()) { - List configWrappers = GsonUtil.arrayFromJson(config, PoiWrapper.class); - if(configWrappers!=null) { - for (PoiWrapper wrapper : configWrappers) { - wrapper.setIconInfoRes(R.drawable.icon_map_marker_road_block_up2_white); - wrapper.setIconRes(R.drawable.icon_map_marker_road_block_up2); - if(poiIconMap.containsKey(wrapper.getPoiType())) { - PoiWrapper defWrapper = poiIconMap.get(wrapper.getPoiType()); - if(defWrapper!=null) { - wrapper.setIconRes(defWrapper.getIconRes()); - wrapper.setIconInfoRes(defWrapper.getIconInfoRes()); - } - } - poiIconMap.put(wrapper.getPoiType(), wrapper); - } - }else{ - Logger.e(TAG, "解析configWrapper异常: " + config); - } - } - } - - public PoiWrapper getWrapperByPoiType(String poiType) { - return poiIconMap.get(poiType); - } - } 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 cecd7b4908..81cea57f96 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 @@ -8,12 +8,11 @@ import androidx.annotation.Nullable; import com.mogo.map.marker.MogoMarkerOptions; import com.mogo.module.common.entity.MarkerExploreWay; -import com.mogo.module.common.entity.MarkerPoiTypeEnum; import com.mogo.module.common.entity.MarkerShowEntity; import com.mogo.module.common.marker.PoiWrapper; +import com.mogo.module.common.utils.CloudPoiManager; import com.mogo.module.service.R; import com.mogo.module.service.ServiceConst; -import com.mogo.utils.glide.GlideApp; import com.mogo.utils.logger.Logger; /** @@ -62,7 +61,7 @@ public class MapMarkerView extends MapMarkerBaseView { // 根据poiType获取对应的图片 String poiType = ((MarkerExploreWay) bindObj).getPoiType(); PoiWrapper poiWrapper = - MapMarkerManager.getInstance().getWrapperByPoiType(poiType); + CloudPoiManager.getInstance().getWrapperByPoiType(poiType); if (poiWrapper != null) { // 加载图片 loadPoiTypeIcon(poiWrapper.getIconUrl(),poiWrapper.getIconRes()); diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareControl.java b/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareControl.java index dc4b8e040b..f915233082 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareControl.java +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareControl.java @@ -9,19 +9,15 @@ import android.util.ArrayMap; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; -import com.mogo.commons.debug.DebugConfig; -import com.mogo.commons.network.ParamsProvider; import com.mogo.commons.network.SubscribeImpl; import com.mogo.commons.network.Utils; -import com.mogo.commons.voice.AIAssist; -import com.mogo.commons.voice.IMogoVoiceCmdCallBack; import com.mogo.map.location.MogoLocation; import com.mogo.module.authorize.authprovider.invoke.AuthorizeConstant; import com.mogo.module.authorize.authprovider.invoke.AuthorizeInvokerConstant; import com.mogo.module.authorize.authprovider.module.IMogoAcquireAuthorizeListener; import com.mogo.module.authorize.authprovider.module.IMogoAuthorizeModuleManager; import com.mogo.module.common.dialog.BaseFloatDialog; -import com.mogo.module.service.marker.MapMarkerManager; +import com.mogo.module.common.utils.CloudPoiManager; import com.mogo.module.share.bean.FixableButton; import com.mogo.module.share.bean.ShareButtonConfigResponse; import com.mogo.module.share.bean.ShareConfigRequest; @@ -29,18 +25,15 @@ import com.mogo.module.share.bean.StepAfterAuth; import com.mogo.module.share.constant.HttpConstant; import com.mogo.module.share.constant.ShareConstants; import com.mogo.module.share.dialog.GridFixableShareDialog; -import com.mogo.module.share.dialog.LaucherShareDialog; import com.mogo.module.share.manager.ServiceApisManager; import com.mogo.module.share.manager.UploadHelper; import com.mogo.module.share.net.ShareApiService; import com.mogo.service.MogoServicePaths; -import com.mogo.service.intent.IMogoIntentListener; -import com.mogo.service.intent.IMogoIntentManager; import com.mogo.service.share.IMogoShareManager; -import com.mogo.service.statusmanager.IMogoStatusChangedListener; -import com.mogo.service.statusmanager.StatusDescriptor; import com.mogo.service.share.IMogoTanluProvider; import com.mogo.service.share.TanluUploadParams; +import com.mogo.service.statusmanager.IMogoStatusChangedListener; +import com.mogo.service.statusmanager.StatusDescriptor; import com.mogo.utils.NetworkUtils; import com.mogo.utils.TipToast; import com.mogo.utils.logger.Logger; @@ -52,7 +45,6 @@ import org.jetbrains.annotations.NotNull; import org.json.JSONObject; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; import java.util.Map; @@ -74,7 +66,6 @@ import static com.mogo.module.share.constant.ShareConstants.UNWAKE_UPLOAD_ROAD_I import static com.mogo.module.share.constant.ShareConstants.UNWAKE_UPLOAD_SEEK_HELP; import static com.mogo.module.share.constant.ShareConstants.UNWAKE_UPLOAD_STAGNANT_WATER; import static com.mogo.module.share.constant.ShareConstants.UNWAKE_UPLOAD_TRAFFIC_CHECK; -import static com.mogo.module.share.constant.ShareConstants.UPLOAD_REAL_TIME_TRAFFIC; import static com.mogo.module.share.constant.ShareConstants.VOICE_CMD_GO_TO_SHARE; import static com.mogo.module.share.constant.ShareConstants.VOICE_CMD_NO_REPLY_SHARE_DIALOG_CLOSE; import static com.mogo.module.share.constant.ShareConstants.VOICE_CMD_PUB_ROAD_CONDITION; @@ -478,7 +469,7 @@ public class ShareControl implements IMogoShareManager, Handler.Callback { } Logger.d(TAG, "获取分享框配置成功: " + config); SharedPrefsMgr.getInstance(mContext).putString(KEY_SHARE_CONFIG, config); - MapMarkerManager.getInstance().updateIconWithPoiType(); + CloudPoiManager.getInstance().updateFromConfig(mContext); } @Override diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/bean/FixableButton.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/bean/FixableButton.kt index f80afbfa52..f68896177a 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/bean/FixableButton.kt +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/bean/FixableButton.kt @@ -8,10 +8,10 @@ import com.mogo.service.share.IMogoTanluProvider.* * 可配置按钮封装 * @author tongchenfei */ -class FixableButton(val id: Int = 0, val poiType: String = "10007", val iconUrl: String = "", val title: String = "拥堵") { +class FixableButton(val id: Int = 0, val poiType: String = "10007", val iconUrl: String = "", val iconInfoUrl: String = "", val title: String = "拥堵") { val iconRes: Int get() = when (poiType) { - TYPE_SEEK_HELP -> R.drawable.share_seek_help + TYPE_SEEK_HELP -> R.drawable.module_common_icon_seek_help TYPE_DENSE_FOG -> R.drawable.share_dense_fog TYPE_ROAD_ICY -> R.drawable.share_road_icy TYPE_STAGNANT_WATER -> R.drawable.share_stagnant_water diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/EventTypeUtils.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/EventTypeUtils.java index 99981c0580..16c8cdd890 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/EventTypeUtils.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/EventTypeUtils.java @@ -1,8 +1,11 @@ package com.mogo.module.v2x.utils; import com.mogo.module.common.entity.V2XPoiTypeEnum; +import com.mogo.module.common.marker.PoiWrapper; +import com.mogo.module.common.utils.CloudPoiManager; import com.mogo.module.v2x.R; import com.mogo.module.v2x.voice.V2XVoiceConstants; +import com.mogo.utils.logger.Logger; /** * @ProjectName: MoGoModulSafeDriving @@ -18,6 +21,13 @@ import com.mogo.module.v2x.voice.V2XVoiceConstants; */ public class EventTypeUtils { public static String getPoiTypeStr(String poiType) { + // 先获取网络配置的poi对应的名称 + PoiWrapper wrapper = CloudPoiManager.getInstance().getWrapperByPoiType(poiType); + if (wrapper != null) { + Logger.d("EventTypeUtils", "从配置表中拿到了相关数据： " + wrapper.getTitle()); + return wrapper.getTitle(); + } + // 如果获取不到，那么就用本地默认的 String str = "其它道路事件"; switch (poiType) { // 停车场