From 18aad0f6f20ce89e2e904a59952f72c194ce085b Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期五, 25 四月 2025 13:42:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/featrue/1.2.0-hxb' into 1.2.0
---
app/src/main/java/com/hdl/photovoltaic/widget/refreshlayout/BGARefreshViewHolder.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/widget/refreshlayout/BGARefreshViewHolder.java b/app/src/main/java/com/hdl/photovoltaic/widget/refreshlayout/BGARefreshViewHolder.java
index add62be..742e2be 100644
--- a/app/src/main/java/com/hdl/photovoltaic/widget/refreshlayout/BGARefreshViewHolder.java
+++ b/app/src/main/java/com/hdl/photovoltaic/widget/refreshlayout/BGARefreshViewHolder.java
@@ -187,7 +187,7 @@
return null;
}
if (mLoadMoreFooterView == null) {
- mLoadMoreFooterView = View.inflate(mContext, R.layout.loading_alert, null);
+ mLoadMoreFooterView = View.inflate(mContext, R.layout.loading_more, null);
mLoadMoreFooterView.setBackgroundColor(Color.TRANSPARENT);
if (mLoadMoreBackgroundColorRes != -1) {
mLoadMoreFooterView.setBackgroundResource(mLoadMoreBackgroundColorRes);
@@ -195,8 +195,8 @@
if (mLoadMoreBackgroundDrawableRes != -1) {
mLoadMoreFooterView.setBackgroundResource(mLoadMoreBackgroundDrawableRes);
}
- mFooterStatusTv = (TextView) mLoadMoreFooterView.findViewById(R.id.load_content_tv);
- mFooterChrysanthemumIv = (ImageView) mLoadMoreFooterView.findViewById(R.id.load_pb);
+ mFooterStatusTv = (TextView) mLoadMoreFooterView.findViewById(R.id.load_more_content_tv);
+ mFooterChrysanthemumIv = (ImageView) mLoadMoreFooterView.findViewById(R.id.load_more_iv);
mFooterChrysanthemumIv.setBackground(mContext.getDrawable(R.drawable.progress_small));
mFooterChrysanthemumAd = (AnimationDrawable) mFooterChrysanthemumIv.getDrawable();
mFooterStatusTv.setText(mLodingMoreText);
--
Gitblit v1.8.0