yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "[8.4.0]临时代码，去掉消息盒子报错信息"

Browse Source 
This reverts commit f900af9f94.
This commit is contained in:
yangyakun
2026-03-11 11:04:23 +08:00
parent 391d172633
commit f62a3ceb3b
2 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OCH/shuttle/driver_unmanned/src/main/java/com/mogo/och/unmanned/ui/widget/UnmannedMsgBoxView.kt
View File

@@ -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,10 +132,7 @@ class UnmannedMsgBoxView @JvmOverloads constructor(
// msgBoxTabAdapter?.notifyItemInserted(0)
}
}
//FM和FSM Event消息暂时不展示
MsgCategory.FM_INFO ->{
return@post
}
else -> {
noticeList.add(0, msgBoxList)
// msgBoxTabAdapter?.notifyItemInserted(0)

10
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/adapter/MsgBoxTabAdapter.kt
View File

@@ -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_info))
holder.tvReportLevel.text = "Info"
holder.ivReportImage.setImageDrawable(getDrawable(R.drawable.icon_report_error))
holder.tvReportLevel.text = "Error"
} 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_info))
holder.tvReportLevel.text = "Info"
holder.ivReportImage.setImageDrawable(getDrawable(R.drawable.icon_report_warning))
holder.tvReportLevel.text = "Warning"
}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 = "通知消息"
holder.tvReportType.text = resultStr
// holder.tvReportReason.text = "原因：${reportEntity.msg}"
holder.tvReportReason.text = "${StringUtils.getString(R.string.module_core_cause1)}${reportEntity.msg}"
// holder.tvReportSrc.text = "消息来源：${reportEntity.src}"