From b31cbc58b11ef1662dbadf11644a961d222dd920 Mon Sep 17 00:00:00 2001
From: xuxinchao <xuxinchao@zhidaoauto.com>
Date: Thu, 27 Oct 2022 17:04:50 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E8=90=A5=E9=9D=A2=E6=9D=BF=E5=B8=83?=
 =?UTF-8?q?=E5=B1=80=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/res/layout/view_sop_setting.xml  | 353 +++++++++---------
 1 file changed, 185 insertions(+), 168 deletions(-)

diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_sop_setting.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_sop_setting.xml
index d95264b1c7..5644c7fbec 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_sop_setting.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_sop_setting.xml
@@ -1,183 +1,200 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="@dimen/dp_800"
     android:layout_height="@dimen/dp_1100"
-    android:background="#FFFFFF">
-    <!--绕障类功能-->
-    <ToggleButton
-        android:id="@+id/tbObstacleAvoidance"
+    android:background="#FFFFFF"
+    android:orientation="vertical">
+
+    <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="@dimen/dp_10"
-        android:background="@drawable/radio_button_normal_background_right"
-        android:textColor="#000"
-        android:textOff="开启绕障类功能"
-        android:textOn="关闭绕障类功能"
-        android:textSize="@dimen/dp_24"
-        app:layout_constraintTop_toTopOf="parent"
-        />
-    <!--危险障碍物颜色标记-->
-    <ToggleButton
-        android:id="@+id/tbMarkingObstacles"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="@dimen/dp_10"
-        android:background="@drawable/radio_button_normal_background_right"
-        android:textColor="#000"
-        android:textOff="开启「危险障碍物颜色标记」"
-        android:textOn="关闭「危险障碍物颜色标记」"
-        android:textSize="@dimen/dp_24"
-        app:layout_constraintTop_toBottomOf="@id/tbObstacleAvoidance"
-        />
-    <!--引导线动态效果-->
-    <ToggleButton
-        android:id="@+id/tbRouteDynamicEffect"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="@dimen/dp_10"
-        android:background="@drawable/radio_button_normal_background_right"
-        android:textColor="#000"
-        android:textOff="开启「引导线动态效果」"
-        android:textOn="关闭「引导线动态效果」"
-        android:textSize="@dimen/dp_24"
-        app:layout_constraintTop_toBottomOf="@id/tbMarkingObstacles"
-        />
-    <!--红绿灯标识-->
-    <ToggleButton
-        android:id="@+id/tbTrafficLight"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="@dimen/dp_10"
-        android:background="@drawable/radio_button_normal_background_right"
-        android:textColor="#000"
-        android:textOff="隐藏红绿灯标识"
-        android:textOn="展示红绿灯标识"
-        android:textSize="@dimen/dp_24"
-        app:layout_constraintTop_toBottomOf="@id/tbRouteDynamicEffect"
-        />
-    <!--限速标识-->
-    <ToggleButton
-        android:id="@+id/tbSpeedLimit"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="@dimen/dp_10"
-        android:background="@drawable/radio_button_normal_background_right"
-        android:textColor="#000"
-        android:textOff="展示限速标识"
-        android:textOn="隐藏限速标识"
-        android:textSize="@dimen/dp_24"
-        app:layout_constraintTop_toBottomOf="@id/tbTrafficLight"
-        />
+        android:layout_height="match_parent"
+        tools:ignore="UselessParent">
 
-    <ToggleButton
-        android:id="@+id/tbDemoMode"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="@dimen/dp_10"
-        android:background="@drawable/radio_button_normal_background_right"
-        android:textColor="#000"
-        android:textOff="开启美化模式"
-        android:textOn="关闭美化模式"
-        android:textSize="@dimen/dp_24"
-        app:layout_constraintTop_toBottomOf="@id/tbSpeedLimit"
-        />
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
 
-    <ToggleButton
-        android:id="@+id/tbRainMode"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="@dimen/dp_10"
-        android:background="@drawable/radio_button_normal_background_right"
-        android:textColor="#000"
-        android:textOff="开启雨天模式"
-        android:textOn="关闭雨天模式"
-        android:textSize="@dimen/dp_24"
-        app:layout_constraintTop_toBottomOf="@id/tbDemoMode"
-        />
+            <!--绕障类功能-->
+            <ToggleButton
+                android:id="@+id/tbObstacleAvoidance"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/dp_10"
+                android:background="@drawable/radio_button_normal_background_right"
+                android:textColor="#000"
+                android:textOff="开启绕障类功能"
+                android:textOn="关闭绕障类功能"
+                android:textSize="@dimen/dp_24"
+                app:layout_constraintTop_toTopOf="parent"
+                />
+            <!--危险障碍物颜色标记-->
+            <ToggleButton
+                android:id="@+id/tbMarkingObstacles"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/dp_10"
+                android:background="@drawable/radio_button_normal_background_right"
+                android:textColor="#000"
+                android:textOff="开启「危险障碍物颜色标记」"
+                android:textOn="关闭「危险障碍物颜色标记」"
+                android:textSize="@dimen/dp_24"
+                app:layout_constraintTop_toBottomOf="@id/tbObstacleAvoidance"
+                />
+            <!--引导线动态效果-->
+            <ToggleButton
+                android:id="@+id/tbRouteDynamicEffect"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/dp_10"
+                android:background="@drawable/radio_button_normal_background_right"
+                android:textColor="#000"
+                android:textOff="开启「引导线动态效果」"
+                android:textOn="关闭「引导线动态效果」"
+                android:textSize="@dimen/dp_24"
+                app:layout_constraintTop_toBottomOf="@id/tbMarkingObstacles"
+                />
+            <!--红绿灯标识-->
+            <ToggleButton
+                android:id="@+id/tbTrafficLight"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/dp_10"
+                android:background="@drawable/radio_button_normal_background_right"
+                android:textColor="#000"
+                android:textOff="隐藏红绿灯标识"
+                android:textOn="展示红绿灯标识"
+                android:textSize="@dimen/dp_24"
+                app:layout_constraintTop_toBottomOf="@id/tbRouteDynamicEffect"
+                />
+            <!--限速标识-->
+            <ToggleButton
+                android:id="@+id/tbSpeedLimit"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/dp_10"
+                android:background="@drawable/radio_button_normal_background_right"
+                android:textColor="#000"
+                android:textOff="展示限速标识"
+                android:textOn="隐藏限速标识"
+                android:textSize="@dimen/dp_24"
+                app:layout_constraintTop_toBottomOf="@id/tbTrafficLight"
+                />
 
-    <ToggleButton
-        android:id="@+id/tbObu"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="@dimen/dp_10"
-        android:background="@drawable/radio_button_normal_background_right"
-        android:textColor="#000"
-        android:textOff="关闭OBU"
-        android:textOn="开启OBU"
-        android:textSize="@dimen/dp_24"
-        app:layout_constraintTop_toBottomOf="@id/tbRainMode"
-        />
+            <ToggleButton
+                android:id="@+id/tbDemoMode"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/dp_10"
+                android:background="@drawable/radio_button_normal_background_right"
+                android:textColor="#000"
+                android:textOff="开启美化模式"
+                android:textOn="关闭美化模式"
+                android:textSize="@dimen/dp_24"
+                app:layout_constraintTop_toBottomOf="@id/tbSpeedLimit"
+                />
 
-    <TextView
-        android:id="@+id/tvSpeedThresholdTitle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tbObu"
-        android:text="变道速度阈值："
-        android:textSize="18sp"
-        android:textColor="#1A1A1A"
-        android:layout_margin="10dp"
-        />
+            <ToggleButton
+                android:id="@+id/tbRainMode"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/dp_10"
+                android:background="@drawable/radio_button_normal_background_right"
+                android:textColor="#000"
+                android:textOff="开启雨天模式"
+                android:textOn="关闭雨天模式"
+                android:textSize="@dimen/dp_24"
+                app:layout_constraintTop_toBottomOf="@id/tbDemoMode"
+                />
 
-    <ImageView
-        android:id="@+id/ivSpeedReduce"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintLeft_toRightOf="@id/tvSpeedThresholdTitle"
-        app:layout_constraintTop_toTopOf="@id/tvSpeedThresholdTitle"
-        app:layout_constraintBottom_toBottomOf="@id/tvSpeedThresholdTitle"
-        android:src="@drawable/icon_reduce"
-        android:padding="10dp"
-        />
+            <ToggleButton
+                android:id="@+id/tbObu"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/dp_10"
+                android:background="@drawable/radio_button_normal_background_right"
+                android:textColor="#000"
+                android:textOff="关闭OBU"
+                android:textOn="开启OBU"
+                android:textSize="@dimen/dp_24"
+                app:layout_constraintTop_toBottomOf="@id/tbRainMode"
+                />
 
-    <TextView
-        android:id="@+id/tvSpeed"
-        android:layout_width="wrap_content"
-        android:layout_height="0dp"
-        app:layout_constraintTop_toTopOf="@id/ivSpeedReduce"
-        app:layout_constraintBottom_toBottomOf="@id/ivSpeedReduce"
-        app:layout_constraintLeft_toRightOf="@id/ivSpeedReduce"
-        android:textSize="18sp"
-        android:gravity="center"
-        android:background="@drawable/debug_setting_edit_bg"
-        android:paddingStart="10dp"
-        android:paddingEnd="10dp"
-        android:layout_marginTop="5dp"
-        android:layout_marginBottom="5dp"
-        />
+            <TextView
+                android:id="@+id/tvSpeedThresholdTitle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/tbObu"
+                android:text="变道速度阈值："
+                android:textSize="18sp"
+                android:textColor="#1A1A1A"
+                android:layout_margin="10dp"
+                />
 
-    <ImageView
-        android:id="@+id/ivSpeedAdd"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintTop_toTopOf="@id/tvSpeed"
-        app:layout_constraintBottom_toBottomOf="@id/tvSpeed"
-        app:layout_constraintLeft_toRightOf="@id/tvSpeed"
-        android:src="@drawable/icon_add"
-        android:padding="10dp"
-        />
+            <ImageView
+                android:id="@+id/ivSpeedReduce"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:layout_constraintLeft_toRightOf="@id/tvSpeedThresholdTitle"
+                app:layout_constraintTop_toTopOf="@id/tvSpeedThresholdTitle"
+                app:layout_constraintBottom_toBottomOf="@id/tvSpeedThresholdTitle"
+                android:src="@drawable/icon_reduce"
+                android:padding="10dp"
+                />
 
-    <Button
-        android:id="@+id/btnSpeedSet"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintTop_toTopOf="@id/ivSpeedAdd"
-        app:layout_constraintBottom_toBottomOf="@id/ivSpeedAdd"
-        app:layout_constraintLeft_toRightOf="@id/ivSpeedAdd"
-        android:text="设置阈值"
-        android:layout_marginStart="10dp"
-        />
+            <TextView
+                android:id="@+id/tvSpeed"
+                android:layout_width="wrap_content"
+                android:layout_height="0dp"
+                app:layout_constraintTop_toTopOf="@id/ivSpeedReduce"
+                app:layout_constraintBottom_toBottomOf="@id/ivSpeedReduce"
+                app:layout_constraintLeft_toRightOf="@id/ivSpeedReduce"
+                android:textSize="18sp"
+                android:gravity="center"
+                android:background="@drawable/debug_setting_edit_bg"
+                android:paddingStart="10dp"
+                android:paddingEnd="10dp"
+                android:layout_marginTop="5dp"
+                android:layout_marginBottom="5dp"
+                />
 
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:layout_margin="10dp"
-        android:background="#F0F0F0"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/btnSpeedSet"
-        />
+            <ImageView
+                android:id="@+id/ivSpeedAdd"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:layout_constraintTop_toTopOf="@id/tvSpeed"
+                app:layout_constraintBottom_toBottomOf="@id/tvSpeed"
+                app:layout_constraintLeft_toRightOf="@id/tvSpeed"
+                android:src="@drawable/icon_add"
+                android:padding="10dp"
+                />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+            <Button
+                android:id="@+id/btnSpeedSet"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:layout_constraintTop_toTopOf="@id/ivSpeedAdd"
+                app:layout_constraintBottom_toBottomOf="@id/ivSpeedAdd"
+                app:layout_constraintLeft_toRightOf="@id/ivSpeedAdd"
+                android:text="设置阈值"
+                android:layout_marginStart="10dp"
+                />
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_margin="10dp"
+                android:background="#F0F0F0"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/btnSpeedSet"
+                />
+
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </ScrollView>
+
+</LinearLayout>
\ No newline at end of file