From 3be5391acaa85a20fe43601051b8289e00820a9d Mon Sep 17 00:00:00 2001 From: zhongchao Date: Sun, 8 Oct 2023 15:31:13 +0800 Subject: [PATCH] [6.1.0] add func of trace log enable and change the msgbox move to datacenter start --- .../mogo/eagle/core/function/DataCenterProvider.kt | 2 ++ .../DevaToolsProvider.kt | 4 ++++ .../trace/TraceManager.kt | 12 +++++++++++- .../core/function/hmi/ui/setting/DebugSettingView.kt | 11 +++++++++++ .../core/function/main/MainMoGoApplication.java | 2 -- .../src/main/res/layout/view_debug_setting.xml | 11 +++++++++++ .../function/api/devatools/IDevaToolsProvider.kt | 5 +++++ .../call/devatools/CallerDevaToolsManager.kt | 7 +++++++ gradle.properties | 2 +- 9 files changed, 52 insertions(+), 4 deletions(-) diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/DataCenterProvider.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/DataCenterProvider.kt index 5ec60c934b..2d6a69a955 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/DataCenterProvider.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/DataCenterProvider.kt @@ -4,6 +4,7 @@ import android.content.Context import com.alibaba.android.arouter.facade.annotation.Route import com.mogo.eagle.core.data.constants.MogoServicePaths import com.mogo.eagle.core.function.api.datacenter.IDataCenterProvider +import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager import com.mogo.eagle.core.function.datacenter.location.MoGoLocationDispatcher import com.mogo.eagle.core.function.datacenter.v2x.SpeedLimitDispatcher import com.mogo.eagle.core.function.datacenter.v2x.TrafficLightDispatcher @@ -18,6 +19,7 @@ class DataCenterProvider: IDataCenterProvider { MoGoLocationDispatcher.initListener() context?.let { + CallerMsgBoxManager.queryAllMessages(it) TrafficLightDispatcher.INSTANCE.initServer(it) SpeedLimitDispatcher.INSTANCE.initLimit(it) } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt index 821101bcb9..8c4130608a 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt @@ -240,6 +240,10 @@ class DevaToolsProvider : IDevaToolsProvider { traceManager.setTraceLogEnable(enable) } + override fun setTraceEnable(enable: Boolean) { + traceManager.setTraceEnable(enable) + } + override fun getTraceInfo(): HashMap { return traceManager.getTraceInfo() } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/trace/TraceManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/trace/TraceManager.kt index d42f41c25e..ecf880c9c6 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/trace/TraceManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/trace/TraceManager.kt @@ -13,6 +13,7 @@ import com.mogo.eagle.core.function.call.cloud.CallerCloudListenerManager import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsListenerManager import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_DEVA +import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr import com.mogo.eagle.core.utilcode.util.Utils import com.zhidao.loglib.call.LogInfoManagerFactory import com.zhidao.loglib.fw.FileWriteManager @@ -37,6 +38,7 @@ class TraceManager : IMoGoCloudListener, IMoGoAutopilotCarConfigListener { companion object { const val TAG = "TraceManager" + private const val TRACE_ENABLE = "TRACE_ENABLE" private const val DELAY_UPLOAD = 60 * 60 * 1000L val traceManager by lazy(LazyThreadSafetyMode.SYNCHRONIZED) { @@ -119,7 +121,11 @@ class TraceManager : IMoGoCloudListener, IMoGoAutopilotCarConfigListener { } CallerDevaToolsListenerManager.invokeDevaToolsFwThreadClose() } - delayUpload() + val traceEnable = SharedPrefsMgr.getInstance(context).getBoolean(TRACE_ENABLE,true) + FileWriteManager.getInstance().setCloseRecord(traceEnable) + if(traceEnable){ + delayUpload() + } init = true } @@ -136,6 +142,10 @@ class TraceManager : IMoGoCloudListener, IMoGoAutopilotCarConfigListener { FileWriteManager.getInstance().logger = enable } + fun setTraceEnable(enable: Boolean) { + FileWriteManager.getInstance().setCloseRecord(enable) + } + fun getTraceLogStatus(): Boolean { return FileWriteManager.getInstance().logger } 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 4aab1e39e6..57e0ff496f 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 @@ -66,6 +66,7 @@ import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager import com.mogo.eagle.core.function.hmi.R import com.mogo.eagle.core.function.hmi.ui.logcatch.ILogViewListener import com.mogo.eagle.core.function.hmi.ui.logcatch.LogInfoView +import com.mogo.eagle.core.function.hmi.ui.utils.HmiActionLog import com.mogo.eagle.core.utilcode.kotlin.currentPadding import com.mogo.eagle.core.utilcode.kotlin.lifecycleOwner import com.mogo.eagle.core.utilcode.kotlin.onClick @@ -1352,6 +1353,16 @@ internal class DebugSettingView @JvmOverloads constructor( mogoMapData.get()?.setDebugMode(isChecked) } + /** + * 设置是否开启pre check, true-打开，false-关闭 + */ + tbPreCheckEnable.isChecked = SharedPrefsMgr.getInstance(context).getBoolean("TRACE_ENABLE",true) + tbPreCheckEnable.setOnCheckedChangeListener { _, isChecked -> + HmiActionLog.hmiAction(TAG + "TRACE_ENABLE",isChecked) + SharedPrefsMgr.getInstance(context).putBoolean("TRACE_ENABLE",isChecked) + CallerDevaToolsManager.setTraceEnable(isChecked) + } + cbTraceLog.isChecked = CallerDevaToolsManager.getTraceLogStatus() //链路Log输出日志 cbTraceLog.setOnCheckedChangeListener { _, isChecked -> diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java index 8d24b5c6b2..8912c45ec6 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java @@ -46,8 +46,6 @@ public abstract class MainMoGoApplication extends AbsMogoApplication { initTipToast(); initModules(); - //todo - CallerMsgBoxManager.INSTANCE.queryAllMessages(this); } /** diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml index dd886db100..2fab2db75c 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml @@ -2099,6 +2099,17 @@ android:textOn="关闭「HD-MAP」Log" android:textSize="@dimen/dp_24" /> + +