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/NFCWreatActivity.java | 115 +++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 98 insertions(+), 17 deletions(-)
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NFCWreatActivity.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NFCWreatActivity.java
index 2ca36b4..554d672 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NFCWreatActivity.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NFCWreatActivity.java
@@ -17,7 +17,10 @@
import com.dayu.qihealonelibrary.card.ConfigurationPowerCard;
import com.dayu.qihealonelibrary.card.ConfigureDeviceRegistrationCrad;
import com.dayu.qihealonelibrary.card.DomainCard;
+import com.dayu.qihealonelibrary.card.ElectricPriceCard;
import com.dayu.qihealonelibrary.card.ManageCard;
+import com.dayu.qihealonelibrary.card.PassWordCard;
+import com.dayu.qihealonelibrary.card.RegionCard;
import com.dayu.qihealonelibrary.card.RegisteredCard;
import com.dayu.qihealonelibrary.card.TestCard;
import com.dayu.qihealonelibrary.card.UserCard;
@@ -41,8 +44,26 @@
*/
public class NFCWreatActivity extends BaseNfcActivity {
+ RegisteredCard registeredCard;
+ CleanUserCard cleanUserCard;
+ ManageCard manageCard;
+ DomainCard domainCard;
+ CleanCard cleanCard;
+ ConfigureDeviceRegistrationCrad configureDeviceRegistrationCrad;
+ TestCard testCard;
+ //鍖哄煙琛ㄥ彿鍗�
+ RegionCard regionCard;
+ ConfigurationPowerCard configurationPowerCard;
+ //瀵嗙爜鍗�
+ PassWordCard passWordCard;
+ //鐢ㄦ埛鐢甸噺鍗曚环鍗�
+ ElectricPriceCard electricPriceCard;
+ UserCardBean userCardBeanByManager;
+ boolean electricPriceFlag = false;
+ boolean passwordFlag = false;
boolean cleanFlag = false;
+ boolean regionFlag = false;
boolean userFlag = false;
boolean manageCardFlag = false;
boolean registeredFlag = false;
@@ -61,22 +82,13 @@
UserCard olduserCard;
String morny;
+ String rechageWater;//鍏呭�肩殑姘撮噺
String userName;
AdminDataBean adminData;
RechargeBean rechargeBean;
Intent intent;
- RegisteredCard registeredCard;
- CleanUserCard cleanUserCard;
- ManageCard manageCard;
- DomainCard domainCard;
-
- CleanCard cleanCard;
- ConfigureDeviceRegistrationCrad configureDeviceRegistrationCrad;
- TestCard testCard;
-
- ConfigurationPowerCard configurationPowerCard;
//鎵撳嵃
QHAloneApplication baseApp;
@@ -115,13 +127,25 @@
if (this.getIntent().hasExtra("userCard")) {
userCard = (UserCard) this.getIntent().getSerializableExtra("userCard");
}
+ if (this.getIntent().hasExtra("electricPriceCard")) {
+ electricPriceCard = (ElectricPriceCard) this.getIntent().getSerializableExtra("electricPriceCard");
+
+ binding.cardData.setText("鍒朵綔鐢ㄦ埛鐢甸噺鍗曚环鍗n褰撳墠鍗曚环锛�" + electricPriceCard.getElectricPrice().toString() + " 鍏�");
+ }
+ if (this.getIntent().hasExtra("passWordCard")) {
+ passWordCard = (PassWordCard) this.getIntent().getSerializableExtra("passWordCard");
+ binding.cardData.setText("鍒朵綔瀵嗙爜鍗�");
+ }
if (this.getIntent().hasExtra("cleanCard")) {
cleanCard = (CleanCard) this.getIntent().getSerializableExtra("cleanCard");
binding.cardData.setText("鍒朵綔娓呴浂鍗�");
}
if (this.getIntent().hasExtra("manageCard")) {
manageCard = (ManageCard) this.getIntent().getSerializableExtra("manageCard");
- binding.cardData.setText("鍒朵綔绠＄悊鍗�");
+ if (this.getIntent().hasExtra("userCardBean_manager")) {
+ userCardBeanByManager = (UserCardBean) this.getIntent().getSerializableExtra("userCardBean_manager");
+ }
+ binding.cardData.setText("鍒朵綔绠＄悊鍗�(璇峰皢绠＄悊鍗¤创鍦ㄨ澶囦笂)\n鐢ㄦ埛鍗″彿锛�" + manageCard.getUserCard());
}
if (this.getIntent().hasExtra("registeredCard")) {
registeredCard = (RegisteredCard) this.getIntent().getSerializableExtra("registeredCard");
@@ -151,6 +175,10 @@
configurationPowerCard = (ConfigurationPowerCard) this.getIntent().getSerializableExtra("configurationPowerCard");
binding.cardData.setText("鍒朵綔閰嶇疆姘存车鍔熺巼鍗�");
}
+ if (this.getIntent().hasExtra("regionCard")) {
+ regionCard = (RegionCard) this.getIntent().getSerializableExtra("regionCard");
+ binding.cardData.setText("鍒朵綔鍖哄煙琛ㄥ彿鍗�");
+ }
if (this.getIntent().hasExtra("morny")) {
// 鍏呭�奸�昏緫
isRecharge = true;
@@ -158,7 +186,8 @@
userName = this.getIntent().getStringExtra("userName");
cardNumber = this.getIntent().getStringExtra("cardNumber");
userCardBean = (UserCardBean) this.getIntent().getSerializableExtra("userCardBean");
- binding.cardData.setText("鍏呭�奸噾棰濓細" + morny + "鍏�");
+ rechageWater = this.getIntent().getStringExtra("rechageWater");
+ binding.cardData.setText("鍏呭�奸噾棰濓細" + morny + " 鍏僜n鍏呭�兼按閲忥細" + rechageWater + " 绔嬫柟绫筹紙鍚級");
}
try {
@@ -218,15 +247,29 @@
|| registeredCard != null || cleanUserCard != null
|| domainCard != null || testCard != null
|| configureDeviceRegistrationCrad != null
- || configurationPowerCard != null) {
+ || configurationPowerCard != null || regionCard != null || passWordCard != null || electricPriceCard != null) {
if (userCard != null && TextUtils.isEmpty(morny)) {
userFlag = WriteCardUtils.setUser(intent, userCard, this);
+ }
+ if (electricPriceCard != null) {
+ setElectricPriceCard(intent, electricPriceCard);
+ }
+ if (passWordCard != null) {
+ setPassWordCard(intent, passWordCard);
+ }
+ if (regionCard != null) {
+ setRegionCard(intent, regionCard);
}
if (cleanCard != null) {
setClean(intent, cleanCard);
}
if (manageCard != null) {
setmanageCard(intent, manageCard);
+ if (manageCardFlag && userCardBeanByManager != null) {
+ //淇敼鐢ㄦ埛琛ㄤ俊鎭�
+ userCardBeanByManager.setCardNumber(manageCard.getUserCard());
+ baseDao.userCardDao().update(userCardBeanByManager);
+ }
}
if (registeredCard != null) {
setRegisteredCard(intent, registeredCard);
@@ -246,7 +289,7 @@
if (configurationPowerCard != null) {
setConfigurationPower(intent, configurationPowerCard);
}
- if ((configPowerFlag || configDeviceRegiestFlag || testCardFlag || domainCrdFlag || userFlag || cleanFlag || manageCardFlag || registeredFlag || administrativeCardFlag || cleanUserCardFlag)) {
+ if (electricPriceFlag || passwordFlag || regionFlag || configPowerFlag || configDeviceRegiestFlag || testCardFlag || domainCrdFlag || userFlag || cleanFlag || manageCardFlag || registeredFlag || administrativeCardFlag || cleanUserCardFlag) {
try {
if (userFlag && userCardBean != null) {
//鐢ㄦ埛鍗�
@@ -283,7 +326,7 @@
super.onNewIntent(intent);
try {
this.intent = intent;
- startAnim();
+// startAnim();
Log.i("NFCWreatActivity", "isUser:" + isUser);
if (isUser) {
//鏂板崱娉ㄥ唽閫昏緫
@@ -352,8 +395,13 @@
String cardNumberThis = NfcReadHelper.getInstence(intent, this).getCardNumber();
//鍒ゆ柇鏄惁鍏呭�肩殑鏄竴涓崱
if (cardNumberThis.equalsIgnoreCase(cardNumber)) {
+ //浣欓
int balance = userCard.getBalance() + MornyUtil.changeY2F(morny);
userCard.setBalance(balance);
+ //鍓╀綑姘撮噺
+ int surplusWater = userCard.getSurplusWater() + MornyUtil.changeY2F(rechageWater);
+ userCard.setSurplusWater(surplusWater);
+
int rechageTims = userCard.getRechargeTimes() + 1;
if (rechageTims == 256) {
rechageTims = 0;
@@ -370,6 +418,8 @@
rechargeBean.setMorny(morny);
rechargeBean.setBalance(MornyUtil.changeF2Y(balance));
rechargeBean.setCardNumber(cardNumber);
+ rechargeBean.setSurplusWater(MornyUtil.changeF2Y(surplusWater));
+ rechargeBean.setRechargeWater(rechageWater);
try {
baseDao.rechargeDao().insert(rechargeBean);
} catch (Exception e) {
@@ -387,7 +437,7 @@
}
private void setmanageCard(Intent intent, final ManageCard manageCard) {
- manageCardFlag = NFCWriteHelper.getInstence(intent, this).writeData(manageCard.toZeroByte(baseDao), 1, 0);
+ manageCardFlag = NFCWriteHelper.getInstence(intent, this).writeData(manageCard.toByte(baseDao), 1, 0);
}
/**
@@ -396,10 +446,39 @@
* @param intent
* @param clearOrInitCard
*/
- private void setClean(Intent intent, final CleanCard clearOrInitCard) {
+ private void setClean(Intent intent, CleanCard clearOrInitCard) {
cleanFlag = NFCWriteHelper.getInstence(intent, this).writeData(clearOrInitCard.toByte(baseDao), 1, 0);
}
+ /**
+ * 淇濆瓨鍖哄煙琛ㄥ彿鍗�
+ *
+ * @param intent
+ * @param regionCard
+ */
+ private void setRegionCard(Intent intent, RegionCard regionCard) {
+ regionFlag = NFCWriteHelper.getInstence(intent, this).writeData(regionCard.toByte(), 1, 0);
+ }
+
+ /**
+ * 瀵嗙爜鍗�
+ *
+ * @param intent
+ * @param passWordCard
+ */
+ private void setPassWordCard(Intent intent, PassWordCard passWordCard) {
+ passwordFlag = NFCWriteHelper.getInstence(intent, this).writeData(passWordCard.toByte(baseDao), 1, 0);
+ }
+
+ /**
+ * 鐢ㄦ埛鐢甸噺鍗曚环
+ *
+ * @param intent
+ * @param electricPriceCard
+ */
+ private void setElectricPriceCard(Intent intent, ElectricPriceCard electricPriceCard) {
+ electricPriceFlag = NFCWriteHelper.getInstence(intent, this).writeData(electricPriceCard.toByte(baseDao), 1, 0);
+ }
/**
* 閲嶆柊娉ㄥ唽璁惧鍗�
@@ -470,10 +549,12 @@
detail.putExtra("userCard", userCard);
if (!TextUtils.isEmpty(morny)) {
detail.putExtra("morny", morny);
+ detail.putExtra("rechageWater", rechageWater);
}
if (!TextUtils.isEmpty(cardNumber)) {
detail.putExtra("cardNumber", cardNumber);
}
+
startActivity(detail);
if (NewCardActivity.newCardActivity != null) {
NewCardActivity.newCardActivity.finish();
--
Gitblit v1.8.0