From 1bf436d8267386f5c701bd382252033d8676cd4f Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Fri, 31 Jul 2020 12:29:53 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E8=A7=A3=E5=86=B3push=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 2 +- .../main/java/com/mogo/module/apps/AppsListActivity.java | 5 +++++ .../main/java/com/mogo/module/apps/AppsListPresenter.java | 6 ++++++ .../src/main/java/com/mogo/module/apps/AppsListView.java | 2 ++ .../mogo-module-extensions/src/main/res/values/strings.xml | 2 +- 5 files changed, 15 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 316601007d..105d223f6c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -73,7 +73,7 @@ MOGO_MODULE_ONLINECAR_VERSION=1.0.3.2 # v2x MOGO_MODULE_V2X_VERSION=1.1.534 # 推送 -MOGO_MODULE_PUSH_VERSION=1.1.5.7 +MOGO_MODULE_PUSH_VERSION=1.1.6 MOGO_MODULE_PUSH_BASE_VERSION=1.1.5.5 MOGO_MODULE_PUSH_NOOP_VERSION=1.1.5.6 # 广告资源位 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 fbaae3255b..1adc5272ea 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 @@ -129,6 +129,11 @@ public class AppsListActivity extends MvpActivity< AppsListView, AppsListPresent overridePendingTransition( R.anim.module_apps_anim_enter, R.anim.module_apps_anim_exit ); } + @Override + public void executeFinish() { + finish(); + } + @Override protected void onDestroy() { super.onDestroy(); diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsListPresenter.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsListPresenter.java index caf44c1c72..0ad09a3b10 100644 --- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsListPresenter.java +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsListPresenter.java @@ -13,6 +13,7 @@ import com.mogo.commons.voice.IMogoVoiceCmdCallBack; import com.mogo.service.MogoServicePaths; import com.mogo.service.intent.IMogoIntentListener; import com.mogo.service.intent.IMogoIntentManager; +import com.mogo.utils.logger.Logger; import org.json.JSONException; import org.json.JSONObject; @@ -38,6 +39,7 @@ public class AppsListPresenter extends Presenter< AppsListView > implements IMog super.onCreate( owner ); mIntentManager = ( IMogoIntentManager ) ARouter.getInstance().build( MogoServicePaths.PATH_INTENT_MANAGER ).navigation( getContext() ); mIntentManager.registerIntentListener( AppsConst.COMMAND_OPERATION, this ); + mIntentManager.registerIntentListener( Intent.ACTION_CLOSE_SYSTEM_DIALOGS, this ); AIAssist.getInstance( getContext() ).registerUnWakeupCommand( AppsConst.CMD_UN_WAKE_CLOSE_APP_LIST, AppsConst.CMD_UN_WAKE_WORDS_CLOSE_APP_LIST, this ); } @@ -56,6 +58,9 @@ public class AppsListPresenter extends Presenter< AppsListView > implements IMog } catch ( JSONException e ) { e.printStackTrace(); } + } else if ( Intent.ACTION_CLOSE_SYSTEM_DIALOGS.equals( intentStr ) ) { + Logger.d( TAG, "home 键导致 app 列表关闭" ); + mView.executeFinish(); } } @@ -90,6 +95,7 @@ public class AppsListPresenter extends Presenter< AppsListView > implements IMog public void onDestroy( @NonNull LifecycleOwner owner ) { super.onDestroy( owner ); mIntentManager.unregisterIntentListener( AppsConst.COMMAND_OPERATION, this ); + mIntentManager.unregisterIntentListener( Intent.ACTION_CLOSE_SYSTEM_DIALOGS, this ); AIAssist.getInstance( getContext() ).unregisterUnWakeupCommand( AppsConst.CMD_UN_WAKE_CLOSE_APP_LIST ); } } diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsListView.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsListView.java index d3ec317ed7..ee38e7c05d 100644 --- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsListView.java +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsListView.java @@ -11,4 +11,6 @@ import com.mogo.commons.mvp.IView; public interface AppsListView extends IView { void closeAppsPanel(); + + void executeFinish(); } diff --git a/modules/mogo-module-extensions/src/main/res/values/strings.xml b/modules/mogo-module-extensions/src/main/res/values/strings.xml index def8fbcd0e..bcfcbae52f 100644 --- a/modules/mogo-module-extensions/src/main/res/values/strings.xml +++ b/modules/mogo-module-extensions/src/main/res/values/strings.xml @@ -13,7 +13,7 @@ 周五 周六 - ··· + 99+ 搜索目的地 分享