From 3673328730251736f9614793d9a75630c17b28f6 Mon Sep 17 00:00:00 2001 From: zuoxiao <470321431@qq.com> Date: 星期二, 13 八月 2024 09:10:27 +0800 Subject: [PATCH] 修改未关泵补卡逻辑 --- henanlibrary/src/main/java/com/dayu/henanlibrary/activity/SysActivity.java | 27 +++++++-------------------- 1 files changed, 7 insertions(+), 20 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 b65789c..91198cd 100644 --- a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/SysActivity.java +++ b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/SysActivity.java @@ -9,13 +9,12 @@ import com.dayu.henanlibrary.card.CleanUserCard; import com.dayu.henanlibrary.card.ConfigurationPowerCard; 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.databinding.ActivityAdminBinding; -import com.dayu.henanlibrary.dbBean.DomainBean; +import com.dayu.henanlibrary.databinding.ActivityAdminHnBinding; import com.dayu.henanlibrary.dbBean.PowerBean; +import com.dayu.henanlibrary.view.DomaindDialog; /** * Copyright (C), 2023, @@ -25,12 +24,12 @@ */ public class SysActivity extends HNBaseActivity { - ActivityAdminBinding adminBinding; + ActivityAdminHnBinding adminBinding; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - adminBinding = ActivityAdminBinding.inflate(LayoutInflater.from(this)); + adminBinding = ActivityAdminHnBinding.inflate(LayoutInflater.from(this)); setContentView(adminBinding.getRoot()); initView(); @@ -39,7 +38,7 @@ private void initView() { - //鍒朵綔绠$悊鍗� + //鍒朵綔绠$悊鍗� adminBinding.adminAdmin.setOnClickListener(v -> { Intent intent = new Intent(SysActivity.this, NFCWreatActivity.class); ManageCard manageCard = new ManageCard(); @@ -69,20 +68,8 @@ }); // 璁剧疆鍩熷悕鍗� 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); -- Gitblit v1.8.0