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/RechargeListActivityQHAlone.java | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeListActivity.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeListActivityQHAlone.java
similarity index 94%
rename from qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeListActivity.java
rename to qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeListActivityQHAlone.java
index 5359aa8..dacaf43 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeListActivity.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeListActivityQHAlone.java
@@ -1,7 +1,6 @@
package com.dayu.qihealonelibrary.activity;
-
import static com.dayu.baselibrary.view.TitleBar.ClickType_RIGHT_TEXT;
import android.os.Bundle;
@@ -15,9 +14,8 @@
import com.dayu.baselibrary.view.datepicker.CustomDatePicker;
import com.dayu.baselibrary.view.datepicker.DateFormatUtils;
import com.dayu.qihealonelibrary.adapter.RechargeAdapter;
-import com.dayu.qihealonelibrary.databinding.ActivityRechargeListBinding;
+import com.dayu.qihealonelibrary.databinding.ActivityRechargeListQhaBinding;
import com.dayu.qihealonelibrary.dbBean.RechargeBean;
-
import com.scwang.smart.refresh.footer.ClassicsFooter;
import com.scwang.smart.refresh.layout.api.RefreshLayout;
import com.scwang.smart.refresh.layout.listener.OnLoadMoreListener;
@@ -35,9 +33,9 @@
* Date: 2023-11-5 09:52
* Description: 鍏呭�艰褰�
*/
-public class RechargeListActivity extends QHAloneBaseActivity {
+public class RechargeListActivityQHAlone extends BaseActivityQHAlone {
- ActivityRechargeListBinding rechargeListBinding;
+ ActivityRechargeListQhaBinding rechargeListBinding;
RechargeAdapter adapter;
List<RechargeBean> rechargeList = new ArrayList<>();
@@ -55,7 +53,7 @@
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- rechargeListBinding = ActivityRechargeListBinding.inflate(LayoutInflater.from(this));
+ rechargeListBinding = ActivityRechargeListQhaBinding.inflate(LayoutInflater.from(this));
setContentView(rechargeListBinding.getRoot());
setRightButton();
initDatePicker();
@@ -165,7 +163,7 @@
public void onTimeSelected(long timestamp) {
endTime = timestamp;
if ((endTime < beginTime) && endTime != beginTime) {
- TipUtil.show(RechargeListActivity.this, "缁撴潫鏃堕棿涓嶈兘鏅氫簬寮�濮嬫椂闂�");
+ TipUtil.show(RechargeListActivityQHAlone.this, "缁撴潫鏃堕棿涓嶈兘鏅氫簬寮�濮嬫椂闂�");
} else {
endTime = endTime + (1000 * 60 * 60 * 24) - 1;
rechargeList.clear();
--
Gitblit v1.8.0