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/res/layout/activity_main.xml
This commit is contained in:
squallzhjch
2023-05-06 11:03:57 +08:00
parent d86ec46943 e4729d2202
commit 9f7bf771c2
35 changed files with 377 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -42,9 +42,9 @@
android:layout_height="48dp"
android:layout_marginLeft="20dp"
android:layout_marginTop="20dp"
android:background="@null"
android:onClick="@{()->mainActivity.openMenu()}"
android:src="@drawable/baseline_person_24"
android:background="@null"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -57,116 +57,41 @@
app:layout_constraintTop_toBottomOf="@id/main_activity_person_center" />
<LinearLayout
android:orientation="horizontal"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10dp"
android:layout_marginTop="10dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintRight_toRightOf="parent"
tools:ignore="MissingConstraints">
<LinearLayout
android:id="@+id/main_activity_menu_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"
android:orientation="horizontal">
<ImageButton
android:id="@+id/main_activity_serach"
android:onClick="@{()->mainActivity.onClickSerach()}"
android:background="@drawable/icon_serach"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<ImageButton
android:id="@+id/main_activity_2d_3d"
android:background="@drawable/icon_2d_3d"
android:onClick="@{()->mainActivity.onClick2DOr3D()}"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<ImageButton
android:id="@+id/main_activity_camera"
android:background="@drawable/icon_page_video_a1"
android:onClick="@{()->mainActivity.openCamera()}"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<ImageButton
android:id="@+id/main_activity_trace"
android:onClick="@{()->mainActivity.onClickTrace()}"
android:background="@drawable/icon_trace"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<ImageButton
android:id="@+id/main_activity_calc_disance"
android:background="@drawable/icon_calc_disance"
android:onClick="@{()->mainActivity.onClickCalcDisance()}"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</LinearLayout>
<ImageButton
android:layout_marginTop="5dp"
android:id="@+id/main_activity_menu"
android:background="@drawable/chk_icon_menu_open_close_xml"
android:onClick="@{()->mainActivity.onClickMenu()}"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</LinearLayout>
<LinearLayout
android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="8dp"
android:layout_marginBottom="108dp"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toLeftOf="@+id/main_activity_right_fragment"
app:layout_constraintRight_toRightOf="parent"
tools:ignore="MissingConstraints">
<ImageButton
android:id="@+id/main_activity_select_line"
android:layout_width="48dp"
android:layout_height="48dp"
android:src="@drawable/baseline_timeline_24"
android:onClick="@{()->mainActivity.selectLineOnclick()}"
android:background="@drawable/shape_card_bg_default" />
<ImageButton
android:id="@+id/main_activity_voice"
android:layout_width="48dp"
android:layout_height="48dp"
android:src="@drawable/icon_add_voice"
android:background="@null" />
android:background="@null"
android:src="@drawable/icon_add_voice" />
<ImageButton
android:id="@+id/main_activity_line"
android:layout_width="48dp"
android:layout_height="48dp"
android:background="@null"
android:onClick="@{()->mainActivity.voiceOnclick()}"
android:src="@drawable/icon_add_data"
android:background="@null" />
android:src="@drawable/icon_add_data" />
<ImageButton
android:id="@+id/main_activity_location"
android:layout_width="48dp"
android:layout_height="48dp"
android:background="@null"
android:onClick="@{()->viewModel.onClickLocationButton()}"
android:src="@drawable/icon_location"
android:background="@null" />
android:src="@drawable/icon_location" />
</LinearLayout>
<fragment
android:id="@+id/main_activity_middle_fragment"
android:name="androidx.navigation.fragment.NavHostFragment"
@@ -182,15 +107,90 @@
<fragment
android:id="@id/main_activity_right_fragment"
android:name="androidx.navigation.fragment.NavHostFragment"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_width="wrap_content"
android:layout_height="match_parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintHorizontal_weight="2.5"
app:layout_constraintLeft_toRightOf="@id/main_activity_middle_fragment"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:navGraph="@navigation/right_fragment_nav_graph" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
app:layout_constraintRight_toLeftOf="@+id/main_activity_right_fragment"
android:layout_marginRight="10dp"
android:orientation="horizontal"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="MissingConstraints">
<LinearLayout
android:id="@+id/main_activity_menu_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:visibility="gone">
<ImageButton
android:id="@+id/main_activity_select_line"
android:layout_width="48dp"
android:layout_height="48dp"
android:background="@drawable/shape_card_bg_default"
android:onClick="@{()->mainActivity.selectLineOnclick()}"
android:src="@drawable/baseline_timeline_24" />
<ImageButton
android:id="@+id/main_activity_serach"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/icon_serach"
android:onClick="@{()->mainActivity.onClickSerach()}" />
<ImageButton
android:id="@+id/main_activity_2d_3d"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/icon_2d_3d"
android:onClick="@{()->mainActivity.onClick2DOr3D()}" />
<ImageButton
android:id="@+id/main_activity_camera"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/icon_page_video_a1"
android:onClick="@{()->mainActivity.openCamera()}" />
<ImageButton
android:id="@+id/main_activity_trace"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/icon_trace"
android:onClick="@{()->mainActivity.onClickTrace()}" />
<ImageButton
android:id="@+id/main_activity_calc_disance"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/icon_calc_disance"
android:onClick="@{()->mainActivity.onClickCalcDisance()}" />
</LinearLayout>
<ImageButton
android:id="@+id/main_activity_menu"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:background="@drawable/chk_icon_menu_open_close_xml"
android:onClick="@{()->mainActivity.onClickMenu()}" />
</LinearLayout>
<ImageButton
android:id="@+id/main_activity_camera2"
@@ -198,9 +198,9 @@
android:layout_height="48dp"
android:layout_marginLeft="20dp"
android:layout_marginTop="20dp"
android:background="@null"
android:onClick="@{()->mainActivity.openCamera()}"
android:src="@drawable/baseline_person_24"
android:background="@null"
android:visibility="gone"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />