From 2fece6551faab0402e7ed53658a60d2256e7a5be Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期四, 12 六月 2025 14:58:56 +0800
Subject: [PATCH] feat(generallibrary): 新增挂失功能并优化相关界面- 新增 LossCardActivity 和 CardWriteSuccessActivity - 实现卡片挂失功能和写卡成功页面 - 优化充值界面布局- 调整卡片信息显示逻辑 - 修复部分 UI样式问题
---
generallibrary/src/main/java/com/dayu/general/activity/SearchUserListActivity.kt | 57 +++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 45 insertions(+), 12 deletions(-)
diff --git a/generallibrary/src/main/java/com/dayu/general/activity/SearchUserListActivity.kt b/generallibrary/src/main/java/com/dayu/general/activity/SearchUserListActivity.kt
index b66c4df..a4282a2 100644
--- a/generallibrary/src/main/java/com/dayu/general/activity/SearchUserListActivity.kt
+++ b/generallibrary/src/main/java/com/dayu/general/activity/SearchUserListActivity.kt
@@ -44,6 +44,9 @@
initView()
setupRecyclerView()
setupRefreshLayout()
+
+ // 纭繚Footer鍒濆鐘舵�佹纭�
+ binding?.refreshLayout?.setEnableLoadMore(true)
}
@@ -62,6 +65,9 @@
// 閲嶇疆鍒嗛〉鐘舵��
currentPage = 1
hasMoreData = true
+
+ // 閲嶇疆鏃犳洿澶氭暟鎹姸鎬�
+ binding?.refreshLayout?.resetNoMoreData()
// 鎵ц鎼滅储
searchUser(farmerId, farmerName, cardNumber, true)
@@ -86,10 +92,7 @@
// 澶勭悊鐢ㄦ埛鐐瑰嚮浜嬩欢
// 浼犻�掔敤鎴蜂俊鎭埌寮�鍗＄晫闈�
val intent = Intent(this, NewCard2Activity::class.java)
- intent.putExtra("userName", user.name)
- intent.putExtra("idCard", user.idCard)
- intent.putExtra("farmerCode", user.clientNum)
- intent.putExtra("userId", user.id)
+ intent.putExtra("clientId", user.clientId)
startActivity(intent)
}
@@ -98,12 +101,21 @@
private fun setupRefreshLayout() {
binding?.refreshLayout?.apply {
+ // 璁剧疆Footer璺熼殢鍔熻兘锛岀‘淇濇棤鏇村鏁版嵁鏃禙ooter鑳芥纭樉绀�
+ setEnableFooterFollowWhenNoMoreData(true)
+ // 璁剧疆鍔犺浇鏇村瀹屾垚鍚庢粴鍔ㄥ唴瀹规樉绀烘柊鏁版嵁
+ setEnableScrollContentWhenLoaded(true)
+ // 绂佺敤绾粴鍔ㄦā寮忥紝纭繚Footer鑳芥甯稿伐浣�
+ setEnableOverScrollDrag(false)
+
// 璁剧疆鍒锋柊鍜屽姞杞芥洿澶氱洃鍚櫒
setOnRefreshLoadMoreListener(object : OnRefreshLoadMoreListener {
override fun onRefresh(refreshLayout: RefreshLayout) {
// 閲嶇疆椤电爜骞跺埛鏂版暟鎹�
currentPage = 1
hasMoreData = true
+ // 閲嶇疆鏃犳洿澶氭暟鎹姸鎬�
+ refreshLayout.resetNoMoreData()
searchUser(currentFarmerId, currentFarmerName, currentCardNumber, true)
}
@@ -113,9 +125,8 @@
currentPage++
searchUser(currentFarmerId, currentFarmerName, currentCardNumber, false)
} else {
- // 瀹屾垚鍔犺浇骞舵彁绀烘病鏈夋洿澶氭暟鎹�
- refreshLayout.finishLoadMore(500, true, false)
- ToastUtil.show("娌℃湁鏇村鏁版嵁浜�")
+ // 瀹屾垚鍔犺浇骞舵樉绀哄凡鍒板簳鐘舵��
+ refreshLayout.finishLoadMoreWithNoMoreData()
}
}
})
@@ -165,9 +176,6 @@
map,
object : SubscriberListener<BaseResponse<SearchUserResult>>() {
override fun onNext(t: BaseResponse<SearchUserResult>) {
- // 瀹屾垚鍒锋柊鎴栧姞杞藉姩浣�
- finishRefreshOrLoad(isRefresh)
-
if (t.success) {
// 澶勭悊鎼滅储鎴愬姛鐨勬儏鍐�
val result = t.content
@@ -183,23 +191,42 @@
// 鍒ゆ柇鏄惁杩樻湁鏇村鏁版嵁锛氭牴鎹綋鍓嶉〉鐮佸拰鎬婚〉鏁板垽鏂�
hasMoreData = currentPage < result.pageTotal
+
+ // 瀹屾垚鍒锋柊鎴栧姞杞藉姩浣�
+ if (isRefresh) {
+ binding?.refreshLayout?.finishRefresh(true)
+ } else {
+ // 濡傛灉娌℃湁鏇村鏁版嵁浜嗭紝璁剧疆宸插埌搴曠姸鎬�
+ if (!hasMoreData) {
+ binding?.refreshLayout?.finishLoadMoreWithNoMoreData()
+ } else {
+ binding?.refreshLayout?.finishLoadMore(true)
+ }
+ }
} else {
if (isRefresh) {
userAdapter?.setData(emptyList())
+ binding?.refreshLayout?.finishRefresh(true)
ToastUtil.show("鏈壘鍒板尮閰嶇殑鐢ㄦ埛")
} else {
hasMoreData = false
- ToastUtil.show("娌℃湁鏇村鏁版嵁浜�")
+ // 浣跨敤finishLoadMoreWithNoMoreData鏄剧ず宸插埌搴曠姸鎬�
+ binding?.refreshLayout?.finishLoadMoreWithNoMoreData()
}
}
} else {
if (isRefresh) {
userAdapter?.setData(emptyList())
+ binding?.refreshLayout?.finishRefresh(true)
ToastUtil.show("鏈壘鍒板尮閰嶇殑鐢ㄦ埛")
+ } else {
+ hasMoreData = false
+ binding?.refreshLayout?.finishLoadMoreWithNoMoreData()
}
}
} else {
// 澶勭悊鎼滅储澶辫触鐨勬儏鍐�
+ finishRefreshOrLoad(isRefresh)
ToastUtil.show(t.msg)
}
}
@@ -222,7 +249,13 @@
if (isRefresh) {
binding?.refreshLayout?.finishRefresh(true)
} else {
- binding?.refreshLayout?.finishLoadMore(true)
+ // 濡傛灉娌℃湁鏇村鏁版嵁锛屼笉鍦ㄨ繖閲岃皟鐢╢inishLoadMore锛岀敱鍏蜂綋閫昏緫璋冪敤finishLoadMoreWithNoMoreData
+ // 濡傛灉鏈夋洿澶氭暟鎹紝鍒欐甯歌皟鐢╢inishLoadMore
+ if (hasMoreData) {
+ binding?.refreshLayout?.finishLoadMore(true)
+ }
+ // 娉ㄦ剰锛氬綋hasMoreData涓篺alse鏃讹紝涓嶈皟鐢ㄤ换浣昮inish鏂规硶锛�
+ // 鍥犱负宸茬粡鍦ㄥ叿浣撻�昏緫涓皟鐢ㄤ簡finishLoadMoreWithNoMoreData()
}
}
--
Gitblit v1.8.0