完成了引导页显示。修改拍照中的问题,解决了8.25出现的bug

This commit is contained in:
wangdongsheng
2021-08-26 18:43:35 +08:00
parent 85d59c2b4e
commit 030cff5d1b
41 changed files with 710 additions and 485 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 208 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 262 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 594 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 678 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 371 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 680 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 681 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 233 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 264 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 673 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 370 KiB

View File

@@ -8,6 +8,5 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
>
</FrameLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

View File

@@ -35,12 +35,11 @@
android:id="@+id/iv_zoom_add"
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_marginLeft="15dp"
android:layout_marginTop="15dp"
android:src="@mipmap/zoom_add"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintBottom_toTopOf="@+id/btn_stop_video"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@+id/btn_switch"
app:layout_constraintTop_toTopOf="parent" />
<ImageView

View File

@@ -16,6 +16,8 @@
android:id="@+id/camera"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:cameraPictureSizeMaxArea="2500"
app:cameraVideoSizeMaxWidth="2750000"
android:keepScreenOn="true"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -36,12 +38,11 @@
android:id="@+id/iv_zoom_add"
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_marginLeft="15dp"
android:layout_marginTop="15dp"
android:src="@mipmap/zoom_add"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintBottom_toTopOf="@+id/btn_stop_picture"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@+id/btn_switch"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
@@ -82,7 +83,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:layout_marginEnd="20dp"
android:layout_marginEnd="25dp"
android:text="切换"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />

View File

@@ -14,7 +14,8 @@
<LinearLayout
android:id="@+id/ll_filter"
android:layout_width="match_parent"
android:layout_height="80dp">
android:layout_height="80dp"
android:baselineAligned="false">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_type"
@@ -39,7 +40,7 @@
style="@style/main_about_text_style"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginStart="10dp"
android:layout_marginBottom="20dp"
android:text="全部"
app:layout_constraintBottom_toBottomOf="parent"
@@ -77,7 +78,7 @@
style="@style/main_about_text_style"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginStart="10dp"
android:layout_marginBottom="20dp"
android:text="全部"
app:layout_constraintBottom_toBottomOf="parent"
@@ -98,7 +99,8 @@
<LinearLayout
android:id="@+id/ll_filter_2"
android:layout_width="match_parent"
android:layout_height="80dp">
android:layout_height="80dp"
android:baselineAligned="false">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_photograph"
@@ -124,7 +126,7 @@
style="@style/main_about_text_style"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginStart="10dp"
android:layout_marginBottom="20dp"
android:text="全部"
app:layout_constraintBottom_toBottomOf="parent"
@@ -162,7 +164,7 @@
style="@style/main_about_text_style"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginStart="10dp"
android:layout_marginBottom="20dp"
android:text="200"
app:layout_constraintBottom_toBottomOf="parent"
@@ -201,9 +203,9 @@
style="@style/user_style"
android:layout_width="80dp"
android:layout_height="40dp"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginRight="20dp"
android:layout_marginEnd="20dp"
android:gravity="center"
android:text="地图显示"
android:textColor="@color/white"

View File

@@ -8,8 +8,9 @@
<Button
android:id="@+id/btn_delete"
android:layout_width="15dp"
android:layout_height="15dp"
android:layout_width="25dp"
android:layout_height="25dp"
android:padding="5dp"
android:layout_marginEnd="10dp"
android:layout_marginTop="5dp"
android:background="@drawable/icon_delete"

View File

@@ -0,0 +1,16 @@
<?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"
android:background="@drawable/icon_data_10_marker"
xmlns:app="http://schemas.android.com/apk/res-auto">
<Button
android:id="@+id/btn_next_step"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/icon_next_step"
android:layout_marginBottom="60dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

View File

@@ -0,0 +1,16 @@
<?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"
android:background="@drawable/icon_discover_8_marker"
xmlns:app="http://schemas.android.com/apk/res-auto">
<Button
android:id="@+id/btn_next_step"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/icon_next_step"
android:layout_marginBottom="60dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

View File

@@ -0,0 +1,16 @@
<?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"
android:background="@drawable/icon_gather_5_marker"
xmlns:app="http://schemas.android.com/apk/res-auto">
<Button
android:id="@+id/btn_next_step"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/icon_next_step"
android:layout_marginBottom="60dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

View File

@@ -0,0 +1,16 @@
<?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"
android:background="@drawable/icon_location_4_marker"
xmlns:app="http://schemas.android.com/apk/res-auto">
<Button
android:id="@+id/btn_next_step"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/icon_next_step"
android:layout_marginBottom="60dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

View File

@@ -0,0 +1,16 @@
<?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"
android:background="@drawable/icon_my_head_9_marker"
xmlns:app="http://schemas.android.com/apk/res-auto">
<Button
android:id="@+id/btn_next_step"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/icon_next_step"
android:layout_marginBottom="60dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

View File

@@ -3,16 +3,16 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:background="@color/bgColor_overlay"
android:background="@drawable/icon_refresh_2_marker"
android:layout_height="match_parent">
<Button
android:id="@+id/btn_icon"
android:layout_width="100dp"
android:layout_height="100dp"
android:text="最后一页"
android:id="@+id/btn_next_step"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/icon_next_step"
android:layout_marginBottom="60dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintStart_toStartOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

View File

@@ -3,16 +3,15 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:background="@color/dialogBkgDark"
android:background="@drawable/icon_screen_3_marker"
android:layout_height="match_parent">
<Button
android:id="@+id/btn_icon"
android:layout_width="100dp"
android:layout_height="100dp"
android:text="第二页"
android:id="@+id/btn_next_step"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/icon_next_step"
android:layout_marginBottom="60dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintStart_toStartOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

View File

@@ -0,0 +1,16 @@
<?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"
android:background="@drawable/icon_submit_6_marker"
xmlns:app="http://schemas.android.com/apk/res-auto">
<Button
android:id="@+id/btn_next_step"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/icon_next_step"
android:layout_marginBottom="60dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

View File

@@ -0,0 +1,16 @@
<?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"
android:background="@drawable/icon_submitted_7_marker"
xmlns:app="http://schemas.android.com/apk/res-auto">
<Button
android:id="@+id/btn_next_step"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/icon_next_step"
android:layout_marginBottom="60dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

View File

@@ -3,16 +3,16 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:background="@drawable/bg"
android:background="@drawable/icon_task_1_marker"
android:layout_height="match_parent">
<Button
android:id="@+id/btn_icon"
android:layout_width="100dp"
android:layout_height="100dp"
android:text="第一页"
android:id="@+id/btn_next_step"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/icon_next_step"
android:layout_marginBottom="60dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintStart_toStartOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

View File

@@ -0,0 +1,16 @@
<?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"
android:background="@drawable/icon_withdraw_11_marker"
xmlns:app="http://schemas.android.com/apk/res-auto">
<Button
android:id="@+id/btn_to_learn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/icon_to_learn"
android:layout_marginBottom="60dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>