From f0630889542605a8f3d6170c523e3e381c35a70a Mon Sep 17 00:00:00 2001
From: lixiaopeng <lixiaopeng@zhidaoauto.com>
Date: Fri, 17 Feb 2023 19:14:14 +0800
Subject: [PATCH] =?UTF-8?q?[dev=5Farch=5Fopt=5F3.0]=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../obu/MogoPrivateObuNewManager.kt           | 50 ++++++++-----------
 1 file changed, 22 insertions(+), 28 deletions(-)

diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuNewManager.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuNewManager.kt
index cf1a909d8c..7ab13fcfb4 100644
--- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuNewManager.kt
+++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuNewManager.kt
@@ -86,7 +86,6 @@ class MogoPrivateObuNewManager private constructor() {
         ObuManager.getInstance().connect(options)
     }
 
-
     /**
      * 断开新obu
      */
@@ -157,7 +156,7 @@ class MogoPrivateObuNewManager private constructor() {
          */
         override fun onObuRvWarning(data: ObuScene.RvWarningData) {
             if (HmiBuildConfig.isShowObuV2vView) {
-                if (data.warningMsg != null && !data.warningMsg.warningDataList.isNullOrEmpty()) {
+                if (data.warningMsg != null) {
                     // 更新数据，远车数据，之前要匹配uuid
                     TrafficDataConvertUtilsNew.cvxRvInfoIndInfo2TrafficData(data.vehBasicsMsg)
                         ?.let {
@@ -166,33 +165,28 @@ class MogoPrivateObuNewManager private constructor() {
                         }
 
                     CallerLogger.d("$M_OBU${MogoObuConst.TAG_MOGO_NEW_OBU}", data.toString())
-                    data.let {
-                        //预警信息,预警类型 threat_level 2、3
-                        data.vehBasicsMsg?.let {
-                            //预警方位
-                            val direction = getMessageDirection(data.vehBasicsMsg.targetPosition)
-                            //处理预警类型
-                            var appId = ""
-                            var level = -1
-                            var status = -1
-                            data.warningMsg?.let {
-                                if (data.warningMsg.warningDataList != null && data.warningMsg.warningDataList.size > 0) {
-                                    level = data.warningMsg.warningDataList[0].warningLevel
-                                    appId =
-                                        data.warningMsg.warningDataList[0].warningType.toString()
-                                    status = data.warningMsg.warningDataList[0].status
-                                    //拼凑数据
-                                    handleSdkObu(appId, direction, status, level, data)
-                                }
-                            }
-
-                            CallerLogger.d(
-                                "$M_OBU${MogoObuConst.TAG_MOGO_NEW_OBU}",
-                                "onMogoObuRvWarning target_classification =  ${
-                                    getMessageDirection(data.vehBasicsMsg.targetPosition)
-                                } --- direction = $direction --- appId = $appId ---level = $level -- status = $status"
-                            )
+                    //预警信息,预警类型 threat_level 2、3
+                    data.vehBasicsMsg?.let {
+                        //预警方位
+                        val direction = getMessageDirection(data.vehBasicsMsg.targetPosition)
+                        //处理预警类型
+                        var appId = ""
+                        var level = -1
+                        var status = -1
+                        if (data.warningMsg.warningDataList != null && data.warningMsg.warningDataList.size > 0) {
+                            level = data.warningMsg.warningDataList[0].warningLevel
+                            appId = data.warningMsg.warningDataList[0].warningType.toString()
+                            status = data.warningMsg.warningDataList[0].status
+                            //拼凑数据
+                            handleSdkObu(appId, direction, status, level, data)
                         }
+
+                        CallerLogger.d(
+                            "$M_OBU${MogoObuConst.TAG_MOGO_NEW_OBU}",
+                            "onMogoObuRvWarning target_classification =  ${
+                                getMessageDirection(data.vehBasicsMsg.targetPosition)
+                            } --- direction = $direction --- appId = $appId ---level = $level -- status = $status"
+                        )
                     }
                 }
             }