From e234a15b428267997c903a4ed42536c5d9f14a1f Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期一, 10 十一月 2025 13:10:42 +0800
Subject: [PATCH] 2025.11.10 1. 新增巡查场景历史详情相关数据逻辑; 2. 新增工地施工阶段修改界面；
---
app/src/main/res/layout/dialog_take_evidence.xml | 278 +++++++++++++++++++++++++++++++------------------------
1 files changed, 155 insertions(+), 123 deletions(-)
diff --git a/app/src/main/res/layout/dialog_take_evidence.xml b/app/src/main/res/layout/dialog_take_evidence.xml
index 94a7037..8986924 100644
--- a/app/src/main/res/layout/dialog_take_evidence.xml
+++ b/app/src/main/res/layout/dialog_take_evidence.xml
@@ -2,7 +2,8 @@
<android.support.design.widget.CoordinatorLayout 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="match_parent">
+ android:layout_height="match_parent"
+ xmlns:tools="http://schemas.android.com/tools">
<android.support.design.widget.FloatingActionButton
android:src="@drawable/icon_close_white"
@@ -46,147 +47,178 @@
android:layout_marginTop="@dimen/dimen8"
android:layout_marginBottom="@dimen/dimen8">
<LinearLayout
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical"
- android:paddingBottom="30dp"
- android:paddingLeft="18dp"
- android:paddingRight="18dp"
- android:paddingTop="12dp">
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical"
+ android:paddingBottom="30dp"
+ android:paddingLeft="18dp"
+ android:paddingRight="18dp"
+ android:paddingTop="12dp">
- <LinearLayout
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
-
- android:orientation="horizontal">
-
- <TextView
- android:id="@+id/tv_dialog_take_evidence_title"
+ <LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="鏂板闂"
- android:textColor="@color/primary_text"
- android:textSize="18dp" />
- </LinearLayout>
- <TextView
- android:id="@+id/tv_type"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginTop="10dp"
- android:text="闂绫诲瀷" />
+ android:orientation="horizontal">
- <Spinner
- android:id="@+id/sp_take_evidence_select_problem_type"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginLeft="-7dp"
- android:layout_marginRight="-7dp"></Spinner>
+ <TextView
+ android:id="@+id/tv_dialog_take_evidence_title"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="闂鍙栬瘉"
+ android:textColor="@color/primary_text"
+ android:textSize="18sp" />
+ </LinearLayout>
- <TextView
- android:id="@+id/tv_chose"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginTop="10dp"
- android:text="閫夋嫨涓�涓棶棰�" />
-
- <Spinner
- android:id="@+id/sp_take_evidence_select_problem"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginLeft="-7dp"
- android:layout_marginRight="-7dp"></Spinner>
-
- <EditText
- android:id="@+id/et_take_evidence_problem_des"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="8dp"
- android:hint="闂鎻忚堪(鍙��)"
- android:visibility="visible" />
-
- <TextView
- android:id="@+id/tv_location"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginTop="8dp"
- android:text="浣嶇疆" />
-
- <Spinner
- android:id="@+id/sp_take_evidence_select_location"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginLeft="-7dp"
- android:layout_marginRight="-7dp"></Spinner>
-
- <EditText
- android:id="@+id/et_take_evidence_location"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:hint="浣嶇疆澶囨敞(鍙��)" />
-
- <LinearLayout
- android:id="@+id/ll_change_suggestion"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- android:visibility="visible">
<TextView
- android:id="@+id/tv_suggestion"
+ android:id="@+id/tv_type"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="10dp"
+ android:text="闂绫诲瀷" />
+
+ <Spinner
+ android:id="@+id/sp_take_evidence_select_problem_type"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="@dimen/dimen4"
+ style="@style/SpinnerStyle.Black"
+ tools:listitem="@layout/item_spinner_drop_down" />
+
+ <TextView
+ android:id="@+id/tv_chose"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="10dp"
+ android:text="閫夋嫨涓�涓棶棰�" />
+
+ <Spinner
+ android:id="@+id/sp_take_evidence_select_problem"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="@dimen/dimen4"
+ style="@style/SpinnerStyle.Black"
+ tools:listitem="@layout/item_spinner_drop_down"/>
+
+ <android.support.constraint.ConstraintLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+ <EditText
+ android:id="@+id/et_take_evidence_problem_des"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:hint="闂鎻忚堪(鍙��)"
+ android:textSize="@dimen/textSize_14"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toStartOf="@id/btn_copy_problem_des"/>
+ <ImageView
+ android:id="@+id/btn_copy_problem_des"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:padding="@dimen/dimen8"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintTop_toTopOf="@id/et_take_evidence_problem_des"
+ app:layout_constraintBottom_toBottomOf="@id/et_take_evidence_problem_des"
+ android:src="@drawable/selector_btn_copy_delete" />
+ </android.support.constraint.ConstraintLayout>
+
+ <TextView
+ android:id="@+id/tv_location"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
- android:text="@string/change_suggestion" />
+ android:text="浣嶇疆" />
<Spinner
- android:id="@+id/sp_take_evidence_select_suggestion"
+ android:id="@+id/sp_take_evidence_select_location"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginLeft="-7dp"
- android:layout_marginRight="-7dp">
- </Spinner>
+ android:layout_marginTop="@dimen/dimen4"
+ style="@style/SpinnerStyle.Black"
+ tools:listitem="@layout/item_spinner_drop_down"/>
<EditText
- android:id="@+id/et_take_evidence_suggestion"
+ android:id="@+id/et_take_evidence_location"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:hint="鏁存敼寤鸿(鍙��)" />
+ android:hint="浣嶇疆澶囨敞(鍙��)"
+ android:textSize="@dimen/textSize_14"/>
+
+ <LinearLayout
+ android:id="@+id/ll_change_suggestion"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:visibility="visible">
+ <TextView
+ android:id="@+id/tv_suggestion"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="8dp"
+ android:text="@string/change_suggestion" />
+
+ <Spinner
+ android:id="@+id/sp_take_evidence_select_suggestion"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="@dimen/dimen4"
+ style="@style/SpinnerStyle.Black"
+ tools:listitem="@layout/item_spinner_drop_down"/>
+
+ <EditText
+ android:id="@+id/et_take_evidence_suggestion"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:hint="鏁存敼寤鸿(鍙��)"
+ android:textSize="@dimen/textSize_14"/>
+ </LinearLayout>
+
+ <android.support.constraint.ConstraintLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="10dp"
+ android:layout_marginTop="10dp"
+ android:orientation="horizontal">
+
+ <ImageView
+ android:id="@+id/iv_take_evidence_add_photo1"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ android:scaleType="fitCenter"
+ android:src="@drawable/icon_add_photo"
+ android:layout_marginEnd="@dimen/dimen8"
+ app:layout_constraintDimensionRatio="W, 1:1"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toStartOf="@id/iv_take_evidence_add_photo2"
+ app:layout_constraintTop_toTopOf="parent"/>
+
+ <ImageView
+ android:id="@+id/iv_take_evidence_add_photo2"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ android:scaleType="fitCenter"
+ android:src="@drawable/icon_add_photo_blank"
+ android:layout_marginEnd="@dimen/dimen8"
+ app:layout_constraintDimensionRatio="W, 1:1"
+ app:layout_constrainedWidth="true"
+ app:layout_constraintStart_toEndOf="@id/iv_take_evidence_add_photo1"
+ app:layout_constraintEnd_toStartOf="@id/iv_take_evidence_add_photo3"
+ app:layout_constraintTop_toTopOf="parent"/>
+
+ <ImageView
+ android:id="@+id/iv_take_evidence_add_photo3"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ android:scaleType="fitCenter"
+ android:src="@drawable/icon_add_photo_blank"
+ app:layout_constraintDimensionRatio="W, 1:1"
+ app:layout_constrainedWidth="true"
+ app:layout_constraintStart_toEndOf="@id/iv_take_evidence_add_photo2"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintTop_toTopOf="parent"/>
+ </android.support.constraint.ConstraintLayout>
+
</LinearLayout>
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginBottom="10dp"
- android:layout_marginTop="10dp"
- android:orientation="horizontal">
-
- <ImageView
- android:id="@+id/iv_take_evidence_add_photo1"
- android:layout_width="60dp"
- android:layout_height="60dp"
- android:layout_marginTop="6dp"
- android:scaleType="centerCrop"
- android:src="@drawable/icon_add_photo" />
-
- <ImageView
- android:id="@+id/iv_take_evidence_add_photo2"
- android:layout_width="60dp"
- android:layout_height="60dp"
- android:layout_marginLeft="10dp"
- android:layout_marginTop="6dp"
- android:scaleType="centerCrop"
- android:src="@drawable/icon_add_photo_blank" />
-
- <ImageView
- android:id="@+id/iv_take_evidence_add_photo3"
- android:layout_width="60dp"
- android:layout_height="60dp"
- android:layout_marginLeft="10dp"
- android:layout_marginTop="6dp"
- android:scaleType="centerCrop"
- android:src="@drawable/icon_add_photo_blank" />
- </LinearLayout>
- </LinearLayout>
</ScrollView>
</android.support.v7.widget.CardView>
--
Gitblit v1.9.3