android/charge.git

			@@ -1,5 +1,6 @@
			package com.dayu.general.activity

			import android.content.Intent
			import android.os.Bundle
			import androidx.recyclerview.widget.LinearLayoutManager
			import com.dayu.baselibrary.net.subscribers.SubscriberListener
			@@ -25,12 +26,12 @@
			var binding: ActivitySearchUserGeBinding? = null
			private var userAdapter: SearchUserListAdapter? = null
			var searchDialog: SearchDialog? = null


			// 分页相关变量
			private var currentPage = 1
			private val pageSize = 20
			private var hasMoreData = true


			// 保存当前搜索条件
			private var currentFarmerId = ""
			private var currentFarmerName = ""
			@@ -43,6 +44,9 @@
			initView()
			setupRecyclerView()
			setupRefreshLayout()

			// 确保Footer初始状态正确
			binding?.refreshLayout?.setEnableLoadMore(true)
			}


			@@ -57,11 +61,14 @@
			currentFarmerId = farmerId
			currentFarmerName = farmerName
			currentCardNumber = cardNumber


			// 重置分页状态
			currentPage = 1
			hasMoreData = true

			// 重置无更多数据状态
			binding?.refreshLayout?.resetNoMoreData()

			// 执行搜索
			searchUser(farmerId, farmerName, cardNumber, true)
			}
			@@ -79,40 +86,47 @@
			layoutManager = LinearLayoutManager(this@SearchUserListActivity)
			adapter = userAdapter
			}


			// 设置列表项点击事件
			userAdapter?.setOnItemClickListener { user ->
			// 处理用户点击事件
			ToastUtil.show("已选择用户：${user.name}")
			// 这里可以添加跳转到用户详情页面的逻辑
			// val intent = Intent(this, UserDetailActivity::class.java)
			// intent.putExtra("userId", user.id)
			// startActivity(intent)
			// 传递用户信息到开卡界面
			val intent = Intent(this, NewCard2Activity::class.java)
			intent.putExtra("clientId", user.clientId)
			startActivity(intent)
			}


			}


			private fun setupRefreshLayout() {
			binding?.refreshLayout?.apply {
			// 设置Footer跟随功能，确保无更多数据时Footer能正确显示
			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)
			}


			override fun onLoadMore(refreshLayout: RefreshLayout) {
			// 如果还有更多数据，加载下一页
			if (hasMoreData) {
			currentPage++
			searchUser(currentFarmerId, currentFarmerName, currentCardNumber, false)
			} else {
			// 完成加载并提示没有更多数据
			refreshLayout.finishLoadMore(500, true, false)
			ToastUtil.show("没有更多数据了")
			// 完成加载并显示已到底状态
			refreshLayout.finishLoadMoreWithNoMoreData()
			}
			}
			})
			@@ -130,7 +144,12 @@
			* @param cardNumber 银行卡号
			* @param isRefresh 是否为刷新操作
			*/
			private fun searchUser(farmerId: String, farmerName: String, cardNumber: String, isRefresh: Boolean = true) {
			private fun searchUser(
			farmerId: String,
			farmerName: String,
			cardNumber: String,
			isRefresh: Boolean = true
			) {
			val map = mutableMapOf<String, Any>()

			if (farmerId.isNotEmpty()) {
			@@ -144,7 +163,7 @@
			if (cardNumber.isNotEmpty()) {
			map["cardNum"] = cardNumber
			}


			// 添加分页参数
			map["pageCurr"] = currentPage
			map["pageSize"] = pageSize
			@@ -152,14 +171,11 @@
			// 使用正确的类型参数
			ApiManager.getInstance().requestGetLoading(
			this,
			"sell/client/get",
			"terminal/client/getTermClients",
			SearchUserResult::class.java,
			map,
			object : SubscriberListener<BaseResponse<SearchUserResult>>() {
			override fun onNext(t: BaseResponse<SearchUserResult>) {
			// 完成刷新或加载动作
			finishRefreshOrLoad(isRefresh)

			if (t.success) {
			// 处理搜索成功的情况
			val result = t.content
			@@ -172,26 +188,45 @@
			} else {
			userAdapter?.addData(result.obj)
			}


			// 判断是否还有更多数据：根据当前页码和总页数判断
			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)
			}
			}
			@@ -205,7 +240,7 @@
			}
			)
			}


			/**
			* 完成刷新或加载操作
			* @param isRefresh 是否为刷新操作
			@@ -214,7 +249,13 @@
			if (isRefresh) {
			binding?.refreshLayout?.finishRefresh(true)
			} else {
			binding?.refreshLayout?.finishLoadMore(true)
			// 如果没有更多数据，不在这里调用finishLoadMore，由具体逻辑调用finishLoadMoreWithNoMoreData
			// 如果有更多数据，则正常调用finishLoadMore
			if (hasMoreData) {
			binding?.refreshLayout?.finishLoadMore(true)
			}
			// 注意：当hasMoreData为false时，不调用任何finish方法，
			// 因为已经在具体逻辑中调用了finishLoadMoreWithNoMoreData()
			}
			}