From 63a2275e7e0ba30a3a8468b313af2dd9fa3d1d14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Mon, 13 Sep 2021 14:29:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=E8=BD=A6=E8=BE=86=E6=8F=90=E9=86=92=20=E5=85=A8=E6=96=B9?=
 =?UTF-8?q?=E4=BD=8D=E9=A2=84=E8=AD=A6tts=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/mogo/module/common/enums/WarningTypeEnum.kt |  4 ++--
 .../mogo/module/obu/mogo/MogoPrivateObuManager.kt   | 13 ++-----------
 2 files changed, 4 insertions(+), 13 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 85f581b2a3..967f6d5d51 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
@@ -57,8 +57,8 @@ enum class WarningTypeEnum(
     TYPE_USECASE_ID_AVW(
         ObuConstants.USE_CASE_ID.AVW,
         "异常车辆提醒",
-        "前车异常",
-        "小心前方异常车辆",
+        "%s车异常",
+        "小心%s异常车辆",
         R.drawable.icon_warning_v2x_abnormal_vehicle
     ),
     TYPE_USECASE_ID_BSW(
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 c926a7a53f..524299fbbb 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
@@ -648,17 +648,8 @@ class MogoPrivateObuManager private constructor() {
             WarningTypeEnum.TYPE_USECASE_ID_AVW.useCaseId -> {
                 alertContent = WarningTypeEnum.getWarningContent(appId)
                 ttsContent = WarningTypeEnum.getWarningTts(appId)
-//                when (direction) {
-//                    3 -> { //左前
-//                        ttsContent = String.format(ttsContent, "左")
-//                    }
-//                    4 -> { //右前
-//                        ttsContent = String.format(ttsContent, "右")
-//                    }
-//                    1 -> { //正前
-//                        ttsContent = alertContent
-//                    }
-//                }
+                alertContent = String.format(alertContent, direction.desc)
+                ttsContent = String.format(ttsContent, direction.desc)
             }
 
             //盲区预警