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 88512fac87..fddda077d6 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 @@ -81,10 +81,10 @@ public class SteeringWheelView extends ConstraintLayout { steeringCircularV.setProgress((int) (180 * 100) / 360, 1000); if (AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode)) { steeringCircularVAlpha = findViewById(R.id.steering_circular_alpha); - steeringCircularVAlpha.setBackWidth(12); - steeringCircularVAlpha.setBlurMaskFilter(BlurMaskFilter.Blur.NORMAL, 12); + steeringCircularVAlpha.setBackWidth(8); steeringCircularVAlpha.setBackColor(R.color.hmi_clear_00); - steeringCircularVAlpha.setProgColor(R.color.hmi_light_blue_alpha); + steeringCircularVAlpha.setProgColor(R.color.hmi_light_blue_alpha_00, R.color.hmi_light_blue_alpha_ff); + steeringCircularVAlpha.setBlurMaskFilter(BlurMaskFilter.Blur.NORMAL, 12); steeringCircularVAlpha.setProgress((int) (180 * 100) / 360, 1000); } } @@ -185,7 +185,12 @@ public class SteeringWheelView extends ConstraintLayout { Log.d(TAG, "onAutopilotSteeringData error"); } animationWithSteeringData(steering); - steeringCircularV.setProgress((int) (-steering * 100) / 360, 1000); + if (steeringCircularV != null) { + steeringCircularV.setProgress((int) (-steering * 100) / 360, 1000); + } + if (steeringCircularVAlpha != null) { + steeringCircularVAlpha.setProgress((int) (-steering * 100) / 360, 1000); + } } }); 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 258956925c..7e523648ba 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 @@ -25,7 +25,7 @@ android:layout_marginTop="@dimen/dp_50" android:layout_marginRight="-10px" android:gravity="right" - android:text="-18°" + android:text="180°" android:textColor="#415479" android:textSize="@dimen/dp_26" android:visibility="invisible" @@ -39,7 +39,7 @@ android:layout_marginLeft="-10px" android:layout_marginTop="@dimen/dp_50" android:gravity="left" - android:text="18°" + android:text="180°" android:textColor="#415479" android:textSize="@dimen/dp_26" app:layout_constraintLeft_toRightOf="@+id/autopilot_iv" 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 2166c95c20..b61a1e2afc 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 @@ -24,7 +24,7 @@ android:layout_marginTop="@dimen/dp_130" android:layout_marginRight="-10px" android:gravity="right" - android:text="-18°" + android:text="180°" android:textColor="#FFFFFFFF" android:textSize="@dimen/dp_37" android:visibility="invisible" @@ -38,7 +38,7 @@ android:layout_marginLeft="-10px" android:layout_marginTop="@dimen/dp_130" android:gravity="left" - android:text="18°" + android:text="180°" android:textColor="#FFFFFFFF" android:textSize="@dimen/dp_37" app:layout_constraintLeft_toRightOf="@+id/autopilot_iv" @@ -90,6 +90,6 @@ android:layout_marginTop="@dimen/dp_30" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" - app:layout_constraintTop_toBottomOf="@+id/steering_circular" /> + app:layout_constraintTop_toBottomOf="@+id/steering_circular_alpha" /> \ No newline at end of file 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 85d44ba7f9..f055c0f405 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,8 +55,9 @@ #FFFFE198 #FFFF9B00 #45D3FF - #1B5BFF + #3261B6 #1EBBCFF6 - #6C79C4 - #0045D3FF + #D945D3FF + #D93261B6 + #00FFFFFF \ No newline at end of file