From bbb5903a4e4fc202839dca00f885f93676e7dc7e Mon Sep 17 00:00:00 2001 From: zhongchao Date: Thu, 23 Dec 2021 18:33:15 +0800 Subject: [PATCH] rebase problrm --- ZD_README/README_VersionHistory.md | 3 --- .../mogo-core-function-devatools/build.gradle | 4 +++- .../logcatch/MogoLogCatchManager.kt | 2 +- .../hmi/ui/setting/DebugSettingView.kt | 4 ++++ .../mogo-core-function-main/build.gradle | 4 ++-- .../function/main/MainMoGoApplication.java | 3 +-- .../eagle/core/data/constants/MoGoConfig.kt | 3 +++ .../core/data/constants/MogoServicePaths.java | 7 ------- modules-back.txt | 0 modules.txt | 1 + .../extensions/entrance/EntranceFragment.java | 5 ----- .../module/monitor/log/MogoLogMonitor.java | 0 .../com/mogo/service/IMogoServiceApis.java | 8 -------- .../mogo/service/monitor/IMogoMonitorLog.java | 9 --------- .../service/monitor/IMogoMonitorProvider.java | 19 ------------------- .../mogo/service/impl/MogoServiceApis.java | 6 ------ settings.gradle | 9 ++++----- 17 files changed, 19 insertions(+), 68 deletions(-) delete mode 100644 modules-back.txt delete mode 100644 modules/mogo-module-monitor/src/main/java/com/zhidao/mogo/module/monitor/log/MogoLogMonitor.java delete mode 100644 services/mogo-service-api/src/main/java/com/mogo/service/monitor/IMogoMonitorLog.java delete mode 100644 services/mogo-service-api/src/main/java/com/mogo/service/monitor/IMogoMonitorProvider.java diff --git a/ZD_README/README_VersionHistory.md b/ZD_README/README_VersionHistory.md index 4386696855..320ac5c41c 100644 --- a/ZD_README/README_VersionHistory.md +++ b/ZD_README/README_VersionHistory.md @@ -38,7 +38,6 @@ com.mogo.eagle.core:network:${MOGO_CORE_SDK_VERSION} ```gradle MOGO_COMMONS_VERSION = 2.0.66 -tanluupload : "com.mogo.module:module-tanlu-upload:${MOGO_COMMONS_VERSION}", // modules moduleshare : "com.mogo.module:module-share:${MOGO_COMMONS_VERSION}", mogocommons : "com.mogo.commons:mogo-commons:${MOGO_COMMONS_VERSION}", @@ -70,8 +69,6 @@ modulesearch : "com.mogo.module:module-search:${MOGO_COMMONS_VER modulepush : "com.mogo.module:module-push:${MOGO_COMMONS_VERSION}", modulepushbase : "com.mogo.module:module-push-base:${MOGO_COMMONS_VERSION}", modulepushnoop : "com.mogo.module:module-push-noop:${MOGO_COMMONS_VERSION}", -// OBU -moduleobu : "com.mogo.module:module-obu:${MOGO_COMMONS_VERSION}", // 左侧面板 moduleleftpanel : "com.mogo.module:module-left-panel:${MOGO_COMMONS_VERSION}", // 左侧面板空实现 diff --git a/core/function-impl/mogo-core-function-devatools/build.gradle b/core/function-impl/mogo-core-function-devatools/build.gradle index 93b4fab3d8..f909f820b5 100644 --- a/core/function-impl/mogo-core-function-devatools/build.gradle +++ b/core/function-impl/mogo-core-function-devatools/build.gradle @@ -66,4 +66,6 @@ dependencies { implementation project(':core:mogo-core-function-call') implementation project(':core:mogo-core-data') } -} \ No newline at end of file +} + +apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString() \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcatch/MogoLogCatchManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcatch/MogoLogCatchManager.kt index 863ec94f7b..d9dfd1b9da 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcatch/MogoLogCatchManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcatch/MogoLogCatchManager.kt @@ -8,6 +8,7 @@ import com.mogo.cloud.passport.MoGoAiCloudClientConfig import com.mogo.commons.AbsMogoApplication import com.mogo.commons.debug.DebugConfig import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsListenerManager +import com.mogo.eagle.core.network.NetConfig import com.mogo.eagle.core.utilcode.mogo.toast.TipToast import com.mogo.eagle.core.utilcode.util.ThreadUtils import com.mogo.eagle.core.utilcode.util.TimeUtils @@ -15,7 +16,6 @@ import com.mogo.module.common.MogoApisHandler import com.mogo.service.cloud.socket.IMogoOnMessageListener import com.mogo.utils.logger.LogLevel import com.mogo.utils.logger.Logger -import com.mogo.utils.network.NetConfig import com.zhidao.loglib.bean.RemoteLogPushContent import com.zhidao.loglib.call.LogInfoManagerFactory import com.zhidao.loglib.core.ILogListener diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt index 624430853a..68c1ac2cb3 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt @@ -307,11 +307,15 @@ class DebugSettingView @JvmOverloads constructor( } } + tbLogCatch.isChecked = + SharedPrefsMgr.getInstance(context).getBoolean(MoGoConfig.CATCH_LOG,false) tbLogCatch.setOnCheckedChangeListener { _, isChecked -> if (isChecked) { CallerDevaToolsManager.startCatchLog() + SharedPrefsMgr.getInstance(context).putBoolean(MoGoConfig.CATCH_LOG, true) } else { CallerDevaToolsManager.stopCatchLog() + SharedPrefsMgr.getInstance(context).putBoolean(MoGoConfig.CATCH_LOG, false) } } CallerDevaToolsListenerManager.registerDevaToolsLogCatchListener(TAG, diff --git a/core/function-impl/mogo-core-function-main/build.gradle b/core/function-impl/mogo-core-function-main/build.gradle index 8c269a93ac..915fad70a1 100644 --- a/core/function-impl/mogo-core-function-main/build.gradle +++ b/core/function-impl/mogo-core-function-main/build.gradle @@ -70,7 +70,6 @@ dependencies { api rootProject.ext.dependencies.mogoservice api rootProject.ext.dependencies.moduleV2x api rootProject.ext.dependencies.moduleshare - api rootProject.ext.dependencies.mogomonitor api rootProject.ext.dependencies.moduleextensions api rootProject.ext.dependencies.modulemap api rootProject.ext.dependencies.moduleADAS @@ -94,6 +93,7 @@ dependencies { api rootProject.ext.dependencies.mogo_core_function_map api rootProject.ext.dependencies.mogo_core_function_v2x api rootProject.ext.dependencies.mogo_core_function_monitoring + api rootProject.ext.dependencies.mogo_core_function_devatools api rootProject.ext.dependencies.modulemain } else { @@ -103,7 +103,6 @@ dependencies { api project(':modules:mogo-module-service') api project(':modules:mogo-module-v2x') api project(':modules:mogo-module-share') - api project(':modules:mogo-module-monitor') api project(':modules:mogo-module-extensions') api project(':modules:mogo-module-map') api project(':modules:mogo-module-adas') @@ -127,6 +126,7 @@ dependencies { api project(':core:function-impl:mogo-core-function-notice') api project(':core:function-impl:mogo-core-function-v2x') api project(':core:function-impl:mogo-core-function-monitoring') + api project(':core:function-impl:mogo-core-function-devatools') api project(":modules:mogo-module-main") } diff --git a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java b/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java index e0647dec88..43fa7f62c0 100644 --- a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java +++ b/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java @@ -299,10 +299,9 @@ public abstract class MainMoGoApplication extends AbsMogoApplication { 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_GAODE_AIMLESS_SHARE, "GaoDeAimlessShare")); - MogoModulePaths.addBaseModule(new MogoModule(MogoServicePaths.PATH_MOGO_MONITOR, "MogoMonitor")); //mogo deva tools - MogoModulePaths.addBaseModule(new MogoModule(MogoServicePaths.PATH_DEVA_TOOLS, "IMoGoDevaToolsProvider")); + MogoModulePaths.addModuleFunctionServer(new MogoModule(MogoServicePaths.PATH_DEVA_TOOLS, "IMoGoDevaToolsProvider")); // 域控制器模块（新） MogoModulePaths.addModuleFunctionServer(new MogoModule(MogoServicePaths.PATH_AUTO_PILOT, "IMoGoAutoPilotProvider")); diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MoGoConfig.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MoGoConfig.kt index 386f0c21e5..68545f6b25 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MoGoConfig.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MoGoConfig.kt @@ -12,4 +12,7 @@ object MoGoConfig { // 域控制器 IP地址 const val AUTOPILOT_IP = "AUTOPILOT_IP" + // CMD全量日志抓取 + const val CATCH_LOG = "CATCH_LOG" + } \ No newline at end of file diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MogoServicePaths.java b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MogoServicePaths.java index 3ba3375cce..9870d74e40 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MogoServicePaths.java +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MogoServicePaths.java @@ -222,13 +222,6 @@ public class MogoServicePaths { @Deprecated public static final String PATH_AGREEMENT = "/agreement/showFragment"; - /** - * 日志上传 - */ - @Keep - @Deprecated - public static final String PATH_MOGO_MONITOR = "/monitor/api"; - /** * 探路api */ diff --git a/modules-back.txt b/modules-back.txt deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/modules.txt b/modules.txt index 82bfb58278..098f27631e 100644 --- a/modules.txt +++ b/modules.txt @@ -44,4 +44,5 @@ :core:function-impl:mogo-core-function-monitoring :core:function-impl:mogo-core-function-notice :core:function-impl:mogo-core-function-v2x +:core:function-impl:mogo-core-function-devatools :core:function-impl:mogo-core-function-main \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java index db86cc6ca5..b0ea525e4f 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java @@ -270,11 +270,6 @@ public class EntranceFragment extends MvpFragment { - mApis.getMogoMonitorApi().getMogoMonitorLog().showLogDebugDialog(); - return true; - }); - mUserHeadImg.setOnLongClickListener(view -> { if (groupFix.getVisibility() == View.VISIBLE) { groupFix.setVisibility(View.GONE); diff --git a/modules/mogo-module-monitor/src/main/java/com/zhidao/mogo/module/monitor/log/MogoLogMonitor.java b/modules/mogo-module-monitor/src/main/java/com/zhidao/mogo/module/monitor/log/MogoLogMonitor.java deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java b/services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java index cfc591106d..ba17ce6c05 100644 --- a/services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java +++ b/services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java @@ -21,7 +21,6 @@ import com.mogo.service.map.IMogoMapService; import com.mogo.service.module.IMogoActionManager; import com.mogo.service.module.IMogoMarkerService; import com.mogo.service.module.IMogoRegisterCenter; -import com.mogo.service.monitor.IMogoMonitorProvider; import com.mogo.service.network.IMogoNetwork; import com.mogo.service.obu.IMogoCrashWarnProvider; import com.mogo.service.share.IMogoShareManager; @@ -227,13 +226,6 @@ public interface IMogoServiceApis extends IProvider { */ IMogoTanluProvider getTanluApi(); - /** - * 获取Monitor相关api - * - * @return - */ - IMogoMonitorProvider getMogoMonitorApi(); - /** * 获取探路ui服务 * diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/monitor/IMogoMonitorLog.java b/services/mogo-service-api/src/main/java/com/mogo/service/monitor/IMogoMonitorLog.java deleted file mode 100644 index 7b302679c3..0000000000 --- a/services/mogo-service-api/src/main/java/com/mogo/service/monitor/IMogoMonitorLog.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.mogo.service.monitor; - -public interface IMogoMonitorLog { - - /** - * 显示日志抓取窗口 - */ - void showLogDebugDialog(); -} diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/monitor/IMogoMonitorProvider.java b/services/mogo-service-api/src/main/java/com/mogo/service/monitor/IMogoMonitorProvider.java deleted file mode 100644 index 7d04148976..0000000000 --- a/services/mogo-service-api/src/main/java/com/mogo/service/monitor/IMogoMonitorProvider.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.mogo.service.monitor; - -import android.content.Context; - -import com.alibaba.android.arouter.facade.template.IProvider; - -/** - * monitor接口 - * @author tongchenfei - */ -public interface IMogoMonitorProvider extends IProvider { - - /** - * 获取日志监控接口 - * @return - */ - IMogoMonitorLog getMogoMonitorLog(); - -} diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java b/services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java index a48b5e2482..f3c900cd2e 100644 --- a/services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java +++ b/services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java @@ -29,7 +29,6 @@ import com.mogo.service.map.IMogoMapService; import com.mogo.service.module.IMogoActionManager; import com.mogo.service.module.IMogoMarkerService; import com.mogo.service.module.IMogoRegisterCenter; -import com.mogo.service.monitor.IMogoMonitorProvider; import com.mogo.service.network.IMogoNetwork; import com.mogo.service.share.IMogoShareManager; import com.mogo.service.share.IMogoTanluProvider; @@ -196,11 +195,6 @@ public class MogoServiceApis implements IMogoServiceApis { return getApiInstance(IMogoTanluProvider.class, MogoServicePaths.PATH_TANLU_API); } - @Override - public IMogoMonitorProvider getMogoMonitorApi() { - return getApiInstance(IMogoMonitorProvider.class, MogoServicePaths.PATH_MOGO_MONITOR); - } - @Override public IMogoTanluUiProvider getTanluUiApi() { return getApiInstance(IMogoTanluUiProvider.class, MogoServicePaths.PATH_TANLU_UI_API); diff --git a/settings.gradle b/settings.gradle index 6f3360d90d..f11d232630 100644 --- a/settings.gradle +++ b/settings.gradle @@ -15,6 +15,10 @@ include ':core:mogo-core-network' include ':core:mogo-core-function-api' // 模块对外暴露等调用接口 include ':core:mogo-core-function-call' + +// deva开发工具套件 +include ':core:function-impl:mogo-core-function-devatools' + // 业务实现 // Main 应用主入口封装，在这里进行初始化应用 include ':core:function-impl:mogo-core-function-main' @@ -54,9 +58,6 @@ include ':libraries:map-autonavi' include ':libraries:mogo-map' // OLD业务模块 -include ':modules:tanlulib' -include ':modules:mogo-module-widgets' -include ':modules:mogo-module-obu' include ':modules:mogo-module-adas' include ':modules:mogo-module-map' include ':modules:mogo-module-common' @@ -84,5 +85,3 @@ include ':test:crashreport-bugly' include ':test:crashreport-noop' include ':test:crashreport-upgrade' -// deva开发工具套件 -include ':core:function-impl:mogo-core-function-devatools'