From d0a0e8e242e293ad35dfbee1217f1103302818cd Mon Sep 17 00:00:00 2001
From: zuojincheng <lf_zuo@163.com>
Date: 星期四, 03 四月 2025 10:22:48 +0800
Subject: [PATCH] refactor(generallibrary):重构卡片和用户搜索功能
---
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ReadCardAcitivy.java | 109 +++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 79 insertions(+), 30 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 dfe6a06..258c817 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ReadCardAcitivy.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ReadCardAcitivy.java
@@ -10,14 +10,19 @@
import com.dayu.baselibrary.tools.HexUtil;
import com.dayu.baselibrary.utils.MornyUtil;
import com.dayu.baselibrary.utils.TipUtil;
+import com.dayu.baselibrary.view.ConfirmDialog;
import com.dayu.qihealonelibrary.card.BlackCard;
import com.dayu.qihealonelibrary.card.ConfigurationPowerCard;
import com.dayu.qihealonelibrary.card.DomainCard;
import com.dayu.qihealonelibrary.card.ElectricPriceCard;
+import com.dayu.qihealonelibrary.card.ManageCard;
+import com.dayu.qihealonelibrary.card.ManagerToUserCard;
import com.dayu.qihealonelibrary.card.RegionCard;
import com.dayu.qihealonelibrary.card.UserCard;
import com.dayu.qihealonelibrary.databinding.ActivityRedCardQhaBinding;
+import com.dayu.qihealonelibrary.dbBean.AdminDataBean;
import com.dayu.qihealonelibrary.dbBean.UserCardBean;
+import com.dayu.qihealonelibrary.tools.NFCWriteHelper;
import com.dayu.qihealonelibrary.tools.NfcReadHelper;
import com.dayu.qihealonelibrary.utils.CardCommon;
import com.dayu.qihealonelibrary.view.ProgressDialog;
@@ -31,14 +36,17 @@
* Date: 2023-11-10 19:52
* Description: 璇诲崱鐣岄潰
*/
-public class ReadCardAcitivy extends BaseNfcActivity {
+public class ReadCardAcitivy extends QHAloneBaseNfcActivity {
volatile UserCard userCard;
ActivityRedCardQhaBinding redCardBinding;
Intent intent;
-
+ ConfirmDialog confirmDialog;
+ AdminDataBean adminData;
+ String cardNumber;
+ String userCardStr;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -57,31 +65,28 @@
int year = calendar.get(Calendar.YEAR);
int month = calendar.get(Calendar.MONTH); // 鏈堜唤浠�0寮�濮嬶紝鎵�浠ラ渶瑕佸姞1
int day = calendar.get(Calendar.DAY_OF_MONTH);
- int hour = calendar.get(Calendar.HOUR_OF_DAY);
- int minute = calendar.get(Calendar.MINUTE);
- int second = calendar.get(Calendar.SECOND);
redCardBinding.redRechargeDate.setText("鏈崱鏈�鍚庤喘姘存棩鏈燂細" + year + "骞�" + month + "鏈�" + day + "鏃�");
} else {
redCardBinding.redRechargeDate.setText("鏈崱鏈�鍚庤喘姘存棩鏈燂細鏃�");
}
redCardBinding.redInitCode.setText(cardNumber);
- redCardBinding.redRechargeNumber.setText("鏈崱鍏呭�兼鏁帮細" + userCard.getRechargeTimes() + "");
- redCardBinding.redTotalWater.setText("鎬荤敤姘撮噺锛�" + userCard.getTotalWater());
- redCardBinding.redTotalPower.setText("鎬荤敤鐢甸噺锛�" + userCard.getTotalElectric());
- redCardBinding.redRemainderBlance.setText("鍓╀綑閲戦锛�" + MornyUtil.changeF2Y(userCard.getBalance()) + "鍏�");
- redCardBinding.redRemainderWater.setText("鍓╀綑姘撮噺锛�" + userCard.getSurplusWater());
+ redCardBinding.redRechargeNumber.setText("鏈崱鍏呭�兼鏁帮細" + userCard.getRechargeTimes() + " 娆�");
+// redCardBinding.redTotalWater.setText("鎬荤敤姘撮噺锛�" + MornyUtil.changeF2Y(userCard.getTotalWater()) + " 鍚�");
+// redCardBinding.redTotalPower.setText("鎬荤敤鐢甸噺锛�" + MornyUtil.changeF2Y(userCard.getTotalElectric()) + " 搴�");
+ redCardBinding.redRemainderBlance.setText("鍓╀綑閲戦锛�" + MornyUtil.changeF2Y(userCard.getBalance()) + " 鍏�");
+// redCardBinding.redRemainderWater.setText("鍓╀綑姘撮噺锛�" + MornyUtil.changeF2Y(userCard.getSurplusWater()) + " 鍚�");
}
}
+
@Override
- public void onNewIntent(Intent intent) {
+ public void onNfcBack(Intent intent) {
this.intent = intent;
ProgressDialog.show(this);
if (NfcAdapter.ACTION_TAG_DISCOVERED.equals(intent.getAction())) {
readAllData(intent);
}
- super.onNewIntent(intent);
}
/**
@@ -92,26 +97,37 @@
String cardType = NfcReadHelper.getInstence(intent, this).getCradTypeAndCardNumber();
- String cardNumber = null;
+
String[] cardTypes = cardType.split(",");
if (cardTypes != null && cardTypes.length == 2) {
cardNumber = cardType.split(",")[0];
+ cardNumber = HexUtil.spaceHex(cardNumber);
+ cardNumber = HexUtil.HighLowHex(cardNumber);
cardType = cardType.split(",")[1];
}
List<byte[]> data = NfcReadHelper.getInstence(intent, this).getOnesectorData();
+ String state = "";
+ if (cardType.equalsIgnoreCase(CardCommon.USER_CARD_TYPE_1)) {
+ state = "缁堢鍐欏崱";
+ } else if (cardType.equalsIgnoreCase(CardCommon.USER_CARD_TYPE_2)) {
+ state = "鍒峰崱寮�娉靛悗";
+ } else if (cardType.equalsIgnoreCase(CardCommon.USER_CARD_TYPE_3)) {
+ state = "鍙犲姞鍏呭��";
+ }
switch (cardType) {
case CardCommon.USER_CARD_TYPE_1:
case CardCommon.USER_CARD_TYPE_2:
case CardCommon.USER_CARD_TYPE_3:
+
if (!data.isEmpty()) {
if (!TextUtils.isEmpty(cardNumber)) {
- userCard = UserCard.getBean(data);
+ userCard = new UserCard().getBean(data);
List<UserCardBean> userCardBeans = baseDao.userCardDao().findUserName(cardNumber);
if (userCardBeans != null && !userCardBeans.isEmpty()) {
UserCardBean userName = userCardBeans.get(0);
- setUserData(userName.getUserName(), "鍚敤", cardNumber);
+ setUserData(userName.getUserName(), state, cardNumber);
} else {
- setUserData("鏈煡璇㈠埌鐢ㄦ埛鍚�", "鍚敤", cardNumber);
+ setUserData("鏈煡璇㈠埌鐢ㄦ埛鍚�", state, cardNumber);
}
} else {
@@ -120,27 +136,64 @@
TipUtil.show("鍗＄墖璇嗗埆閿欒,璇烽噸璇曪紒");
}
- stopAnim();
break;
- case CardCommon.MANAGE_CRAD:
+ case CardCommon.MANAGE_CRAD://绠＄悊鍗�
+ ManageCard manageCard = ManageCard.getBean(data);
viweGone(false);
- redCardBinding.readCardTypeTV.setText("褰撳墠涓虹鐞嗗崱");
- stopAnim();
+ userCardStr = manageCard.getUserCard().toUpperCase();
+ userCardStr = HexUtil.spaceHex(userCardStr);
+ userCardStr = HexUtil.HighLowHex(userCardStr);
+ redCardBinding.readCardTypeTV.setText("褰撳墠涓虹鐞嗗崱" + "\n\n"
+ + "鍘熷鍗″彿锛�" + userCardStr);
+ if (manageCard.getType()==(byte) 1){
+ //褰�01鏃跺皢1鎵囧尯0鍧楀師绠＄悊鍗′俊鎭敼鎴愮敤鎴峰崱鍐呭
+ confirmDialog=new ConfirmDialog(this, "鏄惁纭琛ュ崱锛岃鍗″皢鎴愪负鏂扮敤鎴峰崱锛熷苟涓斾笉瑕佺Щ鍔ㄥ崱鐗�", new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ ProgressDialog.show(ReadCardAcitivy.this);
+ try {
+ confirmDialog.dismiss();
+
+ List<UserCardBean> userCardBeans = baseDao.userCardDao().findUserName(userCardStr);
+ if (userCardBeans != null && !userCardBeans.isEmpty()) {
+ UserCardBean userName = userCardBeans.get(0);
+ userName.setCardNumber(cardNumber);
+ baseDao.userCardDao().update(userName);
+ }
+
+ NFCWriteHelper nfcWriteHelper= NFCWriteHelper.getInstence(intent,ReadCardAcitivy.this);
+ adminData = baseDao.adminDao().findFirst();
+ ManagerToUserCard managerToUserCard=new ManagerToUserCard();
+ managerToUserCard.setArerNumber(Integer.valueOf(adminData.getSerial()));
+ managerToUserCard.setDeviceNumberl(Integer.valueOf(adminData.getAddressCode()));
+ managerToUserCard.setTotalElectric(manageCard.getTotalElectric());
+ if (nfcWriteHelper.writeData(managerToUserCard.getZeroBytes(),1,0)){
+ TipUtil.show(ReadCardAcitivy.this, "琛ュ崱鎴愬姛", () -> ReadCardAcitivy.this.finish());
+ }else {
+ TipUtil.show(ReadCardAcitivy.this, "琛ュ崱澶辫触锛岃閲嶆柊鍒峰崱", () -> ReadCardAcitivy.this.finish());
+ }
+
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ stopAnim();
+ }
+ });
+ confirmDialog.show();
+ }
break;
case CardCommon.CLEAN_CARD_TYPE:
viweGone(false);
redCardBinding.readCardTypeTV.setText("褰撳墠涓烘竻闆跺崱");
- stopAnim();
break;
case CardCommon.REGISTERED_CARD_TYPE:
viweGone(false);
redCardBinding.readCardTypeTV.setText("褰撳墠涓洪噸鏂版敞鍐岃澶囧崱");
- stopAnim();
break;
case CardCommon.CLEAN_ALL_USER_CARD_TYPE:
viweGone(false);
redCardBinding.readCardTypeTV.setText("褰撳墠涓哄垹闄ゅ叏閮ㄧ敤鎴峰崱");
- stopAnim();
break;
case CardCommon.DOMAIN_CARD_TYPE:
viweGone(false);
@@ -152,17 +205,14 @@
} else {
TipUtil.show("鍗＄墖璇嗗埆閿欒,璇烽噸璇曪紒");
}
- stopAnim();
break;
case CardCommon.TEST_CARD_TYPE:
viweGone(false);
redCardBinding.readCardTypeTV.setText("褰撳墠涓烘祴璇曞崱");
- stopAnim();
break;
case CardCommon.CONFIGURATION_CARD_TYPE:
viweGone(false);
redCardBinding.readCardTypeTV.setText("褰撳墠涓洪厤缃澶囨敞鍐屼俊鎭崱");
- stopAnim();
break;
case CardCommon.CONFIGURATION_POWER_CARD_TYPE:
viweGone(false);
@@ -173,7 +223,6 @@
} else {
TipUtil.show("鍗＄墖璇嗗埆閿欒,璇烽噸璇曪紒");
}
- stopAnim();
break;
case CardCommon.BLACK:
viweGone(false);
@@ -201,7 +250,8 @@
if (!data.isEmpty()) {
ElectricPriceCard electricPriceCard = ElectricPriceCard.getBean(data);
StringBuilder electricPriceBuilder = new StringBuilder();
- electricPriceBuilder.append("鐢甸噺鍗曚环锛�").append(electricPriceCard.getElectricPrice()).append("\n");
+ electricPriceBuilder.append("鐢甸噺鍗曚环锛�").append(electricPriceCard.getElectricPrice());
+ electricPriceBuilder.append("鍏�");
redCardBinding.readCardDataTV.setText(electricPriceBuilder.toString());
} else {
TipUtil.show("鍗＄墖璇嗗埆閿欒,璇烽噸璇曪紒");
@@ -209,10 +259,9 @@
break;
default:
TipUtil.show(ReadCardAcitivy.this, "鍗＄墖鏃犳硶璇嗗埆");
- stopAnim();
break;
}
-
+ stopAnim();
}
--
Gitblit v1.8.0