From 6ac51ece2bb64e68144606dee607be4d25c9b47b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Tue, 17 Aug 2021 18:45:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86tts=E6=8F=90=E9=86=92?=
 =?UTF-8?q?=E6=96=87=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/obu/mogo/MogoPrivateObuManager.kt  | 43 +++++++++++--------
 1 file changed, 25 insertions(+), 18 deletions(-)

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 84476351d3..ea8fa589f0 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
@@ -354,40 +354,47 @@ class MogoPrivateObuManager private constructor() {
         when (appId) {
             // 变道预警,注意左后车辆/注意右后车辆
             WarningTypeEnum.TYPE_USECASE_ID_LCW.useCaseId -> {
+                alertContent = WarningTypeEnum.getWarningContent(appId)
                 ttsContent = WarningTypeEnum.getWarningTts(appId)
                 if (direction == 2) {
                     ttsContent = String.format(ttsContent, "左")
                 } else if (direction == 4) else {
                     ttsContent = String.format(ttsContent, "右")
                 }
-                alertContent = WarningTypeEnum.getWarningContent(appId)
             }
 
             //车辆失控预警
             WarningTypeEnum.TYPE_USECASE_ID_CLW.useCaseId -> {
-                ttsContent = WarningTypeEnum.getWarningTts(appId)
-
-                if (direction == 1) { //左前
-                    ttsContent = String.format(ttsContent, "左")
-                } else if (direction == 3) { //右前
-                    ttsContent = String.format(ttsContent, "右")
-                } else if (direction == 5) { //正前
-                    ttsContent = "前车失控预警"
-                }
                 alertContent = WarningTypeEnum.getWarningContent(appId)
+                ttsContent = WarningTypeEnum.getWarningTts(appId)
+                when (direction) {
+                    1 -> { //左前
+                        ttsContent = String.format(ttsContent, "左")
+                    }
+                    3 -> { //右前
+                        ttsContent = String.format(ttsContent, "右")
+                    }
+                    5 -> { //正前
+                        ttsContent = alertContent
+                    }
+                }
             }
 
             //异常车辆提醒
             WarningTypeEnum.TYPE_USECASE_ID_AVW.useCaseId -> {
-                ttsContent = WarningTypeEnum.getWarningTts(appId)
-                if (direction == 1) { //左前
-                    ttsContent = String.format(ttsContent, "左")
-                } else if (direction == 3) { //右前
-                    ttsContent = String.format(ttsContent, "右")
-                } else if (direction == 5) { //正前
-                    ttsContent = "前车异常"
-                }
                 alertContent = WarningTypeEnum.getWarningContent(appId)
+                ttsContent = WarningTypeEnum.getWarningTts(appId)
+                when (direction) {
+                    1 -> { //左前
+                        ttsContent = String.format(ttsContent, "左")
+                    }
+                    3 -> { //右前
+                        ttsContent = String.format(ttsContent, "右")
+                    }
+                    5 -> { //正前
+                        ttsContent = alertContent
+                    }
+                }
             }
 
             //盲区预警