From 844597b5813ff8589de503cd7d7b1bbd0586d287 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期一, 13 五月 2024 19:38:03 +0800
Subject: [PATCH] 1.添加水量单价 2.修复发现的bug
---
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ReadCardAcitivy.java | 249 ++++++++++++++++++++++++++-----------------------
1 files changed, 132 insertions(+), 117 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..b5c1a5f 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ReadCardAcitivy.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ReadCardAcitivy.java
@@ -3,6 +3,7 @@
import android.content.Intent;
import android.nfc.NfcAdapter;
import android.os.Bundle;
+import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;
@@ -15,11 +16,10 @@
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.dbBean.UserCardBean;
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;
@@ -34,7 +34,7 @@
public class ReadCardAcitivy extends BaseNfcActivity {
volatile UserCard userCard;
- ActivityRedCardBinding redCardBinding;
+ ActivityRedCardQhaBinding redCardBinding;
Intent intent;
@@ -42,32 +42,31 @@
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- redCardBinding = ActivityRedCardBinding.inflate(LayoutInflater.from(this));
+ redCardBinding = ActivityRedCardQhaBinding.inflate(LayoutInflater.from(this));
setContentView(redCardBinding.getRoot());
}
- private void setUserData(String userName, int blance, String statu) {
+ private void setUserData(String userName, String statu, String cardNumber) {
viweGone(true);
redCardBinding.redName.setText("鐢ㄦ埛濮撳悕锛�" + userName);
- redCardBinding.redRemainderBlance.setText("鍓╀綑閲戦锛�" + MornyUtil.changeF2Y(blance) + "鍏�");
redCardBinding.redStatu.setText("鍗＄姸鎬侊細" + statu);
if (userCard != null) {
-
Calendar calendar = userCard.getRechargeDate();
if (calendar != null) {
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 + " " + hour + ":" + minute + ":" + second);
+ redCardBinding.redRechargeDate.setText("鏈崱鏈�鍚庤喘姘存棩鏈燂細" + year + "骞�" + month + "鏈�" + day + "鏃�");
} else {
redCardBinding.redRechargeDate.setText("鏈崱鏈�鍚庤喘姘存棩鏈燂細鏃�");
}
-
- redCardBinding.redRechargeNumber.setText("鏈崱鍏呭�兼鏁帮細" + userCard.getRechargeTimes() + "");
+ redCardBinding.redInitCode.setText(cardNumber);
+ 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())+" 鍚�");
}
}
@@ -87,115 +86,131 @@
*/
public void readAllData(Intent intent) {
- NfcReadHelper.getInstence(intent, this)
- .getOneSectorData(new NfcReadHelper.NFCCallListback() {
- @Override
- public void callBack(List<byte[]> data) {
- //鑾峰彇1鎵囧尯鏁版嵁
- if (data != null && data.size() > 0) {
- 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:
- userCard = UserCard.getBean(data);
- break;
- case MyCommon.MANAGE_CRAD:
- viweGone(false);
- redCardBinding.readCardTypeTV.setText("褰撳墠涓虹鐞嗗崱");
- stopAnim();
- break;
- case MyCommon.CLEAN_CARD_TYPE:
- viweGone(false);
- redCardBinding.readCardTypeTV.setText("褰撳墠涓烘竻闆跺崱");
- stopAnim();
- break;
- case MyCommon.REGISTERED_CARD_TYPE:
- viweGone(false);
- redCardBinding.readCardTypeTV.setText("褰撳墠涓洪噸鏂版敞鍐岃澶囧崱");
- stopAnim();
- break;
- case MyCommon.CLEAN_ALL_USER_CARD_TYPE:
- viweGone(false);
- redCardBinding.readCardTypeTV.setText("褰撳墠涓哄垹闄ゅ叏閮ㄧ敤鎴峰崱");
- stopAnim();
- break;
- case MyCommon.DOMAIN_CARD_TYPE:
- 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;
- case MyCommon.TEST_CARD_TYPE:
- viweGone(false);
- redCardBinding.readCardTypeTV.setText("褰撳墠涓烘祴璇曞崱");
- stopAnim();
- break;
- case MyCommon.CONFIGURATION_CARD_TYPE:
- viweGone(false);
- redCardBinding.readCardTypeTV.setText("褰撳墠涓洪厤缃澶囨敞鍐屼俊鎭崱");
- stopAnim();
- break;
- case MyCommon.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:
- 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();
- break;
- }
+ String cardType = NfcReadHelper.getInstence(intent, this).getCradTypeAndCardNumber();
+ String cardNumber = null;
+ String[] cardTypes = cardType.split(",");
+ if (cardTypes != null && cardTypes.length == 2) {
+ cardNumber = cardType.split(",")[0];
+ 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);
+ List<UserCardBean> userCardBeans = baseDao.userCardDao().findUserName(cardNumber);
+ if (userCardBeans != null && !userCardBeans.isEmpty()) {
+ UserCardBean userName = userCardBeans.get(0);
+ setUserData(userName.getUserName(), state, cardNumber);
} else {
- TipUtil.show(ReadCardAcitivy.this, "鍗＄墖鏃犳硶璇嗗埆");
- stopAnim();
+ setUserData("鏈煡璇㈠埌鐢ㄦ埛鍚�", state, cardNumber);
}
+ } else {
}
+ } else {
+ TipUtil.show("鍗＄墖璇嗗埆閿欒,璇烽噸璇曪紒");
+ }
- @Override
- public void error(int code) {
- switch (code) {
- case MyCommon.ERROR_MOVE:
- stopAnim();
- TipUtil.show("杩炴帴涓柇锛岃閲嶆柊璐村悎鍗＄墖");
- break;
- default:
- stopAnim();
- TipUtil.show("鍗＄墖璇嗗埆閿欒,璇烽噸璇曪紒");
- }
- }
- });
+ break;
+ case CardCommon.MANAGE_CRAD:
+ viweGone(false);
+ redCardBinding.readCardTypeTV.setText("褰撳墠涓虹鐞嗗崱");
+ break;
+ case CardCommon.CLEAN_CARD_TYPE:
+ viweGone(false);
+ redCardBinding.readCardTypeTV.setText("褰撳墠涓烘竻闆跺崱");
+ break;
+ case CardCommon.REGISTERED_CARD_TYPE:
+ viweGone(false);
+ redCardBinding.readCardTypeTV.setText("褰撳墠涓洪噸鏂版敞鍐岃澶囧崱");
+ break;
+ case CardCommon.CLEAN_ALL_USER_CARD_TYPE:
+ viweGone(false);
+ redCardBinding.readCardTypeTV.setText("褰撳墠涓哄垹闄ゅ叏閮ㄧ敤鎴峰崱");
+ break;
+ case CardCommon.DOMAIN_CARD_TYPE:
+ viweGone(false);
+ redCardBinding.readCardTypeTV.setText("褰撳墠涓鸿缃煙鍚嶅崱");
+ if (!data.isEmpty()) {
+ DomainCard domainCard = DomainCard.toBean(data);
+ assert domainCard != null;
+ redCardBinding.readCardDataTV.setText("搴忓彿锛�" + domainCard.getDomainNumber() + "\n" + "鍩熷悕锛�" + domainCard.getDomainName() + "\n" + "绔彛鍙凤細" + domainCard.getPort());
+ } else {
+ TipUtil.show("鍗＄墖璇嗗埆閿欒,璇烽噸璇曪紒");
+ }
+ break;
+ case CardCommon.TEST_CARD_TYPE:
+ viweGone(false);
+ redCardBinding.readCardTypeTV.setText("褰撳墠涓烘祴璇曞崱");
+ break;
+ case CardCommon.CONFIGURATION_CARD_TYPE:
+ viweGone(false);
+ redCardBinding.readCardTypeTV.setText("褰撳墠涓洪厤缃澶囨敞鍐屼俊鎭崱");
+ break;
+ case CardCommon.CONFIGURATION_POWER_CARD_TYPE:
+ viweGone(false);
+ redCardBinding.readCardTypeTV.setText("褰撳墠閰嶇疆姘存车鍔熺巼鍗�");
+ if (!data.isEmpty()) {
+ ConfigurationPowerCard powerCard = ConfigurationPowerCard.toBean(data.get(0));
+ redCardBinding.readCardDataTV.setText(powerCard.getPower());
+ } else {
+ TipUtil.show("鍗＄墖璇嗗埆閿欒,璇烽噸璇曪紒");
+ }
+ break;
+ case CardCommon.BLACK:
+ viweGone(false);
+ redCardBinding.readCardTypeTV.setText("褰撳墠涓洪粦鍗�");
+ BlackCard blackCard = BlackCard.getBean(data);
+ redCardBinding.readCardDataTV.setText("褰撳墠榛戝崱鐢ㄦ埛鍙蜂负锛�" + blackCard.getBlackCard());
+ break;
+ case CardCommon.REGION:
+ viweGone(false);
+ redCardBinding.readCardTypeTV.setText("褰撳墠涓哄尯鍩熻〃鍙峰崱");
+ if (!data.isEmpty()) {
+ 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());
+ } else {
+ TipUtil.show("鍗＄墖璇嗗埆閿欒,璇烽噸璇曪紒");
+ }
+
+ break;
+ case CardCommon.ELECTRIC_PRICE:
+ viweGone(false);
+ redCardBinding.readCardTypeTV.setText("褰撳墠涓虹數閲忓崟浠峰崱");
+ if (!data.isEmpty()) {
+ ElectricPriceCard electricPriceCard = ElectricPriceCard.getBean(data);
+ StringBuilder electricPriceBuilder = new StringBuilder();
+ electricPriceBuilder.append("鐢甸噺鍗曚环锛�").append(electricPriceCard.getElectricPrice());
+ electricPriceBuilder.append("鍏�");
+ redCardBinding.readCardDataTV.setText(electricPriceBuilder.toString());
+ } else {
+ TipUtil.show("鍗＄墖璇嗗埆閿欒,璇烽噸璇曪紒");
+ }
+ break;
+ default:
+ TipUtil.show(ReadCardAcitivy.this, "鍗＄墖鏃犳硶璇嗗埆");
+ break;
+ }
+ stopAnim();
+
}
--
Gitblit v1.8.0