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 |   27 ++++++++++++++++++---------
 1 files changed, 18 insertions(+), 9 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 e1ed963..12031d2 100644
--- a/app/src/main/java/com/dayu/recharge/activity/RechargeActivity.java
+++ b/app/src/main/java/com/dayu/recharge/activity/RechargeActivity.java
@@ -73,7 +73,7 @@
                 TipUtil.show(RechargeActivity.this, "鍗$墖璇诲彇澶辫触");
             }
 
-            readAllData(intent);
+//            readAllData(intent);
         } catch (Exception e) {
             e.printStackTrace();
             CrashReport.postCatchedException(e);
@@ -187,18 +187,21 @@
                             //濮撳悕
                             byte[] nameByte = Arrays.copyOfRange(readData.getBodyBytes(), 7, 19);
                             userName = SocketUtil.fromHexString(SocketUtil.bytesToHexClean0(nameByte));
+                            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);
+
                             if ("00".equals(state)) {
-                                stateText.append("鍚敤");
-                                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);
+                                stateText.append("鍚敤");
                                 userCard.setState("00");
                                 userCard.setBalance(balance);
+                                binding.redStatu.setText(stateText.toString());
                                 return;
                             } else if ("01".equals(state)) {
                                 stateText.append("璇ュ崱宸茶绂佺敤");
@@ -212,7 +215,9 @@
                             } 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) {
@@ -237,4 +242,8 @@
 
     }
 
+    protected void onDestroy() {
+        super.onDestroy();
+        rechargeActivity = null;
+    }
 }

--
Gitblit v1.8.0