From 439bc040c883cea666b32a11ef5dc28bb37bb03a Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期六, 11 五月 2024 14:26:26 +0800
Subject: [PATCH] 1.修复提示dialog不设置提示时默认提示不显示问题
---
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/card/ManageCard.java | 33 +++++++++++++++++----------------
1 files changed, 17 insertions(+), 16 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 d01aea9..a0ad0da 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/card/ManageCard.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/card/ManageCard.java
@@ -14,26 +14,26 @@
*/
public class ManageCard extends BaseCard implements Serializable {
public String cardType = CardCommon.MANAGE_CRAD;//鍗＄被鍨�
-// public String cardData = "A0B1C289";//鏍囪瘑鐮�
-
-
- /**
- * M1鍗＄殑0鎵囧尯0鍧楅�氬父鐢ㄤ簬瀛樺偍涓�浜涘熀鏈殑鍗＄墖淇℃伅
- * 绗�0瀛楄妭锛氬崱鐗囩被鍨嬶紙M1鍗′负0x08锛�
- * 绗�1瀛楄妭锛氬崱鐗囧湴鍧�锛堥�氬父涓�0x00锛�
- * 绗�2-5瀛楄妭锛氬崱鐗囧簭鍒楀彿锛�4瀛楄妭锛�
- * 绗�6-8瀛楄妭锛氬崱鐗囧埗閫犲晢浠ｇ爜锛�3瀛楄妭锛�
- * 绗�9瀛楄妭锛氬崱鐗囩増鏈�
- * 绗�10-15瀛楄妭锛氶鐣欏尯鍩�
- */
- public byte[] userCard; //鐢ㄦ埛鍗″彿
-
public String getCardData() {
return cardData;
}
- public byte[] toZeroByte(QHAloneAppDatabase QHAloneAppDatabase) {
+ /**
+ * M1鍗＄殑0鎵囧尯0鍧楅�氬父鐢ㄤ簬瀛樺偍涓�浜涘熀鏈殑鍗＄墖淇℃伅
+ * 0-4瀛楄妭鏄崱鍙�
+ */
+ public String userCard; //鐢ㄦ埛鍗″彿
+
+ public String getUserCard() {
+ return userCard;
+ }
+
+ public void setUserCard(String userCard) {
+ this.userCard = userCard;
+ }
+
+ public byte[] toByte(QHAloneAppDatabase QHAloneAppDatabase) {
setCardData(QHAloneAppDatabase, cardType);
Zero zero = new Zero();
return zero.toByte();
@@ -47,8 +47,9 @@
byte[] cardDataByte = HexUtil.hexToByteArray(cardData);
System.arraycopy(cardDataByte, 0, data, 1, cardDataByte.length);
+ byte[] userCardByts = HexUtil.hexToByteArray(userCard);
if (userCard != null) {
- System.arraycopy(userCard, 0, data, 5, userCard.length);
+ System.arraycopy(userCardByts, 0, data, 5, userCardByts.length);
}
data[15] = getByteSum(data);
--
Gitblit v1.8.0