From 92aabd73664e778aa5a1b7522691a49ab9458c87 Mon Sep 17 00:00:00 2001
From: xuxinchao <xuxinchao@zhidaoauto.com>
Date: Tue, 21 Nov 2023 14:36:17 +0800
Subject: [PATCH] =?UTF-8?q?[6.2.0]=E6=B6=88=E6=81=AF=E7=9B=92=E5=AD=90FM?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=BC=98=E5=8C=96=E6=98=BE=E7=A4=BA=EF=BC=8C?=
 =?UTF-8?q?=E6=8B=AC=E5=8F=B7=E5=86=85=E5=AE=B9=E4=B8=BA=E7=A9=BA=E6=97=B6?=
 =?UTF-8?q?=E4=B8=8D=E5=B1=95=E7=A4=BA=E6=8B=AC=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../adapter/DriverMsgBoxBubbleAdapter.kt      |  6 ++++-
 .../msgbox/adapter/DriverMsgBoxListAdapter.kt | 24 ++++++++++++-------
 2 files changed, 20 insertions(+), 10 deletions(-)

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