From d5adf9f2e2b02baaebf1c5c673ca4a4899f1db5f Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期二, 14 五月 2024 14:01:14 +0800
Subject: [PATCH] 1.隐藏一些不需要的信息 2.将卡号倒序显示，但是制作管理卡时正序写入。
---
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ReadCardAcitivy.java | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 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 b5c1a5f..0529821 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ReadCardAcitivy.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ReadCardAcitivy.java
@@ -14,6 +14,7 @@
import com.dayu.qihealonelibrary.card.ConfigurationPowerCard;
import com.dayu.qihealonelibrary.card.DomainCard;
import com.dayu.qihealonelibrary.card.ElectricPriceCard;
+import com.dayu.qihealonelibrary.card.ManageCard;
import com.dayu.qihealonelibrary.card.RegionCard;
import com.dayu.qihealonelibrary.card.UserCard;
import com.dayu.qihealonelibrary.databinding.ActivityRedCardQhaBinding;
@@ -62,11 +63,11 @@
redCardBinding.redRechargeDate.setText("鏈崱鏈�鍚庤喘姘存棩鏈燂細鏃�");
}
redCardBinding.redInitCode.setText(cardNumber);
- redCardBinding.redRechargeNumber.setText("鏈崱鍏呭�兼鏁帮細" + userCard.getRechargeTimes() + " 娆�");
- redCardBinding.redTotalWater.setText("鎬荤敤姘撮噺锛�" + MornyUtil.changeF2Y(userCard.getTotalWater()) + " 鍚�");
- redCardBinding.redTotalPower.setText("鎬荤敤鐢甸噺锛�" + MornyUtil.changeF2Y(userCard.getTotalElectric())+" 搴�");
- redCardBinding.redRemainderBlance.setText("鍓╀綑閲戦锛�" + MornyUtil.changeF2Y(userCard.getBalance()) + " 鍏�");
- redCardBinding.redRemainderWater.setText("鍓╀綑姘撮噺锛�" + MornyUtil.changeF2Y(userCard.getSurplusWater())+" 鍚�");
+// redCardBinding.redRechargeNumber.setText("鏈崱鍏呭�兼鏁帮細" + userCard.getRechargeTimes() + " 娆�");
+// redCardBinding.redTotalWater.setText("鎬荤敤姘撮噺锛�" + MornyUtil.changeF2Y(userCard.getTotalWater()) + " 鍚�");
+// redCardBinding.redTotalPower.setText("鎬荤敤鐢甸噺锛�" + MornyUtil.changeF2Y(userCard.getTotalElectric()) + " 搴�");
+// redCardBinding.redRemainderBlance.setText("鍓╀綑閲戦锛�" + MornyUtil.changeF2Y(userCard.getBalance()) + " 鍏�");
+ redCardBinding.redRemainderWater.setText("鍓╀綑姘撮噺锛�" + MornyUtil.changeF2Y(userCard.getSurplusWater()) + " 鍚�");
}
}
@@ -93,6 +94,8 @@
String[] cardTypes = cardType.split(",");
if (cardTypes != null && cardTypes.length == 2) {
cardNumber = cardType.split(",")[0];
+ cardNumber = HexUtil.spaceHex(cardNumber);
+ cardNumber = HexUtil.HighLowHex(cardNumber);
cardType = cardType.split(",")[1];
}
List<byte[]> data = NfcReadHelper.getInstence(intent, this).getOnesectorData();
@@ -128,8 +131,13 @@
break;
case CardCommon.MANAGE_CRAD:
+ ManageCard manageCard = ManageCard.getBean(data);
viweGone(false);
- redCardBinding.readCardTypeTV.setText("褰撳墠涓虹鐞嗗崱");
+ String hex = manageCard.getUserCard().toUpperCase();
+ hex = HexUtil.spaceHex(hex);
+ hex = HexUtil.HighLowHex(hex);
+ redCardBinding.readCardTypeTV.setText("褰撳墠涓虹鐞嗗崱" + "\n\n"
+ + "鍘熷鍗″彿锛�" + hex);
break;
case CardCommon.CLEAN_CARD_TYPE:
viweGone(false);
--
Gitblit v1.8.0