From d9acd807617998f5150005515fdda080279d5c7d Mon Sep 17 00:00:00 2001
From: donghongyu <donghongyu@zhidaoauto.com>
Date: Tue, 29 Mar 2022 17:59:07 +0800
Subject: [PATCH] =?UTF-8?q?[Change]=20=E5=A2=9E=E5=8A=A0=E6=B3=A8=E9=87=8A?=
 =?UTF-8?q?=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
---
 .../core/function/hmi/ui/MoGoHmiFragment.kt   |  9 +++
 .../src/main/res/layout/fragment_hmi.xml      | 62 ++++++++-----------
 2 files changed, 36 insertions(+), 35 deletions(-)

diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt
index 5ffa84b7e7..9b66fdfcb8 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt
@@ -195,14 +195,23 @@ class MoGoHmiFragment : MvpFragment<MoGoWarningContract.View?, WaringPresenter?>
         }
     }
 
+    /**
+     * 设置 V2X 通知 代理View
+     */
     override fun setProxyNotificationView(view: IViewNotification) {
         mViewNotification = view
     }
 
+    /**
+     * 设置 红绿灯 代理View
+     */
     override fun setProxyTrafficLightView(view: IViewTrafficLight) {
         mViewTrafficLight = view
     }
 
+    /**
+     * 设置 限速 代理View
+     */
     override fun setProxyLimitingSpeedView(view: IViewLimitingVelocity) {
         mViewLimitingVelocity = view
     }
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml
index 33fb48ffc0..4cb2702ebb 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/fragment_hmi.xml
@@ -53,6 +53,18 @@
         app:layout_constraintTop_toBottomOf="@+id/viewSpeedChart"
         app:layout_goneMarginStart="@dimen/module_mogo_autopilot_status_margin_left" />
 
+
+    <ImageView
+        android:id="@+id/ivCameraIcon"
+        android:layout_width="130px"
+        android:layout_height="130px"
+        android:layout_marginTop="38px"
+        android:layout_marginEnd="40px"
+        android:background="@drawable/icon_camera_nor"
+        app:layout_constraintEnd_toStartOf="@id/viewTrafficLightVr"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:visibility="visible" />
+
     <com.mogo.eagle.core.function.hmi.ui.widget.TrafficLightView
         android:id="@+id/viewTrafficLightVr"
         android:layout_width="wrap_content"
@@ -66,14 +78,6 @@
         tools:visibility="visible" />
 
 
-    <!--    <com.mogo.eagle.core.function.hmi.ui.widget.SpeedLimitStatusView-->
-    <!--        android:id="@+id/viewSpeedLimitStatusView"-->
-    <!--        android:layout_width="130px"-->
-    <!--        android:layout_height="130px"-->
-    <!--        app:layout_constraintEnd_toEndOf="@+id/viewTrafficLightVr"-->
-    <!--        app:layout_constraintTop_toBottomOf="@+id/viewTrafficLightVr"-->
-    <!--        tools:ignore="MissingConstraints"/>-->
-
     <com.mogo.eagle.core.function.hmi.ui.widget.PerspectiveSwitchView
         android:id="@+id/viewPerspectiveSwitch"
         android:layout_width="wrap_content"
@@ -97,49 +101,38 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toEndOf="@+id/viewPerspectiveSwitch"
         app:layout_goneMarginStart="50px" />
-    
+
     <ImageView
         android:id="@+id/vsBadCaseToolsView"
         android:layout_width="@dimen/module_hmi_check_size"
         android:layout_height="@dimen/module_hmi_check_size"
         android:layout_marginStart="25px"
         android:layout_marginBottom="40px"
-        android:visibility="gone"
         android:background="@drawable/icon_car_ap_badcase_entrance"
+        android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toEndOf="@+id/ivToolsIcon"
-        app:layout_goneMarginStart="50px"/>
+        app:layout_goneMarginStart="50px" />
 
     <View
         android:id="@+id/viewUpgradeTips"
         android:layout_width="22px"
         android:layout_height="22px"
-        app:layout_constraintCircle="@id/ivToolsIcon"
-        app:layout_constraintCircleAngle="45"
-        app:layout_constraintCircleRadius="60px"
-        tools:ignore="MissingConstraints"
         android:background="@drawable/version_upgrade_tips_background"
         android:translationZ="30px"
         android:visibility="gone"
-        />
+        app:layout_constraintCircle="@id/ivToolsIcon"
+        app:layout_constraintCircleAngle="45"
+        app:layout_constraintCircleRadius="60px"
+        tools:ignore="MissingConstraints" />
 
 
-    <ImageView
-        android:id="@+id/ivCameraIcon"
-        android:layout_width="130px"
-        android:layout_height="130px"
-        android:layout_marginTop="38px"
-        android:layout_marginEnd="40px"
-        android:background="@drawable/icon_camera_nor"
-        app:layout_constraintEnd_toStartOf="@id/viewTrafficLightVr"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:visibility="visible" />
-
     <com.mogo.eagle.core.function.hmi.ui.widget.LimitingVelocityView
         android:id="@+id/viewLimitingVelocity"
         android:layout_width="130px"
         android:layout_height="130px"
         android:layout_marginTop="30px"
+        android:layout_marginEnd="40px"
         android:background="@drawable/bg_waring_limiting_velocity"
         android:elevation="@dimen/dp_10"
         android:gravity="center"
@@ -149,7 +142,6 @@
         android:visibility="gone"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/ivCameraIcon"
-        android:layout_marginEnd="40px"
         app:layout_goneMarginEnd="40px"
         app:layout_goneMarginTop="40px"
         tools:visibility="visible" />
@@ -159,23 +151,23 @@
         android:id="@+id/turnLightView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:layout_constraintTop_toTopOf="parent"
+        android:layout_marginTop="42px"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        android:layout_marginTop="42px" />
+        app:layout_constraintTop_toTopOf="parent" />
 
     <!--刹车ui-->
     <com.mogo.eagle.core.function.hmi.ui.turnlight.BrakeViewStatus
         android:id="@+id/brakeView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:layout_constraintTop_toTopOf="parent"
+        android:layout_marginTop="42px"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        android:layout_marginTop="42px" />
+        app:layout_constraintTop_toTopOf="parent" />
 
-<!--    app:layout_constraintBottom_toBottomOf="parent"-->
-<!--    app:layout_constraintEnd_toEndOf="parent"-->
-<!--    app:layout_constraintStart_toStartOf="parent"-->
+    <!--    app:layout_constraintBottom_toBottomOf="parent"-->
+    <!--    app:layout_constraintEnd_toEndOf="parent"-->
+    <!--    app:layout_constraintStart_toStartOf="parent"-->
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file