接口联调

app/src/main/java/com/sw/dualscreen/activity/CollectedFoodActivity.kt

@@ -11,7 +11,7 @@ import com.sw.dualscreen.databinding.LayoutEmptySearchBinding
 import com.sw.dualscreen.dialog.WarnDialog
 import com.sw.dualscreen.ext.addOnActionSearchListener
 import com.sw.dualscreen.ext.hideKeyboard
-import com.sw.dualscreen.objbox.CollectedFoodBean
+import com.sw.dualscreen.objbox.CollectedFoodInfo
 import com.sw.dualscreen.objbox.Food
 import com.sw.dualscreen.objbox.ObjectBox
 import com.sw.dualscreen.viewmodel.BaseViewModel
@@ -30,7 +30,7 @@ class CollectedFoodActivity : BaseActivity<ActivityCollectedFoodBinding>() {
         return ActivityCollectedFoodBinding.inflate(layoutInflater)
     }
 
-    private val list: MutableList<CollectedFoodBean> = mutableListOf()
+    private val list: MutableList<CollectedFoodInfo> = mutableListOf()
     private val adapter by lazy {
         CollectedFoodNewAdapter(list).apply {
             isStateViewEnable = true
@@ -88,7 +88,7 @@ class CollectedFoodActivity : BaseActivity<ActivityCollectedFoodBinding>() {
         val totalList = box?.all
             ?.filter { it.name!=null }
             ?.groupBy { it.name!! }
-            ?.map { CollectedFoodBean(foodName = it.key, count = it.value.size) }
+            ?.map { CollectedFoodInfo(foodName = it.key, foodCount = it.value.size) }
         //var queryMap:Map<String, List<Food>> ?= null
         if (searchName.isNullOrBlank().not()) {
             //queryMap = totalMap?.filter { it.key.contains(searchName) }
@@ -106,8 +106,19 @@ class CollectedFoodActivity : BaseActivity<ActivityCollectedFoodBinding>() {
             loadEmptyView()
         }
         binding.root.hideKeyboard()
+
+        viewModel.getCollectedFoodList(pageNo = pageNo) {
+            if (it.isNotEmpty()) {
+                list.addAll(it)
+                runOnUiThread {
+                    adapter.notifyDataSetChanged()
+                }
+            }
+        }
     }
 
+    private var pageNo = 1
+
     private var emptyBinding: LayoutEmptySearchBinding? = null
     private fun loadEmptyView() {
         if (emptyBinding == null) {