From 8745eec4a14a4d44bea8639b4814e93535342eba Mon Sep 17 00:00:00 2001
From: xuxinchao <xuxinchao@zhidaoauto.com>
Date: Wed, 23 Oct 2024 15:10:52 +0800
Subject: [PATCH] =?UTF-8?q?[6.7.0]=E4=BF=AE=E5=A4=8D=E4=B8=8A=E6=8A=A5?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E9=80=89=E6=8B=A9=E2=80=9C=E6=95=85=E9=9A=9C?=
 =?UTF-8?q?=E5=8E=9F=E5=9B=A0=E2=80=9D=E5=90=8E=E5=87=BA=E7=8E=B0=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mogo/eagle/core/function/hmi/bone/BoneTabLayout.kt   | 8 ++++++--
 .../eagle/core/function/hmi/bone/tab/FaultReasonView.kt  | 2 ++
 .../src/main/res/layout/view_fault_reason.xml            | 9 +++++----
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/BoneTabLayout.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/BoneTabLayout.kt
index 77a49ee323..3cf42d5370 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/BoneTabLayout.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/BoneTabLayout.kt
@@ -107,13 +107,17 @@ class BoneTabLayout @JvmOverloads constructor(
 
         faultReasonView.setClickListener(object: FaultReasonView.ClickListener{
             override fun closeFaultReasonView() {
-                updateTabType(TabType.REPORT_INFO)
+                if(tabType == TabType.REPORT_INFO){
+                    updateTabType(TabType.REPORT_INFO)
+                }
             }
         })
 
         workOrderView.setClickListener(object: WorkOrderView.ClickListener{
             override fun closeWorkOrderView() {
-                updateTabType(TabType.REPORT_INFO)
+                if(tabType == TabType.REPORT_INFO){
+                    updateTabType(TabType.REPORT_INFO)
+                }
             }
         })
     }
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/FaultReasonView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/FaultReasonView.kt
index fab38a6847..48d414a11d 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/FaultReasonView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/FaultReasonView.kt
@@ -580,6 +580,8 @@ class FaultReasonView @JvmOverloads constructor(
             level2Name = ""
             level3Name = ""
             reportNote = "" //上报描述
+            tvUploadSuccess.visibility = View.GONE
+            faultReasonGroup.visibility = View.VISIBLE
         }
     }
 
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_fault_reason.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_fault_reason.xml
index 6e8e28b552..8a70f38525 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_fault_reason.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_fault_reason.xml
@@ -38,7 +38,8 @@
         android:textSize="@dimen/sp_32"
         app:layout_constraintTop_toTopOf="@id/tvFaultTitle"
         app:layout_constraintBottom_toBottomOf="@id/tvFaultTitle"
-        app:layout_constraintRight_toRightOf="@id/tvFaultType"
+        app:layout_constraintRight_toRightOf="@id/viewTitleBg"
+        android:layout_marginEnd="@dimen/dp_40"
         />
 
     <View
@@ -332,10 +333,10 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         app:constraint_referenced_ids="viewFaultTypeLabel,tvTypeTitle,tvFaultType,
-            viewFaultReasonLabel,tvFaultReasonTitle,viewFaultTimeLabel,
-            tvFaultTimeTitle,ivTimeReduce,tvOccurrenceTime,ivTimeAdd,
+            viewFaultReasonLabel,tvFaultReasonTitle,tvFaultReason,viewFaultTimeLabel,
+            tvFaultTimeTitle,viewTimeBg,ivTimeReduce,tvOccurrenceTime,ivTimeAdd,
             viewFaultNoteLabel,tvFaultNoteTitle,tvFaultNoteSupplement,
-            etNoteInput,ivNoteAudio,tvFaultReport,tvFaultCancel,tvFaultReason"
+            etNoteInput,ivNoteAudio,tvFaultReport,tvFaultCancel"
         />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file