From fbae5f3ea74727ccadc48314a864a1ea0099a945 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期五, 17 十月 2025 17:36:17 +0800
Subject: [PATCH] 2025.10.17 1、新增巡查时，修改工地施工阶段功能（待完成）
---
app/src/main/res/layout/fragment_task.xml | 199 +++++++++++++++++++++++++++++++++++++++----------
1 files changed, 159 insertions(+), 40 deletions(-)
diff --git a/app/src/main/res/layout/fragment_task.xml b/app/src/main/res/layout/fragment_task.xml
index 8f4fe5d..e72f80d 100644
--- a/app/src/main/res/layout/fragment_task.xml
+++ b/app/src/main/res/layout/fragment_task.xml
@@ -5,7 +5,8 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/taskBG"
- tools:context="cn.flightfeather.thirdappmodule.module.task.TaskFragment">
+ tools:context="cn.flightfeather.thirdappmodule.module.task.TaskFragment"
+ tools:ignore="UnusedAttribute">
<FrameLayout
android:layout_width="match_parent"
@@ -19,8 +20,7 @@
android:id="@+id/tv_task_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginLeft="24dp"
- android:layout_marginTop="20dp"
+ android:layout_marginTop="@dimen/dimen2"
android:text="@string/task"
android:textColor="@color/white"
android:textSize="17sp"
@@ -31,41 +31,56 @@
android:id="@+id/view_waiting"
android:layout_width="@dimen/fab_margin"
android:layout_height="@dimen/fab_margin"
- app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintEnd_toEndOf="@id/card_view"
app:layout_constraintTop_toTopOf="@id/tv_task_title"
app:layout_constraintBottom_toBottomOf="@id/tv_task_title"
- android:layout_marginEnd="24dp"
/>
+
+ <TextView
+ android:id="@+id/tv_search"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:background="@color/white"
+ android:hint="@string/search"
+ android:paddingStart="@dimen/dimen8"
+ android:paddingEnd="@dimen/dimen8"
+ android:paddingTop="@dimen/dimen6"
+ android:paddingBottom="@dimen/dimen6"
+ android:textSize="@dimen/sp_14"
+ android:drawableStart="@mipmap/ic_search"
+ android:drawablePadding="@dimen/dimen8"
+ android:layout_marginStart="@dimen/dimen16"
+ android:layout_marginEnd="@dimen/dimen16"
+ app:layout_constraintTop_toBottomOf="@id/tv_task_title"
+ app:layout_constraintBottom_toTopOf="@id/card_view"
+ android:elevation="@dimen/dimen4" />
<android.support.v7.widget.CardView
android:id="@+id/card_view"
android:layout_width="0dp"
android:layout_height="0dp"
- android:layout_marginBottom="15dp"
- android:layout_marginLeft="20dp"
- android:layout_marginRight="20dp"
- android:layout_marginTop="20dp"
+ android:layout_marginLeft="@dimen/dimen16"
+ android:layout_marginRight="@dimen/dimen16"
+ android:layout_marginTop="@dimen/dimen8"
android:background="#FFF"
- app:cardCornerRadius="4dp"
- app:cardElevation="8dp"
+ app:cardCornerRadius="@dimen/dimen4"
+ app:cardElevation="@dimen/dimen4"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintTop_toBottomOf="@id/tv_task_title"
- app:layout_constraintBottom_toTopOf="@id/task_progress_llcontainer">
+ app:layout_constraintTop_toBottomOf="@id/tv_search"
+ app:layout_constraintBottom_toTopOf="@id/rl_add_task">
- <LinearLayout
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- android:paddingBottom="10dp"
- android:paddingTop="13dp">
+ <android.support.constraint.ConstraintLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
<RelativeLayout
+ android:id="@+id/v_today_task"
android:layout_width="match_parent"
android:layout_height="0dp"
- android:layout_marginLeft="12dp"
- android:layout_marginRight="12dp"
- android:layout_weight="1">
+ android:visibility="gone"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintBottom_toTopOf="@id/ll_buttons">
<android.support.v7.widget.RecyclerView
android:id="@+id/rv_container"
@@ -80,26 +95,122 @@
android:text="浠婃棩鏃犱换鍔�" />
</RelativeLayout>
-
- <TextView
- android:id="@+id/tv_tody_task"
+ <LinearLayout
+ android:id="@+id/v_task_remind"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="46dp"
- android:text="鏃犲緟瀹屾垚鐨勪换鍔�"
- android:visibility="gone" />
+ android:layout_height="0dp"
+ android:visibility="visible"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintBottom_toTopOf="@id/ll_buttons"
+ android:orientation="vertical">
+
+ <android.support.constraint.ConstraintLayout
+ android:id="@+id/cl_un_upload_pic"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:background="@color/colorPrimary"
+ android:paddingTop="@dimen/dimen16"
+ android:paddingBottom="@dimen/dimen16"
+ android:paddingStart="@dimen/dimen8"
+ android:paddingEnd="@dimen/dimen8"
+ android:elevation="@dimen/dimen6"
+ tools:ignore="UnusedAttribute">
+
+ <TextView
+ android:id="@+id/tv_un_upload_pic"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ tools:text="鏈湴鍥剧墖鏈笂浼�"
+ style="@style/TextStyle.Title"
+ android:textStyle="bold"
+ android:textSize="16sp"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintBottom_toBottomOf="parent"/>
+
+ <ImageView
+ android:id="@+id/img_tip"
+ android:layout_width="@dimen/dimen8"
+ android:layout_height="@dimen/dimen8"
+ android:src="@drawable/icon_rank_1"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toStartOf="@id/img_arrow"/>
+
+ <ImageView
+ android:id="@+id/img_arrow"
+ android:layout_width="26dp"
+ android:layout_height="26dp"
+ android:src="@drawable/ic_keyboard_arrow_right_light_blue_600_36dp"
+ android:tint="@color/white"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"/>
+
+ </android.support.constraint.ConstraintLayout>
+
+ <android.support.constraint.ConstraintLayout
+ android:id="@+id/cl_un_complete_task"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:background="@color/colorPrimary"
+ android:paddingTop="@dimen/dimen16"
+ android:paddingBottom="@dimen/dimen16"
+ android:paddingStart="@dimen/dimen8"
+ android:paddingEnd="@dimen/dimen8"
+ android:layout_marginTop="@dimen/dimen4"
+ tools:ignore="UnusedAttribute">
+
+ <TextView
+ android:id="@+id/tv_un_complete_task"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="浠婃棩鏈畬鎴愪换鍔�"
+ style="@style/TextStyle.Title"
+ android:textStyle="bold"
+ android:textSize="16sp"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintBottom_toBottomOf="parent"/>
+
+ <TextView
+ android:id="@+id/tv_task_num"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ style="@style/TextStyle.Title"
+ android:textStyle="bold"
+ android:textSize="16sp"
+ tools:text="2涓�"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"/>
+
+ </android.support.constraint.ConstraintLayout>
+
+ <android.support.v7.widget.RecyclerView
+ android:id="@+id/rv_un_complete_task"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ tools:listitem="@layout/item_task_list_2" />
+
+ </LinearLayout>
<LinearLayout
+ android:id="@+id/ll_buttons"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginTop="5dp"
- android:baselineAligned="false">
+ android:baselineAligned="false"
+ app:layout_constraintBottom_toBottomOf="parent">
<LinearLayout
android:id="@+id/ll_container_todytask"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
+ android:paddingTop="@dimen/dimen6"
+ android:paddingBottom="@dimen/dimen6"
+ android:background="@drawable/selector_bg_gray_or_white"
+ android:foreground="?android:attr/selectableItemBackground"
android:orientation="vertical">
<ImageView
@@ -122,8 +233,11 @@
android:id="@+id/rl_container_taskremind"
android:layout_width="0dp"
android:layout_height="wrap_content"
- android:layout_toRightOf="@id/ll_container_todytask"
android:layout_weight="1"
+ android:paddingTop="@dimen/dimen6"
+ android:paddingBottom="@dimen/dimen6"
+ android:background="@drawable/selector_bg_gray_or_white"
+ android:foreground="?android:attr/selectableItemBackground"
android:orientation="vertical">
<ImageView
@@ -134,11 +248,12 @@
android:layout_gravity="center_horizontal"
android:background="@drawable/icon_task_alert" />
- <View
- android:id="@+id/superscript"
- android:layout_width="26dp"
- android:layout_height="26dp"
- android:layout_toRightOf="@id/iv_taskremind" />
+ <ImageView
+ android:id="@+id/img_tip_2"
+ android:layout_width="@dimen/dimen8"
+ android:layout_height="@dimen/dimen8"
+ android:layout_toEndOf="@id/iv_taskremind"
+ android:src="@drawable/icon_rank_1" />
<TextView
android:layout_width="wrap_content"
@@ -154,6 +269,10 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
+ android:paddingTop="@dimen/dimen6"
+ android:paddingBottom="@dimen/dimen6"
+ android:background="@drawable/selector_bg_gray_or_white"
+ android:foreground="?android:attr/selectableItemBackground"
android:orientation="vertical">
<ImageView
@@ -170,7 +289,7 @@
android:textSize="11sp" />
</LinearLayout>
</LinearLayout>
- </LinearLayout>
+ </android.support.constraint.ConstraintLayout>
</android.support.v7.widget.CardView>
<android.support.constraint.ConstraintLayout
@@ -275,13 +394,13 @@
android:id="@+id/rl_add_task"
android:layout_width="0dp"
android:layout_height="wrap_content"
- android:layout_margin="20dp"
+ android:layout_margin="@dimen/dimen16"
android:paddingStart="@dimen/dimen16"
android:paddingEnd="@dimen/dimen16"
android:paddingBottom="@dimen/dimen16"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@id/rl_add_scense"
- app:layout_constraintTop_toBottomOf="@id/task_progress_llcontainer"
+ app:layout_constraintTop_toBottomOf="@id/card_view"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintVertical_bias="1"
android:background="@drawable/shape_orange_add_task">
--
Gitblit v1.9.3