From d1573513f0eada6a915c2163ce6c84451c8c1070 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期四, 13 六月 2024 15:06:05 +0800
Subject: [PATCH] 1.修复河南版本域名卡结构不同问题 2.修复齐河版本最终购水日期的bug
---
henanlibrary/src/main/java/com/dayu/henanlibrary/activity/ReadCardAcitivy.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/ReadCardAcitivy.java b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/ReadCardAcitivy.java
index ed57dca..ee8176a 100644
--- a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/ReadCardAcitivy.java
+++ b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/ReadCardAcitivy.java
@@ -131,9 +131,20 @@
break;
case CardCommon.DOMAIN_CARD_TYPE:
viweGone(false);
- redCardBinding.readCardTypeTV.setText("褰撳墠涓鸿缃煙鍚嶅崱");
- DomainCard domainCard = DomainCard.toBean(data);
- redCardBinding.readCardDataTV.setText("搴忓彿锛�" + domainCard.getDomainNumber() + "\n" + "鍩熷悕锛�" + domainCard.getDomainName() + "\n" + "绔彛鍙凤細" + domainCard.getPort());
+ DomainCard domainXinXiangCard = DomainCard.toBean(data);
+ if(domainXinXiangCard.getType()==0){
+ redCardBinding.readCardTypeTV.setText("褰撳墠涓烘柊涔″煙鍚嶅崱");
+ }else {
+ redCardBinding.readCardTypeTV.setText("褰撳墠涓洪箍閭戝煙鍚嶅崱");
+ }
+ StringBuilder builder = new StringBuilder();
+ if (domainXinXiangCard.getType() == 0) {
+ builder.append("搴忓彿锛�" + domainXinXiangCard.getDomainNumber() + "\n");
+ }
+ builder.append("鍩熷悕锛�" + domainXinXiangCard.getDomainName());
+ builder.append("\n" + "绔彛鍙凤細" + domainXinXiangCard.getPort());
+
+ redCardBinding.readCardDataTV.setText(builder.toString());
stopAnim();
break;
case CardCommon.TEST_CARD_TYPE:
--
Gitblit v1.8.0