From 306af795a6e1ea048920466be55c5ccdf51c6cf6 Mon Sep 17 00:00:00 2001 From: dongliang Date: Wed, 6 May 2026 13:19:45 +0930 Subject: [PATCH] =?UTF-8?q?refactor:=20NFC=20=E6=89=93=E5=8D=A1=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=E5=BC=B9=E7=AA=97=EF=BC=8C=E6=94=B9=E4=B8=BA=E8=BD=BB?= =?UTF-8?q?=E9=87=8F=E6=8C=89=E9=92=AE=E7=8A=B6=E6=80=81=E5=8F=8D=E9=A6=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 手表小屏上音效+震动已足够反馈结果,全屏弹窗多余。 - 成功:按钮显示"打卡成功"(绿色)1秒 → 刷新/返回 - 失败/超时:按钮恢复"开启打卡"(可重试) - 去掉 QuTipDialog 调用 Co-Authored-By: Claude Opus 4.6 (1M context) --- .../watch/ui/task/TaskDetailFragment.kt | 20 +++++------------- .../xiaoqu/watch/ui/task/TaskListFragment.kt | 21 +++++-------------- 2 files changed, 10 insertions(+), 31 deletions(-) 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 e8915f7..6ee3498 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 @@ -223,22 +223,12 @@ class TaskDetailFragment : BaseFragment() { nfcTaskManager.startTaskPunch(taskId) { success, message -> if (success) { - tipDialog.show( - status = QuTipDialog.Status.SUCCESS, - title = "打卡成功", - back = true, step = 1, countdown = 2, - onBack = { findNavController().popBackStack() } - ) + // 音效已由 NfcTaskManager 播放,按钮短暂显示"打卡成功"后返回 + btn.text = "打卡成功" + btn.setBackgroundResource(R.drawable.bg_foot_btn_green) + btn.postDelayed({ findNavController().popBackStack() }, 1000) } else { - // 失败或超时 → 恢复按钮 - if (message != "超时") { - tipDialog.show( - status = QuTipDialog.Status.ERROR, - title = "打卡失败", - desc = message, - back = true, step = 0, countdown = 3 - ) - } + // 失败/超时 → 恢复按钮(可重试) btn.text = "开启打卡" btn.isEnabled = true btn.setBackgroundResource(R.drawable.bg_foot_btn_orange) 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 4585567..aaf5d10 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 @@ -452,23 +452,12 @@ class TaskListFragment : BaseFragment() { nfcTaskManager.startTaskPunch(taskId) { success, message -> if (success) { - tipDialog.show( - status = QuTipDialog.Status.SUCCESS, - title = "打卡成功", - back = false, step = 1, countdown = 2 - ) - // 刷新当前任务详情 - fetchCurrentDetail() + // 音效已由 NfcTaskManager 播放,按钮短暂显示"打卡成功"后刷新 + btn.text = "打卡成功" + btn.setBackgroundResource(R.drawable.bg_foot_btn_green) + btn.postDelayed({ fetchCurrentDetail() }, 1000) } else { - if (message != "超时") { - tipDialog.show( - status = QuTipDialog.Status.ERROR, - title = "打卡失败", - desc = message, - back = true, step = 0, countdown = 3 - ) - } - // 恢复按钮 + // 失败/超时 → 恢复按钮(可重试) btn.text = "开启打卡" btn.isEnabled = true btn.setBackgroundResource(R.drawable.bg_foot_btn_orange)