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

zuoxiao

2024-05-06 e79ced190337222c7475409363c8071c976c7de9

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

File was renamed from qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/IdentifyingActivity.java
@@ -13,10 +13,9 @@
import com.dayu.qihealonelibrary.card.ManageCard;
import com.dayu.qihealonelibrary.card.RegisteredCard;
import com.dayu.qihealonelibrary.card.TestCard;
import com.dayu.qihealonelibrary.databinding.ActivityIdentyfyingBinding;
import com.dayu.qihealonelibrary.databinding.ActivityIdentyfyingQhaBinding;
import com.dayu.qihealonelibrary.dbBean.CardData;
import com.dayu.qihealonelibrary.dbBean.IdentityBean;

import com.dayu.qihealonelibrary.utils.CardCommon;

import java.util.Arrays;
@@ -28,9 +27,9 @@
 * Time: 10:21
 * 备注：卡标识设置
 */
public class IdentifyingActivity extends QHAloneBaseActivity {
public class IdentifyingActivityQHAlone extends BaseActivityQHAlone {

    ActivityIdentyfyingBinding binding;
    ActivityIdentyfyingQhaBinding binding;


    String[] nianfen = {"管理卡", "清零卡", "重新注册设备卡", "删除全部用户卡", "测试卡", "设备信息卡", "水泵功率卡"};
@@ -44,12 +43,12 @@
    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
        binding = ActivityIdentyfyingBinding.inflate(LayoutInflater.from(this));
        binding = ActivityIdentyfyingQhaBinding.inflate(LayoutInflater.from(this));
        setContentView(binding.getRoot());
        binding.chooseCardType.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                ChooseView.getIntence(IdentifyingActivity.this, Arrays.asList(nianfen.clone()), new ChooseView.ChooseCallBack() {
                ChooseView.getIntence(IdentifyingActivityQHAlone.this, Arrays.asList(nianfen.clone()), new ChooseView.ChooseCallBack() {
                    @Override
                    public void onOptionsSelect(int options1) {
                        chooseData(nianfen[options1]);