From 9450bcb197c2de53982368d5c2059b31abed3b87 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期五, 09 八月 2024 17:40:29 +0800
Subject: [PATCH] 齐河联网版程序除补卡相关逻辑
---
henanlibrary/src/main/java/com/dayu/henanlibrary/activity/ReadCardAcitivy.java | 53 ++++++++++++++++++++++++++++++++---------------------
1 files changed, 32 insertions(+), 21 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 b8b9448..d2417f5 100644
--- a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/ReadCardAcitivy.java
+++ b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/ReadCardAcitivy.java
@@ -10,20 +10,20 @@
import com.dayu.baselibrary.tools.BcdUtil;
import com.dayu.baselibrary.tools.HexUtil;
import com.dayu.baselibrary.utils.CRC8;
-import com.dayu.henanlibrary.utils.DeviceNumberUtils;
import com.dayu.baselibrary.utils.MornyUtil;
import com.dayu.baselibrary.utils.TipUtil;
import com.dayu.henanlibrary.card.ConfigurationPowerCard;
import com.dayu.henanlibrary.card.DomainCard;
import com.dayu.henanlibrary.card.UserCard;
-import com.dayu.henanlibrary.databinding.ActivityRedCardBinding;
+import com.dayu.henanlibrary.databinding.ActivityRedCardHnBinding;
import com.dayu.henanlibrary.net.SocketCallBack;
import com.dayu.henanlibrary.net.SocketData;
import com.dayu.henanlibrary.net.SocketNet;
import com.dayu.henanlibrary.socketBean.BalanceSelecteRequestBean;
import com.dayu.henanlibrary.tools.NfcReadHelper;
import com.dayu.henanlibrary.tools.WriteCardUtils;
-import com.dayu.henanlibrary.utils.MyCommon;
+import com.dayu.henanlibrary.utils.CardCommon;
+import com.dayu.henanlibrary.utils.DeviceNumberUtils;
import com.dayu.henanlibrary.utils.SocketUtil;
import com.dayu.henanlibrary.view.ProgressDialog;
@@ -40,14 +40,14 @@
public class ReadCardAcitivy extends BaseNfcActivity {
volatile UserCard userCard;
- ActivityRedCardBinding redCardBinding;
+ ActivityRedCardHnBinding redCardBinding;
Intent intent;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- redCardBinding = ActivityRedCardBinding.inflate(LayoutInflater.from(this));
+ redCardBinding = ActivityRedCardHnBinding.inflate(LayoutInflater.from(this));
setContentView(redCardBinding.getRoot());
}
@@ -102,51 +102,62 @@
byte cardType = data.get(0)[0];
String cardTypeStr = HexUtil.byteToHex(cardType);
switch (cardTypeStr) {
- case MyCommon.USER_CARD_TYPE_1:
- case MyCommon.USER_CARD_TYPE_2:
- case MyCommon.USER_CARD_TYPE_3:
+ case CardCommon.USER_CARD_TYPE_1:
+ case CardCommon.USER_CARD_TYPE_2:
+ case CardCommon.USER_CARD_TYPE_3:
userCard = UserCard.getBean(data);
selectBalance(userCard.getInitPeasantCode());
break;
- case MyCommon.MANAGE_CRAD:
+ case CardCommon.MANAGE_CRAD:
viweGone(false);
redCardBinding.readCardTypeTV.setText("褰撳墠涓虹鐞嗗崱");
stopAnim();
break;
- case MyCommon.CLEAN_CARD_TYPE:
+ case CardCommon.CLEAN_CARD_TYPE:
viweGone(false);
redCardBinding.readCardTypeTV.setText("褰撳墠涓烘竻闆跺崱");
stopAnim();
break;
- case MyCommon.REGISTERED_CARD_TYPE:
+ case CardCommon.REGISTERED_CARD_TYPE:
viweGone(false);
redCardBinding.readCardTypeTV.setText("褰撳墠涓洪噸鏂版敞鍐岃澶囧崱");
stopAnim();
break;
- case MyCommon.CLEAN_ALL_USER_CARD_TYPE:
+ case CardCommon.CLEAN_ALL_USER_CARD_TYPE:
viweGone(false);
redCardBinding.readCardTypeTV.setText("褰撳墠涓哄垹闄ゅ叏閮ㄧ敤鎴峰崱");
stopAnim();
break;
- case MyCommon.DOMAIN_CARD_TYPE:
+ 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 MyCommon.TEST_CARD_TYPE:
+ case CardCommon.TEST_CARD_TYPE:
viweGone(false);
redCardBinding.readCardTypeTV.setText("褰撳墠涓烘祴璇曞崱");
stopAnim();
break;
- case MyCommon.CONFIGURATION_CARD_TYPE:
+ case CardCommon.CONFIGURATION_CARD_TYPE:
viweGone(false);
redCardBinding.readCardTypeTV.setText("褰撳墠涓洪厤缃澶囨敞鍐屼俊鎭崱");
stopAnim();
break;
- case MyCommon.CONFIGURATION_POWER_CARD_TYPE:
+ case CardCommon.CONFIGURATION_POWER_CARD_TYPE:
viweGone(false);
redCardBinding.readCardTypeTV.setText("褰撳墠閰嶇疆姘存车鍔熺巼鍗�");
ConfigurationPowerCard powerCard = ConfigurationPowerCard.toBean(data.get(0));
@@ -154,7 +165,7 @@
stopAnim();
break;
default:
- TipUtil.show(ReadCardAcitivy.this, "鍗＄墖鏃犳硶璇嗗埆");
+ TipUtil.show(ReadCardAcitivy.this, "褰撳墠鍗＄墖涓虹櫧鍗★紝璇峰埗鍗″悗璇诲彇");
stopAnim();
break;
}
@@ -169,7 +180,7 @@
@Override
public void error(int code) {
switch (code) {
- case MyCommon.ERROR_MOVE:
+ case CardCommon.ERROR_MOVE:
stopAnim();
TipUtil.show("杩炴帴涓柇锛岃閲嶆柊璐村悎鍗＄墖");
break;
--
Gitblit v1.8.0