From b13afc751dbbce24753d008f1f87d2c5e133a4ad Mon Sep 17 00:00:00 2001
From: lmw <125975490@qq.com>
Date: 星期二, 09 七月 2024 15:19:26 +0800
Subject: [PATCH] fix bug

---
 app/src/main/java/com/dollearn/student/ui/welfare/ExchangeRecordActivity.kt |   31 +++++++++++++++++++++++++++----
 1 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/dollearn/student/ui/welfare/ExchangeRecordActivity.kt b/app/src/main/java/com/dollearn/student/ui/welfare/ExchangeRecordActivity.kt
index 9b87869..07212db 100644
--- a/app/src/main/java/com/dollearn/student/ui/welfare/ExchangeRecordActivity.kt
+++ b/app/src/main/java/com/dollearn/student/ui/welfare/ExchangeRecordActivity.kt
@@ -15,7 +15,7 @@
 
     private val list = arrayListOf<ExchangeRecord>()
     private val adapter = ExchangeRecordAdapter(list)
-
+    private var page = 1
 
     override fun initClick() {
 
@@ -24,14 +24,37 @@
     override fun initView() {
         rv_record.layoutManager = LinearLayoutManager(this)
         rv_record.adapter = adapter
+        refreshLayout.setOnRefreshListener {
+            page = 1
+            getData()
+        }
+        refreshLayout.setOnLoadMoreListener {
+            page++
+            getData()
+        }
         getData()
     }
 
     private fun getData() {
-        HttpManager.exchangeRecord().request(this){_,data->
-            list.clear()
-            list.addAll(data?: arrayListOf())
+        HttpManager.exchangeRecord(page).request(this,success = {_,data->
+            if (page == 1)
+                list.clear()
+            list.addAll(data?.records?: arrayListOf())
             adapter.notifyDataSetChanged()
+            if (list.isEmpty())
+                refreshLayout.finishRefreshWithNoMoreData()
+            else if (data?.records.isNullOrEmpty())
+                refreshLayout.finishLoadMoreWithNoMoreData()
+            else if (page == 1)
+                refreshLayout.finishRefresh()
+            else
+                refreshLayout.finishLoadMore()
+        }){_,_->
+            if (page == 1)
+                refreshLayout.finishRefresh(false)
+            else
+                refreshLayout.finishLoadMore(false)
+            page--
         }
     }
 

--
Gitblit v1.7.1