Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS
Conflicts: app/src/main/java/com/navinfo/omqs/Constant.kt app/src/main/java/com/navinfo/omqs/bean/OfflineMapCityBean.kt app/src/main/java/com/navinfo/omqs/ui/activity/login/LoginActivity.kt app/src/main/java/com/navinfo/omqs/ui/activity/login/LoginViewModel.kt app/src/main/res/layout/adapter_offline_map_city.xml
This commit is contained in:
9
app/src/main/res/layout/activity_map_test.xml
Normal file
9
app/src/main/res/layout/activity_map_test.xml
Normal file
@@ -0,0 +1,9 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
<com.navinfo.collect.library.map.NIMapView
|
||||
android:id="@+id/main_activity_map1"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent" />
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
Reference in New Issue
Block a user