From 79717282a9735769fe9c42409c5a6e9d1fecdf44 Mon Sep 17 00:00:00 2001
From: xuxinchao <xuxinchao@zhidaoauto.com>
Date: Mon, 20 Feb 2023 18:35:05 +0800
Subject: [PATCH] =?UTF-8?q?[2.14.0]=E6=B6=88=E6=81=AF=E7=9B=92=E5=AD=90?=
 =?UTF-8?q?=E8=BD=A6=E8=BE=86=E7=B3=BB=E7=BB=9F=E4=BF=A1=E6=81=AF=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=B6=88=E6=81=AF=E6=9D=A5=E6=BA=90=EF=BC=8C=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E6=8A=98=E5=8F=A0=E6=96=87=E5=AD=97=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../msgbox/adapter/DriverMsgBoxListAdapter.kt  |  6 ++++++
 .../res/layout/item_msg_box_ipc_report.xml     | 18 ++++++++++++++++--
 2 files changed, 22 insertions(+), 2 deletions(-)

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 9987bfaa74..a0e12d3a8e 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
@@ -143,6 +143,7 @@ class DriverMsgBoxListAdapter(private val activity: Activity) :
                     holder.tvReportTypeNormal.text = resultStr
                     holder.tvReportTypeOpen.text = resultStr
                     holder.tvReportReasonOpen.text = "原因：${reportEntity.msg}"
+                    holder.tvReportSrcOpen.text = "消息来源：${reportEntity.src}"
                     var actionStr = ""
                     for (action in reportEntity.actionsList) {
                         actionStr =
@@ -157,6 +158,7 @@ class DriverMsgBoxListAdapter(private val activity: Activity) :
                                 null,
                                 null
                             )
+                            holder.tvStatusSelect.text = "折叠"
                             holder.ivReportImageNormal.visibility = View.GONE
                             holder.tvReportLevelNormal.visibility = View.GONE
                             holder.tvReportTimeNormal.visibility = View.GONE
@@ -167,6 +169,7 @@ class DriverMsgBoxListAdapter(private val activity: Activity) :
                             holder.tvReportTimeOpen.visibility = View.VISIBLE
                             holder.tvReportTypeOpen.visibility = View.VISIBLE
                             holder.tvReportReasonOpen.visibility = View.VISIBLE
+                            holder.tvReportSrcOpen.visibility = View.VISIBLE
                             holder.tvReportActionOpen.visibility = View.VISIBLE
                         } else {
                             holder.tvStatusSelect.setCompoundDrawablesWithIntrinsicBounds(
@@ -175,6 +178,7 @@ class DriverMsgBoxListAdapter(private val activity: Activity) :
                                 null,
                                 null
                             )
+                            holder.tvStatusSelect.text = "展开"
                             holder.ivReportImageNormal.visibility = View.VISIBLE
                             holder.tvReportLevelNormal.visibility = View.VISIBLE
                             holder.tvReportTimeNormal.visibility = View.VISIBLE
@@ -185,6 +189,7 @@ class DriverMsgBoxListAdapter(private val activity: Activity) :
                             holder.tvReportTimeOpen.visibility = View.GONE
                             holder.tvReportTypeOpen.visibility = View.GONE
                             holder.tvReportReasonOpen.visibility = View.GONE
+                            holder.tvReportSrcOpen.visibility = View.GONE
                             holder.tvReportActionOpen.visibility = View.GONE
                         }
                     }
@@ -340,6 +345,7 @@ class DriverMsgBoxListAdapter(private val activity: Activity) :
         var tvReportTimeOpen: TextView = itemView.findViewById(R.id.tvReportTimeOpen)
         var tvReportTypeOpen: TextView = itemView.findViewById(R.id.tvReportTypeOpen)
         var tvReportReasonOpen: TextView = itemView.findViewById(R.id.tvReportReasonOpen)
+        var tvReportSrcOpen: TextView = itemView.findViewById(R.id.tvReportSrcOpen)
         var tvReportActionOpen: TextView = itemView.findViewById(R.id.tvReportActionOpen)
     }
 
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_box_ipc_report.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_box_ipc_report.xml
index 5911e16c42..29e1165bfb 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_box_ipc_report.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_box_ipc_report.xml
@@ -70,7 +70,7 @@
         android:id="@+id/tvStatusSelect"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="折叠"
+        android:text="展开"
         android:textColor="#FFFFFFFF"
         android:textSize="24dp"
         app:layout_constraintTop_toTopOf="parent"
@@ -163,12 +163,26 @@
         />
 
     <TextView
-        android:id="@+id/tvReportActionOpen"
+        android:id="@+id/tvReportSrcOpen"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         app:layout_constraintTop_toBottomOf="@id/tvReportReasonOpen"
         app:layout_constraintLeft_toLeftOf="@id/tvReportReasonOpen"
         app:layout_constraintRight_toRightOf="@id/tvStatusSelect"
+        android:textColor="#B3FFFFFF"
+        android:textSize="28dp"
+        android:gravity="start"
+        android:lineSpacingMultiplier="1.2"
+        android:visibility="gone"
+        />
+
+    <TextView
+        android:id="@+id/tvReportActionOpen"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toBottomOf="@id/tvReportSrcOpen"
+        app:layout_constraintLeft_toLeftOf="@id/tvReportSrcOpen"
+        app:layout_constraintRight_toRightOf="@id/tvStatusSelect"
         app:layout_constraintBottom_toBottomOf="parent"
         android:layout_marginBottom="15dp"
         android:textColor="#B3FFFFFF"