From 22ec43b446a3a46b7947171b18f8f79aa58b8bdc Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期四, 28 三月 2024 15:37:22 +0800
Subject: [PATCH] 登录界面添加版本信息
---
app/src/main/java/com/dayu/recharge/activity/BaseNfcActivity.java | 68 +++++++++++++++++++--------------
1 files changed, 39 insertions(+), 29 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 54db2fd..fb08ec3 100644
--- a/app/src/main/java/com/dayu/recharge/activity/BaseNfcActivity.java
+++ b/app/src/main/java/com/dayu/recharge/activity/BaseNfcActivity.java
@@ -7,23 +7,16 @@
import android.app.Activity;
import android.app.PendingIntent;
-import android.content.Context;
import android.content.Intent;
-import android.nfc.NdefMessage;
import android.nfc.NfcAdapter;
-import android.nfc.NfcEvent;
import android.nfc.Tag;
import android.os.Handler;
-import android.os.Message;
+import android.provider.Settings;
import com.dayu.recharge.card.UserCard;
-import com.dayu.recharge.tools.NfcReadHelper;
-import com.dayu.recharge.utils.LogUtil;
+import com.dayu.recharge.tools.LoyaltyCardReader;
import com.dayu.recharge.utils.TipUtil;
-import com.tencent.bugly.crashreport.CrashReport;
-
-import java.util.List;
-import java.util.Map;
+import com.dayu.recharge.utils.ToastUtil;
/**
* Author:Created by Ricky on 2017/8/25.
@@ -34,7 +27,7 @@
* 鍦╫nNewIntent鏂规硶涓墽琛宨ntent浼犻�掕繃鏉ョ殑Tag鏁版嵁
* 灏哊FC鏍囩鍗￠潬杩戞墜鏈哄悗閮紙NFC鏍囩鍗″彲缃戜笂鑷璐拱锛�
*/
-public class BaseNfcActivity extends BaseActivity {
+public class BaseNfcActivity extends BaseActivity implements LoyaltyCardReader.AccountCallback {
/**
* 璇ュ崱宸插啓鍏ョ敤鎴蜂俊鎭�
@@ -57,34 +50,31 @@
volatile UserCard userCard;
Handler handler;
+ public LoyaltyCardReader mLoyaltyCardReader;
/**
* 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);
- if (mNfcAdapter != null){
- mNfcAdapter.setNdefPushMessageCallback(new NfcAdapter.CreateNdefMessageCallback() {
- @Override
- public NdefMessage createNdefMessage(NfcEvent nfcEvent) {
- // 鍦ㄦ澶勫鐞哊FC娑堟伅鐨勫垱寤�
- return null;
- }
- }, this);
-
- }
-// mNfcAdapter.enableReaderMode(this, new NfcAdapter.ReaderCallback() {
-// @Override
-// public void onTagDiscovered(Tag tag) {
-// LogUtil.e(tag.toString());
-// }
-// }, NfcAdapter.FLAG_READER_NFC_A | NfcAdapter.FLAG_READER_SKIP_NDEF_CHECK, null);
+ Intent intent = new Intent(this, getClass());
//涓�鏃︽埅鑾種FC娑堟伅锛屽氨浼氶�氳繃PendingIntent璋冪敤绐楀彛
- mPendingIntent = PendingIntent.getActivity(this, 0, new Intent(this, getClass()), 0);
+ mPendingIntent = PendingIntent.getActivity(this, 0, intent, 0);
+
+// mLoyaltyCardReader = new LoyaltyCardReader(this);
+// if (mNfcAdapter != null) {
+// mNfcAdapter.enableReaderMode(this, mLoyaltyCardReader, READER_FLAGS, null);
+// }
}
@@ -111,7 +101,16 @@
//鎭㈠榛樿鐘舵��
if (mNfcAdapter != null)
mNfcAdapter.disableForegroundDispatch(this);
+// mNfcAdapter.disableReaderMode(this);
+
}
+
+// @Override
+// protected void onDestroy() {
+// super.onDestroy();
+// if (mNfcAdapter != null)
+// mNfcAdapter.disableReaderMode(this);
+// }
/**
* 妫�娴嬪伐浣�,鍒ゆ柇璁惧鐨凬FC鏀寔鎯呭喌
@@ -124,9 +123,20 @@
return false;
}
if (mNfcAdapter != null && !mNfcAdapter.isEnabled()) {
- TipUtil.show(context, "璇峰湪绯荤粺璁剧疆涓厛鍚敤NFC鍔熻兘锛�");
+ startActivity(new Intent(Settings.ACTION_NFC_SETTINGS));
+ ToastUtil.showLong( "璇峰湪绯荤粺璁剧疆涓厛鍚敤NFC鍔熻兘锛�");
return false;
}
return true;
}
+
+
+ @Override
+ public void onAccountReceived(Tag tag) {
+
+ Intent intent = new Intent(this, getClass());
+ intent.putExtra(NfcAdapter.EXTRA_TAG, tag);
+ startActivity(intent);
+
+ }
}
--
Gitblit v1.8.0