From 436ae0629e6fac8bb49489fab31f1558ac53dab4 Mon Sep 17 00:00:00 2001 From: renwj Date: Thu, 18 Apr 2024 10:46:43 +0800 Subject: [PATCH] =?UTF-8?q?[6.4.0][=E5=90=AF=E8=87=AA=E9=A9=BE=E6=8C=87?= =?UTF-8?q?=E5=BC=95]=20=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../status/ui/AutoPilotLaunchBeforeView.kt | 16 ++++++++-------- .../res/color/color_geer_position_selector.xml | 4 ++-- .../layout/layout_autopilot_launch_before.xml | 4 ++++ 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/ui/AutoPilotLaunchBeforeView.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/ui/AutoPilotLaunchBeforeView.kt index 0d8b1143ca..9070649bea 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/ui/AutoPilotLaunchBeforeView.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/ui/AutoPilotLaunchBeforeView.kt @@ -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 -> {} } } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/color/color_geer_position_selector.xml b/core/function-impl/mogo-core-function-devatools/src/main/res/color/color_geer_position_selector.xml index 6809485824..a8c717371f 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/res/color/color_geer_position_selector.xml +++ b/core/function-impl/mogo-core-function-devatools/src/main/res/color/color_geer_position_selector.xml @@ -1,6 +1,6 @@ - - + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools/src/main/res/layout/layout_autopilot_launch_before.xml b/core/function-impl/mogo-core-function-devatools/src/main/res/layout/layout_autopilot_launch_before.xml index cc450cdd9d..aae31ba69e 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/res/layout/layout_autopilot_launch_before.xml +++ b/core/function-impl/mogo-core-function-devatools/src/main/res/layout/layout_autopilot_launch_before.xml @@ -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"/>