From c0538000f28bc68f11bfe118cb5dd7dfaed09911 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期日, 14 七月 2024 09:23:43 +0800
Subject: [PATCH] 修复管理卡为null的bug，修复写卡失败的后提示成功的bug
---
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NewCardActivity.java | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NewCardActivityQHAlone.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NewCardActivity.java
similarity index 92%
rename from qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NewCardActivityQHAlone.java
rename to qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NewCardActivity.java
index d0ecd29..9627cb6 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NewCardActivityQHAlone.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NewCardActivity.java
@@ -38,7 +38,7 @@
* Date: 2023-11-10 19:52
* Description: 鏂板崱娉ㄥ唽
*/
-public class NewCardActivityQHAlone extends BaseActivityQHAlone {
+public class NewCardActivity extends BaseActivity {
public static final int SCAN_IDCARD_REQUEST = 1;
UserCardBean userCardBean;
@@ -46,7 +46,7 @@
ActivityNewCardQhaBinding newCardBinding;
AdminDataBean adminData;
- static NewCardActivityQHAlone newCardActivity;
+ static NewCardActivity newCardActivity;
private int defValueMainId = 2;
private int defValueSubId = 0;
@@ -84,11 +84,11 @@
&& !TextUtils.isEmpty(phone) && !TextUtils.isEmpty(userID)
) {
if (userName.length() <= 1 || !validateName(userName)) {
- TipUtil.show(NewCardActivityQHAlone.this, "璇疯緭鍏ユ纭鍚�");
+ TipUtil.show(NewCardActivity.this, "璇疯緭鍏ユ纭鍚�");
} else if (phone.length() < 11 || !isValidPhoneNumber(phone)) {
- TipUtil.show(NewCardActivityQHAlone.this, "璇疯緭鍏ユ纭墜鏈哄彿");
+ TipUtil.show(NewCardActivity.this, "璇疯緭鍏ユ纭墜鏈哄彿");
} else if (!Utils.check(userID)) {
- TipUtil.show(NewCardActivityQHAlone.this, "璇疯緭鍏ユ纭韩浠借瘉鍙�");
+ TipUtil.show(NewCardActivity.this, "璇疯緭鍏ユ纭韩浠借瘉鍙�");
} else {
userCardBean = new UserCardBean();
userCardBean.setUserName(userName);
@@ -96,10 +96,11 @@
userCardBean.setSerial(adminData.getSerial());
userCardBean.setPhone(phone);
userCardBean.setUserID(userID);
- baseDao.userCardDao().insert(userCardBean);
+
+
UserCard userCard = new UserCard();
- userCard.setArerNumber(Short.valueOf(adminData.getSerial()));
- userCard.setDeviceNumberl(Short.valueOf(adminData.getAddressCode()));
+ userCard.setArerNumber(Integer.valueOf(adminData.getSerial()));
+ userCard.setDeviceNumberl(Integer.valueOf(adminData.getAddressCode()));
userCard.setRechargeTimes((byte) 0);
userCard.setTotalWater(0);
userCard.setTotalElectric(0);
@@ -107,14 +108,14 @@
userCard.setSurplusWater(0);
userCard.setRechargeDate(Calendar.getInstance());
- Intent intent = new Intent(NewCardActivityQHAlone.this, NFCWreatActivityQHAlone.class);
+ Intent intent = new Intent(NewCardActivity.this, NFCWreatActivity.class);
intent.putExtra("userCard", userCard);
intent.putExtra("dbUserCard", userCardBean);
startActivity(intent);
}
} else {
- TipUtil.show(NewCardActivityQHAlone.this, "璇疯緭鍏ュ畬鏁村唴瀹�");
+ TipUtil.show(NewCardActivity.this, "璇疯緭鍏ュ畬鏁村唴瀹�");
}
});
}
--
Gitblit v1.8.0