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/card/ManageCard.java | 37 +++++++++++++++++++++++++++++++++++++
1 files changed, 37 insertions(+), 0 deletions(-)
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/card/ManageCard.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/card/ManageCard.java
index a0ad0da..397a2f2 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/card/ManageCard.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/card/ManageCard.java
@@ -5,6 +5,7 @@
import com.dayu.qihealonelibrary.utils.CardCommon;
import java.io.Serializable;
+import java.util.List;
/**
* Copyright (C), 2023,
@@ -25,6 +26,22 @@
*/
public String userCard; //鐢ㄦ埛鍗″彿
+ public byte type;//褰撳墠鐘舵�� 00锛氬厖鍊肩鐞嗘満鍐� 01:鎺у埗鍣ㄥ弽鍐欑殑 褰�01鏃跺皢1鎵囧尯0鍧楀師绠＄悊鍗′俊鎭敼鎴愮敤鎴峰崱鍐呭
+
+ public int totalElectric;//鎬荤敤鐢甸噺浣� 搴曚綅鍦ㄥ墠锛岄珮浣嶅湪鍚� 1浣嶅皬鏁扮偣 鍚�1浣嶅皬鏁扮偣鐨勬暣鏁�
+
+ public int getTotalElectric() {
+ return totalElectric;
+ }
+
+ public byte getType() {
+ return type;
+ }
+
+ public void setType(byte type) {
+ this.type = type;
+ }
+
public String getUserCard() {
return userCard;
}
@@ -33,6 +50,26 @@
this.userCard = userCard;
}
+
+ public static ManageCard getBean(List<byte[]> data) {
+
+ if (data != null) {
+ ManageCard manageCard = new ManageCard();
+
+ byte[] zero = data.get(0);
+ byte[] passWordByte = new byte[4];
+ System.arraycopy(zero, 5, passWordByte, 0, passWordByte.length);
+ manageCard.setUserCard(HexUtil.bytesToHex(passWordByte));
+ manageCard.setType(zero[9]);
+ byte[] totalElectricByte = new byte[4];
+ System.arraycopy(zero, 10, totalElectricByte, 0, totalElectricByte.length);
+ manageCard.totalElectric = HexUtil.get16To10LowHightByBytes(totalElectricByte);
+ return manageCard;
+ }
+ return null;
+ }
+
+
public byte[] toByte(QHAloneAppDatabase QHAloneAppDatabase) {
setCardData(QHAloneAppDatabase, cardType);
Zero zero = new Zero();
--
Gitblit v1.8.0