From 1c549ae7af5f8d7bdeecb4ad38ab181af4831821 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期四, 29 二月 2024 18:07:41 +0800
Subject: [PATCH] 添加齐河项目的卡结构
---
app/src/main/java/com/dayu/recharge/activity/RechargeActivity.java | 44 ++++++++++++++++++++------------------------
1 files changed, 20 insertions(+), 24 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 5895e71..8647a08 100644
--- a/app/src/main/java/com/dayu/recharge/activity/RechargeActivity.java
+++ b/app/src/main/java/com/dayu/recharge/activity/RechargeActivity.java
@@ -65,10 +65,10 @@
try {
this.intent = intent;
- userCard = NfcReadHelper.getInstence(intent).getUserCardData();
+ userCard = NfcReadHelper.getInstence(intent, this).getUserCardData();
if (userCard != null) {
ProgressDialog.show(this);
- selectBalance(userCard.getInitPeasantCode());
+// selectBalance(userCard.getInitPeasantCode());
} else {
TipUtil.show(RechargeActivity.this, "鍗＄墖璇诲彇澶辫触");
}
@@ -88,24 +88,21 @@
e.printStackTrace();
CrashReport.postCatchedException(e);
}
- binding.rechargeRegistBtn.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- String morny = binding.rechargeWater.getText().toString();
- if (!TextUtils.isEmpty(morny)) {
- 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);
- intent.putExtra("userName", userName);
- intent.putExtra("userCard", userCard);
- startActivity(intent);
- } else {
- TipUtil.show(RechargeActivity.this, "璇疯緭鍏ュ厖鍊奸噾棰濓紙鍏冿級");
+ binding.rechargeRegistBtn.setOnClickListener(v -> {
+ String morny = binding.rechargeWater.getText().toString();
+ if (!TextUtils.isEmpty(morny)) {
+ 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);
+ intent.putExtra("userName", userName);
+ intent.putExtra("userCard", userCard);
+ startActivity(intent);
+ } else {
+ TipUtil.show(RechargeActivity.this, "璇疯緭鍏ュ厖鍊奸噾棰濓紙鍏冿級");
}
});
}
@@ -136,7 +133,6 @@
if (!s.toString().substring(1, 2).equals(".")) {
editText.setText(s.subSequence(0, 1));
editText.setSelection(1);
- return;
}
}
}
@@ -176,7 +172,7 @@
public void onSocketResponse(SocketData readData) {
ProgressDialog.dismiss();
if (CRC8.isCRC8(readData.getOriginDataBytes())) {
- StringBuffer stateText = null;
+ StringBuffer stateText ;
try {
stateText = new StringBuffer();
String state = BcdUtil.bcdToStr(readData.getBodyBytes()[2]); //BCD鐮�00鍚敤 01绂佺敤 02闅跺睘淇℃伅涓嶇 03鏃犳鍗′俊鎭� 04鍏跺畠s
@@ -205,15 +201,15 @@
if ("00".equals(state)) {
binding.rechargeRegistBtn.setVisibility(View.VISIBLE);
stateText.append("鍚敤");
- userCard.setState("00");
+// userCard.setState("00");
userCard.setBalance(balance);
binding.redStatu.setText(stateText.toString());
return;
} else if ("01".equals(state)) {
stateText.append("璇ュ崱宸茶绂佺敤");
- userCard.setState("01");
+// userCard.setState("01");
userCard.setBalance(balance);
- userFlag = WriteCardUtils.setUser(intent, userCard);
+ userFlag = WriteCardUtils.setUser(intent, userCard, RechargeActivity.this);
} else if ("02".equals(state)) {
stateText.append("闅跺睘淇℃伅涓嶇");
} else if ("03".equals(state)) {
--
Gitblit v1.8.0