From 15a3fc02c120ff630a9721a2f48a82f76675213f Mon Sep 17 00:00:00 2001
From: zuojincheng <lf_zuo@163.com>
Date: 星期一, 07 四月 2025 09:04:20 +0800
Subject: [PATCH] feat(generallibrary): 添加新卡开卡界面并更新扫描图标
---
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ReadCardAcitivy.java | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ReadCardAcitivy.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ReadCardAcitivy.java
index 1132551..258c817 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ReadCardAcitivy.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ReadCardAcitivy.java
@@ -36,7 +36,7 @@
* Date: 2023-11-10 19:52
* Description: 璇诲崱鐣岄潰
*/
-public class ReadCardAcitivy extends BaseNfcActivity {
+public class ReadCardAcitivy extends QHAloneBaseNfcActivity {
volatile UserCard userCard;
ActivityRedCardQhaBinding redCardBinding;
@@ -79,14 +79,14 @@
}
+
@Override
- public void onNewIntent(Intent intent) {
+ public void onNfcBack(Intent intent) {
this.intent = intent;
ProgressDialog.show(this);
if (NfcAdapter.ACTION_TAG_DISCOVERED.equals(intent.getAction())) {
readAllData(intent);
}
- super.onNewIntent(intent);
}
/**
@@ -121,7 +121,7 @@
if (!data.isEmpty()) {
if (!TextUtils.isEmpty(cardNumber)) {
- userCard = UserCard.getBean(data);
+ userCard = new UserCard().getBean(data);
List<UserCardBean> userCardBeans = baseDao.userCardDao().findUserName(cardNumber);
if (userCardBeans != null && !userCardBeans.isEmpty()) {
UserCardBean userName = userCardBeans.get(0);
@@ -144,7 +144,7 @@
userCardStr = HexUtil.spaceHex(userCardStr);
userCardStr = HexUtil.HighLowHex(userCardStr);
redCardBinding.readCardTypeTV.setText("褰撳墠涓虹鐞嗗崱" + "\n\n"
- + "鍘熷鍗″彿锛�" + userCard);
+ + "鍘熷鍗″彿锛�" + userCardStr);
if (manageCard.getType()==(byte) 1){
//褰�01鏃跺皢1鎵囧尯0鍧楀師绠＄悊鍗′俊鎭敼鎴愮敤鎴峰崱鍐呭
confirmDialog=new ConfirmDialog(this, "鏄惁纭琛ュ崱锛岃鍗″皢鎴愪负鏂扮敤鎴峰崱锛熷苟涓斾笉瑕佺Щ鍔ㄥ崱鐗�", new View.OnClickListener() {
@@ -167,8 +167,13 @@
managerToUserCard.setArerNumber(Integer.valueOf(adminData.getSerial()));
managerToUserCard.setDeviceNumberl(Integer.valueOf(adminData.getAddressCode()));
managerToUserCard.setTotalElectric(manageCard.getTotalElectric());
- nfcWriteHelper.writeData(managerToUserCard.getZeroBytes(),1,0);
- TipUtil.show(ReadCardAcitivy.this, "琛ュ崱鎴愬姛", () -> ReadCardAcitivy.this.finish());
+ if (nfcWriteHelper.writeData(managerToUserCard.getZeroBytes(),1,0)){
+ TipUtil.show(ReadCardAcitivy.this, "琛ュ崱鎴愬姛", () -> ReadCardAcitivy.this.finish());
+ }else {
+ TipUtil.show(ReadCardAcitivy.this, "琛ュ崱澶辫触锛岃閲嶆柊鍒峰崱", () -> ReadCardAcitivy.this.finish());
+ }
+
+
} catch (Exception e) {
e.printStackTrace();
}
--
Gitblit v1.8.0