From 6fb93f831b1182b88ddce284eb17ddbb54270491 Mon Sep 17 00:00:00 2001 From: EmArrow Date: Thu, 22 Aug 2024 11:28:08 +0800 Subject: [PATCH] [6.6.0] add trace of v2n event --- .../autopilot/adapter/MoGoAdasListenerImpl.kt | 32 +++++++++++++++++++ .../core/data/deva/chain/ChainConstant.kt | 2 ++ .../autopilot/CallerFsm2024ListenerManager.kt | 3 -- 3 files changed, 34 insertions(+), 3 deletions(-) diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt index 7158a447f4..4185d7aa13 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt @@ -11,6 +11,7 @@ import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_AD import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_ADAS_CAR_CONFIG import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_ADAS_CAR_LOC import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_ADAS_FM_MSG +import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_ADAS_FSM_MSG import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_ADAS_GUARDIAN import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_ADAS_MAP_PARAM import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_ADAS_PARALLEL @@ -20,6 +21,7 @@ import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_AD import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_ADAS_STATUS import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_ADAS_STATUS_QUERY_RESP import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_ADAS_TRAJECTORY +import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_ADAS_V2N_EVENT import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_ADAS_VEHICLE import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_SOURCE_ADAS import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_TYPE_GNSS @@ -461,6 +463,12 @@ class MoGoAdasListenerImpl : OnAdasListener { * @param header 头 * @param fsmState 数据 */ + @ChainLog( + linkChainLog = CHAIN_TYPE_SOCKET_AUTOPILOT, + linkCode = CHAIN_SOURCE_ADAS, + nodeAliasCode = CHAIN_CODE_ADAS_FSM_MSG, + paramIndexes = [0, 1] + ) override fun onFSM2024State(header: MessagePad.Header, fsmState: Fsm2024.FSMStateMsg) { CallerFsm2024ListenerManager.invokeFSM2024State(fsmState) } @@ -930,6 +938,12 @@ class MoGoAdasListenerImpl : OnAdasListener { * @param header 头 * @param crossSpeed 数据 */ + @ChainLog( + linkChainLog = CHAIN_TYPE_SOCKET_AUTOPILOT, + linkCode = CHAIN_SOURCE_ADAS, + nodeAliasCode = CHAIN_CODE_ADAS_V2N_EVENT, + paramIndexes = [0, 1] + ) override fun onV2nNioGreenWavePassageEvent( header: MessagePad.Header, crossSpeed: MessagePad.V2nCrossSpeed @@ -943,6 +957,12 @@ class MoGoAdasListenerImpl : OnAdasListener { * @param header 头 * @param event 数据 */ + @ChainLog( + linkChainLog = CHAIN_TYPE_SOCKET_AUTOPILOT, + linkCode = CHAIN_SOURCE_ADAS, + nodeAliasCode = CHAIN_CODE_ADAS_V2N_EVENT, + paramIndexes = [0, 1] + ) override fun onV2nNioCrossoverEvent(header: MessagePad.Header, event: MessagePad.Event) { CallerV2nNioEventListenerManager.invokeV2nNioCrossoverEvent(event) } @@ -953,6 +973,12 @@ class MoGoAdasListenerImpl : OnAdasListener { * @param header 头 * @param event 数据 */ + @ChainLog( + linkChainLog = CHAIN_TYPE_SOCKET_AUTOPILOT, + linkCode = CHAIN_SOURCE_ADAS, + nodeAliasCode = CHAIN_CODE_ADAS_V2N_EVENT, + paramIndexes = [0, 1] + ) override fun onV2nNioOtherRetrogradeEvent(header: MessagePad.Header, event: MessagePad.Event) { CallerV2nNioEventListenerManager.invokeV2nNioOtherRetrogradeEvent(event) } @@ -963,6 +989,12 @@ class MoGoAdasListenerImpl : OnAdasListener { * @param header 头 * @param congestion 数据 */ + @ChainLog( + linkChainLog = CHAIN_TYPE_SOCKET_AUTOPILOT, + linkCode = CHAIN_SOURCE_ADAS, + nodeAliasCode = CHAIN_CODE_ADAS_V2N_EVENT, + paramIndexes = [0, 1] + ) override fun onV2nNioCongestionEvent( header: MessagePad.Header, congestion: MessagePad.V2nCongestion diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/chain/ChainConstant.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/chain/ChainConstant.kt index 6b2e236345..711da1b560 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/chain/ChainConstant.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/chain/ChainConstant.kt @@ -54,6 +54,7 @@ class ChainConstant { const val CHAIN_CODE_ADAS_STATUS = "CHAIN_CODE_ADAS_STATUS" const val CHAIN_CODE_ADAS_SEND = "CHAIN_CODE_ADAS_SEND" const val CHAIN_CODE_ADAS_FM_MSG = "CHAIN_CODE_ADAS_FM_MSG" + const val CHAIN_CODE_ADAS_FSM_MSG = "CHAIN_CODE_ADAS_FSM_MSG" const val CHAIN_CODE_ADAS_ARRIVE = "CHAIN_CODE_ADAS_ARRIVE" const val CHAIN_CODE_ADAS_ROUTE = "CHAIN_CODE_ADAS_ROUTE" const val CHAIN_CODE_ADAS_ROUTE_REQ = "CHAIN_CODE_ADAS_ROUTE_REQ" @@ -68,6 +69,7 @@ class ChainConstant { const val CHAIN_CODE_ADAS_STATUS_QUERY_RESP = "CHAIN_CODE_ADAS_STATUS_QUERY_RESP" const val CHAIN_CODE_ADAS_PARALLEL = "CHAIN_CODE_ADAS_PARALLEL" const val CHAIN_CODE_ADAS_MAP_PARAM = "CHAIN_CODE_ADAS_MAP_PARAM" + const val CHAIN_CODE_ADAS_V2N_EVENT = "CHAIN_CODE_ADAS_V2N_EVENT" const val CHAIN_CODE_ADAS_POWER_OFF = "CHAIN_CODE_ADAS_POWER_OFF" const val CHAIN_CODE_ADAS_IPC_REBOOT = "CHAIN_CODE_ADAS_IPC_REBOOT" diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerFsm2024ListenerManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerFsm2024ListenerManager.kt index c168ca76bd..530c7b8344 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerFsm2024ListenerManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerFsm2024ListenerManager.kt @@ -10,9 +10,6 @@ import mogo.telematics.pad.MessagePad */ object CallerFsm2024ListenerManager : CallerBase() { - /** - * 绿波通行（单路口）事件推送, 透传 - */ fun invokeFSM2024State(fsmState: Fsm2024.FSMStateMsg) { M_LISTENERS.forEach { val listener = it.value