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/ReadCardAcitivy.java | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 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 964df1c..8d55630 100644
--- a/app/src/main/java/com/dayu/recharge/activity/ReadCardAcitivy.java
+++ b/app/src/main/java/com/dayu/recharge/activity/ReadCardAcitivy.java
@@ -3,7 +3,7 @@
import android.content.Intent;
import android.nfc.NfcAdapter;
import android.os.Bundle;
-import android.os.Message;
+import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;
@@ -30,7 +30,6 @@
import java.util.Arrays;
import java.util.Calendar;
import java.util.List;
-import java.util.Map;
/**
* Copyright (C), 2023,
@@ -73,7 +72,7 @@
redCardBinding.redRemainderBlance.setText("鍓╀綑閲戦锛�" + MornyUtil.changeF2Y(blance) + "鍏�");
redCardBinding.redStatu.setText("鍗＄姸鎬侊細" + statu);
if (userCard != null) {
- redCardBinding.redInitCode.setText( userCard.getInitPeasantCode());
+
Calendar calendar = userCard.getRechargeDate();
if (calendar != null) {
int year = calendar.get(Calendar.YEAR);
@@ -107,7 +106,7 @@
*/
public void readAllData(Intent intent) {
- NfcReadHelper.getInstence(intent)
+ NfcReadHelper.getInstence(intent, this)
.getOneSectorData(new NfcReadHelper.NFCCallListback() {
@Override
public void callBack(List<byte[]> data) {
@@ -120,7 +119,7 @@
case MyCommon.USER_CARD_TYPE_2:
case MyCommon.USER_CARD_TYPE_3:
userCard = UserCard.getBean(data);
- selectBalance(userCard.getInitPeasantCode());
+// selectBalance(userCard.getInitPeasantCode());
break;
case MyCommon.MANAGE_CRAD:
viweGone(false);
@@ -218,10 +217,14 @@
* @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));
@@ -250,14 +253,14 @@
String state = BcdUtil.bcdToStr(readData.getBodyBytes()[2]); //BCD鐮�00鍚敤 01绂佺敤 02闅跺睘淇℃伅涓嶇 03鏃犳鍗′俊鎭� 04鍏跺畠s
if ("00".equals(state)) {
userCard.setBalance(balance);
- userCard.setState("00");
+// userCard.setState("00");
- WriteCardUtils.setUser(intent, userCard);
+ WriteCardUtils.setUser(intent, userCard, ReadCardAcitivy.this);
stateText.append("鍚敤");
} else if ("01".equals(state)) {
userCard.setBalance(balance);
- userCard.setState("01");
- WriteCardUtils.setUser(intent, userCard);
+// userCard.setState("01");
+ WriteCardUtils.setUser(intent, userCard, ReadCardAcitivy.this);
stateText.append("绂佺敤");
} else if ("02".equals(state)) {
stateText.append("闅跺睘淇℃伅涓嶇");
@@ -284,7 +287,6 @@
TipUtil.show(ReadCardAcitivy.this, msg);
}
});
-
}
}
--
Gitblit v1.8.0