yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
董宏宇
2020-06-30 12:27:24 +08:00
parent 8c669c6c5b 6d5ae4c382
commit 8856874e46
4 changed files with 33 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/misc.xml generated
View File

@@ -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>

6
gradle.properties
View File

@@ -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
# 视频引导接口

15
modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppFilterImpl.java
View File

@@ -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 ) );
}
}
}

18
modules/mogo-module-apps/src/main/res/values/strings.xml
View File

@@ -3,7 +3,7 @@
<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">
<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>
@@ -13,7 +13,23 @@
<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>
<item>com.zhidao.launcher</item>
<item>com.nwd.android.toolsmanager</item>
<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>
<item>com.nwd.guidebookskin</item>
<item>com.iflytek.inputmethod.pad</item>