From 5a8278faefaefaa90cbe438c1643c987da2f473b Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期五, 08 十二月 2023 11:27:08 +0800
Subject: [PATCH] Changes
---
app/src/main/java/com/dayu/recharge/activity/RechargeActivity.java | 56 ++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 38 insertions(+), 18 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..5895e71 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);
@@ -95,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);
@@ -172,37 +174,46 @@
SocketNet.getInstance().sendTestMessage(requestBean.pack(), new SocketCallBack() {
@Override
public void onSocketResponse(SocketData readData) {
+ ProgressDialog.dismiss();
if (CRC8.isCRC8(readData.getOriginDataBytes())) {
StringBuffer stateText = null;
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);
+ 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)) {
+ binding.rechargeRegistBtn.setVisibility(View.VISIBLE);
stateText.append("鍚敤");
- 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);
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 +221,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 +237,7 @@
@Override
public void onSocketError(int code, String msg) {
+ ProgressDialog.dismiss();
TipUtil.show(RechargeActivity.this, msg);
}
});
@@ -232,4 +248,8 @@
}
+ protected void onDestroy() {
+ super.onDestroy();
+ rechargeActivity = null;
+ }
}
--
Gitblit v1.8.0