From d9e824630e80d4435c7f04b1f3356cb7b8345bb7 Mon Sep 17 00:00:00 2001
From: xuxinchao <xuxinchao@zhidaoauto.com>
Date: Thu, 2 Jan 2025 16:39:22 +0800
Subject: [PATCH] =?UTF-8?q?[6.9.0]=E9=AD=94=E6=96=B9=E8=A7=A6=E5=8F=91?=
 =?UTF-8?q?=E4=B8=BB=E5=8A=A8=E5=BD=95=E5=8C=85=E5=8F=8D=E9=A6=88=E9=9D=A2?=
 =?UTF-8?q?=E6=9D=BF=E8=B0=83=E6=95=B4UI=E9=A3=8E=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../badcase/biz/InitiativeBadCaseWindow.kt    |   8 +-
 .../res/layout/view_initiative_bad_case.xml   | 128 +++++++++++-------
 2 files changed, 82 insertions(+), 54 deletions(-)

diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/InitiativeBadCaseWindow.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/InitiativeBadCaseWindow.kt
index e76b7a819e..d1eba6f878 100644
--- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/InitiativeBadCaseWindow.kt
+++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/InitiativeBadCaseWindow.kt
@@ -176,8 +176,8 @@ class InitiativeBadCaseWindow constructor(activity: Activity) : View.OnTouchList
         }
         tvInitiativeNum.text = BadCaseConfig.windowNum.toString()
         BadCaseConfig.windowNum++
-        tvInitiativeTime.text = "时间：${millis2String(System.currentTimeMillis(),TimeUtils.getHourMinSecondFormat())}"
-        tvInitiativeIdentity.text = "身份：${BadCaseConfig.identity}"
+        tvInitiativeTime.text = millis2String(System.currentTimeMillis(),TimeUtils.getHourMinSecondFormat())
+        tvInitiativeIdentity.text = BadCaseConfig.identity
 
         //展示缓存数据
         if(BadCaseReasonStore.getInitiativeDataRecord().isNotEmpty()){
@@ -246,8 +246,8 @@ class InitiativeBadCaseWindow constructor(activity: Activity) : View.OnTouchList
             it.format = PixelFormat.RGBA_8888
             it.flags = WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE
             it.gravity = Gravity.START or Gravity.TOP
-            it.width = 859
-            it.height = 850
+            it.width = 908
+            it.height = 1306
             it.alpha = 1.0f
         }
     }
diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/layout/view_initiative_bad_case.xml b/core/function-impl/mogo-core-function-devatools/src/main/res/layout/view_initiative_bad_case.xml
index 1e7a03c1d0..f68f25bc58 100644
--- a/core/function-impl/mogo-core-function-devatools/src/main/res/layout/view_initiative_bad_case.xml
+++ b/core/function-impl/mogo-core-function-devatools/src/main/res/layout/view_initiative_bad_case.xml
@@ -1,41 +1,59 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.mogo.eagle.core.widget.RoundConstraintLayout
+<androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="@dimen/dp_859"
-    android:layout_height="@dimen/dp_850"
-    app:roundLayoutRadius="@dimen/dp_36"
-    android:background="#1B2966">
+    android:layout_width="@dimen/dp_908"
+    android:layout_height="@dimen/dp_1306"
+    android:background="@drawable/bg_passive_bad_case">
 
     <View
-        android:layout_width="match_parent"
+        android:id="@+id/viewInitiativeTitleBg"
+        android:layout_width="@dimen/dp_831"
         android:layout_height="@dimen/dp_102"
-        android:background="@drawable/ai_collect_title_bg"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        android:background="@drawable/bg_passive_bad_case_title"
+        android:layout_marginTop="@dimen/dp_32"
+        android:layout_marginStart="@dimen/dp_24"
+        />
+
+    <TextView
+        android:id="@+id/tvInitiativeTitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toTopOf="@id/viewInitiativeTitleBg"
+        app:layout_constraintLeft_toLeftOf="@id/viewInitiativeTitleBg"
+        android:textColor="@color/white"
+        android:textSize="@dimen/sp_45"
+        android:text="@string/passive_title"
+        android:layout_marginTop="@dimen/dp_20"
+        android:layout_marginStart="@dimen/dp_54"
         />
 
     <TextView
         android:id="@+id/tvInitiativeNum"
-        android:layout_width="@dimen/dp_108"
-        android:layout_height="@dimen/dp_102"
-        android:background="@drawable/icon_num_bg"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        android:textColor="#FFFFFFFF"
-        android:textSize="@dimen/sp_42"
+        android:layout_width="@dimen/dp_46"
+        android:layout_height="@dimen/dp_46"
+        app:layout_constraintTop_toTopOf="@id/tvInitiativeTitle"
+        app:layout_constraintBottom_toBottomOf="@id/tvInitiativeTitle"
+        app:layout_constraintLeft_toRightOf="@id/tvInitiativeTitle"
+        android:textColor="@color/white"
+        android:textSize="@dimen/sp_30"
         android:gravity="center"
-        android:text="1"
+        android:background="@drawable/bg_passive_bad_case_num"
+        android:layout_marginStart="@dimen/dp_10"
         />
 
     <TextView
         android:id="@+id/tvInitiativeTime"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:layout_constraintLeft_toRightOf="@id/tvInitiativeNum"
+        app:layout_constraintRight_toRightOf="@id/viewInitiativeTitleBg"
         app:layout_constraintTop_toTopOf="@id/tvInitiativeNum"
         app:layout_constraintBottom_toBottomOf="@id/tvInitiativeNum"
-        android:textColor="#FFFFFFFF"
-        android:textSize="@dimen/sp_34"
-        android:layout_marginStart="@dimen/dp_50"
+        android:textColor="#999999"
+        android:textSize="@dimen/sp_38"
+        android:layout_marginEnd="@dimen/dp_62"
         />
 
     <TextView
@@ -44,18 +62,28 @@
         android:layout_height="wrap_content"
         app:layout_constraintTop_toTopOf="@id/tvInitiativeNum"
         app:layout_constraintBottom_toBottomOf="@id/tvInitiativeNum"
-        app:layout_constraintRight_toRightOf="parent"
-        android:textColor="#FFFFFFFF"
-        android:textSize="@dimen/sp_34"
-        android:layout_marginEnd="@dimen/dp_50"
+        app:layout_constraintRight_toLeftOf="@id/tvInitiativeTime"
+        android:textColor="#999999"
+        android:textSize="@dimen/sp_38"
+        android:layout_marginEnd="@dimen/dp_39"
+        />
+
+    <View
+        android:layout_width="@dimen/dp_1"
+        android:layout_height="@dimen/dp_40"
+        app:layout_constraintTop_toTopOf="@id/tvInitiativeIdentity"
+        app:layout_constraintBottom_toBottomOf="@id/tvInitiativeIdentity"
+        app:layout_constraintLeft_toRightOf="@id/tvInitiativeIdentity"
+        app:layout_constraintRight_toLeftOf="@id/tvInitiativeTime"
+        android:background="#999999"
         />
 
     <ScrollView
-        android:layout_width="match_parent"
+        android:layout_width="@dimen/dp_0"
         android:layout_height="@dimen/dp_0"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tvInitiativeNum"
+        app:layout_constraintLeft_toLeftOf="@id/viewInitiativeTitleBg"
+        app:layout_constraintRight_toRightOf="@id/viewInitiativeTitleBg"
+        app:layout_constraintTop_toBottomOf="@id/viewInitiativeTitleBg"
         app:layout_constraintBottom_toTopOf="@id/viewAudioBg"
         android:scrollbars="vertical"
         android:fadeScrollbars="false"
@@ -78,42 +106,42 @@
 
     <TextView
         android:id="@+id/tvInitiativeReport"
-        android:layout_width="@dimen/dp_370"
+        android:layout_width="@dimen/dp_335"
         android:layout_height="@dimen/dp_80"
-        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintLeft_toLeftOf="@id/viewInitiativeTitleBg"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintRight_toLeftOf="@id/tvInitiativeCancel"
-        android:background="@drawable/report_button_bg"
+        android:background="@drawable/bg_passive_report"
         android:text="上报"
-        android:textColor="#FFFFFF"
-        android:textSize="@dimen/dp_27"
+        android:textColor="@color/white"
+        android:textSize="@dimen/dp_36"
         android:gravity="center"
-        android:layout_marginBottom="@dimen/dp_40"
+        android:layout_marginBottom="@dimen/dp_100"
         />
 
     <TextView
         android:id="@+id/tvInitiativeCancel"
-        android:layout_width="@dimen/dp_370"
+        android:layout_width="@dimen/dp_335"
         android:layout_height="@dimen/dp_80"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintRight_toRightOf="@id/viewInitiativeTitleBg"
         app:layout_constraintLeft_toRightOf="@id/tvInitiativeReport"
         android:text="取消"
-        android:textColor="#FFFFFF"
-        android:textSize="@dimen/dp_27"
+        android:textColor="@color/white"
+        android:textSize="@dimen/sp_36"
         android:gravity="center"
-        android:background="@drawable/icon_cancel_bg"
-        android:layout_marginBottom="@dimen/dp_40"
+        android:background="@drawable/bg_passive_cancel"
+        android:layout_marginBottom="@dimen/dp_100"
         />
 
     <ImageView
         android:id="@+id/viewAudioBg"
-        android:layout_width="@dimen/dp_768"
-        android:layout_height="@dimen/dp_122"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintBottom_toTopOf="@id/tvInitiativeReport"
-        android:background="@drawable/icon_audio_bg"
+        android:layout_width="@dimen/dp_720"
+        android:layout_height="@dimen/dp_90"
+        app:layout_constraintLeft_toLeftOf="@id/viewInitiativeTitleBg"
+        app:layout_constraintRight_toRightOf="@id/viewInitiativeTitleBg"
+        app:layout_constraintBottom_toTopOf="@id/viewInitiativeTitleBg"
+        android:background="@drawable/bg_passive_audio"
         android:layout_marginBottom="@dimen/dp_40"
         />
 
@@ -136,8 +164,8 @@
 
     <ImageView
         android:id="@+id/viewAudioButton"
-        android:layout_width="@dimen/dp_34"
-        android:layout_height="@dimen/dp_48"
+        android:layout_width="@dimen/dp_48"
+        android:layout_height="@dimen/dp_62"
         app:layout_constraintLeft_toLeftOf="@id/viewAudioBg"
         app:layout_constraintRight_toRightOf="@id/viewAudioBg"
         app:layout_constraintTop_toTopOf="@id/viewAudioBg"
@@ -147,8 +175,8 @@
 
     <ImageView
         android:id="@+id/viewAudioStart"
-        android:layout_width="@dimen/dp_34"
-        android:layout_height="@dimen/dp_48"
+        android:layout_width="@dimen/dp_48"
+        android:layout_height="@dimen/dp_62"
         app:layout_constraintTop_toTopOf="@id/viewAudioBg"
         app:layout_constraintBottom_toBottomOf="@id/viewAudioBg"
         app:layout_constraintRight_toRightOf="@id/viewAudioBg"
@@ -157,4 +185,4 @@
         android:visibility="gone"
         />
 
-</com.mogo.eagle.core.widget.RoundConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file