From 1ffa3cb19f95855d44fbc9485f4eb3286b12e359 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期三, 22 十一月 2023 12:43:17 +0800
Subject: [PATCH] 修改提示方式 修改充值流程

---
 app/src/main/java/com/dayu/recharge/tools/NFCWriteHelper.java |   29 ++++++++++++++---------------
 1 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/com/dayu/recharge/tools/NFCWriteHelper.java b/app/src/main/java/com/dayu/recharge/tools/NFCWriteHelper.java
index 449ebe7..856fc30 100644
--- a/app/src/main/java/com/dayu/recharge/tools/NFCWriteHelper.java
+++ b/app/src/main/java/com/dayu/recharge/tools/NFCWriteHelper.java
@@ -24,10 +24,10 @@
  * email 1058083107@qq.com
  * description
  */
-public class NFCWriteHelper extends BaseNFCHelper{
+public class NFCWriteHelper extends BaseNFCHelper {
 
     private Tag tag;
-    private NFCWriteHelper.NFCCallback callback;
+
     private static NFCWriteHelper helper;
     private static int PASSWORD_LENTH = 6;
 
@@ -67,12 +67,12 @@
     /**
      * 鍐欏崱
      *
-     * @param str      涔﹀啓鍐呭锛�16涓瓧鑺�
-     * @param a        涔﹀啓鐨勬墖鍖� (浠�0寮�濮嬫暟)
-     * @param b        涔﹀啓鐨勫潡(浠�0寮�濮嬫暟)
-     * @param callback 杩斿洖鐩戝惉
+     * @param str 涔﹀啓鍐呭锛�16涓瓧鑺�
+     * @param a   涔﹀啓鐨勬墖鍖� (浠�0寮�濮嬫暟)
+     * @param b   涔﹀啓鐨勫潡(浠�0寮�濮嬫暟)
+     * @param
      */
-    public void writeData(byte[] str, int a, int b, NFCWriteHelper.NFCCallback callback) {
+    public boolean writeData(byte[] str, int a, int b) {
         if (str.length <= 16) {
             try {
                 MifareClassic mfc = MifareClassic.get(tag);
@@ -84,15 +84,13 @@
                         int count = mfc.getSectorCount();
                         //濡傛灉浼犺繘鏉ョ殑鎵囧尯澶т簡鎴栬�呭皬浜嗙洿鎺ラ��鍑烘柟娉�
                         if (a > count - 1 || a < 0) {
-                            callback.isSusses(false);
-                            return;
+                            return false;
                         }
                         //鑾峰彇鍐欑殑鎵囧尯鐨勫潡鐨勬暟閲�
                         int bCount = mfc.getBlockCountInSector(a);
                         //濡傛灉杈撳叆鐨勫潡澶т簡鎴栬�呭皬浜嗕篃鏄洿鎺ラ��鍑�
                         if (b > bCount - 1 || b < 0) {
-                            callback.isSusses(false);
-                            return;
+                            return false;
                         }
                         //楠岃瘉鎵囧尯瀵嗙爜
                         boolean isOpen = mfc.authenticateSectorWithKeyA(a, bytes);
@@ -100,13 +98,12 @@
                             int bIndex = mfc.sectorToBlock(a);
                             //鍐欏崱
                             mfc.writeBlock(bIndex + b, str);
-                            callback.isSusses(true);
-                            return;
+                            return true;
                         }
-                        callback.isSusses(false);
+                        return false;
                     } catch (Exception e) {
                         e.printStackTrace();
-                        callback.isSusses(false);
+                        return false;
                     } finally {
                         try {
                             mfc.close();
@@ -117,8 +114,10 @@
                 }
             } catch (Exception e) {
                 e.printStackTrace();
+                return false;
             }
         }
+        return false;
     }
 
 

--
Gitblit v1.8.0