From ab2a89a6230b1336c25489694f97a4690f6c52e8 Mon Sep 17 00:00:00 2001 From: donghongyu Date: Wed, 1 Feb 2023 14:31:40 +0800 Subject: [PATCH] =?UTF-8?q?[dev=5Farch=5Fopt=5F3.0]=20[Change]=20[=201?= =?UTF-8?q?=E3=80=81MoGoObuListenerImpl=E5=AE=9E=E7=8E=B0=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=9B=9E=E8=B0=83=20]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: donghongyu --- .../autopilot/adapter/MoGoAdasListenerImpl.kt | 1 - .../obu/MogoPrivateObuNewManager.kt | 7 ------ .../obu/adapter/MoGoObuListenerImpl.kt | 23 +++++++++++++------ .../mogo/eagle/core/data/obu/ObuStatusInfo.kt | 10 -------- .../core/function/call/base/CallerBase.kt | 6 ++--- .../CallerObuLocationWGS84ListenerManager.kt | 20 ++++++++++++++++ ....kt => CallerObuMapMathListenerManager.kt} | 2 +- 7 files changed, 40 insertions(+), 29 deletions(-) create mode 100644 core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obu/CallerObuLocationWGS84ListenerManager.kt rename core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obu/{CallerObuWarningMapListenerManager.kt => CallerObuMapMathListenerManager.kt} (86%) 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 73a16dfd68..e1bf14c4ad 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 @@ -51,7 +51,6 @@ 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.map.CallerMapUIServiceManager 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 diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuNewManager.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuNewManager.kt index c667c4bb86..16975e57c5 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuNewManager.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuNewManager.kt @@ -97,8 +97,6 @@ class MogoPrivateObuNewManager private constructor() { override fun onConnectStatus(connectStatus: Int) { if (connectStatus == 0) { //断开连接 mObuStatusInfo.obuStatus = false - mObuStatusInfo.obuHvStatus = false - mObuStatusInfo.obuRvStatus = false CallerObuConnectListenerManager.invokeObuConnectListener(mObuStatusInfo) } else if (connectStatus == 1) { //连接成功 mObuStatusInfo.obuStatus = true @@ -110,9 +108,6 @@ class MogoPrivateObuNewManager private constructor() { * HV车辆基础信息 CvxHvCarIndInfo CvxHvInfoIndInfo */ override fun onMogoObuHvBasics(p0: MogoObuHvBasicsData?) { - mObuStatusInfo.obuHvStatus = true - CallerObuConnectListenerManager.invokeObuConnectListener(mObuStatusInfo) - if (p0 != null && p0.vehBasicsMsg != null) { CallerLogger.d( "$M_OBU${MogoObuConst.TAG_MOGO_NEW_OBU}", @@ -161,8 +156,6 @@ class MogoPrivateObuNewManager private constructor() { override fun onMogoObuRvWarning(data: MogoObuRvWarningData) { super.onMogoObuRvWarning(data) // if (HmiBuildConfig.isShowObuV2vView) { //TODO 临时需要关闭v2v开关 - mObuStatusInfo.obuRvStatus = true - CallerObuConnectListenerManager.invokeObuConnectListener(mObuStatusInfo) if (!data.warningMsg.warningData.isNullOrEmpty()) { // 更新数据，远车数据，之前要匹配uuid TrafficDataConvertUtilsNew.cvxRvInfoIndInfo2TrafficData(data)?.let { diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/adapter/MoGoObuListenerImpl.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/adapter/MoGoObuListenerImpl.kt index 7b26638fd2..3c8e89fa18 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/adapter/MoGoObuListenerImpl.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/adapter/MoGoObuListenerImpl.kt @@ -1,5 +1,6 @@ package com.mogo.eagle.core.function.datacenter.obu.adapter +import com.mogo.eagle.core.function.call.obu.* import com.mogo.support.obu.OnMogoObuListener import com.mogo.support.obu.constants.Define.ConnectStatus import com.mogo.support.obu.model.* @@ -17,7 +18,15 @@ object MoGoObuListenerImpl : OnMogoObuListener() { * @since 1.0.0 */ override fun onConnectStatus(@ConnectStatus connectStatus: Int) { - + //断开连接 + if (connectStatus == 0) { + CallerObuConnectListenerManager.getObuStatusInfo().obuStatus = false + } + //连接成功 + else if (connectStatus == 1) { + CallerObuConnectListenerManager.getObuStatusInfo().obuStatus = true + } + CallerObuConnectListenerManager.invokeObuConnectListener() } @@ -28,7 +37,7 @@ object MoGoObuListenerImpl : OnMogoObuListener() { * @since 1.0.0 */ override fun onMogoObuHvBasics(data: MogoObuHvBasicsData) { - + CallerObuLocationWGS84ListenerManager.invokeObuLocationWGS84(data) } /** @@ -38,7 +47,7 @@ object MoGoObuListenerImpl : OnMogoObuListener() { * @since 1.0.0 */ override fun onMogoObuRvWarning(data: MogoObuRvWarningData) { - + CallerObuWarningRvListenerManager.invokeObuRvWarning(data) } /** @@ -48,7 +57,7 @@ object MoGoObuListenerImpl : OnMogoObuListener() { * @since 1.0.0 */ override fun onMogoObuSpatWarning(data: MogoObuSpatWarningData) { - + CallerObuWarningSpatListenerManager.invokeObuSpatWarning(data) } /** @@ -58,7 +67,7 @@ object MoGoObuListenerImpl : OnMogoObuListener() { * @since 1.0.0 */ override fun onMogoObuRsiWarning(data: MogoObuRsiWarningData) { - + CallerObuWarningRsiListenerManager.invokeObuRsiWarning(data) } /** @@ -68,7 +77,7 @@ object MoGoObuListenerImpl : OnMogoObuListener() { * @since 1.0.0 */ override fun onMogoObuRsmWarning(data: MogoObuRsmWarningData) { - + CallerObuWarningRsmListenerManager.invokeObuRsmWarning(data) } /** @@ -78,6 +87,6 @@ object MoGoObuListenerImpl : OnMogoObuListener() { * @since 1.0.0 */ override fun onMogoObuMapMath(data: MogoObuMapMathData) { - + CallerObuMapMathListenerManager.invokeObuMapMath(data) } } \ No newline at end of file diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/obu/ObuStatusInfo.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/obu/ObuStatusInfo.kt index f6161490e3..1331f1a366 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/obu/ObuStatusInfo.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/obu/ObuStatusInfo.kt @@ -21,16 +21,6 @@ class ObuStatusInfo { */ var obuStatus = false - /** - * false--没有链接，true--链接成功 - */ - var obuHvStatus = false - - /** - * false--没有链接，true--链接成功 - */ - var obuRvStatus = false - /** * Stack information */ diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/base/CallerBase.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/base/CallerBase.kt index 853d2cbb8d..c6e13e577a 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/base/CallerBase.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/base/CallerBase.kt @@ -13,7 +13,7 @@ import java.util.concurrent.ConcurrentHashMap open class CallerBase { // 存储所有注册了监听的对象，invokeXXXX进行遍历回调，将信息同步 - val M_LISTENERS: ConcurrentHashMap = ConcurrentHashMap() + protected val M_LISTENERS: ConcurrentHashMap = ConcurrentHashMap() /** * 添加 监听 @@ -21,8 +21,8 @@ open class CallerBase { * @param listener 监听回调 */ fun addListener( - tag: String, - listener: T + tag: String, + listener: T ) { if (M_LISTENERS.containsKey(tag)) { return diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obu/CallerObuLocationWGS84ListenerManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obu/CallerObuLocationWGS84ListenerManager.kt new file mode 100644 index 0000000000..8b1370b34b --- /dev/null +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obu/CallerObuLocationWGS84ListenerManager.kt @@ -0,0 +1,20 @@ +package com.mogo.eagle.core.function.call.obu + +import com.mogo.eagle.core.function.api.obu.IMoGoObuLocationWGS84Listener +import com.mogo.eagle.core.function.call.base.CallerBase +import com.mogo.support.obu.model.MogoObuHvBasicsData + +/** + * OBU HV 自车车辆基础信息数据,自车定位数据 WGS84 坐标系 + */ +object CallerObuLocationWGS84ListenerManager : CallerBase() { + + fun invokeObuLocationWGS84(data: MogoObuHvBasicsData) { + M_LISTENERS.forEach { + val tag = it.key + val listener = it.value + listener.onObuLocationWGS84(data) + } + } + +} \ No newline at end of file diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obu/CallerObuWarningMapListenerManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obu/CallerObuMapMathListenerManager.kt similarity index 86% rename from core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obu/CallerObuWarningMapListenerManager.kt rename to core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obu/CallerObuMapMathListenerManager.kt index 408965c57e..1885e9dd63 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obu/CallerObuWarningMapListenerManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obu/CallerObuMapMathListenerManager.kt @@ -7,7 +7,7 @@ import com.mogo.support.obu.model.MogoObuMapMathData /** * OBU 地图匹配结果,车道线、红绿灯、建议最大车速、建议最小车速 */ -object CallerObuWarningMapListenerManager : CallerBase() { +object CallerObuMapMathListenerManager : CallerBase() { fun invokeObuMapMath(data: MogoObuMapMathData) { M_LISTENERS.forEach {