From 3ee7468931c53cd8aeb5b3ac5e1df630b57de620 Mon Sep 17 00:00:00 2001
From: xuxinchao <xuxinchao@zhidaoauto.com>
Date: Wed, 10 Apr 2024 16:27:20 +0800
Subject: [PATCH] =?UTF-8?q?[6.4.0]=E6=B6=88=E6=81=AF=E7=9B=92=E5=AD=90?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=B1=BB=E5=9E=8B=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hmi/ui/msgbox/DriverMsgBoxBubbleView.kt   | 28 ++++++++++---------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/DriverMsgBoxBubbleView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/DriverMsgBoxBubbleView.kt
index bc3dc0a6fa..959553636e 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/DriverMsgBoxBubbleView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/DriverMsgBoxBubbleView.kt
@@ -13,6 +13,7 @@ import com.mogo.eagle.core.data.enums.DataSourceType
 import com.mogo.eagle.core.data.msgbox.FMInfoMsg
 import com.mogo.eagle.core.data.msgbox.MsgBoxBean
 import com.mogo.eagle.core.data.msgbox.MsgBoxCountDownBean
+import com.mogo.eagle.core.data.msgbox.MsgBoxType
 import com.mogo.eagle.core.data.msgbox.MsgCategory
 import com.mogo.eagle.core.data.msgbox.MsgFmData
 import com.mogo.eagle.core.function.api.datacenter.msgbox.IMsgBoxListener
@@ -100,22 +101,23 @@ class DriverMsgBoxBubbleView @JvmOverloads constructor(
                     }
                 } else if(category == MsgCategory.SYS_INFO){
                     CallerMsgBoxEventListenerManager.invokeUpdateTipListener(true)
-                    val reportMsg = msgBoxBean.bean as ReportEntity
-                    //P8-P1均只收在消息盒子里，P0消息盒子弹出，其中P0弹出时需要判断驾驶状态，非自动驾驶、非平行驾驶状态不弹出，其余状态弹出
-                    var isShowReport = false
-                    for(action in reportMsg.actionsList){
-                        if("ACTION_MANUAL_HANDLE_IMMEDIATELY" == action){
-                            if(CallerAutoPilotStatusListenerManager.getState() == 2
-                                || CallerAutoPilotStatusListenerManager.getState() == 7){
-                                isShowReport = true
+                    if(msgBoxBean.type == MsgBoxType.REPORT){
+                        val reportMsg = msgBoxBean.bean as ReportEntity
+                        //P8-P1均只收在消息盒子里，P0消息盒子弹出，其中P0弹出时需要判断驾驶状态，非自动驾驶、非平行驾驶状态不弹出，其余状态弹出
+                        var isShowReport = false
+                        for(action in reportMsg.actionsList){
+                            if("ACTION_MANUAL_HANDLE_IMMEDIATELY" == action){
+                                if(CallerAutoPilotStatusListenerManager.getState() == 2
+                                    || CallerAutoPilotStatusListenerManager.getState() == 7){
+                                    isShowReport = true
+                                }
                             }
                         }
+                        if(isShowReport){
+                            //展示消息
+                            showData(msgBoxBean)
+                        }
                     }
-                    if(isShowReport){
-                        //展示消息
-                        showData(msgBoxBean)
-                    }
-
                 } else if(category == MsgCategory.FM_INFO){
                     CallerMsgBoxEventListenerManager.invokeUpdateTipListener(true)
                     if(FunctionBuildConfig.isTakeoverRemind){