优化NFC模块架构，将一些方法抽调到父类中。

zuoxiao

2024-09-27 feb7add1979c830e0d940286242a7c489f2f8f96

 qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/NewCardActivityQHOline.java

File was renamed from qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/NewCardActivity.java
@@ -20,15 +20,12 @@

import com.dayu.qiheonlinelibrary.QHOnLineApplication;
import com.dayu.qiheonlinelibrary.bean.AddUserResult;
import com.dayu.qiheonlinelibrary.bean.PricePlanResult;
import com.dayu.qiheonlinelibrary.bean.UserListResult;
import com.dayu.qiheonlinelibrary.card.UserCard;
import com.dayu.qiheonlinelibrary.databinding.ActivityNewCardQhlBinding;
import com.dayu.qiheonlinelibrary.dbBean.AdminDataBean;
import com.dayu.qiheonlinelibrary.dbBean.UserCardBean;
import com.dayu.qiheonlinelibrary.net.ApiManager;
import com.dayu.qiheonlinelibrary.net.BaseResponse;
import com.dayu.qiheonlinelibrary.net.RSAUtile;
import com.dayu.qiheonlinelibrary.net.subscribers.SubscriberListener;
import com.hjq.permissions.OnPermissionCallback;
import com.hjq.permissions.Permission;
@@ -36,9 +33,7 @@
import com.kernal.passportreader.sdk.CardsCameraActivity;
import com.kernal.passportreader.sdk.utils.DefaultPicSavePath;

import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -55,13 +50,13 @@
 * Date: 2023-11-10 19:52
 * Description: 新卡注册
 */
public class NewCardActivity extends BaseActivity {
public class NewCardActivityQHOline extends QHOlineBaseActivity {

    public static final int SCAN_IDCARD_REQUEST = 1;

    ActivityNewCardQhlBinding newCardBinding;

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

@@ -99,17 +94,17 @@
                    && !TextUtils.isEmpty(phone) && !TextUtils.isEmpty(userID)
            ) {
                if (userName.length() <= 1) {
                    TipUtil.show(NewCardActivity.this, "请输入正确姓名");
                    TipUtil.show(NewCardActivityQHOline.this, "请输入正确姓名");
                } else if (phone.length() < 11 || !isValidPhoneNumber(phone)) {
                    TipUtil.show(NewCardActivity.this, "请输入正确手机号");
                    TipUtil.show(NewCardActivityQHOline.this, "请输入正确手机号");
                } else if (!Utils.check(userID)) {
                    TipUtil.show(NewCardActivity.this, "请输入正确身份证号");
                    TipUtil.show(NewCardActivityQHOline.this, "请输入正确身份证号");
                } else {
                    selectUser(userID, phone, userName, morny);
                }

            } else {
                TipUtil.show(NewCardActivity.this, "请输入完整内容");
                TipUtil.show(NewCardActivityQHOline.this, "请输入完整内容");
            }
        });
    }
@@ -361,7 +356,7 @@
        userCardBean.setDate(System.currentTimeMillis());
        userCardBean.setSerial(DeviceUtils.getSN());

        Intent intent = new Intent(NewCardActivity.this, NFCWreatActivity.class);
        Intent intent = new Intent(NewCardActivityQHOline.this, NFCWreatActivityQHOline.class);
        intent.putExtra("userCard", userCard);
        intent.putExtra("dbUserCard", userCardBean);
        startActivity(intent);