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

修改录像功能，添加拍照。修改bug

Browse Source
This commit is contained in:
wangdongsheng
2021-08-24 18:39:17 +08:00
parent d63b66eedf
commit 647dd87934
79 changed files with 935 additions and 1231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/src/main/res/drawable/icon_delete.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 224 B

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

@@ -20,14 +20,14 @@
<com.tencent.tencentmap.mapsdk.maps.TextureMapView
android:id="@+id/iv_map"
android:layout_width="100dp"
android:layout_width="200dp"
android:layout_height="157dp"
app:layout_constraintHeight_default="percent"
app:layout_constraintHeight_percent="0.3"
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.3" />
app:layout_constraintWidth_percent="0.4" />
</FrameLayout>
@@ -36,7 +36,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:layout_marginRight="20dp"
android:layout_marginEnd="20dp"
android:text="切换"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -44,7 +44,7 @@
<CheckBox
android:id="@+id/capuret_picture"
android:id="@+id/capture_picture"
style="@style/user_data_style"
android:layout_width="100dp"
android:layout_height="wrap_content"
@@ -65,7 +65,7 @@
android:background="@drawable/uploding_shape"
android:text="结束采集"
android:textColor="@color/colorBlue"
app:layout_constraintBottom_toBottomOf="@id/capuret_picture"
app:layout_constraintLeft_toRightOf="@id/capuret_picture"
app:layout_constraintBottom_toBottomOf="@id/capture_picture"
app:layout_constraintLeft_toRightOf="@id/capture_picture"
app:layout_constraintRight_toRightOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -6,17 +6,27 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<Button
android:id="@+id/btn_delete"
android:layout_width="15dp"
android:layout_height="15dp"
android:layout_marginEnd="10dp"
android:layout_marginTop="5dp"
android:background="@drawable/icon_delete"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_title"
android:layout_width="270dp"
android:layout_height="wrap_content"
android:layout_margin="15dp"
android:text="众包录像 测试3"
android:textColor="#333"
android:layout_margin="20dp"
android:textSize="18sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/btn_delete" />
<TextView
android:id="@+id/tv_money"
@@ -34,7 +44,7 @@
android:id="@+id/tv_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:layout_marginTop="15dp"
android:text="到期时间："
android:textSize="15sp"
app:layout_constraintStart_toStartOf="@+id/tv_title"
@@ -70,47 +80,53 @@
android:layout_marginTop="20dp"
app:layout_constraintStart_toStartOf="@+id/tv_time"
app:layout_constraintTop_toBottomOf="@+id/tv_time" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_describe">
<Button
android:id="@+id/btn_cancel_get"
style="@style/user_data_style"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_margin="20dp"
android:visibility="gone"
android:layout_margin="15dp"
android:layout_weight="1"
android:text="取消领取" />
android:text="取消领取"
android:visibility="gone" />
<Button
android:id="@+id/btn_get_task"
style="@style/user_data_style"
android:layout_width="0dp"
android:visibility="visible"
android:layout_height="wrap_content"
android:layout_margin="20dp"
android:layout_margin="15dp"
android:layout_weight="1"
android:text="领取任务" />
android:text="领取任务"
android:visibility="visible" />
<Button
android:id="@+id/btn_gather"
style="@style/user_data_style"
android:layout_width="0dp"
android:visibility="visible"
android:layout_height="wrap_content"
android:layout_margin="20dp"
android:layout_margin="15dp"
android:layout_weight="1"
android:text="立即采集" />
android:text="立即采集"
android:visibility="visible" />
<Button
android:id="@+id/btn_finish_gather"
style="@style/user_data_style"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_margin="20dp"
android:visibility="gone"
android:layout_margin="15dp"
android:layout_weight="1"
android:text="结束采集" />
android:text="结束采集"
android:visibility="gone" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

7
app/src/main/res/layout/fragment_other.xml
View File

@@ -32,7 +32,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="20dp"
android:text="01.选择情报类型"
android:text="@string/tv_other_type_01"
android:textStyle="bold"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
@@ -70,13 +70,14 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginEnd="5dp"
android:background="@drawable/ic_baseline_arrow_drop"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
/>
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>

1
app/src/main/res/values/strings.xml
View File

@@ -165,5 +165,6 @@
地图寻宝App：作为专业众包作业工具，可作业道路、POI、充电站、公交站、门牌号等多类型任务。\n\n
地图寻宝小程序：简版众包作业工具，无需安装，可采集POI、充电站点类型任务\n\n
地图寻宝小程序：微信小程序搜索-地图寻宝</string>
<string name="tv_other_type_01">01.其他任务类型</string>
</resources>