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/fragment_inspection_content.xml | 282 ++++++++++++++++++++++++++++----------------------------
1 files changed, 142 insertions(+), 140 deletions(-)
diff --git a/app/src/main/res/layout/fragment_inspection_content.xml b/app/src/main/res/layout/fragment_inspection_content.xml
index f768e0a..ed77ea9 100644
--- a/app/src/main/res/layout/fragment_inspection_content.xml
+++ b/app/src/main/res/layout/fragment_inspection_content.xml
@@ -14,123 +14,6 @@
android:layout_alignParentTop="true"
android:layout_marginBottom="20dp" />
- <TextView
- android:id="@+id/scene_status"
- android:visibility="gone"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentEnd="true"
- android:layout_alignParentBottom="true"
- android:layout_marginBottom="230dp"
- android:background="@drawable/shape_yellow"
- android:drawableStart="@drawable/ic_group_black_24dp"
- android:drawableTint="@color/white"
- android:elevation="@dimen/dimen4"
- android:foreground="?android:attr/selectableItemBackground"
- android:gravity="center"
- android:padding="@dimen/dimen4"
- android:text="@string/scene_status"
- android:textColor="@color/white"
- tools:ignore="UnusedAttribute" />
-
- <TextView
- android:id="@+id/scene_detail"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentEnd="true"
- android:layout_alignParentBottom="true"
- android:layout_marginBottom="230dp"
- android:background="@drawable/shape_yellow"
- android:drawableStart="@drawable/ic_info_black_24dp"
- android:drawableTint="@color/white"
- android:elevation="@dimen/dimen4"
- android:foreground="?android:attr/selectableItemBackground"
- android:gravity="center"
- android:padding="@dimen/dimen4"
- android:text="鐐逛綅鎯呭喌"
- android:textColor="@color/white"
- tools:ignore="UnusedAttribute" />
-
- <TextView
- android:id="@+id/user_account"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentEnd="true"
- android:layout_alignParentBottom="true"
- android:layout_marginBottom="188dp"
- android:background="@drawable/shape_green"
- android:drawableStart="@drawable/ic_group_black_24dp"
- android:drawableTint="@color/white"
- android:elevation="@dimen/dimen4"
- android:foreground="?android:attr/selectableItemBackground"
- android:gravity="center"
- android:padding="@dimen/dimen4"
- android:text="鐢ㄦ埛璐﹀彿"
- android:textColor="@color/white"
- tools:ignore="UnusedAttribute" />
-
- <LinearLayout
- android:visibility="visible"
- android:id="@+id/ll_patrol_icons"
- android:layout_width="match_parent"
- android:layout_height="180dp"
- android:layout_alignParentBottom="true"
- android:background="@drawable/shap_stroke_top"
- android:orientation="vertical">
-
- <LinearLayout
- android:id="@+id/ll_patrol_hide"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:clickable="true"
- android:foreground="?android:attr/selectableItemBackground"
- android:gravity="center">
-
- <ImageView
- android:id="@+id/imageView5"
- android:layout_width="36dp"
- android:layout_height="20dp"
- android:layout_marginBottom="1dp"
- android:layout_marginTop="3dp"
- android:padding="3dp"
- android:scaleType="fitXY"
- android:src="@drawable/icon_hide" />
- </LinearLayout>
-
- <android.support.v4.view.ViewPager
- android:id="@+id/vp_patrol_icons"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight="2">
- </android.support.v4.view.ViewPager>
- <ImageView
- android:id="@+id/iv_patrol_pointer"
- android:layout_width="20dp"
- android:layout_height="20dp"
- android:adjustViewBounds="true"
- android:src="@drawable/select_first_point"
- android:layout_gravity="center_horizontal"
- />
- </LinearLayout>
- <LinearLayout
- android:id="@+id/ll_patrol_show"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:clickable="true"
- android:foreground="?android:attr/selectableItemBackground"
- android:layout_alignParentBottom="true"
- android:background="@drawable/shap_stroke_top"
- android:gravity="center_horizontal">
- <ImageView
- android:src="@drawable/icon_hide"
- android:layout_width="36dp"
- android:rotation="180"
- android:layout_height="20dp"
- android:padding="3dp"
- android:scaleType="fitXY"
- android:layout_gravity="center"/>
- </LinearLayout>
-
<RelativeLayout
android:visibility="visible"
android:elevation="1dp"
@@ -138,7 +21,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/colorPrimary"
-
android:layout_alignParentTop="true"
android:layout_alignParentStart="true">
@@ -146,49 +28,52 @@
android:id="@+id/ll_show_hide_detail"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:background="?android:attr/selectableItemBackground"
+ android:clickable="true"
+ android:gravity="center"
android:orientation="vertical"
android:paddingTop="8dp"
- android:paddingBottom="7dp"
- android:clickable="true"
- android:background="?android:attr/selectableItemBackground"
- android:gravity="center">
+ android:paddingBottom="7dp">
+
<TextView
- android:layout_marginLeft="50dp"
- android:layout_marginRight="50dp"
android:id="@+id/tv_subtask_name_bar"
android:layout_width="wrap_content"
- android:textColor="@color/white"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="50dp"
+ android:layout_marginRight="50dp"
android:gravity="center"
android:singleLine="true"
- android:layout_height="wrap_content"
- android:textSize="16sp"
- android:text="浠诲姟鍚嶇О"/>
+ android:text="浠诲姟鍚嶇О"
+ android:textColor="@color/white"
+ android:textSize="16sp" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:layout_marginTop="-1dp"
android:layout_marginLeft="50dp"
+ android:layout_marginTop="-1dp"
+ android:layout_marginRight="50dp"
android:gravity="center_vertical"
- android:layout_marginRight="50dp">
+ android:orientation="horizontal">
+
<TextView
android:id="@+id/tv_subtask_status_bar"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
- android:textSize="13dp"
android:text="浠诲姟鐘舵��"
- android:textColor="@color/white"/>
+ android:textColor="@color/white"
+ android:textSize="13dp" />
+
<ImageView
- android:alpha="0.9"
- android:layout_marginLeft="2dp"
- android:layout_marginTop="1dp"
android:id="@+id/iv_patrol_show_site_detail"
- android:src="@drawable/selector_show_hide_white"
android:layout_width="14dp"
android:layout_height="13dp"
- android:scaleType="fitXY" />
+ android:layout_marginLeft="2dp"
+ android:layout_marginTop="1dp"
+ android:alpha="0.9"
+ android:scaleType="fitXY"
+ android:src="@drawable/selector_show_hide_white" />
</LinearLayout>
@@ -197,7 +82,7 @@
<ImageView
android:id="@+id/iv_patrol_back"
android:layout_width="45dp"
- android:paddingLeft="18dp"
+ android:paddingLeft="18dp"
android:paddingTop="9dp"
android:paddingRight="9dp"
android:paddingBottom="9dp"
@@ -414,7 +299,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:orientation="horizontal"
- android:visibility="gone">
+ android:visibility="visible">
<TextView
android:layout_width="wrap_content"
@@ -439,6 +324,123 @@
</LinearLayout>
</LinearLayout>
+ <TextView
+ android:id="@+id/scene_status"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentEnd="true"
+ android:layout_alignParentBottom="true"
+ android:layout_marginBottom="246dp"
+ android:background="@drawable/shape_yellow"
+ android:backgroundTint="@color/main_color_3"
+ android:drawableStart="@drawable/ic_info_black_24dp"
+ android:drawableTint="@color/white"
+ android:elevation="@dimen/dimen4"
+ android:foreground="?android:attr/selectableItemBackground"
+ android:gravity="center"
+ android:padding="@dimen/dimen4"
+ android:text="@string/scene_status"
+ android:textColor="@color/white"
+ android:visibility="visible"
+ tools:ignore="UnusedAttribute" />
+ <TextView
+ android:id="@+id/scene_detail"
+ android:layout_width="32dp"
+ android:layout_height="36dp"
+ android:layout_alignParentStart="true"
+ android:layout_alignParentBottom="true"
+ android:layout_marginBottom="188dp"
+ android:background="@drawable/shape_yellow"
+ android:drawableTint="@color/white"
+ android:elevation="@dimen/dimen4"
+ android:foreground="?android:attr/selectableItemBackground"
+ android:gravity="center"
+ android:padding="@dimen/dimen4"
+ android:text="!"
+ android:textStyle="bold"
+ android:textColor="@color/white"
+ tools:ignore="UnusedAttribute" />
+
+ <TextView
+ android:id="@+id/user_account"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentEnd="true"
+ android:layout_alignParentBottom="true"
+ android:layout_marginBottom="188dp"
+ android:background="@drawable/shape_green"
+ android:backgroundTint="@color/lightGreen"
+ android:drawableStart="@drawable/ic_group_black_24dp"
+ android:drawableTint="@color/white"
+ android:elevation="@dimen/dimen4"
+ android:foreground="?android:attr/selectableItemBackground"
+ android:gravity="center"
+ android:padding="@dimen/dimen4"
+ android:text="鐢ㄦ埛璐﹀彿"
+ android:textColor="@color/white"
+ tools:ignore="UnusedAttribute" />
+
+ <LinearLayout
+ android:visibility="visible"
+ android:id="@+id/ll_patrol_icons"
+ android:layout_width="match_parent"
+ android:layout_height="180dp"
+ android:layout_alignParentBottom="true"
+ android:background="@drawable/shap_stroke_top"
+ android:orientation="vertical">
+
+ <LinearLayout
+ android:id="@+id/ll_patrol_hide"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:clickable="true"
+ android:foreground="?android:attr/selectableItemBackground"
+ android:gravity="center">
+
+ <ImageView
+ android:id="@+id/imageView5"
+ android:layout_width="36dp"
+ android:layout_height="20dp"
+ android:layout_marginBottom="1dp"
+ android:layout_marginTop="3dp"
+ android:padding="3dp"
+ android:scaleType="fitXY"
+ android:src="@drawable/icon_hide" />
+ </LinearLayout>
+
+ <android.support.v4.view.ViewPager
+ android:id="@+id/vp_patrol_icons"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_weight="2">
+ </android.support.v4.view.ViewPager>
+ <ImageView
+ android:id="@+id/iv_patrol_pointer"
+ android:layout_width="20dp"
+ android:layout_height="20dp"
+ android:adjustViewBounds="true"
+ android:src="@drawable/select_first_point"
+ android:layout_gravity="center_horizontal"
+ />
+ </LinearLayout>
+ <LinearLayout
+ android:id="@+id/ll_patrol_show"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:clickable="true"
+ android:foreground="?android:attr/selectableItemBackground"
+ android:layout_alignParentBottom="true"
+ android:background="@drawable/shap_stroke_top"
+ android:gravity="center_horizontal">
+ <ImageView
+ android:src="@drawable/icon_hide"
+ android:layout_width="36dp"
+ android:rotation="180"
+ android:layout_height="20dp"
+ android:padding="3dp"
+ android:scaleType="fitXY"
+ android:layout_gravity="center"/>
+ </LinearLayout>
</RelativeLayout>
\ No newline at end of file
--
Gitblit v1.9.3