diff --git a/app/src/main/java/com/xiaoqu/watch/ui/task/TaskListFragment.kt b/app/src/main/java/com/xiaoqu/watch/ui/task/TaskListFragment.kt index 33ceb7c..6a8ecab 100644 --- a/app/src/main/java/com/xiaoqu/watch/ui/task/TaskListFragment.kt +++ b/app/src/main/java/com/xiaoqu/watch/ui/task/TaskListFragment.kt @@ -238,9 +238,13 @@ class TaskListFragment : BaseFragment() { binding.tvPosition.text = "📍 ${detail.positionText}" binding.tvPosition.visibility = View.VISIBLE } - // 时间 - if (detail.sendTime.isNotEmpty()) { - binding.tvTimeInfo.text = "🕐 ${detail.sendTime}" + // 时间(派单时间 + 截止时间) + val timeLines = mutableListOf() + if (detail.sendTime.isNotEmpty()) timeLines.add("🕐 ${detail.sendTime} 派单") + if (!detail.expireTime.isNullOrEmpty()) timeLines.add("⏰ 截止 ${detail.expireTime}") + if (!detail.preFinishTime.isNullOrEmpty()) timeLines.add("📋 要求 ${detail.preFinishTime} 完成") + if (timeLines.isNotEmpty()) { + binding.tvTimeInfo.text = timeLines.joinToString("\n") binding.tvTimeInfo.visibility = View.VISIBLE } // 积分 diff --git a/app/src/main/res/layout/fragment_task_list.xml b/app/src/main/res/layout/fragment_task_list.xml index 1da72cf..f0294fc 100644 --- a/app/src/main/res/layout/fragment_task_list.xml +++ b/app/src/main/res/layout/fragment_task_list.xml @@ -1,10 +1,6 @@ - + - - + android:textSize="20sp" /> - @@ -74,65 +67,63 @@ android:orientation="vertical" android:visibility="gone"> - + - + - + - + - + - + @@ -178,7 +169,7 @@ android:layout_height="wrap_content" android:text="将手表贴近信标" android:textColor="@color/primary" - android:textSize="20sp" + android:textSize="24sp" android:textStyle="bold" /> @@ -206,7 +197,7 @@ android:layout_height="wrap_content" android:text="无需前往指定地点" android:textColor="@color/success" - android:textSize="20sp" + android:textSize="24sp" android:textStyle="bold" /> - + - + android:textSize="20sp" + android:gravity="center" + android:lineSpacingMultiplier="1.5" + android:layout_marginTop="8dp" /> @@ -257,7 +249,7 @@ android:gravity="center" android:text="暂无任务" android:textColor="@color/text_secondary" - android:textSize="24sp" + android:textSize="28sp" android:paddingTop="80dp" android:visibility="gone" /> @@ -281,14 +273,14 @@ android:layout_height="wrap_content" android:text="加载中" android:textColor="@color/text_secondary" - android:textSize="20sp" + android:textSize="22sp" android:layout_marginTop="8dp" /> - +