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

zuoxiao

2024-06-13 d1573513f0eada6a915c2163ce6c84451c8c1070

 henanlibrary/src/main/java/com/dayu/henanlibrary/activity/NFCWreatActivity.java

@@ -204,9 +204,13 @@
                cleanUserCard = (CleanUserCard) this.getIntent().getSerializableExtra("cleanUserCard");
                binding.cardData.setText("制作删除全部用户卡");
            }
            if (this.getIntent().hasExtra("domainCard")) {
                domainCard = (DomainCard) this.getIntent().getSerializableExtra("domainCard");
                binding.cardData.setText("制作设置域名卡");
            if (this.getIntent().hasExtra("domainCard_xinxiang")) {
                domainCard = (DomainCard) this.getIntent().getSerializableExtra("domainCard_xinxiang");
                binding.cardData.setText("制作设置新乡域名卡");
            }
            if (this.getIntent().hasExtra("domainCard_luyi")) {
                domainCard = (DomainCard) this.getIntent().getSerializableExtra("domainCard_luyi");
                binding.cardData.setText("制作设置新乡域名卡");
            }
            if (this.getIntent().hasExtra("testCard")) {
                testCard = (TestCard) this.getIntent().getSerializableExtra("testCard");
@@ -558,19 +562,19 @@
     * 设置域名卡
     *
     * @param intent
     * @param domainCard
     * @param domainXinXiangCard
     */
    private void setDomainCard(Intent intent, DomainCard domainCard) {
    private void setDomainCard(Intent intent, DomainCard domainXinXiangCard) {
        try {
            domainCrdFlag = NFCWriteHelper.getInstence(intent, this).writeData(domainCard.getZeroByte(), 1, 0);
            domainCrdFlag = NFCWriteHelper.getInstence(intent, this).writeData(domainXinXiangCard.getZeroByte(), 1, 0);
            if (!domainCrdFlag) {
                return;
            }
            domainCrdFlag = NFCWriteHelper.getInstence(intent, this).writeData(domainCard.getOneByte(), 1, 1);
            domainCrdFlag = NFCWriteHelper.getInstence(intent, this).writeData(domainXinXiangCard.getOneByte(), 1, 1);
            if (!domainCrdFlag) {
                return;
            }
            domainCrdFlag = NFCWriteHelper.getInstence(intent, this).writeData(domainCard.getTwoByte(), 1, 2);
            domainCrdFlag = NFCWriteHelper.getInstence(intent, this).writeData(domainXinXiangCard.getTwoByte(), 1, 2);
        } catch (Exception e) {
            domainCrdFlag = false;
            throw new RuntimeException(e);