1.修复开卡列表显示异常bug 2.实现读卡界面相关功能 3.所有Activity去掉齐河后缀

zuoxiao

2024-05-07 15d9aae9a65c3385aaea29cb6d9810e4a8e8bd27

 qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NewCardActivity.java

File was renamed from qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NewCardActivityQHAlone.java
@@ -38,7 +38,7 @@
 * Date: 2023-11-10 19:52
 * Description: 新卡注册
 */
public class NewCardActivityQHAlone extends BaseActivityQHAlone {
public class NewCardActivity extends BaseActivity {

    public static final int SCAN_IDCARD_REQUEST = 1;
    UserCardBean userCardBean;
@@ -46,7 +46,7 @@
    ActivityNewCardQhaBinding newCardBinding;
    AdminDataBean adminData;

    static NewCardActivityQHAlone newCardActivity;
    static NewCardActivity newCardActivity;
    private int defValueMainId = 2;
    private int defValueSubId = 0;

@@ -84,11 +84,11 @@
                    && !TextUtils.isEmpty(phone) && !TextUtils.isEmpty(userID)
            ) {
                if (userName.length() <= 1 || !validateName(userName)) {
                    TipUtil.show(NewCardActivityQHAlone.this, "请输入正确姓名");
                    TipUtil.show(NewCardActivity.this, "请输入正确姓名");
                } else if (phone.length() < 11 || !isValidPhoneNumber(phone)) {
                    TipUtil.show(NewCardActivityQHAlone.this, "请输入正确手机号");
                    TipUtil.show(NewCardActivity.this, "请输入正确手机号");
                } else if (!Utils.check(userID)) {
                    TipUtil.show(NewCardActivityQHAlone.this, "请输入正确身份证号");
                    TipUtil.show(NewCardActivity.this, "请输入正确身份证号");
                } else {
                    userCardBean = new UserCardBean();
                    userCardBean.setUserName(userName);
@@ -96,10 +96,11 @@
                    userCardBean.setSerial(adminData.getSerial());
                    userCardBean.setPhone(phone);
                    userCardBean.setUserID(userID);
                    baseDao.userCardDao().insert(userCardBean);


                    UserCard userCard = new UserCard();
                    userCard.setArerNumber(Short.valueOf(adminData.getSerial()));
                    userCard.setDeviceNumberl(Short.valueOf(adminData.getAddressCode()));
                    userCard.setArerNumber(Integer.valueOf(adminData.getSerial()));
                    userCard.setDeviceNumberl(Integer.valueOf(adminData.getAddressCode()));
                    userCard.setRechargeTimes((byte) 0);
                    userCard.setTotalWater(0);
                    userCard.setTotalElectric(0);
@@ -107,14 +108,14 @@
                    userCard.setSurplusWater(0);
                    userCard.setRechargeDate(Calendar.getInstance());

                    Intent intent = new Intent(NewCardActivityQHAlone.this, NFCWreatActivityQHAlone.class);
                    Intent intent = new Intent(NewCardActivity.this, NFCWreatActivity.class);
                    intent.putExtra("userCard", userCard);
                    intent.putExtra("dbUserCard", userCardBean);
                    startActivity(intent);
                }

            } else {
                TipUtil.show(NewCardActivityQHAlone.this, "请输入完整内容");
                TipUtil.show(NewCardActivity.this, "请输入完整内容");
            }
        });
    }