From 3af6e283d2d18ea48dbf57347b95bc2465f1e3c4 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Wed, 15 Feb 2023 12:03:21 +0800 Subject: [PATCH] =?UTF-8?q?[dev=5Farch=5Fopt=5F3.0]=20=E6=B7=BB=E5=8A=A0ob?= =?UTF-8?q?u=E7=BA=A2=E7=BB=BF=E7=81=AF=E6=B6=88=E5=A4=B1=E7=9A=84?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../function/datacenter/obu/MogoPrivateObuNewManager.kt | 1 + .../core/function/datacenter/v2x/TrafficLightDispatcher.kt | 7 +++++++ .../core/function/api/v2x/IMoGoTrafficLightListener.kt | 5 +++++ .../function/call/v2x/CallerTrafficLightListenerManager.kt | 7 +++++++ 4 files changed, 20 insertions(+) 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 6fe7f68168..ab50d5c7b2 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 @@ -781,6 +781,7 @@ class MogoPrivateObuNewManager private constructor() { CallerTrafficLightListenerManager.disableTrafficLight() isShowGreenWave = false isShowRunRedLight = false + CallerTrafficLightListenerManager.invokeTrafficLightDisapper() } } } diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/TrafficLightDispatcher.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/TrafficLightDispatcher.kt index 06eb44312b..da18deaa54 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/TrafficLightDispatcher.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/TrafficLightDispatcher.kt @@ -125,6 +125,13 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight CallerTrafficLightListenerManager.resetTrafficLightStatus(!hasObuLightStatus) } + /** + * obu数据消失 + */ + override fun onObuTrafficLightDisapper() { + hasObuLightStatus = false + } + /** * obu 红绿灯数据 */ diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/v2x/IMoGoTrafficLightListener.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/v2x/IMoGoTrafficLightListener.kt index 58e247b9e3..4ea3b0f1f4 100644 --- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/v2x/IMoGoTrafficLightListener.kt +++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/v2x/IMoGoTrafficLightListener.kt @@ -30,6 +30,11 @@ interface IMoGoTrafficLightListener { */ fun onTrafficLightPlusSource(light: TrafficLightEnum, remain:Int = -1, lightSource: DataSourceType){} + /** + * obu 红绿灯消失 + */ + fun onObuTrafficLightDisapper() + /** * 展示红绿灯预警 * diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/v2x/CallerTrafficLightListenerManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/v2x/CallerTrafficLightListenerManager.kt index c903ddbc2a..60e4cd4e78 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/v2x/CallerTrafficLightListenerManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/v2x/CallerTrafficLightListenerManager.kt @@ -45,6 +45,13 @@ object CallerTrafficLightListenerManager : CallerBase } } + fun invokeTrafficLightDisapper() { + M_LISTENERS.forEach { + val listener = it.value + listener.onObuTrafficLightDisapper() + } + } + /** * 重置红绿灯状态并隐藏 */