From c318dbdfa5c984202887d71a49ac9e5d3b409f57 Mon Sep 17 00:00:00 2001
From: dongliang <dongliang@dongliangdeMac-mini.local>
Date: Tue, 28 Apr 2026 21:17:57 +0930
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8E=BB=E6=8E=89=E9=9D=A2=E6=9D=BF?=
 =?UTF-8?q?=E6=97=A5=E6=9C=9F=20+=20=E4=BF=AE=E5=A4=8DNFC=E5=85=A8?=
 =?UTF-8?q?=E9=9B=B6=E5=8D=A1=E5=8F=B7=E8=AF=AF=E8=A7=A6=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. 面板去掉日期显示，只保留时间
2. FiseNfcController读到全零卡号（无卡贴近）时不触发回调，
   避免拿无效nfcId调API导致直接失败

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 .../com/xiaoqu/watch/device/nfc/FiseNfcController.kt   |  3 ++-
 .../java/com/xiaoqu/watch/ui/punch/PunchPanelView.kt   |  4 ----
 app/src/main/res/layout/view_punch_panel.xml           | 10 ----------
 3 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/com/xiaoqu/watch/device/nfc/FiseNfcController.kt b/app/src/main/java/com/xiaoqu/watch/device/nfc/FiseNfcController.kt
index dd48c88..08edf73 100644
--- a/app/src/main/java/com/xiaoqu/watch/device/nfc/FiseNfcController.kt
+++ b/app/src/main/java/com/xiaoqu/watch/device/nfc/FiseNfcController.kt
@@ -80,7 +80,8 @@ class FiseNfcController @Inject constructor() : NfcController {
                             content.replace("\\s+".toRegex(), "")
                         }
 
-                        if (nfcId.isNotEmpty()) {
+                        // 非空且非全零才算有效卡号（全零=无卡贴近）
+                        if (nfcId.isNotEmpty() && nfcId.any { it != '0' }) {
                             Timber.d("NFC控制: 读到卡号 $nfcId")
                             // 切回主线程回调
                             withContext(Dispatchers.Main) {
diff --git a/app/src/main/java/com/xiaoqu/watch/ui/punch/PunchPanelView.kt b/app/src/main/java/com/xiaoqu/watch/ui/punch/PunchPanelView.kt
index 02ffca5..de47b3b 100644
--- a/app/src/main/java/com/xiaoqu/watch/ui/punch/PunchPanelView.kt
+++ b/app/src/main/java/com/xiaoqu/watch/ui/punch/PunchPanelView.kt
@@ -35,7 +35,6 @@ class PunchPanelView @JvmOverloads constructor(
     private val overlay: View
     private val panelContent: LinearLayout
     private val tvPunchTime: TextView
-    private val tvPunchDate: TextView
     private val tvNfcHint: TextView
     private val btnPunchIn: TextView
     private val btnPunchOut: TextView
@@ -63,7 +62,6 @@ class PunchPanelView @JvmOverloads constructor(
         overlay = findViewById(R.id.overlay)
         panelContent = findViewById(R.id.panelContent)
         tvPunchTime = findViewById(R.id.tvPunchTime)
-        tvPunchDate = findViewById(R.id.tvPunchDate)
         tvNfcHint = findViewById(R.id.tvNfcHint)
         btnPunchIn = findViewById(R.id.btnPunchIn)
         btnPunchOut = findViewById(R.id.btnPunchOut)
@@ -171,8 +169,6 @@ class PunchPanelView @JvmOverloads constructor(
 
     /** 更新时钟显示 */
     fun updateClock() {
-        val info = DateUtil.getDateInfo()
         tvPunchTime.text = DateUtil.formatTimeShort()
-        tvPunchDate.text = "${info.month}月${info.day}日 ${info.week}"
     }
 }
diff --git a/app/src/main/res/layout/view_punch_panel.xml b/app/src/main/res/layout/view_punch_panel.xml
index 51f3636..4fdcba2 100644
--- a/app/src/main/res/layout/view_punch_panel.xml
+++ b/app/src/main/res/layout/view_punch_panel.xml
@@ -37,16 +37,6 @@
             android:textColor="@color/text_primary"
             android:textSize="48sp" />
 
-        <!-- 日期显示 -->
-        <TextView
-            android:id="@+id/tvPunchDate"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
-            android:text="1月1日 星期一"
-            android:textColor="@color/text_secondary"
-            android:textSize="16sp" />
-
         <!-- NFC 扫描提示（默认隐藏） -->
         <TextView
             android:id="@+id/tvNfcHint"