From c7a8a721805b8bbcfad79db54a8fca2bfb45b164 Mon Sep 17 00:00:00 2001
From: tongchenfei <tongchenfei@zhidaoauto.com>
Date: Fri, 20 Nov 2020 11:59:35 +0800
Subject: [PATCH] =?UTF-8?q?opt=201+16=20=E6=B5=AE=E5=B1=82=E5=B8=83?=
 =?UTF-8?q?=E5=B1=80=E5=B1=82=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/mogo/module/common/map/MyLocationUtil.java   |  2 +-
 .../res/layout/module_main_activity_main_no_map.xml  | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/map/MyLocationUtil.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/map/MyLocationUtil.java
index 347447f467..f3b279d147 100644
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/map/MyLocationUtil.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/map/MyLocationUtil.java
@@ -98,7 +98,7 @@ public class MyLocationUtil {
             throw new IllegalArgumentException("inflate myLocation bitmap can not be null!");
         }
         View root =
-                LayoutInflater.from(context).inflate(R.layout.module_map_amap_my_location, null, false);
+                LayoutInflater.from(context).inflate(R.layout.module_common_my_location, null, false);
         ImageView iv =
                 root.findViewById(R.id.module_map_amap_my_location_iv);
         iv.setImageBitmap(res);
diff --git a/modules/mogo-module-main/src/main/res/layout/module_main_activity_main_no_map.xml b/modules/mogo-module-main/src/main/res/layout/module_main_activity_main_no_map.xml
index c69e16a9ab..c88a2f274b 100644
--- a/modules/mogo-module-main/src/main/res/layout/module_main_activity_main_no_map.xml
+++ b/modules/mogo-module-main/src/main/res/layout/module_main_activity_main_no_map.xml
@@ -36,12 +36,6 @@
         android:layout_width="@dimen/module_main_id_left_panel_fragment_container_width"
         android:layout_height="match_parent" />
 
-    <!-- 浮层-->
-    <FrameLayout
-        android:id="@+id/module_main_id_floating_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
     <FrameLayout
         android:id="@+id/module_main_id_event_panel_fragment_container"
         android:layout_width="match_parent"
@@ -52,6 +46,12 @@
         android:paddingTop="@dimen/module_main_apps_fragment_container_paddingTop"
         android:paddingBottom="@dimen/module_main_apps_fragment_container_paddingTop" />
 
+    <!-- 浮层-->
+    <FrameLayout
+        android:id="@+id/module_main_id_floating_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
     <!--快捷操作浮层-->
     <FrameLayout
         android:id="@+id/module_main_id_entrance_fragment_container"