From e79ced190337222c7475409363c8071c976c7de9 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期一, 06 五月 2024 10:03:04 +0800
Subject: [PATCH] 1.修复两个工程因layout名字一样导致的bug
---
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ReadCardAcitivy.java | 42 ++++++++++++++++++++----------------------
1 files changed, 20 insertions(+), 22 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 ec3a42a..bc359e9 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ReadCardAcitivy.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ReadCardAcitivy.java
@@ -15,11 +15,9 @@
import com.dayu.qihealonelibrary.card.ElectricPriceCard;
import com.dayu.qihealonelibrary.card.RegionCard;
import com.dayu.qihealonelibrary.card.UserCard;
-import com.dayu.qihealonelibrary.databinding.ActivityRedCardBinding;
-
+import com.dayu.qihealonelibrary.databinding.ActivityRedCardQhaBinding;
import com.dayu.qihealonelibrary.tools.NfcReadHelper;
-
-import com.dayu.qihealonelibrary.utils.MyCommon;
+import com.dayu.qihealonelibrary.utils.CardCommon;
import com.dayu.qihealonelibrary.view.ProgressDialog;
import java.util.Calendar;
@@ -31,10 +29,10 @@
* Date: 2023-11-10 19:52
* Description: 璇诲崱鐣岄潰
*/
-public class ReadCardAcitivy extends BaseNfcActivity {
+public class ReadCardAcitivy extends BaseNfcActivityQHAlone {
volatile UserCard userCard;
- ActivityRedCardBinding redCardBinding;
+ ActivityRedCardQhaBinding redCardBinding;
Intent intent;
@@ -42,7 +40,7 @@
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- redCardBinding = ActivityRedCardBinding.inflate(LayoutInflater.from(this));
+ redCardBinding = ActivityRedCardQhaBinding.inflate(LayoutInflater.from(this));
setContentView(redCardBinding.getRoot());
}
@@ -96,33 +94,33 @@
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);
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);
@@ -130,30 +128,30 @@
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));
redCardBinding.readCardDataTV.setText(powerCard.getPower());
stopAnim();
break;
- case MyCommon.BLACK:
+ case CardCommon.BLACK:
viweGone(false);
redCardBinding.readCardTypeTV.setText("褰撳墠涓洪粦鍗�");
BlackCard blackCard = BlackCard.getBean(data);
redCardBinding.readCardDataTV.setText("褰撳墠榛戝崱鐢ㄦ埛鍙蜂负锛�" + blackCard.getBlackCard());
break;
- case MyCommon.REGION:
+ case CardCommon.REGION:
viweGone(false);
redCardBinding.readCardTypeTV.setText("褰撳墠涓哄尯鍩熻〃鍙峰崱");
RegionCard regionCard = RegionCard.getBean(data);
@@ -162,7 +160,7 @@
stringBuilder.append("鎺у埗鍣ㄧ紪鍙凤細").append(regionCard.getControllerCodel()).append("\n");
redCardBinding.readCardDataTV.setText(stringBuilder.toString());
break;
- case MyCommon.ELECTRIC_PRICE:
+ case CardCommon.ELECTRIC_PRICE:
viweGone(false);
redCardBinding.readCardTypeTV.setText("褰撳墠涓虹數閲忓崟浠峰崱");
ElectricPriceCard electricPriceCard = ElectricPriceCard.getBean(data);
@@ -186,7 +184,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