From feb7add1979c830e0d940286242a7c489f2f8f96 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期五, 27 九月 2024 09:23:34 +0800
Subject: [PATCH] 优化NFC模块架构，将一些方法抽调到父类中。
---
henanlibrary/src/main/java/com/dayu/henanlibrary/activity/RechargeActivity.java | 32 ++++++++++++++++++++++----------
1 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/RechargeActivity.java b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/RechargeActivity.java
index 8cea9de..d68b79a 100644
--- a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/RechargeActivity.java
+++ b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/RechargeActivity.java
@@ -9,12 +9,15 @@
import android.view.View;
import android.widget.EditText;
+import com.dayu.baselibrary.activity.BaseNfcActivity;
import com.dayu.baselibrary.tools.BcdUtil;
import com.dayu.baselibrary.utils.CRC8;
-import com.dayu.henanlibrary.utils.DeviceNumberUtils;
import com.dayu.baselibrary.utils.MornyUtil;
import com.dayu.baselibrary.utils.TipUtil;
-import com.dayu.henanlibrary.databinding.ActivityRechargeBinding;
+import com.dayu.henanlibrary.card.UserCardHN;
+import com.dayu.henanlibrary.dao.AppDatabase;
+import com.dayu.henanlibrary.dao.HNBaseDaoSingleton;
+import com.dayu.henanlibrary.databinding.ActivityRechargeHnBinding;
import com.dayu.henanlibrary.dbBean.AdminDataBean;
import com.dayu.henanlibrary.net.SocketCallBack;
import com.dayu.henanlibrary.net.SocketData;
@@ -22,6 +25,8 @@
import com.dayu.henanlibrary.socketBean.BalanceSelecteRequestBean;
import com.dayu.henanlibrary.tools.NfcReadHelper;
import com.dayu.henanlibrary.tools.WriteCardUtils;
+import com.dayu.henanlibrary.utils.CardCommon;
+import com.dayu.henanlibrary.utils.DeviceNumberUtils;
import com.dayu.henanlibrary.utils.SocketUtil;
import com.dayu.henanlibrary.view.ProgressDialog;
import com.tencent.bugly.crashreport.CrashReport;
@@ -35,22 +40,23 @@
* Date: 2023-11-5 09:52
* Description: 鍏呭�肩晫闈�
*/
-public class RechargeActivity extends BaseNfcActivity {
+public class RechargeActivity extends HNBaseNfcActivity {
Intent intent;
boolean userFlag;
- ActivityRechargeBinding binding;
+ ActivityRechargeHnBinding binding;
public static RechargeActivity rechargeActivity;
AdminDataBean adminData;
String userName;
+
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
try {
- binding = ActivityRechargeBinding.inflate(LayoutInflater.from(this));
+ binding = ActivityRechargeHnBinding.inflate(LayoutInflater.from(this));
setContentView(binding.getRoot());
setPricePoint(binding.rechargeWater);
rechargeActivity = this;
@@ -61,14 +67,21 @@
}
}
- public void onNewIntent(Intent intent) {
-
+ @Override
+ public void onNfcBack(Intent intent) {
try {
this.intent = intent;
userCard = NfcReadHelper.getInstence(intent, this).getUserCardData();
if (userCard != null) {
- ProgressDialog.show(this);
- selectBalance(userCard.getInitPeasantCode());
+ if (userCard.getCardType().equalsIgnoreCase(CardCommon.USER_CARD_TYPE_1)
+ || userCard.getCardType().equalsIgnoreCase(CardCommon.USER_CARD_TYPE_2)
+ || userCard.getCardType().equalsIgnoreCase(CardCommon.USER_CARD_TYPE_3)) {
+ ProgressDialog.show(this);
+ selectBalance(userCard.getInitPeasantCode());
+ } else {
+ TipUtil.show(RechargeActivity.this, "褰撳墠鍗￠潪鐢ㄦ埛鍗�");
+ }
+
} else {
TipUtil.show(RechargeActivity.this, "鍗＄墖璇诲彇澶辫触");
}
@@ -78,7 +91,6 @@
e.printStackTrace();
CrashReport.postCatchedException(e);
}
- super.onNewIntent(intent);
}
private void initView() {
--
Gitblit v1.8.0