From ddafb0f0951e68b4e56bfceef43cf78559f5161f Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期三, 26 六月 2024 14:52:27 +0800
Subject: [PATCH] 1.修复河南版本域名卡结构不同问题 2.修复齐河版本最终购水日期的bug
---
henanlibrary/src/main/java/com/dayu/henanlibrary/activity/NFCWreatActivity.java | 48 ++++++++++++++++++++++++++++++++++--------------
1 files changed, 34 insertions(+), 14 deletions(-)
diff --git a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/NFCWreatActivity.java b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/NFCWreatActivity.java
index f098f97..8fb1d67 100644
--- a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/NFCWreatActivity.java
+++ b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/NFCWreatActivity.java
@@ -204,9 +204,13 @@
cleanUserCard = (CleanUserCard) this.getIntent().getSerializableExtra("cleanUserCard");
binding.cardData.setText("鍒朵綔鍒犻櫎鍏ㄩ儴鐢ㄦ埛鍗�");
}
- if (this.getIntent().hasExtra("domainCard")) {
- domainCard = (DomainCard) this.getIntent().getSerializableExtra("domainCard");
- binding.cardData.setText("鍒朵綔璁剧疆鍩熷悕鍗�");
+ if (this.getIntent().hasExtra("domainCard_xinxiang")) {
+ domainCard = (DomainCard) this.getIntent().getSerializableExtra("domainCard_xinxiang");
+ binding.cardData.setText("鍒朵綔璁剧疆鏂颁埂鍩熷悕鍗�");
+ }
+ if (this.getIntent().hasExtra("domainCard_luyi")) {
+ domainCard = (DomainCard) this.getIntent().getSerializableExtra("domainCard_luyi");
+ binding.cardData.setText("鍒朵綔璁剧疆楣块倯鍩熷悕鍗�");
}
if (this.getIntent().hasExtra("testCard")) {
testCard = (TestCard) this.getIntent().getSerializableExtra("testCard");
@@ -520,7 +524,11 @@
}
private void setmanageCard(Intent intent, final ManageCard manageCard) {
- manageCardFlag = NFCWriteHelper.getInstence(intent, this).writeData(manageCard.toZeroByte(baseDao), 1, 0);
+ try {
+ manageCardFlag = NFCWriteHelper.getInstence(intent, this).writeData(manageCard.toZeroByte(baseDao), 1, 0);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
/**
@@ -530,7 +538,11 @@
* @param clearOrInitCard
*/
private void setClean(Intent intent, final CleanCard clearOrInitCard) {
- cleanFlag = NFCWriteHelper.getInstence(intent, this).writeData(clearOrInitCard.toByte(baseDao), 1, 0);
+ try {
+ cleanFlag = NFCWriteHelper.getInstence(intent, this).writeData(clearOrInitCard.toByte(baseDao), 1, 0);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
@@ -541,7 +553,11 @@
* @param registeredCard
*/
private void setRegisteredCard(Intent intent, RegisteredCard registeredCard) {
- registeredFlag = NFCWriteHelper.getInstence(intent, this).writeData(registeredCard.toByte(baseDao), 1, 0);
+ try {
+ registeredFlag = NFCWriteHelper.getInstence(intent, this).writeData(registeredCard.toByte(baseDao), 1, 0);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
/**
@@ -551,29 +567,33 @@
* @param cleanUserCard
*/
private void setCleanUserCard(Intent intent, CleanUserCard cleanUserCard) {
- cleanUserCardFlag = NFCWriteHelper.getInstence(intent, this).writeData(cleanUserCard.toByte(baseDao), 1, 0);
+ try {
+ cleanUserCardFlag = NFCWriteHelper.getInstence(intent, this).writeData(cleanUserCard.toByte(baseDao), 1, 0);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
/**
* 璁剧疆鍩熷悕鍗�
*
* @param intent
- * @param domainCard
+ * @param domainXinXiangCard
*/
- private void setDomainCard(Intent intent, DomainCard domainCard) {
+ private void setDomainCard(Intent intent, DomainCard domainXinXiangCard) {
try {
- domainCrdFlag = NFCWriteHelper.getInstence(intent, this).writeData(domainCard.getZeroByte(), 1, 0);
+ domainCrdFlag = NFCWriteHelper.getInstence(intent, this).writeData(domainXinXiangCard.getZeroByte(), 1, 0);
if (!domainCrdFlag) {
return;
}
- domainCrdFlag = NFCWriteHelper.getInstence(intent, this).writeData(domainCard.getOneByte(), 1, 1);
+ domainCrdFlag = NFCWriteHelper.getInstence(intent, this).writeData(domainXinXiangCard.getOneByte(), 1, 1);
if (!domainCrdFlag) {
return;
}
- domainCrdFlag = NFCWriteHelper.getInstence(intent, this).writeData(domainCard.getTwoByte(), 1, 2);
+ domainCrdFlag = NFCWriteHelper.getInstence(intent, this).writeData(domainXinXiangCard.getTwoByte(), 1, 2);
} catch (Exception e) {
domainCrdFlag = false;
- throw new RuntimeException(e);
+ e.printStackTrace();
}
}
@@ -591,7 +611,7 @@
configPowerFlag = NFCWriteHelper.getInstence(intent, this).writeData(configurationPowerCard.toByte(baseDao), 1, 0);
} catch (Exception e) {
configPowerFlag = false;
- throw new RuntimeException(e);
+ e.printStackTrace();
}
}
--
Gitblit v1.8.0