From 25153fecdc79974d7a6570b0a858a5e9182007be Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Thu, 23 Nov 2023 17:14:59 +0800 Subject: [PATCH] =?UTF-8?q?[6.2.0]=E4=BF=AE=E6=94=B9=E8=BD=A6=E5=86=85?= =?UTF-8?q?=E6=A0=87=E7=89=8C=E6=B6=88=E6=81=AF=E6=8F=90=E7=A4=BA=E7=AD=96?= =?UTF-8?q?=E7=95=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datacenter/obu/MogoObuDcCombineManager.kt | 13 +++++++++++++ .../datacenter/obu/MogoPrivateObuNewManager.kt | 14 ++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoObuDcCombineManager.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoObuDcCombineManager.kt index 966544606d..cbb6576917 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoObuDcCombineManager.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoObuDcCombineManager.kt @@ -310,6 +310,19 @@ class MogoObuDcCombineManager private constructor() : IMoGoObuWarningRsiListener saveObuToDcData(appId, alertContent, ttsContent,CommunicationType.V2I) showWarning(appId, alertContent, ttsContent, direction) } + if (alertContent.isEmpty() || ttsContent.isEmpty()) { + return + } + //大于10m，才提示rsi,超速不限制 + if (appId == "6666") { + saveObuToDcData(appId, alertContent, ttsContent,CommunicationType.V2I) + showWarning(appId, alertContent, ttsContent, direction) + } else { + if (Math.round(rsiWarningData.warningMsgList[0].distance) > 10) { + saveObuToDcData(appId, alertContent, ttsContent,CommunicationType.V2I) + showWarning(appId, alertContent, ttsContent, direction) + } + } } // 删除 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 f6110fefc4..b555456f85 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 @@ -599,6 +599,20 @@ class MogoPrivateObuNewManager private constructor() : OnUpgradeListener { saveObuData(appId, alertContent, ttsContent,CommunicationType.V2I) showWarning(appId, alertContent, ttsContent, direction) } + //不显示弹框，语音提示,数据在消息盒子里面展示，此处不在处理弹框 + if (alertContent.isEmpty() || ttsContent.isEmpty()) { + return + } + //大于10m，才提示rsi。超速不限制 + if (appId == "6666") { + saveObuData(appId, alertContent, ttsContent,CommunicationType.V2I) + showWarning(appId, alertContent, ttsContent, direction) + } else { + if (Math.round(data.warningMsgList[0].distance) > 10) { + saveObuData(appId, alertContent, ttsContent,CommunicationType.V2I) + showWarning(appId, alertContent, ttsContent, direction) + } + } } MogoObuShowConstants.STATUS.DELETE -> { // 删除