1.修改数据监控模块UI

workbenches/src/main/java/com/yingyang/workbenches/datamonitor/DataMonitorFragment.kt

@@ -36,7 +36,6 @@ class DataMonitorFragment : BaseMVVMFragment<FragmentDataMonitorBinding, DataMon
     /**
      * 数据监控adapter
      */
-    private var pageIndex = 1
     private var selectedTime = ""
     private var dataMonitorList = mutableListOf<Record>()
     private val dataMonitorAdapter by lazy { DataMonitorAdapter() }
@@ -53,8 +52,6 @@ class DataMonitorFragment : BaseMVVMFragment<FragmentDataMonitorBinding, DataMon
 
     override fun initViews() {
         binding {
-            swipeWeek.setEnableLoadMore(true)
-            swipeWeek.setEnableRefresh(true)
             rvDate.layoutManager = GridLayoutManager(mContext, 7)
             rvDate.adapter = dateAdapter
             dateAdapter.currentDate = User.getNowDay()
@@ -62,7 +59,7 @@ class DataMonitorFragment : BaseMVVMFragment<FragmentDataMonitorBinding, DataMon
             dateAdapter.onDateClickListener = { bean ->
                 dataMonitorAdapter.clearData()
                 selectedTime = bean
-                getDayRecordDetail(true, true)
+                getDayRecordDetail()
             }
             rvWeek.adapter = dataMonitorAdapter
         }
@@ -85,15 +82,6 @@ class DataMonitorFragment : BaseMVVMFragment<FragmentDataMonitorBinding, DataMon
                 loadData()
             }
 
-            swipeWeek.setOnLoadMoreListener {
-                getDayRecordDetail(false, false)
-
-            }
-
-            swipeWeek.setOnRefreshListener {
-                getDayRecordDetail(true, false)
-            }
-
             btnTrainingDaily.setOnSingleClickListener {
                 if (TextUtils.isEmpty(url).not()) {
                     val trainingDailyUrl = url +
@@ -110,11 +98,11 @@ class DataMonitorFragment : BaseMVVMFragment<FragmentDataMonitorBinding, DataMon
                 if (checkedId == R.id.ragExclusiveTraining) {
                     playClass = "A"
                     btnTrainingDaily.show(true)
-                    getDayRecordDetail(true, true)
+                    getDayRecordDetail()
                 } else if (checkedId == R.id.ragFreeTraining) {
                     playClass = "C"
                     btnTrainingDaily.show(false)
-                    getDayRecordDetail(true, true)
+                    getDayRecordDetail()
                 }
             }
         }
@@ -124,7 +112,7 @@ class DataMonitorFragment : BaseMVVMFragment<FragmentDataMonitorBinding, DataMon
         loadData()
         getStatisticRecord()
         selectedTime = User.getNowDay()
-        getDayRecordDetail(true, true)
+        getDayRecordDetail()
     }
 
     /**
@@ -148,23 +136,11 @@ class DataMonitorFragment : BaseMVVMFragment<FragmentDataMonitorBinding, DataMon
     /**
      * 查询指定日期游戏记录
      */
-    private fun getDayRecordDetail(isRefresh: Boolean, showLoading: Boolean) {
-        if (isRefresh) {
-            dataMonitorAdapter.clearData()
-            dataMonitorList.clear()
-            pageIndex = 1
-            binding.swipeWeek.resetNoMoreData()
-        } else {
-            pageIndex++
-        }
-        viewModel.getDayRecordDetail(pageIndex, selectedTime, playClass, showLoading, fail = {
-            endRefresh()
+    private fun getDayRecordDetail() {
+        viewModel.getDayRecordDetail(selectedTime, playClass, fail = {
             it.toast()
         }, success = {
-            endRefresh()
-            if (isRefresh) {
-                dataMonitorList.clear()
-            }
+            dataMonitorList.clear()
             if (it != null) {
                 binding.tvTrainingTimeToday.text = if (TextUtils.equals("0", it.time)) {
                     "0秒"
@@ -173,8 +149,6 @@ class DataMonitorFragment : BaseMVVMFragment<FragmentDataMonitorBinding, DataMon
                 }
                 if (it.record.isNullOrEmpty().not()) {
                     dataMonitorList.addAll(it.record)
-                } else {
-                    binding.swipeWeek.finishLoadMoreWithNoMoreData()
                 }
                 url = it.url
             }
@@ -311,14 +285,4 @@ class DataMonitorFragment : BaseMVVMFragment<FragmentDataMonitorBinding, DataMon
         calendar[Calendar.MONTH] = calendar[Calendar.MONTH] - 1
     }
 
-    /**
-     * 结束刷新
-     */
-    private fun endRefresh() {
-        binding {
-            swipeWeek.finishRefresh()
-            swipeWeek.finishLoadMore()
-        }
-    }
-
 }

workbenches/src/main/java/com/yingyang/workbenches/datamonitor/DataMonitorViewModel.kt

@@ -47,16 +47,13 @@ class DataMonitorViewModel : BaseViewModel() {
      * 查询指定日期游戏记录
      */
     fun getDayRecordDetail(
-        pageIndex: Int,
         date: String,
         playType: String,
-        showLoading: Boolean,
         fail: ((msg: String) -> Unit)? = null,
         success: ((success: DayRecordDetailBean?) -> Unit)? = null,
-    ) = launchFlow(showLoading) {
+    ) = launchFlow(true) {
         val requestBean = GetDayRecordDetailBean().apply {
             time = date
-            pageNum = pageIndex.toString()
             playClass = playType
         }
         val body = XUtils.createJson(GsonUtil.GsonString(requestBean))

workbenches/src/main/res/layout/fragment_data_monitor.xml

@@ -214,21 +214,14 @@
                 </RadioGroup>
             </com.google.android.material.card.MaterialCardView>
 
-            <com.scwang.smartrefresh.layout.SmartRefreshLayout
-                android:id="@+id/swipeWeek"
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/rvWeek"
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
-                android:layout_weight="1">
-
-                <androidx.recyclerview.widget.RecyclerView
-                    android:id="@+id/rvWeek"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:scrollbarStyle="insideOverlay"
-                    android:scrollbars="vertical"
-                    app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
-
-            </com.scwang.smartrefresh.layout.SmartRefreshLayout>
+                android:layout_weight="1"
+                android:scrollbarStyle="insideOverlay"
+                android:scrollbars="vertical"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
 
             <Button
                 android:id="@+id/btnTrainingDaily"