From 461732f38fe32cbdb38310dba77974953a75e2ad Mon Sep 17 00:00:00 2001 From: dongliang Date: Fri, 8 May 2026 14:04:56 +0930 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=81=A2=E5=A4=8D=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E6=97=B6=E9=92=9F=E4=B8=8D=E5=B8=A6=E7=A7=92=20+=20TTS?= =?UTF-8?q?=E5=A4=87=E6=B3=A8=E8=AF=BB=E5=8F=96=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 首页时钟恢复 HH:mm 格式 2. TTS备注改为优先读 taskRequire，没有则读 content（和页面显示一致） Co-Authored-By: Claude Opus 4.6 (1M context) --- .../main/java/com/xiaoqu/watch/ui/home/HomeFragment.kt | 2 +- .../java/com/xiaoqu/watch/ui/task/TaskDetailFragment.kt | 7 ++++++- .../java/com/xiaoqu/watch/ui/task/TaskListFragment.kt | 8 +++++++- 3 files changed, 14 insertions(+), 3 deletions(-) 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