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

zuoxiao

2024-05-06 e79ced190337222c7475409363c8071c976c7de9

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

@@ -1,7 +1,5 @@
package com.dayu.henanlibrary.activity;

import static android.app.Activity.RESULT_OK;

import android.content.Intent;
import android.os.Bundle;
import android.text.InputFilter;
@@ -17,12 +15,11 @@
import com.dayu.baselibrary.tools.HexUtil;
import com.dayu.baselibrary.tools.Utils;
import com.dayu.baselibrary.utils.CRC8;
import com.dayu.henanlibrary.utils.DeviceNumberUtils;
import com.dayu.baselibrary.utils.TipUtil;
import com.dayu.baselibrary.utils.ToastUtil;
import com.dayu.henanlibrary.HeNanApplication;
import com.dayu.henanlibrary.card.UserCard;
import com.dayu.henanlibrary.databinding.ActivityNewCardBinding;
import com.dayu.henanlibrary.databinding.ActivityNewCardHnBinding;
import com.dayu.henanlibrary.dbBean.AdminDataBean;
import com.dayu.henanlibrary.dbBean.ElectricPriceBean;
import com.dayu.henanlibrary.dbBean.IpBean;
@@ -31,6 +28,7 @@
import com.dayu.henanlibrary.net.SocketData;
import com.dayu.henanlibrary.net.SocketNet;
import com.dayu.henanlibrary.socketBean.InitCardRequestBean;
import com.dayu.henanlibrary.utils.DeviceNumberUtils;
import com.dayu.henanlibrary.utils.SocketUtil;
import com.dayu.henanlibrary.view.ProgressDialog;
import com.hjq.permissions.OnPermissionCallback;
@@ -59,7 +57,7 @@
    public static final int SCAN_IDCARD_REQUEST = 1;
    UserCardBean userCardBean;

    ActivityNewCardBinding newCardBinding;
    ActivityNewCardHnBinding newCardBinding;
    AdminDataBean adminData;

    static NewCardActivity newCardActivity;
@@ -68,7 +66,7 @@
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
        newCardActivity = this;
        newCardBinding = ActivityNewCardBinding.inflate(LayoutInflater.from(this));
        newCardBinding = ActivityNewCardHnBinding.inflate(LayoutInflater.from(this));
        setContentView(newCardBinding.getRoot());
        setData();
        initView();
@@ -78,14 +76,6 @@
    private void initView() {
        newCardBinding.newCardName.setFilters(new InputFilter[]{new ChineseInputFilter()});
        newCardBinding.newCardId.setFilters(new InputFilter[]{new AlphaNumericXFilter(), new InputFilter.LengthFilter(18)});
        //身份证识别
        newCardBinding.newCardScanBtn.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {

                getPermission();
            }
        });

        newCardBinding.newCardRegistBtn.setOnClickListener(v -> {

@@ -221,41 +211,6 @@
        return false;
    }


    private void getPermission() {
        try {
            XXPermissions.with(this)
                    // 申请单个权限
//                    .permission(Permission.RECORD_AUDIO)
                    // 申请多个权限
                    .permission(Permission.CAMERA)
                    // 设置权限请求拦截器（局部设置）
                    //.interceptor(new PermissionInterceptor())
                    // 设置不触发错误检测机制（局部设置）
                    //.unchecked()
                    .request(new OnPermissionCallback() {

                        @Override
                        public void onGranted(@NonNull List<String> permissions, boolean allGranted) {
                            if (allGranted) {

                            }
                        }

                        @Override
                        public void onDenied(@NonNull List<String> permissions, boolean doNotAskAgain) {
                            if (doNotAskAgain) {
                                // 如果是被永久拒绝就跳转到应用权限系统设置页面
                            } else {
//                                toast("获取录音和日历权限失败");
                            }
                        }
                    });
        } catch (
                Throwable e) {
            e.printStackTrace();
        }
    }


    @Override