From 50be4d5a561bb15c0ea27edb3a74c7b14399f26f Mon Sep 17 00:00:00 2001
From: lixiaopeng <lixiaopeng@zhidaoauto.com>
Date: Sun, 15 Jan 2023 16:09:05 +0800
Subject: [PATCH] =?UTF-8?q?[2.13.2]=20=E4=BF=AE=E6=94=B9=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E7=A9=BA=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98=EF=BC=8C=E6=9A=82?=
 =?UTF-8?q?=E6=97=B6=E5=8E=BB=E6=8E=89=E8=A1=8C=E4=BA=BA=E6=A0=87=E7=89=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/function/hmi/ui/MoGoHmiFragment.kt   |  1 +
 .../obu/mogo/MogoPrivateObuNewManager.kt      | 21 ++++++++++++-------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt
index d2e159753b..d0cc92ec8d 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt
@@ -948,6 +948,7 @@ class MoGoHmiFragment : MvpFragment<MoGoHmiContract.View?, HmiPresenter?>(),
             val warningContent = alertContent
                 ?: EventTypeEnumNew.getWarningContent(v2xType)
 
+            Log.e("liyz", "warningV2X v2xType = $v2xType ---alertContent = $alertContent ---ttsContent = $ttsContent")
             //占道施工预警
             if (v2xType.equals("10006") || v2xType.equals("100061")) {
                 val currentTime = System.currentTimeMillis() / 1000
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 5e7b0ed34d..8fc466f91b 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
@@ -319,9 +319,9 @@ class MogoPrivateObuNewManager private constructor() {
                                 MogoObuConstants.RTS.RTI_TYPE_BRIDGE -> { //桥梁
                                     appId = EventTypeEnumNew.TYPE_ID_BRIDGE.poiType
                                 }
-                                MogoObuConstants.RTS.RTI_TYPE_PEDESTRIAN -> { //行人
-                                    appId = EventTypeEnumNew.TYPE_ID_PEDESTRIAN.poiType
-                                }
+//                                MogoObuConstants.RTS.RTI_TYPE_PEDESTRIAN -> { //行人 TODO 暂时去掉
+//                                    appId = EventTypeEnumNew.TYPE_ID_PEDESTRIAN.poiType
+//                                }
                                 MogoObuConstants.RTS.RTI_TYPE_SLIPPERY_ROAD -> { //路滑
                                     appId = EventTypeEnumNew.TYPE_ID_SLIPPERY_ROAD.poiType
                                 }
@@ -436,17 +436,19 @@ class MogoPrivateObuNewManager private constructor() {
 
                     CallerLogger.d(
                         "$M_OBU${MogoObuConst.TAG_MOGO_NEW_OBU}",
-                        "new onMogoObuRsiWarning  appId = $appId --- ttsContent = $ttsContent --alertContent = $alertContent -- eventSerialNum  = ${data.warningMsg[0].eventSerialNum} ---signSerialNum = ${data.warningMsg[0].signSerialNum}  ---direction = ${direction.direction} --distance = ${
-                            Math.round(
-                                data.warningMsg[0].distance
-                            )
+                        "new onMogoObuRsiWarning  appId = $appId ---status = $status --- ttsContent = $ttsContent --alertContent = $alertContent -- eventSerialNum  = ${data.warningMsg[0].eventSerialNum} ---signSerialNum = ${data.warningMsg[0].signSerialNum}  ---direction = ${direction.direction} --distance = ${
+                            Math.round(data.warningMsg[0].distance)
                         } ---eventRadius = ${Math.round(data.warningMsg[0].eventRadius)} --speedMaxLimit  = ${data.warningMsg[0].speedMaxLimit.toInt()}"
                     )
+
                     when (status) {
                         MogoObuConstants.STATUS.ADD -> { // 添加
                             //显示警告红边
 //                        CallerHmiManager.showWarning(direction)
                             //不显示弹框，语音提示,数据在消息盒子里面展示，此处不在处理弹框
+                            if (alertContent.isNullOrEmpty() || ttsContent.isNullOrEmpty()) {
+                                return
+                            }
                             CallerMsgBoxManager.saveMsgBox(
                                 MsgBoxBean(
                                     MsgBoxType.V2X,
@@ -615,6 +617,9 @@ class MogoPrivateObuNewManager private constructor() {
                                             ?.updateITrafficThreatLevelInfo(it)
                                     }
 
+                                if (alertContent.isNullOrEmpty() || ttsContent.isNullOrEmpty()) {
+                                    return
+                                }
                                 //显示警告红边
                                 CallerHmiManager.showWarning(direction)
                                 CallerMsgBoxManager.saveMsgBox(
@@ -978,7 +983,7 @@ class MogoPrivateObuNewManager private constructor() {
         val currentLight = lights[0]
         CallerLogger.d(
             "$M_OBU${MogoObuConst.TAG_MOGO_NEW_OBU}",
-            "changeTrafficLightStatus currentLight = $currentLight ----currentLight.light = ${currentLight.light} ---currentLight.phase = ${currentLight.phaseId} ---appId = $appId"
+            "changeTrafficLightStatus currentLight = $currentLight ----currentLight.light = ${currentLight.light} ---currentLight.phase = ${currentLight.phaseId} ---appId = $appId --countDown =  ${currentLight.countDown.toInt()}"
         )
         // 闯红灯预警，绿波通行和闯红灯是互斥的
         when (appId) {