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

# Conflicts:
#	gradle.properties

.idea/misc.xml

@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-<<<<<<< HEAD
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK">
-=======
   <component name="ASMPluginConfiguration">
     <asm skipDebug="false" skipFrames="false" skipCode="false" expandFrames="false" />
     <groovy codeStyle="LEGACY" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
->>>>>>> qa
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
 </project>

app/build.gradle

@@ -98,18 +98,21 @@ android {
             dimension "product"
             // 使用思必驰语音
             buildConfigField 'int', 'AIType','2'
+            buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'false'
         }
         // e系列
         e8xx {
             dimension "product"
             // 使用思必驰语音
             buildConfigField 'int', 'AIType','2'
+            buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'true'
         }
         // d系列
         d8xx {
             dimension "product"
             // 使用同行者语音
             buildConfigField 'int', 'AIType','1'
+            buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'true'
         }
         qa {
             dimension "env"

app/src/main/java/com/mogo/launcher/MogoApplication.java

@@ -37,13 +37,7 @@ public class MogoApplication extends AbsMogoApplication {
 
     @Override
     public void onCreate() {
-        DebugConfig.setNetMode(BuildConfig.NET_ENV);
-        DebugConfig.setDebug(BuildConfig.DEBUG);
-        DebugConfig.setAIType(BuildConfig.AIType);
-        DebugConfig.setLaunchLocationService(BuildConfig.LAUNCH_LOCATION_SERVICE);
-        DebugConfig.setUseCustomNavi(BuildConfig.USE_CUSTOM_NAVI);
-        DebugConfig.setLauncher(BuildConfig.IS_LAUNCHER);
-        DebugConfig.setUseMockObuData(false);
+        initDebugConfig();
         super.onCreate();
         // Crash 日志收集
         final long start = System.currentTimeMillis();
@@ -79,6 +73,16 @@ public class MogoApplication extends AbsMogoApplication {
         Log.i("timer", "cost " + (System.currentTimeMillis() - start) + "ms");
     }
 
+    private void initDebugConfig(){
+        DebugConfig.setNetMode(BuildConfig.NET_ENV);
+        DebugConfig.setDebug(BuildConfig.DEBUG);
+        DebugConfig.setAIType(BuildConfig.AIType);
+        DebugConfig.setLaunchLocationService(BuildConfig.LAUNCH_LOCATION_SERVICE);
+        DebugConfig.setUseCustomNavi(BuildConfig.USE_CUSTOM_NAVI);
+        DebugConfig.setLauncher(BuildConfig.IS_LAUNCHER);
+        DebugConfig.setActiveAIAssistFlag( BuildConfig.AI_ASSIST_ACTIVE_STAUTS );
+    }
+
     @Override
     protected void init() {
         super.init();

foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java

@@ -158,7 +158,20 @@ public class DebugConfig {
         useMockObuData = use;
     }
 
-    public static boolean isUseMockObuData(){
+    public static boolean isUseMockObuData() {
         return useMockObuData;
     }
+
+    /**
+     * 是否支持临时激活小智
+     */
+    private static boolean sActiveAIAssistFlag = true;
+
+    public static boolean isActiveAIAssistFlag() {
+        return sActiveAIAssistFlag;
+    }
+
+    public static void setActiveAIAssistFlag( boolean sActiveAIAssistFlag ) {
+        DebugConfig.sActiveAIAssistFlag = sActiveAIAssistFlag;
+    }
 }

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: