From ae6fff187b368385f8142a98da6067897201d544 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期一, 29 四月 2024 15:47:22 +0800
Subject: [PATCH] 1.修改架构将河南版本提取成library 2.修复密码修改的bug 3.添加登录页选择模块功能
---
henanlibrary/src/main/java/com/dayu/henanlibrary/activity/ReadCardAcitivy.java | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 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..59485dd 100644
--- a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/ReadCardAcitivy.java
+++ b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/ReadCardAcitivy.java
@@ -23,7 +23,7 @@
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.SocketUtil;
import com.dayu.henanlibrary.view.ProgressDialog;
@@ -102,51 +102,51 @@
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());
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));
@@ -169,7 +169,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