xiaoyan159/OneMapQS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://gitlab.navinfo.com/qiji4215/OneMapQS

Browse Source 
 Conflicts:
	app/build.gradle
	app/src/main/java/com/navinfo/omqs/OMQSApplication.kt
	app/src/main/java/com/navinfo/omqs/ui/MainActivity.kt
	app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt
	app/src/main/res/layout/fragment_offline_map_state_list.xml
	app/src/main/res/layout/map_view.xml
	collect-library/build.gradle
This commit is contained in:
qiji4215
2023-04-19 15:52:28 +08:00
parent 3876ab9f38 12223e7a1e
commit 4f9f85d09d
90 changed files with 2972 additions and 812 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/res/layout/fragment_offline_map.xml
View File

@@ -26,20 +26,13 @@
android:text="城市列表" />
</com.google.android.material.tabs.TabLayout>
<EditText
android:id="@+id/offline_map_search"
style="@style/input_blue_type"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="搜索"
app:layout_constraintTop_toBottomOf="@id/offline_map_tab_layout" />
<androidx.viewpager2.widget.ViewPager2
android:id="@+id/offline_map_viewpager"
android:layout_width="match_parent"
android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@id/offline_map_search" />
app:layout_constraintTop_toBottomOf="@id/offline_map_tab_layout" />
<ImageView
android:id="@+id/offline_map_back"
@@ -51,4 +44,6 @@
app:layout_constraintBottom_toBottomOf="@id/offline_map_tab_layout"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="@id/offline_map_tab_layout" />
</androidx.constraintlayout.widget.ConstraintLayout>