From 50f6dd3b617f769e7fc6094c2dd0752747541489 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期四, 23 十一月 2023 18:04:05 +0800
Subject: [PATCH] 修复导出充值记录bug 优化充值记录加载逻辑和速度 优化导出记录逻辑
---
app/src/main/java/com/dayu/recharge/activity/RechargeActivity.java | 38 ++++++++++++++++++++++++++------------
1 files changed, 26 insertions(+), 12 deletions(-)
diff --git a/app/src/main/java/com/dayu/recharge/activity/RechargeActivity.java b/app/src/main/java/com/dayu/recharge/activity/RechargeActivity.java
index a0b2a39..12031d2 100644
--- a/app/src/main/java/com/dayu/recharge/activity/RechargeActivity.java
+++ b/app/src/main/java/com/dayu/recharge/activity/RechargeActivity.java
@@ -23,6 +23,7 @@
import com.dayu.recharge.utils.MornyUtil;
import com.dayu.recharge.utils.SocketUtil;
import com.dayu.recharge.utils.TipUtil;
+import com.dayu.recharge.view.ProgressDialog;
import com.tencent.bugly.crashreport.CrashReport;
import java.util.Arrays;
@@ -66,13 +67,13 @@
this.intent = intent;
userCard = NfcReadHelper.getInstence(intent).getUserCardData();
if (userCard != null) {
-
+ ProgressDialog.show(this);
selectBalance(userCard.getInitPeasantCode());
} else {
TipUtil.show(RechargeActivity.this, "鍗＄墖璇诲彇澶辫触");
}
- readAllData(intent);
+// readAllData(intent);
} catch (Exception e) {
e.printStackTrace();
CrashReport.postCatchedException(e);
@@ -172,6 +173,7 @@
SocketNet.getInstance().sendTestMessage(requestBean.pack(), new SocketCallBack() {
@Override
public void onSocketResponse(SocketData readData) {
+ ProgressDialog.dismiss();
if (CRC8.isCRC8(readData.getOriginDataBytes())) {
StringBuffer stateText = null;
try {
@@ -185,24 +187,27 @@
//濮撳悕
byte[] nameByte = Arrays.copyOfRange(readData.getBodyBytes(), 7, 19);
userName = SocketUtil.fromHexString(SocketUtil.bytesToHexClean0(nameByte));
- if ("00".equals(state)) {
- stateText.append("鍚敤");
- binding.rechargeReadLL.setVisibility(View.GONE);
- binding.rechargeTextLL.setVisibility(View.VISIBLE);
+ binding.rechargeLL.setVisibility(View.VISIBLE);
+ binding.rechargeRegistBtn.setVisibility(View.VISIBLE);
+ binding.rechargeReadLL.setVisibility(View.GONE);
+ binding.rechargeTextLL.setVisibility(View.VISIBLE);
+ binding.userName.setText(userName);
+ binding.redRemainderBlance.setText(MornyUtil.changeF2Y(balance));
+ binding.redStatu.setText(stateText.toString());
+ binding.redInitCode.setText(initPeasantCode);
- binding.userName.setText(userName);
- binding.redRemainderBlance.setText(MornyUtil.changeF2Y(balance));
- binding.redStatu.setText(stateText.toString());
- binding.redInitCode.setText(initPeasantCode);
+ if ("00".equals(state)) {
+ binding.rechargeRegistBtn.setVisibility(View.VISIBLE);
+ stateText.append("鍚敤");
userCard.setState("00");
userCard.setBalance(balance);
+ binding.redStatu.setText(stateText.toString());
return;
} else if ("01".equals(state)) {
- stateText.append("绂佺敤");
+ stateText.append("璇ュ崱宸茶绂佺敤");
userCard.setState("01");
userCard.setBalance(balance);
userFlag = WriteCardUtils.setUser(intent, userCard);
- TipUtil.show("璇ュ崱宸茶绂佺敤");
} else if ("02".equals(state)) {
stateText.append("闅跺睘淇℃伅涓嶇");
} else if ("03".equals(state)) {
@@ -210,6 +215,10 @@
} else if ("04".equals(state)) {
stateText.append("鍏跺畠");
}
+ binding.redStatu.setText(stateText.toString());
+ binding.rechargeLL.setVisibility(View.GONE);
+ binding.rechargeRegistBtn.setVisibility(View.GONE);
+ binding.rechargeRegistBtn.setVisibility(View.GONE);
TipUtil.show(RechargeActivity.this, stateText.toString());
} catch (Exception e) {
e.printStackTrace();
@@ -222,6 +231,7 @@
@Override
public void onSocketError(int code, String msg) {
+ ProgressDialog.dismiss();
TipUtil.show(RechargeActivity.this, msg);
}
});
@@ -232,4 +242,8 @@
}
+ protected void onDestroy() {
+ super.onDestroy();
+ rechargeActivity = null;
+ }
}
--
Gitblit v1.8.0