From f900af9f9461a492c0f803ee5401ad593196446d Mon Sep 17 00:00:00 2001
From: xuxinchao <xuxinchao@zhidaoauto.com>
Date: Fri, 27 Feb 2026 09:44:55 +0800
Subject: [PATCH] =?UTF-8?q?[8.4.0]=E4=B8=B4=E6=97=B6=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C=E5=8E=BB=E6=8E=89=E6=B6=88=E6=81=AF=E7=9B=92=E5=AD=90?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mogo/och/unmanned/ui/widget/UnmannedMsgBoxView.kt | 11 +++++++----
 .../function/hmi/bone/tab/adapter/MsgBoxTabAdapter.kt | 10 +++++-----
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/OCH/shuttle/driver_unmanned/src/main/java/com/mogo/och/unmanned/ui/widget/UnmannedMsgBoxView.kt b/OCH/shuttle/driver_unmanned/src/main/java/com/mogo/och/unmanned/ui/widget/UnmannedMsgBoxView.kt
index a00a9fe19f..2f964a222d 100644
--- a/OCH/shuttle/driver_unmanned/src/main/java/com/mogo/och/unmanned/ui/widget/UnmannedMsgBoxView.kt
+++ b/OCH/shuttle/driver_unmanned/src/main/java/com/mogo/och/unmanned/ui/widget/UnmannedMsgBoxView.kt
@@ -62,9 +62,9 @@ class UnmannedMsgBoxView @JvmOverloads constructor(
         getDrawable(R.drawable.rv_divider_line_tab)?.let { divider.setDrawable(it) }
         rvUnmannedMsgBoxList.addItemDecoration(divider)
         //获取通知消息列表
-        CallerMsgBoxManager.getCachedNotifyData()?.let {
-            noticeList.addAll(it)
-        }
+//        CallerMsgBoxManager.getCachedNotifyData()?.let {
+//            noticeList.addAll(it)
+//        }
         // 获取车辆系统信息
         CallerMsgBoxManager.getCachedSysInfoData()?.let {
             noticeList.addAll(it)
@@ -132,7 +132,10 @@ class UnmannedMsgBoxView @JvmOverloads constructor(
 //                        msgBoxTabAdapter?.notifyItemInserted(0)
                     }
                 }
-
+                //FM和FSM Event消息暂时不展示
+                MsgCategory.FM_INFO ->{
+                    return@post
+                }
                 else -> {
                     noticeList.add(0, msgBoxList)
 //                    msgBoxTabAdapter?.notifyItemInserted(0)
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/adapter/MsgBoxTabAdapter.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/adapter/MsgBoxTabAdapter.kt
index 5275c41d84..56a0384246 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/adapter/MsgBoxTabAdapter.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/adapter/MsgBoxTabAdapter.kt
@@ -399,15 +399,15 @@ class MsgBoxTabAdapter(private val activity: Activity) :
                         || reportEntity.resultList.contains(RESULT_REMOTEPILOT_DISABLE)
                     ) {
                         //Error
-                        holder.ivReportImage.setImageDrawable(getDrawable(R.drawable.icon_report_error))
-                        holder.tvReportLevel.text = "Error"
+                        holder.ivReportImage.setImageDrawable(getDrawable(R.drawable.icon_report_info))
+                        holder.tvReportLevel.text = "Info"
                     } else if(reportEntity.resultList.contains(RESULT_AUTOPILOT_INFERIOR)
                         || reportEntity.resultList.contains(RESULT_SHOW_WARNING)
                         || reportEntity.resultList.contains(RESULT_REMOTEPILOT_INFERIOR)
                     ){
                         //Warning
-                        holder.ivReportImage.setImageDrawable(getDrawable(R.drawable.icon_report_warning))
-                        holder.tvReportLevel.text = "Warning"
+                        holder.ivReportImage.setImageDrawable(getDrawable(R.drawable.icon_report_info))
+                        holder.tvReportLevel.text = "Info"
                     }else {
                         //INFO
                         holder.ivReportImage.setImageDrawable(getDrawable(R.drawable.icon_report_info))
@@ -423,7 +423,7 @@ class MsgBoxTabAdapter(private val activity: Activity) :
                         resultStr =
                             "${resultStr}${CallerAutoPilotControlManager.getReportResultDesc(result)}"
                     }
-                    holder.tvReportType.text = resultStr
+                    holder.tvReportType.text = "通知消息"
 //                    holder.tvReportReason.text = "原因：${reportEntity.msg}"
                     holder.tvReportReason.text = "${StringUtils.getString(R.string.module_core_cause1)}${reportEntity.msg}"
 //                    holder.tvReportSrc.text = "消息来源：${reportEntity.src}"