[dev_arch_opt_3.0]

[Change]
[
1、修改OBU数据PB回调
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
This commit is contained in:
donghongyu
2023-02-01 19:30:47 +08:00
parent 3c8f69d83a
commit 6c2d19f9c2
11 changed files with 31 additions and 24 deletions

View File

@@ -51,6 +51,10 @@ import com.mogo.eagle.core.function.call.autopilot.CallerPlanningActionsListener
import com.mogo.eagle.core.function.call.autopilot.CallerPlanningRottingListenerManager.invokeAutopilotRotting
import com.mogo.eagle.core.function.call.autopilot.CallerPlanningTrajectoryListenerManager.invokeAutopilotTrajectory
import com.mogo.eagle.core.function.call.autopilot.CallerStartAutopilotFailedListenerManager.invokeStartAutopilotFailed
import com.mogo.eagle.core.function.call.obu.CallerObuMapMathListenerManager
import com.mogo.eagle.core.function.call.obu.CallerObuWarningRsiListenerManager
import com.mogo.eagle.core.function.call.obu.CallerObuWarningRsmListenerManager
import com.mogo.eagle.core.function.call.obu.CallerObuWarningSpatListenerManager
import com.mogo.eagle.core.function.call.obucombine.CallerObuDcCombineListenerManager
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
import com.mogo.eagle.core.utilcode.mogo.logger.Logger
@@ -544,6 +548,7 @@ class MoGoAdasListenerImpl : OnAdasListener {
* @param spatWarningData 数据
*/
override fun onoObuSpatWarning(header: MessagePad.Header?, spatWarningData: ObuScene.SpatWarningData?) {
CallerObuWarningSpatListenerManager.invokeObuSpatWarning(spatWarningData!!)
}
/**
* OBU RSI预警信息
@@ -552,6 +557,7 @@ class MoGoAdasListenerImpl : OnAdasListener {
* @param rsiWarningData 数据
*/
override fun onoObuRsiWarning(header: MessagePad.Header?, rsiWarningData: ObuScene.RsiWarningData?) {
CallerObuWarningRsiListenerManager.invokeObuRsiWarning(rsiWarningData!!)
}
/**
@@ -561,6 +567,7 @@ class MoGoAdasListenerImpl : OnAdasListener {
* @param rsmWarningData 数据
*/
override fun onoObuRsmWarning(header: MessagePad.Header?, rsmWarningData: ObuScene.RsmWarningData?) {
CallerObuWarningRsmListenerManager.invokeObuRsmWarning(rsmWarningData!!)
}
/**
* OBU 地图匹配结果
@@ -569,6 +576,7 @@ class MoGoAdasListenerImpl : OnAdasListener {
* @param mapMatchData 数据
*/
override fun onoObuRsmWarning(header: MessagePad.Header?, mapMatchData: ObuScene.MapMatchData?) {
CallerObuMapMathListenerManager.invokeObuMapMath(mapMatchData!!)
}
/**

View File

@@ -18,6 +18,7 @@ object MoGoLocationManager :
CallerBase<IMoGoLocationListener>(),
IMoGoChassisLocationWGS84Listener,
IMoGoObuLocationWGS84Listener {
private val TAG = "MoGoLocationManager"
init {

View File

@@ -57,7 +57,7 @@ object MoGoObuListenerImpl : OnMogoObuListener() {
* @since 1.0.0
*/
override fun onMogoObuSpatWarning(data: MogoObuSpatWarningData) {
CallerObuWarningSpatListenerManager.invokeObuSpatWarning(data)
}
/**
@@ -67,7 +67,7 @@ object MoGoObuListenerImpl : OnMogoObuListener() {
* @since 1.0.0
*/
override fun onMogoObuRsiWarning(data: MogoObuRsiWarningData) {
CallerObuWarningRsiListenerManager.invokeObuRsiWarning(data)
}
/**
@@ -77,7 +77,6 @@ object MoGoObuListenerImpl : OnMogoObuListener() {
* @since 1.0.0
*/
override fun onMogoObuRsmWarning(data: MogoObuRsmWarningData) {
CallerObuWarningRsmListenerManager.invokeObuRsmWarning(data)
}
/**
@@ -87,6 +86,5 @@ object MoGoObuListenerImpl : OnMogoObuListener() {
* @since 1.0.0
*/
override fun onMogoObuMapMath(data: MogoObuMapMathData) {
CallerObuMapMathListenerManager.invokeObuMapMath(data)
}
}

View File

@@ -1,6 +1,6 @@
package com.mogo.eagle.core.function.api.obu
import com.mogo.support.obu.model.MogoObuMapMathData
import com.mogo.support.obu.ObuScene
/**
* OBU 地图匹配结果,
@@ -12,9 +12,9 @@ interface IMoGoObuWarningMapListener {
/**
* 地图匹配结果
*
* @param data 数据
* @param mapMatchData 数据
* @since 1.0.0
*/
fun onMoGoObuMapMath(data: MogoObuMapMathData)
fun onMoGoObuMapMath(mapMatchData: ObuScene.MapMatchData)
}

View File

@@ -1,6 +1,6 @@
package com.mogo.eagle.core.function.api.obu
import com.mogo.support.obu.model.MogoObuRsiWarningData
import com.mogo.support.obu.ObuScene
/**
* OBU RSI预警信息
@@ -12,9 +12,9 @@ interface IMoGoObuWarningRsiListener {
/**
* RSI预警信息
*
* @param data 数据
* @param rsiWarningData 数据
* @since 1.0.0
*/
fun onMoGoObuRsiWarning(data: MogoObuRsiWarningData)
fun onMoGoObuRsiWarning(rsiWarningData: ObuScene.RsiWarningData)
}

View File

@@ -1,6 +1,6 @@
package com.mogo.eagle.core.function.api.obu
import com.mogo.support.obu.model.MogoObuRsmWarningData
import com.mogo.support.obu.ObuScene
/**
* OBU RSM预警信息弱势交通参与者预警信息
@@ -12,9 +12,9 @@ interface IMoGoObuWarningRsmListener {
/**
* RSM预警信息弱势交通参与者预警信息
*
* @param data 数据
* @param rsmWarningData 数据
* @since 1.0.0
*/
fun onMoGoObuRsmWarning(data: MogoObuRsmWarningData)
fun onMoGoObuRsmWarning(rsmWarningData: ObuScene.RsmWarningData)
}

View File

@@ -1,6 +1,6 @@
package com.mogo.eagle.core.function.api.obu
import com.mogo.support.obu.model.MogoObuSpatWarningData
import com.mogo.support.obu.ObuScene
/**
* OBU 红绿灯预警信息,
@@ -12,9 +12,9 @@ interface IMoGoObuWarningSpatListener {
/**
* OBU 红绿灯预警信息
*
* @param data 数据
* @param spatWarningData 数据
* @since 1.0.0
*/
fun onMoGoObuSpatWarning(data: MogoObuSpatWarningData)
fun onMoGoObuSpatWarning(spatWarningData: ObuScene.SpatWarningData)
}

View File

@@ -2,14 +2,14 @@ package com.mogo.eagle.core.function.call.obu
import com.mogo.eagle.core.function.api.obu.IMoGoObuWarningMapListener
import com.mogo.eagle.core.function.call.base.CallerBase
import com.mogo.support.obu.model.MogoObuMapMathData
import com.mogo.support.obu.ObuScene
/**
* OBU 地图匹配结果,车道线、红绿灯、建议最大车速、建议最小车速
*/
object CallerObuMapMathListenerManager : CallerBase<IMoGoObuWarningMapListener>() {
fun invokeObuMapMath(data: MogoObuMapMathData) {
fun invokeObuMapMath(data: ObuScene.MapMatchData) {
M_LISTENERS.forEach {
val tag = it.key
val listener = it.value

View File

@@ -2,14 +2,14 @@ package com.mogo.eagle.core.function.call.obu
import com.mogo.eagle.core.function.api.obu.IMoGoObuWarningRsiListener
import com.mogo.eagle.core.function.call.base.CallerBase
import com.mogo.support.obu.model.MogoObuRsiWarningData
import com.mogo.support.obu.ObuScene
/**
* OBU 交通事件预警
*/
object CallerObuWarningRsiListenerManager : CallerBase<IMoGoObuWarningRsiListener>() {
fun invokeObuRsiWarning(data: MogoObuRsiWarningData) {
fun invokeObuRsiWarning(data: ObuScene.RsiWarningData) {
M_LISTENERS.forEach {
val tag = it.key
val listener = it.value

View File

@@ -2,14 +2,14 @@ package com.mogo.eagle.core.function.call.obu
import com.mogo.eagle.core.function.api.obu.IMoGoObuWarningRsmListener
import com.mogo.eagle.core.function.call.base.CallerBase
import com.mogo.support.obu.model.MogoObuRsmWarningData
import com.mogo.support.obu.ObuScene
/**
* OBU RSM预警信息弱势交通参与者预警信息
*/
object CallerObuWarningRsmListenerManager : CallerBase<IMoGoObuWarningRsmListener>() {
fun invokeObuRsmWarning(data: MogoObuRsmWarningData) {
fun invokeObuRsmWarning(data: ObuScene.RsmWarningData) {
M_LISTENERS.forEach {
val tag = it.key
val listener = it.value

View File

@@ -2,14 +2,14 @@ package com.mogo.eagle.core.function.call.obu
import com.mogo.eagle.core.function.api.obu.IMoGoObuWarningSpatListener
import com.mogo.eagle.core.function.call.base.CallerBase
import com.mogo.support.obu.model.MogoObuSpatWarningData
import com.mogo.support.obu.ObuScene
/**
* OBU 红绿灯信息
*/
object CallerObuWarningSpatListenerManager : CallerBase<IMoGoObuWarningSpatListener>() {
fun invokeObuSpatWarning(data: MogoObuSpatWarningData) {
fun invokeObuSpatWarning(data: ObuScene.SpatWarningData) {
M_LISTENERS.forEach {
val tag = it.key
val listener = it.value