From 9450bcb197c2de53982368d5c2059b31abed3b87 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期五, 09 八月 2024 17:40:29 +0800
Subject: [PATCH] 齐河联网版程序除补卡相关逻辑

---
 qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/BaseNfcActivity.java |   20 ++++++++------------
 1 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/BaseNfcActivity.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/BaseNfcActivity.java
index 438c33d..abdffbc 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/BaseNfcActivity.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/BaseNfcActivity.java
@@ -1,15 +1,8 @@
 package com.dayu.qihealonelibrary.activity;
-
-/**
- * Created by zuo on 2018/12/2.
- */
-
-
 import android.app.Activity;
 import android.app.PendingIntent;
 import android.content.Intent;
 import android.nfc.NfcAdapter;
-import android.nfc.Tag;
 import android.os.Handler;
 
 import com.dayu.baselibrary.utils.TipUtil;
@@ -17,7 +10,7 @@
 
 
 /**
- * Author:Created by Ricky on 2017/8/25.
+ * Author:Createdby zuo on 2018/12/2.
  * Email:584182977@qq.com
  * Description:
  * 瀛愮被鍦╫nNewIntent鏂规硶涓繘琛孨FC鏍囩鐩稿叧鎿嶄綔銆�
@@ -25,14 +18,13 @@
  * 鍦╫nNewIntent鏂规硶涓墽琛宨ntent浼犻�掕繃鏉ョ殑Tag鏁版嵁
  * 灏哊FC鏍囩鍗¢潬杩戞墜鏈哄悗閮紙NFC鏍囩鍗″彲缃戜笂鑷璐拱锛�
  */
-public class BaseNfcActivity extends QHAloneBaseActivity  {
+public class BaseNfcActivity extends BaseActivity {
 
 
     protected NfcAdapter mNfcAdapter;
     private PendingIntent mPendingIntent;
 
     volatile UserCard userCard;
-    Handler handler;
 
     /**
      * onCreat->onStart->onResume->onPause->onStop->onDestroy
@@ -68,7 +60,6 @@
     public void onResume() {
         super.onResume();
         if (!ifNFCUse(this)) {
-            this.finish();
         }
         //璁剧疆澶勭悊浼樹簬鎵�鏈夊叾浠朜FC鐨勫鐞�
         if (mNfcAdapter != null)
@@ -97,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