From d773ab0295feba24ae4fc14f61e8aa310e40f4ba Mon Sep 17 00:00:00 2001
From: zuojincheng <lf_zuo@163.com>
Date: 星期五, 06 六月 2025 16:55:57 +0800
Subject: [PATCH] refactor(nfc): 优化写卡流程和状态更新

---
 generallibrary/src/main/java/com/dayu/general/activity/SearchUserListActivity.kt |   41 +++++++++++++++++++++++------------------
 1 files changed, 23 insertions(+), 18 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 5e11d51..2b39bc4 100644
--- a/generallibrary/src/main/java/com/dayu/general/activity/SearchUserListActivity.kt
+++ b/generallibrary/src/main/java/com/dayu/general/activity/SearchUserListActivity.kt
@@ -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 = ""
@@ -57,11 +58,11 @@
                 currentFarmerId = farmerId
                 currentFarmerName = farmerName
                 currentCardNumber = cardNumber
-                
+
                 // 閲嶇疆鍒嗛〉鐘舵��
                 currentPage = 1
                 hasMoreData = true
-                
+
                 // 鎵ц鎼滅储
                 searchUser(farmerId, farmerName, cardNumber, true)
             }
@@ -79,20 +80,19 @@
             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 {
             // 璁剧疆鍒锋柊鍜屽姞杞芥洿澶氱洃鍚櫒
@@ -103,7 +103,7 @@
                     hasMoreData = true
                     searchUser(currentFarmerId, currentFarmerName, currentCardNumber, true)
                 }
-                
+
                 override fun onLoadMore(refreshLayout: RefreshLayout) {
                     // 濡傛灉杩樻湁鏇村鏁版嵁锛屽姞杞戒笅涓�椤�
                     if (hasMoreData) {
@@ -130,7 +130,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 +149,7 @@
         if (cardNumber.isNotEmpty()) {
             map["cardNum"] = cardNumber
         }
-        
+
         // 娣诲姞鍒嗛〉鍙傛暟
         map["pageCurr"] = currentPage
         map["pageSize"] = pageSize
@@ -152,14 +157,14 @@
         // 浣跨敤姝ｇ‘鐨勭被鍨嬪弬鏁�
         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,7 +177,7 @@
                                 } else {
                                     userAdapter?.addData(result.obj)
                                 }
-                                
+
                                 // 鍒ゆ柇鏄惁杩樻湁鏇村鏁版嵁锛氭牴鎹綋鍓嶉〉鐮佸拰鎬婚〉鏁板垽鏂�
                                 hasMoreData = currentPage < result.pageTotal
                             } else {
@@ -205,7 +210,7 @@
             }
         )
     }
-    
+
     /**
      * 瀹屾垚鍒锋柊鎴栧姞杞芥搷浣�
      * @param isRefresh 鏄惁涓哄埛鏂版搷浣�

--
Gitblit v1.8.0