采集向量优化调试

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

@@ -8,17 +8,21 @@ import com.sw.dualscreen.GlobalData
 import com.sw.dualscreen.R
 import com.sw.dualscreen.adapter.CollectedFoodNewAdapter
 import com.sw.dualscreen.databinding.ActivityCollectedFoodBinding
-import com.sw.dualscreen.dialog.WarnDialog
+import com.sw.dualscreen.dialog.RemindDialog
 import com.sw.dualscreen.ext.addOnActionSearchListener
 import com.sw.dualscreen.ext.gone
 import com.sw.dualscreen.ext.hideKeyboard
 import com.sw.dualscreen.ext.visible
+import com.sw.dualscreen.model.response.ResetBoxEvent
 import com.sw.dualscreen.objbox.CollectedFoodInfo
 import com.sw.dualscreen.objbox.Food
+import com.sw.dualscreen.objbox.ObjectBox
 import com.sw.dualscreen.viewmodel.BaseViewModel
 import com.sw.dualscreen.viewmodel.UserViewModel
 import com.sw.plate.utils.ToastUtils
 import io.objectbox.Box
+import io.objectbox.kotlin.boxFor
+import org.greenrobot.eventbus.EventBus
 
 class CollectedFoodActivity : BaseActivity<ActivityCollectedFoodBinding>() {
 
@@ -47,6 +51,7 @@ class CollectedFoodActivity : BaseActivity<ActivityCollectedFoodBinding>() {
 
     override fun initialize() {
         super.initialize()
+        box = ObjectBox.boxStore.boxFor(Food::class)
         //binding.root.setOnClickListener { it.hideKeyboard() }
         binding.rvFoodList.let {
             it.layoutManager = LinearLayoutManager(this)
@@ -99,7 +104,7 @@ class CollectedFoodActivity : BaseActivity<ActivityCollectedFoodBinding>() {
     }
 
 
-    private var box: Box<Food>? = null
+    private lateinit var box: Box<Food>
 
     @SuppressLint("NotifyDataSetChanged")
     private fun getCollectGoods(searchName: String? = null) {
@@ -181,7 +186,7 @@ class CollectedFoodActivity : BaseActivity<ActivityCollectedFoodBinding>() {
     }
 
     private fun loadDeleteDialog(position: Int) {
-        WarnDialog(
+        RemindDialog(
             context = context,
             content = "请确认是否删除菜品：${list[position].foodName}？",
             confirmBlock = {
@@ -195,8 +200,16 @@ class CollectedFoodActivity : BaseActivity<ActivityCollectedFoodBinding>() {
         viewModel.deleteCollectFood(food.foodId, GlobalData.foodModelVersion) { deleteSuccess ->
             if (deleteSuccess) {
                 Thread {
-                    val filterIdList = box?.all?.filter { it.foodName == food.foodName }?.map { it.id }
-                    box?.removeByIds(filterIdList)
+                    val filterFoodList = box.all.filter { it.foodName == food.foodName }
+                    filterFoodList.forEach { it.isDel = true }
+                    box.put(filterFoodList)
+//                    val filterIdList = filterFoodList.map { it.id }
+//////                    ObjectBox.boxStore.runInTx {
+////                    box.removeByIds(filterIdList)
+//////                    EventBus.getDefault().post(ResetBoxEvent())
+//////                    }
+
+
                     runOnUiThread {
                         hideWaitingDialog()
                         adapter.removeAt(position)