From f4fc58196bd246272bf755a767660c03f573cbc6 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期二, 03 六月 2025 14:03:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
baselibrary/src/main/java/com/dayu/baselibrary/tools/nfc/NfcReadAdapter.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/baselibrary/src/main/java/com/dayu/baselibrary/tools/nfc/NfcReadAdapter.java b/baselibrary/src/main/java/com/dayu/baselibrary/tools/nfc/NfcReadAdapter.java
index ba423c5..9d9df56 100644
--- a/baselibrary/src/main/java/com/dayu/baselibrary/tools/nfc/NfcReadAdapter.java
+++ b/baselibrary/src/main/java/com/dayu/baselibrary/tools/nfc/NfcReadAdapter.java
@@ -27,7 +27,7 @@
public NfcReadAdapter(Intent intent, Activity activity) {
switch (BaseNfcActivity.adapterType) {
case ModelUtils.defaultType:
- nativeNfcReadHelper = new NativeNfcReadHelper(intent, activity);
+ nativeNfcReadHelper = NativeNfcReadHelper.getInstence(intent, activity);
break;
}
@@ -62,9 +62,14 @@
}
}
-
@Override
public String getCardNumber() {
+ return getCardNumber(false);
+ }
+
+
+
+ public String getCardNumber(boolean isChangePS) {
switch (BaseNfcActivity.adapterType) {
case ModelUtils.defaultType:
return nativeNfcReadHelper.getCardNumber();
--
Gitblit v1.8.0