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/MyActivityQHAlone.java | 33 +++++++++++++++------------------
1 files changed, 15 insertions(+), 18 deletions(-)
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/MyActivity.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/MyActivityQHAlone.java
similarity index 89%
rename from qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/MyActivity.java
rename to qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/MyActivityQHAlone.java
index 7049960..312b576 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/MyActivity.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/MyActivityQHAlone.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;
--
Gitblit v1.8.0