diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/DriverMsgBoxBubbleAdapter.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/DriverMsgBoxBubbleAdapter.kt index 96f6000687..1c4e6a7a75 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/DriverMsgBoxBubbleAdapter.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/DriverMsgBoxBubbleAdapter.kt @@ -251,7 +251,11 @@ class DriverMsgBoxBubbleAdapter(private val activity: Activity) : RecyclerView.A val faultAction = MsgFmData.FaultAction.getFaultAction(curFaultLevel) //当出现多个建议操作时,按照整车下电重启、请求人工驾驶接管、请求平行驾驶接管、系统重启、联系硬件工程师、 // 联系运维工程师、联系软件工程师优先级递减的顺序,只展示最高优先级的内容 - holder.tvBubbleFmFaultAction.text = "${faultAction}(${MsgFmData.FaultAction.getFaultActionCode(curFaultLevel)})" + if(curFaultLevel == 0){ + holder.tvBubbleFmFaultAction.text = "建议操作:暂无" + }else{ + holder.tvBubbleFmFaultAction.text = "${faultAction}(${MsgFmData.FaultAction.getFaultActionCode(curFaultLevel)})" + } } } } 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 0fd316e508..555e692b59 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 @@ -192,9 +192,11 @@ class DriverMsgBoxListAdapter(private val activity: Activity) : receiveFaultLevel.sorted() receiveFaultLevel.forEach {level-> faultActionStr.append(MsgFmData.FaultAction.getFaultAction(level)) - faultActionStr.append("(") - faultActionStr.append(MsgFmData.FaultAction.getFaultActionCode(level)) - faultActionStr.append(")") + if(MsgFmData.FaultAction.getFaultActionCode(level).isNotBlank()){ + faultActionStr.append("(") + faultActionStr.append(MsgFmData.FaultAction.getFaultActionCode(level)) + faultActionStr.append(")") + } } holder.tvFmActionOpen.text = faultActionStr.toString() holder.tvFmActionNormal.text = faultActionStr.toString() @@ -213,9 +215,11 @@ class DriverMsgBoxListAdapter(private val activity: Activity) : fmFaultReason.append("故障原因:") for((index,info) in fmInfoMsg.fmInfoList!!.withIndex()){ fmFaultReason.append(info.faultName) - fmFaultReason.append("(") - fmFaultReason.append(info.faultId) - fmFaultReason.append(")") + if(info.faultId.isNotBlank()){ + fmFaultReason.append("(") + fmFaultReason.append(info.faultId) + fmFaultReason.append(")") + } if(index!=(fmInfoMsg.fmInfoList!!.size-1)){ fmFaultReason.append("/") } @@ -232,9 +236,11 @@ class DriverMsgBoxListAdapter(private val activity: Activity) : if(info.faultResultCount != 0){ info.faultResultList.forEach { result-> fmFaultResult.append(MsgFmData.FaultResult.getResultDefine(result)) - fmFaultResult.append("(") - fmFaultResult.append(result) - fmFaultResult.append(")") + if(result.isNotBlank()){ + fmFaultResult.append("(") + fmFaultResult.append(result) + fmFaultResult.append(")") + } fmFaultResult.append("/") } }