From dce50514e96be5df033e35ffbfbd57b142b1976a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Tue, 28 Sep 2021 17:49:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=BC=B1=E5=8A=BF=E4=BA=A4?=
 =?UTF-8?q?=E9=80=9A=E9=A2=84=E8=AD=A6=E4=B9=88,=E8=BF=99=E9=87=8C?=
 =?UTF-8?q?=E5=8F=AA=E5=A4=84=E7=90=86,=E9=9D=9E=E6=9C=BA=E5=8A=A8?=
 =?UTF-8?q?=E8=BD=A6=E5=92=8C=E8=A1=8C=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 董宏宇 <martindhy@gmail.com>
---
 .../obu/mogo/MogoPrivateObuManager.kt         | 31 ++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuManager.kt b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuManager.kt
index 2395ab3a50..d2b5444869 100644
--- a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuManager.kt
+++ b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuManager.kt
@@ -225,6 +225,34 @@ class MogoPrivateObuManager private constructor() {
                             0x17 -> {
                                 appId = EventTypeEnum.TYPE_USECASE_ID_ROAD_HUMP_BRIDGE.poiType
                             }
+                            //轻轨电车
+                            0x18 -> {
+                                appId = EventTypeEnum.TYPE_USECASE_ID_ROAD_TRAMCAR.poiType
+                            }
+                            //人行横道
+                            0x19 -> {
+                                appId = EventTypeEnum.TYPE_USECASE_ID_ROAD_PEDESTRIAN_CROSSING.poiType
+                            }
+                            //减速慢行
+                            0x1A -> {
+                                appId = EventTypeEnum.TYPE_USECASE_ID_ROAD_GIVE_WAY.poiType
+                            }
+                            //事故易发路段
+                            0x1B -> {
+                                appId = EventTypeEnum.TYPE_USECASE_ID_ROAD_COLLISION_WARNING.poiType
+                            }
+                            //环岛行驶
+                            0x1C -> {
+                                appId = EventTypeEnum.TYPE_USECASE_ID_ROAD_ROUNDABOUTPNG.poiType
+                            }
+                            //环岛行驶
+                            0x1D -> {
+                                appId = EventTypeEnum.TYPE_USECASE_ID_ROAD_TEST_SECTION.poiType
+                            }
+                            //驼峰桥
+                            0x1E -> {
+                                appId = EventTypeEnum.TYPE_USECASE_ID_ROAD_HUMP_BRIDGE.poiType
+                            }
                         }
                         alertContent = EventTypeEnum.getWarningContent(appId)
                         ttsContent = EventTypeEnum.getWarningTts(appId)
@@ -308,7 +336,8 @@ class MogoPrivateObuManager private constructor() {
         // (2) 弱势交通参与者预警信息：CVX_PTC_THREAT_IND
         override fun onCvxPtcThreatIndInfo(info: CvxPtcThreatIndInfo?) {
             Logger.d(MogoObuConst.TAG_MOGO_OBU, "onCvxPtcInfoIndInfo ------> $info")
-            if (info != null) {
+            // 交通参与者类型 0x0:未知 UNKNOWN | 0x1:非机动车 NON_MOTOR | 0x2:行人 PEDESTRIAN 0x3:RSU
+            if (info != null && (info.ptc_type == 1 || info.ptc_type == 2)) {
                 Logger.d(
                     MogoObuConst.TAG_MOGO_OBU,
                     "onCvxPtcInfoIndInfo ---status---> ${info.status}"