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_2.xml | 313 +++++++++++++++++++++++++++------------------------
1 files changed, 166 insertions(+), 147 deletions(-)
diff --git a/app/src/main/res/layout/dialog_scene_history_2.xml b/app/src/main/res/layout/dialog_scene_history_2.xml
index 05fe7dc..94edddf 100644
--- a/app/src/main/res/layout/dialog_scene_history_2.xml
+++ b/app/src/main/res/layout/dialog_scene_history_2.xml
@@ -1,167 +1,186 @@
<?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<layout 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"
- android:orientation="vertical">
+ xmlns:tools="http://schemas.android.com/tools">
- <android.support.v7.widget.CardView
- android:id="@+id/cv_dialog_main"
+ <data >
+ <import type="android.view.View" alias="View"/>
+ <variable
+ name="viewModel"
+ type="cn.flightfeather.thirdappmodule.databinding.SceneHistoryViewModel" />
+ </data>
+
+ <android.support.design.widget.CoordinatorLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_marginLeft="12dp"
- android:layout_marginTop="30dp"
- android:layout_marginRight="12dp"
- android:layout_marginBottom="40dp"
- app:cardCornerRadius="6dp"
- app:cardElevation="7dp">
+ android:orientation="vertical">
- <ScrollView
+ <android.support.v7.widget.CardView
+ android:id="@+id/cv_dialog_main"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_marginBottom="30dp">
- <LinearLayout
+ android:layout_marginLeft="12dp"
+ android:layout_marginTop="30dp"
+ android:layout_marginRight="12dp"
+ android:layout_marginBottom="40dp"
+ app:cardCornerRadius="6dp"
+ app:cardElevation="7dp">
+
+ <ScrollView
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical">
+ android:layout_height="match_parent"
+ android:layout_marginBottom="30dp">
-
-
- <android.support.constraint.ConstraintLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:padding="@dimen/dimen16">
- <ImageView
- android:id="@+id/img_risk_warn"
- android:layout_width="20dp"
- android:layout_height="20dp"
- android:src="@drawable/icon_task_alert"
- android:layout_marginBottom="@dimen/dimen4"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="@id/tv_risk_warn"
- app:layout_constraintBottom_toBottomOf="@id/tv_risk_warn"
- android:contentDescription="椋庨櫓鎻愮ず" />
-
- <TextView
- android:id="@+id/tv_risk_warn"
- android:layout_width="0dp"
- android:layout_height="30dp"
- 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"
- android:text="椋庨櫓鎻愮ず" />
-
- <TextView
- android:id="@+id/tv_change_rate"
+ <LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:textColor="@color/main_color_1"
- android:textSize="@dimen/textSize_16"
- android:paddingStart="20dp"
- android:paddingEnd="0dp"
- tools:text="鏁存敼鐜囨儏鍐碉紝濡傛灉鏁存敼鐜囪緝浣庯紝鍒欎綔涓洪闄╂彁绀哄睍绀�"
- app:layout_constraintTop_toBottomOf="@id/tv_risk_warn"/>
- <TextView
- android:id="@+id/tv_change_efficiency"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:textColor="@color/main_color_1"
- android:textSize="@dimen/textSize_16"
- android:paddingStart="20dp"
- android:paddingEnd="0dp"
- tools:text="鏁存敼鏁堢巼鎯呭喌锛屾暣鏀规晥鐜囦负瑕佹眰鏁存敼鐨勬湡闄愶紙澶╂暟锛夐櫎浠ュ疄闄呮暣鏀圭殑鐢ㄦ椂锛堝ぉ鏁帮級锛屽鏋滄晥鐜囦綆浜�60%锛屽垯浣滀负椋庨櫓鎻愮ず灞曠ず"
- app:layout_constraintTop_toBottomOf="@id/tv_change_rate"/>
- <TextView
- android:id="@+id/tv_problem_recurrence"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:textColor="@color/main_color_1"
- android:textSize="@dimen/textSize_16"
- android:paddingStart="20dp"
- android:paddingEnd="0dp"
- tools:text="闂澶嶅彂鎯呭喌锛岃嫢鍓嶄笁涓湀鍐呮湁鐩稿悓绫诲瀷鐨勯棶棰樺嚭鐜颁袱娆″強浠ヤ笂鏃讹紝鎻愰啋灞曠ず锛屽苟缁欏嚭瀵瑰簲鐨勬暣鏀圭巼"
- app:layout_constraintTop_toBottomOf="@id/tv_change_efficiency"/>
+ android:orientation="vertical">
- </android.support.constraint.ConstraintLayout>
- <android.support.constraint.ConstraintLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:padding="@dimen/dimen16">
- <ImageView
- android:id="@+id/img_inspection_key_point"
- android:layout_width="20dp"
- android:layout_height="20dp"
- android:src="@drawable/icon_consult"
- android:layout_marginBottom="@dimen/dimen4"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="@id/tv_risk_warn"
- app:layout_constraintBottom_toBottomOf="@id/tv_inspection_key_point"
- android:contentDescription="宸℃煡瑕佺偣" />
- <TextView
- android:id="@+id/tv_inspection_key_point"
- android:layout_width="0dp"
- android:layout_height="30dp"
- android:textColor="@color/primary_text"
- android:textSize="@dimen/textSize_18"
- app:layout_constraintStart_toEndOf="@id/img_inspection_key_point"
- app:layout_constraintTop_toTopOf="parent"
- android:text="宸℃煡瑕佺偣" />
+ <android.support.constraint.ConstraintLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:visibility="@{viewModel.changeInfoList == null ? View.GONE : View.VISIBLE}"
+ android:padding="@dimen/dimen16">
- <TextView
- android:id="@+id/tv_change_rate"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:textColor="@color/main_color_1"
- android:textSize="@dimen/textSize_16"
- android:paddingStart="20dp"
- android:paddingEnd="0dp"
- tools:text="宸℃煡瑕佺偣锛屾敞鎰忛渶瑕佹鏌ョ殑浣嶇疆銆佽澶囧拰闂绛�"
- app:layout_constraintTop_toBottomOf="@id/img_inspection_key_point"/>
+ <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" />
- </android.support.constraint.ConstraintLayout>
- <android.support.constraint.ConstraintLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:padding="@dimen/dimen16">
- <ImageView
- android:id="@+id/img_risk_warn"
- android:layout_width="20dp"
- android:layout_height="20dp"
- android:src="@drawable/ic_emergency"
- android:layout_marginBottom="@dimen/dimen4"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="@id/tv_risk_warn"
- app:layout_constraintBottom_toBottomOf="@id/tv_risk_warn"
- android:contentDescription="搴旀�ュ贰鏌�" />
+ <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_risk_warn"
- android:layout_width="0dp"
- android:layout_height="30dp"
- android:textColor="@color/primary_text"
- android:textSize="@dimen/textSize_18"
- app:layout_constraintStart_toEndOf="@id/img_risk_warn"
- app:layout_constraintTop_toTopOf="parent"
- android:text="搴旀�ュ贰鏌�" />
+ <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"
+ app:layout_constraintTop_toBottomOf="@id/tv_risk_warn"
+ android:text="@{viewModel.changeInfoTxt}"
+ tools:text="鏁存敼鐜囨儏鍐碉紝濡傛灉鏁存敼鐜囪緝浣庯紝鍒欎綔涓洪闄╂彁绀哄睍绀�" />
- </android.support.constraint.ConstraintLayout>
- </LinearLayout>
- </ScrollView>
- </android.support.v7.widget.CardView>
+ <TextView
+ android:id="@+id/tv_change_efficiency"
+ 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"
+ app:layout_constraintTop_toBottomOf="@id/tv_change_rate"
+ tools:text="鏁存敼鏁堢巼鎯呭喌锛屾暣鏀规晥鐜囦负瑕佹眰鏁存敼鐨勬湡闄愶紙澶╂暟锛夐櫎浠ュ疄闄呮暣鏀圭殑鐢ㄦ椂锛堝ぉ鏁帮級锛屽鏋滄晥鐜囦綆浜�60%锛屽垯浣滀负椋庨櫓鎻愮ず灞曠ず" />
- <android.support.design.widget.FloatingActionButton
- android:id="@+id/fab_close"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:contentDescription="@string/cancel"
- android:src="@drawable/icon_close_white"
- app:elevation="8dp"
- app:fabSize="normal"
- app:layout_anchor="@id/cv_dialog_main"
- app:layout_anchorGravity="bottom|center" />
+ <TextView
+ android:id="@+id/tv_problem_recurrence"
+ 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"
+ app:layout_constraintTop_toBottomOf="@id/tv_change_efficiency"
+ tools:text="闂澶嶅彂鎯呭喌锛岃嫢鍓嶄笁涓湀鍐呮湁鐩稿悓绫诲瀷鐨勯棶棰樺嚭鐜颁袱娆″強浠ヤ笂鏃讹紝鎻愰啋灞曠ず锛屽苟缁欏嚭瀵瑰簲鐨勬暣鏀圭巼" />
-</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
+ </android.support.constraint.ConstraintLayout>
+
+ <android.support.constraint.ConstraintLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:padding="@dimen/dimen16">
+
+ <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_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"
+ android:textColor="@color/main_color_1"
+ android:textSize="@dimen/textSize_16"
+ app:layout_constraintTop_toBottomOf="@id/img_inspection_key_point"
+ tools:text="宸℃煡瑕佺偣锛屾敞鎰忛渶瑕佹鏌ョ殑浣嶇疆銆佽澶囧拰闂绛�" />
+
+ </android.support.constraint.ConstraintLayout>
+
+ <android.support.constraint.ConstraintLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:padding="@dimen/dimen16">
+
+ <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_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" />
+
+ </android.support.constraint.ConstraintLayout>
+ </LinearLayout>
+ </ScrollView>
+ </android.support.v7.widget.CardView>
+
+ <android.support.design.widget.FloatingActionButton
+ android:id="@+id/fab_close"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:contentDescription="@string/cancel"
+ android:src="@drawable/icon_close_white"
+ app:elevation="8dp"
+ app:fabSize="normal"
+ app:layout_anchor="@id/cv_dialog_main"
+ app:layout_anchorGravity="bottom|center" />
+
+ </android.support.design.widget.CoordinatorLayout>
+</layout>
\ No newline at end of file
--
Gitblit v1.9.3