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

修改9.2号提出的bug（部分）

Browse Source
This commit is contained in:
md
2021-09-02 15:45:10 +08:00
parent f63bbeb8fe
commit b1f3d251ba
22 changed files with 420 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
app/src/main/res/layout/activity_photo_album.xml Normal file
View File

@@ -0,0 +1,66 @@
<?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"
tools:context=".activity.PhotoAlbumActivity">
<LinearLayout
android:id="@+id/rl_photo_album"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#1BA5F1"
android:orientation="horizontal"
android:paddingTop="@dimen/top_pind_sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<ImageView
android:id="@+id/iv_photo_final"
android:layout_width="wrap_content"
android:layout_height="45dp"
android:layout_alignParentLeft="true"
android:layout_marginLeft="15dp"
android:src="@drawable/icon_arrow" />
<TextView
android:id="@+id/tv_event"
style="@style/text_style_toolbar_title"
android:layout_width="wrap_content"
android:layout_toRightOf="@id/iv_find_task"
android:text="查看相册" />
</LinearLayout>
<TextView
android:id="@+id/tv_photo_choose"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="10dp"
android:text="选择"
android:textColor="@color/black"
android:textSize="16sp"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@+id/rl_photo_album"/>
<TextView
android:id="@+id/tv_photo_album_delete"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="10dp"
android:text="删除"
android:textColor="@color/black"
android:textSize="16sp"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@+id/rl_photo_album"/>
<com.jcodecraeer.xrecyclerview.XRecyclerView
android:id="@+id/photo_album_recycler"
android:layout_width="match_parent"
android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_photo_album_delete" />
</androidx.constraintlayout.widget.ConstraintLayout>

26
app/src/main/res/layout/activity_picture.xml
View File

@@ -52,17 +52,17 @@
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" />
<!-- <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"
@@ -71,8 +71,8 @@
android:layout_marginTop="15dp"
android:src="@mipmap/mine_location"
android:visibility="gone"
app:layout_constraintLeft_toLeftOf="@id/cb_map_type"
app:layout_constraintTop_toBottomOf="@id/cb_map_type" />
app:layout_constraintLeft_toLeftOf="@id/iv_zoom_del"
app:layout_constraintTop_toBottomOf="@id/iv_zoom_del" />
<Button
android:id="@+id/btn_switch"
android:layout_width="wrap_content"

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

@@ -59,17 +59,17 @@
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" />
<!-- <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"
@@ -78,8 +78,8 @@
android:layout_marginTop="15dp"
android:src="@mipmap/mine_location"
android:visibility="gone"
app:layout_constraintLeft_toLeftOf="@id/cb_map_type"
app:layout_constraintTop_toBottomOf="@id/cb_map_type" />
app:layout_constraintLeft_toLeftOf="@id/iv_zoom_del"
app:layout_constraintTop_toBottomOf="@id/iv_zoom_del" />
<Button

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

@@ -24,7 +24,7 @@
android:layout_width="wrap_content"
android:layout_height="45dp"
android:layout_alignParentLeft="true"
android:layout_marginLeft="20dp"
android:layout_marginLeft="15dp"
android:src="@drawable/icon_arrow"
/>

1
app/src/main/res/layout/fragment_message.xml
View File

@@ -40,6 +40,7 @@
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginTop="20dp"
android:visibility="gone"
android:layout_marginRight="10dp"
android:text="全部已读"
android:textColor="@color/black" />

25
app/src/main/res/layout/photo_album_item.xml Normal file
View File

@@ -0,0 +1,25 @@
<?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"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<ImageView
android:id="@+id/iv_photo_album"
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_margin="10dp"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
<CheckBox
android:id="@+id/cb_photo_album"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"
android:layout_margin="10dp"
app:layout_constraintRight_toRightOf="@+id/iv_photo_album"
app:layout_constraintTop_toTopOf="@+id/iv_photo_album" />
</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -175,6 +175,16 @@
android:text="点击拍照"
android:textColor="@color/white"
android:textSize="15sp" />
<TextView
android:id="@+id/tv_photo_album"
style="@style/user_style"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:gravity="center"
android:text="点击查看成果"
android:textColor="@color/white"
android:textSize="15sp" />
</LinearLayout>

2
app/src/main/res/values/styles.xml
View File

@@ -57,7 +57,7 @@
<style name="text_style_toolbar_title">
<item name="android:layout_height">45dp</item>
<item name="android:layout_marginLeft">35dp</item>
<item name="android:layout_marginLeft">15dp</item>
<item name="android:gravity">center</item>
<item name="android:textSize">17sp</item>
<item name="android:textStyle">bold</item>