From d1573513f0eada6a915c2163ce6c84451c8c1070 Mon Sep 17 00:00:00 2001 From: zuoxiao <470321431@qq.com> Date: 星期四, 13 六月 2024 15:06:05 +0800 Subject: [PATCH] 1.修复河南版本域名卡结构不同问题 2.修复齐河版本最终购水日期的bug --- henanlibrary/src/main/java/com/dayu/henanlibrary/activity/SysActivity.java | 19 +++---------------- 1 files changed, 3 insertions(+), 16 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..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.ActivityAdminHnBinding; -import com.dayu.henanlibrary.dbBean.DomainBean; import com.dayu.henanlibrary.dbBean.PowerBean; +import com.dayu.henanlibrary.view.DomaindDialog; /** * Copyright (C), 2023, @@ -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