diff --git a/app/src/main/java/com/xiaoqu/watch/ui/home/HomeFragment.kt b/app/src/main/java/com/xiaoqu/watch/ui/home/HomeFragment.kt index 2ff8801..2fb2e4d 100644 --- a/app/src/main/java/com/xiaoqu/watch/ui/home/HomeFragment.kt +++ b/app/src/main/java/com/xiaoqu/watch/ui/home/HomeFragment.kt @@ -367,7 +367,7 @@ class HomeFragment : BaseFragment() { /** 更新时钟和日期 */ private fun updateClock() { val info = DateUtil.getDateInfo() - tvClock.text = DateUtil.formatTime() + tvClock.text = DateUtil.formatTimeShort() tvDate.text = "${info.month}月${info.day}日 ${info.week}" // 同步更新打卡面板时钟 if (punchPanel.isShowing) { diff --git a/app/src/main/java/com/xiaoqu/watch/ui/task/TaskDetailFragment.kt b/app/src/main/java/com/xiaoqu/watch/ui/task/TaskDetailFragment.kt index 890a0ae..7d3d358 100644 --- a/app/src/main/java/com/xiaoqu/watch/ui/task/TaskDetailFragment.kt +++ b/app/src/main/java/com/xiaoqu/watch/ui/task/TaskDetailFragment.kt @@ -315,7 +315,12 @@ class TaskDetailFragment : BaseFragment() { !detail.expireTime.isNullOrEmpty() -> parts.add("截止时间:${formatTimeForTts(detail.expireTime!!)}") } if (detail.point > 0) parts.add("积分:${detail.point.toInt()}分") - if (detail.content.isNotBlank()) parts.add("备注:${detail.content}") + val note = when { + !detail.taskRequire.isNullOrEmpty() -> detail.taskRequire + detail.content.isNotEmpty() -> detail.content + else -> null + } + if (!note.isNullOrBlank()) parts.add("备注:$note") if (parts.isEmpty()) return 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 472748a..27e529d 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 @@ -1042,7 +1042,13 @@ class TaskListFragment : BaseFragment() { !detail.expireTime.isNullOrEmpty() -> parts.add("截止时间:${formatTimeForTts(detail.expireTime!!)}") } if (detail.point > 0) parts.add("积分:${detail.point.toInt()}分") - if (detail.content.isNotBlank()) parts.add("备注:${detail.content}") + // 备注:优先 taskRequire,没有则用 content(和页面显示逻辑一致) + val note = when { + !detail.taskRequire.isNullOrEmpty() -> detail.taskRequire + detail.content.isNotEmpty() -> detail.content + else -> null + } + if (!note.isNullOrBlank()) parts.add("备注:$note") if (parts.isEmpty()) return