From 22134acf33596a7afd335fec081b91bc4e9e78e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Fri, 20 Aug 2021 19:22:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BA=A2=E7=BB=BF=E7=81=AF?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E5=BC=B9=E7=AA=97=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/mogo/module/common/enums/WarningTypeEnum.kt | 2 +- .../java/com/mogo/module/obu/mogo/MogoPrivateObuManager.kt | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/enums/WarningTypeEnum.kt b/modules/mogo-module-common/src/main/java/com/mogo/module/common/enums/WarningTypeEnum.kt index c3890acf54..f9f497b1b4 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/enums/WarningTypeEnum.kt +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/enums/WarningTypeEnum.kt @@ -133,8 +133,8 @@ enum class WarningTypeEnum( ), TYPE_USECASE_ID_IVP_GREEN( 0x2B091, + "绿波通行", "绿波通行 %s km/h", - "路口红灯，禁止通行", "保持车速 %s 公里每小时,可直接通过路口", R.drawable.icon_warning_v2x_traffic_lights_green ), 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 bd7ad711b8..f95ffc021b 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 @@ -444,6 +444,7 @@ class MogoPrivateObuManager private constructor() { ) { var ttsContent = "" var alertContent = "" + // TODO 这里需要根据真实数据确定 indicator 取值方式 if (lights.size >= indicator) { val currentLight = lights[indicator] when (currentLight.phase) { @@ -482,8 +483,9 @@ class MogoPrivateObuManager private constructor() { ttsContent = String.format(WarningTypeEnum.getWarningTts(0x2B091), adviceSpeedTts) + alertContent = - String.format(WarningTypeEnum.getWarningTts(0x2B091), adviceSpeed) + String.format(WarningTypeEnum.getWarningContent(0x2B091), adviceSpeed) mIMoGoWaringProvider!!.showWarningV2X( 0x2B091,