From a6fdb620fa48f6c78f066d8e01b69d2570d3baa7 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期三, 22 十一月 2023 17:43:45 +0800
Subject: [PATCH] 修改初始密码 首页添加联网状态 调整联网loding动画

---
 app/src/main/java/com/dayu/recharge/activity/RechargeActivity.java |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 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..e1ed963 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,7 +67,7 @@
             this.intent = intent;
             userCard = NfcReadHelper.getInstence(intent).getUserCardData();
             if (userCard != null) {
-
+                ProgressDialog.show(this);
                 selectBalance(userCard.getInitPeasantCode());
             } else {
                 TipUtil.show(RechargeActivity.this, "鍗$墖璇诲彇澶辫触");
@@ -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 {
@@ -187,9 +189,10 @@
                             userName = SocketUtil.fromHexString(SocketUtil.bytesToHexClean0(nameByte));
                             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());
@@ -198,11 +201,10 @@
                                 userCard.setBalance(balance);
                                 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 +212,8 @@
                             } else if ("04".equals(state)) {
                                 stateText.append("鍏跺畠");
                             }
+                            binding.rechargeLL.setVisibility(View.GONE);
+                            binding.rechargeRegistBtn.setVisibility(View.GONE);
                             TipUtil.show(RechargeActivity.this, stateText.toString());
                         } catch (Exception e) {
                             e.printStackTrace();
@@ -222,6 +226,7 @@
 
                 @Override
                 public void onSocketError(int code, String msg) {
+                    ProgressDialog.dismiss();
                     TipUtil.show(RechargeActivity.this, msg);
                 }
             });

--
Gitblit v1.8.0