From c0538000f28bc68f11bfe118cb5dd7dfaed09911 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期日, 14 七月 2024 09:23:43 +0800
Subject: [PATCH] 修复管理卡为null的bug,修复写卡失败的后提示成功的bug

---
 qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ReadCardAcitivy.java |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ReadCardAcitivy.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ReadCardAcitivy.java
index 1132551..3210875 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ReadCardAcitivy.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ReadCardAcitivy.java
@@ -144,7 +144,7 @@
                 userCardStr = HexUtil.spaceHex(userCardStr);
                 userCardStr = HexUtil.HighLowHex(userCardStr);
                 redCardBinding.readCardTypeTV.setText("褰撳墠涓虹鐞嗗崱" + "\n\n"
-                        + "鍘熷鍗″彿锛�" + userCard);
+                        + "鍘熷鍗″彿锛�" + userCardStr);
                 if (manageCard.getType()==(byte) 1){
                     //褰�01鏃跺皢1鎵囧尯0鍧楀師绠$悊鍗′俊鎭敼鎴愮敤鎴峰崱鍐呭
                      confirmDialog=new ConfirmDialog(this, "鏄惁纭琛ュ崱锛岃鍗″皢鎴愪负鏂扮敤鎴峰崱锛熷苟涓斾笉瑕佺Щ鍔ㄥ崱鐗�", new View.OnClickListener() {
@@ -167,8 +167,13 @@
                                 managerToUserCard.setArerNumber(Integer.valueOf(adminData.getSerial()));
                                 managerToUserCard.setDeviceNumberl(Integer.valueOf(adminData.getAddressCode()));
                                 managerToUserCard.setTotalElectric(manageCard.getTotalElectric());
-                                nfcWriteHelper.writeData(managerToUserCard.getZeroBytes(),1,0);
-                                TipUtil.show(ReadCardAcitivy.this, "琛ュ崱鎴愬姛", () -> ReadCardAcitivy.this.finish());
+                                if (nfcWriteHelper.writeData(managerToUserCard.getZeroBytes(),1,0)){
+                                    TipUtil.show(ReadCardAcitivy.this, "琛ュ崱鎴愬姛", () -> ReadCardAcitivy.this.finish());
+                                }else {
+                                    TipUtil.show(ReadCardAcitivy.this, "琛ュ崱澶辫触锛岃閲嶆柊鍒峰崱", () -> ReadCardAcitivy.this.finish());
+                                }
+
+
                             } catch (Exception e) {
                                e.printStackTrace();
                             }

--
Gitblit v1.8.0