From e44a25e8411fe019220a5a0a8bbc2edb60f83e99 Mon Sep 17 00:00:00 2001
From: dongliang <dongliang@dongliangdeMac-mini.local>
Date: Tue, 28 Apr 2026 20:13:48 +0930
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8E=BB=E6=8E=89=E6=89=93=E5=8D=A1?=
 =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E5=BC=B9=E7=AA=97=20+=20NFC=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E6=8E=92=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 去掉"确定上班打卡？"确认弹窗，NFC读到卡号直接提交
- 添加NFC开启/扫描日志便于排查无反应问题

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 .../com/xiaoqu/watch/ui/punch/PunchFragment.kt | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/com/xiaoqu/watch/ui/punch/PunchFragment.kt b/app/src/main/java/com/xiaoqu/watch/ui/punch/PunchFragment.kt
index 7480ff3..0c5162a 100644
--- a/app/src/main/java/com/xiaoqu/watch/ui/punch/PunchFragment.kt
+++ b/app/src/main/java/com/xiaoqu/watch/ui/punch/PunchFragment.kt
@@ -143,21 +143,15 @@ class PunchFragment : BaseFragment<FragmentPunchBinding>() {
         // NFC 开启语音+振动（planId=8）
         VibrationDefaults.getPattern(8)?.let { vibrationController.executePattern(it) }
 
-        // 开启 NFC 扫描
+        // 开启 NFC 扫描（加日志排查）
+        Timber.d("考勤: 开启 NFC")
         nfcController.open()
+        Timber.d("考勤: NFC isOpen=${nfcController.isOpen()}, 开始扫描")
         nfcController.startScan { nfcId ->
-            Timber.d("考勤: NFC 读到 $nfcId")
+            Timber.d("考勤: NFC 读到卡号 $nfcId")
             stopNfc()
-
-            if (currentPunchType == 0) {
-                confirmDialog.showText(
-                    text = "确定上班打卡？",
-                    onConfirm = { doPunch(nfcId) },
-                    onCancel = { resetButton() }
-                )
-            } else {
-                doPunch(nfcId)
-            }
+            // 不弹确认，直接打卡
+            doPunch(nfcId)
         }
 
         // 10秒超时