From feb7add1979c830e0d940286242a7c489f2f8f96 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期五, 27 九月 2024 09:23:34 +0800
Subject: [PATCH] 优化NFC模块架构，将一些方法抽调到父类中。
---
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeActivityQHAlone.java | 20 +++++++++-----------
1 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeActivity.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeActivityQHAlone.java
similarity index 93%
rename from qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeActivity.java
rename to qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeActivityQHAlone.java
index bfce39b..e057c18 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeActivity.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeActivityQHAlone.java
@@ -21,8 +21,6 @@
import com.dayu.qihealonelibrary.dbBean.UserCardBean;
import com.dayu.qihealonelibrary.tools.NfcReadHelper;
import com.dayu.qihealonelibrary.utils.CardCommon;
-import com.dayu.qihealonelibrary.utils.DeviceNumberUtils;
-import com.dayu.qihealonelibrary.view.ProgressDialog;
import com.tencent.bugly.crashreport.CrashReport;
import java.util.Calendar;
@@ -35,12 +33,12 @@
* Date: 2023-11-5 09:52
* Description: 鍏呭�肩晫闈�
*/
-public class RechargeActivity extends BaseNfcActivity {
+public class RechargeActivityQHAlone extends QHAloneBaseNfcActivity {
Intent intent;
ActivityRechargeQhaBinding binding;
- public static RechargeActivity rechargeActivity;
+ public static RechargeActivityQHAlone rechargeActivity;
AdminDataBean adminData;
String userName;
@@ -66,7 +64,8 @@
}
}
- public void onNewIntent(Intent intent) {
+ @Override
+ public void onNfcBack(Intent intent) {
this.intent = intent;
try {
readAllData();
@@ -74,7 +73,6 @@
e.printStackTrace();
CrashReport.postCatchedException(e);
}
- super.onNewIntent(intent);
}
@@ -93,8 +91,8 @@
if (!data.isEmpty()) {
if (!TextUtils.isEmpty(cardNumber)) {
setUserData(cardType, cardNumber, data);
- if(priceBean!=null){
- binding.redRechargeElectric.setText("鐢甸噺鍗曚环锛�"+priceBean.getPrice()+"鍏�/搴�");
+ if (priceBean != null) {
+ binding.redRechargeElectric.setText("鐢甸噺鍗曚环锛�" + priceBean.getPrice() + "鍏�/搴�");
}
} else {
TipUtil.show(this, "璇诲彇鍗＄墖澶辫触锛岃閲嶆柊璐村崱");
@@ -130,7 +128,7 @@
}
- userCard = UserCard.getBean(data);
+ userCard = new UserCard().getBean(data);
List<UserCardBean> userCardBeans = baseDao.userCardDao().findUserName(cardNumber);
AdminDataBean adminDataBean = baseDao.adminDao().findFirst();
@@ -191,7 +189,7 @@
binding.rechargeRegistBtn.setOnClickListener(v -> {
String morny = binding.rechargeWater.getText().toString();
if (!TextUtils.isEmpty(morny)) {
- Intent intent = new Intent(RechargeActivity.this, NFCWreatActivity.class);
+ Intent intent = new Intent(RechargeActivityQHAlone.this, NFCWreatActivityQHAlone.class);
//褰撳墠閲戦鍗曚綅涓哄厓
intent.putExtra("morny", morny);
intent.putExtra("userName", userName);
@@ -201,7 +199,7 @@
// intent.putExtra("rechageWater", rechageWater);
startActivity(intent);
} else {
- TipUtil.show(RechargeActivity.this, "璇疯緭鍏ュ厖鍊奸噾棰濓紙鍏冿級");
+ TipUtil.show(RechargeActivityQHAlone.this, "璇疯緭鍏ュ厖鍊奸噾棰濓紙鍏冿級");
}
});
}
--
Gitblit v1.8.0