From 5292f9ec4c42cdb939562efa6bc1d106ba6d1cea Mon Sep 17 00:00:00 2001
From: donghongyu <donghongyu@zhidaoauto.com>
Date: Wed, 27 Apr 2022 10:36:26 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=8CChange=E3=80=8D=20=E4=BF=AE=E6=AD=A3?=
 =?UTF-8?q?=E8=B0=83=E8=AF=95=E9=9D=A2=E6=9D=BF=E6=8E=A7=E4=BB=B6=E5=8F=A0?=
 =?UTF-8?q?=E5=8A=A0=E5=88=B0=E4=B8=80=E8=B5=B7=E5=88=B0bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
---
 .../main/res/layout/view_debug_setting.xml    | 134 +++++++++---------
 1 file changed, 65 insertions(+), 69 deletions(-)

diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml
index 1a2c79a96c..e6ad801c09 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml
@@ -12,7 +12,8 @@
         android:layout_width="match_parent"
         android:layout_height="@dimen/dp_350"
         android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="parent">
+        app:layout_constraintBottom_toBottomOf="parent"
+        tools:visibility="visible">
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
@@ -23,147 +24,131 @@
                 android:layout_width="match_parent"
                 android:layout_height="6dp"
                 android:background="#F0F0F0"
-                app:layout_constraintTop_toTopOf="parent"
-                />
+                app:layout_constraintTop_toTopOf="parent" />
 
             <ToggleButton
                 android:id="@+id/tbReportMore"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                app:layout_constraintTop_toBottomOf="@id/vReportLine"
-                app:layout_constraintRight_toRightOf="parent"
-                android:textOff="打开历史"
-                android:textOn="关闭历史"
-                android:textSize="@dimen/dp_24"
-                android:padding="10dp"
+                android:background="@null"
                 android:drawableEnd="@drawable/icon_right"
                 android:drawablePadding="5dp"
                 android:gravity="center"
-                android:background="@null"
-                />
+                android:padding="10dp"
+                android:textOff="打开历史"
+                android:textOn="关闭历史"
+                android:textSize="@dimen/dp_24"
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/vReportLine" />
 
             <TextView
                 android:id="@+id/tvReportSrc"
                 style="@style/DebugSettingText"
                 android:layout_width="0dp"
                 android:layout_height="0dp"
-                app:layout_constraintTop_toBottomOf="@id/vReportLine"
+                app:layout_constraintBottom_toBottomOf="@id/tbReportMore"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintRight_toLeftOf="@id/tbReportMore"
-                app:layout_constraintTop_toTopOf="@id/tbReportMore"
-                app:layout_constraintBottom_toBottomOf="@id/tbReportMore"
-                />
+                app:layout_constraintTop_toBottomOf="@id/vReportLine"
+                app:layout_constraintTop_toTopOf="@id/tbReportMore" />
 
             <View
                 android:id="@+id/vReportSrcLine"
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
                 android:background="#F0F0F0"
-                app:layout_constraintTop_toBottomOf="@id/tbReportMore"
-                />
+                app:layout_constraintTop_toBottomOf="@id/tbReportMore" />
 
             <TextView
                 android:id="@+id/tvReportLevel"
                 style="@style/DebugSettingText"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                app:layout_constraintTop_toBottomOf="@id/vReportSrcLine"
-                />
+                app:layout_constraintTop_toBottomOf="@id/vReportSrcLine" />
 
             <View
                 android:id="@+id/vReportLevelLine"
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
                 android:background="#F0F0F0"
-                app:layout_constraintTop_toBottomOf="@id/tvReportLevel"
-                />
+                app:layout_constraintTop_toBottomOf="@id/tvReportLevel" />
 
             <TextView
                 android:id="@+id/tvReportMsg"
                 style="@style/DebugSettingText"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                app:layout_constraintTop_toBottomOf="@id/vReportLevelLine"/>
+                app:layout_constraintTop_toBottomOf="@id/vReportLevelLine" />
 
             <View
                 android:id="@+id/vReportMsgLine"
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
                 android:background="#F0F0F0"
-                app:layout_constraintTop_toBottomOf="@id/tvReportMsg"
-                />
+                app:layout_constraintTop_toBottomOf="@id/tvReportMsg" />
 
             <TextView
                 android:id="@+id/tvReportCode"
                 style="@style/DebugSettingText"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                app:layout_constraintTop_toBottomOf="@id/vReportMsgLine"
-                />
+                app:layout_constraintTop_toBottomOf="@id/vReportMsgLine" />
 
             <View
                 android:id="@+id/vReportCodeLine"
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
                 android:background="#F0F0F0"
-                app:layout_constraintTop_toBottomOf="@id/tvReportCode"
-                />
+                app:layout_constraintTop_toBottomOf="@id/tvReportCode" />
 
             <TextView
                 android:id="@+id/tvReportResult"
                 style="@style/DebugSettingText"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                app:layout_constraintTop_toBottomOf="@id/vReportCodeLine"
-                />
+                app:layout_constraintTop_toBottomOf="@id/vReportCodeLine" />
 
             <View
                 android:id="@+id/vReportResultLine"
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
                 android:background="#F0F0F0"
-                app:layout_constraintTop_toBottomOf="@id/tvReportResult"
-                />
+                app:layout_constraintTop_toBottomOf="@id/tvReportResult" />
 
             <TextView
                 android:id="@+id/tvReportActions"
                 style="@style/DebugSettingText"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                app:layout_constraintTop_toBottomOf="@id/vReportResultLine"
-                />
+                app:layout_constraintTop_toBottomOf="@id/vReportResultLine" />
 
             <View
                 android:id="@+id/vReportActionsLine"
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
                 android:background="#F0F0F0"
-                app:layout_constraintTop_toBottomOf="@id/tvReportActions"
-                />
+                app:layout_constraintTop_toBottomOf="@id/tvReportActions" />
 
             <TextView
                 android:id="@+id/tvReportSec"
                 style="@style/DebugSettingText"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                app:layout_constraintTop_toBottomOf="@id/vReportActionsLine"
-                />
+                app:layout_constraintTop_toBottomOf="@id/vReportActionsLine" />
 
             <View
                 android:id="@+id/vReportSecLine"
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
                 android:background="#F0F0F0"
-                app:layout_constraintTop_toBottomOf="@id/tvReportSec"
-                />
+                app:layout_constraintTop_toBottomOf="@id/tvReportSec" />
 
             <TextView
                 android:id="@+id/tvReportNSec"
                 style="@style/DebugSettingText"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                app:layout_constraintTop_toBottomOf="@id/vReportSecLine"
-                />
+                app:layout_constraintTop_toBottomOf="@id/vReportSecLine" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -272,7 +257,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
-                android:visibility="gone">
+                android:visibility="gone"
+                tools:visibility="visible">
 
                 <TextView
                     android:id="@+id/tvAppVersionName"
@@ -413,7 +399,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
-                android:visibility="gone">
+                android:visibility="gone"
+                tools:visibility="visible">
 
                 <TextView
                     android:id="@+id/tvServerEnvironment"
@@ -510,7 +497,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
-                android:visibility="gone">
+                android:visibility="gone"
+                tools:visibility="visible">
 
                 <ToggleButton
                     android:id="@+id/tbDomainController"
@@ -527,7 +515,8 @@
                     android:id="@+id/domainControllerLayout"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:visibility="gone">
+                    android:visibility="gone"
+                    tools:visibility="visible">
 
                     <TextView
                         android:id="@+id/tvAutopilotInfo"
@@ -711,7 +700,8 @@
                         android:visibility="gone"
                         app:layout_constraintLeft_toLeftOf="parent"
                         app:layout_constraintRight_toLeftOf="@id/btnSystemRestart"
-                        app:layout_constraintTop_toBottomOf="@id/recordPackageDivider" />
+                        app:layout_constraintTop_toBottomOf="@id/recordPackageDivider"
+                        tools:visibility="visible" />
 
                     <Button
                         android:id="@+id/btnSystemRestart"
@@ -721,7 +711,8 @@
                         android:visibility="gone"
                         app:layout_constraintLeft_toRightOf="@id/btnSystemUpgrade"
                         app:layout_constraintRight_toRightOf="parent"
-                        app:layout_constraintTop_toBottomOf="@id/recordPackageDivider" />
+                        app:layout_constraintTop_toBottomOf="@id/recordPackageDivider"
+                        tools:visibility="visible" />
 
 
                     <TextView
@@ -770,7 +761,8 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:orientation="vertical"
-                    android:visibility="gone">
+                    android:visibility="gone"
+                    tools:visibility="visible">
 
                     <TextView
                         android:id="@+id/tvSteeringInfo"
@@ -813,7 +805,8 @@
                     android:id="@+id/obuControllerLayout"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:visibility="gone">
+                    android:visibility="gone"
+                    tools:visibility="visible">
 
                     <Button
                         android:id="@+id/btnSetObuIP"
@@ -895,7 +888,8 @@
                     android:id="@+id/eagleEyeControllerLayout"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:visibility="gone">
+                    android:visibility="gone"
+                    tools:visibility="visible">
 
                     <Button
                         android:id="@+id/btnBrakeThreshold"
@@ -1003,7 +997,8 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:columnCount="2"
-                    android:visibility="gone">
+                    android:visibility="gone"
+                    tools:visibility="visible">
 
                     <ToggleButton
                         android:id="@+id/tbChangeCurrentSkinMode"
@@ -1115,7 +1110,7 @@
                         android:gravity="center"
                         android:textOff="打开「加速度面板」"
                         android:textOn="关闭「加速度面板」"
-                        android:textSize="@dimen/dp_24"/>
+                        android:textSize="@dimen/dp_24" />
 
                     <androidx.appcompat.widget.AppCompatEditText
                         android:id="@+id/etThreshold"
@@ -1123,14 +1118,14 @@
                         android:layout_height="wrap_content"
                         android:layout_columnWeight="1"
                         android:layout_margin="2dp"
-                        android:paddingTop="5dp"
-                        android:paddingBottom="5dp"
                         android:background="@drawable/debug_setting_edit_bg"
                         android:gravity="center"
-                        android:textSize="14sp"
                         android:hint="过滤阈值"
+                        android:paddingTop="5dp"
+                        android:paddingBottom="5dp"
+                        android:textSize="14sp"
                         android:visibility="gone"
-                        />
+                        tools:visibility="visible" />
 
                     <Button
                         android:id="@+id/btnThresholdDefine"
@@ -1142,7 +1137,7 @@
                         android:text="设置加速度变化幅度过滤阈值"
                         android:textSize="@dimen/dp_24"
                         android:visibility="gone"
-                        />
+                        tools:visibility="visible" />
 
 
                 </GridLayout>
@@ -1162,7 +1157,8 @@
                     android:id="@+id/hdMapControllerLayout"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:visibility="gone">
+                    android:visibility="gone"
+                    tools:visibility="visible">
 
                     <Button
                         android:id="@+id/changesight_top_btn"
@@ -1367,6 +1363,7 @@
                         android:id="@+id/tbIsDemoMode"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
+                        android:layout_margin="2dp"
                         android:padding="@dimen/dp_10"
                         android:textColor="#000"
                         android:textOff="开启美化模式"
@@ -1380,6 +1377,7 @@
                         android:id="@+id/tbIsDrawAutopilotTrajectoryData"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
+                        android:layout_margin="2dp"
                         android:padding="@dimen/dp_10"
                         android:textColor="#000"
                         android:textOff="强制绘制引导线"
@@ -1387,14 +1385,12 @@
                         android:textSize="@dimen/dp_24"
                         app:layout_constraintLeft_toRightOf="@id/tbIsDemoMode"
                         app:layout_constraintRight_toRightOf="parent"
-                        app:layout_constraintTop_toBottomOf="@id/btnOpenObuFusion"
-
-
-                        />
+                        app:layout_constraintTop_toTopOf="@id/tbIsDemoMode" />
 
                     <ToggleButton
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
+                        android:layout_margin="2dp"
                         android:padding="@dimen/dp_10"
                         android:textColor="#000"
                         android:textOff="强制绘制路径规划"
@@ -1479,7 +1475,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
-                android:visibility="gone">
+                android:visibility="gone"
+                tools:visibility="visible">
 
                 <com.google.android.flexbox.FlexboxLayout
                     android:id="@+id/flLogControl"
@@ -1531,8 +1528,7 @@
                         android:gravity="center"
                         android:textOff="打开「网络」Log"
                         android:textOn="关闭「网络」Log"
-                        android:textSize="@dimen/dp_24"
-                        />
+                        android:textSize="@dimen/dp_24" />
 
                     <ToggleButton
                         android:id="@+id/tbObuLog"
@@ -1542,8 +1538,7 @@
                         android:gravity="center"
                         android:textOff="打开「OBU」Log"
                         android:textOn="关闭「OBU」Log"
-                        android:textSize="@dimen/dp_24"
-                        />
+                        android:textSize="@dimen/dp_24" />
 
 
                 </com.google.android.flexbox.FlexboxLayout>
@@ -1769,7 +1764,8 @@
                 android:id="@+id/apkCenterLayout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:visibility="gone">
+                android:visibility="gone"
+                tools:visibility="visible">
 
                 <ImageView
                     android:id="@+id/ivApkSearch"