From 336b752a54ca86a0c37134bde441be7f642439fd Mon Sep 17 00:00:00 2001
From: zhongchao <zhongchao@zhidaoauto.com>
Date: Tue, 15 Mar 2022 10:50:57 +0800
Subject: [PATCH] change some logger logic

---
 .../function/monitoring/CronTaskManager.kt     |  4 ++--
 .../core/utilcode/mogo/logger/CallerLogger.kt  | 16 ++++++++--------
 .../core/utilcode/mogo/logger/scene/Scene.kt   | 18 ++++++++++++------
 .../mogo/logger/scene/SceneConstant.kt         |  2 +-
 4 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function/monitoring/CronTaskManager.kt b/core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function/monitoring/CronTaskManager.kt
index f7c780b33e..9655114b70 100644
--- a/core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function/monitoring/CronTaskManager.kt
+++ b/core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function/monitoring/CronTaskManager.kt
@@ -105,7 +105,7 @@ class CronTaskManager(private var context: Context?) {
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe({
                     cameraList = it
-                    CallerLogger.d("$M_MONITOR$TAG", "requestDeviceList返回结果为：$it")
+//                    CallerLogger.d("$M_MONITOR$TAG", "requestDeviceList返回结果为：$it")
                 }, {
                     it.printStackTrace()
                     CallerLogger.e(
@@ -138,7 +138,7 @@ class CronTaskManager(private var context: Context?) {
                     .observeOn(AndroidSchedulers.mainThread())
                     .subscribe({
                         carCameraList = it
-                        CallerLogger.d("$M_MONITOR$TAG", "requestCarCameraList返回结果为：$it")
+//                        CallerLogger.d("$M_MONITOR$TAG", "requestCarCameraList返回结果为：$it")
                     }, {
                         CallerLogger.e(
                             "$M_MONITOR$TAG",
diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/logger/CallerLogger.kt b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/logger/CallerLogger.kt
index 4ff1f03247..7bd90bf05e 100644
--- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/logger/CallerLogger.kt
+++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/logger/CallerLogger.kt
@@ -4,27 +4,27 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.Scene.Companion.scene
 
 object CallerLogger {
 
-    fun i(tag: String, message: String) {
+    fun i(tag: String, message: Any? = null) {
         if (scene.check(tag)) {
-            Logger.i(tag, message, null)
+            Logger.i(tag, message.toString(), null)
         }
     }
 
-    fun d(tag: String, message: String) {
+    fun d(tag: String, message: Any? = null) {
         if (scene.check(tag)) {
-            Logger.d(tag, message, null)
+            Logger.d(tag, message.toString(), null)
         }
     }
 
-    fun w(tag: String, message: String) {
+    fun w(tag: String, message: Any? = null) {
         if (scene.check(tag)) {
-            Logger.w(tag, message, null)
+            Logger.w(tag, message.toString(), null)
         }
     }
 
-    fun e(tag: String, message: String) {
+    fun e(tag: String, message: Any? = null) {
         if (scene.check(tag)) {
-            Logger.e(tag, message, null)
+            Logger.e(tag, message.toString(), null)
         }
     }
 
diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/logger/scene/Scene.kt b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/logger/scene/Scene.kt
index 328c75b916..7c4b65883d 100644
--- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/logger/scene/Scene.kt
+++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/logger/scene/Scene.kt
@@ -8,6 +8,9 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OLD_ROUTE
 import java.util.*
 
+/**
+ * 场景日志，提供场景过滤服务
+ */
 class Scene {
 
     companion object {
@@ -40,11 +43,16 @@ class Scene {
         //初始化其他模块，方便定位索引
         val otherMap = SceneLogCache(mutableMapOf(), true)
         sceneCache[M_OTHER] = otherMap
+
+        //todo  1. SceneLogCache增加模块名称，提供场景需要
+        //todo  2. 对特定场景提供数据, 网约车，调度...
+
     }
 
     fun check(tag: String): Boolean {
         return if (canLog()) {
-            classifyLog(tag)
+//            classifyLog(tag)
+            true
         } else {
             false
         }
@@ -76,15 +84,13 @@ class Scene {
             return otherLogCache.logger
         }
 
-        if (businessName.isNullOrEmpty()) {
-            return false
-        }
-
         //此处存在用户自定义方式，可根据过滤找到对应不符合标准的模块
         var logCache = sceneCache[moduleName]
         if (logCache == null) {
             logCache = SceneLogCache(mutableMapOf(), true)
-            logCache.tagMap!![businessName] = true
+            businessName?.let {
+                logCache.tagMap!![it] = true
+            }
         }
         sceneCache[moduleName] = logCache
         return logCache.logger
diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/logger/scene/SceneConstant.kt b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/logger/scene/SceneConstant.kt
index bd4366734f..0333486bfe 100644
--- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/logger/scene/SceneConstant.kt
+++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/logger/scene/SceneConstant.kt
@@ -25,6 +25,6 @@ class SceneConstant {
         //旧module
         const val M_OLD_ROUTE = "OLD-ROUTE-SERVICE_"
         const val M_OLD_OTHER = "OLD-OTHER-SERVICE_"
-        const val M_OTHER = "ALL-MODULES_"
+        const val M_OTHER = "ALL_OLD-MODULES_"
     }
 }
\ No newline at end of file