From fe79cc8b05637b7dd3fc8f4c37a54e5f85da1efc Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期三, 27 三月 2024 17:35:27 +0800
Subject: [PATCH] 优化卡标识设置界面提示

---
 app/src/main/java/com/dayu/recharge/activity/ReadCardAcitivy.java |   31 +++++++++++++------------------
 1 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/com/dayu/recharge/activity/ReadCardAcitivy.java b/app/src/main/java/com/dayu/recharge/activity/ReadCardAcitivy.java
index 8fb153f..63c6b8d 100644
--- a/app/src/main/java/com/dayu/recharge/activity/ReadCardAcitivy.java
+++ b/app/src/main/java/com/dayu/recharge/activity/ReadCardAcitivy.java
@@ -3,6 +3,7 @@
 import android.content.Intent;
 import android.nfc.NfcAdapter;
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 
@@ -38,20 +39,6 @@
  */
 public class ReadCardAcitivy extends BaseNfcActivity {
 
-    private static final int USER_CRAD = 1;
-    private static final int MANAGE_CRAD = 2;
-    private static final int CLEAN_CARD = 3;
-    private static final int REGISTERED_CARD = 4;
-    private static final int CLEAN_ALL_USER = 5;
-    private static final int DOMAIN_CARD = 6;
-    private static final int TEST_CARD = 7;
-
-    private static final int CONFIGURATION_CARD = 8;
-
-    private static final int CONFIGURATION_POWER_CARD = 9;
-    private static final int PASS_WORD_CRAD = 10;
-
-
     volatile UserCard userCard;
     ActivityRedCardBinding redCardBinding;
 
@@ -70,6 +57,7 @@
         redCardBinding.redName.setText("鐢ㄦ埛濮撳悕锛�" + userName);
         redCardBinding.redRemainderBlance.setText("鍓╀綑閲戦锛�" + MornyUtil.changeF2Y(blance) + "鍏�");
         redCardBinding.redStatu.setText("鍗$姸鎬侊細" + statu);
+        redCardBinding.redAddressCode.setText("鍦板潃鐮侊細" + userCard.getAddressCode());
         if (userCard != null) {
             redCardBinding.redInitCode.setText(userCard.getInitPeasantCode());
             Calendar calendar = userCard.getRechargeDate();
@@ -216,14 +204,18 @@
      * @param initPeasantCode 鍐滄埛娉ㄥ唽缂栧彿
      */
     private void selectBalance(String initPeasantCode) {
+        String initCode = DeviceNumberUtils.getDeviceNumber();
+        if (TextUtils.isEmpty(initCode)) {
+            TipUtil.show("璁惧鏈敞鍐�");
+            return;
+        }
         BalanceSelecteRequestBean requestBean = new BalanceSelecteRequestBean();
         requestBean.setAFN("94");
         requestBean.setControl("01");
-        String initCode = DeviceNumberUtils.getDeviceNumber();
         requestBean.setInitCode(initCode);
         requestBean.setInitPeasantCode(initPeasantCode);
         requestBean.setXuLie(SocketUtil.getXuLie(this));
-        SocketNet.getInstance().sendTestMessage(requestBean.pack(), new SocketCallBack() {
+        SocketNet.getInstance().sendTestMessage(requestBean.pack(), "94", new SocketCallBack() {
             @Override
             public void onSocketResponse(SocketData readData) {
                 if (CRC8.isCRC8(readData.getOriginDataBytes())) {
@@ -279,10 +271,13 @@
 
             @Override
             public void onSocketError(int code, String msg) {
-                TipUtil.show(ReadCardAcitivy.this, msg);
+                runOnUiThread(() -> {
+                    stopAnim();
+                    TipUtil.show(ReadCardAcitivy.this, msg);
+                });
+
             }
         });
-
     }
 
 }

--
Gitblit v1.8.0