From 8c5452d9953d12a9096bd18ef2a830126839aecf Mon Sep 17 00:00:00 2001
From: xuxinchao <xuxinchao@zhidaoauto.com>
Date: Sun, 19 Feb 2023 23:48:13 +0800
Subject: [PATCH] =?UTF-8?q?[2.14.0]SOP=E8=BF=90=E8=90=A5=E9=9D=A2=E6=9D=BF?=
 =?UTF-8?q?=E6=94=B9=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../function/hmi/ui/setting/SOPSettingView.kt |  61 ++-
 .../src/main/res/layout/view_sop_setting.xml  | 362 +++++++++---------
 2 files changed, 215 insertions(+), 208 deletions(-)

diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt
index a3a612b656..e85c990676 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt
@@ -103,28 +103,24 @@ class SOPSettingView @JvmOverloads constructor(
          * 限速数据来源开关
          */
         tbRoadLimitSpeedSop.setOnCheckedChangeListener { _, isChecked ->
-            //默认开启
+            //默认关闭
             HmiBuildConfig.isShowObuLimitSpeedView = isChecked
         }
 
         /**
          * obu V2V开关
          */
-        tbObuV2vView.isChecked = HmiBuildConfig.isShowObuV2vView
         tbObuV2vView.setOnCheckedChangeListener { _, isChecked ->
-            //默认开启
+            //默认关闭
             HmiBuildConfig.isShowObuV2vView = isChecked
-//            Log.e("liyz", "---2222-- v2v = ${HmiBuildConfig.isShowObuV2vView}")
         }
 
         /**
          * obu V2i开关
          */
-        tbObuV2iView.isChecked = HmiBuildConfig.isShowObuV2iView
         tbObuV2iView.setOnCheckedChangeListener { _, isChecked ->
             //默认关闭
             HmiBuildConfig.isShowObuV2iView = isChecked
-//            Log.d("liyz", "---2--- v2i = ${HmiBuildConfig.isShowObuV2iView}")
         }
 
         /**
@@ -161,7 +157,10 @@ class SOPSettingView @JvmOverloads constructor(
         // 演示模式,上一次勾选的数据
         tbDemoMode.isChecked = FunctionBuildConfig.isDemoMode
         // 演示模式
-        tbDemoMode.setOnCheckedChangeListener { _, _ ->
+        tbDemoMode.setOnCheckedChangeListener { compoundButton, _ ->
+            if(!compoundButton.isPressed){
+                return@setOnCheckedChangeListener
+            }
             FunctionBuildConfig.isDemoMode = !FunctionBuildConfig.isDemoMode
             CallerHmiManager.updateStatusBarLeftView(FunctionBuildConfig.isDemoMode, "demoMode", DemoModeView(context))
             CallerAutoPilotManager.setDemoMode(FunctionBuildConfig.isDemoMode)
@@ -179,7 +178,10 @@ class SOPSettingView @JvmOverloads constructor(
         // 雨天模式，上一次勾选的数据
         tbRainMode.isChecked = FunctionBuildConfig.isRainMode
         //雨天模式
-        tbRainMode.setOnCheckedChangeListener { _, isChecked ->
+        tbRainMode.setOnCheckedChangeListener { compoundButton, isChecked ->
+            if(!compoundButton.isPressed){
+                return@setOnCheckedChangeListener
+            }
             CallerAutoPilotManager.setRainMode(isChecked)
             FunctionBuildConfig.isRainMode = isChecked
         }
@@ -191,8 +193,12 @@ class SOPSettingView @JvmOverloads constructor(
         //OBU控制总开关
         tbObu.isChecked = CallerOBUManager.isConnected()
         tbObu.setOnCheckedChangeListener { _, isChecked ->
-            if (isChecked) {
-                CallerOBUManager.resetObuIpAddress("192.168.1.199")
+            if (!isChecked) {
+                if (AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode)) {
+                    CallerOBUManager.resetObuIpAddress("192.168.1.199")
+                } else if (AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)) {
+                    CallerOBUManager.resetObuIpAddress("192.168.1.199")
+                }
             } else {
                 //断开链接
                 CallerOBUManager.disConnectObu()
@@ -268,11 +274,8 @@ class SOPSettingView @JvmOverloads constructor(
     private val timerTaskRefresh = object : TimerTask(){
         override fun run() {
             UiThreadHandler.post{
-                if(FunctionBuildConfig.isDemoMode){
-                    tbDemoMode.text = "关闭美化模式"
-                }else{
-                    tbDemoMode.text = "开启美化模式"
-                }
+                tbDemoMode.isChecked = FunctionBuildConfig.isDemoMode
+                tbRainMode.isChecked = FunctionBuildConfig.isRainMode
             }
         }
 
@@ -282,39 +285,27 @@ class SOPSettingView @JvmOverloads constructor(
         when (type) {
             FuncBizConfig.BIZ_BEAUTY_MODE -> {
                 tbDemoMode.isClickable = !lock
-                val (left,top,right,bottom) = tbDemoMode.currentPadding()
-                if (lock) {
-                    tbDemoMode.background =
-                        resources.getDrawable(R.drawable.radio_button_lock_background)
-                } else {
-                    tbDemoMode.background =
-                        resources.getDrawable(R.drawable.radio_button_normal_background_right)
+                if(lock){
+                    tbDemoMode.visibility = View.INVISIBLE
+                }else{
+                    tbDemoMode.visibility = View.VISIBLE
                 }
-                tbDemoMode.setPadding(left,top,right,bottom)
             }
             FuncBizConfig.BIZ_RAIN_MODE -> {
                 tbRainMode.isClickable = !lock
-                val (left,top,right,bottom) = tbRainMode.currentPadding()
                 if (lock) {
-                    tbRainMode.background =
-                        resources.getDrawable(R.drawable.radio_button_lock_background)
+                    tbRainMode.visibility = View.INVISIBLE
                 } else {
-                    tbRainMode.background =
-                        resources.getDrawable(R.drawable.radio_button_normal_background_right)
+                    tbRainMode.visibility = View.VISIBLE
                 }
-                tbRainMode.setPadding(left,top,right,bottom)
             }
             FuncBizConfig.BIZ_PNC_WARNING -> {
                 tbMarkingObstacles.isClickable = !lock
-                val (left,top,right,bottom) = tbMarkingObstacles.currentPadding()
                 if (lock) {
-                    tbMarkingObstacles.background =
-                        resources.getDrawable(R.drawable.radio_button_lock_background)
+                    tbMarkingObstacles.visibility = View.INVISIBLE
                 } else {
-                    tbMarkingObstacles.background =
-                        resources.getDrawable(R.drawable.radio_button_normal_background_right)
+                    tbMarkingObstacles.visibility = View.VISIBLE
                 }
-                tbMarkingObstacles.setPadding(left,top,right,bottom)
             }
         }
     }
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 d6720d62b6..53f1efd8ba 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
@@ -16,205 +16,231 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
+            <androidx.constraintlayout.widget.Guideline
+                android:id="@+id/verticalGuideLine"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                app:layout_constraintGuide_percent="0.5"
+                />
+
             <!--绕障类功能-->
-            <ToggleButton
+            <androidx.appcompat.widget.SwitchCompat
                 android:id="@+id/tbObstacleAvoidance"
-                android:layout_width="match_parent"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_margin="@dimen/dp_10"
-                android:padding="@dimen/dp_20"
-                android:background="@drawable/radio_button_normal_background_right"
-                android:textColor="#000"
-                android:textOff="开启绕障类功能"
-                android:textOn="关闭绕障类功能"
-                android:textSize="@dimen/dp_24"
+                android:text="绕障类功能"
+                android:paddingTop="40dp"
+                android:paddingBottom="25dp"
+                android:scaleY="1.2"
+                android:scaleX="1.2"
                 app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toLeftOf="@id/verticalGuideLine"
                 />
+
             <!--危险障碍物颜色标记-->
-            <ToggleButton
+            <androidx.appcompat.widget.SwitchCompat
                 android:id="@+id/tbMarkingObstacles"
-                android:layout_width="match_parent"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_margin="@dimen/dp_10"
-                android:padding="@dimen/dp_20"
-                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"
+                android:text="危险障碍物颜色标记"
+                android:paddingTop="40dp"
+                android:paddingBottom="25dp"
+                android:scaleY="1.2"
+                android:scaleX="1.2"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintLeft_toRightOf="@id/verticalGuideLine"
+                app:layout_constraintRight_toRightOf="parent"
                 />
+
             <!--引导线动态效果-->
-            <ToggleButton
+            <androidx.appcompat.widget.SwitchCompat
                 android:id="@+id/tbRouteDynamicEffect"
-                android:layout_width="match_parent"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_margin="@dimen/dp_10"
-                android:padding="@dimen/dp_20"
-                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"
+                android:text="引导线动态效果"
+                android:paddingTop="25dp"
+                android:paddingBottom="25dp"
+                android:scaleY="1.2"
+                android:scaleX="1.2"
+                app:layout_constraintTop_toBottomOf="@id/tbObstacleAvoidance"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toLeftOf="@id/verticalGuideLine"
                 />
+
             <!--红绿灯标识-->
-            <ToggleButton
+            <androidx.appcompat.widget.SwitchCompat
                 android:id="@+id/tbTrafficLight"
-                android:layout_width="match_parent"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_margin="@dimen/dp_10"
-                android:padding="@dimen/dp_20"
-                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"
+                android:text="红绿灯标识"
+                android:paddingTop="25dp"
+                android:paddingBottom="25dp"
+                android:scaleY="1.2"
+                android:scaleX="1.2"
+                app:layout_constraintTop_toBottomOf="@id/tbObstacleAvoidance"
+                app:layout_constraintLeft_toRightOf="@id/verticalGuideLine"
+                app:layout_constraintRight_toRightOf="parent"
                 />
+
             <!--限速标识-->
-            <ToggleButton
+            <androidx.appcompat.widget.SwitchCompat
                 android:id="@+id/tbSpeedLimit"
-                android:layout_width="match_parent"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_margin="@dimen/dp_10"
-                android:padding="@dimen/dp_20"
-                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:text="限速标识"
+                android:paddingTop="25dp"
+                android:paddingBottom="25dp"
+                android:scaleY="1.2"
+                android:scaleX="1.2"
+                app:layout_constraintTop_toBottomOf="@id/tbRouteDynamicEffect"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toLeftOf="@id/verticalGuideLine"
                 />
 
-            <ToggleButton
+            <!--美化模式-->
+            <androidx.appcompat.widget.SwitchCompat
                 android:id="@+id/tbDemoMode"
-                android:layout_width="match_parent"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_margin="@dimen/dp_10"
-                android:padding="@dimen/dp_20"
-                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"
+                android:text="美化模式"
+                android:paddingTop="25dp"
+                android:paddingBottom="25dp"
+                android:scaleY="1.2"
+                android:scaleX="1.2"
+                app:layout_constraintTop_toBottomOf="@id/tbRouteDynamicEffect"
+                app:layout_constraintLeft_toRightOf="@id/verticalGuideLine"
+                app:layout_constraintRight_toRightOf="parent"
                 />
 
-            <ToggleButton
+            <!--雨天模式-->
+            <androidx.appcompat.widget.SwitchCompat
                 android:id="@+id/tbRainMode"
-                android:layout_width="match_parent"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_margin="@dimen/dp_10"
-                android:padding="@dimen/dp_20"
-                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"
+                android:text="雨天模式"
+                android:paddingTop="25dp"
+                android:paddingBottom="25dp"
+                android:scaleY="1.2"
+                android:scaleX="1.2"
+                app:layout_constraintTop_toBottomOf="@id/tbSpeedLimit"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toLeftOf="@id/verticalGuideLine"
                 />
 
-            <ToggleButton
+            <!--OBU-->
+            <androidx.appcompat.widget.SwitchCompat
                 android:id="@+id/tbObu"
-                android:layout_width="match_parent"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_margin="@dimen/dp_10"
-                android:padding="@dimen/dp_20"
-                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"
+                android:text="OBU"
+                android:paddingTop="25dp"
+                android:paddingBottom="25dp"
+                android:scaleY="1.2"
+                android:scaleX="1.2"
+                app:layout_constraintTop_toBottomOf="@id/tbSpeedLimit"
+                app:layout_constraintLeft_toRightOf="@id/verticalGuideLine"
+                app:layout_constraintRight_toRightOf="parent"
                 />
 
-            <ToggleButton
+            <androidx.appcompat.widget.SwitchCompat
                 android:id="@+id/tbObuV2vView"
-                android:layout_width="match_parent"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:padding="@dimen/dp_20"
-                android:background="@drawable/radio_button_normal_background_right"
-                android:textColor="#000"
-                android:textOff="展示v2v事件"
-                android:textOn="不展示v2v事件"
-                app:layout_constraintTop_toBottomOf="@id/tbObu"
-                android:textSize="@dimen/dp_24" />
-
-            <ToggleButton
-                android:id="@+id/tbObuV2iView"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:padding="@dimen/dp_20"
-                android:background="@drawable/radio_button_normal_background_right"
-                android:textColor="#000"
-                android:textOff="展示v2i事件"
-                android:textOn="不展示v2i事件"
-                app:layout_constraintTop_toBottomOf="@id/tbObuV2vView"
-                android:textSize="@dimen/dp_24" />
-
-            <ToggleButton
-                android:id="@+id/tbObuToDcView"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_margin="@dimen/dp_10"
-                android:padding="@dimen/dp_20"
-                android:background="@drawable/radio_button_normal_background_right"
-                app:layout_constraintTop_toBottomOf="@id/tbObuV2iView"
-                android:textOff="关闭OBU到工控机V2I显示"
-                android:textOn="打开OBU到工控机V2I显示"
-                android:textSize="@dimen/dp_24" />
-
-            <ToggleButton
-                android:id="@+id/tbObuWeaknessTrafficSop"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_margin="@dimen/dp_10"
-                android:padding="@dimen/dp_20"
-                android:background="@drawable/radio_button_normal_background_right"
-                app:layout_constraintTop_toBottomOf="@id/tbObuToDcView"
-                android:textOff="关闭路侧弱势群体预警"
-                android:textOn="打开路侧弱势群体预警"
-                android:textSize="@dimen/dp_24" />
-
-            <ToggleButton
-                android:id="@+id/tbCloudWeaknessTrafficSop"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_margin="@dimen/dp_10"
-                android:padding="@dimen/dp_20"
-                android:background="@drawable/radio_button_normal_background_right"
-                app:layout_constraintTop_toBottomOf="@id/tbObuWeaknessTrafficSop"
-                android:textOff="开启云端弱势群体预警"
-                android:textOn="关闭云端弱势群体预警"
-                android:textSize="@dimen/dp_24" />
-
-            <ToggleButton
-                android:id="@+id/tbIPCReport"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_margin="@dimen/dp_10"
-                android:padding="@dimen/dp_20"
-                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/tbCloudWeaknessTrafficSop"
+                android:text="V2V事件"
+                android:paddingTop="25dp"
+                android:paddingBottom="25dp"
+                android:scaleY="1.2"
+                android:scaleX="1.2"
+                app:layout_constraintTop_toBottomOf="@id/tbRainMode"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toLeftOf="@id/verticalGuideLine"
                 />
 
-            <ToggleButton
-                android:id="@+id/tbRoadLimitSpeedSop"
-                android:layout_width="match_parent"
+            <androidx.appcompat.widget.SwitchCompat
+                android:id="@+id/tbObuV2iView"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:padding="@dimen/dp_20"
-                android:visibility="gone"
-                android:background="@drawable/radio_button_normal_background_right"
-                android:textColor="#000"
-                android:textOff="获取路侧限速提醒"
-                android:textOn="关闭路侧限速提醒"
-                app:layout_constraintTop_toBottomOf="@id/tbIPCReport"
-                android:textSize="@dimen/dp_24" />
+                android:text="V2I事件"
+                android:paddingTop="25dp"
+                android:paddingBottom="25dp"
+                android:scaleY="1.2"
+                android:scaleX="1.2"
+                app:layout_constraintTop_toBottomOf="@id/tbRainMode"
+                app:layout_constraintLeft_toRightOf="@id/verticalGuideLine"
+                app:layout_constraintRight_toRightOf="parent"
+                />
+
+            <androidx.appcompat.widget.SwitchCompat
+                android:id="@+id/tbObuToDcView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="OBU到工控机V2I显示"
+                android:paddingTop="25dp"
+                android:paddingBottom="25dp"
+                android:scaleY="1.2"
+                android:scaleX="1.2"
+                app:layout_constraintTop_toBottomOf="@id/tbObuV2vView"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toLeftOf="@id/verticalGuideLine"
+                />
+
+            <androidx.appcompat.widget.SwitchCompat
+                android:id="@+id/tbObuWeaknessTrafficSop"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="路侧弱势群体预警"
+                android:paddingTop="25dp"
+                android:paddingBottom="25dp"
+                android:scaleY="1.2"
+                android:scaleX="1.2"
+                app:layout_constraintTop_toBottomOf="@id/tbObuV2vView"
+                app:layout_constraintLeft_toRightOf="@id/verticalGuideLine"
+                app:layout_constraintRight_toRightOf="parent"
+                />
+
+            <androidx.appcompat.widget.SwitchCompat
+                android:id="@+id/tbCloudWeaknessTrafficSop"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="云端弱势群体预警"
+                android:paddingTop="25dp"
+                android:paddingBottom="25dp"
+                android:scaleY="1.2"
+                android:scaleX="1.2"
+                app:layout_constraintTop_toBottomOf="@id/tbObuToDcView"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toLeftOf="@id/verticalGuideLine"
+                />
+
+            <androidx.appcompat.widget.SwitchCompat
+                android:id="@+id/tbIPCReport"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="异常上报提示"
+                android:paddingTop="25dp"
+                android:paddingBottom="25dp"
+                android:scaleY="1.2"
+                android:scaleX="1.2"
+                app:layout_constraintTop_toBottomOf="@id/tbObuToDcView"
+                app:layout_constraintLeft_toRightOf="@id/verticalGuideLine"
+                app:layout_constraintRight_toRightOf="parent"
+                />
+
+            <androidx.appcompat.widget.SwitchCompat
+                android:id="@+id/tbRoadLimitSpeedSop"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="路侧限速提醒"
+                android:paddingTop="25dp"
+                android:paddingBottom="25dp"
+                android:scaleY="1.2"
+                android:scaleX="1.2"
+                app:layout_constraintTop_toBottomOf="@id/tbCloudWeaknessTrafficSop"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toLeftOf="@id/verticalGuideLine"
+                />
 
             <TextView
                 android:id="@+id/tvSpeedThresholdTitle"
@@ -225,7 +251,7 @@
                 android:text="变道速度阈值："
                 android:textSize="@dimen/dp_36"
                 android:textColor="#1A1A1A"
-                android:layout_margin="10dp"
+                android:layout_margin="20dp"
                 />
 
             <ImageView
@@ -249,8 +275,8 @@
                 android:textSize="@dimen/dp_36"
                 android:gravity="center"
                 android:background="@drawable/debug_setting_edit_bg"
-                android:paddingStart="10dp"
-                android:paddingEnd="10dp"
+                android:paddingStart="15dp"
+                android:paddingEnd="15dp"
                 android:layout_marginTop="5dp"
                 android:layout_marginBottom="5dp"
                 />
@@ -278,16 +304,6 @@
                 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>