From f63115017c9a051cd5f440559034adeb079cb6a8 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Wed, 18 Aug 2021 19:26:05 +0800 Subject: [PATCH] opt --- .../mogo/module/obu/mogo/MogoObuConst.java | 3 ++- .../module/obu/mogo/MogoPrivateObuManager.kt | 7 ----- .../receiver/ObuRsuTestTriggerReceiver.kt | 26 ++++++++++++++++++- .../obu/mogo/utils/TrafficDataConvertUtils.kt | 2 +- 4 files changed, 28 insertions(+), 10 deletions(-) diff --git a/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/MogoObuConst.java b/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/MogoObuConst.java index bad9ce5b9b..8fb173c7f3 100644 --- a/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/MogoObuConst.java +++ b/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/MogoObuConst.java @@ -21,6 +21,7 @@ public class MogoObuConst { public static String BROADCAST_OBU_LEVEL_EXTRA_KEY = "obuLevel"; //红绿灯标识 0:不可用，1：红灯，2：绿灯，3：黄灯 public static String BROADCAST_LIGHT_LEVEL_EXTRA_KEY = "lightLevel"; - + //弱势交通 0：未知，1：非机动车，2：行人 + public static String BROADCAST_PTC_INFO_EXTRA_KEY = "ptcInfo"; } diff --git a/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/MogoPrivateObuManager.kt b/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/MogoPrivateObuManager.kt index 3fc763f3ae..765f4dfee2 100644 --- a/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/MogoPrivateObuManager.kt +++ b/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/MogoPrivateObuManager.kt @@ -463,13 +463,6 @@ class MogoPrivateObuManager private constructor() { alertContent = WarningTypeEnum.getWarningContent(appId) } - // 前方拥堵提醒,前方XXX米道路拥堵，请减速慢行 TODO - WarningTypeEnum.TYPE_USECASE_ID_TJW.useCaseId -> { - ttsContent = WarningTypeEnum.getWarningTts(appId) - ttsContent = String.format(ttsContent, "") - alertContent = WarningTypeEnum.getWarningContent(appId) - } - // 这里处理固定的提示信息 else -> { ttsContent = WarningTypeEnum.getWarningTts(appId) diff --git a/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/receiver/ObuRsuTestTriggerReceiver.kt b/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/receiver/ObuRsuTestTriggerReceiver.kt index f914e6321c..fd4c1d524a 100644 --- a/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/receiver/ObuRsuTestTriggerReceiver.kt +++ b/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/receiver/ObuRsuTestTriggerReceiver.kt @@ -9,6 +9,8 @@ import com.mogo.module.obu.mogo.MogoPrivateObuManager import com.mogo.utils.logger.Logger import com.zhidao.support.obu.constants.ObuConstants import com.zhidao.support.obu.model.CvxIvpThreatIndInfo +import com.zhidao.support.obu.model.CvxPtcInfoIndInfo +import com.zhidao.support.obu.model.CvxRtiThreatIndInfo import com.zhidao.support.obu.model.CvxSlwThreatIndInfo import com.zhidao.support.obu.model.advance.* @@ -34,6 +36,7 @@ class ObuRsuTestTriggerReceiver : BroadcastReceiver() { val obuStatus = intent.getIntExtra(MogoObuConst.BROADCAST_OBU_STATES_EXTRA_KEY, 0) val obuLevel = intent.getIntExtra(MogoObuConst.BROADCAST_OBU_LEVEL_EXTRA_KEY, 3) val phase = intent.getIntExtra(MogoObuConst.BROADCAST_LIGHT_LEVEL_EXTRA_KEY, 0) + val pctType = intent.getIntExtra(MogoObuConst.BROADCAST_PTC_INFO_EXTRA_KEY, 0) Logger.d( TAG, "obuStatus:$obuStatus phase:$phase obuType:$obuType obuLevel:$obuLevel" @@ -69,10 +72,31 @@ class ObuRsuTestTriggerReceiver : BroadcastReceiver() { //弱势交通参与者碰撞预警,行人/摩托车碰撞预警 ObuConstants.USE_CASE_ID.VRUCW -> { + val cvxPtcIndInfo = CvxPtcInfoIndInfo(1,1,1) + val position = Position(0, 399739429, 1164115207, 20) + val movingObjectInfo = MovingObjectInfo(0, position, 1800, 6000) + cvxPtcIndInfo.basic_info = movingObjectInfo + cvxPtcIndInfo.id = "111" + cvxPtcIndInfo.ptc_type = pctType + cvxPtcIndInfo.status = obuStatus + + MogoPrivateObuManager.INSTANCE.getMogoObuListener().onCvxPtcInfoIndInfo(cvxPtcIndInfo) } - } + //道路危险情况, 车内标牌, 前方拥堵提醒 + ObuConstants.USE_CASE_ID.HLW, ObuConstants.USE_CASE_ID.IVS,ObuConstants.USE_CASE_ID.TJW -> { + val cvxRtiThreatIndInfo = CvxRtiThreatIndInfo(1,1, 1L) + val dateTime = DateTime(1,1,1,1,1,1,1,1) + val rtiThread = RtiThreat(1, obuType, dateTime,100000, obuLevel, 100) + + cvxRtiThreatIndInfo.threat_info = rtiThread + cvxRtiThreatIndInfo.status = obuStatus + + MogoPrivateObuManager.INSTANCE.getMogoObuListener().onCvxRtiThreatIndInfo(cvxRtiThreatIndInfo) + } + + } } } diff --git a/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/utils/TrafficDataConvertUtils.kt b/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/utils/TrafficDataConvertUtils.kt index d6113161d3..bef06ea667 100644 --- a/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/utils/TrafficDataConvertUtils.kt +++ b/modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/utils/TrafficDataConvertUtils.kt @@ -85,7 +85,7 @@ object TrafficDataConvertUtils { } /** - * OBU 弱势交通参与者信息 转换交通元素数据 + * OBU 弱势交通参与者信息 转换交通元素数据 TODO */ fun cvxPtcInfoIndInfo2TrafficData(info: CvxPtcInfoIndInfo): TrafficData? { if (info.basic_info == null || info.basic_info.position == null || info.threat_infos != null) {