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

[6.2.0]消息盒子FM信息优化显示，括号内容为空时不展示括号

Browse Source
This commit is contained in:
xuxinchao
2023-11-21 14:36:17 +08:00
parent 0df4447277
commit 92aabd7366
2 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/DriverMsgBoxBubbleAdapter.kt
View File

@@ -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)})"
}
}
}
}

24
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/DriverMsgBoxListAdapter.kt
View File

@@ -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("/")
}
}