From 0003e445c106288a61db6321861da2664512ad85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Mon, 2 Aug 2021 19:25:48 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=B1=82=E7=BA=A7=E5=85=B3?=
 =?UTF-8?q?=E7=B3=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/.idea/misc.xml b/.idea/misc.xml
index f74b39a1db..955cec9389 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -11,7 +11,7 @@
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">
       <map>
-        <entry key="modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml" value="0.273046875" />
+        <entry key="modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml" value="0.25" />
         <entry key="modules/mogo-module-map/src/main/res/layout/module_map_fragment_map.xml" value="0.202734375" />
       </map>
     </option>
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 0c83ef1c77..1f6e58218e 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
@@ -13,6 +13,12 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
+    <!--小地图视图-->
+    <FrameLayout
+        android:id="@+id/module_main_id_smp_fragment"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
     <!-- 天气动画层 -->
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/cl_special_effect"
@@ -38,37 +44,6 @@
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 
-    <!--四个方向，碰撞预警-->
-    <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
         android:id="@+id/module_main_id_map_left_shadow_frame"
@@ -141,11 +116,42 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
-    <!--小地图视图-->
+    <!--四个方向，碰撞预警-->
     <FrameLayout
-        android:id="@+id/module_main_id_smp_fragment"
         android:layout_width="match_parent"
-        android:layout_height="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>
+
 
     <!--冷启动过渡Logo-->
     <androidx.constraintlayout.widget.ConstraintLayout