From 4a4dd5a6344f100e0be433156a6637dcf2a13f43 Mon Sep 17 00:00:00 2001
From: unknown <zhongchao@zdauto.com>
Date: Tue, 30 Jun 2020 10:58:09 +0800
Subject: [PATCH 1/3] upgrade callchat to 1.2.0

---
 .idea/misc.xml    | 2 +-
 gradle.properties | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index cd77a1f062..21e99e2dc0 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -4,7 +4,7 @@
     <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">
+  <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>
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 3640e7590a..c544822aac 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -61,9 +61,9 @@ MOGO_MODULE_MAIN_INDEPENDENT_VERSION = 1.2.1.9
 # 探路
 MOGO_MODULE_TANLU_VERSION=1.2.1.5
 # 车聊聊
-CARCHATTING_VERSION=1.1.9
+CARCHATTING_VERSION=1.2.0
 # 车聊聊接口
-CARCHATTINGPROVIDER_VERSION=1.1.9
+CARCHATTINGPROVIDER_VERSION=1.2.0
 # 视频引导
 MOGO_MODULE_GUIDESHOW_VERSION=1.0.2-SNAPSHOT
 # 视频引导接口

From 6a23dca5d1f6f22c2ba87d0a6b45f863c49272b8 Mon Sep 17 00:00:00 2001
From: wangcongtao <wangcongtao@zhidaoauto.com>
Date: Tue, 30 Jun 2020 11:59:29 +0800
Subject: [PATCH 2/3] opt

---
 .idea/misc.xml                                  |  2 +-
 .../com/mogo/module/apps/AppFilterImpl.java     | 15 ++++++++++-----
 .../src/main/res/values/strings.xml             | 17 +++++++++++++++++
 3 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index cd77a1f062..21e99e2dc0 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -4,7 +4,7 @@
     <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">
+  <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>
\ No newline at end of file
diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppFilterImpl.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppFilterImpl.java
index 0043bcab25..beb26f4b71 100644
--- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppFilterImpl.java
+++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppFilterImpl.java
@@ -8,6 +8,7 @@ import com.mogo.module.apps.model.AppEnum;
 import com.mogo.module.apps.model.AppEnumHelper;
 import com.mogo.module.common.utils.CarSeries;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
@@ -27,11 +28,15 @@ public class AppFilterImpl implements AppFilter {
 
     public AppFilterImpl( Context context ) {
         mContext = context;
-        final String[] values = context.getResources().getStringArray( R.array.module_apps_array_filter_packages );
-        if ( values != null ) {
-            mFilterPackages = Arrays.asList( values );
-            if ( CarSeries.getSeries() != CarSeries.CAR_SERIES_F80X ) {
-                mFilterPackages.add( "com.android.settings" );
+        if ( CarSeries.getSeries() != CarSeries.CAR_SERIES_F80X ) {
+            final String[] values = context.getResources().getStringArray( R.array.module_apps_array_filter_packages );
+            if ( values != null ) {
+                mFilterPackages = new ArrayList( Arrays.asList( values ) );
+            }
+        } else {
+            final String[] values = context.getResources().getStringArray( R.array.module_apps_array_filter_packages_f );
+            if ( values != null ) {
+                mFilterPackages = new ArrayList( Arrays.asList( values ) );
             }
         }
     }
diff --git a/modules/mogo-module-apps/src/main/res/values/strings.xml b/modules/mogo-module-apps/src/main/res/values/strings.xml
index 822303fed7..7f1bf9cdd4 100644
--- a/modules/mogo-module-apps/src/main/res/values/strings.xml
+++ b/modules/mogo-module-apps/src/main/res/values/strings.xml
@@ -3,6 +3,23 @@
     <string name="module_apps_str_no_app">APP 未安装</string>
     <string name="module_apps_str_no_guide_show">新手引导服务未加载</string>
     <string name="module_apps_str_guide_warning">为了您的安全，导航中不可播放视频</string>
+    <string-array name="module_apps_array_filter_packages_f">
+        <item>com.mogo.launcher</item>
+        <item>com.mogo.launcher.app</item>
+        <item>com.zhidao.launcher</item>
+        <item>com.nwd.android.toolsmanager</item>
+        <item>com.nwd.filemanager</item>
+        <item>com.zhidao.autopilot</item>
+        <item>com.android.settings</item>
+        <item>com.android.browser</item>
+        <item>com.android.providers.downloads.ui</item>
+        <item>com.zhidao.guide.lock</item>
+        <item>com.android.calculator2</item>
+        <item>com.nwd.guidebookskin</item>
+        <item>com.iflytek.inputmethod.pad</item>
+        <item>com.nwd.tools.reboot</item>
+        <item>com.android.car.setting</item>
+    </string-array>
     <string-array name="module_apps_array_filter_packages">
         <item>com.mogo.launcher</item>
         <item>com.mogo.launcher.app</item>

From 6d5ae4c382964f16cbba0a58e12da3d58627cb50 Mon Sep 17 00:00:00 2001
From: wangcongtao <wangcongtao@zhidaoauto.com>
Date: Tue, 30 Jun 2020 12:00:18 +0800
Subject: [PATCH 3/3] opt

---
 modules/mogo-module-apps/src/main/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/mogo-module-apps/src/main/res/values/strings.xml b/modules/mogo-module-apps/src/main/res/values/strings.xml
index 7f1bf9cdd4..93d46e9929 100644
--- a/modules/mogo-module-apps/src/main/res/values/strings.xml
+++ b/modules/mogo-module-apps/src/main/res/values/strings.xml
@@ -10,7 +10,6 @@
         <item>com.nwd.android.toolsmanager</item>
         <item>com.nwd.filemanager</item>
         <item>com.zhidao.autopilot</item>
-        <item>com.android.settings</item>
         <item>com.android.browser</item>
         <item>com.android.providers.downloads.ui</item>
         <item>com.zhidao.guide.lock</item>
@@ -28,6 +27,7 @@
         <item>com.nwd.filemanager</item>
         <item>com.zhidao.autopilot</item>
         <item>com.android.browser</item>
+        <item>com.android.settings</item>
         <item>com.android.providers.downloads.ui</item>
         <item>com.zhidao.guide.lock</item>
         <item>com.android.calculator2</item>