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

zuoxiao

2024-05-06 e79ced190337222c7475409363c8071c976c7de9

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

File was renamed from qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/HomeActivity.java
@@ -8,7 +8,7 @@
import android.widget.Toast;

import com.dayu.baselibrary.utils.TipUtil;
import com.dayu.qihealonelibrary.databinding.ActivityHomeBinding;
import com.dayu.qihealonelibrary.databinding.ActivityHomeQhaBinding;
import com.dayu.qihealonelibrary.dbBean.AdminDataBean;


@@ -19,16 +19,16 @@
 * Date: 2023-11-6 19:52
 * Description: 主界面
 */
public class HomeActivity extends QHAloneBaseActivity {
public class HomeActivityQHAlone extends BaseActivityQHAlone {

    public static HomeActivity homeActivity;
    ActivityHomeBinding homeBinding;
    public static HomeActivityQHAlone homeActivity;
    ActivityHomeQhaBinding homeBinding;

    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
        homeActivity = this;
        homeBinding = ActivityHomeBinding.inflate(LayoutInflater.from(this));
        homeBinding = ActivityHomeQhaBinding.inflate(LayoutInflater.from(this));
        setContentView(homeBinding.getRoot());
        initView();

@@ -44,7 +44,7 @@
            public void onClick(View v) {
                AdminDataBean adminData = baseDao.adminDao().findFirst();
                if (adminData != null) {
                    startActivity(new Intent(HomeActivity.this, NewCardActivity.class));
                    startActivity(new Intent(HomeActivityQHAlone.this, NewCardActivityQHAlone.class));
                } else {
                    TipUtil.show("请先设置地址信息");
                }
@@ -56,7 +56,7 @@
            public void onClick(View v) {
                AdminDataBean adminData = baseDao.adminDao().findFirst();
                if (adminData != null) {
                    startActivity(new Intent(HomeActivity.this, RechargeActivity.class));
                    startActivity(new Intent(HomeActivityQHAlone.this, RechargeActivityQHAlone.class));
                } else {
                    TipUtil.show("请先设置地址信息");
                }
@@ -66,28 +66,28 @@
        homeBinding.homeRedCard.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                startActivity(new Intent(HomeActivity.this, ReadCardAcitivy.class));
                startActivity(new Intent(HomeActivityQHAlone.this, ReadCardAcitivy.class));
            }
        });
        //管理系统界面
        homeBinding.homeAdmin.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                startActivity(new Intent(HomeActivity.this, SysActivity.class));
                startActivity(new Intent(HomeActivityQHAlone.this, SysActivityQHAlone.class));
            }
        });
        //参数设置
        homeBinding.homeParameter.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                startActivity(new Intent(HomeActivity.this, ParameterActivity.class));
                startActivity(new Intent(HomeActivityQHAlone.this, ParameterActivityQHAlone.class));

            }
        });
        homeBinding.homeMy.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                startActivity(new Intent(HomeActivity.this, MyActivity.class));
                startActivity(new Intent(HomeActivityQHAlone.this, MyActivityQHAlone.class));

            }
        });
@@ -107,10 +107,10 @@
    public boolean onKeyDown(int keyCode, KeyEvent event) {
        if (keyCode == KeyEvent.KEYCODE_BACK) {
            if ((System.currentTimeMillis() - mExitTime) > 2000) {
                Toast.makeText(HomeActivity.this, "再按一次退出程序", Toast.LENGTH_SHORT).show();
                Toast.makeText(HomeActivityQHAlone.this, "再按一次退出程序", Toast.LENGTH_SHORT).show();
                mExitTime = System.currentTimeMillis();
            } else {
                HomeActivity.this.finish();
                HomeActivityQHAlone.this.finish();
            }
            return true;
        }