diff --git a/app/src/main/java/com/xiaoqu/watch/service/manager/NfcTaskManager.kt b/app/src/main/java/com/xiaoqu/watch/service/manager/NfcTaskManager.kt index 79750c3..83bf579 100644 --- a/app/src/main/java/com/xiaoqu/watch/service/manager/NfcTaskManager.kt +++ b/app/src/main/java/com/xiaoqu/watch/service/manager/NfcTaskManager.kt @@ -63,8 +63,8 @@ class NfcTaskManager @Inject constructor( * @param onResult 结果回调(主线程),success + message */ fun startTaskPunch(taskId: Long, onResult: (success: Boolean, message: String) -> Unit) { - if (isScanning) { - Timber.d("NFC任务打卡: 已在扫描中,忽略") + if (isScanning || nfcController.isOpen()) { + Timber.d("NFC任务打卡: NFC 正在使用中,忽略") return } isScanning = true @@ -123,8 +123,8 @@ class NfcTaskManager @Inject constructor( */ fun startActivePunch(onResult: (success: Boolean, message: String) -> Unit) { if (isScanning) { - Timber.d("NFC主动打卡: 已在扫��中,忽略") - return + if (isScanning || nfcController.isOpen()) { + Timber.d("NFC主动打卡: NFC 正在使用中,忽略") } isScanning = true Timber.d("NFC主动��卡: 开启(返回键触发)")