From 4f12f1e3543fce41e71ae9e21a782f8d9cb41947 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 07 七月 2025 10:45:11 +0800
Subject: [PATCH] Merge branch '1.3.1' into dev
---
app/src/main/java/com/hdl/photovoltaic/ui/newC/MessageCenterListActivity.java | 107 +++++++++++++++++++++++++++++++++++------------------
1 files changed, 71 insertions(+), 36 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/newC/MessageCenterList.java b/app/src/main/java/com/hdl/photovoltaic/ui/newC/MessageCenterListActivity.java
similarity index 89%
rename from app/src/main/java/com/hdl/photovoltaic/ui/newC/MessageCenterList.java
rename to app/src/main/java/com/hdl/photovoltaic/ui/newC/MessageCenterListActivity.java
index 476ebb8..3f8f9b2 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/newC/MessageCenterList.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/newC/MessageCenterListActivity.java
@@ -4,13 +4,12 @@
import android.content.DialogInterface;
import android.content.Intent;
import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
import android.view.View;
import android.widget.TextView;
-import androidx.annotation.NonNull;
import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import com.google.gson.Gson;
import com.google.gson.JsonObject;
@@ -34,6 +33,8 @@
import com.hdl.photovoltaic.ui.newC.adapter.MessageCenterListAdapter;
import com.hdl.photovoltaic.uni.HDLUniMP;
import com.hdl.photovoltaic.widget.TypeTitleListDialog;
+import com.hdl.photovoltaic.widget.refreshlayout.BGARefreshLayout;
+import com.hdl.photovoltaic.widget.refreshlayout.HDLRefreshViewHolder;
import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;
import org.greenrobot.eventbus.Subscribe;
@@ -47,7 +48,10 @@
/**
* C绔秷鎭腑蹇冨垪琛�
*/
-public class MessageCenterList extends CustomBaseActivity {
+public class MessageCenterListActivity extends CustomBaseActivity {
+
+ private Handler handler;
+ private Runnable delayedRunnable;
private ActivityMessageCenterListBinding viewBinding;
@@ -106,6 +110,14 @@
super.onResume();
//杩涙潵璇诲彇涓�娆℃暟鎹�(涓轰簡鏇存柊currentPage锛宑urrentTotal杩欎釜鍊�)
// loadNextPageMessageList(1, true, mFilterKye, mFilterValue);
+ }
+
+ @Override
+ protected void onDestroy() {
+ if (handler != null && delayedRunnable != null) {
+ handler.removeCallbacks(delayedRunnable);
+ }
+ super.onDestroy();
}
private void initEvent() {
@@ -281,38 +293,6 @@
}
});
-
- //涓嬫媺鎸夐挳
- viewBinding.messageContentSrl.setColorSchemeResources(R.color.text_FF245EC3);
- viewBinding.messageContentSrl.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
- @Override
- public void onRefresh() {
- viewBinding.messageContentSrl.setRefreshing(false);
- loadNextPageMessageList(1, true, mDeviceTypeFilterKye, mDeviceTypeFilterValue, mTypeFilterKye, mTypeFilterValue, mTimeTypeFilterKye, mTimeTypeFilterValue);
- }
- });
- //涓婃媺鎸夐挳
- viewBinding.messageContentRl.addOnScrollListener(new RecyclerView.OnScrollListener() {
- @Override
- public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
-// super.onScrolled(recyclerView, dx, dy);
-
- LinearLayoutManager layoutManager = (LinearLayoutManager) recyclerView.getLayoutManager();
- if (layoutManager == null) {
- return;
- }
- int visibleItemCount = layoutManager.getChildCount();
- int totalItemCount = layoutManager.getItemCount();
- int firstVisibleItemPosition = layoutManager.findFirstVisibleItemPosition();
- if (visibleItemCount > 0 && visibleItemCount + firstVisibleItemPosition == totalItemCount) {
- if (!isLoadingMore) {
- // 婊戝姩鍒颁簡搴曢儴锛屾墽琛岀浉搴旂殑鎿嶄綔
- HdlLogLogic.print("--->婊戝姩鍒颁簡搴曢儴");
- loadNextPageMessageList(++mCurrentPage, false, mDeviceTypeFilterKye, mDeviceTypeFilterValue, mTypeFilterKye, mTypeFilterValue, mTimeTypeFilterKye, mTimeTypeFilterValue);
- }
- }
- }
- });
if (messageCenterListAdapter != null) {
messageCenterListAdapter.setNoOnclickListener(new MessageCenterListAdapter.OnclickListener() {
@Override
@@ -343,7 +323,9 @@
viewBinding.messageContentRl.setAdapter(messageCenterListAdapter);
messageCenterListAdapter.setList(mList);
// this.nullDataUpdateUi();
+ pullToRefresh();
}
+
private void initData() {
try {
@@ -363,6 +345,55 @@
}
} catch (Exception ignored) {
}
+ }
+
+ /**
+ * 涓嬫媺鍒锋柊鐨勯�昏緫
+ */
+ protected void pullToRefresh() {
+ viewBinding.messageContentSrl.setDelegate(new BGARefreshLayout.BGARefreshLayoutDelegate() {
+ @Override
+ public void onBGARefreshLayoutBeginRefreshing(BGARefreshLayout refreshLayout) {
+ handler = new Handler(Looper.getMainLooper());
+
+ delayedRunnable = new Runnable() {
+ @Override
+ public void run() {
+ viewBinding.messageContentSrl.endRefreshing();
+ loadNextPageMessageList(1, false, mDeviceTypeFilterKye, mDeviceTypeFilterValue, mTypeFilterKye, mTypeFilterValue, mTimeTypeFilterKye, mTimeTypeFilterValue);
+ }
+ };
+ // 寤惰繜 5 绉掓墽琛�
+ handler.postDelayed(delayedRunnable, 1000);
+ }
+
+
+ @Override
+ public boolean onBGARefreshLayoutBeginLoadingMore(BGARefreshLayout refreshLayout) {
+
+ handler = new Handler(Looper.getMainLooper());
+ delayedRunnable = new Runnable() {
+ @Override
+ public void run() {
+ viewBinding.messageContentSrl.endLoadingMore();
+ if (!isLoadingMore) {
+ // 婊戝姩鍒颁簡搴曢儴锛屾墽琛岀浉搴旂殑鎿嶄綔
+ HdlLogLogic.print("--->婊戝姩鍒颁簡搴曢儴");
+ loadNextPageMessageList(++mCurrentPage, false, mDeviceTypeFilterKye, mDeviceTypeFilterValue, mTypeFilterKye, mTypeFilterValue, mTimeTypeFilterKye, mTimeTypeFilterValue);
+ }
+ }
+ };
+ // 寤惰繜 5 绉掓墽琛�
+ handler.postDelayed(delayedRunnable, 10);
+
+ return true;
+ }
+ });
+ HDLRefreshViewHolder hdlRefreshViewHolder = new HDLRefreshViewHolder(_mActivity, true);
+ hdlRefreshViewHolder.setPullDownImageResource(R.mipmap.loading_44);
+ hdlRefreshViewHolder.setChangeToReleaseRefreshAnimResId(R.drawable.loading_refresh);
+ hdlRefreshViewHolder.setRefreshingAnimResId(R.drawable.loading_refresh_end);
+ viewBinding.messageContentSrl.setRefreshViewHolder(hdlRefreshViewHolder);
}
/**
@@ -525,9 +556,13 @@
if (typeClick) {
viewBinding.messageBottomAlarmDeviceLineV.setVisibility(View.VISIBLE);
viewBinding.messageBottomAlarmRecordLineV.setVisibility(View.GONE);
+ viewBinding.messageBottomAlarmDeviceTitleTv.setTextColor(getColor(R.color.text_FFACACAC));
+ viewBinding.messageBottomAlarmRecordTitleTv.setTextColor(getColor(R.color.text_FF5B5B5B));
} else {
viewBinding.messageBottomAlarmDeviceLineV.setVisibility(View.GONE);
viewBinding.messageBottomAlarmRecordLineV.setVisibility(View.VISIBLE);
+ viewBinding.messageBottomAlarmDeviceTitleTv.setTextColor(getColor(R.color.text_FF5B5B5B));
+ viewBinding.messageBottomAlarmRecordTitleTv.setTextColor(getColor(R.color.text_FFACACAC));
}
}
--
Gitblit v1.8.0