diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index 3fb454d61e..6c241e16fd 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -76,6 +76,7 @@ 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_STRATEGY_SHARE,"StrategyShare")); + 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/main-extensions/mogo-module-main-independent/src/main/res/values/strings.xml b/main-extensions/mogo-module-main-independent/src/main/res/values/strings.xml new file mode 100644 index 0000000000..472f7c8136 --- /dev/null +++ b/main-extensions/mogo-module-main-independent/src/main/res/values/strings.xml @@ -0,0 +1,4 @@ + + + 应用不支持分屏 + \ No newline at end of file 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 b61b845b08..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,9 +48,11 @@ 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); + startRemoteCtrl(); } private void startRemoteCtrl(){ @@ -68,7 +70,6 @@ public class MogoMonitorProvider implements IMogoMonitorProvider, this.context = context; logDebugDialog = new LogDebugDialog(context); logDebugDialog.setDialogListener(this); - startRemoteCtrl(); } @Override