From c6c6f927e7ed265b84edbc177064d87a10a9b394 Mon Sep 17 00:00:00 2001
From: xuxinchao <xuxinchao@zhidaoauto.com>
Date: Mon, 18 Mar 2024 17:51:11 +0800
Subject: [PATCH] =?UTF-8?q?[6.3.0]=E8=BF=90=E8=90=A5=E9=9D=A2=E6=9D=BF?=
 =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=B1=BB=E5=BC=80=E5=85=B3=E4=BD=8D=E7=BD=AE?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../function/hmi/ui/setting/SOPSettingView.kt |  7 ---
 .../src/main/res/layout/view_sop_setting.xml  | 63 ++++++++++---------
 2 files changed, 33 insertions(+), 37 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 85fecc0698..db05d11005 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
@@ -826,13 +826,6 @@ internal class SOPSettingView @JvmOverloads constructor(
                 View.GONE
         tvPullTimeTitle.visibility =
             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 {
                 View.GONE
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 f5ed4c7fb0..90cecd13cb 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
@@ -771,6 +771,35 @@
                     app:layout_constraintRight_toRightOf="@id/scIPCReport"
                     app:layout_constraintTop_toBottomOf="@id/scIPCReport" />
 
+                <androidx.appcompat.widget.LinearLayoutCompat
+                    android:id="@+id/llMFLayout"
+                    android:layout_width="0dip"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="15dp"
+                    android:layout_marginTop="@dimen/dp_20"
+                    android:layout_marginEnd="15dp"
+                    android:background="@drawable/bg_mf_sop_operator"
+                    android:orientation="vertical"
+                    android:padding="5dip"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/scWeatherSwitch">
+
+                    <com.mogo.eagle.core.function.hmi.ui.setting.StateViewLayout
+                        android:id="@+id/mfStatusLayout"
+                        android:layout_width="match_parent"
+                        android:layout_height="60dp" />
+
+                    <androidx.appcompat.widget.SwitchCompat
+                        android:id="@+id/mfTest"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="5dip"
+                        android:paddingTop="25dp"
+                        android:paddingBottom="25dp"
+                        android:text="魔方指令测试" />
+                </androidx.appcompat.widget.LinearLayoutCompat>
+
                 <TextView
                     android:id="@+id/tvPullTimeTitle"
                     android:layout_width="wrap_content"
@@ -780,7 +809,10 @@
                     android:text="@string/pull_time_title"
                     android:textColor="@color/black"
                     android:textSize="32dp"
-                    app:layout_constraintStart_toStartOf="parent" />
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintRight_toRightOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/llMFLayout"
+                    />
 
                 <RadioGroup
                     android:id="@+id/rgPullTime"
@@ -826,35 +858,6 @@
                         android:textSize="32dp" />
                 </RadioGroup>
 
-                <androidx.appcompat.widget.LinearLayoutCompat
-                    android:id="@+id/llMFLayout"
-                    android:layout_width="0dip"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="15dp"
-                    android:layout_marginTop="@dimen/dp_20"
-                    android:layout_marginEnd="15dp"
-                    android:background="@drawable/bg_mf_sop_operator"
-                    android:orientation="vertical"
-                    android:padding="5dip"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/rgPullTime">
-
-                    <com.mogo.eagle.core.function.hmi.ui.setting.StateViewLayout
-                        android:id="@+id/mfStatusLayout"
-                        android:layout_width="match_parent"
-                        android:layout_height="60dp" />
-
-                    <androidx.appcompat.widget.SwitchCompat
-                        android:id="@+id/mfTest"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="5dip"
-                        android:paddingTop="25dp"
-                        android:paddingBottom="25dp"
-                        android:text="魔方指令测试" />
-                </androidx.appcompat.widget.LinearLayoutCompat>
-
             </androidx.constraintlayout.widget.ConstraintLayout>
 
         </androidx.cardview.widget.CardView>