From e79ced190337222c7475409363c8071c976c7de9 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期一, 06 五月 2024 10:03:04 +0800
Subject: [PATCH] 1.修复两个工程因layout名字一样导致的bug
---
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/HomeActivityQHAlone.java | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/HomeActivity.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/HomeActivityQHAlone.java
similarity index 72%
rename from qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/HomeActivity.java
rename to qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/HomeActivityQHAlone.java
index fa7d852..745efc4 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/HomeActivity.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/HomeActivityQHAlone.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;
}
--
Gitblit v1.8.0