From e79ced190337222c7475409363c8071c976c7de9 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期一, 06 五月 2024 10:03:04 +0800
Subject: [PATCH] 1.修复两个工程因layout名字一样导致的bug
---
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/SysActivityQHAlone.java | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/SysActivity.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/SysActivityQHAlone.java
similarity index 83%
rename from qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/SysActivity.java
rename to qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/SysActivityQHAlone.java
index 49ad98a..e1a1a4b 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/SysActivity.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/SysActivityQHAlone.java
@@ -15,7 +15,7 @@
import com.dayu.qihealonelibrary.card.PassWordCard;
import com.dayu.qihealonelibrary.card.RegisteredCard;
import com.dayu.qihealonelibrary.card.TestCard;
-import com.dayu.qihealonelibrary.databinding.ActivityAdminBinding;
+import com.dayu.qihealonelibrary.databinding.ActivityAdminQhaBinding;
import com.dayu.qihealonelibrary.dbBean.DomainBean;
import com.dayu.qihealonelibrary.dbBean.PassWordCardBean;
import com.dayu.qihealonelibrary.dbBean.PowerBean;
@@ -27,14 +27,14 @@
* Date: 2023-11-5 09:52
* Description: 绠＄悊绯荤粺
*/
-public class SysActivity extends QHAloneBaseActivity {
+public class SysActivityQHAlone extends BaseActivityQHAlone {
- ActivityAdminBinding adminBinding;
+ ActivityAdminQhaBinding adminBinding;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- adminBinding = ActivityAdminBinding.inflate(LayoutInflater.from(this));
+ adminBinding = ActivityAdminQhaBinding.inflate(LayoutInflater.from(this));
setContentView(adminBinding.getRoot());
initView();
@@ -47,7 +47,7 @@
adminBinding.adminAdmin.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- Intent intent = new Intent(SysActivity.this, NFCWreatActivity.class);
+ Intent intent = new Intent(SysActivityQHAlone.this, NFCWreatActivityQHAlone.class);
ManageCard manageCard = new ManageCard();
intent.putExtra("manageCard", manageCard);
startActivity(intent);
@@ -57,7 +57,7 @@
adminBinding.adminCleanZero.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- Intent intent = new Intent(SysActivity.this, NFCWreatActivity.class);
+ Intent intent = new Intent(SysActivityQHAlone.this, NFCWreatActivityQHAlone.class);
CleanCard cleanCard = new CleanCard();
intent.putExtra("cleanCard", cleanCard);
startActivity(intent);
@@ -66,7 +66,7 @@
adminBinding.adminRegistered.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- Intent intent = new Intent(SysActivity.this, NFCWreatActivity.class);
+ Intent intent = new Intent(SysActivityQHAlone.this, NFCWreatActivityQHAlone.class);
RegisteredCard registeredCard = new RegisteredCard();
intent.putExtra("registeredCard", registeredCard);
startActivity(intent);
@@ -76,7 +76,7 @@
adminBinding.adminCleanUser.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- Intent intent = new Intent(SysActivity.this, NFCWreatActivity.class);
+ Intent intent = new Intent(SysActivityQHAlone.this, NFCWreatActivityQHAlone.class);
CleanUserCard cleanUserCard = new CleanUserCard();
intent.putExtra("cleanUserCard", cleanUserCard);
startActivity(intent);
@@ -86,7 +86,7 @@
adminBinding.adminDomain.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- Intent intent = new Intent(SysActivity.this, NFCWreatActivity.class);
+ Intent intent = new Intent(SysActivityQHAlone.this, NFCWreatActivityQHAlone.class);
DomainBean domainBean = baseDao.domainPortDao().findFirst();
DomainCard domainCard = new DomainCard();
if (domainBean != null) {
@@ -107,7 +107,7 @@
adminBinding.adminTest.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- Intent intent = new Intent(SysActivity.this, NFCWreatActivity.class);
+ Intent intent = new Intent(SysActivityQHAlone.this, NFCWreatActivityQHAlone.class);
TestCard testCard = new TestCard();
intent.putExtra("testCard", testCard);
startActivity(intent);
@@ -118,7 +118,7 @@
adminBinding.adminConfigDeviceRegistration.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- Intent intent = new Intent(SysActivity.this, NFCWreatActivity.class);
+ Intent intent = new Intent(SysActivityQHAlone.this, NFCWreatActivityQHAlone.class);
ConfigureDeviceRegistrationCrad configureDeviceRegistrationCrad = new ConfigureDeviceRegistrationCrad();
intent.putExtra("configureDeviceRegistrationCrad", configureDeviceRegistrationCrad);
startActivity(intent);
@@ -131,7 +131,7 @@
public void onClick(View v) {
PowerBean powerBean = baseDao.powerDao().findFirst();
if (powerBean != null) {
- Intent intent = new Intent(SysActivity.this, NFCWreatActivity.class);
+ Intent intent = new Intent(SysActivityQHAlone.this, NFCWreatActivityQHAlone.class);
ConfigurationPowerCard configurationPowerCard = new ConfigurationPowerCard();
configurationPowerCard.setPower(powerBean.getPower());
intent.putExtra("configurationPowerCard", configurationPowerCard);
@@ -149,7 +149,7 @@
public void onClick(View v) {
PassWordCardBean powerBean = baseDao.passWordCardDao().findFirst();
if (powerBean != null) {
- Intent intent = new Intent(SysActivity.this, NFCWreatActivity.class);
+ Intent intent = new Intent(SysActivityQHAlone.this, NFCWreatActivityQHAlone.class);
PassWordCard passWordCard = new PassWordCard();
passWordCard.setPassWord(powerBean.getPassWord());
intent.putExtra("passWordCard", passWordCard);
--
Gitblit v1.8.0