[6.4.0][启自驾指引] 优化代码逻辑

This commit is contained in:
renwj
2024-04-18 10:46:43 +08:00
parent 9b3864eed2
commit 436ae0629e
3 changed files with 14 additions and 10 deletions

View File

@@ -63,21 +63,21 @@ class AutoPilotLaunchBeforeView: LinearLayout, IStatusListener {
when(status) {
is GearStatus -> {
val position = try { GearPosition.valueOf(status.value) } catch (ignore: Throwable) { GEAR_NONE }
gear_n?.isPressed = false
gear_n?.isEnabled = false
gear_n?.isSelected = false
gear_p?.isPressed = false
gear_p?.isEnabled = false
gear_p?.isSelected =false
gear_r?.isPressed = false
gear_r?.isEnabled = false
gear_r?.isSelected = false
gear_d?.isPressed = false
gear_d?.isEnabled = false
gear_d?.isSelected = false
if (position != GEAR_NONE) {
val isError = status.isError
when(position) {
GEAR_N -> if (isError) gear_n?.isPressed = true else gear_n?.isSelected = true
GEAR_R -> if (isError) gear_r?.isPressed = true else gear_r?.isSelected = true
GEAR_P -> if (isError) gear_p?.isPressed = true else gear_p?.isSelected = true
GEAR_D -> if (isError) gear_d?.isPressed = true else gear_d?.isSelected = true
GEAR_N -> if (isError) gear_n?.isEnabled = true else gear_n?.isSelected = true
GEAR_R -> if (isError) gear_r?.isEnabled = true else gear_r?.isSelected = true
GEAR_P -> if (isError) gear_p?.isEnabled = true else gear_p?.isSelected = true
GEAR_D -> if (isError) gear_d?.isEnabled = true else gear_d?.isSelected = true
else -> {}
}
}

View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/white" android:state_selected="true" />
<item android:color="#F73B3C" android:state_pressed="true" />
<item android:color="#343C63" />
<item android:color="#F73B3C" android:state_enabled="true" />
<item android:color="#343C63" android:state_enabled="false"/>
</selector>

View File

@@ -61,6 +61,7 @@
android:layout_height="wrap_content"
android:text="P"
android:textSize="@dimen/dp_36"
android:enabled="false"
android:layout_marginEnd="@dimen/dp_32"
android:textColor="@color/color_geer_position_selector"/>
@@ -70,6 +71,7 @@
android:layout_height="wrap_content"
android:text="R"
android:textSize="@dimen/dp_36"
android:enabled="false"
android:layout_marginEnd="@dimen/dp_32"
android:textColor="@color/color_geer_position_selector"/>
@@ -79,6 +81,7 @@
android:layout_height="wrap_content"
android:text="N"
android:textSize="@dimen/dp_36"
android:enabled="false"
android:layout_marginEnd="@dimen/dp_32"
android:textColor="@color/color_geer_position_selector"/>
@@ -88,6 +91,7 @@
android:layout_height="wrap_content"
android:text="D"
android:textSize="@dimen/dp_36"
android:enabled="false"
android:textColor="@color/color_geer_position_selector"/>
</LinearLayout>