From 50f6dd3b617f769e7fc6094c2dd0752747541489 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期四, 23 十一月 2023 18:04:05 +0800
Subject: [PATCH] 修复导出充值记录bug 优化充值记录加载逻辑和速度 优化导出记录逻辑

---
 app/src/main/java/com/dayu/recharge/activity/BaseNfcActivity.java |   57 +++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 53 insertions(+), 4 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 5b1e40b..54db2fd 100644
--- a/app/src/main/java/com/dayu/recharge/activity/BaseNfcActivity.java
+++ b/app/src/main/java/com/dayu/recharge/activity/BaseNfcActivity.java
@@ -5,12 +5,25 @@
  */
 
 
+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 com.dayu.recharge.utils.ToastUtil;
+import com.dayu.recharge.card.UserCard;
+import com.dayu.recharge.tools.NfcReadHelper;
+import com.dayu.recharge.utils.LogUtil;
+import com.dayu.recharge.utils.TipUtil;
+import com.tencent.bugly.crashreport.CrashReport;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * Author:Created by Ricky on 2017/8/25.
@@ -22,8 +35,27 @@
  * 灏哊FC鏍囩鍗￠潬杩戞墜鏈哄悗閮紙NFC鏍囩鍗″彲缃戜笂鑷璐拱锛�
  */
 public class BaseNfcActivity extends BaseActivity {
+
+    /**
+     * 璇ュ崱宸插啓鍏ョ敤鎴蜂俊鎭�
+     */
+    public final static int HAS_USER = 1;
+    /**
+     * 璇ュ崱鏈啓鍏ョ敤鎴蜂俊鎭�
+     */
+    public final static int NO_USER = 2;
+    /**
+     * 鍏呭��
+     */
+    public final static int RECHARGE = 3;
+
+    public final static int ERROR = -1;
+
     protected NfcAdapter mNfcAdapter;
     private PendingIntent mPendingIntent;
+
+    volatile UserCard userCard;
+    Handler handler;
 
     /**
      * onCreat->onStart->onResume->onPause->onStop->onDestroy
@@ -34,6 +66,23 @@
         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);
+
         //涓�鏃︽埅鑾種FC娑堟伅锛屽氨浼氶�氳繃PendingIntent璋冪敤绐楀彛
         mPendingIntent = PendingIntent.getActivity(this, 0, new Intent(this, getClass()), 0);
 
@@ -69,13 +118,13 @@
      *
      * @return
      */
-    protected Boolean ifNFCUse(Context context) {
+    protected Boolean ifNFCUse(Activity context) {
         if (mNfcAdapter == null) {
-            ToastUtil.show(context, "璁惧涓嶆敮鎸丯FC锛�");
+            TipUtil.show(context, "璁惧涓嶆敮鎸丯FC锛�");
             return false;
         }
         if (mNfcAdapter != null && !mNfcAdapter.isEnabled()) {
-            ToastUtil.show(context, "璇峰湪绯荤粺璁剧疆涓厛鍚敤NFC鍔熻兘锛�");
+            TipUtil.show(context, "璇峰湪绯荤粺璁剧疆涓厛鍚敤NFC鍔熻兘锛�");
             return false;
         }
         return true;

--
Gitblit v1.8.0