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

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

Browse Source 
 Conflicts:
	app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt
	app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt
	collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBTileDataSource.java
	vtm
This commit is contained in:
qiji4215
2023-08-11 10:05:35 +08:00
parent 061aca96ab 54b30d5db5
commit 215aad041e
15 changed files with 569 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
app/src/main/res/drawable/baseline_cancel_24.xml → app/src/main/res/drawable-v24/baseline_cancel_24.xml
View File

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 836 B

1
app/src/main/res/drawable/selector_default_button_white_bg.xml
View File

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

2
app/src/main/res/drawable/shape_rect_transparent_blue_6dp_bg.xml
View File

@@ -7,7 +7,7 @@
android:bottomRightRadius="6dp"
android:topLeftRadius="6dp"
android:topRightRadius="6dp" />
<stroke android:width="1dp" android:color="@color/blue"/>
<solid android:color="#2632335e" />
</shape>

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

@@ -101,7 +101,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/top_right_drawer_btns_mr"
app:constraint_referenced_ids="main_activity_note,main_activity_task_line,main_activity_serach,main_activity_2d_3d,main_activity_camera,main_activity_trace,main_activity_calc_disance,main_activity_menu"
app:constraint_referenced_ids="main_activity_note,main_activity_task_line,main_activity_serach,main_activity_2d_3d,main_activity_camera,main_activity_trace,main_activity_calc_distance,main_activity_menu"
app:flow_horizontalGap="6dp"
app:flow_wrapMode="aligned"
app:layout_constraintRight_toLeftOf="@id/main_activity_right_fragment"
@@ -112,7 +112,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="invisible"
app:constraint_referenced_ids="main_activity_serach,main_activity_2d_3d,main_activity_camera,main_activity_trace,main_activity_note,main_activity_task_line,main_activity_calc_disance" />
app:constraint_referenced_ids="main_activity_serach,main_activity_2d_3d,main_activity_camera,main_activity_trace,main_activity_note,main_activity_task_line,main_activity_calc_distance" />
<ImageButton
android:id="@+id/main_activity_serach"
@@ -139,9 +139,9 @@
android:src="@drawable/icon_trace" />
<ImageButton
android:id="@+id/main_activity_calc_disance"
android:id="@+id/main_activity_calc_distance"
style="@style/top_right_drawer_btns_style"
android:onClick="@{()->mainActivity.onClickCalcDisance()}"
android:onClick="@{()->mainActivity.onClickCalcDistance()}"
android:src="@drawable/icon_calc_disance" />
<ImageButton
@@ -164,6 +164,15 @@
android:elevation="2dp"
android:onClick="@{()->mainActivity.onClickMenu()}" />
<include
android:id="@+id/main_activity_measuring_tool"
layout="@layout/main_measuring_tool"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:visibility="gone"
app:layout_constraintRight_toRightOf="@id/main_activity_calc_distance"
app:layout_constraintTop_toBottomOf="@id/main_activity_flow" />
<androidx.constraintlayout.widget.Barrier
android:layout_width="wrap_content"
@@ -333,12 +342,12 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/five"
app:constraint_referenced_ids="main_activity_snapshot_finish,main_activity_trace_snapshot_points,main_activity_snapshot_media_flag,main_activity_snapshot_rewind,main_activity_snapshot_pause,main_activity_snapshot_next,main_activity_menu_indoor_group"
app:constraint_referenced_ids="main_activity_snapshot_finish,main_activity_trace_snapshot_points,main_activity_snapshot_rewind,main_activity_snapshot_pause,main_activity_snapshot_next,main_activity_menu_indoor_group"
app:flow_horizontalGap="6dp"
app:flow_wrapMode="aligned"
app:layout_constraintBottom_toTopOf="@id/main_activity_bottom_sheet"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toTopOf="@id/main_activity_bottom_sheet" />
app:layout_constraintStart_toStartOf="parent" />
<androidx.constraintlayout.widget.Group
android:id="@+id/main_activity_menu_indoor_group"
@@ -359,12 +368,12 @@
android:onClick="@{()->mainActivity.tracePointsOnclick()}"
android:src="@drawable/map_trace_select_point" />
<!-- <ImageButton
android:id="@+id/main_activity_snapshot_media_flag"
style="@style/top_right_drawer_btns_style"
android:visibility="gone"
android:onClick="@{()->mainActivity.mediaFlagOnclick()}"
android:src="@drawable/map_trace_mediaflag" />-->
<!-- <ImageButton
android:id="@+id/main_activity_snapshot_media_flag"
style="@style/top_right_drawer_btns_style"
android:visibility="gone"
android:onClick="@{()->mainActivity.mediaFlagOnclick()}"
android:src="@drawable/map_trace_mediaflag" />-->
<ImageButton
android:id="@+id/main_activity_snapshot_rewind"

71
app/src/main/res/layout/main_measuring_tool.xml
View File

@@ -3,31 +3,48 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/shape_rect_white_6dp_bg"
android:clickable="true"
android:gravity="center"
android:orientation="horizontal">
android:orientation="horizontal"
android:padding="5dp">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="5dp"
android:gravity="center"
android:orientation="vertical">
<TextView
android:id="@+id/measuring_tool_value"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_height="24dp"
android:background="@drawable/shape_bg_blue_bg_4_radius"
android:textColor="@color/white" />
android:gravity="center"
android:minWidth="65dp"
android:text="0"
android:textColor="@color/white"
android:textSize="14sp" />
<TextView
android:id="@+id/measuring_tool_value_unit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/blue" />
android:text="米"
android:textColor="@color/blue"
android:textSize="12sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/measuring_tool_select_point"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:gravity="center"
android:orientation="vertical">
android:orientation="vertical"
android:paddingLeft="6dp"
android:paddingRight="6dp">
<ImageView
android:layout_width="24dp"
@@ -43,10 +60,16 @@
</LinearLayout>
<LinearLayout
android:id="@+id/measuring_tool_distance"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:background="@drawable/selector_default_button_white_bg"
android:gravity="center"
android:orientation="vertical">
android:orientation="vertical"
android:paddingLeft="6dp"
android:paddingRight="6dp">
<ImageView
android:layout_width="24dp"
@@ -62,8 +85,12 @@
</LinearLayout>
<LinearLayout
android:id="@+id/measuring_tool_area"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:background="@drawable/selector_default_button_white_bg"
android:gravity="center"
android:orientation="vertical">
@@ -81,8 +108,12 @@
</LinearLayout>
<LinearLayout
android:id="@+id/measuring_tool_angle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:background="@drawable/selector_default_button_white_bg"
android:gravity="center"
android:orientation="vertical">
@@ -100,20 +131,36 @@
</LinearLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/measuring_tool_backspace"
android:layout_width="80dp"
android:layout_height="32dp"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:background="@drawable/shape_rect_transparent_blue_6dp_bg"
android:drawableLeft="@drawable/baseline_arrow_left_24"
android:drawablePadding="-15dp"
android:gravity="center"
android:text="上一步"
android:textColor="@color/blue"
android:textSize="12sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableLeft="@drawable/baseline_arrow_left_24"
android:id="@+id/measuring_tool_reset"
android:layout_width="80dp"
android:layout_height="32dp"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:background="@drawable/shape_rect_transparent_blue_6dp_bg"
android:gravity="center"
android:text="重复"
android:text="重绘"
android:textColor="@color/blue"
android:textSize="12sp" />
<ImageView
android:id="@+id/measuring_tool_close"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:background="@drawable/measuring_tool_close" />
</LinearLayout>