From edf775d322f01e72f0b19754d991998e41838456 Mon Sep 17 00:00:00 2001
From: lixiaopeng <lixiaopeng@zhidaoauto.com>
Date: Tue, 24 Aug 2021 17:15:25 +0800
Subject: [PATCH] fixed conflict

---
 .../java/com/mogo/module/obu/mogo/MogoPrivateObuManager.kt | 7 +++++--
 1 file changed, 5 insertions(+), 2 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 6ec5c4030a..0d02b5488b 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
@@ -342,7 +342,9 @@ class MogoPrivateObuManager private constructor() {
                     val status = info.status
                     Logger.d(
                         MogoObuConst.TAG_MOGO_OBU,
-                        "onCvxV2vThreatIndInfo getMessageDirection(direction) =  $direction"
+                        "onCvxV2vThreatIndInfo getMessageDirection(direction) =  ${
+                            getMessageDirection(direction)
+                        } --- direction = $direction --- appId = $appId ---level = $level"
                     )
                     handleSdkObu(appId, direction, status, level, info)
                 }
@@ -508,7 +510,7 @@ class MogoPrivateObuManager private constructor() {
         info: CvxV2vThreatIndInfo
     ) {
         //  这里排除需要特殊定制的语音及文案外,其余的都可以使用 WarningTypeEnum 提供的
-        Log.d(MogoObuConst.TAG_MOGO_OBU, "appId = $appId --- handleDirection = $direction ")
+        Log.d(MogoObuConst.TAG_MOGO_OBU, "handleSdkObu  appId = $appId --- handleDirection = $direction ---level = $level")
         var alertContent = ""
         var ttsContent = ""
         when (appId) {
@@ -584,6 +586,7 @@ class MogoPrivateObuManager private constructor() {
                     "ACTION_V2X_FRONT_WARNING"
                 )
                 //显示弹框，语音提示
+                Log.d(MogoObuConst.TAG_MOGO_OBU, "appId = $appId --- level = $level --- alertContent = $alertContent")
                 mIMoGoWaringProvider!!.showWarningV2X(
                     appId,
                     alertContent,