From 2903f54f0d785a4829cd0162b37e9bfe50f2bdc0 Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Wed, 29 Jun 2022 15:07:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/res/layout/bus_base_fragment.xml | 38 +++++++++----------
 .../hmi/ui/widget/TrafficDataView.java        | 11 +-----
 2 files changed, 19 insertions(+), 30 deletions(-)

diff --git a/OCH/mogo-och-bus/src/main/res/layout/bus_base_fragment.xml b/OCH/mogo-och-bus/src/main/res/layout/bus_base_fragment.xml
index 87e3d95737..3c6e819345 100644
--- a/OCH/mogo-och-bus/src/main/res/layout/bus_base_fragment.xml
+++ b/OCH/mogo-och-bus/src/main/res/layout/bus_base_fragment.xml
@@ -5,30 +5,26 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_marginTop="@dimen/dp_72">
-        <FrameLayout
-            android:id="@+id/fl_speed"
+
+    <FrameLayout
+        android:id="@+id/fl_speed"
+        android:layout_width="@dimen/dp_616"
+        android:layout_height="@dimen/dp_320"
+        android:layout_marginLeft="@dimen/dp_16"
+        android:layout_marginTop="@dimen/dp_40"
+        android:elevation="@dimen/bus_dp_10"
+        android:padding="@dimen/bus_dp_20"
+        android:visibility="visible"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <com.mogo.eagle.core.function.hmi.ui.widget.TrafficDataView
+            android:id="@+id/bus_arc"
             android:layout_width="@dimen/dp_616"
             android:layout_height="@dimen/dp_320"
-            android:layout_marginLeft="@dimen/dp_16"
-            android:layout_marginTop="@dimen/dp_40"
-            android:elevation="@dimen/bus_dp_10"
-            android:padding="@dimen/bus_dp_20"
-            android:visibility="visible"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
+            android:layout_gravity="center" />
 
-<!--            <com.mogo.och.bus.view.BusArcView-->
-<!--                android:id="@+id/bus_arc"-->
-<!--                android:layout_width="@dimen/bus_ext_arcView_width"-->
-<!--                android:layout_height="@dimen/bus_ext_arcView_height"-->
-<!--                android:layout_gravity="center" />-->
-            <com.mogo.eagle.core.function.hmi.ui.widget.TrafficDataView
-                android:id="@+id/bus_arc"
-                android:layout_width="@dimen/dp_616"
-                android:layout_height="@dimen/dp_320"
-                android:layout_gravity="center" />
-
-        </FrameLayout>
+    </FrameLayout>
 
 
     <RelativeLayout
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/TrafficDataView.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/TrafficDataView.java
index 9917382a0f..fa1b973b0e 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/TrafficDataView.java
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/TrafficDataView.java
@@ -68,13 +68,6 @@ public class TrafficDataView extends ConstraintLayout {
         speedTextView = findViewById(R.id.speedTextView);
         accTextView = findViewById(R.id.speedAccTextView);
     }
-    //onVehicleState
-
-//    @Override
-//    public void onVehicleState(MessagePad.Header header, VehicleStateOuterClass.VehicleState vehicleState) {
-//        VehicleState base = new VehicleState(header, vehicleState, sdf);
-//        DataDistribution.getInstance().addData(base);
-//    }
 
     private final IMoGoAutopilotVehicleStateListener mIMoGoAutopilotVehicleStateListener = new IMoGoAutopilotVehicleStateListener() {
         /**
@@ -140,8 +133,8 @@ public class TrafficDataView extends ConstraintLayout {
 
         @Override
         public void onAutopilotAcc(float carAcc) {
-            Log.d(TAG, "加速度:" + carAcc);
-            java.text.DecimalFormat myformat=new java.text.DecimalFormat("0.00");
+            Log.d(TAG, "司机屏加速度:" + carAcc);
+            java.text.DecimalFormat myformat = new java.text.DecimalFormat("0.00");
             String accStr = myformat.format(carAcc);
             accTextView.setText("a: " + accStr);
         }