From 43822cb3f4bbdec692c76f184d5b7b64dfd17648 Mon Sep 17 00:00:00 2001
From: xuxinchao <xuxinchao@zhidaoauto.com>
Date: Mon, 18 Sep 2023 14:41:12 +0800
Subject: [PATCH] =?UTF-8?q?[6.1.0]=E8=BF=90=E8=90=A5=E9=9D=A2=E6=9D=BFUI?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/res/layout/view_sop_setting.xml  | 73 +++++++++++--------
 1 file changed, 42 insertions(+), 31 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 911d7794e8..3550ce2a70 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
@@ -53,10 +53,10 @@
                     app:layout_constraintStart_toStartOf="parent"
                     android:text="V2N总开关"
                     android:textSize="@dimen/sp_28"
-                    android:scaleX="1.4"
-                    android:scaleY="1.4"
-                    android:layout_marginStart="@dimen/dp_50"
-                    android:layout_marginTop="@dimen/dp_20"
+                    android:scaleX="1.2"
+                    android:scaleY="1.2"
+                    android:layout_marginStart="@dimen/dp_60"
+                    android:layout_marginTop="@dimen/dp_25"
                     />
 
                 <androidx.constraintlayout.widget.Guideline
@@ -66,7 +66,7 @@
                     app:layout_constraintLeft_toLeftOf="parent"
                     app:layout_constraintRight_toRightOf="parent"
                     android:orientation="vertical"
-                    app:layout_constraintGuide_percent="0.5"
+                    app:layout_constraintGuide_percent="0.55"
                     />
                 <!--V2N新链路-->
                 <androidx.appcompat.widget.SwitchCompat
@@ -80,7 +80,7 @@
                     app:layout_constraintLeft_toLeftOf="@id/scV2XSwitch"
                     app:layout_constraintRight_toRightOf="@id/v2xGuideLine"
                     app:layout_constraintTop_toBottomOf="@id/scV2NSwitch"
-                    android:layout_marginTop="@dimen/dp_20"
+                    android:layout_marginTop="@dimen/dp_25"
                     />
                 <!--V2N场景进PNC-->
                 <androidx.appcompat.widget.SwitchCompat
@@ -94,7 +94,7 @@
                     app:layout_constraintLeft_toLeftOf="@id/v2xGuideLine"
                     app:layout_constraintRight_toRightOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/scV2NSwitch"
-                    android:layout_marginTop="@dimen/dp_20"
+                    android:layout_marginTop="@dimen/dp_25"
                     />
                 <!--绿波通行-->
                 <androidx.appcompat.widget.SwitchCompat
@@ -105,10 +105,9 @@
                     android:textSize="@dimen/sp_28"
                     android:scaleX="1.2"
                     android:scaleY="1.2"
-                    app:layout_constraintLeft_toLeftOf="parent"
-                    app:layout_constraintRight_toRightOf="@id/v2xGuideLine"
+                    app:layout_constraintLeft_toLeftOf="@id/scNewV2NData"
                     app:layout_constraintTop_toBottomOf="@id/scNewV2NData"
-                    android:layout_marginTop="@dimen/dp_20"
+                    android:layout_marginTop="@dimen/dp_25"
                     />
                 <!--V2I总开关-->
                 <androidx.appcompat.widget.SwitchCompat
@@ -121,8 +120,8 @@
                     android:scaleY="1.2"
                     app:layout_constraintLeft_toLeftOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/scGreenWaveSop"
-                    android:layout_marginTop="@dimen/dp_20"
-                    android:layout_marginStart="@dimen/dp_20"
+                    android:layout_marginTop="@dimen/dp_25"
+                    android:layout_marginStart="@dimen/dp_60"
                     />
                 <!--V2I场景进PNC-->
                 <androidx.appcompat.widget.SwitchCompat
@@ -136,6 +135,8 @@
                     app:layout_constraintLeft_toLeftOf="parent"
                     app:layout_constraintRight_toRightOf="@id/v2xGuideLine"
                     app:layout_constraintTop_toBottomOf="@id/scV2ISwitch"
+                    android:layout_marginTop="@dimen/dp_25"
+                    android:layout_marginStart="@dimen/dp_10"
                     />
                 <!--闯红灯预警-->
                 <androidx.appcompat.widget.SwitchCompat
@@ -149,6 +150,7 @@
                     app:layout_constraintLeft_toLeftOf="@id/v2xGuideLine"
                     app:layout_constraintRight_toRightOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/scV2ISwitch"
+                    android:layout_marginTop="@dimen/dp_25"
                     />
                 <!--路侧弱势交通参与者-->
                 <androidx.appcompat.widget.SwitchCompat
@@ -159,9 +161,9 @@
                     android:textSize="@dimen/sp_28"
                     android:scaleX="1.2"
                     android:scaleY="1.2"
-                    app:layout_constraintLeft_toLeftOf="parent"
-                    app:layout_constraintRight_toRightOf="@id/v2xGuideLine"
+                    app:layout_constraintLeft_toLeftOf="@id/scV2iPnc"
                     app:layout_constraintTop_toBottomOf="@id/scV2iPnc"
+                    android:layout_marginTop="@dimen/dp_25"
                     />
                 <!--V2V总开关-->
                 <androidx.appcompat.widget.SwitchCompat
@@ -174,8 +176,8 @@
                     android:scaleY="1.2"
                     app:layout_constraintLeft_toLeftOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/scObuWeaknessTrafficSop"
-                    android:layout_marginTop="@dimen/dp_20"
-                    android:layout_marginStart="@dimen/dp_20"
+                    android:layout_marginTop="@dimen/dp_25"
+                    android:layout_marginStart="@dimen/dp_60"
                     />
                 <!--obu总开关-->
                 <androidx.appcompat.widget.SwitchCompat
@@ -188,8 +190,10 @@
                     android:scaleY="1.2"
                     app:layout_constraintLeft_toLeftOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/scObuV2vView"
-                    android:layout_marginTop="@dimen/dp_20"
-                    android:layout_marginStart="@dimen/dp_20"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    android:layout_marginTop="@dimen/dp_25"
+                    android:layout_marginStart="@dimen/dp_60"
+                    android:layout_marginBottom="@dimen/dp_10"
                     />
 
             </androidx.constraintlayout.widget.ConstraintLayout>
@@ -219,7 +223,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="地图效果类"
-                    android:textSize="@dimen/sp_30"
+                    android:textSize="@dimen/sp_36"
                     android:textColor="@color/black"
                     app:layout_constraintTop_toTopOf="parent"
                     app:layout_constraintLeft_toLeftOf="parent"
@@ -273,7 +277,9 @@
                     app:layout_constraintLeft_toLeftOf="parent"
                     app:layout_constraintRight_toRightOf="@id/mapGuideLine"
                     app:layout_constraintTop_toBottomOf="@id/scMarkingObstacles"
-                    android:layout_marginTop="@dimen/dp_20"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    android:layout_marginTop="@dimen/dp_25"
+                    android:layout_marginBottom="@dimen/dp_10"
                     android:text="点云效果"
                     android:textSize="@dimen/sp_28"
                     android:scaleX="1.2"
@@ -287,7 +293,9 @@
                     app:layout_constraintLeft_toLeftOf="@id/mapGuideLine"
                     app:layout_constraintRight_toRightOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/scRouteDynamicEffect"
-                    android:layout_marginTop="@dimen/dp_20"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    android:layout_marginTop="@dimen/dp_25"
+                    android:layout_marginBottom="@dimen/dp_10"
                     android:text="自车光圈"
                     android:textSize="@dimen/sp_28"
                     android:scaleX="1.2"
@@ -323,7 +331,7 @@
                     app:layout_constraintTop_toTopOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     android:text="与车相关类"
-                    android:textSize="@dimen/sp_30"
+                    android:textSize="@dimen/sp_36"
                     android:textColor="@color/black"
                     android:layout_marginStart="@dimen/dp_10"
                     android:layout_marginTop="@dimen/dp_10"
@@ -374,7 +382,7 @@
                     app:layout_constraintLeft_toLeftOf="parent"
                     app:layout_constraintRight_toRightOf="@id/vehicleGuideLine"
                     app:layout_constraintTop_toBottomOf="@id/scObstacleAvoidance"
-                    android:layout_marginTop="@dimen/dp_20"
+                    android:layout_marginTop="@dimen/dp_25"
                     android:text="雨天模式"
                     android:textSize="@dimen/sp_28"
                     android:scaleX="1.2"
@@ -388,7 +396,7 @@
                     app:layout_constraintLeft_toLeftOf="@id/vehicleGuideLine"
                     app:layout_constraintRight_toRightOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/scDemoMode"
-                    android:layout_marginTop="@dimen/dp_20"
+                    android:layout_marginTop="@dimen/dp_25"
                     android:text="弱网减速停车"
                     android:textSize="@dimen/sp_28"
                     android:scaleX="1.2"
@@ -402,7 +410,7 @@
                     app:layout_constraintLeft_toLeftOf="parent"
                     app:layout_constraintRight_toRightOf="@id/vehicleGuideLine"
                     app:layout_constraintTop_toBottomOf="@id/scRainMode"
-                    android:layout_marginTop="@dimen/dp_20"
+                    android:layout_marginTop="@dimen/dp_25"
                     android:text="故障减速停车"
                     android:textSize="@dimen/sp_28"
                     android:scaleX="1.2"
@@ -417,7 +425,8 @@
                     app:layout_constraintLeft_toLeftOf="parent"
                     app:layout_constraintRight_toRightOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/scFaultSlowDown"
-                    android:layout_marginStart="20dp"
+                    android:layout_marginStart="@dimen/dp_30"
+                    android:layout_marginTop="@dimen/dp_10"
                     >
 
                     <RadioButton
@@ -496,7 +505,7 @@
                     app:layout_constraintTop_toTopOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     android:text="其他"
-                    android:textSize="@dimen/sp_30"
+                    android:textSize="@dimen/sp_36"
                     android:textColor="@color/black"
                     android:layout_marginStart="@dimen/dp_10"
                     android:layout_marginTop="@dimen/dp_10"
@@ -549,7 +558,7 @@
                     android:text="异常上报提示"
                     android:scaleY="1.2"
                     android:scaleX="1.2"
-                    android:layout_marginTop="@dimen/dp_20"
+                    android:layout_marginTop="@dimen/dp_25"
                     />
                 <!--360环视-->
                 <androidx.appcompat.widget.SwitchCompat
@@ -562,7 +571,7 @@
                     android:text="360环视"
                     android:scaleY="1.2"
                     android:scaleX="1.2"
-                    android:layout_marginTop="@dimen/dp_20"
+                    android:layout_marginTop="@dimen/dp_25"
                     />
                 <!--是否展示被动录包弹窗-->
                 <androidx.appcompat.widget.SwitchCompat
@@ -572,10 +581,12 @@
                     app:layout_constraintLeft_toLeftOf="parent"
                     app:layout_constraintRight_toRightOf="@id/otherGuideLine"
                     app:layout_constraintTop_toBottomOf="@id/scIPCReport"
+                    app:layout_constraintBottom_toBottomOf="parent"
                     android:text="录包弹窗"
                     android:scaleY="1.2"
                     android:scaleX="1.2"
-                    android:layout_marginTop="@dimen/dp_20"
+                    android:layout_marginTop="@dimen/dp_25"
+                    android:layout_marginBottom="@dimen/dp_10"
                     />
 
             </androidx.constraintlayout.widget.ConstraintLayout>
@@ -672,7 +683,7 @@
                     app:layout_constraintEnd_toEndOf="parent"
                     android:padding="5dip"
                     android:background="@drawable/bg_mf_sop_operator"
-                    android:layout_marginTop="10dp"
+                    android:layout_marginTop="@dimen/dp_20"
                     android:layout_marginStart="15dp"
                     android:layout_marginEnd="15dp" >