Merge branch 'dev' into qa_topview

This commit is contained in:
tongchenfei
2020-06-17 09:46:38 +08:00
2 changed files with 8 additions and 9 deletions

View File

@@ -71,7 +71,7 @@ MOGO_MODULE_GUIDESHOW_PROVIDER_VERSION=1.0.2-SNAPSHOT
# 在线车辆F
MOGO_MODULE_ONLINECAR_VERSION=1.0.3.2
# v2x
MOGO_MODULE_V2X_VERSION=1.1.13
MOGO_MODULE_V2X_VERSION=1.1.14
# 推送
MOGO_MODULE_PUSH_VERSION=1.0.1
# 广告资源位

View File

@@ -9,13 +9,7 @@
<FrameLayout
android:id="@+id/module_main_id_map_fragment_container"
android:layout_width="match_parent"
android:layout_height="match_parent" >
<FrameLayout
android:id="@+id/module_main_id_search_fragment"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</FrameLayout>
android:layout_height="match_parent" />
<FrameLayout
android:id="@+id/module_main_id_map_left_shadow_frame"
@@ -53,7 +47,10 @@
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_search_fragment"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<FrameLayout
android:id="@+id/module_main_id_cover_up"
android:layout_width="match_parent"
@@ -61,4 +58,6 @@
android:background="@drawable/module_main_launcher_bg"
android:visibility="visible"
tools:visibility="gone" />
</FrameLayout>