From ee87cfa3fec96ed074282364d848d5e8205c9eb0 Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Tue, 10 May 2022 18:16:51 +0800
Subject: [PATCH] =?UTF-8?q?busUI,=E5=B7=A6=E6=AD=A3=E5=8F=B3=E8=B4=9F?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9,=E5=BE=85=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/res/layout/bus_p_base_fragment.xml       | 11 ++++++-----
 .../function/hmi/ui/widget/SteeringWheelView.java     | 10 +++++-----
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_base_fragment.xml b/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_base_fragment.xml
index ae8970ff66..523a6fc82d 100644
--- a/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_base_fragment.xml
+++ b/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_base_fragment.xml
@@ -6,12 +6,13 @@
 
     <com.mogo.eagle.core.function.hmi.ui.widget.SteeringWheelView
         android:id="@+id/steering_wheel"
-        android:layout_width="@dimen/dp_630"
-        android:layout_height="@dimen/dp_630"
-        android:layout_marginLeft="-59px"
-        android:layout_marginTop="@dimen/dp_20"
+        android:layout_width="@dimen/dp_300"
+        android:layout_height="@dimen/dp_300"
+        android:layout_marginLeft="@dimen/dp_90"
+        android:layout_marginTop="@dimen/dp_112"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
+
     <ImageView
         android:id="@+id/bus_p_autopilot_iv"
         android:layout_width="wrap_content"
@@ -19,7 +20,7 @@
         android:layout_marginLeft="@dimen/bus_p_curent_station_panel_margin"
         android:layout_marginTop="@dimen/dp_112"
         android:scaleType="fitXY"
-        android:visibility="gone"
+        android:visibility="invisible"
         android:layout_gravity="center_horizontal"
         android:src="@drawable/bus_p_un_auto_nor"
         app:layout_constraintLeft_toLeftOf="parent"
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 b9e4a4b6cb..b241f9e9cf 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
@@ -154,7 +154,7 @@ public class SteeringWheelView extends ConstraintLayout {
         }
 
         /**
-         * 方向盘转向角
+         * 方向盘转向角 左+右-
          * @param steering
          */
         @Override
@@ -162,12 +162,12 @@ public class SteeringWheelView extends ConstraintLayout {
             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(steering));
+                    if (steeringTVL != null && steering > 0) {
                         steeringTVR.setVisibility(View.INVISIBLE);
                         steeringTVL.setVisibility(View.VISIBLE);
                         steeringTVL.setText(String.valueOf((int) steering) + "°");
-                    } else if (steeringTVR != null && steering >= 0) {
+                    } else if (steeringTVR != null && steering <= 0) {
                         steeringTVL.setVisibility(View.INVISIBLE);
                         steeringTVR.setVisibility(View.VISIBLE);
                         steeringTVR.setText(String.valueOf((int) steering) + "°");
@@ -175,7 +175,7 @@ public class SteeringWheelView extends ConstraintLayout {
                         Log.d(TAG, "onAutopilotSteeringData error");
                     }
                     animationWithSteeringData(steering);
-                    steeringCircularV.setProgress((int) (steering * 100) / 360, 1000);
+                    steeringCircularV.setProgress((int) (-steering * 100) / 360, 1000);
                 }
             });