From 04cd86aaf180cc1bb8043862a5e510dd0bbdd515 Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Wed, 8 Jun 2022 11:53:28 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=9F=E6=96=AD=E8=BF=9B=E5=BA=A6=E6=9D=A1?=
 =?UTF-8?q?=E5=8A=A8=E7=94=BB=E6=97=B6=E9=95=BF,=E9=81=BF=E5=85=8D?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=B8=8E=E8=BF=9B=E5=BA=A6=E6=9D=A1=E4=B8=8D?=
 =?UTF-8?q?=E4=B8=80=E8=87=B4=E9=97=AE=E9=A2=98,=E5=B0=8F=E4=BA=8E1?=
 =?UTF-8?q?=E7=9A=84=E5=BA=A6=E6=95=B0=E6=8C=89=E7=85=A70=C2=B0=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hmi/ui/widget/SteeringWheelView.java      | 26 +++++++++++--------
 1 file changed, 15 insertions(+), 11 deletions(-)

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 f22e98bab0..98108964a0 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,11 +78,11 @@ public class SteeringWheelView extends ConstraintLayout {
         steeringCircularV = findViewById(R.id.steering_circular);
         steeringCircularV.setBackWidth(8);
         steeringCircularV.setBackColor(R.color.hmi_light_back_bg);
-        steeringCircularV.setProgress((int) (270 * 100) / 360, 2000);
+        steeringCircularV.setProgress((int) (270 * 100) / 360, 20);
         steeringCircularV.setProgColor(R.color.hmi_light_blue, R.color.hmi_dark_blue);
         if (AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode)) {
             steeringCircularVAlpha = findViewById(R.id.steering_circular_alpha);
-            steeringCircularVAlpha.setProgress((int) (270 * 100) / 360, 2000);
+            steeringCircularVAlpha.setProgress((int) (270 * 100) / 360, 20);
             steeringCircularV.setProgColor(R.color.hmi_dark_blue, R.color.hmi_light_blue);
             steeringCircularVAlpha.setBackWidth(8);
             steeringCircularVAlpha.setBackColor(R.color.hmi_clear_00);
@@ -177,27 +177,31 @@ public class SteeringWheelView extends ConstraintLayout {
          */
         @Override
         public void onAutopilotSteeringData(float steering) {
+            if (steering < 1) {
+                steering = 0;
+            }
+            float steeringValue = steering;
             ThreadUtils.runOnUiThread(new Runnable() {
                 @Override
                 public void run() {
-                    Log.d(TAG, "steering====" + String.valueOf(steering));
-                    if (steeringTVL != null && steering > 0) {
+                    Log.d(TAG, "steering====" + String.valueOf(steeringValue));
+                    if (steeringTVL != null && steeringValue > 0) {
                         steeringTVR.setVisibility(View.INVISIBLE);
                         steeringTVL.setVisibility(View.VISIBLE);
-                        steeringTVL.setText(String.valueOf((int) steering) + "°");
-                    } else if (steeringTVR != null && steering <= 0) {
+                        steeringTVL.setText(String.valueOf((int) steeringValue) + "°");
+                    } else if (steeringTVR != null && steeringValue <= 0) {
                         steeringTVL.setVisibility(View.INVISIBLE);
                         steeringTVR.setVisibility(View.VISIBLE);
-                        steeringTVR.setText(String.valueOf((int) -steering) + "°");
+                        steeringTVR.setText(String.valueOf((int) -steeringValue) + "°");
                     } else {
                         Log.d(TAG, "onAutopilotSteeringData error");
                     }
-                    animationWithSteeringData(-steering);
+                    animationWithSteeringData(-steeringValue);
                     if (steeringCircularV != null) {
-                        steeringCircularV.setProgress((int) (-steering * 100) / 360, 1000);
+                        steeringCircularV.setProgress((int) (-steeringValue * 100) / 360, 20);
                     }
                     if (steeringCircularVAlpha != null) {
-                        steeringCircularVAlpha.setProgress((int) (-steering * 100) / 360, 1000);
+                        steeringCircularVAlpha.setProgress((int) (-steeringValue * 100) / 360, 20);
                     }
                 }
             });
@@ -245,7 +249,7 @@ public class SteeringWheelView extends ConstraintLayout {
         rotateAnimation = new RotateAnimation(fromDegrees, steering,
                 RotateAnimation.RELATIVE_TO_SELF, 0.5f,
                 RotateAnimation.RELATIVE_TO_SELF, 0.5f);
-        rotateAnimation.setDuration(1000);//旋转时长
+        rotateAnimation.setDuration(20);//旋转时长
         rotateAnimation.setFillAfter(true);//旋转后保持原状
         autopilotIV.clearAnimation();
         autopilotIV.startAnimation(rotateAnimation);