update 自提点列表接口取消分页请求

Components/BUserOrder/src/main/java/com/yidian/shenghuoquan/border/ui/SelectPickupPointActivity.kt

@@ -70,12 +70,11 @@ class SelectPickupPointActivity : BaseMvvmActivity<BorderActivitySelectPickupPoi
   }
 
   private fun initSmartRefresh() {
+    // 禁止上拉加载更多
+    binding.rlPickupPointList.setEnableLoadMore(false)
     binding.rlPickupPointList.setOnRefreshListener {
       requestPickupPoint(SelectPickupPointViewModel.LoadType.REFRESH)
     }
-    binding.rlPickupPointList.setOnLoadMoreListener {
-      requestPickupPoint(SelectPickupPointViewModel.LoadType.LOAD_MORE)
-    }
   }
 
   /**
@@ -89,14 +88,10 @@ class SelectPickupPointActivity : BaseMvvmActivity<BorderActivitySelectPickupPoi
       binding.rlPickupPointList.finishRefresh(it != null)
       updateData(it)
     })
-    vm.pickupPointListLoadMore.observe(this, {
-      binding.rlPickupPointList.finishLoadMore(it != null)
-      updateData(it)
-    })
   }
 
   /**
-   * 更新列表数据
+   * 更新数据
    */
   private fun updateData(data: PickupPointListDto?) {
     if (data == null) return

Components/BUserOrder/src/main/java/com/yidian/shenghuoquan/border/viewmodel/SelectPickupPointViewModel.kt

@@ -20,14 +20,6 @@ class SelectPickupPointViewModel : BaseViewModel() {
   private val _pickupPointListRefresh = MutableLiveData<PickupPointListDto?>()
   val pickupPointListRefresh: LiveData<PickupPointListDto?> = _pickupPointListRefresh
 
-  private val _pickupPointListLoadMore = MutableLiveData<PickupPointListDto?>()
-  val pickupPointListLoadMore: LiveData<PickupPointListDto?> = _pickupPointListLoadMore
-
-  /**
-   * 记录分页请求下一页
-   */
-  private var nextPage = 2
-
   /**
    * 请求自提点列表
    */
@@ -37,28 +29,18 @@ class SelectPickupPointViewModel : BaseViewModel() {
     latitude: Double?,
     keyWords: String?,
     type: LoadType,
-    page: Int = 1,
-    limit: Int = 20,
   ) {
     val requestParams = HashMap<String, String?>(6)
     requestParams["marketing_id"] = marketingId
     longitude?.let { requestParams["longitude"] = it.toString() }
     latitude?.let { requestParams["latitude"] = it.toString() }
     if (keyWords?.isNotEmpty() == true) requestParams["keywords"] = keyWords
-    if (type == LoadType.SEARCH || type == LoadType.REFRESH) {
-      requestParams["page"] = page.toString()
-    } else {
-      requestParams["page"] = nextPage.toString()
-    }
-    requestParams["limit"] = limit.toString()
     OrderRemoteDataSource.getPickupPointList(
       object : IGetPickupPointListCallback {
         override fun getPickupPointListSuccess(result: PickupPointListDto?) {
-          if (type == LoadType.SEARCH || type == LoadType.REFRESH) nextPage = 2 else nextPage++
           when (type) {
             LoadType.SEARCH -> _pickupPointListSearch.value = result
             LoadType.REFRESH -> _pickupPointListRefresh.value = result
-            LoadType.LOAD_MORE -> _pickupPointListLoadMore.value = result
           }
         }
 
@@ -66,7 +48,6 @@ class SelectPickupPointViewModel : BaseViewModel() {
           when (type) {
             LoadType.SEARCH -> _pickupPointListSearch.value = null
             LoadType.REFRESH -> _pickupPointListRefresh.value = null
-            LoadType.LOAD_MORE -> _pickupPointListLoadMore.value = null
           }
         }
 
@@ -83,9 +64,6 @@ class SelectPickupPointViewModel : BaseViewModel() {
 
     // 下拉刷新
     REFRESH,
-
-    // 上拉加载更多
-    LOAD_MORE
   }
 
 }

Components/BUserOrder/src/main/res/layout/border_item_pickup_point_list.xml

@@ -30,6 +30,8 @@
             android:id="@+id/tv_pickup_point_name"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:maxLines="1"
             android:text="@{data.takePlaceName}"
             android:textColor="@color/color_333333"
             android:textSize="@dimen/sp16"
@@ -81,6 +83,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/dp8"
+            android:ellipsize="end"
+            android:maxLines="1"
             android:text="@{@string/pickup_point_contract_name(data.contactName)}"
             android:textColor="@color/color_999999"
             android:textSize="@dimen/sp14"

Components/BUserOrder/src/main/res/layout/border_view_pickup_point_search.xml

@@ -14,12 +14,10 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="@dimen/dp40"
         android:background="@drawable/shape_solid_ffffff_corner_10"
         android:paddingStart="@dimen/dp9"
-        android:paddingTop="@dimen/dp12"
-        android:paddingEnd="@dimen/dp9"
-        android:paddingBottom="@dimen/dp12">
+        android:paddingEnd="@dimen/dp8">
 
         <ImageView
             android:id="@+id/iv_search"