From c73b5720de1e4a64bb7b806df400fb5ba85df6e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Wed, 18 Aug 2021 17:16:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E7=BA=A2=E4=B8=AA=E8=89=B2?=
 =?UTF-8?q?=E9=A2=84=E8=AD=A6=E5=B1=82=E5=B1=82=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/misc.xml                                |  1 +
 .../res/layout/module_main_activity_main.xml  | 71 ++++++++++---------
 2 files changed, 37 insertions(+), 35 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index c5ecb8cf8a..010a13f489 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -15,6 +15,7 @@
         <entry key="modules/mogo-module-hmi/src/main/res/layout/fragment_warning.xml" value="0.34427083333333336" />
         <entry key="modules/mogo-module-hmi/src/main/res/layout/notification_v2x_msg_vr.xml" value="0.3453125" />
         <entry key="modules/mogo-module-hmi/src/main/res/layout/view_traffic_light_vr.xml" value="0.25" />
+        <entry key="modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml" value="0.3125" />
         <entry key="modules/mogo-module-service/src/main/res/drawable/bg_adas_dispatch.xml" value="0.184" />
         <entry key="modules/mogo-module-service/src/main/res/drawable/bg_adas_dispatch_affirm.xml" value="0.19166666666666668" />
         <entry key="modules/mogo-module-service/src/main/res/drawable/bg_map_marker_blue_info.xml" value="0.184" />
diff --git a/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml b/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml
index 6bd455216a..f545a6accd 100644
--- a/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml
+++ b/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml
@@ -19,6 +19,42 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
+    <!--四个方向，碰撞预警-->
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <ImageView
+            android:id="@+id/warning_top"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_390"
+            android:background="@drawable/module_main_warning_bkg_top"
+            android:visibility="gone" />
+
+        <ImageView
+            android:id="@+id/warning_left"
+            android:layout_width="@dimen/dp_390"
+            android:layout_height="match_parent"
+            android:background="@drawable/module_main_warning_bkg_left"
+            android:visibility="gone" />
+
+        <ImageView
+            android:id="@+id/warning_right"
+            android:layout_width="@dimen/dp_390"
+            android:layout_height="match_parent"
+            android:layout_gravity="right"
+            android:background="@drawable/module_main_warning_bkg_right"
+            android:visibility="gone" />
+
+        <ImageView
+            android:id="@+id/warning_bottom"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_390"
+            android:layout_gravity="bottom"
+            android:background="@drawable/module_main_warning_bkg_bottom"
+            android:visibility="gone" />
+    </FrameLayout>
+
     <!-- 天气动画层 -->
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/cl_special_effect"
@@ -116,41 +152,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
-    <!--四个方向，碰撞预警-->
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <ImageView
-            android:id="@+id/warning_top"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_390"
-            android:background="@drawable/module_main_warning_bkg_top"
-            android:visibility="gone" />
-
-        <ImageView
-            android:id="@+id/warning_left"
-            android:layout_width="@dimen/dp_390"
-            android:layout_height="match_parent"
-            android:background="@drawable/module_main_warning_bkg_left"
-            android:visibility="gone" />
-
-        <ImageView
-            android:id="@+id/warning_right"
-            android:layout_width="@dimen/dp_390"
-            android:layout_height="match_parent"
-            android:layout_gravity="right"
-            android:background="@drawable/module_main_warning_bkg_right"
-            android:visibility="gone" />
-
-        <ImageView
-            android:id="@+id/warning_bottom"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_390"
-            android:layout_gravity="bottom"
-            android:background="@drawable/module_main_warning_bkg_bottom"
-            android:visibility="gone" />
-    </FrameLayout>
 
     <!--预警视图 OBU、云端下发、自车感知、自车策略-->
     <FrameLayout