From bd4891e2fd6b773cbb0ec387f6db4bc944fdf51a Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期一, 31 三月 2025 18:07:51 +0800
Subject: [PATCH] feat(generallibrary): 添加卡片列表功能并优化登录逻辑
---
generallibrary/src/main/java/com/dayu/general/activity/SearchUserActivity.kt | 114 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 103 insertions(+), 11 deletions(-)
diff --git a/generallibrary/src/main/java/com/dayu/general/activity/SearchUserActivity.kt b/generallibrary/src/main/java/com/dayu/general/activity/SearchUserActivity.kt
index a0c6974..b284cea 100644
--- a/generallibrary/src/main/java/com/dayu/general/activity/SearchUserActivity.kt
+++ b/generallibrary/src/main/java/com/dayu/general/activity/SearchUserActivity.kt
@@ -12,6 +12,8 @@
import com.dayu.general.view.SearchDialog
import com.dayu.general.net.ApiManager
import com.dayu.general.net.BaseResponse
+import com.scwang.smart.refresh.layout.api.RefreshLayout
+import com.scwang.smart.refresh.layout.listener.OnRefreshLoadMoreListener
/**
* @author: zuo
@@ -23,6 +25,16 @@
var binding: ActivitySearchUserGeBinding? = null
private var userAdapter: SearchListAdapter? = null
var searchDialog: SearchDialog? = null
+
+ // 鍒嗛〉鐩稿叧鍙橀噺
+ private var currentPage = 1
+ private val pageSize = 20
+ private var hasMoreData = true
+
+ // 淇濆瓨褰撳墠鎼滅储鏉′欢
+ private var currentFarmerId = ""
+ private var currentFarmerName = ""
+ private var currentCardNumber = ""
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
@@ -30,7 +42,7 @@
setContentView(binding?.root)
initView()
setupRecyclerView()
-
+ setupRefreshLayout()
}
@@ -41,12 +53,17 @@
// 璁剧疆鎼滅储鐩戝惉鍣�
searchDialog?.setOnSearchListener(object : SearchDialog.OnSearchListener {
override fun onSearch(farmerId: String, farmerName: String, cardNumber: String) {
- // 澶勭悊鎼滅储缁撴灉
- // 杩欓噷鍙槸绀轰緥锛屽疄闄呭簲鐢ㄤ腑鍙兘闇�瑕佽皟鐢ˋPI鎴栨煡璇㈡暟鎹簱
- val message =
- "鎼滅储鏉′欢锛歕n鍐滄埛缂栧彿锛�$farmerId\n鍐滄埛鍚嶇О锛�$farmerName\n鍗″彿锛�$cardNumber"
- // 鎵ц瀹為檯鐨勬悳绱㈤�昏緫
- searchUser(farmerId, farmerName, cardNumber)
+ // 淇濆瓨褰撳墠鎼滅储鏉′欢
+ currentFarmerId = farmerId
+ currentFarmerName = farmerName
+ currentCardNumber = cardNumber
+
+ // 閲嶇疆鍒嗛〉鐘舵��
+ currentPage = 1
+ hasMoreData = true
+
+ // 鎵ц鎼滅储
+ searchUser(farmerId, farmerName, cardNumber, true)
}
})
binding?.titleBar?.setOnItemclickListner(ClickType_RIGHT_IMAGE) {
@@ -62,6 +79,42 @@
layoutManager = LinearLayoutManager(this@SearchUserActivity)
adapter = userAdapter
}
+
+ // 璁剧疆鍒楄〃椤圭偣鍑讳簨浠�
+ userAdapter?.setOnItemClickListener { user ->
+ // 澶勭悊鐢ㄦ埛鐐瑰嚮浜嬩欢
+ ToastUtil.show("宸查�夋嫨鐢ㄦ埛锛�${user.name}")
+ // 杩欓噷鍙互娣诲姞璺宠浆鍒扮敤鎴疯鎯呴〉闈㈢殑閫昏緫
+ // val intent = Intent(this, UserDetailActivity::class.java)
+ // intent.putExtra("userId", user.id)
+ // startActivity(intent)
+ }
+ }
+
+ private fun setupRefreshLayout() {
+ binding?.refreshLayout?.apply {
+ // 璁剧疆鍒锋柊鍜屽姞杞芥洿澶氱洃鍚櫒
+ setOnRefreshLoadMoreListener(object : OnRefreshLoadMoreListener {
+ override fun onRefresh(refreshLayout: RefreshLayout) {
+ // 閲嶇疆椤电爜骞跺埛鏂版暟鎹�
+ currentPage = 1
+ hasMoreData = true
+ searchUser(currentFarmerId, currentFarmerName, currentCardNumber, true)
+ }
+
+ override fun onLoadMore(refreshLayout: RefreshLayout) {
+ // 濡傛灉杩樻湁鏇村鏁版嵁锛屽姞杞戒笅涓�椤�
+ if (hasMoreData) {
+ currentPage++
+ searchUser(currentFarmerId, currentFarmerName, currentCardNumber, false)
+ } else {
+ // 瀹屾垚鍔犺浇骞舵彁绀烘病鏈夋洿澶氭暟鎹�
+ refreshLayout.finishLoadMore(500, true, false)
+ ToastUtil.show("娌℃湁鏇村鏁版嵁浜�")
+ }
+ }
+ })
+ }
}
/**
@@ -73,8 +126,9 @@
* @param farmerId 鍐滄皯鐨勫敮涓�鏍囪瘑绗�
* @param farmerName 鍐滄皯鐨勫鍚�
* @param cardNumber 閾惰鍗″彿
+ * @param isRefresh 鏄惁涓哄埛鏂版搷浣�
*/
- private fun searchUser(farmerId: String, farmerName: String, cardNumber: String) {
+ private fun searchUser(farmerId: String, farmerName: String, cardNumber: String, isRefresh: Boolean = true) {
val map = mutableMapOf<String, Any>()
if (farmerId.isNotEmpty()) {
@@ -88,6 +142,10 @@
if (cardNumber.isNotEmpty()) {
map["cardNum"] = cardNumber
}
+
+ // 娣诲姞鍒嗛〉鍙傛暟
+ map["pageCurr"] = currentPage
+ map["pageSize"] = pageSize
// 浣跨敤姝ｇ‘鐨勭被鍨嬪弬鏁�
ApiManager.getInstance().requestGetLoading(
@@ -97,18 +155,38 @@
map,
object : SubscriberListener<BaseResponse<SearchUserResult>>() {
override fun onNext(t: BaseResponse<SearchUserResult>) {
+ // 瀹屾垚鍒锋柊鎴栧姞杞藉姩浣�
+ finishRefreshOrLoad(isRefresh)
+
if (t.success) {
// 澶勭悊鎼滅储鎴愬姛鐨勬儏鍐�
val result = t.content
if (result != null) {
// 澶勭悊鎼滅储缁撴灉
if (result.obj.isNotEmpty()) {
- userAdapter?.setData(result.obj)
+ // 鏍规嵁鏄惁涓哄埛鏂版搷浣滃喅瀹氬浣曟洿鏂版暟鎹�
+ if (isRefresh) {
+ userAdapter?.setData(result.obj)
+ } else {
+ userAdapter?.addData(result.obj)
+ }
+
+ // 鍒ゆ柇鏄惁杩樻湁鏇村鏁版嵁锛氭牴鎹綋鍓嶉〉鐮佸拰鎬婚〉鏁板垽鏂�
+ hasMoreData = currentPage < result.pageTotal
} else {
- ToastUtil.show("鏈壘鍒板尮閰嶇殑鐢ㄦ埛")
+ if (isRefresh) {
+ userAdapter?.setData(emptyList())
+ ToastUtil.show("鏈壘鍒板尮閰嶇殑鐢ㄦ埛")
+ } else {
+ hasMoreData = false
+ ToastUtil.show("娌℃湁鏇村鏁版嵁浜�")
+ }
}
} else {
- ToastUtil.show("鏈壘鍒板尮閰嶇殑鐢ㄦ埛")
+ if (isRefresh) {
+ userAdapter?.setData(emptyList())
+ ToastUtil.show("鏈壘鍒板尮閰嶇殑鐢ㄦ埛")
+ }
}
} else {
// 澶勭悊鎼滅储澶辫触鐨勬儏鍐�
@@ -118,11 +196,25 @@
override fun onError(e: Throwable?) {
super.onError(e)
+ // 瀹屾垚鍒锋柊鎴栧姞杞藉姩浣�
+ finishRefreshOrLoad(isRefresh)
ToastUtil.show("鎼滅储澶辫触: ${e?.message ?: "鏈煡閿欒"}")
}
}
)
}
+
+ /**
+ * 瀹屾垚鍒锋柊鎴栧姞杞芥搷浣�
+ * @param isRefresh 鏄惁涓哄埛鏂版搷浣�
+ */
+ private fun finishRefreshOrLoad(isRefresh: Boolean) {
+ if (isRefresh) {
+ binding?.refreshLayout?.finishRefresh(true)
+ } else {
+ binding?.refreshLayout?.finishLoadMore(true)
+ }
+ }
/**
* 澶勭悊鎼滅储缁撴灉
--
Gitblit v1.8.0