From 9c11fb9a45b0f1ff2a86eb139078e5361216434b Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期三, 29 十一月 2023 14:59:10 +0800
Subject: [PATCH] 读取模拟卡修改后注释(未完成)

---
 app/src/main/java/com/dayu/recharge/activity/RechargeActivity.java |   28 +++++++++++++++++++---------
 1 files changed, 19 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 fabb5c9..5895e71 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);
@@ -96,6 +96,7 @@
                     String initCode = DeviceNumberUtils.getDeviceNumber();
                     if (TextUtils.isEmpty(initCode)) {
                         TipUtil.show(RechargeActivity.this, "璁惧娉ㄥ唽鍙蜂负绌猴紝璇峰厛璁剧疆IP鍜岀鐞嗗憳鍦板潃");
+                        return;
                     }
                     Intent intent = new Intent(RechargeActivity.this, NFCWreatActivity.class);
                     intent.putExtra("morny", morny);
@@ -179,14 +180,19 @@
                         try {
                             stateText = new StringBuffer();
                             String state = BcdUtil.bcdToStr(readData.getBodyBytes()[2]);  //BCD鐮�00鍚敤 01绂佺敤 02闅跺睘淇℃伅涓嶇 03鏃犳鍗′俊鎭� 04鍏跺畠s
+                            int balance = 0;
 
-                            //鍙湁鍚姩鐘舵�佹墠鑳藉厖鍊�
-                            //閲戦
-                            byte[] blanceByte = Arrays.copyOfRange(readData.getBodyBytes(), 3, 7);
-                            int balance = SocketUtil.get16to10LowHigh(blanceByte);
-                            //濮撳悕
-                            byte[] nameByte = Arrays.copyOfRange(readData.getBodyBytes(), 7, 19);
-                            userName = SocketUtil.fromHexString(SocketUtil.bytesToHexClean0(nameByte));
+                            try {
+                                //鍙湁鍚姩鐘舵�佹墠鑳藉厖鍊�
+                                //閲戦
+                                byte[] blanceByte = Arrays.copyOfRange(readData.getBodyBytes(), 3, 7);
+                                balance = SocketUtil.get16to10LowHigh(blanceByte);
+                                //濮撳悕
+                                byte[] nameByte = Arrays.copyOfRange(readData.getBodyBytes(), 7, 19);
+                                userName = SocketUtil.fromHexString(SocketUtil.bytesToHexClean0(nameByte));
+                            } catch (Exception e) {
+                                e.printStackTrace();
+                            }
                             binding.rechargeLL.setVisibility(View.VISIBLE);
                             binding.rechargeRegistBtn.setVisibility(View.VISIBLE);
                             binding.rechargeReadLL.setVisibility(View.GONE);
@@ -195,7 +201,9 @@
                             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);
@@ -215,6 +223,7 @@
                             }
                             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) {
@@ -238,8 +247,9 @@
         }
 
     }
+
     protected void onDestroy() {
         super.onDestroy();
-        rechargeActivity=null;
+        rechargeActivity = null;
     }
 }

--
Gitblit v1.8.0