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 @@ - + \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 1d5e11a1d8..2fbf8224ec 100644 --- a/gradle.properties +++ b/gradle.properties @@ -38,7 +38,7 @@ MOGO_SERVICE_API_VERSION=1.2.1.9 MOGO_CONNECTION_VERSION=1.2.1.9 MOGO_MODULE_APPS_VERSION=1.2.1.9 MOGO_MODULE_NAVI_VERSION=1.2.1.9 -MOGO_MODULE_SHARE_VERSION=1.2.1.10 +MOGO_MODULE_SHARE_VERSION=1.2.1.18 MOGO_MODULE_COMMON_VERSION=1.2.1.9 MOGO_MODULE_MAIN_VERSION=1.2.1.9 MOGO_MODULE_MAP_VERSION=1.2.1.9 @@ -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 # 视频引导接口 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 1d0437d956..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 @@ -6,7 +6,9 @@ import android.content.pm.PackageInfo; 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; @@ -26,9 +28,16 @@ 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 ) { + 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 bf172403d9..93d46e9929 100644 --- a/modules/mogo-module-apps/src/main/res/values/strings.xml +++ b/modules/mogo-module-apps/src/main/res/values/strings.xml @@ -3,7 +3,7 @@ APP 未安装 新手引导服务未加载 为了您的安全,导航中不可播放视频 - + com.mogo.launcher com.mogo.launcher.app com.zhidao.launcher @@ -13,7 +13,23 @@ com.android.browser com.android.providers.downloads.ui com.zhidao.guide.lock + com.android.calculator2 + com.nwd.guidebookskin + com.iflytek.inputmethod.pad + com.nwd.tools.reboot + com.android.car.setting + + + com.mogo.launcher + com.mogo.launcher.app + com.zhidao.launcher + com.nwd.android.toolsmanager + com.nwd.filemanager + com.zhidao.autopilot + com.android.browser com.android.settings + com.android.providers.downloads.ui + com.zhidao.guide.lock com.android.calculator2 com.nwd.guidebookskin com.iflytek.inputmethod.pad