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

feat: 1.增加道路任务1秒2拍功能，修改为快照模式 2.增加自动采集道路任务功能

Browse Source
This commit is contained in:
xiaoyan
2022-07-28 14:12:06 +08:00
parent dd9144aa32
commit c925268911
39 changed files with 4668 additions and 711 deletions
Download Patch File Download Diff File Expand all files Collapse all files

256
app/src/main/res/layout/activity_auto_take_pictures.xml Normal file
View File

@@ -0,0 +1,256 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#FF444444"
tools:context=".activity.PicturesActivity">
<FrameLayout
android:id="@+id/layer_change"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<com.otaliastudios.cameraview.CameraView
android:id="@+id/camera"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:keepScreenOn="true"
app:cameraPictureFormat="jpeg"
app:cameraPictureMetering="true"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<com.tencent.tencentmap.mapsdk.maps.TextureMapView
android:id="@+id/text_map_view"
android:layout_width="200dp"
android:layout_height="157dp"
app:layout_constraintHeight_default="percent"
app:layout_constraintHeight_percent="0.4"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintWidth_default="percent"
app:layout_constraintWidth_percent="0.4" />
</FrameLayout>
<ImageView
android:id="@+id/image_view"
android:layout_width="300dp"
android:layout_height="157dp"
app:layout_constraintHeight_default="percent"
app:layout_constraintHeight_percent="0.4"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintWidth_default="percent"
app:layout_constraintWidth_percent="0.4" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:orientation="vertical">
<TextView
android:id="@+id/tv_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="25dp"
android:textColor="@color/white"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_convert"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/white"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</LinearLayout>
<ImageView
android:id="@+id/iv_zoom_add"
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_marginEnd="25dp"
android:src="@mipmap/zoom_add"
android:visibility="gone"
app:layout_constraintBottom_toTopOf="@+id/btn_stop_picture"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/iv_zoom_del"
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_marginTop="15dp"
android:src="@mipmap/zoom_del"
android:visibility="gone"
app:layout_constraintLeft_toLeftOf="@id/iv_zoom_add"
app:layout_constraintTop_toBottomOf="@id/iv_zoom_add" />
<!--<CheckBox
android:id="@+id/cb_map_type"
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_marginTop="15dp"
android:background="@drawable/atlas_selector"
android:button="@null"
android:checked="false"
android:visibility="gone"
app:layout_constraintLeft_toLeftOf="@id/iv_zoom_del"
app:layout_constraintTop_toBottomOf="@id/iv_zoom_del" />-->
<ImageView
android:id="@+id/iv_location"
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_marginTop="15dp"
android:src="@mipmap/mine_location"
android:visibility="gone"
app:layout_constraintLeft_toLeftOf="@id/iv_zoom_del"
app:layout_constraintTop_toBottomOf="@id/iv_zoom_del" />
<ImageView
android:id="@+id/btn_switch"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:layout_marginEnd="25dp"
android:src="@mipmap/switcher"
android:padding="@dimen/default_widget_padding"
android:text="切换"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<Button
android:id="@+id/btn_setting"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="设置"
android:layout_marginTop="@dimen/default_widget_padding"
app:layout_constraintTop_toBottomOf="@id/btn_switch"
app:layout_constraintRight_toRightOf="parent"></Button>
<Switch
android:id="@+id/location_switch"
android:text="启用定位"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:checked="true"
android:padding="@dimen/default_widget_padding"
app:layout_constraintTop_toBottomOf="@id/btn_setting"
app:layout_constraintRight_toRightOf="parent"></Switch>
<RadioGroup
android:id="@+id/radio_group_picture"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="35dp"
android:orientation="vertical"
android:visibility="gone"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/image_view">
<RadioButton
android:id="@+id/radio_btn_hand"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:layout_marginBottom="15dp"
android:button="@null"
android:text="手动"
android:textColor="@color/rbtn_text_color_selector" />
<RadioButton
android:id="@+id/radio_btn_half_sec"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:layout_marginBottom="15dp"
android:button="@null"
android:text="自动0.5秒"
android:textColor="@color/rbtn_text_color_selector" />
<RadioButton
android:id="@+id/radio_btn_auto"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:layout_marginBottom="15dp"
android:button="@null"
android:text="自动1秒"
android:textColor="@color/rbtn_text_color_selector" />
<RadioButton
android:id="@+id/radio_btn_auto_sec"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:layout_marginBottom="15dp"
android:button="@null"
android:text="自动2秒"
android:textColor="@color/rbtn_text_color_selector" />
</RadioGroup>
<ImageView
android:id="@+id/iv_pic_road"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/take_pic_arrow"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/iv_pic_video"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/take_poi_video_arrow"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<Button
android:id="@+id/clear_all_match_data"
style="@style/user_data_style"
android:layout_width="100dp"
android:layout_height="wrap_content"
android:layout_marginBottom="20dp"
android:background="@drawable/user_style"
android:button="@null"
android:gravity="center"
android:padding="@dimen/fab_margin"
android:text="清空匹配"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toLeftOf="@id/btn_stop_picture" />
<Button
android:id="@+id/btn_stop_picture"
android:layout_width="100dp"
android:layout_height="wrap_content"
android:background="@drawable/uploding_shape"
android:text="结束采集"
android:textColor="@color/colorBlue"
app:layout_constraintBottom_toBottomOf="@id/clear_all_match_data"
app:layout_constraintLeft_toRightOf="@id/clear_all_match_data"
app:layout_constraintRight_toRightOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

14
app/src/main/res/layout/activity_pictures.xml
View File

@@ -122,17 +122,27 @@
app:layout_constraintLeft_toLeftOf="@id/iv_zoom_del"
app:layout_constraintTop_toBottomOf="@id/iv_zoom_del" />
<Button
<ImageView
android:id="@+id/btn_switch"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:layout_marginEnd="25dp"
android:text="切换"
android:visibility="gone"
android:src="@mipmap/switcher"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<Button
android:id="@+id/btn_setting"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="设置"
android:layout_marginTop="@dimen/default_widget_padding"
android:visibility="gone"
app:layout_constraintTop_toBottomOf="@id/btn_switch"
app:layout_constraintRight_toRightOf="parent"></Button>
<RadioGroup
android:id="@+id/radio_group_picture"
android:layout_width="wrap_content"

165
app/src/main/res/layout/camera_setting.xml Normal file
View File

@@ -0,0 +1,165 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/dialogButtonMIUITextGray"
android:padding="@dimen/fab_margin"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingHorizontal="@dimen/default_widget_padding"
android:text="屏幕亮度"></TextView>
<EditText
android:id="@+id/edt_camera_setting_brightness"
android:layout_width="150dp"
android:layout_height="wrap_content"
android:inputType="number"
android:hint="屏幕亮度"
></EditText>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingHorizontal="@dimen/default_widget_padding"
android:text="相机刷新"></TextView>
<EditText
android:id="@+id/edt_camera_setting_framness"
android:layout_width="150dp"
android:layout_height="wrap_content"
android:inputType="number"
android:hint="相机刷新"
></EditText>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingHorizontal="@dimen/default_widget_padding"
android:text="起点距离阈值"></TextView>
<EditText
android:id="@+id/edt_camera_setting_start_distance"
android:layout_width="150dp"
android:layout_height="wrap_content"
android:inputType="numberDecimal"
android:hint="起点距离阈值"
></EditText>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingHorizontal="@dimen/default_widget_padding"
android:text="过程点距离阈值"></TextView>
<EditText
android:id="@+id/edt_camera_setting_mid_distance"
android:layout_width="150dp"
android:layout_height="wrap_content"
android:inputType="numberDecimal"
android:hint="过程点距离阈值"
></EditText>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingHorizontal="@dimen/default_widget_padding"
android:text="起点放弃个数"></TextView>
<EditText
android:id="@+id/edt_camera_setting_start_count"
android:layout_width="150dp"
android:layout_height="wrap_content"
android:inputType="number"
android:hint="起点放弃个数"
></EditText>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingHorizontal="@dimen/default_widget_padding"
android:text="过程点放弃个数"></TextView>
<EditText
android:id="@+id/edt_camera_setting_mid_count"
android:layout_width="150dp"
android:layout_height="wrap_content"
android:inputType="number"
android:hint="过程点放弃个数"
></EditText>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingHorizontal="@dimen/default_widget_padding"
android:text="放弃匹配距离阈值"></TextView>
<EditText
android:id="@+id/edt_camera_setting_unmatch_pecent"
android:layout_width="150dp"
android:layout_height="wrap_content"
android:inputType="numberDecimal"
android:hint="放弃匹配距离百分比"
></EditText>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingHorizontal="@dimen/default_widget_padding"
android:text="完全匹配距离百分比"></TextView>
<EditText
android:id="@+id/edt_camera_setting_match_pecent"
android:layout_width="150dp"
android:layout_height="wrap_content"
android:inputType="numberDecimal"
android:hint="完全匹配距离百分比"
></EditText>
</LinearLayout>
<Button
android:id="@+id/btn_camera_setting_confirm"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="确定"
android:layout_gravity="center"></Button>
</LinearLayout>

53
app/src/main/res/layout/camera_setting_pre.xml Normal file
View File

@@ -0,0 +1,53 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/dialogButtonMIUITextGray"
android:padding="@dimen/fab_margin"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingHorizontal="@dimen/default_widget_padding"
android:text="屏幕亮度"></TextView>
<EditText
android:id="@+id/edt_camera_setting_brightness"
android:layout_width="150dp"
android:layout_height="wrap_content"
android:inputType="number"
android:hint="屏幕亮度"
></EditText>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingHorizontal="@dimen/default_widget_padding"
android:text="相机刷新"></TextView>
<EditText
android:id="@+id/edt_camera_setting_framness"
android:layout_width="150dp"
android:layout_height="wrap_content"
android:inputType="number"
android:hint="相机刷新"
></EditText>
</LinearLayout>
<Button
android:id="@+id/btn_camera_setting_confirm"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="确定"
android:layout_gravity="center"></Button>
</LinearLayout>

11
app/src/main/res/layout/treasure_fragment.xml
View File

@@ -41,6 +41,7 @@
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/iv_mas_notification"
android:layout_width="10dp"
@@ -115,6 +116,16 @@
app:layout_constraintLeft_toLeftOf="@id/cb_map_type"
app:layout_constraintTop_toTopOf="@+id/iv_refrish" />
<Button
android:id="@+id/iv_auto_match_road"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:text="道路自动匹配"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"/>
<ImageView
android:id="@+id/iv_zoom_add"
android:layout_width="50dp"

BIN
app/src/main/res/mipmap-xxhdpi/switcher.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 474 B