yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bug of scene module tag problem

Browse Source
This commit is contained in:
zhongchao
2022-04-01 19:57:16 +08:00
parent 52ea6f98dc
commit a4e9b95d99
14 changed files with 126 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/logger/scene/Scene.kt
View File

@@ -1,15 +1,18 @@
package com.mogo.eagle.core.utilcode.mogo.logger.scene
import android.util.ArrayMap
import com.mogo.eagle.core.utilcode.mogo.logger.Logger
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_ADAS_IMPL
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_BUS
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_DEVA
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_HMI
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_MAP
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_NETWORK
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OLD_ROUTE
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OTHER
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_TAXI
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_TAXI_P
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_V2X
import java.util.*
/**
@@ -35,11 +38,17 @@ class Scene {
val adasMap = SceneLogCache(mutableMapOf(), true)
sceneCache[M_ADAS_IMPL] = adasMap
//初始化deva
val devaMap = SceneLogCache(mutableMapOf(), true)
val devaMap = SceneLogCache(mutableMapOf(), false)
sceneCache[M_DEVA] = devaMap
//初始化hmi
val hmiMap = SceneLogCache(mutableMapOf(), true)
val hmiMap = SceneLogCache(mutableMapOf(), false)
sceneCache[M_HMI] = hmiMap
//初始化v2x
val v2xMap = SceneLogCache(mutableMapOf(), false)
sceneCache[M_V2X] = v2xMap
//初始化map
val map = SceneLogCache(mutableMapOf(), false)
sceneCache[M_MAP] = map
//初始化路径规划
val routeMap = SceneLogCache(mutableMapOf(), true)
sceneCache[M_OLD_ROUTE] = routeMap
@@ -58,6 +67,12 @@ class Scene {
}
private var changed: ((String) -> Unit)? = null
fun addChangeListener(changed:(String) -> Unit){
this.changed = changed
}
fun getSceneCache(): MutableMap<String, SceneLogCache> {
return sceneCache
}
@@ -76,7 +91,6 @@ class Scene {
//前置收口
private fun canLog(): Boolean {
return true
}
@@ -97,18 +111,21 @@ class Scene {
if (moduleName.isNullOrEmpty()) {
val otherLogCache = sceneCache[M_OTHER]
otherLogCache!!.tagMap!![tag] = true
otherLogCache.logger = false
return otherLogCache.logger
}
//此处存在用户自定义方式，可根据过滤找到对应不符合标准的模块
var logCache = sceneCache["$moduleName-"]
if (logCache == null) {
Logger.i("emArrow","tag : $tag , module : $moduleName , sceneCache : $sceneCache")
logCache = SceneLogCache(mutableMapOf(), true)
businessName?.let {
logCache.tagMap!![it] = true
}
changed?.invoke("$moduleName-")
}
sceneCache[moduleName] = logCache
sceneCache["$moduleName-"] = logCache
return logCache.logger
}
}

1
core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/logger/scene/SceneConstant.kt
View File

@@ -15,7 +15,6 @@ class SceneConstant {
const val M_DEVA = "M_DEVA-"
const val M_DISPATCH = "M_DISPATCH-"
const val M_HMI = "M_HMI-"
const val M_MAIN = "M_MAIN-"
const val M_MAP = "M_MAP-"
const val M_MONITOR = "M_MONITOR-"
const val M_NOTICE = "M_NOTICE-"