From 44e05fc867c3f028cf110f7b2fefb417d51646b2 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期四, 14 三月 2024 12:01:13 +0800
Subject: [PATCH] 添加密码校验 修复用户卡bug

---
 app/src/main/java/com/dayu/recharge/activity/BaseNfcActivity.java |   70 +++++++++++++++++++++++++++++++---
 1 files changed, 63 insertions(+), 7 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..89456ef 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,16 @@
  */
 
 
+import android.app.Activity;
 import android.app.PendingIntent;
-import android.content.Context;
 import android.content.Intent;
 import android.nfc.NfcAdapter;
+import android.nfc.Tag;
+import android.os.Handler;
 
-import com.dayu.recharge.utils.ToastUtil;
+import com.dayu.recharge.card.UserCard;
+import com.dayu.recharge.tools.LoyaltyCardReader;
+import com.dayu.recharge.utils.TipUtil;
 
 /**
  * Author:Created by Ricky on 2017/8/25.
@@ -21,21 +25,54 @@
  * 鍦╫nNewIntent鏂规硶涓墽琛宨ntent浼犻�掕繃鏉ョ殑Tag鏁版嵁
  * 灏哊FC鏍囩鍗￠潬杩戞墜鏈哄悗閮紙NFC鏍囩鍗″彲缃戜笂鑷璐拱锛�
  */
-public class BaseNfcActivity extends BaseActivity {
+public class BaseNfcActivity extends BaseActivity implements LoyaltyCardReader.AccountCallback {
+
+    /**
+     * 璇ュ崱宸插啓鍏ョ敤鎴蜂俊鎭�
+     */
+    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;
+
+    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);
+        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);
+//        }
 
     }
 
@@ -62,22 +99,41 @@
         //鎭㈠榛樿鐘舵��
         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(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;
     }
+
+
+    @Override
+    public void onAccountReceived(Tag tag) {
+
+        Intent intent = new Intent(this, getClass());
+        intent.putExtra(NfcAdapter.EXTRA_TAG, tag);
+        startActivity(intent);
+
+    }
 }

--
Gitblit v1.8.0