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

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

Browse Source 
 Conflicts:
	app/src/main/java/com/navinfo/omqs/db/RealmOperateHelper.kt
	app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt
	app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt
	vtm
This commit is contained in:
squallzhjch
2023-09-20 09:59:34 +08:00
parent 607d4c290a 03c778c1ec
commit 427e36bb8a
21 changed files with 30724 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/res/layout/activity_main.xml
View File

@@ -235,6 +235,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/shape_road_name_bg"
android:visibility="gone"
android:onClick="@{()->mainActivity.openRoadNameFragment()}"
android:layout_marginLeft="10dp"
android:paddingLeft="10dp"
@@ -543,7 +544,6 @@
android:id="@+id/main_activity_bottom_sheet_group"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"
app:constraint_referenced_ids="
main_bottom_route_text,
main_bottom_offline_map_text,
@@ -551,7 +551,7 @@
main_bottom_task_text,main_bottom_route,
main_bottom_offline_map,
main_bottom_res,
main_activity_bottom_sheet_bg,
main_activity_bottom_sheet_bg,
main_bottom_task,main_bottom_home" />

1
app/src/main/res/layout/dialog_default.xml
View File

@@ -73,6 +73,7 @@
style="@style/content_font_default"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textIsSelectable="true"
android:background="@android:color/transparent"
android:gravity="center"
android:paddingBottom="@dimen/twenty_two"

2
app/src/main/res/menu/personal_center_menu.xml
View File

@@ -54,7 +54,7 @@
<item
android:id="@+id/personal_center_menu_version"
android:icon="@drawable/ic_baseline_layers_24"
android:title="版本：23QE4_V1.5.0_20230912_A" />
android:title="版本：23QE4_V1.5.2_20230919_A" />
</group>
<group android:checkableBehavior="single">
<item android:title="小标题">