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

修改1、2、3级bug(部分)

Browse Source
This commit is contained in:
md
2021-08-03 16:54:33 +08:00
parent eccc2fdadb
commit 839c96e638
12 changed files with 601 additions and 374 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,21 +6,30 @@
android:layout_height="match_parent"
android:background="#FF444444"
tools:context=".activity.PicturesActivity">
<com.otaliastudios.cameraview.CameraView
android:id="@+id/cameraView"
<FrameLayout
android:id="@+id/layer_change"
android:layout_width="match_parent"
android:layout_height="0dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
/>
android:layout_height="match_parent">
<com.otaliastudios.cameraview.CameraView
android:id="@+id/camera"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:keepScreenOn="true"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<com.tencent.tencentmap.mapsdk.maps.TextureMapView
android:id="@+id/iv_map"
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>
<!-- <com.tencent.tencentmap.mapsdk.maps.MapView-->
<!-- android:id="@+id/iv_map"-->
<!-- android:layout_width="300dp"-->
<!-- android:layout_height="183dp"-->
<!-- app:layout_constraintLeft_toLeftOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent" />-->
<Button
android:id="@+id/btn_switch"
@@ -32,23 +41,25 @@
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/iv_pic"
<Button
android:id="@+id/btn_video"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@mipmap/take_pic_arrow"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
android:text="停止"
android:visibility="gone"
app:layout_constraintRight_toRightOf="@id/btn_switch"
app:layout_constraintTop_toBottomOf="@id/btn_switch" />
<Button
<CheckBox
android:id="@+id/capuretVideo"
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"