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/SysActivity.java | 43 +++++++++++++++----------------------------
1 files changed, 15 insertions(+), 28 deletions(-)
diff --git a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/SysActivity.java b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/SysActivity.java
index c0d5b04..043d0ca 100644
--- a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/SysActivity.java
+++ b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/SysActivity.java
@@ -5,17 +5,16 @@
import android.view.LayoutInflater;
import com.dayu.baselibrary.utils.TipUtil;
-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.ManageCardHN;
+import com.dayu.henanlibrary.card.RegisteredCardHN;
+import com.dayu.henanlibrary.card.TestCardHN;
import com.dayu.henanlibrary.databinding.ActivityAdminHnBinding;
-import com.dayu.henanlibrary.dbBean.DomainBean;
import com.dayu.henanlibrary.dbBean.PowerBean;
+import com.dayu.henanlibrary.view.DomaindDialog;
/**
* Copyright (C), 2023,
@@ -42,7 +41,7 @@
//鍒朵綔绠＄悊鍗�
adminBinding.adminAdmin.setOnClickListener(v -> {
Intent intent = new Intent(SysActivity.this, NFCWreatActivity.class);
- ManageCard manageCard = new ManageCard();
+ ManageCardHN manageCard = new ManageCardHN();
intent.putExtra("manageCard", manageCard);
startActivity(intent);
@@ -50,43 +49,31 @@
//鍒朵綔娓呴浂鍗�
adminBinding.adminCleanZero.setOnClickListener(v -> {
Intent intent = new Intent(SysActivity.this, NFCWreatActivity.class);
- CleanCard cleanCard = new CleanCard();
+ CleanCardHN cleanCard = new CleanCardHN();
intent.putExtra("cleanCard", cleanCard);
startActivity(intent);
});
adminBinding.adminRegistered.setOnClickListener(v -> {
Intent intent = new Intent(SysActivity.this, NFCWreatActivity.class);
- RegisteredCard registeredCard = new RegisteredCard();
+ RegisteredCardHN registeredCard = new RegisteredCardHN();
intent.putExtra("registeredCard", registeredCard);
startActivity(intent);
});
//鍒犻櫎鍏ㄩ儴鐢ㄦ埛
adminBinding.adminCleanUser.setOnClickListener(v -> {
Intent intent = new Intent(SysActivity.this, NFCWreatActivity.class);
- CleanUserCard cleanUserCard = new CleanUserCard();
+ CleanUserCardHN cleanUserCard = new CleanUserCardHN();
intent.putExtra("cleanUserCard", cleanUserCard);
startActivity(intent);
});
// 璁剧疆鍩熷悕鍗�
adminBinding.adminDomain.setOnClickListener(v -> {
- Intent intent = new Intent(SysActivity.this, NFCWreatActivity.class);
- DomainBean domainBean = baseDao.domainPortDao().findFirst();
- DomainCard domainCard = new DomainCard();
- if (domainBean != null) {
- domainCard.setDomainNumber(domainBean.getDomainNumber());
- domainCard.setDomainName(domainBean.getDomain());
- domainCard.setPort(domainBean.getPort());
- } else {
- domainCard.setDomainNumber("1");
- domainCard.setDomainName("newreceive.hnsjgg.com");
- domainCard.setPort(9999);
- }
- intent.putExtra("domainCard", domainCard);
- startActivity(intent);
+ DomaindDialog domaindDialog=new DomaindDialog(SysActivity.this);
+ domaindDialog.show();
});
adminBinding.adminTest.setOnClickListener(v -> {
Intent intent = new Intent(SysActivity.this, NFCWreatActivity.class);
- TestCard testCard = new TestCard();
+ TestCardHN testCard = new TestCardHN();
intent.putExtra("testCard", testCard);
startActivity(intent);
});
@@ -102,7 +89,7 @@
PowerBean powerBean = baseDao.powerDao().findFirst();
if (powerBean != null) {
Intent intent = new Intent(SysActivity.this, NFCWreatActivity.class);
- ConfigurationPowerCard configurationPowerCard = new ConfigurationPowerCard();
+ ConfigurationPowerCardHN configurationPowerCard = new ConfigurationPowerCardHN();
configurationPowerCard.setPower(powerBean.getPower());
intent.putExtra("configurationPowerCard", configurationPowerCard);
startActivity(intent);
--
Gitblit v1.8.0