diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/CallerLoggerUtils.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/CallerLoggerUtils.kt index 6289004563..671317b75e 100644 --- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/CallerLoggerUtils.kt +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/CallerLoggerUtils.kt @@ -3,6 +3,7 @@ package com.mogo.och.common.module.utils import com.mogo.commons.debug.DebugConfig 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_BUS_P +import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_SWEEPER 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 @@ -24,6 +25,10 @@ object CallerLoggerUtils { //小巴车乘客 M_BUS_P } + "fPadLenovoOchSweeper" -> { + //清扫车 + M_SWEEPER + } else -> { "" } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/scene/SceneManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/scene/SceneManager.kt index 329b2ff2ab..9b2d4ec691 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/scene/SceneManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/scene/SceneManager.kt @@ -16,6 +16,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OBU 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_SWEEPER 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 @@ -38,6 +39,7 @@ class SceneManager { private const val NET = "NET" private const val BUS = "BUS" private const val TAXI = "TAXI" + private const val SWEEPER = "SWEEPER" private const val TAXI_P = "TAXI_P" private const val OTHER = "OTHER" @@ -63,6 +65,7 @@ class SceneManager { sceneModuleTAG.map[BUS] = SceneModule(true, M_BUS) sceneModuleTAG.map[TAXI] = SceneModule(true, M_TAXI) sceneModuleTAG.map[TAXI_P] = SceneModule(true, M_TAXI_P) + sceneModuleTAG.map[SWEEPER] = SceneModule(true, M_SWEEPER) sceneModuleTAG.map[OTHER] = SceneModule(false, M_OTHER) sceneLogTAG.map[TAXI] = SceneTAG(false) @@ -160,6 +163,15 @@ class SceneManager { sceneCache[M_OLD_ROUTE]?.logger = logger scene.updateSceneCache(sceneCache) } + SWEEPER -> { + sceneCache[M_SWEEPER]?.logger = logger + sceneCache[M_NETWORK]?.logger = logger + sceneCache[M_ADAS_IMPL]?.logger = logger + sceneCache[M_HMI]?.logger = logger + sceneCache[M_DEVA]?.logger = logger + sceneCache[M_OLD_ROUTE]?.logger = logger + scene.updateSceneCache(sceneCache) + } } } } \ No newline at end of file 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 c98bbfc1e0..bfb62159ca 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 @@ -1222,6 +1222,8 @@ class DebugSettingView @JvmOverloads constructor( SceneConstant.M_TAXI -> cbTaxiLog.isChecked = log //TAXI_P日志标签 SceneConstant.M_TAXI_P -> cbTaxiPLog.isChecked = log + //清扫车日志 + SceneConstant.M_SWEEPER -> cbSweeperPLog.isChecked = log //其他模块日志(暂未区分具体模块) SceneConstant.M_OTHER -> cbOtherLog.isChecked = log } @@ -1352,6 +1354,12 @@ class DebugSettingView @JvmOverloads constructor( sceneMap[SceneConstant.M_TAXI_P] = taxiPModule CallerDevaToolsManager.updateModuleTAG(sceneMap) } + //清扫车日志标签 + cbTaxiPLog.setOnCheckedChangeListener { _, isChecked -> + val sweeperModule = SceneModule(isChecked, SceneConstant.M_SWEEPER) + sceneMap[SceneConstant.M_SWEEPER] = sweeperModule + CallerDevaToolsManager.updateModuleTAG(sceneMap) + } //其他未分类模块日志 cbOtherLog.setOnCheckedChangeListener { _, isChecked -> val otherModule = SceneModule(isChecked, SceneConstant.M_OTHER) 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 7a32567b16..3b975f7a51 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 @@ -2146,6 +2146,13 @@ android:layout_height="wrap_content" android:checked="false" android:text="乘客屏日志" /> +