From a44c47bc7f37245612635866adaddf5c98d41747 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期五, 16 八月 2024 11:03:49 +0800
Subject: [PATCH] 添加补打逻辑 联调修复bug
---
qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/ReadCardAcitivy.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/ReadCardAcitivy.java b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/ReadCardAcitivy.java
index 3e65674..fb8b5e7 100644
--- a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/ReadCardAcitivy.java
+++ b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/ReadCardAcitivy.java
@@ -115,11 +115,12 @@
break;
case CardCommon.MANAGE_CRAD://绠＄悊鍗�
ManageCard manageCard = ManageCard.getBean(data);
- viweGone(false);
- userCardStr = manageCard.getUserCard().toUpperCase();
- redCardBinding.readCardTypeTV.setText("褰撳墠涓虹鐞嗗崱" + "\n\n"
- + "鍘熷鍗″彿锛�" + userCardStr);
-
+ if (manageCard != null) {
+ viweGone(false);
+ userCardStr = manageCard.getUserCard().toUpperCase();
+ redCardBinding.readCardTypeTV.setText("褰撳墠涓虹鐞嗗崱" + "\n\n"
+ + "鍘熷鍗″彿锛�" + userCardStr);
+ }
break;
case CardCommon.CLEAN_CARD_TYPE:
viweGone(false);
@@ -230,12 +231,14 @@
Map<String, Object> data = new HashMap<>();
//ic鍗′俊鎭痠d
data.put("iccardNum", iccardCode);
- ApiManager.getInstance().requestPostLoading(this, "api/sjgg/iccard/peasant/getIccardInfoVoByCardCode", CardInfoResult.class, data, new SubscriberListener<BaseResponse<CardInfoResult>>() {
+ ApiManager.getInstance().requestPostLoading(this, "iccard/peasant/getIccardInfoVoByCardCode", CardInfoResult.class, data, new SubscriberListener<BaseResponse<CardInfoResult>>() {
@Override
public void onNext(BaseResponse<CardInfoResult> t) {
String state = "";
- if (t.isSuccess()) {
+ if (t.isSuccess() && t.getData() instanceof CardInfoResult) {
setUserData(t.getData());
+ } else {
+ TipUtil.show(ReadCardAcitivy.this, "浠庤幏鍙栧钩鍙板崱淇℃伅澶辫触锛�");
}
}
});
@@ -249,7 +252,7 @@
redCardBinding.redUserCode.setText(cardInfoResult.getIccardCode());
redCardBinding.redBlance.setText(MornyUtil.changeF2Y(userCard.getBalance()) + "鍏�");
redCardBinding.redElectric.setText(MornyUtil.changeF2Y(userCard.getSurplusElecticity()) + "搴�");
- redCardBinding.redTotalMorny.setText(MornyUtil.changeF2Y(userCard.getTotalMorny()) + "鍏�");
+ redCardBinding.redTotalMorny.setText(cardInfoResult.getTotalRechargeMoney() + "鍏�");
redCardBinding.redPhone.setText(cardInfoResult.getPeasantPhone());
redCardBinding.redCodeId.setText(cardInfoResult.getPeasantIdNumber());
if (cardInfoResult.getIccardStatus() == 0) {
--
Gitblit v1.8.0