From b9cc7390e8e8ce64c41c26fb369c98ce669d660c Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 07 五月 2025 15:02:30 +0800
Subject: [PATCH] Merge branch '1.2.0'

---
 app/src/main/java/com/hdl/photovoltaic/ui/message/SearchMessageActivity.java |   93 ++++++++++++++++++++++++++++++----------------
 1 files changed, 61 insertions(+), 32 deletions(-)

diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/message/SearchMessageActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/message/SearchMessageActivity.java
index 0817798..944fd6d 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/message/SearchMessageActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/message/SearchMessageActivity.java
@@ -3,7 +3,10 @@
 
 import android.content.Context;
 import android.content.Intent;
+import android.os.AsyncTask;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
@@ -31,6 +34,8 @@
 import com.hdl.photovoltaic.ui.adapter.SearchMessageAdapter;
 import com.hdl.photovoltaic.ui.bean.MessageBean;
 import com.hdl.photovoltaic.utils.KeyboardStateObserverUtils;
+import com.hdl.photovoltaic.widget.refreshlayout.BGARefreshLayout;
+import com.hdl.photovoltaic.widget.refreshlayout.HDLRefreshViewHolder;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -40,6 +45,9 @@
  * 娑堟伅鎼滅储鐣岄潰
  */
 public class SearchMessageActivity extends CustomBaseActivity {
+
+    private Handler handler;
+    private Runnable delayedRunnable;
 
     private ActivitySearchMessgeBinding viewBinding;
 
@@ -90,6 +98,53 @@
         }
     }
 
+    /**
+     * 涓嬫媺鍒锋柊鐨勯�昏緫
+     */
+    protected void pullToRefresh() {
+        viewBinding.listSrl.setDelegate(new BGARefreshLayout.BGARefreshLayoutDelegate() {
+            @Override
+            public void onBGARefreshLayoutBeginRefreshing(BGARefreshLayout refreshLayout) {
+                handler = new Handler(Looper.getMainLooper());
+
+                delayedRunnable = new Runnable() {
+                    @Override
+                    public void run() {
+                        viewBinding.listSrl.endRefreshing();
+                        loadNextPageMessageList(false, 1, viewBinding.messageSearchEt.getText().toString(), true);
+                    }
+                };
+                // 寤惰繜 5 绉掓墽琛�
+                handler.postDelayed(delayedRunnable, 1000);
+            }
+
+
+            @Override
+            public boolean onBGARefreshLayoutBeginLoadingMore(BGARefreshLayout refreshLayout) {
+
+                handler = new Handler(Looper.getMainLooper());
+                delayedRunnable = new Runnable() {
+                    @Override
+                    public void run() {
+                        viewBinding.listSrl.endLoadingMore();
+                        if (!isLoadingMore) {
+                            // 婊戝姩鍒颁簡搴曢儴锛屾墽琛岀浉搴旂殑鎿嶄綔
+                            loadNextPageMessageList(false, ++mCurrentPage, viewBinding.messageSearchEt.getText().toString(), false);
+                        }
+                    }
+                };
+                // 寤惰繜 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.listSrl.setRefreshViewHolder(hdlRefreshViewHolder);
+    }
 
     private void initEvent() {
 
@@ -117,38 +172,6 @@
                 viewBinding.listParent.setVisibility(View.VISIBLE);
                 addSearchTextToList();
                 loadNextPageMessageList(true, 1, viewBinding.messageSearchEt.getText().toString(), true);
-            }
-        });
-
-
-        //涓嬫媺绠ご棰滆壊
-        viewBinding.listSrl.setColorSchemeResources(R.color.text_FF245EC3);
-        //涓嬫媺璇诲彇
-        viewBinding.listSrl.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
-            @Override
-            public void onRefresh() {
-                viewBinding.listSrl.setRefreshing(false);
-                loadNextPageMessageList(true, 1, viewBinding.messageSearchEt.getText().toString(), true);
-            }
-        });
-        //涓婃媺璇诲彇
-        viewBinding.listRcv.addOnScrollListener(new RecyclerView.OnScrollListener() {
-            @Override
-            public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int 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(false, ++mCurrentPage, viewBinding.messageSearchEt.getText().toString(), false);
-                    }
-                }
             }
         });
         //娓呴櫎
@@ -246,6 +269,7 @@
                 viewBinding.messageSearchEt.requestFocus();
             }
         });
+        pullToRefresh();
 
         //鍦ㄧ晫闈腑浣跨敤
         KeyboardStateObserverUtils.getKeyboardStateObserver(_mActivity).setKeyboardVisibilityListener(new KeyboardStateObserverUtils.OnKeyboardVisibilityListener() {
@@ -321,6 +345,9 @@
         if (searchHistoryTitleList.size() > 0) {
             HdlFileLogic.getInstance().deleteFile(getHistoryFileNamePath());
             HdlFileLogic.getInstance().appendFile(getHistoryFileNamePath(), new Gson().toJson(searchHistoryTitleList));
+        }
+        if (handler != null && delayedRunnable != null) {
+            handler.removeCallbacks(delayedRunnable);
         }
         super.onDestroy();
     }
@@ -471,4 +498,6 @@
     public String getHistoryFileNamePath() {
         return HdlFileLogic.getInstance().getCurrentUserRootPath() + "/message.txt";
     }
+
+
 }
\ No newline at end of file

--
Gitblit v1.8.0