From aeffbbc9d39b98c4d2a01bd33cde2f9ca3594ee2 Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Mon, 13 Jul 2020 10:28:21 +0800 Subject: [PATCH 1/5] opt --- app/build.gradle | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 5a39c176c3..0b97a53e87 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -192,9 +192,6 @@ dependencies { implementation rootProject.ext.dependencies.guideshowprovider implementation rootProject.ext.dependencies.guideshow - implementation rootProject.ext.dependencies.modulepush, { - exclude group: 'com.mogo.module', module: 'module-common' - } implementation rootProject.ext.dependencies.moduleadcard implementation rootProject.ext.dependencies.moduleV2x From 02ea4f989fcd668828ba56ecc6064fef73bbf21b Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Mon, 13 Jul 2020 11:07:49 +0800 Subject: [PATCH 2/5] opt --- gradle.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index 2414240678..cf03246b94 100644 --- a/gradle.properties +++ b/gradle.properties @@ -73,9 +73,9 @@ MOGO_MODULE_ONLINECAR_VERSION=1.0.3.2 # v2x MOGO_MODULE_V2X_VERSION=1.1.53 # 推送 -MOGO_MODULE_PUSH_VERSION=1.1.5.2 -MOGO_MODULE_PUSH_BASE_VERSION=1.1.5.2 -MOGO_MODULE_PUSH_NOOP_VERSION=1.1.5.2 +MOGO_MODULE_PUSH_VERSION=1.1.5.4 +MOGO_MODULE_PUSH_BASE_VERSION=1.1.5.4 +MOGO_MODULE_PUSH_NOOP_VERSION=1.1.5.4 # 广告资源位 MOGO_MODULE_AD_CARD_VERSION=1.0.1 # 探路上报和分享模块 From ba0b9d2264604f1e272f67e856cf2ecece04c164 Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Mon, 13 Jul 2020 11:42:15 +0800 Subject: [PATCH 3/5] opt --- gradle.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index cf03246b94..8fb948eac3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -73,9 +73,9 @@ MOGO_MODULE_ONLINECAR_VERSION=1.0.3.2 # v2x MOGO_MODULE_V2X_VERSION=1.1.53 # 推送 -MOGO_MODULE_PUSH_VERSION=1.1.5.4 -MOGO_MODULE_PUSH_BASE_VERSION=1.1.5.4 -MOGO_MODULE_PUSH_NOOP_VERSION=1.1.5.4 +MOGO_MODULE_PUSH_VERSION=1.1.5.5 +MOGO_MODULE_PUSH_BASE_VERSION=1.1.5.5 +MOGO_MODULE_PUSH_NOOP_VERSION=1.1.5.5 # 广告资源位 MOGO_MODULE_AD_CARD_VERSION=1.0.1 # 探路上报和分享模块 From f03a4b6439c548f6486bcb8866b8d96b877f4ac8 Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Mon, 13 Jul 2020 17:15:37 +0800 Subject: [PATCH 4/5] opt --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 0b97a53e87..7e8007defa 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -25,7 +25,7 @@ android { externalNativeBuild { ndk { // 设置支持的SO库架构 - abiFilters 'armeabi-v7a','x86' + abiFilters 'armeabi-v7a' } } } From 8d3ee2dee2188416e11c6f4f4d337393f8ff878a Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Mon, 13 Jul 2020 17:54:25 +0800 Subject: [PATCH 5/5] opt: homekey down close adas at independent app --- .../src/main/java/com/mogo/module/main/MainActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java index 5ec6d71509..b42f31f3c3 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java @@ -237,7 +237,7 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme super.onPause(); mMogoStatusManager.setMainPageResumeStatus( TAG, false ); mMogoStatusManager.setMainPageLaunchedStatus( TAG, false ); - if ( !mIsHomeKeyDown ) { + if ( !mIsHomeKeyDown || !DebugConfig.isLauncher() ) { mServiceApis.getAdasControllerApi().closeADAS(); } mIsHomeKeyDown = false;