1.修复两个工程因layout名字一样导致的bug

zuoxiao

2024-05-06 e79ced190337222c7475409363c8071c976c7de9

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

@@ -10,20 +10,20 @@
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;
import com.dayu.henanlibrary.socketBean.BalanceSelecteRequestBean;
import com.dayu.henanlibrary.tools.NfcReadHelper;
import com.dayu.henanlibrary.tools.WriteCardUtils;
import com.dayu.henanlibrary.utils.MyCommon;
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());
    }

@@ -102,51 +102,51 @@
                            byte cardType = data.get(0)[0];
                            String cardTypeStr = HexUtil.byteToHex(cardType);
                            switch (cardTypeStr) {
                                case MyCommon.USER_CARD_TYPE_1:
                                case MyCommon.USER_CARD_TYPE_2:
                                case MyCommon.USER_CARD_TYPE_3:
                                case CardCommon.USER_CARD_TYPE_1:
                                case CardCommon.USER_CARD_TYPE_2:
                                case CardCommon.USER_CARD_TYPE_3:
                                    userCard = UserCard.getBean(data);
                                    selectBalance(userCard.getInitPeasantCode());
                                    break;
                                case MyCommon.MANAGE_CRAD:
                                case CardCommon.MANAGE_CRAD:
                                    viweGone(false);
                                    redCardBinding.readCardTypeTV.setText("当前为管理卡");
                                    stopAnim();
                                    break;
                                case MyCommon.CLEAN_CARD_TYPE:
                                case CardCommon.CLEAN_CARD_TYPE:
                                    viweGone(false);
                                    redCardBinding.readCardTypeTV.setText("当前为清零卡");
                                    stopAnim();
                                    break;
                                case MyCommon.REGISTERED_CARD_TYPE:
                                case CardCommon.REGISTERED_CARD_TYPE:
                                    viweGone(false);
                                    redCardBinding.readCardTypeTV.setText("当前为重新注册设备卡");
                                    stopAnim();

                                    break;
                                case MyCommon.CLEAN_ALL_USER_CARD_TYPE:
                                case CardCommon.CLEAN_ALL_USER_CARD_TYPE:
                                    viweGone(false);
                                    redCardBinding.readCardTypeTV.setText("当前为删除全部用户卡");
                                    stopAnim();
                                    break;
                                case MyCommon.DOMAIN_CARD_TYPE:
                                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());
                                    stopAnim();
                                    break;
                                case MyCommon.TEST_CARD_TYPE:
                                case CardCommon.TEST_CARD_TYPE:
                                    viweGone(false);
                                    redCardBinding.readCardTypeTV.setText("当前为测试卡");
                                    stopAnim();
                                    break;
                                case MyCommon.CONFIGURATION_CARD_TYPE:
                                case CardCommon.CONFIGURATION_CARD_TYPE:
                                    viweGone(false);
                                    redCardBinding.readCardTypeTV.setText("当前为配置设备注册信息卡");
                                    stopAnim();
                                    break;
                                case MyCommon.CONFIGURATION_POWER_CARD_TYPE:
                                case CardCommon.CONFIGURATION_POWER_CARD_TYPE:
                                    viweGone(false);
                                    redCardBinding.readCardTypeTV.setText("当前配置水泵功率卡");
                                    ConfigurationPowerCard powerCard = ConfigurationPowerCard.toBean(data.get(0));
@@ -169,7 +169,7 @@
                    @Override
                    public void error(int code) {
                        switch (code) {
                            case MyCommon.ERROR_MOVE:
                            case CardCommon.ERROR_MOVE:
                                stopAnim();
                                TipUtil.show("连接中断，请重新贴合卡片");
                                break;