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_scene_history.xml | 323 +++++++++++++++++++++++++----------------------------
1 files changed, 152 insertions(+), 171 deletions(-)
diff --git a/app/src/main/res/layout/dialog_scene_history.xml b/app/src/main/res/layout/dialog_scene_history.xml
index 462ae83..4fd465f 100644
--- a/app/src/main/res/layout/dialog_scene_history.xml
+++ b/app/src/main/res/layout/dialog_scene_history.xml
@@ -17,194 +17,175 @@
app:cardCornerRadius="6dp"
app:cardElevation="7dp">
- <android.support.constraint.ConstraintLayout
+ <ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:orientation="vertical"
- android:padding="@dimen/dimen16">
+ android:layout_marginBottom="30dp">
- <TextView
- android:id="@+id/tv_title"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="鍘嗗彶鎯呭喌"
- android:textColor="@color/primary_text"
- android:textSize="@dimen/textSize_18"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent" />
-
- <ProgressBar
- android:id="@+id/view_waiting"
- android:layout_width="@dimen/fab_margin"
- android:layout_height="@dimen/fab_margin"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintTop_toTopOf="parent" />
-
- <android.support.constraint.ConstraintLayout
- android:id="@+id/cl_1"
+ <LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="vertical"
- app:layout_constraintTop_toBottomOf="@id/tv_title">
+ android:orientation="vertical">
- <TextView
- android:id="@+id/tv_title_1"
- android:layout_width="wrap_content"
+
+ <android.support.constraint.ConstraintLayout
+ android:id="@+id/cl_risk_warn"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingTop="@dimen/dimen4"
- android:paddingBottom="@dimen/dimen4"
- android:text="1. 鐜板満璇勫垎"
- android:textColor="@color/main_color_1"
- android:textSize="@dimen/textSize_16"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- tools:ignore="UnusedAttribute" />
- </android.support.constraint.ConstraintLayout>
+ android:padding="@dimen/dimen16">
- <android.support.constraint.ConstraintLayout
- android:id="@+id/cl_2"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- app:layout_constraintTop_toBottomOf="@id/cl_1">
+ <ImageView
+ android:id="@+id/img_risk_warn"
+ android:layout_width="20dp"
+ android:layout_height="20dp"
+ android:layout_marginBottom="@dimen/dimen4"
+ android:contentDescription="椋庨櫓鎻愮ず"
+ android:src="@drawable/icon_task_alert"
+ app:layout_constraintBottom_toBottomOf="@id/tv_risk_warn"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="@id/tv_risk_warn" />
- <TextView
- android:id="@+id/tv_title_2"
- android:layout_width="wrap_content"
+ <TextView
+ android:id="@+id/tv_risk_warn"
+ android:layout_width="0dp"
+ android:layout_height="30dp"
+ android:text="椋庨櫓鎻愮ず"
+ android:textColor="@color/red_btn_bg_color"
+ android:textSize="@dimen/textSize_18"
+ android:textStyle="bold"
+ app:layout_constraintStart_toEndOf="@id/img_risk_warn"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ <TextView
+ android:id="@+id/tv_change_rate"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingStart="20dp"
+ android:paddingEnd="0dp"
+ android:textColor="@color/main_color_1"
+ android:textSize="@dimen/textSize_16"
+ style="@style/TextButtonStyle.DialogNeutral"
+ android:gravity="start"
+ app:layout_constraintTop_toBottomOf="@id/tv_risk_warn"
+ tools:text="鏁存敼鐜囨儏鍐碉紝濡傛灉鏁存敼鐜囪緝浣庯紝鍒欎綔涓洪闄╂彁绀哄睍绀�" />
+
+ <TextView
+ android:id="@+id/tv_change_efficiency"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingStart="20dp"
+ android:paddingEnd="0dp"
+ android:layout_marginTop="@dimen/dimen16"
+ app:layout_goneMarginTop="0dp"
+ style="@style/TextButtonStyle.DialogNeutral"
+ android:gravity="start"
+ android:textColor="@color/main_color_1"
+ android:textSize="@dimen/textSize_16"
+ app:layout_constraintTop_toBottomOf="@id/tv_change_rate"
+ tools:text="鏁存敼鏁堢巼鎯呭喌锛屾暣鏀规晥鐜囦负瑕佹眰鏁存敼鐨勬湡闄愶紙澶╂暟锛夐櫎浠ュ疄闄呮暣鏀圭殑鐢ㄦ椂锛堝ぉ鏁帮級锛屽鏋滄晥鐜囦綆浜�50%锛屽垯浣滀负椋庨櫓鎻愮ず灞曠ず" />
+
+ <TextView
+ android:id="@+id/tv_problem_recurrence"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingStart="20dp"
+ android:paddingEnd="0dp"
+ android:layout_marginTop="@dimen/dimen16"
+ app:layout_goneMarginTop="0dp"
+ style="@style/TextButtonStyle.DialogNeutral"
+ android:gravity="start"
+ android:textColor="@color/main_color_1"
+ android:textSize="@dimen/textSize_16"
+ app:layout_constraintTop_toBottomOf="@id/tv_change_efficiency"
+ tools:text="闂澶嶅彂鎯呭喌锛岃嫢鍓嶄笁涓湀鍐呮湁鐩稿悓绫诲瀷鐨勯棶棰樺嚭鐜颁袱娆″強浠ヤ笂鏃讹紝鎻愰啋灞曠ず锛屽苟缁欏嚭瀵瑰簲鐨勬暣鏀圭巼" />
+
+ </android.support.constraint.ConstraintLayout>
+
+ <android.support.constraint.ConstraintLayout
+ android:id="@+id/cl_inspection_key_point"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingTop="@dimen/dimen4"
- android:paddingBottom="@dimen/dimen4"
- android:text="2. 鍏稿瀷宸ュ湴"
- android:textColor="@color/main_color_1"
- android:textSize="@dimen/textSize_16"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- tools:ignore="UnusedAttribute" />
- </android.support.constraint.ConstraintLayout>
+ android:padding="@dimen/dimen16">
- <android.support.constraint.ConstraintLayout
- android:id="@+id/cl_3"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- app:layout_constraintTop_toBottomOf="@id/cl_2">
+ <ImageView
+ android:id="@+id/img_inspection_key_point"
+ android:layout_width="20dp"
+ android:layout_height="20dp"
+ android:layout_marginBottom="@dimen/dimen4"
+ android:contentDescription="宸℃煡瑕佺偣"
+ android:src="@drawable/icon_consult"
+ app:layout_constraintBottom_toBottomOf="@id/tv_inspection_key_point"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="@id/tv_risk_warn" />
- <TextView
- android:id="@+id/tv_title_3"
- android:layout_width="wrap_content"
+ <TextView
+ android:id="@+id/title_inspection_key_point"
+ android:layout_width="0dp"
+ android:layout_height="30dp"
+ android:text="宸℃煡瑕佺偣"
+ android:textColor="@color/primary_text"
+ android:textSize="@dimen/textSize_18"
+ app:layout_constraintStart_toEndOf="@id/img_inspection_key_point"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ <TextView
+ android:id="@+id/tv_key_point"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingStart="20dp"
+ android:paddingEnd="0dp"
+ style="@style/TextButtonStyle.DialogNeutral"
+ android:gravity="start"
+ android:textColor="@color/main_color_1"
+ android:textSize="@dimen/textSize_16"
+ app:layout_constraintTop_toBottomOf="@id/title_inspection_key_point"
+ tools:text="宸℃煡瑕佺偣锛屾敞鎰忛渶瑕佹鏌ョ殑浣嶇疆銆佽澶囧拰闂绛�" />
+
+ </android.support.constraint.ConstraintLayout>
+
+ <android.support.constraint.ConstraintLayout
+ android:id="@+id/cl_temp_inspection"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingTop="@dimen/dimen4"
- android:paddingBottom="@dimen/dimen4"
- android:text="3. 閲嶇偣鍖哄煙"
- android:textColor="@color/main_color_1"
- android:textSize="@dimen/textSize_16"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- tools:ignore="UnusedAttribute" />
- </android.support.constraint.ConstraintLayout>
- <android.support.constraint.ConstraintLayout
- android:id="@+id/cl_4"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- app:layout_constraintTop_toBottomOf="@id/cl_3">
+ android:padding="@dimen/dimen16">
- <TextView
- android:id="@+id/tv_title_4"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingTop="@dimen/dimen4"
- android:paddingBottom="@dimen/dimen4"
- android:text="4. 鑱斿悎鎵ф硶"
- android:textColor="@color/main_color_1"
- android:textSize="@dimen/textSize_16"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- tools:ignore="UnusedAttribute" />
- </android.support.constraint.ConstraintLayout>
- <android.support.constraint.ConstraintLayout
- android:id="@+id/cl_5"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- app:layout_constraintTop_toBottomOf="@id/cl_4">
+ <ImageView
+ android:id="@+id/img_temp_inspection"
+ android:layout_width="20dp"
+ android:layout_height="20dp"
+ android:layout_marginBottom="@dimen/dimen4"
+ android:contentDescription="搴旀�ュ贰鏌�"
+ android:src="@drawable/ic_emergency"
+ app:layout_constraintBottom_toBottomOf="@id/tv_risk_warn"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="@id/tv_risk_warn" />
- <TextView
- android:id="@+id/tv_title_5"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingTop="@dimen/dimen4"
- android:paddingBottom="@dimen/dimen4"
- android:text="5. 鏁存敼鏁堢巼"
- android:textColor="@color/main_color_1"
- android:textSize="@dimen/textSize_16"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- tools:ignore="UnusedAttribute" />
- </android.support.constraint.ConstraintLayout>
- <android.support.constraint.ConstraintLayout
- android:id="@+id/cl_6"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- app:layout_constraintTop_toBottomOf="@id/cl_5">
+ <TextView
+ android:id="@+id/title_temp_inspection"
+ android:layout_width="0dp"
+ android:layout_height="30dp"
+ android:text="搴旀�ュ贰鏌�"
+ android:textColor="@color/primary_text"
+ android:textSize="@dimen/textSize_18"
+ app:layout_constraintStart_toEndOf="@id/img_temp_inspection"
+ app:layout_constraintTop_toTopOf="parent" />
- <TextView
- android:id="@+id/tv_title_6"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingTop="@dimen/dimen4"
- android:paddingBottom="@dimen/dimen4"
- android:text="6. 鏂藉伐闃舵"
- android:textColor="@color/main_color_1"
- android:textSize="@dimen/textSize_16"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- tools:ignore="UnusedAttribute" />
- </android.support.constraint.ConstraintLayout>
- <android.support.constraint.ConstraintLayout
- android:id="@+id/cl_7"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- app:layout_constraintTop_toBottomOf="@id/cl_6">
+ <TextView
+ android:id="@+id/tv_temp_inspection"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingStart="20dp"
+ android:paddingEnd="0dp"
+ style="@style/TextButtonStyle.DialogNeutral"
+ android:gravity="start"
+ android:textColor="@color/main_color_1"
+ android:textSize="@dimen/textSize_16"
+ app:layout_constraintTop_toBottomOf="@id/title_temp_inspection"
+ tools:text="搴旀�ュ贰鏌ワ紝涓�鑸负鐜繚灞�鍙戝竷鐨勭揣鎬ヨ姹傜瓑" />
- <TextView
- android:id="@+id/tv_title_7"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingTop="@dimen/dimen4"
- android:paddingBottom="@dimen/dimen4"
- android:text="7. 鐩戞祴鏁版嵁"
- android:textColor="@color/main_color_1"
- android:textSize="@dimen/textSize_16"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- tools:ignore="UnusedAttribute" />
- </android.support.constraint.ConstraintLayout>
- <android.support.constraint.ConstraintLayout
- android:id="@+id/cl_8"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- app:layout_constraintTop_toBottomOf="@id/cl_7">
-
- <TextView
- android:id="@+id/tv_title_8"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingTop="@dimen/dimen4"
- android:paddingBottom="@dimen/dimen4"
- android:text="8. 搴旀�ュ贰鏌�"
- android:textColor="@color/main_color_1"
- android:textSize="@dimen/textSize_16"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- tools:ignore="UnusedAttribute" />
- </android.support.constraint.ConstraintLayout>
-
-
- </android.support.constraint.ConstraintLayout>
+ </android.support.constraint.ConstraintLayout>
+ </LinearLayout>
+ </ScrollView>
</android.support.v7.widget.CardView>
<android.support.design.widget.FloatingActionButton
--
Gitblit v1.9.3