From 7bc80650814c179eab230f05e53eba38e5ef8382 Mon Sep 17 00:00:00 2001
From: chenglifeng <clf_cheng@163.com>
Date: Tue, 5 Nov 2024 11:30:23 +0800
Subject: [PATCH] =?UTF-8?q?=E7=82=B9=E6=B5=8B=E9=87=8F=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../logic/viewmodel/ProjectViewModel.kt       |  2 +-
 .../java/com/project/survey/network/Api.kt    |  4 +-
 .../pointmeasure/PointMeasureListActivity.kt  | 54 +++++++++----------
 3 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/app/src/main/java/com/project/survey/logic/viewmodel/ProjectViewModel.kt b/app/src/main/java/com/project/survey/logic/viewmodel/ProjectViewModel.kt
index 502eef0..7b4d742 100644
--- a/app/src/main/java/com/project/survey/logic/viewmodel/ProjectViewModel.kt
+++ b/app/src/main/java/com/project/survey/logic/viewmodel/ProjectViewModel.kt
@@ -71,7 +71,7 @@ class ProjectViewModel : BaseViewModel() {
     fun fetchMeasureDataList(type: String, page: Int, keyword: String? = null) {
         launch {
             val query = if (keyword.isNullOrBlank())
-                ""
+                null
             else {
                 if (type == Constants.TYPE_BD_CLJH)
                     "[{\"code\":\"SY_CURRENTTASK\",\"type\":\"=\",\"value\":\"施工单位APP上开展测量工作\"},{\"type\":\"and\",\"value\":[{\"code\":\"CLJH_LCMC\",\"type\":\"like\",\"value\":\"${keyword}\",\"cn\":\"or\"},{\"code\":\"CLJH_BDLSH\",\"type\":\"like\",\"value\":\"${keyword}\",\"cn\":\"or\"},{\"code\":\"BD_FBFXPZ_DWGCMC\",\"type\":\"like\",\"value\":\"${keyword}\",\"cn\":\"or\"},{\"code\":\"BD_FBFXPZ_FBGCMC\",\"type\":\"like\",\"value\":\"${keyword}\",\"cn\":\"or\"},{\"code\":\"BD_FBFXPZ_FXGCMC\",\"type\":\"like\",\"value\":\"${keyword}\",\"cn\":\"or\"},{\"code\":\"BD_FBFXPZ_DYGCMC\",\"type\":\"like\",\"value\":\"${keyword}\",\"cn\":\"or\"}]}]"
diff --git a/app/src/main/java/com/project/survey/network/Api.kt b/app/src/main/java/com/project/survey/network/Api.kt
index f0c9852..b2a2fed 100644
--- a/app/src/main/java/com/project/survey/network/Api.kt
+++ b/app/src/main/java/com/project/survey/network/Api.kt
@@ -150,9 +150,9 @@ interface Api {
         @Header("projectId") projectId: String = SPUtils.getString(SPConstants.PROJECT_ID),
         @Field("tableCode") tableCode: String,
         @Field("funcCode") funcCode: String,
-        @Field("j_qurey") j_qurey: String = "",
+        @Field("j_query") j_qurey: String?,
         @Field("page") page: Int,
-        @Field("limit") limit: Int = 30,
+        @Field("limit") limit: Int = 1000,
         @Field("start") start: Int = 0
     ): HttpResult<ListResult<MeasureBean>>
 
diff --git a/app/src/main/java/com/project/survey/ui/pointmeasure/PointMeasureListActivity.kt b/app/src/main/java/com/project/survey/ui/pointmeasure/PointMeasureListActivity.kt
index f8c37bf..b595728 100644
--- a/app/src/main/java/com/project/survey/ui/pointmeasure/PointMeasureListActivity.kt
+++ b/app/src/main/java/com/project/survey/ui/pointmeasure/PointMeasureListActivity.kt
@@ -22,8 +22,7 @@ import com.scwang.smart.refresh.layout.listener.OnRefreshLoadMoreListener
 /**
  * 点测量列表
  */
-class PointMeasureListActivity : BaseBindingActivity<ActivityPointMeasureListBinding>(),
-    OnRefreshLoadMoreListener {
+class PointMeasureListActivity : BaseBindingActivity<ActivityPointMeasureListBinding>() {
 
     companion object {
         const val KEY_TYPE = "KEY_TYPE"
@@ -39,7 +38,7 @@ class PointMeasureListActivity : BaseBindingActivity<ActivityPointMeasureListBin
 
     private val adapter by lazy { PointMeasureListAdapter(type) }
     private var type = ""
-    private var currentPage = 1
+//    private var currentPage = 1
 
     //    private var start = 0
     private var searchContent = "" // 搜索框里的内容
@@ -56,7 +55,9 @@ class PointMeasureListActivity : BaseBindingActivity<ActivityPointMeasureListBin
                 else -> ""
             }
         )
-        mBinding.smartRefreshLayout.setOnRefreshLoadMoreListener(this)
+        mBinding.smartRefreshLayout.setEnableLoadMore(false)
+        mBinding.smartRefreshLayout.setEnableRefresh(false)
+//        mBinding.smartRefreshLayout.setOnRefreshLoadMoreListener(this)
         mBinding.recyclerView.setAdapter(adapter)
         adapter.isStateViewEnable = true
     }
@@ -71,24 +72,23 @@ class PointMeasureListActivity : BaseBindingActivity<ActivityPointMeasureListBin
         viewModel.measureBeanListResponse.observe(this) {
             dismissLoadingDialog()
             mBinding.smartRefreshLayout.smartDismiss()
-            if (currentPage == 1) {
+//            if (currentPage == 1) {
                 adapter.submitList(it.rows)
                 if (it.rows.isEmpty()) {
                     mBinding.smartRefreshLayout.finishLoadMoreWithNoMoreData()
                     adapter.setStateViewLayout(this, R.layout.layout_no_data)
-                } else {
-                    currentPage++
-//                    start += it.totalCount
                 }
-            } else {
-                if (it.rows.isEmpty()) {
-                    mBinding.smartRefreshLayout.finishLoadMoreWithNoMoreData()
-                } else {
-                    adapter.addAll(it.rows)
-                    currentPage++
-//                    start += it.totalCount
-                }
-            }
+//                else {
+//                    currentPage++
+//                }
+//            } else {
+//                if (it.rows.isEmpty()) {
+//                    mBinding.smartRefreshLayout.finishLoadMoreWithNoMoreData()
+//                } else {
+//                    adapter.addAll(it.rows)
+//                    currentPage++
+//                }
+//            }
         }
         // 生成报验单
         viewModel.createInspectionReportResponse.observe(this) {
@@ -113,7 +113,7 @@ class PointMeasureListActivity : BaseBindingActivity<ActivityPointMeasureListBin
         // 搜索
         mBinding.searchWidget.setOnEditorSearchListener {
             searchContent = it
-            currentPage = 1
+//            currentPage = 1
             showLoadingDialog()
             fetchData()
         }
@@ -154,17 +154,17 @@ class PointMeasureListActivity : BaseBindingActivity<ActivityPointMeasureListBin
     }
 
     private fun fetchData() {
-        viewModel.fetchMeasureDataList(type, currentPage, searchContent)
+        viewModel.fetchMeasureDataList(type, 1, searchContent)
     }
 
-    override fun onRefresh(refreshLayout: RefreshLayout) {
-        currentPage = 1
-        fetchData()
-    }
-
-    override fun onLoadMore(refreshLayout: RefreshLayout) {
-        fetchData()
-    }
+//    override fun onRefresh(refreshLayout: RefreshLayout) {
+//        currentPage = 1
+//        fetchData()
+//    }
+//
+//    override fun onLoadMore(refreshLayout: RefreshLayout) {
+//        fetchData()
+//    }
 
 
 }
\ No newline at end of file