From dc1ab1a73f979940ed7d631418f44ca309d077c0 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期四, 22 二月 2024 16:24:56 +0800
Subject: [PATCH] 读卡时检验设备是否注册
---
app/src/main/java/com/dayu/recharge/activity/NFCWreatActivity.java | 57 +++++++++++++++++++++++----------------------------------
1 files changed, 23 insertions(+), 34 deletions(-)
diff --git a/app/src/main/java/com/dayu/recharge/activity/NFCWreatActivity.java b/app/src/main/java/com/dayu/recharge/activity/NFCWreatActivity.java
index 311b862..7c5a5f4 100644
--- a/app/src/main/java/com/dayu/recharge/activity/NFCWreatActivity.java
+++ b/app/src/main/java/com/dayu/recharge/activity/NFCWreatActivity.java
@@ -2,15 +2,12 @@
import android.content.Intent;
import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
import android.text.TextUtils;
import android.util.Log;
import android.view.LayoutInflater;
import android.widget.Toast;
import com.dayu.recharge.MyApplication;
-
import com.dayu.recharge.R;
import com.dayu.recharge.card.CleanCard;
import com.dayu.recharge.card.CleanUserCard;
@@ -32,7 +29,6 @@
import com.dayu.recharge.socketBean.BalanceSelecteRequestBean;
import com.dayu.recharge.socketBean.RechargeRequestBean;
import com.dayu.recharge.tools.BcdUtil;
-import com.dayu.recharge.tools.HexUtil;
import com.dayu.recharge.tools.NFCWriteHelper;
import com.dayu.recharge.tools.NfcReadHelper;
import com.dayu.recharge.tools.WriteCardUtils;
@@ -192,7 +188,7 @@
*/
private void checkHasUser() {
- String cardType = NfcReadHelper.getInstence(intent).getCradType();
+ String cardType = NfcReadHelper.getInstence(intent, this).getCradType();
Log.i("NFCWreatActivity", "cardType=" + cardType);
if (cardType.equals(MyCommon.USER_CARD_TYPE_1) ||
cardType.equals(MyCommon.USER_CARD_TYPE_2) ||
@@ -221,10 +217,9 @@
|| configurationPowerCard != null) {
if (userCard != null && TextUtils.isEmpty(morny)) {
- userFlag = WriteCardUtils.setUser(intent, userCard);
+ userFlag = WriteCardUtils.setUser(intent, userCard, this);
}
if (cleanCard != null) {
- NFCWriteHelper.getInstence(intent).changePasword(1);
setClean(intent, cleanCard);
}
if (manageCard != null) {
@@ -254,19 +249,9 @@
//鐢ㄦ埛鍗�
startDetailActivity(userCardBean.getUserName(), "鍚敤");
} else if (!TextUtils.isEmpty(morny)) {
- TipUtil.show(NFCWreatActivity.this, "鍏呭�兼垚鍔�", new TipUtil.TipListener() {
- @Override
- public void onCancle() {
- NFCWreatActivity.this.finish();
- }
- });
+ TipUtil.show(NFCWreatActivity.this, "鍏呭�兼垚鍔�", () -> NFCWreatActivity.this.finish());
} else {
- TipUtil.show(NFCWreatActivity.this, "鍐欏崱鎴愬姛", new TipUtil.TipListener() {
- @Override
- public void onCancle() {
- NFCWreatActivity.this.finish();
- }
- });
+ TipUtil.show(NFCWreatActivity.this, "鍐欏崱鎴愬姛", () -> NFCWreatActivity.this.finish());
}
} catch (Exception e) {
@@ -408,7 +393,7 @@
userCard.setRechargeTimes(userCard.getRechargeTimes() + 1);
} else if ("01".equalsIgnoreCase(state)) {
userCard.setState("01");
- userFlag = WriteCardUtils.setUser(intent, userCard);
+ userFlag = WriteCardUtils.setUser(intent, userCard, NFCWreatActivity.this);
NFCWreatActivity.this.finish();
TipUtil.show("鍏呭�兼姤鏂囬敊璇�-绂佺敤");
} else if ("02".equalsIgnoreCase(state)) {
@@ -444,12 +429,12 @@
//寰�鍗″唴鍐欏厖鍊煎悗鐨勬暟鎹�
private void rechargeWrratCard() {
- UserCard userCardold = NfcReadHelper.getInstence(intent).getUserCardData();
+ UserCard userCardold = NfcReadHelper.getInstence(intent, this).getUserCardData();
if (userCardold != null) {
//鍒ゆ柇鏄惁鍏呭�肩殑鏄竴涓崱
if (userCard.getInitPeasantCode().equals(userCardold.getInitPeasantCode())) {
userCard.setState("00");
- userFlag = WriteCardUtils.setUser(intent, userCard);
+ userFlag = WriteCardUtils.setUser(intent, userCard, this);
// 鎵撳嵃鐩稿叧
if (userFlag) {
setPrinterData(rechargeBean);
@@ -466,7 +451,7 @@
}
private void setmanageCard(Intent intent, final ManageCard manageCard) {
- manageCardFlag = NFCWriteHelper.getInstence(intent).writeData(manageCard.toZeroByte(), 1, 0);
+ manageCardFlag = NFCWriteHelper.getInstence(intent, this).writeData(manageCard.toZeroByte(), 1, 0);
}
/**
@@ -476,7 +461,7 @@
* @param clearOrInitCard
*/
private void setClean(Intent intent, final CleanCard clearOrInitCard) {
- cleanFlag = NFCWriteHelper.getInstence(intent).writeData(clearOrInitCard.toByte(), 1, 0);
+ cleanFlag = NFCWriteHelper.getInstence(intent, this).writeData(clearOrInitCard.toByte(), 1, 0);
}
@@ -487,7 +472,7 @@
* @param registeredCard
*/
private void setRegisteredCard(Intent intent, RegisteredCard registeredCard) {
- registeredFlag = NFCWriteHelper.getInstence(intent).writeData(registeredCard.toByte(), 1, 0);
+ registeredFlag = NFCWriteHelper.getInstence(intent, this).writeData(registeredCard.toByte(), 1, 0);
}
/**
@@ -497,7 +482,7 @@
* @param cleanUserCard
*/
private void setCleanUserCard(Intent intent, CleanUserCard cleanUserCard) {
- cleanUserCardFlag = NFCWriteHelper.getInstence(intent).writeData(cleanUserCard.toByte(), 1, 0);
+ cleanUserCardFlag = NFCWriteHelper.getInstence(intent, this).writeData(cleanUserCard.toByte(), 1, 0);
}
/**
@@ -508,15 +493,15 @@
*/
private void setDomainCard(Intent intent, DomainCard domainCard) {
try {
- domainCrdFlag = NFCWriteHelper.getInstence(intent).writeData(domainCard.getZeroByte(), 1, 0);
+ domainCrdFlag = NFCWriteHelper.getInstence(intent, this).writeData(domainCard.getZeroByte(), 1, 0);
if (!domainCrdFlag) {
return;
}
- domainCrdFlag = NFCWriteHelper.getInstence(intent).writeData(domainCard.getOneByte(), 1, 1);
+ domainCrdFlag = NFCWriteHelper.getInstence(intent, this).writeData(domainCard.getOneByte(), 1, 1);
if (!domainCrdFlag) {
return;
}
- domainCrdFlag = NFCWriteHelper.getInstence(intent).writeData(domainCard.getTwoByte(), 1, 2);
+ domainCrdFlag = NFCWriteHelper.getInstence(intent, this).writeData(domainCard.getTwoByte(), 1, 2);
} catch (Exception e) {
domainCrdFlag = false;
throw new RuntimeException(e);
@@ -524,17 +509,17 @@
}
private void setTestCard(Intent intent, TestCard testCard) {
- testCardFlag = NFCWriteHelper.getInstence(intent).writeData(testCard.toByte(), 1, 0);
+ testCardFlag = NFCWriteHelper.getInstence(intent, this).writeData(testCard.toByte(), 1, 0);
}
private void setConfigDeviceRegiest(Intent intent, ConfigureDeviceRegistrationCrad configureDeviceRegistrationCrad) {
- configDeviceRegiestFlag = NFCWriteHelper.getInstence(intent).writeData(configureDeviceRegistrationCrad.toByte(), 1, 0);
+ configDeviceRegiestFlag = NFCWriteHelper.getInstence(intent, this).writeData(configureDeviceRegistrationCrad.toByte(), 1, 0);
}
private void setConfigurationPower(Intent intent, ConfigurationPowerCard configurationPowerCard) {
try {
- configPowerFlag = NFCWriteHelper.getInstence(intent).writeData(configurationPowerCard.toByte(), 1, 0);
+ configPowerFlag = NFCWriteHelper.getInstence(intent, this).writeData(configurationPowerCard.toByte(), 1, 0);
} catch (Exception e) {
configPowerFlag = false;
throw new RuntimeException(e);
@@ -611,7 +596,7 @@
userCard.setBalance(balance);
userCard.setState("00");
//琛ュ崱閫昏緫
- userFlag = WriteCardUtils.setUser(intent, userCard);
+ userFlag = WriteCardUtils.setUser(intent, userCard, NFCWreatActivity.this);
if (userFlag) {
TipUtil.show(NFCWreatActivity.this, "琛ュ崱鎴愬姛", new TipUtil.TipListener() {
@Override
@@ -625,7 +610,7 @@
stateText.append("绂佺敤");
userCard.setState("01");
userCard.setBalance(balance);
- userFlag = WriteCardUtils.setUser(intent, userCard);
+ userFlag = WriteCardUtils.setUser(intent, userCard, NFCWreatActivity.this);
startDetailActivity(name, stateText.toString());
} else if ("02".equals(state)) {
@@ -661,4 +646,8 @@
}
+ protected void onDestroy() {
+ super.onDestroy();
+ nfcWreatActivity = null;
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0