From 979d9cff22806f213b420452ab4a68fcbaf021b6 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期一, 31 五月 2021 17:43:49 +0800
Subject: [PATCH] 1. 修复多项可能引起空指针崩溃的bug； 2. 新建子任务时默认执行人员从全体人员改为当前用户； 3. 新建子任务时默认执行时间强制固定为总任务对应的时段内，确保子任务执行时间不会超出总任务范围。
---
app/src/main/res/layout/item_night_work.xml | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/app/src/main/res/layout/item_night_work.xml b/app/src/main/res/layout/item_night_work.xml
index 661068b..502f99e 100644
--- a/app/src/main/res/layout/item_night_work.xml
+++ b/app/src/main/res/layout/item_night_work.xml
@@ -1,14 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
-<android.support.design.card.MaterialCardView
+<android.support.v7.widget.CardView
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:orientation="horizontal"
- android:layout_width="220dp"
+ android:layout_width="200dp"
android:layout_height="wrap_content"
app:cardCornerRadius="@dimen/dimen16"
app:cardBackgroundColor="@color/white"
- android:layout_marginEnd="@dimen/dimen16"
+ android:layout_marginStart="@dimen/dimen4"
+ android:layout_marginEnd="@dimen/dimen8"
+ android:layout_marginTop="@dimen/dimen4"
android:layout_marginBottom="@dimen/dimen4">
<android.support.constraint.ConstraintLayout
@@ -77,14 +79,30 @@
</android.support.constraint.ConstraintLayout>
+ <TextView
+ android:id="@+id/txt_sign"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="start|bottom"
+ android:background="@drawable/button_bg_enable_2"
+ style="@style/TextStyle.Category.Item"
+ android:textColor="@color/white"
+ android:paddingStart="@dimen/dimen8"
+ android:paddingEnd="@dimen/dimen8"
+ android:paddingTop="@dimen/dimen2"
+ android:paddingBottom="@dimen/dimen2"
+ android:layout_marginStart="@dimen/dimen16"
+ android:layout_marginBottom="@dimen/dimen16"
+ android:text="绛炬敹"/>
+
<ImageView
android:layout_width="wrap_content"
android:layout_height="160dp"
android:src="@mipmap/ic_file"
android:layout_gravity="bottom|end"
- android:layout_marginTop="150dp"
+ android:layout_marginTop="120dp"
app:layout_constraintTop_toBottomOf="@id/txt_time"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
-</android.support.design.card.MaterialCardView>
\ No newline at end of file
+</android.support.v7.widget.CardView>
\ No newline at end of file
--
Gitblit v1.9.3