From 5a43448f0d76386fedad170623fa4b823e81a706 Mon Sep 17 00:00:00 2001
From: lixiaopeng <lixiaopeng@zhidaoauto.com>
Date: Tue, 29 Nov 2022 11:50:56 +0800
Subject: [PATCH] =?UTF-8?q?2.13.0=20=E4=BC=98=E5=8C=96obu=20=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=20=E9=99=90=E9=80=9F=E9=A2=84=E8=AD=A6=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../obu/mogo/MogoPrivateObuNewManager.kt      | 38 ++++---------------
 1 file changed, 8 insertions(+), 30 deletions(-)

diff --git a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuNewManager.kt b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuNewManager.kt
index 826fe5d152..b5bb3413eb 100644
--- a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuNewManager.kt
+++ b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuNewManager.kt
@@ -363,7 +363,7 @@ class MogoPrivateObuNewManager private constructor() {
                         appId = V2iEventTypeEnum.TYPE_USECASE_ID_TJW.poiType
                     }
 
-                    //限速预警 TODO
+                    //限速预警, ADD处理一次
                     MogoObuConstants.RSI_SCENE_TYPE.SLW.toString() -> {
 
                     }
@@ -391,7 +391,7 @@ class MogoPrivateObuNewManager private constructor() {
                     // 添加
                     MogoObuConstants.STATUS.ADD -> {
                         if (appId == "1") { //限速预警 TODO
-//                            CallerHmiManager.showLimitingVelocity((Math.round(((info.ext_info.speed_limit_max * 60 * 60) / 1000) / 10) * 10).toInt())
+                            CallerHmiManager.showLimitingVelocity((data.warningMsg[0].speedMaxLimit*3.6).toInt())
                         } else {
                             //显示警告红边
 //                        CallerHmiManager.showWarning(direction)
@@ -422,30 +422,10 @@ class MogoPrivateObuNewManager private constructor() {
                             )
 
                             // 更新数据
-//                            TrafficDataConvertUtilsNew.cvxRtiThreatIndInfo2TrafficData(data)?.let {
-//                                CallerMapUIServiceManager.getMarkerService()
-//                                    ?.updateITrafficThreatLevelInfo(it)
-                                //显示弹框，语音提示,数据在消息盒子里面展示，此处不在处理弹框
-//                                CallerHmiManager.warningV2X(
-//                                    appId,
-//                                    alertContent,
-//                                    ttsContent,// 只有第一次才tts，防止更新的时候不断的提醒
-//                                    (appId + direction.direction),//使用当前事件类型+方向记录tag，当发生变化的时候关闭当前弹出新的
-//                                    object : IMoGoWarningStatusListener {
-//                                        override fun onDismiss() {
-//                                            // 关闭警告红边
-//                                            CallerHmiManager.showWarning(WarningDirectionEnum.ALERT_WARNING_NON)
-//                                        }
-//                                    },
-//                                    true,
-//                                    5000L
-//                                )
-
-                                // 更新数据
-                                TrafficDataConvertUtilsNew.cvxRtiThreatIndInfo2TrafficData(data)?.let {
-                                        CallerMapUIServiceManager.getMarkerService()
-                                            ?.updateITrafficThreatLevelInfo(it)
-                                    }
+                            TrafficDataConvertUtilsNew.cvxRtiThreatIndInfo2TrafficData(data)?.let {
+                                    CallerMapUIServiceManager.getMarkerService()
+                                        ?.updateITrafficThreatLevelInfo(it)
+                                }
                             }
 //                        }
                     }
@@ -597,9 +577,7 @@ class MogoPrivateObuNewManager private constructor() {
         /**
          * 地图匹配 是OBU算法输出地图匹配结果，主车匹配道路哪条路或者哪条车道
          */
-        override fun onMogoObuMapMath(
-            data: MogoObuMapMathData?
-        ) {
+        override fun onMogoObuMapMath(data: MogoObuMapMathData?) {
             super.onMogoObuMapMath(data)
 
         }
@@ -829,7 +807,7 @@ private fun handlerTrafficLight(appId: Int, status: Int, lights: List<SpatLight>
             changeTrafficLightStatus(appId, lights)
         }
         // 删除
-        MogoObuConstants.STATUS.DELETE -> { //TODO 底层在修改，暂时没发送删除
+        MogoObuConstants.STATUS.DELETE -> {
             // 移除顶部弹窗
             CallerHmiManager.disableWarningTrafficLight()
             CallerHmiManager.disableWarningV2X(appId.toString())