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

1.修改拍摄的语音提醒 2.修改log日志 3.修改数据库更新操作

Browse Source
This commit is contained in:
wangdongsheng
2021-11-17 18:34:08 +08:00
parent 61915b4ead
commit f46d12a77e
34 changed files with 505 additions and 421 deletions
Download Patch File Download Diff File Expand all files Collapse all files

124
app/src/main/res/layout/fragment_gather_get.xml
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<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"
@@ -10,78 +9,97 @@
android:id="@+id/btn_delete"
android:layout_width="25dp"
android:layout_height="25dp"
android:padding="5dp"
android:layout_marginEnd="20dp"
android:layout_marginTop="10dp"
android:layout_marginEnd="20dp"
android:background="@drawable/delete"
android:padding="5dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_title"
android:layout_width="270dp"
<LinearLayout
android:id="@+id/linear_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="15dp"
android:text="众包录像 测试3"
android:ellipsize="end"
android:lines="2"
android:textColor="#333"
android:textSize="18sp"
android:orientation="horizontal"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/btn_delete" />
app:layout_constraintTop_toBottomOf="@+id/btn_delete">
<TextView
android:id="@+id/tv_money"
android:layout_width="wrap_content"
<TextView
android:id="@+id/tv_title"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="15dp"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:layout_weight="1"
android:ellipsize="end"
android:lines="2"
android:text="众包录像 测试3"
android:textColor="#333"
android:textSize="18sp" />
<TextView
android:id="@+id/tv_money"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="15dp"
android:text="3.5元"
android:textColor="#F44336"
android:textSize="20sp"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="@+id/tv_title"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/tv_title" />
</LinearLayout>
<RelativeLayout
android:id="@+id/relative_linear"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="3.5元"
android:textColor="#F44336"
android:textSize="20sp"
android:textStyle="bold"
android:layout_margin="15dp"
app:layout_constraintBottom_toBottomOf="@+id/tv_title"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/tv_title" />
<TextView
android:id="@+id/tv_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:text="到期时间："
android:textSize="15sp"
app:layout_constraintStart_toStartOf="@+id/tv_title"
app:layout_constraintTop_toBottomOf="@+id/tv_title" />
android:layout_marginTop="10dp"
app:layout_constraintStart_toStartOf="@+id/linear_layout"
app:layout_constraintTop_toBottomOf="@+id/linear_layout">
<TextView
android:id="@+id/tv_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="15dp"
android:text="到期时间："
android:textSize="15sp" />
<TextView
android:id="@+id/tv_distance"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_marginEnd="20dp"
android:maxLength="10"
android:text="距离："
android:textSize="15sp" />
</RelativeLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="#BFB8B8"
android:layout_marginStart="20dp"
android:layout_marginEnd="20dp"
app:layout_constraintBottom_toBottomOf="@+id/tv_time"
app:layout_constraintTop_toTopOf="@+id/tv_describe" />
<TextView
android:id="@+id/tv_distance"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:layout_marginEnd="20dp"
android:maxLength="10"
android:text="距离："
android:textSize="15sp"
app:layout_constraintBottom_toBottomOf="@+id/tv_time"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/tv_time" />
app:layout_constraintBottom_toTopOf="@+id/tv_describe"
app:layout_constraintTop_toBottomOf="@+id/relative_linear"
tools:layout_editor_absoluteX="20dp" />
<TextView
android:id="@+id/tv_describe"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="15dp"
android:layout_marginTop="20dp"
android:text="任务描述："
android:textSize="15sp"
android:layout_marginTop="20dp"
app:layout_constraintStart_toStartOf="@+id/tv_time"
app:layout_constraintTop_toBottomOf="@+id/tv_time" />
app:layout_constraintStart_toStartOf="@+id/relative_linear"
app:layout_constraintTop_toBottomOf="@+id/relative_linear" />
<LinearLayout
android:layout_width="match_parent"

16
app/src/main/res/layout/fragment_road.xml
View File

@@ -16,15 +16,16 @@
app:layout_constraintTop_toTopOf="parent">
</include>
<androidx.core.widget.NestedScrollView
android:id="@+id/nested_scroll_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
>
android:layout_height="match_parent">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
>
android:layout_height="match_parent">
<TextView
android:id="@+id/tv_message"
android:layout_width="wrap_content"
@@ -102,16 +103,15 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
app:layout_constraintLeft_toLeftOf="@id/ll_pictures"
app:layout_constraintTop_toBottomOf="@id/ll_pictures">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="点击拍摄成果可查看，长按可删除"
android:textSize="16sp"
android:layout_marginStart="10dp"
/>
android:textSize="16sp" />
<ImageView
android:id="@+id/iv_road_picture"
android:layout_width="200dp"

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

@@ -132,7 +132,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="100dp"
android:layout_marginRight="50dp"
android:layout_marginRight="30dp"
android:background="@null"
android:hint="银行卡号"
android:digits="1234567890"
@@ -142,16 +142,15 @@
app:layout_constraintLeft_toRightOf="@+id/tv_creditNumbers"
/>
<ImageView
android:id="@+id/gathering_camera"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_marginBottom="10dp"
android:src="@drawable/ic_baseline_camera"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toRightOf="@+id/et_bank_num"
app:layout_constraintTop_toTopOf="parent"
/>
<ImageView
android:id="@+id/gathering_camera"
android:layout_width="30dp"
android:layout_height="30dp"
android:src="@drawable/ic_baseline_camera"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintLeft_toRightOf="@+id/et_bank_num"
app:layout_constraintTop_toTopOf="parent" />

2
app/src/main/res/layout/poi_video_fragment.xml
View File

@@ -128,7 +128,7 @@
android:layout_height="wrap_content"
android:text="点击拍摄成果可查看，长按可删除"
android:textSize="16sp"
android:layout_marginStart="10dp"/>
/>
<ImageView
android:id="@+id/iv_poi_video_picture"
android:layout_width="200dp"

8
app/src/main/res/layout/user_attestation_fragment.xml
View File

@@ -140,22 +140,22 @@
android:background="@null"
android:textColorHint="@color/colorRed"
android:layout_marginLeft="100dp"
android:layout_marginRight="50dp"
android:layout_marginRight="30dp"
android:hint="点击拍照自动识别"
android:textSize="16sp"
app:layout_constraintLeft_toRightOf="@+id/tv_card"
app:layout_constraintTop_toTopOf="@+id/tv_card"
/>
<ImageView
android:id="@+id/user_attestation_camera"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_marginBottom="10dp"
android:src="@drawable/ic_baseline_camera"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintLeft_toRightOf="@+id/et_namePhone"
app:layout_constraintTop_toTopOf="parent"
/>
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<View