首页、支付功能

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

@@ -85,12 +85,21 @@ class CollectedFoodActivity : BaseActivity<ActivityCollectedFoodBinding>() {
             box = ObjectBox.boxStore.boxFor(Food::class)
         }
         list.clear()
-        var queryList = box?.all?.distinctBy { it.name }
+        val totalList = box?.all
+            ?.filter { it.name!=null }
+            ?.groupBy { it.name!! }
+            ?.map { CollectedFoodBean(foodName = it.key, count = it.value.size) }
+        //var queryMap:Map<String, List<Food>> ?= null
         if (searchName.isNullOrBlank().not()) {
-            queryList = queryList?.filter { it.name?.contains(searchName) == true }
-        }
-        queryList?.forEach {
-            list.add(CollectedFoodBean(foodName = it.name))
+            //queryMap = totalMap?.filter { it.key.contains(searchName) }
+            val temp = totalList?.filter { it.foodName?.contains(searchName) == true}
+            if (temp.isNullOrEmpty().not()) {
+                list.addAll(temp)
+            }
+        } else {
+            if (totalList.isNullOrEmpty().not()) {
+                list.addAll(totalList)
+            }
         }
         adapter.notifyDataSetChanged()
         if (list.isEmpty()) {