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-23 18:40:39 +08:00
parent 25153fecdc
commit bc86e638ec
2 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/msgbox/MsgFmData.kt
View File

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

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

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