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

1、增加要素线捕捉开关2、增加图层开关与要素捕捉联动3、个人中心增加Marker显隐开关4、修复道路属性不显示道路种别问题

Browse Source
This commit is contained in:
qiji4215
2023-09-21 16:13:46 +08:00
parent 028fda54b5
commit ab27048d54
15 changed files with 164 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/src/main/res/drawable-xxhdpi/icon_close_catch_line.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
app/src/main/res/drawable-xxhdpi/icon_open_catch_line.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

5
app/src/main/res/drawable/selector_catch_line_src.xml Normal file
View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/icon_open_catch_line" android:state_selected="true"></item>
<item android:drawable="@drawable/icon_close_catch_line" />
</selector>

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

@@ -248,13 +248,14 @@
app:layout_constraintLeft_toLeftOf="@id/main_activity_top_sign_recyclerview" />
<ImageButton
android:id="@+id/main_activity_map_update"
android:id="@+id/main_activity_map_catch_line"
style="@style/zoom_btns_style"
android:background="@drawable/selector_road_line_bg"
android:layout_marginBottom="12dp"
android:onClick="@{(view)->mainActivity.refrushOnclick(view)}"
android:src="@drawable/icon_map_refrush"
app:layout_constraintBottom_toTopOf="@id/main_activity_zoom_in"
app:layout_constraintRight_toRightOf="@id/main_activity_zoom_in" />
android:onClick="@{(view)->mainActivity.catchLineOnclick(view)}"
android:src="@drawable/selector_catch_line_src"
app:layout_constraintBottom_toTopOf="@id/main_activity_location"
app:layout_constraintRight_toRightOf="@id/main_activity_location" />
<ImageButton
@@ -287,8 +288,8 @@
android:layout_marginBottom="12dp"
android:onClick="@{()->mainActivity.onClickLocation()}"
android:src="@drawable/icon_location_north"
app:layout_constraintBottom_toTopOf="@id/main_activity_map_update"
app:layout_constraintRight_toRightOf="@id/main_activity_map_update" />
app:layout_constraintBottom_toTopOf="@id/main_activity_zoom_in"
app:layout_constraintRight_toRightOf="@id/main_activity_zoom_in" />
<ImageButton
android:id="@+id/main_activity_note"
@@ -296,8 +297,8 @@
android:layout_marginBottom="12dp"
android:onClick="@{()->mainActivity.onClickNewNote()}"
android:src="@drawable/icon_menu_note"
app:layout_constraintBottom_toTopOf="@id/main_activity_location"
app:layout_constraintRight_toRightOf="@id/main_activity_location" />
app:layout_constraintBottom_toTopOf="@id/main_activity_map_catch_line"
app:layout_constraintRight_toRightOf="@id/main_activity_map_catch_line" />
<ImageButton
android:id="@+id/main_activity_voice"
@@ -338,7 +339,7 @@
android:id="@+id/main_activity_right_visibility_buttons_group2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:constraint_referenced_ids="main_activity_close_line,main_activity_select_line,main_activity_voice,main_activity_note,main_activity_map_update,main_activity_zoom_in,main_activity_zoom_out,main_activity_geometry,main_activity_location" />
app:constraint_referenced_ids="main_activity_close_line,main_activity_select_line,main_activity_voice,main_activity_note,main_activity_map_catch_line,main_activity_zoom_in,main_activity_zoom_out,main_activity_geometry,main_activity_location" />
<fragment
android:id="@+id/main_activity_middle_fragment"

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

@@ -46,6 +46,11 @@
android:icon="@drawable/baseline_person_24"
android:visible="true"
android:title="锁定地图旋转及视角" />
<item
android:id="@+id/personal_center_menu_marker"
android:icon="@drawable/baseline_person_24"
android:visible="true"
android:title="隐藏Marker" />
<item
android:id="@+id/personal_center_menu_catch_all"
android:icon="@drawable/baseline_person_24"