From c0538000f28bc68f11bfe118cb5dd7dfaed09911 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期日, 14 七月 2024 09:23:43 +0800
Subject: [PATCH] 修复管理卡为null的bug，修复写卡失败的后提示成功的bug
---
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/SysActivity.java | 169 +++++++++++++++++---------------------------------------
1 files changed, 52 insertions(+), 117 deletions(-)
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/SysActivity.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/SysActivity.java
index 49ad98a..9438eef 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/SysActivity.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/SysActivity.java
@@ -11,14 +11,19 @@
import com.dayu.qihealonelibrary.card.ConfigurationPowerCard;
import com.dayu.qihealonelibrary.card.ConfigureDeviceRegistrationCrad;
import com.dayu.qihealonelibrary.card.DomainCard;
+import com.dayu.qihealonelibrary.card.ElectricPriceCard;
import com.dayu.qihealonelibrary.card.ManageCard;
import com.dayu.qihealonelibrary.card.PassWordCard;
+import com.dayu.qihealonelibrary.card.RegionCard;
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.AdminDataBean;
import com.dayu.qihealonelibrary.dbBean.DomainBean;
+import com.dayu.qihealonelibrary.dbBean.ElectricPriceBean;
import com.dayu.qihealonelibrary.dbBean.PassWordCardBean;
import com.dayu.qihealonelibrary.dbBean.PowerBean;
+import com.dayu.qihealonelibrary.view.AdminCardDialog;
/**
@@ -27,14 +32,14 @@
* Date: 2023-11-5 09:52
* Description: 绠＄悊绯荤粺
*/
-public class SysActivity extends QHAloneBaseActivity {
+public class SysActivity extends BaseActivity {
- 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();
@@ -43,130 +48,60 @@
private void initView() {
+ //鍒朵綔绠＄悊鍗�
+ adminBinding.adminAdmin.setOnClickListener(v -> {
- adminBinding.adminAdmin.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- Intent intent = new Intent(SysActivity.this, NFCWreatActivity.class);
- ManageCard manageCard = new ManageCard();
- intent.putExtra("manageCard", manageCard);
- startActivity(intent);
- }
+ AdminCardDialog dialog=new AdminCardDialog(this);
+ dialog.show();
+
});
//鍒朵綔娓呴浂鍗�
- adminBinding.adminCleanZero.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
+ adminBinding.adminCleanZero.setOnClickListener(v -> {
+ Intent intent = new Intent(SysActivity.this, NFCWreatActivity.class);
+ CleanCard cleanCard = new CleanCard();
+ intent.putExtra("cleanCard", cleanCard);
+ startActivity(intent);
+ });
+ //鍒朵綔瀵嗙爜鍗�
+ adminBinding.adminPassWordCard.setOnClickListener(v -> {
+ PassWordCardBean powerBean = baseDao.passWordCardDao().findFirst();
+ if (powerBean != null) {
Intent intent = new Intent(SysActivity.this, NFCWreatActivity.class);
- CleanCard cleanCard = new CleanCard();
- intent.putExtra("cleanCard", cleanCard);
+ PassWordCard passWordCard = new PassWordCard();
+ passWordCard.setPassWord(powerBean.getPassWord());
+ intent.putExtra("passWordCard", passWordCard);
startActivity(intent);
- }
- });
- adminBinding.adminRegistered.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- Intent intent = new Intent(SysActivity.this, NFCWreatActivity.class);
- RegisteredCard registeredCard = new RegisteredCard();
- intent.putExtra("registeredCard", registeredCard);
- startActivity(intent);
- }
- });
- //鍒犻櫎鍏ㄩ儴鐢ㄦ埛
- adminBinding.adminCleanUser.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- Intent intent = new Intent(SysActivity.this, NFCWreatActivity.class);
- CleanUserCard cleanUserCard = new CleanUserCard();
- intent.putExtra("cleanUserCard", cleanUserCard);
- startActivity(intent);
- }
- });
-// 璁剧疆鍩熷悕鍗�
- adminBinding.adminDomain.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View 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("dayuyanjiuyuan.top");
- domainCard.setPort(8888);
- }
- intent.putExtra("domainCard", domainCard);
- startActivity(intent);
- }
- });
-
- //鍒朵綔娴嬭瘯鍗�
- adminBinding.adminTest.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- Intent intent = new Intent(SysActivity.this, NFCWreatActivity.class);
- TestCard testCard = new TestCard();
- intent.putExtra("testCard", testCard);
- startActivity(intent);
- }
- });
-
- //鍒朵綔閰嶇疆璁惧淇℃伅鍗�
- adminBinding.adminConfigDeviceRegistration.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- Intent intent = new Intent(SysActivity.this, NFCWreatActivity.class);
- ConfigureDeviceRegistrationCrad configureDeviceRegistrationCrad = new ConfigureDeviceRegistrationCrad();
- intent.putExtra("configureDeviceRegistrationCrad", configureDeviceRegistrationCrad);
- startActivity(intent);
- }
- });
-
- //鍒朵綔閰嶇疆姘存车鍔熺巼鍗�
- adminBinding.adminConfigPower.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- PowerBean powerBean = baseDao.powerDao().findFirst();
- if (powerBean != null) {
- Intent intent = new Intent(SysActivity.this, NFCWreatActivity.class);
- ConfigurationPowerCard configurationPowerCard = new ConfigurationPowerCard();
- configurationPowerCard.setPower(powerBean.getPower());
- intent.putExtra("configurationPowerCard", configurationPowerCard);
- startActivity(intent);
- } else {
- TipUtil.show("璇峰厛璁剧疆姘存车鍔熺巼");
- }
-
- }
- });
-
-
- adminBinding.adminPassWordCard.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- PassWordCardBean powerBean = baseDao.passWordCardDao().findFirst();
- if (powerBean != null) {
- Intent intent = new Intent(SysActivity.this, NFCWreatActivity.class);
- PassWordCard passWordCard = new PassWordCard();
- passWordCard.setPassWord(powerBean.getPassWord());
- intent.putExtra("passWordCard", passWordCard);
- startActivity(intent);
- } else {
- TipUtil.show("璇峰厛璁剧疆鍗″瘑鐮�");
- }
+ } else {
+ TipUtil.show(this, "璇峰厛鍦ㄥ弬鏁拌缃唴璁剧疆鍗″瘑鐮�");
}
});
//鍒朵綔鍖哄煙琛ㄥ彿鍗�
- adminBinding.adminRegionCard.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
+ adminBinding.adminRegionCard.setOnClickListener(v -> {
- }
+ Intent intent = new Intent(SysActivity.this, NFCWreatActivity.class);
+ RegionCard regionCard = new RegionCard();
+ AdminDataBean adminDataBean = baseDao.adminDao().findFirst();
+ regionCard.setRegion(Integer.valueOf(adminDataBean.getAddressCode()));
+ regionCard.setControllerCodel(Integer.valueOf(adminDataBean.getAddressCode()));
+ intent.putExtra("regionCard", regionCard);
+ startActivity(intent);
});
+ //鍒朵綔璁剧疆鐢ㄦ埛鐢甸噺鍗曚环鍗�
+ adminBinding.adminElectricCard.setOnClickListener(v -> {
+ Intent intent = new Intent(SysActivity.this, NFCWreatActivity.class);
+ ElectricPriceBean electricPriceBean = baseDao.electricPriceDao().findFirst();
+ if (electricPriceBean != null) {
+ ElectricPriceCard electricPriceCard = new ElectricPriceCard();
+ electricPriceCard.setElectricPrice(electricPriceBean.getPrice());
+ intent.putExtra("electricPriceCard", electricPriceCard);
+ startActivity(intent);
+ } else {
+ TipUtil.show(this, "璇峰厛鍦ㄥ弬鏁拌缃唴璁剧疆鐢甸噺鍗曚环");
+ }
+
+ });
+
}
--
Gitblit v1.8.0