From 1cbb505922e010cace51020773a2dc1529713322 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期三, 06 三月 2024 16:12:58 +0800
Subject: [PATCH] 1.修改包名
---
app/src/main/java/com/dayu/rechargeqh/activity/ReadCardAcitivy.java | 83 ++++++++++++++++++++++++-----------------
1 files changed, 48 insertions(+), 35 deletions(-)
diff --git a/app/src/main/java/com/dayu/recharge/activity/ReadCardAcitivy.java b/app/src/main/java/com/dayu/rechargeqh/activity/ReadCardAcitivy.java
similarity index 78%
rename from app/src/main/java/com/dayu/recharge/activity/ReadCardAcitivy.java
rename to app/src/main/java/com/dayu/rechargeqh/activity/ReadCardAcitivy.java
index 8d55630..8543ad1 100644
--- a/app/src/main/java/com/dayu/recharge/activity/ReadCardAcitivy.java
+++ b/app/src/main/java/com/dayu/rechargeqh/activity/ReadCardAcitivy.java
@@ -1,4 +1,4 @@
-package com.dayu.recharge.activity;
+package com.dayu.rechargeqh.activity;
import android.content.Intent;
import android.nfc.NfcAdapter;
@@ -7,25 +7,28 @@
import android.view.LayoutInflater;
import android.view.View;
-import com.dayu.recharge.card.ConfigurationPowerCard;
-import com.dayu.recharge.card.DomainCard;
-import com.dayu.recharge.card.UserCard;
-import com.dayu.recharge.databinding.ActivityRedCardBinding;
-import com.dayu.recharge.net.SocketCallBack;
-import com.dayu.recharge.net.SocketData;
-import com.dayu.recharge.net.SocketNet;
-import com.dayu.recharge.socketBean.BalanceSelecteRequestBean;
-import com.dayu.recharge.tools.BcdUtil;
-import com.dayu.recharge.tools.HexUtil;
-import com.dayu.recharge.tools.NfcReadHelper;
-import com.dayu.recharge.tools.WriteCardUtils;
-import com.dayu.recharge.utils.CRC8;
-import com.dayu.recharge.utils.DeviceNumberUtils;
-import com.dayu.recharge.utils.MornyUtil;
-import com.dayu.recharge.utils.MyCommon;
-import com.dayu.recharge.utils.SocketUtil;
-import com.dayu.recharge.utils.TipUtil;
-import com.dayu.recharge.view.ProgressDialog;
+import com.dayu.rechargeqh.card.BlackCard;
+import com.dayu.rechargeqh.card.ConfigurationPowerCard;
+import com.dayu.rechargeqh.card.DomainCard;
+import com.dayu.rechargeqh.card.ElectricPriceCard;
+import com.dayu.rechargeqh.card.RegionCard;
+import com.dayu.rechargeqh.card.UserCard;
+import com.dayu.rechargeqh.databinding.ActivityRedCardBinding;
+import com.dayu.rechargeqh.net.SocketCallBack;
+import com.dayu.rechargeqh.net.SocketData;
+import com.dayu.rechargeqh.net.SocketNet;
+import com.dayu.rechargeqh.socketBean.BalanceSelecteRequestBean;
+import com.dayu.rechargeqh.tools.BcdUtil;
+import com.dayu.rechargeqh.tools.HexUtil;
+import com.dayu.rechargeqh.tools.NfcReadHelper;
+import com.dayu.rechargeqh.tools.WriteCardUtils;
+import com.dayu.rechargeqh.utils.CRC8;
+import com.dayu.rechargeqh.utils.DeviceNumberUtils;
+import com.dayu.rechargeqh.utils.MornyUtil;
+import com.dayu.rechargeqh.utils.MyCommon;
+import com.dayu.rechargeqh.utils.SocketUtil;
+import com.dayu.rechargeqh.utils.TipUtil;
+import com.dayu.rechargeqh.view.ProgressDialog;
import java.util.Arrays;
import java.util.Calendar;
@@ -39,22 +42,9 @@
*/
public class ReadCardAcitivy extends BaseNfcActivity {
- private static final int USER_CRAD = 1;
- private static final int MANAGE_CRAD = 2;
- private static final int CLEAN_CARD = 3;
- private static final int REGISTERED_CARD = 4;
- private static final int CLEAN_ALL_USER = 5;
- private static final int DOMAIN_CARD = 6;
- private static final int TEST_CARD = 7;
-
- private static final int CONFIGURATION_CARD = 8;
-
- private static final int CONFIGURATION_POWER_CARD = 9;
- private static final int PASS_WORD_CRAD = 10;
-
-
volatile UserCard userCard;
ActivityRedCardBinding redCardBinding;
+
Intent intent;
@@ -119,7 +109,6 @@
case MyCommon.USER_CARD_TYPE_2:
case MyCommon.USER_CARD_TYPE_3:
userCard = UserCard.getBean(data);
-// selectBalance(userCard.getInitPeasantCode());
break;
case MyCommon.MANAGE_CRAD:
viweGone(false);
@@ -146,6 +135,7 @@
viweGone(false);
redCardBinding.readCardTypeTV.setText("褰撳墠涓鸿缃煙鍚嶅崱");
DomainCard domainCard = DomainCard.toBean(data);
+ assert domainCard != null;
redCardBinding.readCardDataTV.setText("搴忓彿锛�" + domainCard.getDomainNumber() + "\n" + "鍩熷悕锛�" + domainCard.getDomainName() + "\n" + "绔彛鍙凤細" + domainCard.getPort());
stopAnim();
break;
@@ -166,6 +156,29 @@
redCardBinding.readCardDataTV.setText(powerCard.getPower());
stopAnim();
break;
+ case MyCommon.BLACK:
+ viweGone(false);
+ redCardBinding.readCardTypeTV.setText("褰撳墠涓洪粦鍗�");
+ BlackCard blackCard = BlackCard.getBean(data);
+ redCardBinding.readCardDataTV.setText("褰撳墠榛戝崱鐢ㄦ埛鍙蜂负锛�" + blackCard.getBlackCard());
+ break;
+ case MyCommon.REGION:
+ viweGone(false);
+ redCardBinding.readCardTypeTV.setText("褰撳墠涓哄尯鍩熻〃鍙峰崱");
+ RegionCard regionCard = RegionCard.getBean(data);
+ StringBuilder stringBuilder = new StringBuilder();
+ stringBuilder.append("鍖哄煙鍦板潃锛�").append(regionCard.getRegion()).append("\n");
+ stringBuilder.append("鎺у埗鍣ㄧ紪鍙凤細").append(regionCard.getControllerCodel()).append("\n");
+ redCardBinding.readCardDataTV.setText(stringBuilder.toString());
+ break;
+ case MyCommon.ELECTRIC_PRICE:
+ viweGone(false);
+ redCardBinding.readCardTypeTV.setText("褰撳墠涓虹數閲忓崟浠峰崱");
+ ElectricPriceCard electricPriceCard = ElectricPriceCard.getBean(data);
+ StringBuilder electricPriceBuilder = new StringBuilder();
+ electricPriceBuilder.append("鐢甸噺鍗曚环锛�").append(electricPriceCard.getElectricPrice()).append("\n");
+ redCardBinding.readCardDataTV.setText(electricPriceBuilder.toString());
+ break;
default:
TipUtil.show(ReadCardAcitivy.this, "鍗＄墖鏃犳硶璇嗗埆");
stopAnim();
--
Gitblit v1.8.0