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/NFCWreatActivity.java | 100 +++++++++++++++++++++++++-------------------------
1 files changed, 50 insertions(+), 50 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 7c5a5f4..bfd8072 100644
--- a/app/src/main/java/com/dayu/recharge/activity/NFCWreatActivity.java
+++ b/app/src/main/java/com/dayu/recharge/activity/NFCWreatActivity.java
@@ -168,7 +168,7 @@
userName = this.getIntent().getStringExtra("userName");
binding.cardData.setText("鍏呭�奸噾棰濓細" + morny + "鍏�");
// 鍏呭�奸�昏緫
- recharge(userCard.getInitPeasantCode(), userName, "鍚敤");
+// recharge(userCard.getInitPeasantCode(), userName, "鍚敤");
}
try {
@@ -373,26 +373,26 @@
String state = BcdUtil.bcdToStr(readData.getBodyBytes()[2]);
//00鍚敤01绂佺敤02闅跺睘淇℃伅涓嶇03鏃犳鍗′俊鎭�04鍏跺畠
if ("00".equalsIgnoreCase(state)) {
- rechargeIsOk = true;
- binding.cardData.setText("鍏呭�奸�氫俊瀹屾垚锛岃甯栧崱鍏呭��");
- rechargeBean = new RechargeBean();
- rechargeBean.setDate(System.currentTimeMillis());
- rechargeBean.setMorny(morny);
- rechargeBean.setUserName(name);
-
- rechargeBean.setSerial(adminData.getSerial());
- userCard.setRechargeDate(Calendar.getInstance());
- rechargeBean.setBalance(MornyUtil.changeF2Y(balance));
- rechargeBean.setInitPeasantCode(initPeasantCode);
- rechargeBean.setOrderID(orderId);
- try {
- baseDao.rechargeDao().insert(rechargeBean);
- } catch (Exception e) {
- e.printStackTrace();
- }
- userCard.setRechargeTimes(userCard.getRechargeTimes() + 1);
+// rechargeIsOk = true;
+// binding.cardData.setText("鍏呭�奸�氫俊瀹屾垚锛岃甯栧崱鍏呭��");
+// rechargeBean = new RechargeBean();
+// rechargeBean.setDate(System.currentTimeMillis());
+// rechargeBean.setMorny(morny);
+// rechargeBean.setUserName(name);
+//
+// rechargeBean.setSerial(adminData.getSerial());
+// userCard.setRechargeDate(Calendar.getInstance());
+// rechargeBean.setBalance(MornyUtil.changeF2Y(balance));
+// rechargeBean.setInitPeasantCode(initPeasantCode);
+// rechargeBean.setOrderID(orderId);
+// try {
+// baseDao.rechargeDao().insert(rechargeBean);
+// } catch (Exception e) {
+// e.printStackTrace();
+// }
+// userCard.setRechargeTimes(userCard.getRechargeTimes() + 1);
} else if ("01".equalsIgnoreCase(state)) {
- userCard.setState("01");
+// userCard.setState("01");
userFlag = WriteCardUtils.setUser(intent, userCard, NFCWreatActivity.this);
NFCWreatActivity.this.finish();
TipUtil.show("鍏呭�兼姤鏂囬敊璇�-绂佺敤");
@@ -432,19 +432,19 @@
UserCard userCardold = NfcReadHelper.getInstence(intent, this).getUserCardData();
if (userCardold != null) {
//鍒ゆ柇鏄惁鍏呭�肩殑鏄竴涓崱
- if (userCard.getInitPeasantCode().equals(userCardold.getInitPeasantCode())) {
- userCard.setState("00");
- userFlag = WriteCardUtils.setUser(intent, userCard, this);
- // 鎵撳嵃鐩稿叧
- if (userFlag) {
- setPrinterData(rechargeBean);
- startDetailActivity(userName, "鍚敤");
- } else {
- TipUtil.show(NFCWreatActivity.this, "鍐欏崱澶辫触锛岃閲嶆柊鍐嶈瘯");
- }
- } else {
- TipUtil.show(NFCWreatActivity.this, "璇诲彇鐨勫崱鍜屽厖鍊肩殑鍗′笉涓�鑷�");
- }
+// if (userCard.getInitPeasantCode().equals(userCardold.getInitPeasantCode())) {
+// userCard.setState("00");
+// userFlag = WriteCardUtils.setUser(intent, userCard, this);
+// // 鎵撳嵃鐩稿叧
+// if (userFlag) {
+// setPrinterData(rechargeBean);
+// startDetailActivity(userName, "鍚敤");
+// } else {
+// TipUtil.show(NFCWreatActivity.this, "鍐欏崱澶辫触锛岃閲嶆柊鍐嶈瘯");
+// }
+// } else {
+// TipUtil.show(NFCWreatActivity.this, "璇诲彇鐨勫崱鍜屽厖鍊肩殑鍗′笉涓�鑷�");
+// }
} else {
}
@@ -570,19 +570,19 @@
String state = BcdUtil.bcdToStr(readData.getBodyBytes()[2]); //BCD鐮�00鍚敤 01绂佺敤 02闅跺睘淇℃伅涓嶇 03鏃犳鍗′俊鎭� 04鍏跺畠s
if (userCard == null) {
userCard = new UserCard();
- userCard.setRechargeTimes(0);
- ElectricPriceBean electricPriceBean = baseDao.electricPriceDao().findFirst();
- if (electricPriceBean != null) {
- userCard.setElectricityPrice(electricPriceBean.getPrice());
- } else {
- //榛樿鏄�1鍏�
- userCard.setElectricityPrice(1.000f);
- }
- userCard.setSwipeNumber((short) 0);
- userCard.setState("00");
- userCard.setBalance(0);
- userCard.setAddressCode(adminData.getAddressCode());
- userCard.setInitPeasantCode(initPeasantCode);
+// userCard.setRechargeTimes(0);
+// ElectricPriceBean electricPriceBean = baseDao.electricPriceDao().findFirst();
+// if (electricPriceBean != null) {
+// userCard.setElectricityPrice(electricPriceBean.getPrice());
+// } else {
+// //榛樿鏄�1鍏�
+// userCard.setElectricityPrice(1.000f);
+// }
+// userCard.setSwipeNumber((short) 0);
+// userCard.setState("00");
+// userCard.setBalance(0);
+// userCard.setAddressCode(adminData.getAddressCode());
+// userCard.setInitPeasantCode(initPeasantCode);
}
//鍙湁鍚姩鐘舵�佹墠鑳藉厖鍊�
//閲戦
@@ -593,8 +593,8 @@
String name = SocketUtil.fromHexString(SocketUtil.bytesToHexClean0(nameByte));
if ("00".equals(state)) {
stateText.append("鍚敤");
- userCard.setBalance(balance);
- userCard.setState("00");
+// userCard.setBalance(balance);
+// userCard.setState("00");
//琛ュ崱閫昏緫
userFlag = WriteCardUtils.setUser(intent, userCard, NFCWreatActivity.this);
if (userFlag) {
@@ -608,8 +608,8 @@
return;
} else if ("01".equals(state)) {
stateText.append("绂佺敤");
- userCard.setState("01");
- userCard.setBalance(balance);
+// userCard.setState("01");
+// userCard.setBalance(balance);
userFlag = WriteCardUtils.setUser(intent, userCard, NFCWreatActivity.this);
startDetailActivity(name, stateText.toString());
--
Gitblit v1.8.0