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" />
-
-
-