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 fc8d719fa2..548572101a 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 @@ -78,7 +78,7 @@ public class SteeringWheelView extends ConstraintLayout { steeringCircularV = findViewById(R.id.steering_circular); steeringCircularV.setBackWidth(8); steeringCircularV.setBackColor(R.color.hmi_light_back_bg); - steeringCircularV.setProgColor(R.color.hmi_dark_blue, R.color.hmi_light_blue); + steeringCircularV.setProgColor(R.color.hmi_light_blue, R.color.hmi_dark_blue); steeringCircularV.setProgress((int) (180 * 100) / 360, 1000); if (AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode)) { steeringCircularVAlpha = findViewById(R.id.steering_circular_alpha); diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/bg_auto.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/bg_auto.png index 748625a43c..31ae1e4f8d 100644 Binary files a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/bg_auto.png and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/bg_auto.png differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/bg_auto_nor.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/bg_auto_nor.png index a9965aaf1f..3b7d23f4dc 100644 Binary files a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/bg_auto_nor.png and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xxhdpi/bg_auto_nor.png differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_steering_wheel_bus.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_steering_wheel_bus.xml index a043188788..ea990f2d13 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_steering_wheel_bus.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_steering_wheel_bus.xml @@ -38,6 +38,7 @@ android:layout_centerHorizontal="true" android:layout_gravity="center_horizontal" android:src="@drawable/bg_auto" + android:layout_marginTop="@dimen/dp_20" app:layout_constraintBottom_toBottomOf="@+id/steering_circular" app:layout_constraintLeft_toLeftOf="@+id/steering_circular" app:layout_constraintRight_toRightOf="@+id/steering_circular" @@ -48,7 +49,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_72" - android:layout_marginRight="-10px" + android:layout_marginRight="-16px" android:gravity="right" android:text="180°" android:textColor="#415479" @@ -61,7 +62,7 @@ android:id="@+id/steering_tv_right" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginLeft="-10px" + android:layout_marginLeft="-16px" android:layout_marginTop="@dimen/dp_72" android:gravity="left" android:text="180°" diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_steering_wheel_taxi.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_steering_wheel_taxi.xml index b61a1e2afc..c11ff4b07c 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_steering_wheel_taxi.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_steering_wheel_taxi.xml @@ -11,7 +11,7 @@ android:layout_height="@dimen/dp_240" android:layout_centerHorizontal="true" android:layout_gravity="center_horizontal" - android:layout_marginTop="@dimen/dp_140" + android:layout_marginTop="@dimen/dp_152" android:src="@drawable/bg_auto" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml index f055c0f405..a9df74cf22 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml @@ -55,7 +55,7 @@ #FFFFE198 #FFFF9B00 #45D3FF - #3261B6 + #1B5BFF #1EBBCFF6 #D945D3FF #D93261B6