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

解决界面问题，解决采集拍摄界面

Browse Source
This commit is contained in:
wangdongsheng
2021-09-14 18:49:28 +08:00
parent 27f41d98d6
commit 0dceef5ecc
24 changed files with 233 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/res/layout/fragment_filter.xml
View File

@@ -227,7 +227,16 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginStart="10dp"
android:button="@null"
android:background="@drawable/baseline_radio"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_toEndOf="@id/check_ok"
android:text="批量领取"
/>
<Button
android:id="@+id/btn_draw"

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

@@ -21,7 +21,7 @@
android:layout_height="wrap_content"
android:layout_marginEnd="10dp"
android:layout_marginBottom="20dp"
android:src="@drawable/poi_square"
android:background="@drawable/marker_poi_bg1"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/tv_poi"
app:layout_constraintLeft_toLeftOf="parent"
@@ -123,7 +123,7 @@
android:layout_height="wrap_content"
android:layout_marginEnd="10dp"
android:layout_marginBottom="20dp"
android:src="@drawable/poi_square"
android:background="@drawable/marker_poi_video_bg1"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/tv_poiVideo"
app:layout_constraintLeft_toLeftOf="parent"
@@ -223,7 +223,7 @@
android:id="@+id/iv_road"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/road_square"
android:background="@drawable/marker_road_bg"
app:layout_constraintLeft_toLeftOf="@id/view4"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
@@ -320,7 +320,7 @@
android:id="@+id/iv_charging"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/charge_square"
android:background="@drawable/marker_charge_bg1"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="@id/view5"
app:layout_constraintTop_toTopOf="parent" />
@@ -417,7 +417,7 @@
android:id="@+id/iv_other"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/other_square"
android:background="@drawable/marker_other_bg1"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="@id/other_audit_view"
app:layout_constraintTop_toTopOf="parent"

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

@@ -79,6 +79,50 @@
app:layout_constraintTop_toTopOf="parent"
/>
</androidx.constraintlayout.widget.ConstraintLayout>
<RelativeLayout
android:id="@+id/linear_exist"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:background="@drawable/underline"
android:padding="2dp"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_01">
<TextView
android:id="@+id/tv_exist"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:layout_marginLeft="18dp"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:text="是否存在*"
android:textColor="#333" />
<Spinner
android:id="@+id/spinner_exist"
android:layout_width="match_parent"
android:layout_height="40dp"
android:layout_centerVertical="true"
android:layout_marginLeft="18dp"
android:layout_marginRight="10dp"
android:layout_toEndOf="@id/tv_exist"
android:layout_toRightOf="@id/tv_exist"
android:background="@color/white"
android:textColor="#333"
android:textSize="15sp" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:background="@drawable/ic_baseline_arrow_drop" />
</RelativeLayout>
</LinearLayout>
<LinearLayout

90
app/src/main/res/layout/poi_fragment.xml
View File

@@ -34,7 +34,50 @@
android:textColor="@color/black"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<RelativeLayout
android:id="@+id/linear_exist"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:background="@drawable/underline"
android:padding="2dp"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_01">
<TextView
android:id="@+id/tv_exist"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:layout_marginLeft="18dp"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:text="是否存在*"
android:textColor="#333" />
<Spinner
android:id="@+id/spinner_exist"
android:layout_width="match_parent"
android:layout_height="40dp"
android:layout_centerVertical="true"
android:layout_marginLeft="18dp"
android:layout_marginRight="10dp"
android:layout_toEndOf="@id/tv_exist"
android:layout_toRightOf="@id/tv_exist"
android:background="@color/white"
android:textColor="#333"
android:textSize="15sp" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:background="@drawable/ic_baseline_arrow_drop" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/linear_pot"
android:layout_width="match_parent"
@@ -45,7 +88,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_01">
app:layout_constraintTop_toBottomOf="@id/linear_exist">
<TextView
android:id="@+id/tv_pot"
@@ -200,50 +243,7 @@
android:orientation="vertical"></LinearLayout>
</RelativeLayout>
<RelativeLayout
android:id="@+id/linear_exist"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:background="@drawable/underline"
android:padding="2dp"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/linear_phone">
<TextView
android:id="@+id/tv_exist"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:layout_marginLeft="18dp"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:text="是否存在*"
android:textColor="#333" />
<Spinner
android:id="@+id/spinner_exist"
android:layout_width="match_parent"
android:layout_height="40dp"
android:layout_centerVertical="true"
android:layout_marginLeft="18dp"
android:layout_marginRight="10dp"
android:layout_toEndOf="@id/tv_exist"
android:layout_toRightOf="@id/tv_exist"
android:background="@color/white"
android:textColor="#333"
android:textSize="15sp" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:background="@drawable/ic_baseline_arrow_drop" />
</RelativeLayout>
<TextView
android:id="@+id/tv_02"
@@ -253,7 +253,7 @@
android:text="02.拍照"
android:textColor="@color/black"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/linear_exist" />
app:layout_constraintTop_toBottomOf="@id/linear_phone" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"

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

@@ -145,50 +145,6 @@
app:layout_constraintLeft_toLeftOf="@id/fm_poi_video_picture"
app:layout_constraintTop_toBottomOf="@id/fm_poi_video_picture">
<RelativeLayout
android:id="@+id/linear_exist"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:background="@drawable/other_text"
android:padding="2dp"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/linear_phone">
<TextView
android:id="@+id/tv_exist"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
android:layout_centerVertical="true"
android:layout_marginStart="18dp"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:text="是否存在*"
android:textColor="#333" />
<Spinner
android:id="@+id/spinner_exist"
android:layout_width="match_parent"
android:layout_height="40dp"
android:layout_centerVertical="true"
android:layout_marginStart="18dp"
android:layout_marginEnd="10dp"
android:layout_toEndOf="@id/tv_exist"
android:background="@color/white"
android:textColor="#333"
android:textSize="15sp" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:background="@drawable/ic_baseline_arrow_drop" />
</RelativeLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"

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

@@ -54,7 +54,7 @@
<FrameLayout
android:id="@+id/frame_layout"
android:layout_width="match_parent"
android:layout_height="200dp"
android:layout_height="250dp"
android:background="@color/white"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"

28
app/src/main/res/layout/withdraw_fragment.xml
View File

@@ -249,7 +249,7 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_margin="2dp"
android:background="@drawable/poi_square" />
android:background="@drawable/marker_poi_bg1" />
<TextView
android:layout_width="wrap_content"
@@ -289,7 +289,7 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_margin="2dp"
android:background="@drawable/poi_square" />
android:background="@drawable/marker_poi_bg1" />
<TextView
android:layout_width="wrap_content"
@@ -328,7 +328,7 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_margin="2dp"
android:background="@drawable/poi_square" />
android:background="@drawable/marker_poi_video_bg1" />
<TextView
android:layout_width="wrap_content"
@@ -368,7 +368,7 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_margin="2dp"
android:background="@drawable/poi_square" />
android:background="@drawable/marker_poi_video_bg1" />
<TextView
android:layout_width="wrap_content"
@@ -407,7 +407,7 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_margin="2dp"
android:background="@drawable/road_square" />
android:background="@drawable/marker_road_bg" />
<TextView
android:layout_width="wrap_content"
@@ -445,7 +445,7 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_margin="2dp"
android:background="@drawable/road_square" />
android:background="@drawable/marker_road_bg" />
<TextView
android:layout_width="wrap_content"
@@ -483,7 +483,7 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_margin="2dp"
android:background="@drawable/charge_square" />
android:background="@drawable/marker_charge_bg1" />
<TextView
android:layout_width="wrap_content"
@@ -521,7 +521,7 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_margin="2dp"
android:background="@drawable/charge_square" />
android:background="@drawable/marker_charge_bg1" />
<TextView
android:layout_width="wrap_content"
@@ -555,11 +555,11 @@
android:gravity="center_vertical">
<ImageView
android:id="@+id/image_other"
android:layout_width="40dp"
android:layout_height="45dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_margin="2dp"
android:background="@drawable/push_qingbao" />
android:background="@drawable/marker_other_bg1" />
<TextView
android:layout_width="wrap_content"
@@ -593,11 +593,11 @@
android:gravity="center_vertical">
<ImageView
android:id="@+id/image_other_report"
android:layout_width="40dp"
android:layout_height="45dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_margin="2dp"
android:background="@drawable/push_qingbao" />
android:background="@drawable/marker_other_bg1" />
<TextView
android:layout_width="wrap_content"