From d68497cefd1cc02bd857e85561c1c483f82dc69f 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 11:18:27 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=BB=A3=E7=A0=81=E5=90=88?=
 =?UTF-8?q?=E5=B9=B6=E4=BA=A7=E7=94=9F=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: chenfufeng <chenfufeng@zhidaoauto.com>
---
 .../module/obu/mogo/MogoPrivateObuManager.kt     | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 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 33f447988a..b4cb9b4bd1 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
@@ -161,7 +161,7 @@ class MogoPrivateObuManager private constructor() {
             if (info != null && info.threat_info != null && info.ext_info != null) {
                 var alertContent = ""
                 var ttsContent = ""
-                var appId = ""
+                var appId = info.threat_info.app_id.toString()
                 val status = info.status
                 val level = info.threat_info.threat_level
                 val direction =
@@ -169,7 +169,7 @@ class MogoPrivateObuManager private constructor() {
                 when (appId) {
                     // 道路危险情况预警
                     EventTypeEnum.TYPE_USECASE_ID_HLW.poiType -> {
-                        Logger.d(MogoObuConst.TAG_MOGO_OBU, "onCvxRtiThreatIndInfo appId = ${info.threat_info.app_id} --status = $status --level = $level -- handleDirection = $direction --rtiType = ${info.ext_info.rti_type}")
+                        Logger.d(MogoObuConst.TAG_MOGO_OBU, "onCvxRtiThreatIndInfo appId = $appId --status = $status --level = $level -- handleDirection = $direction --rtiType = ${info.ext_info.rti_type}")
                         when (info.ext_info.rti_type) {
                             //急转弯
                             0x2 -> {
@@ -594,8 +594,8 @@ class MogoPrivateObuManager private constructor() {
         when (appId.toString()) {
             // 变道预警,注意左后车辆/注意右后车辆
             EventTypeEnum.TYPE_USECASE_ID_LCW.poiType -> {
-                alertContent = EventTypeEnum.getWarningContent(appId)
-                ttsContent = EventTypeEnum.getWarningTts(appId)
+                alertContent = EventTypeEnum.getWarningContent(appId.toString())
+                ttsContent = EventTypeEnum.getWarningTts(appId.toString())
                 if (
                     direction == WarningDirectionEnum.ALERT_WARNING_LEFT ||
                     direction == WarningDirectionEnum.ALERT_WARNING_TOP_LEFT ||
@@ -632,8 +632,8 @@ class MogoPrivateObuManager private constructor() {
 
             //左转辅助
             EventTypeEnum.TYPE_USECASE_ID_LTA.poiType -> {
-                alertContent = EventTypeEnum.getWarningContent(appId)
-                ttsContent = EventTypeEnum.getWarningTts(appId)
+                alertContent = EventTypeEnum.getWarningContent(appId.toString())
+                ttsContent = EventTypeEnum.getWarningTts(appId.toString())
                 if (
                     direction == WarningDirectionEnum.ALERT_WARNING_LEFT ||
                     direction == WarningDirectionEnum.ALERT_WARNING_TOP_LEFT ||
@@ -668,8 +668,8 @@ class MogoPrivateObuManager private constructor() {
 
             //盲区预警
             EventTypeEnum.TYPE_USECASE_ID_BSW.poiType -> {
-                ttsContent = EventTypeEnum.getWarningTts(appId)
-                alertContent = EventTypeEnum.getWarningContent(appId)
+                ttsContent = EventTypeEnum.getWarningTts(appId.toString())
+                alertContent = EventTypeEnum.getWarningContent(appId.toString())
                 if (
                     direction == WarningDirectionEnum.ALERT_WARNING_LEFT ||
                     direction == WarningDirectionEnum.ALERT_WARNING_TOP_LEFT ||