From d5fd6f32cc4cb554028ff4c26b439e6738e8bf02 Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Thu, 12 May 2022 16:18:15 +0800
Subject: [PATCH] =?UTF-8?q?UI---=E7=BC=BA=E5=B0=91=E8=BF=9B=E5=BA=A6?=
 =?UTF-8?q?=E6=9D=A1=E6=B8=90=E5=8F=98=E8=BF=87=E7=A8=8B=E9=98=B4=E5=BD=B1?=
 =?UTF-8?q?(=E6=AF=9B=E7=8E=BB=E7=92=83=E6=95=88=E6=9E=9C)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hmi/ui/widget/CircularProgressView.kt     |  3 +-
 .../hmi/ui/widget/SteeringWheelView.java      |  2 +-
 .../res/layout/hmi_steering_wheel_taxi.xml    | 41 +++++++++----------
 3 files changed, 22 insertions(+), 24 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 59f51b97d1..93a1707834 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
@@ -2,6 +2,7 @@ package com.mogo.eagle.core.function.hmi.ui.widget
 
 import android.animation.ValueAnimator
 import android.content.Context
+import android.content.res.Resources
 import android.content.res.TypedArray
 import android.graphics.*
 import android.util.AttributeSet
@@ -87,8 +88,6 @@ class CircularProgressView @JvmOverloads constructor(
 
         Log.d(TAG, mRectL.toString() + "," + mRectT.toString())
         Log.d(TAG, mRectF.toString() + "," + "width:" + measuredWidth.toString() + "," + "PaddingLeft:" + getPaddingLeft().toString())
-
-
     }
 
     override fun onDraw(canvas: Canvas?) {
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 84d848c9e8..f11ab82e66 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
@@ -80,7 +80,7 @@ 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.setAlpha(0.3f);
+            steeringCircularVAlpha.setAlpha(0.4f);
             steeringCircularVAlpha.setBackColor(R.color.hmi_light_blue_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 eff30fb43b..496870eddc 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
@@ -58,34 +58,33 @@
         app:layout_constraintLeft_toRightOf="@+id/autopilot_iv"
         app:layout_constraintTop_toTopOf="parent" />
 
-<!--    &lt;!&ndash;进度值改变状态进度条&ndash;&gt;-->
-<!--    <com.mogo.eagle.core.function.hmi.ui.widget.CircularProgressView-->
-<!--        android:id="@+id/steering_circular"-->
-<!--        android:layout_width="@dimen/dp_263"-->
-<!--        android:layout_height="@dimen/dp_263"-->
-<!--        android:layout_alignParentTop="true"-->
-<!--        android:layout_centerHorizontal="true"-->
-<!--        android:layout_marginTop="@dimen/dp_128"-->
-<!--        android:outlineAmbientShadowColor="#1EBBCFF6"-->
-<!--        app:layout_constraintLeft_toLeftOf="parent"-->
-<!--        app:layout_constraintRight_toRightOf="parent"-->
-<!--        app:layout_constraintTop_toTopOf="parent"-->
-<!--        app:progWidth="8px"-->
-<!--        app:progress="0" />-->
-
-    <!--进度值改变状态进度条 260  130-->
+    <!--进度值改变状态进度条-->
     <com.mogo.eagle.core.function.hmi.ui.widget.CircularProgressView
-        android:id="@+id/steering_circular_alpha"
-        android:layout_width="@dimen/dp_276"
-        android:layout_height="@dimen/dp_276"
+        android:id="@+id/steering_circular"
+        android:layout_width="@dimen/dp_260"
+        android:layout_height="@dimen/dp_260"
         android:layout_alignParentTop="true"
         android:layout_centerHorizontal="true"
-        android:layout_marginTop="@dimen/dp_114"
+        android:layout_marginTop="@dimen/dp_130"
         android:outlineAmbientShadowColor="#1EBBCFF6"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:progWidth="16px"
+        app:progWidth="8px"
+        app:progress="0" />
+
+    <!--状态条阴影-->
+    <com.mogo.eagle.core.function.hmi.ui.widget.CircularProgressView
+        android:id="@+id/steering_circular_alpha"
+        android:layout_width="@dimen/dp_274"
+        android:layout_height="@dimen/dp_274"
+        android:layout_alignParentTop="true"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="@dimen/dp_122"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:progWidth="22px"
         app:progress="0" />
 
     <ImageView