From d08a5a6d062f1568aaeb14d2d72357826291ef97 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期六, 13 七月 2024 18:14:28 +0800
Subject: [PATCH] 添加齐河管理卡相关逻辑 修复bug

---
 henanlibrary/src/main/java/com/dayu/henanlibrary/activity/NFCWreatActivity.java |   32 ++++++++++++++++++++++++--------
 1 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/NFCWreatActivity.java b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/NFCWreatActivity.java
index 5f11fca..c6315bf 100644
--- a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/NFCWreatActivity.java
+++ b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/NFCWreatActivity.java
@@ -210,7 +210,7 @@
             }
             if (this.getIntent().hasExtra("domainCard_luyi")) {
                 domainCard = (DomainCard) this.getIntent().getSerializableExtra("domainCard_luyi");
-                binding.cardData.setText("鍒朵綔璁剧疆鏂颁埂鍩熷悕鍗�");
+                binding.cardData.setText("鍒朵綔璁剧疆楣块倯鍩熷悕鍗�");
             }
             if (this.getIntent().hasExtra("testCard")) {
                 testCard = (TestCard) this.getIntent().getSerializableExtra("testCard");
@@ -375,7 +375,7 @@
             StringBuffer data = new StringBuffer();
             if (rechargeBean != null) {
                 data.append("*****************************" + "\n");
-                data.append(getResources().getString(com.dayu.baselibrary.R.string.login_title)).append("\n");
+
                 data.append("璁惧搴忓垪鍙凤細").append(rechargeBean.getSerial()).append("\n");
                 data.append("鐢ㄦ埛鍚嶏細").append(rechargeBean.getUserName()).append("\n");
                 //            data.append("鎴�  鍙凤細" + rechargeBean.getUserNum() + "\n");
@@ -524,7 +524,11 @@
     }
 
     private void setmanageCard(Intent intent, final ManageCard manageCard) {
-        manageCardFlag = NFCWriteHelper.getInstence(intent, this).writeData(manageCard.toZeroByte(baseDao), 1, 0);
+        try {
+            manageCardFlag = NFCWriteHelper.getInstence(intent, this).writeData(manageCard.toZeroByte(baseDao), 1, 0);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 
     /**
@@ -534,7 +538,11 @@
      * @param clearOrInitCard
      */
     private void setClean(Intent intent, final CleanCard clearOrInitCard) {
-        cleanFlag = NFCWriteHelper.getInstence(intent, this).writeData(clearOrInitCard.toByte(baseDao), 1, 0);
+        try {
+            cleanFlag = NFCWriteHelper.getInstence(intent, this).writeData(clearOrInitCard.toByte(baseDao), 1, 0);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 
 
@@ -545,7 +553,11 @@
      * @param registeredCard
      */
     private void setRegisteredCard(Intent intent, RegisteredCard registeredCard) {
-        registeredFlag = NFCWriteHelper.getInstence(intent, this).writeData(registeredCard.toByte(baseDao), 1, 0);
+        try {
+            registeredFlag = NFCWriteHelper.getInstence(intent, this).writeData(registeredCard.toByte(baseDao), 1, 0);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 
     /**
@@ -555,7 +567,11 @@
      * @param cleanUserCard
      */
     private void setCleanUserCard(Intent intent, CleanUserCard cleanUserCard) {
-        cleanUserCardFlag = NFCWriteHelper.getInstence(intent, this).writeData(cleanUserCard.toByte(baseDao), 1, 0);
+        try {
+            cleanUserCardFlag = NFCWriteHelper.getInstence(intent, this).writeData(cleanUserCard.toByte(baseDao), 1, 0);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 
     /**
@@ -577,7 +593,7 @@
             domainCrdFlag = NFCWriteHelper.getInstence(intent, this).writeData(domainXinXiangCard.getTwoByte(), 1, 2);
         } catch (Exception e) {
             domainCrdFlag = false;
-            throw new RuntimeException(e);
+            e.printStackTrace();
         }
     }
 
@@ -595,7 +611,7 @@
             configPowerFlag = NFCWriteHelper.getInstence(intent, this).writeData(configurationPowerCard.toByte(baseDao), 1, 0);
         } catch (Exception e) {
             configPowerFlag = false;
-            throw new RuntimeException(e);
+            e.printStackTrace();
         }
     }
 

--
Gitblit v1.8.0