Merge remote-tracking branch 'origin/dev' into dev

app/build.gradle

@@ -116,7 +116,7 @@ android {
             dimension "product"
             // 使用思必驰语音
             buildConfigField 'int', 'AIType', '2'
-            buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'true'
+            buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'false'
             // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0
             buildConfigField 'int', 'CAR_MACHINE_TYPE', '0'
             buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'true'
@@ -130,7 +130,7 @@ android {
             dimension "product"
             // 使用思必驰语音
             buildConfigField 'int', 'AIType', '2'
-            buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'true'
+            buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'false'
             // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0
             buildConfigField 'int', 'CAR_MACHINE_TYPE', '0'
             buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'true'
@@ -144,7 +144,7 @@ android {
             dimension "product"
             // 使用思必驰语音
             buildConfigField 'int', 'AIType', '2'
-            buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'true'
+            buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'false'
             // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0
             buildConfigField 'int', 'CAR_MACHINE_TYPE', '0'
             buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'false'
@@ -158,7 +158,7 @@ android {
             dimension "product"
             // 使用思必驰语音
             buildConfigField 'int', 'AIType', '2'
-            buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'true'
+            buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'false'
             // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0
             buildConfigField 'int', 'CAR_MACHINE_TYPE', '0'
             buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'false'
@@ -172,7 +172,7 @@ android {
             dimension "product"
             // 使用同行者语音
             buildConfigField 'int', 'AIType', '1'
-            buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'true'
+            buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'false'
             // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0
             buildConfigField 'int', 'CAR_MACHINE_TYPE', '0'
             buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'false'
@@ -186,7 +186,7 @@ android {
             dimension "product"
             // 使用同行者语音
             buildConfigField 'int', 'AIType', '1'
-            buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'true'
+            buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'false'
             // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0
             buildConfigField 'int', 'CAR_MACHINE_TYPE', '0'
             buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'false'
@@ -251,8 +251,6 @@ dependencies {
     implementation rootProject.ext.dependencies.mogologlib
 
     if (Boolean.valueOf(RELEASE)) {
-        launcherImplementation rootProject.ext.dependencies.modulemainlauncher
-        independentImplementation rootProject.ext.dependencies.modulemainindependent
         implementation rootProject.ext.dependencies.mogocommons
         implementation rootProject.ext.dependencies.modulecommon
         implementation rootProject.ext.dependencies.modulesearch
@@ -270,8 +268,6 @@ dependencies {
         implementation rootProject.ext.dependencies.mogomodulewidgets
         implementation rootProject.ext.dependencies.mogomoduleback
     } else {
-        launcherImplementation project(':main-extensions:mogo-module-main-launcher')
-        independentImplementation project(':main-extensions:mogo-module-main-independent')
         implementation project(':foudations:mogo-commons')
         implementation project(':modules:mogo-module-common')
         implementation project(':modules:mogo-module-search')
@@ -289,6 +285,7 @@ dependencies {
         implementation project(':modules:mogo-module-back')
     }
 
+    apply from: "./functions/perform.gradle"
     apply from: "./functions/baseservices.gradle"
     apply from: "./functions/socketpush.gradle"
     apply from: "./functions/gpssimulator.gradle"

app/functions/perform.gradle

@@ -0,0 +1,11 @@
+// 表现：独立 app 和 launcher
+
+project.dependencies {
+    if (Boolean.valueOf(RELEASE)) {
+        launcherImplementation rootProject.ext.dependencies.modulemainlauncher
+        independentImplementation rootProject.ext.dependencies.modulemainindependent
+    } else {
+        launcherImplementation project(':main-extensions:mogo-module-main-launcher')
+        independentImplementation project(':main-extensions:mogo-module-main-independent')
+    }
+}

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

@@ -193,7 +193,7 @@ public class DebugConfig {
     /**
      * 是否支持临时激活小智
      */
-    private static boolean sActiveAIAssistFlag = true;
+    private static boolean sActiveAIAssistFlag = false;
 
     public static boolean isActiveAIAssistFlag() {
         return sActiveAIAssistFlag;

modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsAdapter.java

@@ -25,7 +25,13 @@ public class AppsAdapter extends BaseAdapter {
     private List< AppInfo > mAppInfos;
 
     public AppsAdapter( List< AppInfo > appInfos ) {
-        this.mAppInfos = new ArrayList<>( appInfos );
+        this.mAppInfos = new ArrayList<>();
+        for ( AppInfo appInfo : appInfos ) {
+            if ( appInfo == null ) {
+                continue;
+            }
+            mAppInfos.add( appInfo );
+        }
     }
 
     @Override

modules/mogo-module-apps/src/main/res/layout/module_apps_item_app.xml

@@ -10,7 +10,7 @@
         android:id="@+id/module_apps_id_app_icon"
         android:layout_width="@dimen/module_apps_navigation_icon_width"
         android:scaleType="fitXY"
-        android:src="@drawable/module_apps_ic_im"
+        android:src="@drawable/module_apps_ic_default_icon"
         android:layout_height="@dimen/module_apps_navigation_icon_height" />
 
     <TextView