From fc1ec55e6ad56dc92737657750bcca7ed49f53eb Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期一, 29 七月 2024 14:44:35 +0800
Subject: [PATCH] 齐河联网版程序和通讯相关工具
---
henanlibrary/src/main/java/com/dayu/henanlibrary/activity/ReadCardAcitivy.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 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..d2417f5 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:
@@ -154,7 +165,7 @@
stopAnim();
break;
default:
- TipUtil.show(ReadCardAcitivy.this, "鍗＄墖鏃犳硶璇嗗埆");
+ TipUtil.show(ReadCardAcitivy.this, "褰撳墠鍗＄墖涓虹櫧鍗★紝璇峰埗鍗″悗璇诲彇");
stopAnim();
break;
}
--
Gitblit v1.8.0