From 64da728f9fee716027ec5efe40f9a5828316703b Mon Sep 17 00:00:00 2001 From: liujing Date: Wed, 25 May 2022 16:35:19 +0800 Subject: [PATCH] =?UTF-8?q?ui:bus=E6=A1=A3=E4=BD=8D=E8=89=B2=E5=80=BC;?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=B9=E5=90=91=E7=9B=98=E8=A7=92=E5=BA=A6?= =?UTF-8?q?"-"=E7=AC=A6=E5=8F=B7,=E5=8F=AA=E4=BF=9D=E7=95=99=E6=95=B0?= =?UTF-8?q?=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hmi/ui/widget/SteeringWheelView.java | 3 +- .../hmi/ui/widget/TapPositionView.java | 114 +++++++++++++----- .../src/main/res/layout/hmi_tap_position.xml | 8 +- 3 files changed, 87 insertions(+), 38 deletions(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SteeringWheelView.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SteeringWheelView.java index c5da489cbf..5a453dbbd0 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SteeringWheelView.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SteeringWheelView.java @@ -67,6 +67,7 @@ public class SteeringWheelView extends ConstraintLayout { initView(); CallerAutoPilotStatusListenerManager.INSTANCE.addListener(TAG, mGoAutopilotStatusListener); CallerAutopilotVehicleStateListenerManager.INSTANCE.addListener(TAG, mIMoGoAutopilotVehicleStateListener); + tapPositionView.updateWithGear(Chassis.GearPosition.GEAR_R); } private void initView() { @@ -180,7 +181,7 @@ public class SteeringWheelView extends ConstraintLayout { } else if (steeringTVR != null && steering <= 0) { steeringTVL.setVisibility(View.INVISIBLE); steeringTVR.setVisibility(View.VISIBLE); - steeringTVR.setText(String.valueOf((int) steering) + "°"); + steeringTVR.setText(String.valueOf((int) -steering) + "°"); } else { Log.d(TAG, "onAutopilotSteeringData error"); } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/TapPositionView.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/TapPositionView.java index 88c6bfabed..b49e64b0c0 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/TapPositionView.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/TapPositionView.java @@ -11,7 +11,9 @@ import android.widget.TextView; import androidx.annotation.Nullable; import androidx.constraintlayout.widget.ConstraintLayout; +import com.mogo.eagle.core.data.config.FunctionBuildConfig; import com.mogo.eagle.core.function.hmi.R; +import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils; import org.jetbrains.annotations.NotNull; @@ -41,40 +43,86 @@ public class TapPositionView extends ConstraintLayout { public void updateWithGear(@NotNull Chassis.GearPosition gear) { if (tabP != null && tabR != null && tabN != null && tabD != null) { - switch (gear) { - case GEAR_NONE: - tabP.setTextColor(Color.parseColor("#FF6E8EC9")); - tabR.setTextColor(Color.parseColor("#FF6E8EC9")); - tabN.setTextColor(Color.parseColor("#FF6E8EC9")); - tabD.setTextColor(Color.parseColor("#FF6E8EC9")); - break; - case GEAR_P: - tabP.setTextColor(Color.parseColor("#FFFFFFFF")); - tabR.setTextColor(Color.parseColor("#FF6E8EC9")); - tabN.setTextColor(Color.parseColor("#FF6E8EC9")); - tabD.setTextColor(Color.parseColor("#FF6E8EC9")); - break; - case GEAR_R: - tabR.setTextColor(Color.parseColor("#FFFFFFFF")); - tabP.setTextColor(Color.parseColor("#FF6E8EC9")); - tabN.setTextColor(Color.parseColor("#FF6E8EC9")); - tabD.setTextColor(Color.parseColor("#FF6E8EC9")); - break; - case GEAR_N: - tabN.setTextColor(Color.parseColor("#FFFFFFFF")); - tabR.setTextColor(Color.parseColor("#FF6E8EC9")); - tabP.setTextColor(Color.parseColor("#FF6E8EC9")); - tabD.setTextColor(Color.parseColor("#FF6E8EC9")); - break; - case GEAR_D: - tabD.setTextColor(Color.parseColor("#FFFFFFFF")); - tabN.setTextColor(Color.parseColor("#FF6E8EC9")); - tabR.setTextColor(Color.parseColor("#FF6E8EC9")); - tabP.setTextColor(Color.parseColor("#FF6E8EC9")); - break; - default: - break; + if (AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode)) { + taxiGear(gear); + } else { + busGear(gear); } } } + + private void busGear(@NotNull Chassis.GearPosition gear) { + switch (gear) { + case GEAR_NONE: + tabP.setTextColor(Color.parseColor("#6E8EC9")); + tabR.setTextColor(Color.parseColor("#6E8EC9")); + tabN.setTextColor(Color.parseColor("#6E8EC9")); + tabD.setTextColor(Color.parseColor("#6E8EC9")); + break; + case GEAR_P: + tabP.setTextColor(Color.parseColor("#0043FF")); + tabR.setTextColor(Color.parseColor("#6E8EC9")); + tabN.setTextColor(Color.parseColor("#6E8EC9")); + tabD.setTextColor(Color.parseColor("#6E8EC9")); + break; + case GEAR_R: + tabR.setTextColor(Color.parseColor("#0043FF")); + tabP.setTextColor(Color.parseColor("#6E8EC9")); + tabN.setTextColor(Color.parseColor("#6E8EC9")); + tabD.setTextColor(Color.parseColor("#6E8EC9")); + break; + case GEAR_N: + tabN.setTextColor(Color.parseColor("#0043FF")); + tabR.setTextColor(Color.parseColor("#6E8EC9")); + tabP.setTextColor(Color.parseColor("#6E8EC9")); + tabD.setTextColor(Color.parseColor("#6E8EC9")); + break; + case GEAR_D: + tabD.setTextColor(Color.parseColor("#0043FF")); + tabN.setTextColor(Color.parseColor("#6E8EC9")); + tabR.setTextColor(Color.parseColor("#6E8EC9")); + tabP.setTextColor(Color.parseColor("#6E8EC9")); + break; + default: + break; + } + } + + + private void taxiGear(@NotNull Chassis.GearPosition gear) { + switch (gear) { + case GEAR_NONE: + tabP.setTextColor(Color.parseColor("#FF6E8EC9")); + tabR.setTextColor(Color.parseColor("#FF6E8EC9")); + tabN.setTextColor(Color.parseColor("#FF6E8EC9")); + tabD.setTextColor(Color.parseColor("#FF6E8EC9")); + break; + case GEAR_P: + tabP.setTextColor(Color.parseColor("#FFFFFFFF")); + tabR.setTextColor(Color.parseColor("#FF6E8EC9")); + tabN.setTextColor(Color.parseColor("#FF6E8EC9")); + tabD.setTextColor(Color.parseColor("#FF6E8EC9")); + break; + case GEAR_R: + tabR.setTextColor(Color.parseColor("#FFFFFFFF")); + tabP.setTextColor(Color.parseColor("#FF6E8EC9")); + tabN.setTextColor(Color.parseColor("#FF6E8EC9")); + tabD.setTextColor(Color.parseColor("#FF6E8EC9")); + break; + case GEAR_N: + tabN.setTextColor(Color.parseColor("#FFFFFFFF")); + tabR.setTextColor(Color.parseColor("#FF6E8EC9")); + tabP.setTextColor(Color.parseColor("#FF6E8EC9")); + tabD.setTextColor(Color.parseColor("#FF6E8EC9")); + break; + case GEAR_D: + tabD.setTextColor(Color.parseColor("#FFFFFFFF")); + tabN.setTextColor(Color.parseColor("#FF6E8EC9")); + tabR.setTextColor(Color.parseColor("#FF6E8EC9")); + tabP.setTextColor(Color.parseColor("#FF6E8EC9")); + break; + default: + break; + } + } } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_tap_position.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_tap_position.xml index 5020791857..8165b46cf7 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_tap_position.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_tap_position.xml @@ -12,7 +12,7 @@ android:gravity="center" android:text="P" android:textAlignment="center" - android:textColor="#738FC4" + android:textColor="#6E8EC9" android:textSize="@dimen/dp_32" android:textStyle="bold" app:layout_constraintBottom_toBottomOf="parent" @@ -27,7 +27,7 @@ android:gravity="center" android:text="R" android:textAlignment="center" - android:textColor="#738FC4" + android:textColor="#6E8EC9" android:textSize="@dimen/dp_32" android:textStyle="bold" app:layout_constraintBottom_toBottomOf="parent" @@ -42,7 +42,7 @@ android:gravity="center" android:text="N" android:textAlignment="center" - android:textColor="#738FC4" + android:textColor="#6E8EC9" android:textSize="@dimen/dp_32" android:textStyle="bold" app:layout_constraintBottom_toBottomOf="parent" @@ -57,7 +57,7 @@ android:gravity="center" android:text="D" android:textAlignment="center" - android:textColor="#738FC4" + android:textColor="#0043FF" android:textSize="@dimen/dp_32" android:textStyle="bold" app:layout_constraintBottom_toBottomOf="parent"