From 29033b21d92b3a7423a41c3b360ec4e0af8ecff6 Mon Sep 17 00:00:00 2001
From: xuxinchao <xuxinchao@zhidaoauto.com>
Date: Thu, 7 Dec 2023 21:20:27 +0800
Subject: [PATCH] =?UTF-8?q?[6.2.4]=E9=9D=9ETaxi=E5=8F=B8=E6=9C=BA=E5=B1=8F?=
 =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E6=97=A0=E4=BA=BA=E5=8C=96=E6=BC=94?=
 =?UTF-8?q?=E7=BB=83=E6=8B=89=E5=8F=96=E6=97=B6=E9=97=B4=E9=97=B4=E9=9A=94?=
 =?UTF-8?q?Title?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../eagle/core/function/hmi/ui/setting/SOPSettingView.kt  | 8 ++++++--
 .../src/main/res/layout/view_sop_setting.xml              | 2 +-
 2 files changed, 7 insertions(+), 3 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 b01319581d..2c888da2b4 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
@@ -2,7 +2,6 @@ package com.mogo.eagle.core.function.hmi.ui.setting
 
 import android.content.Context
 import android.util.AttributeSet
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.widget.Toast
@@ -31,7 +30,6 @@ import com.mogo.eagle.core.function.call.setting.CallerSopSettingManager
 import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager
 import com.mogo.eagle.core.function.call.vehicle.CallerSweeperModeListenerManager
 import com.mogo.eagle.core.function.hmi.R
-import com.mogo.eagle.core.function.hmi.ui.tools.DockerRebootDialog
 import com.mogo.eagle.core.function.hmi.ui.tools.SweeperModeChangedConfirmDialog
 import com.mogo.eagle.core.function.call.unmanned.CallerUnmannedListenerManager
 import com.mogo.eagle.core.function.hmi.ui.utils.HmiActionLog.Companion.hmiAction
@@ -84,6 +82,7 @@ import kotlinx.android.synthetic.main.view_sop_setting.view.scV2nPnc
 import kotlinx.android.synthetic.main.view_sop_setting.view.scWeakNetSlowDown
 import kotlinx.android.synthetic.main.view_sop_setting.view.sopLayout
 import kotlinx.android.synthetic.main.view_sop_setting.view.tvOverTakeLimit
+import kotlinx.android.synthetic.main.view_sop_setting.view.tvPullTimeTitle
 import kotlinx.android.synthetic.main.view_sop_setting.view.tvSpeed
 import kotlinx.android.synthetic.main.view_sop_setting.view.tvSpeedOverTakeLimit
 import kotlinx.android.synthetic.main.view_sop_setting.view.tvSpeedThresholdTitle
@@ -789,6 +788,11 @@ internal class SOPSettingView @JvmOverloads constructor(
                 View.VISIBLE
             else
                 View.GONE
+        tvPullTimeTitle.visibility =
+            if(AppIdentityModeUtils.isTaxiDriver(FunctionBuildConfig.appIdentityMode))
+                View.VISIBLE
+            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 cad768784f..92488dd246 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
@@ -586,7 +586,7 @@
                     android:textColor="@color/black"
                     android:textSize="32dp"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/scLineRoutingVerify" />
+                    app:layout_constraintTop_toBottomOf="@id/scShowBagRecordWindow" />
 
                 <RadioGroup
                     android:id="@+id/rgPullTime"