Merge remote-tracking branch 'origin/demo/shunyi_v2v' into demo/shunyi_v2v

# Conflicts:
#	gradle.properties

modules/mogo-module-apps/src/main/java/com/mogo/module/apps/view/OnAiAssistClickListener.java

@@ -30,7 +30,7 @@ class OnAiAssistClickListener implements View.OnClickListener {
 
     @Override
     public void onClick( View v ) {
-        if ( Devices.isBind() ) {
+        if ( Devices.isBind() || !DebugConfig.isActiveAIAssistFlag() ) {
             AIAssist.startAssistant( v.getContext() );
             trackNavigatorClickEvent( 5 );
         } else {

modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/CarSeries.java

@@ -1,5 +1,7 @@
 package com.mogo.module.common.utils;
 
+import android.text.TextUtils;
+
 import java.lang.reflect.Method;
 
 /**
@@ -21,6 +23,7 @@ public class CarSeries {
     public static final int CAR_SERIES_E84XCD = 51;
     public static final int CAR_SERIES_E85X = 50;
     public static final int CAR_SERIES_E85XCD = 51;
+    public static final int CAR_SERIES_E85XJD = 51;
 
     public static int CAR_SERIES = 0;
 
@@ -33,6 +36,10 @@ public class CarSeries {
                 return CAR_SERIES;
             }
             String device = get( "ro.fota.device" );
+            if ( TextUtils.isEmpty( device ) ) {
+                return CAR_SERIES_F80X;
+            }
+
             if ( "FG166".equals( device ) ) {
                 CAR_SERIES = CAR_SERIES_C80X;
             } else if ( "D801-802".equals( device ) ) {
@@ -58,6 +65,10 @@ public class CarSeries {
                 CAR_SERIES = CAR_SERIES_E85X;
             } else if ( "E85XCD".equals( device ) ) {
                 CAR_SERIES = CAR_SERIES_E85XCD;
+            } else if ( "E85XJD".equals( device ) ) {
+                CAR_SERIES = CAR_SERIES_E85XJD;
+            } else if ( device.startsWith( "E85" ) ) {
+                CAR_SERIES = CAR_SERIES_E85XJD;
             } else {
                 CAR_SERIES = CAR_SERIES_F80X;
             }

modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerInfoView.java

@@ -139,7 +139,7 @@ public class MapMarkerInfoView extends MapMarkerBaseView {
                                 ivIcon.setImageResource( R.drawable.module_service_ic_rc_illegal_park_light );
                                 break;
                             case MarkerPoiTypeEnum.ROAD_SLIPPERY:
-                                // TODO: 2020/6/28 添加点击展示图标
+                                ivIcon.setImageResource( R.drawable.module_service_ic_rc_road_slippery_light );
                                 break;
                             default:
                                 ivIcon.setImageResource( R.drawable.icon_map_marker_road_block_up2_light );

modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerView.java

@@ -102,7 +102,7 @@ public class MapMarkerView extends MapMarkerBaseView {
                                 ivIcon.setImageResource( R.drawable.module_service_ic_rc_illegal_park );
                                 break;
                             case MarkerPoiTypeEnum.ROAD_SLIPPERY:
-                                // TODO: 2020/6/28 添加展示图标
+                                ivIcon.setImageResource( R.drawable.module_service_ic_rc_road_slippery );
                                 break;
                             case MarkerPoiTypeEnum.FOURS_PARKING:
                             default: