From 70e6ed7a9c28bf401450ab8cb8ee93d3322c7c25 Mon Sep 17 00:00:00 2001
From: xuxinchao <xuxinchao@zhidaoauto.com>
Date: Wed, 28 Feb 2024 14:46:45 +0800
Subject: [PATCH] =?UTF-8?q?[6.3.0]=E5=8F=B8=E6=9C=BA=E7=AB=AF=E5=B7=A5?=
 =?UTF-8?q?=E5=85=B7=E7=AE=B1=E5=A2=9E=E5=8A=A0=E7=B3=BB=E7=BB=9F=E9=87=8D?=
 =?UTF-8?q?=E5=90=AF=E6=8C=89=E9=92=AE=EF=BC=8C=E5=B9=B6=E9=9A=90=E8=97=8F?=
 =?UTF-8?q?=E5=BD=95=E5=8C=85=E7=AE=A1=E7=90=86=E5=92=8C=E5=BD=95=E5=8C=85?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hmi/ui/tools/AutoPilotAndCheckView.kt     |  7 --
 .../main/res/layout/view_auto_pilot_check.xml | 96 ++-----------------
 .../src/main/res/layout/view_check_system.xml |  2 +-
 3 files changed, 10 insertions(+), 95 deletions(-)

diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotAndCheckView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotAndCheckView.kt
index fa9831f93b..1c4f93d462 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotAndCheckView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotAndCheckView.kt
@@ -136,18 +136,11 @@ internal class AutoPilotAndCheckView @JvmOverloads constructor(
         sopLayout.setOnClickListener {
             clickListener?.showSOPSettingView()
         }
-        managerLayout.setOnClickListener {
-            //录包管理页面
-            clickListener?.showBadCaseManagerView()
-        }
         //BadCase上报
         CallerDevaToolsManager.initAiCollect(badCaseLayout)
         ivDebugPanel.setOnClickListener {
             clickListener?.showDebugPanelView()
         }
-        ivDebugFeedback.onClick {
-            clickListener?.showFeedbackView()
-        }
 
         if (AppConfigInfo.isConnectAutopilot) {
             CallerAutoPilotControlManager.getCarConfig()
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_auto_pilot_check.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_auto_pilot_check.xml
index 3995b40c50..dce7960ed1 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_auto_pilot_check.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_auto_pilot_check.xml
@@ -72,28 +72,26 @@
                 </RelativeLayout>
 
                 <RelativeLayout
-                    android:id="@+id/feedback"
+                    android:id="@+id/badCaseLayout"
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_height="@dimen/dp_216"
                     android:layout_marginStart="142dp">
 
                     <ImageView
-                        android:id="@+id/ivDebugFeedback"
                         android:layout_width="150dp"
                         android:layout_height="150dp"
                         android:layout_centerHorizontal="true"
-                        android:background="@drawable/debug_icon_feedback" />
+                        android:background="@drawable/debug_icon_bad_case" />
 
                     <TextView
-                        android:id="@+id/tvDebugFeedback"
                         android:layout_width="wrap_content"
                         android:layout_height="42dp"
                         android:layout_alignParentBottom="true"
                         android:layout_centerHorizontal="true"
-                        android:layout_marginTop="23dp"
-                        android:text="@string/debug_panel_fb"
+                        android:text="@string/debug_bad_case_report"
                         android:textColor="@color/color_FFA7B6F0"
                         android:textSize="32dp" />
+
                 </RelativeLayout>
 
                 <RelativeLayout
@@ -148,57 +146,14 @@
 
             </RelativeLayout>
 
-            <RelativeLayout
-                android:id="@+id/managerLayout"
+            <com.mogo.eagle.core.function.hmi.ui.widget.CheckSystemView
+                android:id="@+id/checkSystemView"
                 android:layout_width="wrap_content"
                 android:layout_height="@dimen/dp_216"
-                android:layout_marginStart="142dp"
                 app:layout_constraintBottom_toBottomOf="@id/sopLayout"
                 app:layout_constraintLeft_toRightOf="@id/sopLayout"
-                app:layout_constraintTop_toTopOf="@id/sopLayout">
+                app:layout_constraintTop_toTopOf="@id/sopLayout" />
 
-                <ImageView
-                    android:layout_width="150dp"
-                    android:layout_height="150dp"
-                    android:layout_centerHorizontal="true"
-                    android:background="@drawable/debug_icon_bag_manager" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="42dp"
-                    android:layout_alignParentBottom="true"
-                    android:layout_centerHorizontal="true"
-                    android:text="@string/debug_bad_case_manager"
-                    android:textColor="@color/color_FFA7B6F0"
-                    android:textSize="32dp" />
-
-            </RelativeLayout>
-
-            <RelativeLayout
-                android:id="@+id/badCaseLayout"
-                android:layout_width="wrap_content"
-                android:layout_height="@dimen/dp_216"
-                android:layout_marginStart="142dp"
-                app:layout_constraintBottom_toBottomOf="@id/managerLayout"
-                app:layout_constraintLeft_toRightOf="@id/managerLayout"
-                app:layout_constraintTop_toTopOf="@id/managerLayout">
-
-                <ImageView
-                    android:layout_width="150dp"
-                    android:layout_height="150dp"
-                    android:layout_centerHorizontal="true"
-                    android:background="@drawable/debug_icon_bad_case" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="42dp"
-                    android:layout_alignParentBottom="true"
-                    android:layout_centerHorizontal="true"
-                    android:text="@string/debug_bad_case_report"
-                    android:textColor="@color/color_FFA7B6F0"
-                    android:textSize="32dp" />
-
-            </RelativeLayout>
 
             <TextView
                 android:id="@+id/tv_check_title"
@@ -316,39 +271,6 @@
 
             </androidx.constraintlayout.widget.ConstraintLayout>
 
-            <View
-                android:layout_width="14dp"
-                android:layout_height="50dp"
-                android:layout_marginStart="80dp"
-                android:layout_marginTop="94dp"
-                android:background="@color/color_FF2966EC"
-                android:visibility="gone"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/clSpeedSet" />
-
-            <TextView
-                android:id="@+id/tvSystemOperation"
-                android:layout_width="168dp"
-                android:layout_height="86dp"
-                android:layout_marginStart="113dp"
-                android:layout_marginTop="76dp"
-                android:gravity="center"
-                android:text="@string/check_system_operation"
-                android:textColor="@color/color_FFFFFF"
-                android:textSize="42dp"
-                android:visibility="gone"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/clSpeedSet" />
-
-            <com.mogo.eagle.core.function.hmi.ui.widget.CheckSystemView
-                android:id="@+id/checkSystemView"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="40dp"
-                android:visibility="gone"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/tvSystemOperation" />
-
             <View
                 android:id="@+id/viewSystemVersion"
                 android:layout_width="14dp"
@@ -357,7 +279,7 @@
                 android:layout_marginTop="94dp"
                 android:background="@color/color_FF2966EC"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/checkSystemView" />
+                app:layout_constraintTop_toBottomOf="@id/clSpeedSet" />
 
             <TextView
                 android:id="@+id/tvSystemVersion"
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_check_system.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_check_system.xml
index b269b8d7e6..75bb525735 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_check_system.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_check_system.xml
@@ -35,7 +35,7 @@
         android:id="@+id/viewCheckReboot"
         android:layout_width="150dp"
         android:layout_height="150dp"
-        android:layout_marginStart="113dp"
+        android:layout_marginStart="@dimen/dp_142"
         android:clickable="true"
         android:src="@drawable/check_reboot"
         app:layout_constraintLeft_toLeftOf="parent"