From bc86e638ec4f16034cfd114854cda6499c341927 Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Thu, 23 Nov 2023 18:40:39 +0800 Subject: [PATCH] =?UTF-8?q?[6.2.0]FM=E4=BF=A1=E6=81=AF=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../eagle/core/function/msgbox/MsgFmData.kt | 4 +-- .../msgbox/adapter/DriverMsgBoxListAdapter.kt | 32 +++++++++++++++---- 2 files changed, 27 insertions(+), 9 deletions(-) diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/msgbox/MsgFmData.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/msgbox/MsgFmData.kt index 055e8eeb3c..064484cc27 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/msgbox/MsgFmData.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/msgbox/MsgFmData.kt @@ -71,7 +71,7 @@ class MsgFmData{ FM_ACT_CONTACT_OPERATIONS_ENGINEER.faultLevel ->FM_ACT_CONTACT_OPERATIONS_ENGINEER.faultAction //请联系软件工程师 FM_ACT_CONTACT_SOFTWARE_ENGINEER.faultLevel -> FM_ACT_CONTACT_SOFTWARE_ENGINEER.faultAction - else -> "暂无" + else -> "" } } @@ -136,7 +136,7 @@ class MsgFmData{ FM_RST_FORBID_MANNUAL_DERVING.resultCode -> FM_RST_FORBID_MANNUAL_DERVING.resultDefine //失控，无法策略停车 FM_RST_OUT_OF_CONTROL.resultCode -> FM_RST_OUT_OF_CONTROL.resultDefine - else -> "暂无" + else -> "" } } } 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 5643373c56..9abf8fd4d3 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 @@ -186,7 +186,7 @@ class DriverMsgBoxListAdapter(private val activity: Activity) : if(info.faultActionCount != 0){ info.faultActionList.forEach { action -> //如果不包含此故障Level，则进行添加 - if(!receiveFaultLevel.contains(MsgFmData.FaultAction.getFaultLevel(action))){ + if(!receiveFaultLevel.contains(MsgFmData.FaultAction.getFaultLevel(action)) && MsgFmData.FaultAction.getFaultLevel(action)!=0){ receiveFaultLevel.add(MsgFmData.FaultAction.getFaultLevel(action)) } } @@ -196,17 +196,31 @@ class DriverMsgBoxListAdapter(private val activity: Activity) : if(receiveFaultLevel.size > 0){ val faultActionStr: StringBuilder = StringBuilder() faultActionStr.append("建议操作：") - receiveFaultLevel.sorted() + receiveFaultLevel.sort() + receiveFaultLevel.reverse() receiveFaultLevel.forEach {level-> - faultActionStr.append(MsgFmData.FaultAction.getFaultAction(level)) + if(MsgFmData.FaultAction.getFaultAction(level).isNotBlank()){ + faultActionStr.append(MsgFmData.FaultAction.getFaultAction(level)) + } if(MsgFmData.FaultAction.getFaultActionCode(level).isNotBlank()){ faultActionStr.append("(") faultActionStr.append(MsgFmData.FaultAction.getFaultActionCode(level)) faultActionStr.append(")") } + if(MsgFmData.FaultAction.getFaultAction(level).isNotBlank() || MsgFmData.FaultAction.getFaultActionCode(level).isNotBlank()){ + faultActionStr.append("/") + } + } + if(faultActionStr.length > 5){ + if(faultActionStr.endsWith("/")){ + faultActionStr.deleteCharAt(faultActionStr.lastIndex) + } + holder.tvFmActionOpen.text = faultActionStr.toString() + holder.tvFmActionNormal.text = faultActionStr.toString() + }else{ + holder.tvFmActionOpen.text = "建议操作：暂无" + holder.tvFmActionNormal.text = "建议操作：暂无" } - holder.tvFmActionOpen.text = faultActionStr.toString() - holder.tvFmActionNormal.text = faultActionStr.toString() }else{ holder.tvFmActionOpen.text = "建议操作：暂无" holder.tvFmActionNormal.text = "建议操作：暂无" @@ -242,13 +256,17 @@ class DriverMsgBoxListAdapter(private val activity: Activity) : fmInfoMsg.fmInfoList!!.forEach { info-> if(info.faultResultCount != 0){ info.faultResultList.forEach { result-> - fmFaultResult.append(MsgFmData.FaultResult.getResultDefine(result)) + if(MsgFmData.FaultResult.getResultDefine(result).isNotBlank()){ + fmFaultResult.append(MsgFmData.FaultResult.getResultDefine(result)) + } if(result.isNotBlank()){ fmFaultResult.append("(") fmFaultResult.append(result) fmFaultResult.append(")") } - fmFaultResult.append("/") + if(MsgFmData.FaultResult.getResultDefine(result).isNotBlank() || result.isNotBlank()){ + fmFaultResult.append("/") + } } } }