From 793c36ac821e75111f0856c40a90feb507841406 Mon Sep 17 00:00:00 2001
From: chenfufeng <chenfufeng@zhidaoauto.com>
Date: Fri, 15 Mar 2024 18:14:31 +0800
Subject: [PATCH] =?UTF-8?q?[6.3.0][Opt]=E8=BF=90=E8=90=A5=E9=9D=A2?=
 =?UTF-8?q?=E6=9D=BF=E4=B8=9A=E5=8A=A1=E7=B1=BBUI=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../function/hmi/ui/setting/SOPSettingView.kt | 19 +++++++++++++++++--
 .../src/main/res/layout/view_sop_setting.xml  |  3 +--
 2 files changed, 18 insertions(+), 4 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 5479ed816c..85fecc0698 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
@@ -743,6 +743,13 @@ internal class SOPSettingView @JvmOverloads constructor(
                 it.visibility = GONE
             } else {
                 it.visibility = VISIBLE
+                val params = it.layoutParams as ConstraintLayout.LayoutParams
+                if (scLineRoutingVerify.visibility == VISIBLE) {
+                    params.topToBottom = R.id.scLineRoutingVerify
+                } else {
+                    params.topToBottom = R.id.scIPCReport
+                }
+                it.layoutParams = params
                 it.setOnCheckedChangeListener { _, isChecked ->
                     CallerMapUIServiceManager.getMapUIController()?.setWeatherEnable(isChecked)
                 }
@@ -818,10 +825,18 @@ internal class SOPSettingView @JvmOverloads constructor(
             else
                 View.GONE
         tvPullTimeTitle.visibility =
-            if(AppIdentityModeUtils.isTaxiDriver(FunctionBuildConfig.appIdentityMode))
+            if(AppIdentityModeUtils.isTaxiDriver(FunctionBuildConfig.appIdentityMode)) {
+                val params = tvPullTimeTitle.layoutParams as ConstraintLayout.LayoutParams
+                if (scWeatherSwitch.visibility == VISIBLE) {
+                    params.topToBottom = R.id.scWeatherSwitch
+                } else {
+                    params.topToBottom = R.id.scLineRoutingVerify
+                }
+                tvPullTimeTitle.layoutParams = params
                 View.VISIBLE
-            else
+            } else {
                 View.GONE
+            }
 
         /**
          * 魔方sop运营相关配置
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 7cf8c1dab1..f5ed4c7fb0 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
@@ -780,8 +780,7 @@
                     android:text="@string/pull_time_title"
                     android:textColor="@color/black"
                     android:textSize="32dp"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/scLineRoutingVerify" />
+                    app:layout_constraintStart_toStartOf="parent" />
 
                 <RadioGroup
                     android:id="@+id/rgPullTime"