From 11f8fb666f3e8f6157178c1e45274257fbdc16cc Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Wed, 24 Jan 2024 16:45:40 +0800 Subject: [PATCH] =?UTF-8?q?[6.2.9]=E6=B6=88=E6=81=AF=E7=9B=92=E5=AD=90Repo?= =?UTF-8?q?rt=E5=85=B3=E9=94=AEINFO=E4=BA=8B=E4=BB=B6=20PAD=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E9=9C=80=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../report/IPCReportManager.kt | 28 ++++++++++++++++++- .../msgbox/adapter/DriverMsgBoxListAdapter.kt | 17 ++++++++++- 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/report/IPCReportManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/report/IPCReportManager.kt index f04fe535d4..55126f96de 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/report/IPCReportManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/report/IPCReportManager.kt @@ -9,6 +9,7 @@ import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager import com.mogo.eagle.core.utilcode.util.TimeUtils +import com.zhjt.mogo.adas.data.bean.MogoReport import mogo_msg.MogoReportMsg /** @@ -87,7 +88,32 @@ class IPCReportManager : IMoGoAutopilotStatusListener { || it.resultList.contains(RESULT_REMOTEPILOT_DISABLE) || it.resultList.contains(RESULT_AUTOPILOT_INFERIOR) || it.resultList.contains(RESULT_SHOW_WARNING) - || it.resultList.contains(RESULT_REMOTEPILOT_INFERIOR)){ + || it.resultList.contains(RESULT_REMOTEPILOT_INFERIOR) + || it.code == MogoReport.Code.Info.ISYS.STARTING + || it.code == MogoReport.Code.Info.ISYS.RUNNING + || it.code == MogoReport.Code.Info.IMAP.ENTRY_AUTOPILOT + || it.code == MogoReport.Code.Info.IMAP.EXIT_AUTOPILOT + || it.code == MogoReport.Code.Info.IMAP.ENTRY_REMOTEPILOT + || it.code == MogoReport.Code.Info.IMAP.EXIT_REMOTEPILOT + || it.code == MogoReport.Code.Info.IMAP.CONTROLLER_START_FM_COMMAND + || it.code == MogoReport.Code.Info.IMAP.CONTROLLER_FINISH_FM_COMMAND + || it.code == MogoReport.Code.Info.IMAP.CONTROLLER_ABORT_FM_COMMAND + || it.code == MogoReport.Code.Info.IMAP.PLANNING_START_FM_COMMAND + || it.code == MogoReport.Code.Info.IMAP.PLANNING_FINISH_FM_COMMAND + || it.code == MogoReport.Code.Info.IMAP.PLANNING_ABORT_FM_COMMAND + || it.code == MogoReport.Code.Info.ISYS.ALREADY_AUTOPILOT_STATE + || it.code == MogoReport.Code.Info.ISYS.AUTOPILOT_TAKEN_OVER_BY_REMOTE + || it.code == MogoReport.Code.Info.ISSM.OTA_UPGRADE_START + || it.code == MogoReport.Code.Info.ISSM.OTA_UPGRADE_FINISH + || it.code == MogoReport.Code.Info.ISSM.OTA_UPGRADE_LOADING + || it.code == MogoReport.Code.Info.ISYS.INIT_TRAJECTORY_START + || it.code == MogoReport.Code.Info.ISYS.INIT_TRAJECTORY_SUCCESS + || it.code == MogoReport.Code.Info.ISYS.INIT_TRAJECTORY_TIMEOUT + || it.code == MogoReport.Code.Info.ISYS.INIT_TRAJECTORY_FAILURE + || it.code == MogoReport.Code.Info.IPARALLEL.AICLOUD_CONNECTION_OK + || it.code == MogoReport.Code.Info.IVEHICLE.NOT_IN_TROUBLE + || it.code == MogoReport.Code.Info.ILCT.RTK_STATUS_NORMAL + ){ val reportEntity = ReportEntity(TimeUtils.millis2String(System.currentTimeMillis()), it.src,it.level,it.msg,it.code,it.resultList,it.actionsList,false) CallerMsgBoxManager.saveMsgBox(MsgBoxBean(MsgBoxType.REPORT, reportEntity)) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/DriverMsgBoxListAdapter.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/DriverMsgBoxListAdapter.kt index 3602ef9503..e64c061cee 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/DriverMsgBoxListAdapter.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/DriverMsgBoxListAdapter.kt @@ -52,6 +52,11 @@ class DriverMsgBoxListAdapter(private val activity: Activity) : private val RESULT_AUTOPILOT_SYSTEM_UNSTARTED = "RESULT_AUTOPILOT_SYSTEM_UNSTARTED" private val RESULT_REMOTEPILOT_DISABLE = "RESULT_REMOTEPILOT_DISABLE" + //Warning + private val RESULT_AUTOPILOT_INFERIOR = "RESULT_AUTOPILOT_INFERIOR" + private val RESULT_SHOW_WARNING = "RESULT_SHOW_WARNING" + private val RESULT_REMOTEPILOT_INFERIOR = "RESULT_REMOTEPILOT_INFERIOR" + fun setData(data: List) { this.data = data notifyDataSetChanged() @@ -378,13 +383,23 @@ class DriverMsgBoxListAdapter(private val activity: Activity) : holder.ivReportImageOpen.setImageDrawable(getDrawable(R.drawable.icon_report_error_open)) holder.tvReportLevelNormal.text = "Error" holder.tvReportLevelOpen.text = "Error" - } else { + } else if(reportEntity.resultList.contains(RESULT_AUTOPILOT_INFERIOR) + || reportEntity.resultList.contains(RESULT_SHOW_WARNING) + || reportEntity.resultList.contains(RESULT_REMOTEPILOT_INFERIOR) + ){ //Warning holder.ivReportImageNormal.setImageDrawable(getDrawable(R.drawable.icon_report_warning_normal)) holder.ivReportImageOpen.setImageDrawable(getDrawable(R.drawable.icon_report_warning_open)) holder.tvReportLevelNormal.text = "Warning" holder.tvReportLevelOpen.text = "Warning" + }else { + //INFO + holder.ivReportImageNormal.setImageDrawable(getDrawable(R.drawable.icon_report_warning_normal)) + holder.ivReportImageOpen.setImageDrawable(getDrawable(R.drawable.icon_report_warning_open)) + holder.tvReportLevelNormal.text = "Info" + holder.tvReportLevelOpen.text = "Info" } + holder.tvReportTimeNormal.text = "时间：${TimeUtils.millis2String(it[position].timestamp)}" holder.tvReportTimeOpen.text =