From e0fa0027a09e8b34af3ef794aac89a1df678217b Mon Sep 17 00:00:00 2001 From: liujing Date: Thu, 12 May 2022 19:59:39 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B8=90=E5=8F=98=E6=A8=A1=E7=B3=8A?= =?UTF-8?q?=E5=8C=96,=E8=89=B2=E5=80=BC=E5=BE=85=E4=B8=8EUI=E7=A1=AE?= =?UTF-8?q?=E8=AE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hmi/ui/widget/CircularProgressView.kt | 9 +++++- .../hmi/ui/widget/SteeringWheelView.java | 10 ++++--- .../res/layout/hmi_steering_wheel_taxi.xml | 28 +++++++++---------- .../src/main/res/values/color.xml | 3 +- 4 files changed, 29 insertions(+), 21 deletions(-) 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 93a1707834..a6e00ed9ca 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 @@ -56,6 +56,7 @@ class CircularProgressView @JvmOverloads constructor( mProgPaint.isDither = true // 设置抖动 mProgPaint.strokeWidth = typedArray.getDimension(R.styleable.CircularProgressView_progWidth, 10.0f) mProgPaint.color = typedArray.getColor(R.styleable.CircularProgressView_progColor, Color.BLUE) +// mProgPaint.setPathEffect() // 初始化进度圆环渐变色 val startColor = typedArray.getColor(R.styleable.CircularProgressView_progStartColor, -1) val firstColor = typedArray.getColor(R.styleable.CircularProgressView_progFirstColor, -1) @@ -65,7 +66,7 @@ class CircularProgressView @JvmOverloads constructor( mColorArray = null } - +// mProgPaint.setShadowLayer() typedArray.recycle(); } @@ -102,6 +103,12 @@ class CircularProgressView @JvmOverloads constructor( } + fun setBlurMaskFilter(blur: Boolean,radius: Float) { + var blur: BlurMaskFilter = BlurMaskFilter(radius, BlurMaskFilter.Blur.NORMAL) + mProgPaint.setMaskFilter(blur) + invalidate() + } + /** * 获取当前进度 * @return 当前进度（0-100） 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 f11ab82e66..b39cc3c670 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 @@ -75,13 +75,15 @@ public class SteeringWheelView extends ConstraintLayout { tapPositionView = findViewById(R.id.tap_position); steeringCircularV = findViewById(R.id.steering_circular); steeringCircularV.setBackWidth(8); - steeringCircularV.setBackColor(R.color.hmi_light_blue_00); + steeringCircularV.setBackColor(R.color.hmi_light_back_bg); steeringCircularV.setProgColor(R.color.hmi_light_blue, R.color.hmi_dark_blue); steeringCircularV.setProgress((int) (180 * 100) / 360, 1000); - if (AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode)){ + if (AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode)) { steeringCircularVAlpha = findViewById(R.id.steering_circular_alpha); - steeringCircularVAlpha.setAlpha(0.4f); - steeringCircularVAlpha.setBackColor(R.color.hmi_light_blue_00); + steeringCircularVAlpha.setBackWidth(20); + steeringCircularVAlpha.setProgWidth(20); + steeringCircularVAlpha.setBlurMaskFilter(true, 10.0f); + 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 496870eddc..9995d22f72 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 @@ -18,18 +18,18 @@ app:layout_constraintTop_toTopOf="parent" /> - + + + + + + + + + + + + + app:layout_constraintTop_toBottomOf="@+id/steering_circular" /> \ 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 d3a8ba3651..9eecbbe85f 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 @@ -56,6 +56,7 @@ #FFFF9B00 #45D3FF #1B5BFF - #0045D3FF + #1EBBCFF6 #666C79C4 + #0045D3FF \ No newline at end of file From 8315cbf07f0006306e04e97540e4f3709332aa8e Mon Sep 17 00:00:00 2001 From: liujing Date: Mon, 16 May 2022 16:04:02 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=96=B9=E5=90=91=E7=9B=98=E5=A4=96?= =?UTF-8?q?=E5=9C=88=E8=92=99=E5=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hmi/ui/widget/CircularProgressView.kt | 6 ++-- .../hmi/ui/widget/SteeringWheelView.java | 6 ++-- .../res/layout/hmi_steering_wheel_taxi.xml | 28 ++++++------------- .../src/main/res/values/color.xml | 2 +- .../res/values-xhdpi-2560x1440/dimens.xml | 1 + .../res/values-xhdpi-2560x1600/dimens.xml | 1 + 6 files changed, 16 insertions(+), 28 deletions(-) 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