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/NFCWreatActivity.java | 106 +++++++++++++++++++++++++++--------------------------
1 files changed, 54 insertions(+), 52 deletions(-)
diff --git a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/NFCWreatActivity.java b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/NFCWreatActivity.java
index c6315bf..be76c16 100644
--- a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/NFCWreatActivity.java
+++ b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/NFCWreatActivity.java
@@ -10,6 +10,7 @@
import android.view.View;
import android.widget.Toast;
+import com.dayu.baselibrary.activity.BaseNfcActivity;
import com.dayu.baselibrary.tools.BcdUtil;
import com.dayu.baselibrary.utils.AidlUtil;
import com.dayu.baselibrary.utils.BaseCommon;
@@ -19,15 +20,15 @@
import com.dayu.baselibrary.utils.TipUtil;
import com.dayu.baselibrary.view.ConfirmDialog;
import com.dayu.baselibrary.view.TitleBar;
-import com.dayu.henanlibrary.card.CleanCard;
-import com.dayu.henanlibrary.card.CleanUserCard;
-import com.dayu.henanlibrary.card.ConfigurationPowerCard;
+import com.dayu.henanlibrary.card.CleanCardHN;
+import com.dayu.henanlibrary.card.CleanUserCardHN;
+import com.dayu.henanlibrary.card.ConfigurationPowerCardHN;
import com.dayu.henanlibrary.card.ConfigureDeviceRegistrationCrad;
import com.dayu.henanlibrary.card.DomainCard;
-import com.dayu.henanlibrary.card.ManageCard;
-import com.dayu.henanlibrary.card.RegisteredCard;
-import com.dayu.henanlibrary.card.TestCard;
-import com.dayu.henanlibrary.card.UserCard;
+import com.dayu.henanlibrary.card.ManageCardHN;
+import com.dayu.henanlibrary.card.RegisteredCardHN;
+import com.dayu.henanlibrary.card.TestCardHN;
+import com.dayu.henanlibrary.card.UserCardHN;
import com.dayu.henanlibrary.databinding.ActivityWriteTextHnBinding;
import com.dayu.henanlibrary.dbBean.AdminDataBean;
import com.dayu.henanlibrary.dbBean.ElectricPriceBean;
@@ -56,7 +57,7 @@
* Date: 2023-11-08 21:19
* Description: nfc鍐欏崱鐣岄潰
*/
-public class NFCWreatActivity extends BaseNfcActivity {
+public class NFCWreatActivity extends HNBaseNfcActivity {
public static String TAG = "NFCWreatActivity";
boolean cleanFlag = false;
@@ -88,16 +89,16 @@
Intent intent;
- RegisteredCard registeredCard;
- CleanUserCard cleanUserCard;
- ManageCard manageCard;
+ RegisteredCardHN registeredCard;
+ CleanUserCardHN cleanUserCard;
+ ManageCardHN manageCard;
DomainCard domainCard;
- CleanCard cleanCard;
+ CleanCardHN cleanCard;
ConfigureDeviceRegistrationCrad configureDeviceRegistrationCrad;
- TestCard testCard;
+ TestCardHN testCard;
- ConfigurationPowerCard configurationPowerCard;
+ ConfigurationPowerCardHN configurationPowerCard;
//鎵撳嵃
public static NFCWreatActivity nfcWreatActivity;
@@ -112,6 +113,30 @@
boolean rechargeIsOk = false;
ActivityWriteTextHnBinding binding;
ConfirmDialog confirmDialog;
+
+ @Override
+ public void onNfcBack(Intent intent) {
+ try {
+ this.intent = intent;
+ startAnim();
+ Log.i("NFCWreatActivity", "isUser:" + isUser);
+ if (isUser) {
+ checkHasUser();
+ } else if (isRecharge) {
+ if (rechargeIsOk) {
+ rechargeWrratCard();
+ } else {
+ Toast.makeText(this, "姝ｅ湪閫氫俊璇风◢鍚�", Toast.LENGTH_SHORT).show();
+ }
+
+ } else {
+ saveData();
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ CrashReport.postCatchedException(e);
+ }
+ }
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -182,18 +207,18 @@
private void getData() {
try {
if (this.getIntent().hasExtra("userCard")) {
- userCard = (UserCard) this.getIntent().getSerializableExtra("userCard");
+ userCard = (UserCardHN) this.getIntent().getSerializableExtra("userCard");
}
if (this.getIntent().hasExtra("cleanCard")) {
- cleanCard = (CleanCard) this.getIntent().getSerializableExtra("cleanCard");
+ cleanCard = (CleanCardHN) this.getIntent().getSerializableExtra("cleanCard");
binding.cardData.setText("鍒朵綔娓呴浂鍗�");
}
if (this.getIntent().hasExtra("manageCard")) {
- manageCard = (ManageCard) this.getIntent().getSerializableExtra("manageCard");
+ manageCard = (ManageCardHN) this.getIntent().getSerializableExtra("manageCard");
binding.cardData.setText("鍒朵綔绠＄悊鍗�");
}
if (this.getIntent().hasExtra("registeredCard")) {
- registeredCard = (RegisteredCard) this.getIntent().getSerializableExtra("registeredCard");
+ registeredCard = (RegisteredCardHN) this.getIntent().getSerializableExtra("registeredCard");
binding.cardData.setText("鍒朵綔閲嶆柊娉ㄥ唽璁惧鍗�");
}
if (this.getIntent().hasExtra("dbUserCard")) {
@@ -201,7 +226,7 @@
isUser = true;
}
if (this.getIntent().hasExtra("cleanUserCard")) {
- cleanUserCard = (CleanUserCard) this.getIntent().getSerializableExtra("cleanUserCard");
+ cleanUserCard = (CleanUserCardHN) this.getIntent().getSerializableExtra("cleanUserCard");
binding.cardData.setText("鍒朵綔鍒犻櫎鍏ㄩ儴鐢ㄦ埛鍗�");
}
if (this.getIntent().hasExtra("domainCard_xinxiang")) {
@@ -213,7 +238,7 @@
binding.cardData.setText("鍒朵綔璁剧疆楣块倯鍩熷悕鍗�");
}
if (this.getIntent().hasExtra("testCard")) {
- testCard = (TestCard) this.getIntent().getSerializableExtra("testCard");
+ testCard = (TestCardHN) this.getIntent().getSerializableExtra("testCard");
binding.cardData.setText("鍒朵綔娴嬭瘯鍗�");
}
if (this.getIntent().hasExtra("configureDeviceRegistrationCrad")) {
@@ -221,7 +246,7 @@
binding.cardData.setText("鍒朵綔閰嶇疆璁惧娉ㄥ唽淇℃伅鍗�");
}
if (this.getIntent().hasExtra("configurationPowerCard")) {
- configurationPowerCard = (ConfigurationPowerCard) this.getIntent().getSerializableExtra("configurationPowerCard");
+ configurationPowerCard = (ConfigurationPowerCardHN) this.getIntent().getSerializableExtra("configurationPowerCard");
binding.cardData.setText("鍒朵綔閰嶇疆姘存车鍔熺巼鍗�");
}
if (this.getIntent().hasExtra("morny")) {
@@ -339,30 +364,7 @@
}
}
- @Override
- public void onNewIntent(Intent intent) {
- super.onNewIntent(intent);
- try {
- this.intent = intent;
- startAnim();
- Log.i("NFCWreatActivity", "isUser:" + isUser);
- if (isUser) {
- checkHasUser();
- } else if (isRecharge) {
- if (rechargeIsOk) {
- rechargeWrratCard();
- } else {
- Toast.makeText(this, "姝ｅ湪閫氫俊璇风◢鍚�", Toast.LENGTH_SHORT).show();
- }
- } else {
- saveData();
- }
- } catch (Exception e) {
- e.printStackTrace();
- CrashReport.postCatchedException(e);
- }
- }
/**
@@ -502,7 +504,7 @@
//寰�鍗″唴鍐欏厖鍊煎悗鐨勬暟鎹�
private void rechargeWrratCard() {
- UserCard userCardold = NfcReadHelper.getInstence(intent, this).getUserCardData();
+ UserCardHN userCardold = NfcReadHelper.getInstence(intent, this).getUserCardData();
if (userCardold != null) {
//鍒ゆ柇鏄惁鍏呭�肩殑鏄竴涓崱
if (userCard.getInitPeasantCode().equals(userCardold.getInitPeasantCode()) || isAgainWrite) {
@@ -523,7 +525,7 @@
stopAnim();
}
- private void setmanageCard(Intent intent, final ManageCard manageCard) {
+ private void setmanageCard(Intent intent, final ManageCardHN manageCard) {
try {
manageCardFlag = NFCWriteHelper.getInstence(intent, this).writeData(manageCard.toZeroByte(baseDao), 1, 0);
} catch (Exception e) {
@@ -537,7 +539,7 @@
* @param intent
* @param clearOrInitCard
*/
- private void setClean(Intent intent, final CleanCard clearOrInitCard) {
+ private void setClean(Intent intent, final CleanCardHN clearOrInitCard) {
try {
cleanFlag = NFCWriteHelper.getInstence(intent, this).writeData(clearOrInitCard.toByte(baseDao), 1, 0);
} catch (Exception e) {
@@ -552,7 +554,7 @@
* @param intent
* @param registeredCard
*/
- private void setRegisteredCard(Intent intent, RegisteredCard registeredCard) {
+ private void setRegisteredCard(Intent intent, RegisteredCardHN registeredCard) {
try {
registeredFlag = NFCWriteHelper.getInstence(intent, this).writeData(registeredCard.toByte(baseDao), 1, 0);
} catch (Exception e) {
@@ -566,7 +568,7 @@
* @param intent
* @param cleanUserCard
*/
- private void setCleanUserCard(Intent intent, CleanUserCard cleanUserCard) {
+ private void setCleanUserCard(Intent intent, CleanUserCardHN cleanUserCard) {
try {
cleanUserCardFlag = NFCWriteHelper.getInstence(intent, this).writeData(cleanUserCard.toByte(baseDao), 1, 0);
} catch (Exception e) {
@@ -597,7 +599,7 @@
}
}
- private void setTestCard(Intent intent, TestCard testCard) {
+ private void setTestCard(Intent intent, TestCardHN testCard) {
testCardFlag = NFCWriteHelper.getInstence(intent, this).writeData(testCard.toByte(baseDao), 1, 0);
}
@@ -606,7 +608,7 @@
configDeviceRegiestFlag = NFCWriteHelper.getInstence(intent, this).writeData(configureDeviceRegistrationCrad.toByte(baseDao), 1, 0);
}
- private void setConfigurationPower(Intent intent, ConfigurationPowerCard configurationPowerCard) {
+ private void setConfigurationPower(Intent intent, ConfigurationPowerCardHN configurationPowerCard) {
try {
configPowerFlag = NFCWriteHelper.getInstence(intent, this).writeData(configurationPowerCard.toByte(baseDao), 1, 0);
} catch (Exception e) {
@@ -653,7 +655,7 @@
stateText = new StringBuffer();
String state = BcdUtil.bcdToStr(readData.getBodyBytes()[2]); //BCD鐮�00鍚敤 01绂佺敤 02闅跺睘淇℃伅涓嶇 03鏃犳鍗′俊鎭� 04鍏跺畠s
if (userCard == null) {
- userCard = new UserCard();
+ userCard = new UserCardHN();
userCard.setRechargeTimes(0);
ElectricPriceBean electricPriceBean = baseDao.electricPriceDao().findFirst();
if (electricPriceBean != null) {
--
Gitblit v1.8.0