diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/CircularProgressView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/CircularProgressView.kt index a6e00ed9ca..829163327f 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/CircularProgressView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/CircularProgressView.kt @@ -65,8 +65,6 @@ class CircularProgressView @JvmOverloads constructor( } else { mColorArray = null } - -// mProgPaint.setShadowLayer() typedArray.recycle(); } @@ -103,8 +101,8 @@ class CircularProgressView @JvmOverloads constructor( } - fun setBlurMaskFilter(blur: Boolean,radius: Float) { - var blur: BlurMaskFilter = BlurMaskFilter(radius, BlurMaskFilter.Blur.NORMAL) + fun setBlurMaskFilter(blur: BlurMaskFilter.Blur, radius: Float) { + var blur: BlurMaskFilter = BlurMaskFilter(radius, blur) mProgPaint.setMaskFilter(blur) invalidate() } 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 b39cc3c670..88512fac87 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 @@ -1,6 +1,7 @@ package com.mogo.eagle.core.function.hmi.ui.widget; import android.content.Context; +import android.graphics.BlurMaskFilter; import android.util.AttributeSet; import android.util.Log; import android.view.LayoutInflater; @@ -80,9 +81,8 @@ 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(20); - steeringCircularVAlpha.setProgWidth(20); - steeringCircularVAlpha.setBlurMaskFilter(true, 10.0f); + steeringCircularVAlpha.setBackWidth(12); + steeringCircularVAlpha.setBlurMaskFilter(BlurMaskFilter.Blur.NORMAL, 12); steeringCircularVAlpha.setBackColor(R.color.hmi_clear_00); steeringCircularVAlpha.setProgColor(R.color.hmi_light_blue_alpha); steeringCircularVAlpha.setProgress((int) (180 * 100) / 360, 1000); 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 9995d22f72..2166c95c20 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 @@ -17,20 +17,6 @@ app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" /> - - - - - - - - - - - - - - #45D3FF #1B5BFF #1EBBCFF6 - #666C79C4 + #6C79C4 #0045D3FF \ No newline at end of file diff --git a/modules/mogo-module-common/src/main/res/values-xhdpi-2560x1440/dimens.xml b/modules/mogo-module-common/src/main/res/values-xhdpi-2560x1440/dimens.xml index 7f051678b4..36a6e225b7 100644 --- a/modules/mogo-module-common/src/main/res/values-xhdpi-2560x1440/dimens.xml +++ b/modules/mogo-module-common/src/main/res/values-xhdpi-2560x1440/dimens.xml @@ -1,5 +1,6 @@ + 12px 20px 26px 30px diff --git a/modules/mogo-module-common/src/main/res/values-xhdpi-2560x1600/dimens.xml b/modules/mogo-module-common/src/main/res/values-xhdpi-2560x1600/dimens.xml index daf0174189..c4a29618fd 100644 --- a/modules/mogo-module-common/src/main/res/values-xhdpi-2560x1600/dimens.xml +++ b/modules/mogo-module-common/src/main/res/values-xhdpi-2560x1600/dimens.xml @@ -1,5 +1,6 @@ + 12px 42px 628px 188px