yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[6.3.0]运营面板业务类开关位置调整

Browse Source
This commit is contained in:
xuxinchao
2024-03-18 17:51:11 +08:00
parent 11a87db42e
commit c6c6f927e7
2 changed files with 33 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt
View File

@@ -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

63
core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_sop_setting.xml
View File

@@ -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>