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/RechargeDetailActivity.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeDetailActivity.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeDetailActivity.java
index b505371..0f207ef 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeDetailActivity.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeDetailActivity.java
@@ -25,6 +25,7 @@
String statu;
String userName;
String morny;
+ String rechageWater;
String cardNumber;
@Override
@@ -40,6 +41,7 @@
userName = getIntent().getStringExtra("userName");
if (getIntent().hasExtra("morny")) {
morny = getIntent().getStringExtra("morny");
+ rechageWater = getIntent().getStringExtra("rechageWater");
}
if (getIntent().hasExtra("cardNumber")) {
cardNumber = getIntent().getStringExtra("cardNumber");
@@ -55,15 +57,18 @@
int balance = userCard.getBalance();
if (!TextUtils.isEmpty(morny)) {
binding.tip.setText("鍏呭�兼垚鍔燂紒");
- balance = userCard.getBalance() + MornyUtil.changeY2F(morny);
+ balance = userCard.getBalance();
binding.redRemainderMorny.setText("鍏呭�奸噾棰濓細" + morny + " 鍏�");
+ binding.redRechargeWater.setText("鍓╀綑閲戦锛�" + MornyUtil.changeF2Y(balance) + " 鍏�");
} else {
binding.tip.setText("寮�鍗℃垚鍔燂紒");
balance = userCard.getBalance();
binding.redRemainderMorny.setVisibility(View.GONE);
+ binding.redRechargeWater.setVisibility(View.GONE);
}
binding.redName.setText("鐢ㄦ埛濮撳悕锛�" + userName);
- binding.redRemainderBlance.setText("鍓╀綑閲戦锛�" + MornyUtil.changeF2Y(balance) + " 鍏�");
+// binding.redRemainderBlance.setText("鍓╀綑閲戦锛�" + MornyUtil.changeF2Y(balance) + " 鍏�");
+ binding.redSurplusWater.setText("鍓╀綑姘撮噺锛�" + MornyUtil.changeF2Y(userCard.getSurplusWater()) + " 鍚�");
binding.redStatu.setText("鍗＄姸鎬侊細" + statu);
if (userCard != null) {
binding.redInitCode.setText("褰撳墠鍗″彿锛�" + cardNumber);
@@ -73,12 +78,12 @@
int month = calendar.get(Calendar.MONTH); // 鏈堜唤浠�0寮�濮嬶紝鎵�浠ラ渶瑕佸姞1
int day = calendar.get(Calendar.DAY_OF_MONTH);
- binding.redRechargeDate.setText("鏈崱鏈�鍚庤喘姘存棩鏈燂細" + year + month + day );
+ binding.redRechargeDate.setText("鏈崱鏈�鍚庤喘姘存棩鏈燂細" + year + month + day);
} else {
binding.redRechargeDate.setText("鏈崱鏈�鍚庤喘姘存棩鏈燂細鏃�");
}
- binding.redRechargeNumber.setText("鏈崱鍏呭�兼鏁帮細" + userCard.getRechargeTimes() + "");
+// binding.redRechargeNumber.setText("鏈崱鍏呭�兼鏁帮細" + userCard.getRechargeTimes() + "");
}
}
}
--
Gitblit v1.8.0