From 553d92d2850b74c6ae9b8be3127f6e38c65aa18a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Sat, 27 Jun 2020 00:38:32 +0800 Subject: [PATCH 01/19] =?UTF-8?q?=E6=9A=82=E6=97=B6=E5=85=B3=E9=97=AD?= =?UTF-8?q?=E4=BA=86=E8=87=AA=E6=94=B9=E6=8F=92=E4=BB=B6=E5=8A=A0=E8=BD=BD?= =?UTF-8?q?boost=5Fmultidex=E4=B8=8EARouter=E3=80=82=20=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E4=BD=BF=E7=94=A8ARouter=E7=9A=84=E5=8E=9F=E6=9C=89=E6=B3=A8?= =?UTF-8?q?=E5=86=8C=E6=8F=92=E4=BB=B6=E5=AE=8C=E6=88=90=E6=B3=A8=E5=86=8C?= =?UTF-8?q?=E8=A1=A8=E5=9C=A8=E7=BC=96=E8=AF=91=E6=9C=9F=E5=AE=8C=E6=88=90?= =?UTF-8?q?=EF=BC=8C=E5=AE=8C=E6=88=90=E7=A7=92=E5=BC=80=E7=9A=84=E6=95=88?= =?UTF-8?q?=E6=9E=9C=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 8 ++++---- build.gradle | 2 +- config.gradle | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index aad3e71d5e..306b547bf2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,8 +1,8 @@ -import java.text.SimpleDateFormat - apply plugin: 'com.android.application' +apply plugin: 'com.alibaba.arouter' apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' +import java.text.SimpleDateFormat android { compileSdkVersion rootProject.ext.android.compileSdkVersion @@ -25,7 +25,7 @@ android { externalNativeBuild { ndk { // 设置支持的SO库架构 - abiFilters 'armeabi-v7a' + abiFilters 'armeabi-v7a','x86' } } } @@ -282,4 +282,4 @@ def getGitCommit() { gitCommit } -apply plugin: 'arouterhook' \ No newline at end of file +//apply plugin: 'arouterhook' \ No newline at end of file diff --git a/build.gradle b/build.gradle index 1ff312c0fb..2ff4df7631 100644 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,7 @@ buildscript { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "com.alibaba:arouter-register:1.0.2" classpath 'com.hujiang.aspectjx:gradle-android-plugin-aspectjx:2.0.4' - classpath "com.mogo.module.pluginhook:module-pluginhook:${HOOKPLUGIN_VERSION}" +// classpath "com.mogo.module.pluginhook:module-pluginhook:${HOOKPLUGIN_VERSION}" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } diff --git a/config.gradle b/config.gradle index d79002527d..ea2f5501c3 100644 --- a/config.gradle +++ b/config.gradle @@ -17,7 +17,7 @@ ext { androidxappcompat : "androidx.appcompat:appcompat:1.0.2", androidxccorektx : "androidx.core:core-ktx:1.2.0", androidxconstraintlayout : "androidx.constraintlayout:constraintlayout:1.1.3", - boostmultidex : "com.mogo.module.boostmultidex:module-boostmultidex:${BOOST_MULTIDEX_VERSION}", + boostmultidex : "com.bytedance.boost_multidex:boost_multidex:1.0.1", androidxviewpager2 : "androidx.viewpager2:viewpager2:1.0.0", androidxrecyclerview : "androidx.recyclerview:recyclerview:1.1.0", androidxcardview : "androidx.cardview:cardview:1.0.0", From afd03008cdf7ef0d26a30abb156fa8ced647f4a3 Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Sun, 28 Jun 2020 20:11:36 +0800 Subject: [PATCH 02/19] bugfix: E85XJD-50 --- .../java/com/mogo/module/extensions/navi/BaseNaviInfoView.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/navi/BaseNaviInfoView.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/navi/BaseNaviInfoView.java index 85faab6b7a..192cdfe588 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/navi/BaseNaviInfoView.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/navi/BaseNaviInfoView.java @@ -67,7 +67,7 @@ public abstract class BaseNaviInfoView { protected String getFormatSurplusTime( int seconds ) { if ( seconds > 60 * 60 ) { - mFormatSurplusDistanceUnit = "h"; + mFormatSurplusTimeUnit = "h"; return String.format( "%.1f", ( ( float ) seconds ) / ( 60 * 60 ) ); } From a876fef33c125fd0b0e8bd3eaabeeefde25b2f0f Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Mon, 29 Jun 2020 10:10:33 +0800 Subject: [PATCH 03/19] opt --- .idea/misc.xml | 2 +- app/build.gradle | 3 +++ .../java/com/mogo/launcher/MogoApplication.java | 17 +++++++++++------ .../com/mogo/commons/debug/DebugConfig.java | 13 +++++++++++++ .../apps/view/OnAiAssistClickListener.java | 2 +- .../com/mogo/module/common/utils/CarSeries.java | 11 +++++++++++ 6 files changed, 40 insertions(+), 8 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 @@ - + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 306b547bf2..cd753934aa 100644 --- a/app/build.gradle +++ b/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" diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index ddd2d059ba..ca92b2cb80 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -37,12 +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); + initDebugConfig(); super.onCreate(); // Crash 日志收集 final long start = System.currentTimeMillis(); @@ -78,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(); diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java index f8c85cf2c1..8d152859ba 100644 --- a/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java @@ -151,4 +151,17 @@ public class DebugConfig { public static void setRequestOnlineCarData( boolean sRequestOnlineCarData ) { DebugConfig.sRequestOnlineCarData = sRequestOnlineCarData; } + + /** + * 是否支持临时激活小智 + */ + private static boolean sActiveAIAssistFlag = true; + + public static boolean isActiveAIAssistFlag() { + return sActiveAIAssistFlag; + } + + public static void setActiveAIAssistFlag( boolean sActiveAIAssistFlag ) { + DebugConfig.sActiveAIAssistFlag = sActiveAIAssistFlag; + } } diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/view/OnAiAssistClickListener.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/view/OnAiAssistClickListener.java index 393f3d9a6f..8be87989e0 100644 --- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/view/OnAiAssistClickListener.java +++ b/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 { diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/CarSeries.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/CarSeries.java index e8675cdfc9..71bcd12274 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/CarSeries.java +++ b/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; } From 83a75948ce411e37153f007d5389d7280a113da3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Mon, 29 Jun 2020 10:24:03 +0800 Subject: [PATCH 04/19] =?UTF-8?q?=E5=8D=87=E7=BA=A7V2X=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E4=BA=86=EF=BC=9A=20=E3=80=90=E8=BF=9D=E7=AB=A0=E9=AB=98?= =?UTF-8?q?=E5=8F=91=E5=9C=B0=E3=80=91=E6=89=93=E7=82=B9=E7=9A=84=E8=BF=9D?= =?UTF-8?q?=E5=81=9C=E6=95=B0=E6=8D=AE=EF=BC=8C=E6=B2=A1=E6=9C=89=E5=9C=A8?= =?UTF-8?q?=E4=B8=8B=E4=B8=80=E6=AC=A1=E6=95=B4=E4=BD=93=E5=88=B7=E6=96=B0?= =?UTF-8?q?=E6=97=B6=E8=87=AA=E5=8A=A8=E6=B6=88=E5=A4=B1=20http://jira.zhi?= =?UTF-8?q?daohulian.com/browse/E85XJD-46=20=E3=80=90=E8=BF=9D=E7=AB=A0?= =?UTF-8?q?=E9=AB=98=E5=8F=91=E5=9C=B0=E3=80=91=E5=85=8D=E5=94=A4=E9=86=92?= =?UTF-8?q?=E8=AF=AD=E9=9F=B3=E2=80=9C=E6=9C=89=E7=94=A8=E2=80=9D=E2=80=9C?= =?UTF-8?q?=E6=97=A0=E7=94=A8=E2=80=9D=EF=BC=8C=E6=B2=A1=E6=9C=89=E7=94=9F?= =?UTF-8?q?=E6=95=88=20http://jira.zhidaohulian.com/browse/E85XJD-47=20?= =?UTF-8?q?=E3=80=90=E8=BF=9D=E7=AB=A0=E9=AB=98=E5=8F=91=E5=9C=B0=E3=80=91?= =?UTF-8?q?=E8=B6=85=E9=95=BF=E7=9A=84=E5=9C=B0=E5=9D=80=E6=96=87=E6=9C=AC?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E6=B5=AE=E7=AA=97=E5=86=85=E5=85=B6=E4=BB=96?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=85=A8=20http:/?= =?UTF-8?q?/jira.zhidaohulian.com/browse/E85XJD-51?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 3640e7590a..09281ed0f0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -71,7 +71,7 @@ MOGO_MODULE_GUIDESHOW_PROVIDER_VERSION=1.0.2-SNAPSHOT # 在线车辆F MOGO_MODULE_ONLINECAR_VERSION=1.0.3.2 # v2x -MOGO_MODULE_V2X_VERSION=1.1.36 +MOGO_MODULE_V2X_VERSION=1.1.37 # 推送 MOGO_MODULE_PUSH_VERSION=1.0.1 # 广告资源位 From 38c6fbbba264470ebc7e1e6e131836c62d191478 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Mon, 29 Jun 2020 10:49:04 +0800 Subject: [PATCH 05/19] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86V2X=E4=B8=AD?= =?UTF-8?q?=E8=BF=9D=E7=AB=A0=E5=81=9C=E8=BD=A6=E7=9A=84=E5=9F=8B=E7=82=B9?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/misc.xml | 2 +- gradle.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index 21e99e2dc0..cd77a1f062 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 09281ed0f0..ef49b73705 100644 --- a/gradle.properties +++ b/gradle.properties @@ -71,7 +71,7 @@ MOGO_MODULE_GUIDESHOW_PROVIDER_VERSION=1.0.2-SNAPSHOT # 在线车辆F MOGO_MODULE_ONLINECAR_VERSION=1.0.3.2 # v2x -MOGO_MODULE_V2X_VERSION=1.1.37 +MOGO_MODULE_V2X_VERSION=1.1.38 # 推送 MOGO_MODULE_PUSH_VERSION=1.0.1 # 广告资源位 From 31b530eea965715ed0cddb344082f9d0db0b0e19 Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Mon, 29 Jun 2020 14:15:02 +0800 Subject: [PATCH 06/19] opt --- .../mogo/module/apps/AppNavigatorPresenter.java | 2 +- .../com/mogo/module/apps/AppsListActivity.java | 1 + .../java/com/mogo/module/apps/model/AppsModel.java | 14 ++++++++------ 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppNavigatorPresenter.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppNavigatorPresenter.java index 7b39a6b5a3..de53733b66 100644 --- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppNavigatorPresenter.java +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppNavigatorPresenter.java @@ -40,7 +40,7 @@ public class AppNavigatorPresenter extends Presenter< AppNavigatorView > impleme AppServiceHandler.getApis().getRegisterCenterApi().registerMogoNaviListener( TAG, this ); if ( DebugConfig.isLauncher() ) { // 预加载应用列表，空间换时间 - AppsModel.getInstance( getContext() ).load( null ); +// AppsModel.getInstance( getContext() ).load( null ); } } diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsListActivity.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsListActivity.java index 34a738ac9e..80ad419ea4 100644 --- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsListActivity.java +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsListActivity.java @@ -113,6 +113,7 @@ public class AppsListActivity extends MvpActivity< AppsListView, AppsListPresent @Override protected void onDestroy() { super.onDestroy(); + AppsModel.getInstance( this ).release(); AppServiceHandler.getApis().getStatusManagerApi().setAppListUIShow( TAG, false ); mMogoFragmentManager.removeMainFragmentStackTransactionListener( this ); mMogoFragmentManager = null; diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/AppsModel.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/AppsModel.java index 7235c69ed9..ee047a2bb7 100644 --- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/AppsModel.java +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/AppsModel.java @@ -56,21 +56,23 @@ public class AppsModel { if ( mPagedApps != null ) { mPagedApps.clear(); } + mPagedApps = null; mContext = null; mAppFilter = null; sInstance = null; } public void load( AppLoadCallback callback ) { - if ( !mPagedApps.isEmpty() ) { - if ( callback != null ) { - callback.onLoaded( mPagedApps ); - } - return; - } +// if ( !mPagedApps.isEmpty() ) { +// if ( callback != null ) { +// callback.onLoaded( mPagedApps ); +// } +// return; +// } if ( mAppFilter == null ) { mAppFilter = new AppFilterImpl( mContext ); } + mPagedApps.clear(); final PackageManager packageManager = mContext.getPackageManager(); List< PackageInfo > packages = packageManager.getInstalledPackages( 0 ); int counter = 0; From 21ced97bb79d0c5f3001ed7bea7167c2859c49c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Mon, 29 Jun 2020 14:46:17 +0800 Subject: [PATCH 07/19] =?UTF-8?q?=E5=8D=87=E7=BA=A7V2X=EF=BC=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=B8=BAgps=E9=80=9F=E5=BA=A6=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E8=BD=A6=E8=BE=86=E7=A7=BB=E5=8A=A8=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index ef49b73705..b0ea862a92 100644 --- a/gradle.properties +++ b/gradle.properties @@ -71,7 +71,7 @@ MOGO_MODULE_GUIDESHOW_PROVIDER_VERSION=1.0.2-SNAPSHOT # 在线车辆F MOGO_MODULE_ONLINECAR_VERSION=1.0.3.2 # v2x -MOGO_MODULE_V2X_VERSION=1.1.38 +MOGO_MODULE_V2X_VERSION=1.1.39 # 推送 MOGO_MODULE_PUSH_VERSION=1.0.1 # 广告资源位 From 997924b9dd6978ef8b6153597a9d0e4098f22e26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Mon, 29 Jun 2020 15:44:44 +0800 Subject: [PATCH 08/19] =?UTF-8?q?=E5=8D=87=E7=BA=A7V2X=EF=BC=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=B8=BAgps=E9=80=9F=E5=BA=A6=205?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index b0ea862a92..02e0ed90ff 100644 --- a/gradle.properties +++ b/gradle.properties @@ -71,7 +71,7 @@ MOGO_MODULE_GUIDESHOW_PROVIDER_VERSION=1.0.2-SNAPSHOT # 在线车辆F MOGO_MODULE_ONLINECAR_VERSION=1.0.3.2 # v2x -MOGO_MODULE_V2X_VERSION=1.1.39 +MOGO_MODULE_V2X_VERSION=1.1.40 # 推送 MOGO_MODULE_PUSH_VERSION=1.0.1 # 广告资源位 From 0375d7a8d8ba7ff9ed478173c1a76ef93a6f202a Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Mon, 29 Jun 2020 15:45:36 +0800 Subject: [PATCH 09/19] opt --- .../module/apps/AppNavigatorPresenter.java | 2 +- .../mogo/module/apps/AppsListActivity.java | 1 - .../com/mogo/module/apps/AppsPresenter.java | 31 ++++++++++++++++++- .../com/mogo/module/apps/model/AppInfo.java | 18 ++++++++++- .../com/mogo/module/apps/model/AppsModel.java | 13 ++++---- .../src/main/res/layout/view_map_marker.xml | 6 ++-- .../main/res/layout/view_map_marker_info.xml | 4 +-- .../src/main/res/values-xhdpi/dimens.xml | 4 +-- .../src/main/res/values/dimens.xml | 4 +-- 9 files changed, 63 insertions(+), 20 deletions(-) diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppNavigatorPresenter.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppNavigatorPresenter.java index de53733b66..7b39a6b5a3 100644 --- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppNavigatorPresenter.java +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppNavigatorPresenter.java @@ -40,7 +40,7 @@ public class AppNavigatorPresenter extends Presenter< AppNavigatorView > impleme AppServiceHandler.getApis().getRegisterCenterApi().registerMogoNaviListener( TAG, this ); if ( DebugConfig.isLauncher() ) { // 预加载应用列表，空间换时间 -// AppsModel.getInstance( getContext() ).load( null ); + AppsModel.getInstance( getContext() ).load( null ); } } diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsListActivity.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsListActivity.java index 80ad419ea4..34a738ac9e 100644 --- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsListActivity.java +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsListActivity.java @@ -113,7 +113,6 @@ public class AppsListActivity extends MvpActivity< AppsListView, AppsListPresent @Override protected void onDestroy() { super.onDestroy(); - AppsModel.getInstance( this ).release(); AppServiceHandler.getApis().getStatusManagerApi().setAppListUIShow( TAG, false ); mMogoFragmentManager.removeMainFragmentStackTransactionListener( this ); mMogoFragmentManager = null; diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsPresenter.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsPresenter.java index 942568fc7f..87d43203e1 100644 --- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsPresenter.java +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsPresenter.java @@ -80,6 +80,11 @@ public class AppsPresenter extends Presenter< AppsView > { Logger.d( TAG, "apps: %s", appInfoList ); final Map< Integer, List< AppInfo > > result = addOthersEntrances( appInfoList ); + try { + filterSamePackage( result ); + } catch ( Exception e ) { + Logger.e( TAG, e, "error." ); + } UiThreadHandler.post( () -> { if ( mView != null ) { mView.renderApps( result ); @@ -143,7 +148,7 @@ public class AppsPresenter extends Presenter< AppsView > { } } } -// growthCapacity( result ); +// growthCapacity( result ) // // 添加介绍入口 // result.get( result.size() - 1 ).add( new AppInfo( GuideShowLauncher.APP_INFO_NAME_GUIDE_SHOW, getContext().getPackageName(), null, 0, null, R.drawable.module_apps_ic_guide_show ) ); if ( DebugConfig.isDebug() ) { @@ -154,6 +159,30 @@ public class AppsPresenter extends Presenter< AppsView > { return result; } + private void filterSamePackage( Map< Integer, List< AppInfo > > appInfoMap ) { + if ( appInfoMap == null || appInfoMap.isEmpty() ) { + return; + } + for ( Map.Entry< Integer, List< AppInfo > > integerListEntry : appInfoMap.entrySet() ) { + if ( integerListEntry == null ) { + continue; + } + List< AppInfo > oldList = integerListEntry.getValue(); + if ( oldList == null + || oldList.size() > AppsConst.TOTAL_SIZE_EACH_PAGE ) { + return; + } + List< AppInfo > appInfos = new ArrayList<>(); + for ( AppInfo appInfo : oldList ) { + if ( appInfos.contains( appInfo ) ) { + continue; + } + appInfos.add( appInfo ); + } + integerListEntry.setValue( appInfos ); + } + } + /** * 扩容 * diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/AppInfo.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/AppInfo.java index d9fddafb98..dae51ba27d 100644 --- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/AppInfo.java +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/AppInfo.java @@ -1,6 +1,9 @@ package com.mogo.module.apps.model; import android.graphics.drawable.Drawable; +import android.text.TextUtils; + +import java.util.Objects; /** * @author congtaowang @@ -29,7 +32,7 @@ public class AppInfo { } public AppInfo( String mName, String mPackageName, String mVersionName, int mVersionCode, Drawable mIcon, int mIconResId ) { - this(mName, mPackageName, mVersionName, mVersionCode, mIcon, mIconResId, 0); + this( mName, mPackageName, mVersionName, mVersionCode, mIcon, mIconResId, 0 ); } public int getIconResId() { @@ -60,6 +63,19 @@ public class AppInfo { return mTrackType; } + @Override + public boolean equals( Object o ) { + if ( this == o ) return true; + if ( o == null || getClass() != o.getClass() ) return false; + AppInfo appInfo = ( AppInfo ) o; + return TextUtils.equals( mPackageName, appInfo.mPackageName ); + } + + @Override + public int hashCode() { + return Objects.hash( mPackageName ); + } + @Override public String toString() { return "AppInfo{" + diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/AppsModel.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/AppsModel.java index ee047a2bb7..61c55a981d 100644 --- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/AppsModel.java +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/AppsModel.java @@ -63,16 +63,15 @@ public class AppsModel { } public void load( AppLoadCallback callback ) { -// if ( !mPagedApps.isEmpty() ) { -// if ( callback != null ) { -// callback.onLoaded( mPagedApps ); -// } -// return; -// } + if ( !mPagedApps.isEmpty() ) { + if ( callback != null ) { + callback.onLoaded( mPagedApps ); + } + return; + } if ( mAppFilter == null ) { mAppFilter = new AppFilterImpl( mContext ); } - mPagedApps.clear(); final PackageManager packageManager = mContext.getPackageManager(); List< PackageInfo > packages = packageManager.getInstalledPackages( 0 ); int counter = 0; diff --git a/modules/mogo-module-service/src/main/res/layout/view_map_marker.xml b/modules/mogo-module-service/src/main/res/layout/view_map_marker.xml index 3ba8e4a5cf..7651639cf3 100644 --- a/modules/mogo-module-service/src/main/res/layout/view_map_marker.xml +++ b/modules/mogo-module-service/src/main/res/layout/view_map_marker.xml @@ -17,11 +17,11 @@ + tools:src="@drawable/icon_map_marker_road_block_up2" /> diff --git a/modules/mogo-module-service/src/main/res/layout/view_map_marker_info.xml b/modules/mogo-module-service/src/main/res/layout/view_map_marker_info.xml index 028892962e..444e398c97 100644 --- a/modules/mogo-module-service/src/main/res/layout/view_map_marker_info.xml +++ b/modules/mogo-module-service/src/main/res/layout/view_map_marker_info.xml @@ -32,8 +32,8 @@ 8dp 100px 117px - 50px - 50px + 60px + 60px 8px diff --git a/modules/mogo-module-service/src/main/res/values/dimens.xml b/modules/mogo-module-service/src/main/res/values/dimens.xml index 03b1e6650a..6faf47f1e0 100644 --- a/modules/mogo-module-service/src/main/res/values/dimens.xml +++ b/modules/mogo-module-service/src/main/res/values/dimens.xml @@ -4,8 +4,8 @@ 4dp 56px 65px - 27px - 27px + 35px + 35px 4px 550px From 146ad163687ecd0d538c4d6fbf849c1f00d05532 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Mon, 29 Jun 2020 16:04:32 +0800 Subject: [PATCH 10/19] =?UTF-8?q?=E5=8D=87=E7=BA=A7V2X=EF=BC=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=B8=BAgps=E9=80=9F=E5=BA=A6=205?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 02e0ed90ff..992c13b82a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -71,7 +71,7 @@ MOGO_MODULE_GUIDESHOW_PROVIDER_VERSION=1.0.2-SNAPSHOT # 在线车辆F MOGO_MODULE_ONLINECAR_VERSION=1.0.3.2 # v2x -MOGO_MODULE_V2X_VERSION=1.1.40 +MOGO_MODULE_V2X_VERSION=1.1.41 # 推送 MOGO_MODULE_PUSH_VERSION=1.0.1 # 广告资源位 From 269d8aeab84f4407fa1fd6017936130ecc5711be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Mon, 29 Jun 2020 16:33:22 +0800 Subject: [PATCH 11/19] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=81=9C=E8=BD=A6?= =?UTF-8?q?=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 992c13b82a..c2bf111f40 100644 --- a/gradle.properties +++ b/gradle.properties @@ -71,7 +71,7 @@ MOGO_MODULE_GUIDESHOW_PROVIDER_VERSION=1.0.2-SNAPSHOT # 在线车辆F MOGO_MODULE_ONLINECAR_VERSION=1.0.3.2 # v2x -MOGO_MODULE_V2X_VERSION=1.1.41 +MOGO_MODULE_V2X_VERSION=1.1.42 # 推送 MOGO_MODULE_PUSH_VERSION=1.0.1 # 广告资源位 From 10f5fab86dd2a69c0521761cc319561e6563d3e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Mon, 29 Jun 2020 17:43:01 +0800 Subject: [PATCH 12/19] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=80=9F=E5=BA=A6?= =?UTF-8?q?=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index c2bf111f40..d6f97c1b24 100644 --- a/gradle.properties +++ b/gradle.properties @@ -71,7 +71,7 @@ MOGO_MODULE_GUIDESHOW_PROVIDER_VERSION=1.0.2-SNAPSHOT # 在线车辆F MOGO_MODULE_ONLINECAR_VERSION=1.0.3.2 # v2x -MOGO_MODULE_V2X_VERSION=1.1.42 +MOGO_MODULE_V2X_VERSION=1.1.43 # 推送 MOGO_MODULE_PUSH_VERSION=1.0.1 # 广告资源位 From 86dfe9416775c2d3f73cdd4f0dd89d79aef5255b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Mon, 29 Jun 2020 18:05:29 +0800 Subject: [PATCH 13/19] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=80=9F=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index d6f97c1b24..0d59a17e45 100644 --- a/gradle.properties +++ b/gradle.properties @@ -71,7 +71,7 @@ MOGO_MODULE_GUIDESHOW_PROVIDER_VERSION=1.0.2-SNAPSHOT # 在线车辆F MOGO_MODULE_ONLINECAR_VERSION=1.0.3.2 # v2x -MOGO_MODULE_V2X_VERSION=1.1.43 +MOGO_MODULE_V2X_VERSION=1.1.44 # 推送 MOGO_MODULE_PUSH_VERSION=1.0.1 # 广告资源位 From d351d527eee4d3e307a5928c1087096f2fd82ba0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Mon, 29 Jun 2020 18:10:00 +0800 Subject: [PATCH 14/19] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AD=98=E5=82=A8?= =?UTF-8?q?=EF=BC=8C=E5=A4=A7=E5=B0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 0d59a17e45..fb382210a5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -71,7 +71,7 @@ MOGO_MODULE_GUIDESHOW_PROVIDER_VERSION=1.0.2-SNAPSHOT # 在线车辆F MOGO_MODULE_ONLINECAR_VERSION=1.0.3.2 # v2x -MOGO_MODULE_V2X_VERSION=1.1.44 +MOGO_MODULE_V2X_VERSION=1.1.45 # 推送 MOGO_MODULE_PUSH_VERSION=1.0.1 # 广告资源位 From 972b6b0ab03261196bf15378ac48c71018b1faf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Mon, 29 Jun 2020 19:27:42 +0800 Subject: [PATCH 15/19] =?UTF-8?q?=E5=8D=87=E7=BA=A7V2X=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E4=BA=86=20=E3=80=90=E8=BF=9D=E7=AB=A0=E9=AB=98=E5=8F=91?= =?UTF-8?q?=E5=9C=B0=E3=80=91=E3=80=90=E8=B7=AF=E6=B5=8B=E3=80=91=E5=AE=9E?= =?UTF-8?q?=E8=BD=A6=E9=9D=99=E6=AD=A2=E7=8A=B6=E6=80=81=EF=BC=8C=E4=BB=8D?= =?UTF-8?q?=E4=BC=9A=E8=AF=AF=E8=A7=A6=E5=8F=91=E8=BF=9D=E7=AB=A0=E9=AB=98?= =?UTF-8?q?=E5=8F=91=E5=9C=B0=E5=9C=BA=E6=99=AF=20http://jira.zhidaohulian?= =?UTF-8?q?.com/browse/E85XJD-62?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index fb382210a5..f18e313818 100644 --- a/gradle.properties +++ b/gradle.properties @@ -71,7 +71,7 @@ MOGO_MODULE_GUIDESHOW_PROVIDER_VERSION=1.0.2-SNAPSHOT # 在线车辆F MOGO_MODULE_ONLINECAR_VERSION=1.0.3.2 # v2x -MOGO_MODULE_V2X_VERSION=1.1.45 +MOGO_MODULE_V2X_VERSION=1.1.46 # 推送 MOGO_MODULE_PUSH_VERSION=1.0.1 # 广告资源位 From 940b60fda7b908d29f40e88fb4bc7d2f57e6f4cd Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Mon, 29 Jun 2020 20:00:29 +0800 Subject: [PATCH 16/19] fixed bug --- gradle.properties | 2 +- .../src/main/java/com/mogo/module/share/ShareControl.java | 2 +- .../java/com/mogo/module/share/dialog/LaucherShareDialog.java | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index f18e313818..812587a61d 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.9 +MOGO_MODULE_SHARE_VERSION=1.2.1.10 MOGO_MODULE_COMMON_VERSION=1.2.1.9 MOGO_MODULE_MAIN_VERSION=1.2.1.9 MOGO_MODULE_MAP_VERSION=1.2.1.9 diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareControl.java b/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareControl.java index fabec3de0d..813a7e9252 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareControl.java +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareControl.java @@ -295,7 +295,7 @@ public class ShareControl implements IMogoShareManager, IMogoIntentListener, IMo private void trackVoiceWithType(String type){ Map properties = new HashMap<>(); properties.put("type",type); - properties.put("from","2"); + properties.put("from","1"); AnalyticsUtils.track("v2x_share_type",properties); } diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java b/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java index 30154abf9e..0a2e936abb 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java @@ -144,6 +144,7 @@ public class LaucherShareDialog extends BaseFloatDialog implements View.OnClickL // 事故 Logger.d(TAG,"点击事故"); sendShareReceiver(ShareConstants.TYPE_ACCIDENT); + trackWithType(ShareConstants.TYPE_ACCIDENT); dismiss(); } else if (id == R.id.tvConstruction) { // 道路施工 @@ -155,6 +156,7 @@ public class LaucherShareDialog extends BaseFloatDialog implements View.OnClickL // 实时路况 Logger.d(TAG,"点击实时路况"); sendShareReceiver(ShareConstants.TYPE_REAL_TIME_TRAFFIC); + trackWithType(ShareConstants.TYPE_REAL_TIME_TRAFFIC); dismiss(); } else if (id == R.id.tvStagnantWater) { // 道路积水 From 2ec7dc111f9c7b67fbebb452bdd5bd30cf2e1aed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Mon, 29 Jun 2020 20:04:49 +0800 Subject: [PATCH 17/19] =?UTF-8?q?=E5=8D=87=E7=BA=A7V2X=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E4=BA=86=20=E3=80=90=E8=BF=9D=E7=AB=A0=E9=AB=98=E5=8F=91?= =?UTF-8?q?=E5=9C=B0=E3=80=91=E5=85=B3=E9=97=AD=E6=B5=AE=E7=AA=97=E5=90=8E?= =?UTF-8?q?=EF=BC=8C=E8=87=AA=E5=8A=A8=E5=BC=B9=E5=87=BA=E7=9A=84=E6=B5=AE?= =?UTF-8?q?=E7=AA=97=E4=B8=8D=E4=BC=9A=E5=9C=A820s=E5=90=8E=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E6=B6=88=E5=A4=B1=20http://jira.zhidaohulian.com/brow?= =?UTF-8?q?se/E85XJD-49?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index f18e313818..d0dbeceb89 100644 --- a/gradle.properties +++ b/gradle.properties @@ -71,7 +71,7 @@ MOGO_MODULE_GUIDESHOW_PROVIDER_VERSION=1.0.2-SNAPSHOT # 在线车辆F MOGO_MODULE_ONLINECAR_VERSION=1.0.3.2 # v2x -MOGO_MODULE_V2X_VERSION=1.1.46 +MOGO_MODULE_V2X_VERSION=1.1.47 # 推送 MOGO_MODULE_PUSH_VERSION=1.0.1 # 广告资源位 From dd5b152f6c3b960f3d07fb8396bac880df11f47d Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Mon, 29 Jun 2020 20:16:06 +0800 Subject: [PATCH 18/19] opt --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index a06d097f73..b7557966fa 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 From ac439dbb99c7ffab054fff07c355b3a90a5ed6f2 Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Tue, 30 Jun 2020 10:37:43 +0800 Subject: [PATCH 19/19] opt --- .../src/main/java/com/mogo/module/apps/AppFilterImpl.java | 4 ++++ modules/mogo-module-apps/src/main/res/values/strings.xml | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) 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..0043bcab25 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,6 +6,7 @@ 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.Arrays; import java.util.HashMap; @@ -29,6 +30,9 @@ public class AppFilterImpl implements AppFilter { 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" ); + } } } 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..822303fed7 100644 --- a/modules/mogo-module-apps/src/main/res/values/strings.xml +++ b/modules/mogo-module-apps/src/main/res/values/strings.xml @@ -13,7 +13,6 @@ com.android.browser com.android.providers.downloads.ui com.zhidao.guide.lock - com.android.settings com.android.calculator2 com.nwd.guidebookskin com.iflytek.inputmethod.pad