From c73541dd1070af4fc9abaea8c7c44b793e1922e3 Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Thu, 20 Aug 2020 15:30:50 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0Monitor=E4=B8=BABaseModul?= =?UTF-8?q?e?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/mogo/launcher/MogoApplication.java | 2 ++ .../com/zhidao/mogo/module/monitor/MogoMonitorProvider.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index 9fe3dd3a05..ce003d4ca1 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -75,6 +75,8 @@ public class MogoApplication extends AbsMogoApplication { MogoModulePaths.addBaseModule( new MogoModule( ServiceConst.PATH_REFRESH_STRATEGY, ServiceConst.PATH_REFRESH_STRATEGY ) ); MogoModulePaths.addBaseModule( new MogoModule( V2XConst.PATH_V2X_UI, V2XConst.MODULE_NAME ) ); + MogoModulePaths.addBaseModule(new MogoModule(MogoServicePaths.PATH_MOGO_MONITOR, + "MogoMonitor")); MogoModulePaths.addModule( new MogoModule( V2XConst.PATH_EVENT_PANEL, V2XConst.MODULE_NAME_EVENT_PANEL ) ); MogoModulePaths.addModule( new MogoModule( PushUIConstants.PATH, PushUIConstants.NAME ) ); diff --git a/modules/mogo-module-monitor/src/main/java/com/zhidao/mogo/module/monitor/MogoMonitorProvider.java b/modules/mogo-module-monitor/src/main/java/com/zhidao/mogo/module/monitor/MogoMonitorProvider.java index b61b845b08..593592baca 100644 --- a/modules/mogo-module-monitor/src/main/java/com/zhidao/mogo/module/monitor/MogoMonitorProvider.java +++ b/modules/mogo-module-monitor/src/main/java/com/zhidao/mogo/module/monitor/MogoMonitorProvider.java @@ -51,6 +51,7 @@ public class MogoMonitorProvider implements IMogoMonitorProvider, IMogoServiceApis apis = (IMogoServiceApis) ARouter.getInstance().build(MogoServicePaths.PATH_SERVICE_APIS).navigation(context); apis.getSocketManagerApi(context).registerOnMessageListener(MogoMonitorConst.LOG_PUSH_TYPE, this); + startRemoteCtrl(); } private void startRemoteCtrl(){ @@ -68,7 +69,6 @@ public class MogoMonitorProvider implements IMogoMonitorProvider, this.context = context; logDebugDialog = new LogDebugDialog(context); logDebugDialog.setDialogListener(this); - startRemoteCtrl(); } @Override From 19a9e52612dd6f8a36827b67fc7a053d916a882e Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Thu, 20 Aug 2020 16:58:55 +0800 Subject: [PATCH 2/2] crash fix --- .../src/main/java/com/mogo/module/main/MainActivity.java | 6 +++--- .../com/zhidao/mogo/module/monitor/MogoMonitorProvider.java | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) 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 7975e3c195..0c97508d87 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 @@ -174,9 +174,9 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme } ); // 初始化MonitorModule - IMogoMonitorProvider monitorProvider = (IMogoMonitorProvider) ARouter.getInstance().build(MogoServicePaths.PATH_MOGO_MONITOR).navigation(this); - monitorProvider.resetActivityContext(this); - +// IMogoMonitorProvider monitorProvider = (IMogoMonitorProvider) ARouter.getInstance().build(MogoServicePaths.PATH_MOGO_MONITOR).navigation(this); +// monitorProvider.resetActivityContext(this); + mServiceApis.getMogoMonitorApi().resetActivityContext(this); } private void startBaseService() { diff --git a/modules/mogo-module-monitor/src/main/java/com/zhidao/mogo/module/monitor/MogoMonitorProvider.java b/modules/mogo-module-monitor/src/main/java/com/zhidao/mogo/module/monitor/MogoMonitorProvider.java index 593592baca..133fd25bd5 100644 --- a/modules/mogo-module-monitor/src/main/java/com/zhidao/mogo/module/monitor/MogoMonitorProvider.java +++ b/modules/mogo-module-monitor/src/main/java/com/zhidao/mogo/module/monitor/MogoMonitorProvider.java @@ -48,6 +48,7 @@ public class MogoMonitorProvider implements IMogoMonitorProvider, @Override public void init(Context context) { + this.context = context; IMogoServiceApis apis = (IMogoServiceApis) ARouter.getInstance().build(MogoServicePaths.PATH_SERVICE_APIS).navigation(context); apis.getSocketManagerApi(context).registerOnMessageListener(MogoMonitorConst.LOG_PUSH_TYPE, this);