diff --git a/.idea/misc.xml b/.idea/misc.xml
index 2dc54c489f..707ee6e613 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 84350bc66e..f691bda4a6 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -24,32 +24,32 @@ SNAPSHOT_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-snapshots/
USERNAME=xintai
PASSWORD=xintai2018
# 编译模式: false - 依赖本地版本, true - 依赖 maven 版本
-RELEASE=false
+RELEASE=true
# 模块版本
## 工程内模块
-MOGO_COMMONS_VERSION=1.1.0.1
-MOGO_UTILS_VERSION=1.1.0.1
-MAP_AMAP_VERSION=1.1.0.1
-MOGO_MAP_VERSION=1.1.0.1
-MOGO_MAP_API_VERSION=1.1.0.1
-MOGO_SERVICE_VERSION=1.1.0.1
-MOGO_SERVICE_API_VERSION=1.1.0.1
-MOGO_CONNECTION_VERSION=1.1.0.1
-MOGO_MODULE_APPS_VERSION=1.1.0.1
-MOGO_MODULE_NAVI_VERSION=1.1.0.1
-MOGO_MODULE_SHARE_VERSION=1.1.0.1
-MOGO_MODULE_COMMON_VERSION=1.1.0.1
-MOGO_MODULE_MAIN_VERSION=1.1.0.1
-MOGO_MODULE_MAP_VERSION=1.1.0.1
-MOGO_MODULE_SERVICE_VERSION=1.1.0.1
-MOGO_MODULE_EXTENSIONS_VERSION=1.1.0.1
-MOGO_MODULE_SEARCH_VERSION=1.1.0.1
-MOGO_MODULE_BACK_VERSION=1.1.0.1
-MOGO_MODULE_GPS_SIMULATOR_VERSION=1.1.0.1
-MOGO_MODULE_GPS_SIMULATOR_DEBUG_VERSION=1.1.0.1
-MOGO_MODULE_GPS_SIMULATOR_NOOP_VERSION=1.1.0.1
-MOGO_MODULE_AUTHORIZE_VERSION=1.1.0.1
-MOGO_MODULE_GUIDE_VERSION=1.1.0.1
+MOGO_COMMONS_VERSION=1.1.0.2
+MOGO_UTILS_VERSION=1.1.0.2
+MAP_AMAP_VERSION=1.1.0.2
+MOGO_MAP_VERSION=1.1.0.2
+MOGO_MAP_API_VERSION=1.1.0.2
+MOGO_SERVICE_VERSION=1.1.0.2
+MOGO_SERVICE_API_VERSION=1.1.0.2
+MOGO_CONNECTION_VERSION=1.1.0.2
+MOGO_MODULE_APPS_VERSION=1.1.0.2
+MOGO_MODULE_NAVI_VERSION=1.1.0.2
+MOGO_MODULE_SHARE_VERSION=1.1.0.2
+MOGO_MODULE_COMMON_VERSION=1.1.0.5
+MOGO_MODULE_MAIN_VERSION=1.1.0.2
+MOGO_MODULE_MAP_VERSION=1.1.0.2
+MOGO_MODULE_SERVICE_VERSION=1.1.0.3
+MOGO_MODULE_EXTENSIONS_VERSION=1.1.0.2
+MOGO_MODULE_SEARCH_VERSION=1.1.0.2
+MOGO_MODULE_BACK_VERSION=1.1.0.2
+MOGO_MODULE_GPS_SIMULATOR_VERSION=1.1.0.2
+MOGO_MODULE_GPS_SIMULATOR_DEBUG_VERSION=1.1.0.2
+MOGO_MODULE_GPS_SIMULATOR_NOOP_VERSION=1.1.0.2
+MOGO_MODULE_AUTHORIZE_VERSION=1.1.0.2
+MOGO_MODULE_GUIDE_VERSION=1.1.0.2
## 工程外部模块
diff --git a/modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_navigator_applist.png b/modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_navigator_applist.png
new file mode 100755
index 0000000000..205ed11e64
Binary files /dev/null and b/modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_navigator_applist.png differ
diff --git a/modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_navigator_media.png b/modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_navigator_media.png
new file mode 100755
index 0000000000..3f47b7a60b
Binary files /dev/null and b/modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_navigator_media.png differ
diff --git a/modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_navigator_navi.png b/modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_navigator_navi.png
new file mode 100755
index 0000000000..585e128e9a
Binary files /dev/null and b/modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_navigator_navi.png differ
diff --git a/modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_navigator_navi_disable.png b/modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_navigator_navi_disable.png
new file mode 100644
index 0000000000..45c5eeb6b2
Binary files /dev/null and b/modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_navigator_navi_disable.png differ
diff --git a/modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_navigator_personcenter.png b/modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_navigator_personcenter.png
new file mode 100755
index 0000000000..eb036c5ea0
Binary files /dev/null and b/modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_navigator_personcenter.png differ
diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_navigator_navi_disable.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_navigator_navi_disable.png
new file mode 100644
index 0000000000..6a00c94c9d
Binary files /dev/null and b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_navigator_navi_disable.png differ
diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerExploreWay.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerExploreWay.java
index 00fdbf8552..d33c09686d 100644
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerExploreWay.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerExploreWay.java
@@ -11,6 +11,10 @@ public class MarkerExploreWay implements Serializable {
private String infoId;
private String type;//卡片类型,
+ /**
+ * @see MarkerPoiTypeEnum
+ */
+ private String poiType;
private String sn;
private MarkerLocation location;//位置信息
private int direction;//方位角度
@@ -21,8 +25,9 @@ public class MarkerExploreWay implements Serializable {
private String cityName;//:"城市名称",
private double distance;//距离
private MarkerUserInfo userInfo;//用户信息
- private String poiType;
private List items;//视频地址和图片地址
+ //上报类型:1-用户上报,2-后台上报 3-三方上报
+ private String uploadType;
public String getAddr() {
if (TextUtils.isEmpty(addr)) {
@@ -123,35 +128,48 @@ public class MarkerExploreWay implements Serializable {
this.userInfo = userInfo;
}
- public String getPoiType() {
- return poiType;
- }
-
-
public String getInfoId() {
return infoId;
}
- public MarkerExploreWay setInfoId( String infoId ) {
+ public void setInfoId(String infoId) {
this.infoId = infoId;
- return this;
+ }
+
+ public String getPoiType() {
+ return poiType;
+ }
+
+ public void setPoiType(String poiType) {
+ this.poiType = poiType;
+ }
+
+ public String getUploadType() {
+ return uploadType;
+ }
+
+ public void setUploadType(String uploadType) {
+ this.uploadType = uploadType;
}
@Override
public String toString() {
return "MarkerExploreWay{" +
- "addr='" + addr + '\'' +
- ", canLive=" + canLive +
- ", cityName='" + cityName + '\'' +
- ", direction=" + direction +
- ", distance=" + distance +
- ", fileType=" + fileType +
- ", generateTime=" + generateTime +
- ", items=" + items +
- ", location=" + location +
+ "type='" + type + '\'' +
+ ", infoId='" + infoId + '\'' +
+ ", poiType='" + poiType + '\'' +
", sn='" + sn + '\'' +
- ", type='" + type + '\'' +
+ ", location=" + location +
+ ", direction=" + direction +
+ ", canLive=" + canLive +
+ ", fileType=" + fileType +
+ ", addr='" + addr + '\'' +
+ ", generateTime=" + generateTime +
+ ", cityName='" + cityName + '\'' +
+ ", distance=" + distance +
", userInfo=" + userInfo +
+ ", items=" + items +
+ ", uploadType='" + uploadType + '\'' +
'}';
}
}
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_display_overview.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_display_overview.png
new file mode 100755
index 0000000000..df4f12f225
Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_display_overview.png differ
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_navi_info1.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_navi_info1.png
new file mode 100755
index 0000000000..8495a826bc
Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_navi_info1.png differ
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_navi_info2.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_navi_info2.png
new file mode 100755
index 0000000000..797cb5f596
Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_navi_info2.png differ
diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_navi_info3.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_navi_info3.png
new file mode 100755
index 0000000000..c8580d052c
Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/module_ext_ic_navi_info3.png differ
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/RefreshBody.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/RefreshBody.java
index 769aa2c6a1..d1a5384490 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/RefreshBody.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/RefreshBody.java
@@ -19,6 +19,7 @@ public class RefreshBody {
public String sn;
public boolean onlyFocus; // 是否仅查询已关注的好友
public boolean onlySameCity; // 是否仅查询注册城市相同的同城用户
+ public boolean viewPush; // 是否走V2X通道 ,true-401011,false -401001
public static class LatLon {
diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_living.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_living.png
new file mode 100755
index 0000000000..f66b3e8176
Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_living.png differ
diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_living_light.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_living_light.png
new file mode 100755
index 0000000000..b52aab6bad
Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_living_light.png differ
diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_location_yellow.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_location_yellow.png
new file mode 100755
index 0000000000..f8da53f346
Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_location_yellow.png differ
diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_pondingl2.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_pondingl2.png
new file mode 100755
index 0000000000..61bb224ffc
Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_pondingl2.png differ
diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_pondingl2_light.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_pondingl2_light.png
new file mode 100755
index 0000000000..85de6dcee6
Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_pondingl2_light.png differ
diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_road_block_off2.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_road_block_off2.png
new file mode 100755
index 0000000000..a29d82adb4
Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_road_block_off2.png differ
diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_road_block_off2_light.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_road_block_off2_light.png
new file mode 100755
index 0000000000..3241e2adf4
Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_road_block_off2_light.png differ
diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_road_block_up2.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_road_block_up2.png
new file mode 100755
index 0000000000..a51384a08e
Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_road_block_up2.png differ
diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_road_block_up2_light.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_road_block_up2_light.png
new file mode 100755
index 0000000000..33fbef70c4
Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_road_block_up2_light.png differ
diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_road_check2.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_road_check2.png
new file mode 100755
index 0000000000..45fac29f3f
Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_road_check2.png differ
diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_road_check2_light.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_road_check2_light.png
new file mode 100755
index 0000000000..4b7288d976
Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_road_check2_light.png differ
diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_road_work2.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_road_work2.png
new file mode 100755
index 0000000000..4e721b457e
Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_road_work2.png differ
diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_road_work2_light.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_road_work2_light.png
new file mode 100755
index 0000000000..5e63a96978
Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_road_work2_light.png differ
diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/module_service_ic_rc_accident3.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/module_service_ic_rc_accident3.png
new file mode 100755
index 0000000000..3ceef9aa09
Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-ldpi/module_service_ic_rc_accident3.png differ
diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/module_service_ic_rc_accident3_light.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/module_service_ic_rc_accident3_light.png
new file mode 100755
index 0000000000..cea530e6d2
Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-ldpi/module_service_ic_rc_accident3_light.png differ
diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/module_service_ic_rc_dark_frog2_light.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/module_service_ic_rc_dark_frog2_light.png
new file mode 100755
index 0000000000..45b9e35622
Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-ldpi/module_service_ic_rc_dark_frog2_light.png differ
diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/module_service_ic_rc_freeze2_light.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/module_service_ic_rc_freeze2_light.png
new file mode 100755
index 0000000000..70419c886f
Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-ldpi/module_service_ic_rc_freeze2_light.png differ
diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_dark.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_dark.png
new file mode 100755
index 0000000000..c1ef274cbe
Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_dark.png differ
diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_living.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_living.png
new file mode 100755
index 0000000000..3780ecf9b9
Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_living.png differ
diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_living_light.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_living_light.png
new file mode 100755
index 0000000000..ae94e4bc3d
Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_living_light.png differ
diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_location_yellow.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_location_yellow.png
new file mode 100644
index 0000000000..f05356795e
Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_location_yellow.png differ
diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_pondingl2.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_pondingl2.png
new file mode 100755
index 0000000000..478232ac79
Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_pondingl2.png differ
diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_pondingl2_light.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_pondingl2_light.png
new file mode 100755
index 0000000000..700226f150
Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_pondingl2_light.png differ
diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_block_off2.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_block_off2.png
new file mode 100755
index 0000000000..2fb4ef553e
Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_block_off2.png differ
diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_block_off2_light.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_block_off2_light.png
new file mode 100755
index 0000000000..9b424494ee
Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_block_off2_light.png differ
diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_block_up2.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_block_up2.png
new file mode 100755
index 0000000000..e62fd5ec03
Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_block_up2.png differ
diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_block_up2_light.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_block_up2_light.png
new file mode 100755
index 0000000000..0ac89f4dec
Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_block_up2_light.png differ
diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_check2.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_check2.png
new file mode 100755
index 0000000000..001974ba87
Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_check2.png differ
diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_check2_light.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_check2_light.png
new file mode 100755
index 0000000000..5baea2a41b
Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_check2_light.png differ
diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_work2.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_work2.png
new file mode 100755
index 0000000000..c11e911f15
Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_work2.png differ
diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_work2_light.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_work2_light.png
new file mode 100755
index 0000000000..7875086c3e
Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_work2_light.png differ
diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_accident3.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_accident3.png
new file mode 100755
index 0000000000..fe68bc7cba
Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_accident3.png differ
diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_accident3_light.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_accident3_light.png
new file mode 100755
index 0000000000..911bee2df4
Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_accident3_light.png differ
diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_dark_frog2_light.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_dark_frog2_light.png
new file mode 100755
index 0000000000..b6164bcfdd
Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_dark_frog2_light.png differ
diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_freeze2_light.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_freeze2_light.png
new file mode 100755
index 0000000000..353cfefec6
Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_freeze2_light.png differ
diff --git a/modules/mogo-module-service/src/main/res/drawable/bg_map_marker_yellow_info.xml b/modules/mogo-module-service/src/main/res/drawable/bg_map_marker_yellow_info.xml
new file mode 100644
index 0000000000..b2be8e312e
--- /dev/null
+++ b/modules/mogo-module-service/src/main/res/drawable/bg_map_marker_yellow_info.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_yellow.xml b/modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_yellow.xml
new file mode 100644
index 0000000000..6bc80c96dc
--- /dev/null
+++ b/modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_yellow.xml
@@ -0,0 +1,17 @@
+
+
+ -
+
+
+
+
+
+
+
+
+
+