1.修复河南版本域名卡结构不同问题 2.修复齐河版本最终购水日期的bug

zuoxiao

2024-06-13 d1573513f0eada6a915c2163ce6c84451c8c1070

 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);