From d08a5a6d062f1568aaeb14d2d72357826291ef97 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期六, 13 七月 2024 18:14:28 +0800
Subject: [PATCH] 添加齐河管理卡相关逻辑 修复bug
---
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeActivity.java | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeActivity.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeActivity.java
index 2d35414..bfce39b 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeActivity.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeActivity.java
@@ -17,6 +17,7 @@
import com.dayu.qihealonelibrary.card.UserCard;
import com.dayu.qihealonelibrary.databinding.ActivityRechargeQhaBinding;
import com.dayu.qihealonelibrary.dbBean.AdminDataBean;
+import com.dayu.qihealonelibrary.dbBean.ElectricPriceBean;
import com.dayu.qihealonelibrary.dbBean.UserCardBean;
import com.dayu.qihealonelibrary.tools.NfcReadHelper;
import com.dayu.qihealonelibrary.utils.CardCommon;
@@ -47,6 +48,7 @@
UserCardBean userCardBean;
int waterPrice;
String rechageWater;//鍏呭�肩殑姘撮噺
+ ElectricPriceBean priceBean;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -91,6 +93,9 @@
if (!data.isEmpty()) {
if (!TextUtils.isEmpty(cardNumber)) {
setUserData(cardType, cardNumber, data);
+ if(priceBean!=null){
+ binding.redRechargeElectric.setText("鐢甸噺鍗曚环锛�"+priceBean.getPrice()+"鍏�/搴�");
+ }
} else {
TipUtil.show(this, "璇诲彇鍗＄墖澶辫触锛岃閲嶆柊璐村崱");
}
@@ -107,10 +112,11 @@
String state = "";
if (cardType.equalsIgnoreCase(CardCommon.USER_CARD_TYPE_1)) {
state = "缁堢鍐欏崱";
+ binding.rechargeLL.setVisibility(View.VISIBLE);
binding.rechargeRegistBtn.setVisibility(View.VISIBLE);
binding.redStatu.setTextColor(R.color.black);
} else if (cardType.equalsIgnoreCase(CardCommon.USER_CARD_TYPE_2)) {
- state = "鍒峰崱寮�娉靛悗,褰撳墠鐘舵�佷笉鑳藉厖鍊�";
+ state = "鏈埛鍗″叧娉�,褰撳墠涓嶅彲鍏呭��";
binding.rechargeLL.setVisibility(View.GONE);
binding.rechargeRegistBtn.setVisibility(View.GONE);
binding.redStatu.setTextColor(com.dayu.baselibrary.R.color.red);
@@ -161,13 +167,13 @@
// binding.redRechargeNumber.setText("鏈崱鍏呭�兼鏁帮細" + userCard.getRechargeTimes() + " 娆�");
// binding.redTotalWater.setText("鎬荤敤姘撮噺锛�" + MornyUtil.changeF2Y(userCard.getTotalWater()) + " 鍚�");
// binding.redTotalPower.setText("鎬荤敤鐢甸噺锛�" + MornyUtil.changeF2Y(userCard.getTotalElectric()) + " 搴�");
-// binding.redRemainderBlance.setText(MornyUtil.changeF2Y(userCard.getBalance()) + " 鍏�");
+ binding.redRemainderBlance.setText(MornyUtil.changeF2Y(userCard.getBalance()) + " 鍏�");
binding.redRemainderWater.setText("鍓╀綑姘撮噺锛�" + MornyUtil.changeF2Y(userCard.getSurplusWater()) + " 鍚�");
- binding.redWaterPrice.setText("姣忕珛鏂圭背姘翠环鏍硷細" + MornyUtil.changeF2Y(adminData.getWaterPrice()) + " 鍏�");
+// binding.redWaterPrice.setText("姣忕珛鏂圭背姘翠环鏍硷細" + MornyUtil.changeF2Y(adminData.getWaterPrice()) + " 鍏�");
}
} else {
- TipUtil.show(this, "涓嶆槸鏈尯鍩熷崱");
+ TipUtil.show(this, "闈炴湰鍖哄煙鍗n涓嶈兘鍏呭�硷紒锛侊紒");
}
@@ -177,6 +183,7 @@
private void initView() {
try {
adminData = baseDao.adminDao().findFirst();
+ priceBean = baseDao.electricPriceDao().findFirst();
} catch (Exception e) {
e.printStackTrace();
CrashReport.postCatchedException(e);
@@ -191,7 +198,7 @@
intent.putExtra("cardNumber", cardNumber);
intent.putExtra("userCard", userCard);
intent.putExtra("userCardBean", userCardBean);
- intent.putExtra("rechageWater", rechageWater);
+// intent.putExtra("rechageWater", rechageWater);
startActivity(intent);
} else {
TipUtil.show(RechargeActivity.this, "璇疯緭鍏ュ厖鍊奸噾棰濓紙鍏冿級");
@@ -230,7 +237,7 @@
String morny = editText.getText().toString();
if (!TextUtils.isEmpty(morny)) {
rechageWater = MornyUtil.intDiv(MornyUtil.changeY2F(editText.getText().toString()), waterPrice);
- binding.redRechargeWater.setText("鍏呭�兼按閲忥細" + rechageWater + " 绔嬫柟绫�(鍚�)");
+// binding.redRechargeWater.setText("鍏呭�兼按閲忥細" + rechageWater + " 绔嬫柟绫�(鍚�)");
}
--
Gitblit v1.8.0