rebase problrm

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}",
 // 左侧面板空实现

core/function-impl/mogo-core-function-devatools/build.gradle

@@ -67,3 +67,5 @@ dependencies {
         implementation project(':core:mogo-core-data')
     }
 }
+
+apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString()

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

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,

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")
     }

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"));

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"
+
 }

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
      */

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

modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java

@@ -270,11 +270,6 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
 
         if (DebugConfig.isDebug()) {
 
-            mUploadRoadCondition.setOnLongClickListener(view -> {
-                mApis.getMogoMonitorApi().getMogoMonitorLog().showLogDebugDialog();
-                return true;
-            });
-
             mUserHeadImg.setOnLongClickListener(view -> {
                 if (groupFix.getVisibility() == View.VISIBLE) {
                     groupFix.setVisibility(View.GONE);

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服务
      *

services/mogo-service-api/src/main/java/com/mogo/service/monitor/IMogoMonitorLog.java

@@ -1,9 +0,0 @@
-package com.mogo.service.monitor;
-
-public interface IMogoMonitorLog {
-
-    /**
-     * 显示日志抓取窗口
-     */
-    void showLogDebugDialog();
-}

services/mogo-service-api/src/main/java/com/mogo/service/monitor/IMogoMonitorProvider.java

@@ -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();
-
-}

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);

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'