diff --git a/gradle.properties b/gradle.properties
index f53bc40781..edc2ee609e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -54,7 +54,7 @@ MOGO_MODULE_GUIDE_VERSION=1.1.0.12
## 工程外部模块
# 探路
-MOGO_MODULE_TANLU_VERSION=1.0.6-SNAPSHOT
+MOGO_MODULE_TANLU_VERSION=1.0.6.2
# 车聊聊
CARCHATTING_VERSION=1.0.4-SNAPSHOT
# 车聊聊接口
@@ -68,7 +68,7 @@ MOGO_MODULE_ONLINECAR_VERSION=1.0.3.2
# v2x
MOGO_MODULE_V2X_VERSION=1.0.7
# 媒体卡片
-MOGO_MODULE_MEDIA_VERSION=1.0.4.10
+MOGO_MODULE_MEDIA_VERSION=1.0.4.11
# 推送
MOGO_MODULE_PUSH_VERSION=1.0.1
# 广告资源位
diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/CarSeries.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/CarSeries.java
index 75c6725940..c487e3e99b 100644
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/CarSeries.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/CarSeries.java
@@ -17,6 +17,8 @@ public class CarSeries {
public static final int CAR_SERIES_D84X = 23;
public static final int CAR_SERIES_F80X = 30;
public static final int CAR_SERIES_G80X = 40;
+ public static final int CAR_SERIES_E84X = 50;
+ public static final int CAR_SERIES_E84XCD = 51;
public static int CAR_SERIES = 0;
@@ -33,7 +35,7 @@ public class CarSeries {
CAR_SERIES = CAR_SERIES_C80X;
} else if ( "D801-802".equals( device ) ) {
CAR_SERIES = CAR_SERIES_D80X;
- } else if( "D801B-802B".equals( device )){
+ } else if ( "D801B-802B".equals( device ) ) {
// 2+16G
CAR_SERIES = CAR_SERIES_D80X;
} else if ( "D811-812".equals( device ) ) {
@@ -46,6 +48,10 @@ public class CarSeries {
CAR_SERIES = CAR_SERIES_G80X;
} else if ( "F801-802".equals( device ) ) {
CAR_SERIES = CAR_SERIES_F80X;
+ } else if ( "E841-842".equals( device ) ) {
+ CAR_SERIES = CAR_SERIES_E84X;
+ } else if ( "E84XCD".equals( device ) ) {
+ CAR_SERIES = CAR_SERIES_E84XCD;
} else {
CAR_SERIES = CAR_SERIES_F80X;
}
diff --git a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml
index 7dedbe8be2..946efb92ea 100644
--- a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml
+++ b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml
@@ -25,7 +25,7 @@
diff --git a/modules/mogo-module-search/src/main/res/drawable/amap_calculate_navi_strategy2_bkg.xml b/modules/mogo-module-search/src/main/res/drawable/amap_calculate_navi_strategy2_bkg.xml
index c0f20a1c86..8b5efeaf32 100644
--- a/modules/mogo-module-search/src/main/res/drawable/amap_calculate_navi_strategy2_bkg.xml
+++ b/modules/mogo-module-search/src/main/res/drawable/amap_calculate_navi_strategy2_bkg.xml
@@ -2,7 +2,7 @@
-
-
+
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 bb991fdae9..31825c7c11 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
@@ -88,7 +88,7 @@ public class MapMarkerInfoView extends MapMarkerBaseView {
ivUserHead.setVisibility( View.INVISIBLE );
ivIcon.setVisibility( View.VISIBLE );
- if ( bindObj instanceof MarkerExploreWay ) {
+ if ( bindObj instanceof MarkerExploreWay && ( ( MarkerExploreWay ) bindObj ).getPoiType() != null ) {
switch ( ( ( MarkerExploreWay ) bindObj ).getPoiType() ) {
case MarkerPoiTypeEnum.GAS_STATION:
ivIcon.setImageResource( R.drawable.icon_map_marker_refuel );
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 95e95c4a07..db970da316 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
@@ -57,7 +57,7 @@ public class MapMarkerView extends MapMarkerBaseView {
switch ( markerShowEntity.getMarkerType() ) {
case ServiceConst.CARD_TYPE_ROAD_CONDITION:
case ServiceConst.CARD_TYPE_NOVELTY:
- if ( bindObj instanceof MarkerExploreWay ) {
+ if ( bindObj instanceof MarkerExploreWay && ( ( MarkerExploreWay ) bindObj ).getPoiType() != null ) {
switch ( ( ( MarkerExploreWay ) bindObj ).getPoiType() ) {
case MarkerPoiTypeEnum.GAS_STATION:
ivIcon.setImageResource( R.drawable.icon_map_marker_refuel );