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

zuoxiao

2024-06-13 d1573513f0eada6a915c2163ce6c84451c8c1070

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

@@ -10,13 +10,12 @@
import com.dayu.baselibrary.tools.BcdUtil;
import com.dayu.baselibrary.tools.HexUtil;
import com.dayu.baselibrary.utils.CRC8;
import com.dayu.henanlibrary.utils.DeviceNumberUtils;
import com.dayu.baselibrary.utils.MornyUtil;
import com.dayu.baselibrary.utils.TipUtil;
import com.dayu.henanlibrary.card.ConfigurationPowerCard;
import com.dayu.henanlibrary.card.DomainCard;
import com.dayu.henanlibrary.card.UserCard;
import com.dayu.henanlibrary.databinding.ActivityRedCardBinding;
import com.dayu.henanlibrary.databinding.ActivityRedCardHnBinding;
import com.dayu.henanlibrary.net.SocketCallBack;
import com.dayu.henanlibrary.net.SocketData;
import com.dayu.henanlibrary.net.SocketNet;
@@ -24,6 +23,7 @@
import com.dayu.henanlibrary.tools.NfcReadHelper;
import com.dayu.henanlibrary.tools.WriteCardUtils;
import com.dayu.henanlibrary.utils.CardCommon;
import com.dayu.henanlibrary.utils.DeviceNumberUtils;
import com.dayu.henanlibrary.utils.SocketUtil;
import com.dayu.henanlibrary.view.ProgressDialog;

@@ -40,14 +40,14 @@
public class ReadCardAcitivy extends BaseNfcActivity {

    volatile UserCard userCard;
    ActivityRedCardBinding redCardBinding;
    ActivityRedCardHnBinding redCardBinding;

    Intent intent;

    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
        redCardBinding = ActivityRedCardBinding.inflate(LayoutInflater.from(this));
        redCardBinding = ActivityRedCardHnBinding.inflate(LayoutInflater.from(this));
        setContentView(redCardBinding.getRoot());
    }

@@ -131,9 +131,20 @@
                                    break;
                                case CardCommon.DOMAIN_CARD_TYPE:
                                    viweGone(false);
                                    redCardBinding.readCardTypeTV.setText("当前为设置域名卡");
                                    DomainCard domainCard = DomainCard.toBean(data);
                                    redCardBinding.readCardDataTV.setText("序号：" + domainCard.getDomainNumber() + "\n" + "域名：" + domainCard.getDomainName() + "\n" + "端口号：" + domainCard.getPort());
                                    DomainCard domainXinXiangCard = DomainCard.toBean(data);
                                    if(domainXinXiangCard.getType()==0){
                                        redCardBinding.readCardTypeTV.setText("当前为新乡域名卡");
                                    }else {
                                        redCardBinding.readCardTypeTV.setText("当前为鹿邑域名卡");
                                    }
                                    StringBuilder builder = new StringBuilder();
                                    if (domainXinXiangCard.getType() == 0) {
                                        builder.append("序号：" + domainXinXiangCard.getDomainNumber() + "\n");
                                    }
                                    builder.append("域名：" + domainXinXiangCard.getDomainName());
                                    builder.append("\n" + "端口号：" + domainXinXiangCard.getPort());

                                    redCardBinding.readCardDataTV.setText(builder.toString());
                                    stopAnim();
                                    break;
                                case CardCommon.TEST_CARD_TYPE: