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/NewCardListActivityQHAlone.java | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NewCardListActivity.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NewCardListActivityQHAlone.java
similarity index 95%
rename from qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NewCardListActivity.java
rename to qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NewCardListActivityQHAlone.java
index b0023b4..6724634 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NewCardListActivity.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/NewCardListActivityQHAlone.java
@@ -12,9 +12,8 @@
import com.dayu.baselibrary.view.datepicker.CustomDatePicker;
import com.dayu.baselibrary.view.datepicker.DateFormatUtils;
import com.dayu.qihealonelibrary.adapter.NewCardAdapter;
-import com.dayu.qihealonelibrary.databinding.ActivityNewcardListBinding;
+import com.dayu.qihealonelibrary.databinding.ActivityNewcardListQhaBinding;
import com.dayu.qihealonelibrary.dbBean.UserCardBean;
-
import com.scwang.smart.refresh.footer.ClassicsFooter;
import com.scwang.smart.refresh.layout.api.RefreshLayout;
import com.scwang.smart.refresh.layout.listener.OnLoadMoreListener;
@@ -33,10 +32,10 @@
* Description: 鏂板崱娉ㄥ唽鍒楄〃鐣岄潰
*/
-public class NewCardListActivity extends QHAloneBaseActivity {
+public class NewCardListActivityQHAlone extends BaseActivityQHAlone {
- ActivityNewcardListBinding newcardListBinding;
+ ActivityNewcardListQhaBinding newcardListBinding;
List<UserCardBean> userCardBeanList = new ArrayList<>();
NewCardAdapter adapter;
private CustomDatePicker beginDatePicker;
@@ -53,7 +52,7 @@
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- newcardListBinding = ActivityNewcardListBinding.inflate(LayoutInflater.from(this));
+ newcardListBinding = ActivityNewcardListQhaBinding.inflate(LayoutInflater.from(this));
setContentView(newcardListBinding.getRoot());
setRightButton();
initDatePicker();
@@ -153,7 +152,7 @@
public void onTimeSelected(long timestamp) {
endTime = timestamp;
if ((endTime < beginTime) && endTime != beginTime) {
- TipUtil.show(NewCardListActivity.this, "缁撴潫鏃堕棿涓嶈兘鏅氫簬寮�濮嬫椂闂�");
+ TipUtil.show(NewCardListActivityQHAlone.this, "缁撴潫鏃堕棿涓嶈兘鏅氫簬寮�濮嬫椂闂�");
} else {
// try {
// endTime = endTime + (1000 * 60 * 60 * 24) - 1;
--
Gitblit v1.8.0