From 11ed44729c8dd71da764da255df20c456ad95336 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Wed, 6 Apr 2022 19:29:36 +0800 Subject: [PATCH] add log version --- app/build.gradle | 2 +- .../DevaToolsProvider.kt | 4 ++++ .../trace/TraceManager.kt | 6 +++++- .../hmi/ui/setting/DebugSettingView.kt | 1 + .../api/devatools/IDevaToolsProvider.kt | 5 +++++ .../call/devatools/CallerDevaToolsManager.kt | 18 +++++++++++++----- gradle.properties | 2 +- 7 files changed, 30 insertions(+), 8 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 959e4e5d3b..68f2bc1df2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -19,7 +19,7 @@ if (!isAndroidTestBuild()) { apply plugin: 'chain.log.hook' hooklog{ enableTraceToServer false - enableLoggerToLocal false + enableLoggerToLocal true } } 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 e3cca9363a..19bbea383e 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 @@ -44,6 +44,10 @@ class DevaToolsProvider : IDevaToolsProvider { MogoLogCatchManager.stopCatchLog(logPrefixName) } + override fun getTraceLogStatus(): Boolean { + return traceManager.getTraceLogStatus() + } + override fun setTraceLogEnable(enable: Boolean) { traceManager.setTraceLogEnable(enable) } 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 ab0db00e83..96f33d80d6 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 @@ -59,7 +59,11 @@ class TraceManager { } fun setTraceLogEnable(enable:Boolean){ - FileWriteManager.getInstance().setLogger(enable) + FileWriteManager.getInstance().logger = enable + } + + fun getTraceLogStatus():Boolean{ + return FileWriteManager.getInstance().logger } fun getTraceInfo(): HashMap { 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 e9ce3fbaaf..7c5be114e4 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 @@ -1006,6 +1006,7 @@ class DebugSettingView @JvmOverloads constructor( } } + cbTraceLog.isChecked = CallerDevaToolsManager.getTraceLogStatus() //链路Log输出日志 cbTraceLog.setOnCheckedChangeListener { _, isChecked -> CallerDevaToolsManager.setTraceLogEnable(isChecked) diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/IDevaToolsProvider.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/IDevaToolsProvider.kt index 137e8f7cf6..ab690871e0 100644 --- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/IDevaToolsProvider.kt +++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/IDevaToolsProvider.kt @@ -29,6 +29,11 @@ interface IDevaToolsProvider : IProvider { */ fun stopLogCatch(logPrefixName: String?) + /** + * 获取TraceLog状态 + */ + fun getTraceLogStatus():Boolean + /** * 设置链路日志是否开启 */ diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/devatools/CallerDevaToolsManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/devatools/CallerDevaToolsManager.kt index b05c4dc12f..527c0ec6d2 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/devatools/CallerDevaToolsManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/devatools/CallerDevaToolsManager.kt @@ -18,7 +18,7 @@ object CallerDevaToolsManager { MogoServicePaths.PATH_DEVA_TOOLS ) - fun init(context: Context){ + fun init(context: Context) { devaToolsProviderApi?.init(context) } @@ -40,7 +40,7 @@ object CallerDevaToolsManager { /** * 停止抓取全量日志 */ - fun stopCatchLog(logPrefixName:String? = null) { + fun stopCatchLog(logPrefixName: String? = null) { devaToolsProviderApi?.stopLogCatch(logPrefixName) } @@ -51,10 +51,18 @@ object CallerDevaToolsManager { devaToolsProviderApi?.refreshTraceInfo(map) } + fun getTraceLogStatus(): Boolean { + return if (devaToolsProviderApi != null) { + devaToolsProviderApi!!.getTraceLogStatus() + } else { + false + } + } + /** * 链路Log输出日志开关 */ - fun setTraceLogEnable(enable:Boolean){ + fun setTraceLogEnable(enable: Boolean) { devaToolsProviderApi?.setTraceLogEnable(enable) } @@ -125,7 +133,7 @@ object CallerDevaToolsManager { /** * 下载指定包 */ - fun downLoadPackage(downloadKey: String,downloadUrl: String) { - devaToolsProviderApi?.downLoadPackage(downloadKey,downloadUrl) + fun downLoadPackage(downloadKey: String, downloadUrl: String) { + devaToolsProviderApi?.downLoadPackage(downloadKey, downloadUrl) } } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 65cb4f7d18..4f7a8a0de8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -60,7 +60,7 @@ HOOK_LOG_VERSION=1.6.1 SERVICE_CHAIN_VERSION=1.1.0 ################ 外部依赖引用 ################ # loglib -LOGLIB_VERSION=1.2.29 +LOGLIB_VERSION=1.2.30 ######## MogoAiCloudSDK Version ######## # 网络请求LOGLIB_VERSION MOGO_NETWORK_VERSION=1.3.51