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

zuoxiao

2024-05-06 e79ced190337222c7475409363c8071c976c7de9

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

File was renamed from qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/MyActivity.java
@@ -18,13 +18,10 @@
import com.dayu.baselibrary.view.PassWordDialog;
import com.dayu.baselibrary.view.datepicker.CustomDatePicker;
import com.dayu.baselibrary.view.datepicker.DateFormatUtils;
import com.dayu.qihealonelibrary.databinding.ActivityMyBinding;
import com.dayu.qihealonelibrary.databinding.ActivityMyQhaBinding;
import com.dayu.qihealonelibrary.dbBean.AdminDataBean;

import com.dayu.qihealonelibrary.utils.DeviceNumberUtils;

import com.dayu.qihealonelibrary.utils.ExcelUtil;


import java.io.File;
import java.util.ArrayList;
@@ -37,7 +34,7 @@
 * Date: 2023-11-10 19:52
 * Description: 个人中心
 */
public class MyActivity extends QHAloneBaseActivity {
public class MyActivityQHAlone extends BaseActivityQHAlone {


    private CustomDatePicker beginDatePicker;
@@ -46,12 +43,12 @@
    long endTime;

    boolean isRechargeList = false;
    ActivityMyBinding myBinding;
    ActivityMyQhaBinding myBinding;

    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
        myBinding = ActivityMyBinding.inflate(LayoutInflater.from(this));
        myBinding = ActivityMyQhaBinding.inflate(LayoutInflater.from(this));
        setContentView(myBinding.getRoot());
        getVersion(this);
        setData();
@@ -63,13 +60,13 @@
        myBinding.cardReplacement.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                startActivity(new Intent(MyActivity.this, ReplacementActivity.class));
                startActivity(new Intent(MyActivityQHAlone.this, ReplacementActivityQHAlone.class));
            }
        });
        myBinding.myAdmin.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                PassWordDialog passWordDialog = new PassWordDialog(MyActivity.this, new Intent(MyActivity.this, AdminSetupActivity.class));
                PassWordDialog passWordDialog = new PassWordDialog(MyActivityQHAlone.this, new Intent(MyActivityQHAlone.this, AdminSetupActivityQHAlone.class));
                passWordDialog.show();
//                startActivity(new Intent(MyActivity.this, AdminSetupActivity.class));
            }
@@ -77,19 +74,19 @@
        myBinding.myPsw.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                startActivity(new Intent(MyActivity.this, PassWordActivity.class));
                startActivity(new Intent(MyActivityQHAlone.this, PassWordActivityQHAlone.class));
            }
        });
        myBinding.myRechargeListLl.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                startActivity(new Intent(MyActivity.this, RechargeListActivity.class));
                startActivity(new Intent(MyActivityQHAlone.this, RechargeListActivityQHAlone.class));
            }
        });
        myBinding.myNewCardListLl.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                startActivity(new Intent(MyActivity.this, NewCardListActivity.class));
                startActivity(new Intent(MyActivityQHAlone.this, NewCardListActivityQHAlone.class));
            }
        });
        myBinding.myNewCardOut.setOnClickListener(new View.OnClickListener() {
@@ -116,13 +113,13 @@
        public boolean handleMessage(@NonNull Message msg) {
            switch (msg.what) {
                case 1:
                    TipUtil.show(MyActivity.this, "导出成功!");
                    TipUtil.show(MyActivityQHAlone.this, "导出成功!");
                    break;
                case 3:
                    TipUtil.show(MyActivity.this, "记录为空!");
                    TipUtil.show(MyActivityQHAlone.this, "记录为空!");
                    break;
                default:
                    TipUtil.show(MyActivity.this, "导出失败!");
                    TipUtil.show(MyActivityQHAlone.this, "导出失败!");
                    break;
            }
            stopAnim();
@@ -162,7 +159,7 @@
                        String[] title;
                        String fileName;
                        if (listData == null || listData.size() == 0) {
                            TipUtil.show(MyActivity.this, "记录为空");
                            TipUtil.show(MyActivityQHAlone.this, "记录为空");
                            return;
                        }
                        if (isRechargeList) {
@@ -173,7 +170,7 @@
                            fileName = file.toString() + "/" + ExcelUtil.outUserPathName;
                        }
                        ExcelUtil.initExcel(fileName, title);
                        ExcelUtil.writeObjListToExcel(listData, fileName, MyActivity.this);
                        ExcelUtil.writeObjListToExcel(listData, fileName, MyActivityQHAlone.this);
                        handler.sendEmptyMessage(1);
                    } catch (Exception e) {
                        handler.sendEmptyMessage(2);
@@ -262,7 +259,7 @@
            public void onTimeSelected(long timestamp) {
                endTime = timestamp;
                if ((endTime < beginTime) && endTime != beginTime) {
                    TipUtil.show(MyActivity.this, "结束时间不能晚于开始时间");
                    TipUtil.show(MyActivityQHAlone.this, "结束时间不能晚于开始时间");
                } else {
                    try {
                        endTime = endTime + (1000 * 60 * 60 * 24) - 1;