From 6a5879320dfac43155d024814a0a4d794a612696 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期三, 21 八月 2024 13:52:14 +0800
Subject: [PATCH] 齐河联网版程序除补卡相关逻辑

---
 qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/UserSearchActivity.java |   24 ++++++++++++++++++------
 1 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/UserSearchActivity.java b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/UserSearchActivity.java
index b45759d..3a3b79e 100644
--- a/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/UserSearchActivity.java
+++ b/qiheonlinelibrary/src/main/java/com/dayu/qiheonlinelibrary/activity/UserSearchActivity.java
@@ -12,6 +12,7 @@
 import com.dayu.qiheonlinelibrary.adapter.UserSearchAdapter;
 import com.dayu.qiheonlinelibrary.bean.UserListResult;
 import com.dayu.qiheonlinelibrary.databinding.ActivityUserSearchQhlBinding;
+import com.dayu.qiheonlinelibrary.dbBean.UserCardBean;
 import com.dayu.qiheonlinelibrary.net.ApiManager;
 import com.dayu.qiheonlinelibrary.net.BaseResponse;
 import com.dayu.qiheonlinelibrary.net.subscribers.SubscriberListener;
@@ -32,6 +33,8 @@
  * 澶囨敞锛氱敤鎴锋悳绱�
  */
 public class UserSearchActivity extends BaseActivity {
+    public static UserSearchActivity userSearchActivity;
+
     ActivityUserSearchQhlBinding binding;
     UserSearchDialog userSearchDialog;
     RefreshLayout myRefreshLayout;
@@ -45,9 +48,12 @@
 
     int type;//褰撳墠鎿嶄綔绫诲瀷
 
+    UserCardBean userCardBean = new UserCardBean();
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        userSearchActivity = this;
         binding = ActivityUserSearchQhlBinding.inflate(LayoutInflater.from(this));
         setContentView(binding.getRoot());
         type = this.getIntent().getIntExtra("type", 0);
@@ -69,11 +75,18 @@
         adapter = new UserSearchAdapter(this, records, new UserSearchAdapter.OnItemClickListener() {
             @Override
             public void onItemClick(int position) {
+                UserListResult.Records record = records.get(position);
+                userCardBean.setUserName(record.getPeasantName());
+                userCardBean.setUserID(record.getPeasantIdNumber());
+                userCardBean.setPhone(record.getPeasantPhone());
+                userCardBean.setPersonId(record.getPeasantId());
+                userCardBean.setAddressCode(record.getAdcd());
+                userCardBean.setAddressName(record.getAdcdName());
                 Intent intent = new Intent(UserSearchActivity.this, CardSearchActivity.class);
-                intent.putExtra("pearsontId", records.get(position).getPeasantId());
+                intent.putExtra("pearsontId", record.getPeasantId());
                 intent.putExtra("type", type);
+                intent.putExtra("dbUserCard", userCardBean);
                 UserSearchActivity.this.startActivity(intent);
-                UserSearchActivity.this.finish();
             }
         });
         LinearLayoutManager layoutManager = new LinearLayoutManager(this);
@@ -113,15 +126,14 @@
         data.put("peasantName", name);
         data.put("current", page);
         data.put("pageSize", size);
-        ApiManager.getInstance().requestPostLoading(this, "api/sjgg/base/peasant/pagePeasantVo", UserListResult.class, data, new SubscriberListener<BaseResponse<UserListResult>>() {
+        ApiManager.getInstance().requestPostLoading(this, "base/peasant/pagePeasantVo", UserListResult.class, data, new SubscriberListener<BaseResponse<UserListResult>>() {
             @Override
             public void onNext(BaseResponse<UserListResult> t) {
                 if (t.isSuccess()) {
-                    if (t.getData().getTotal() == records.size()) {
+                    if (t.getData().getTotal() == records.size() || size > t.getData().getTotal()) {
                         myRefreshLayout.finishLoadMoreWithNoMoreData();
-                    } else {
-                        records.addAll(t.getData().getRecords());
                     }
+                    records.addAll(t.getData().getRecords());
                     adapter.notifyDataSetChanged();
                     myRefreshLayout.finishLoadMore();
                 }

--
Gitblit v1.8.0