From 8e3719a37a6be0c9e244a0160b5f2f3331ca3122 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期四, 30 十一月 2023 15:11:38 +0800
Subject: [PATCH] 支持虚拟卡读取
---
app/src/main/java/com/dayu/recharge/activity/BaseNfcActivity.java | 74 +++++++++++--------------------------
1 files changed, 22 insertions(+), 52 deletions(-)
diff --git a/app/src/main/java/com/dayu/recharge/activity/BaseNfcActivity.java b/app/src/main/java/com/dayu/recharge/activity/BaseNfcActivity.java
index fd36401..84768de 100644
--- a/app/src/main/java/com/dayu/recharge/activity/BaseNfcActivity.java
+++ b/app/src/main/java/com/dayu/recharge/activity/BaseNfcActivity.java
@@ -14,11 +14,13 @@
import android.nfc.NfcEvent;
import android.nfc.Tag;
import android.nfc.cardemulation.CardEmulation;
+import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
import com.dayu.recharge.card.UserCard;
import com.dayu.recharge.tools.LoyaltyCardReader;
+import com.dayu.recharge.tools.NFCUtil;
import com.dayu.recharge.tools.NfcReadHelper;
import com.dayu.recharge.utils.LogUtil;
import com.dayu.recharge.utils.TipUtil;
@@ -53,35 +55,34 @@
public final static int ERROR = -1;
- protected NfcAdapter mNfcAdapter;
- private PendingIntent mPendingIntent;
+// protected NfcAdapter mNfcAdapter;
+// private PendingIntent mPendingIntent;
volatile UserCard userCard;
Handler handler;
public LoyaltyCardReader mLoyaltyCardReader;
+
+ NFCUtil nfcUtil;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ nfcUtil = NFCUtil.getInstance();
+ nfcUtil.setAccountCallback(this);
+ }
+
/**
* onCreat->onStart->onResume->onPause->onStop->onDestroy
* 鍚姩Activity锛岀晫闈㈠彲瑙佹椂.
*/
- public static int READER_FLAGS =
- NfcAdapter.FLAG_READER_NFC_A | NfcAdapter.FLAG_READER_SKIP_NDEF_CHECK;
@Override
protected void onStart() {
super.onStart();
//姝ゅadapter闇�瑕侀噸鏂拌幏鍙栵紝鍚﹀垯鏃犳硶鑾峰彇message
- mNfcAdapter = NfcAdapter.getDefaultAdapter(this);
- Intent intent = new Intent(this, getClass());
-
- //涓�鏃︽埅鑾種FC娑堟伅锛屽氨浼氶�氳繃PendingIntent璋冪敤绐楀彛
- mPendingIntent = PendingIntent.getActivity(this, 0, intent, 0);
-
-// mLoyaltyCardReader = new LoyaltyCardReader(this);
-// if (mNfcAdapter != null) {
-// mNfcAdapter.enableReaderMode(this, mLoyaltyCardReader, READER_FLAGS, null);
-// }
+ nfcUtil.onStartNfcAdapter(this);
}
@@ -91,12 +92,7 @@
@Override
public void onResume() {
super.onResume();
- if (!ifNFCUse(this)) {
- this.finish();
- }
- //璁剧疆澶勭悊浼樹簬鎵�鏈夊叾浠朜FC鐨勫鐞�
- if (mNfcAdapter != null)
- mNfcAdapter.enableForegroundDispatch(this, mPendingIntent, null, null);
+ nfcUtil.onResumeNfcAdapter(this);
}
/**
@@ -106,43 +102,17 @@
public void onPause() {
super.onPause();
//鎭㈠榛樿鐘舵��
- if (mNfcAdapter != null)
- mNfcAdapter.disableForegroundDispatch(this);
-// mNfcAdapter.disableReaderMode(this);
-
- }
-
-// @Override
-// protected void onDestroy() {
-// super.onDestroy();
-// if (mNfcAdapter != null)
-// mNfcAdapter.disableReaderMode(this);
-// }
-
- /**
- * 妫�娴嬪伐浣�,鍒ゆ柇璁惧鐨凬FC鏀寔鎯呭喌
- *
- * @return
- */
- protected Boolean ifNFCUse(Activity context) {
- if (mNfcAdapter == null) {
- TipUtil.show(context, "璁惧涓嶆敮鎸丯FC锛�");
- return false;
- }
- if (mNfcAdapter != null && !mNfcAdapter.isEnabled()) {
- TipUtil.show(context, "璇峰湪绯荤粺璁剧疆涓厛鍚敤NFC鍔熻兘锛�");
- return false;
- }
- return true;
+ nfcUtil.onPauseNfcAdapter(this);
}
@Override
- public void onAccountReceived(Tag tag) {
+ public void physicalCardDoing(Tag tag) {
- Intent intent = new Intent(this, getClass());
- intent.putExtra(NfcAdapter.EXTRA_TAG, tag);
- startActivity(intent);
+ }
+
+ @Override
+ public void virtualCardDoing(Tag tag) {
}
}
--
Gitblit v1.8.0