From fc1ec55e6ad56dc92737657750bcca7ed49f53eb Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期一, 29 七月 2024 14:44:35 +0800
Subject: [PATCH] 齐河联网版程序和通讯相关工具

---
 qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/BaseNfcActivity.java |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/BaseNfcActivityQHAlone.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/BaseNfcActivity.java
similarity index 89%
rename from qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/BaseNfcActivityQHAlone.java
rename to qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/BaseNfcActivity.java
index 4de667f..abdffbc 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/BaseNfcActivityQHAlone.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/BaseNfcActivity.java
@@ -18,14 +18,13 @@
  * 鍦╫nNewIntent鏂规硶涓墽琛宨ntent浼犻�掕繃鏉ョ殑Tag鏁版嵁
  * 灏哊FC鏍囩鍗¢潬杩戞墜鏈哄悗閮紙NFC鏍囩鍗″彲缃戜笂鑷璐拱锛�
  */
-public class BaseNfcActivityQHAlone extends BaseActivityQHAlone {
+public class BaseNfcActivity extends BaseActivity {
 
 
     protected NfcAdapter mNfcAdapter;
     private PendingIntent mPendingIntent;
 
     volatile UserCard userCard;
-    Handler handler;
 
     /**
      * onCreat->onStart->onResume->onPause->onStop->onDestroy
@@ -61,7 +60,6 @@
     public void onResume() {
         super.onResume();
         if (!ifNFCUse(this)) {
-            this.finish();
         }
         //璁剧疆澶勭悊浼樹簬鎵�鏈夊叾浠朜FC鐨勫鐞�
         if (mNfcAdapter != null)
@@ -90,7 +88,12 @@
      */
     protected Boolean ifNFCUse(Activity context) {
         if (mNfcAdapter == null) {
-            TipUtil.show(context, "璁惧涓嶆敮鎸丯FC锛�");
+            TipUtil.show(context, "璁惧涓嶆敮鎸丯FC锛�", new TipUtil.TipListener() {
+                @Override
+                public void onCancle() {
+                    BaseNfcActivity.this.finish();
+                }
+            });
             return false;
         }
         if (mNfcAdapter != null && !mNfcAdapter.isEnabled()) {

--
Gitblit v1.8.0