采集向量数据接口调试

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

@@ -4,10 +4,10 @@ import android.annotation.SuppressLint
 import androidx.activity.viewModels
 import androidx.core.widget.addTextChangedListener
 import androidx.recyclerview.widget.LinearLayoutManager
+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.databinding.LayoutEmptySearchBinding
 import com.sw.dualscreen.dialog.WarnDialog
 import com.sw.dualscreen.ext.addOnActionSearchListener
 import com.sw.dualscreen.ext.gone
@@ -15,12 +15,10 @@ import com.sw.dualscreen.ext.hideKeyboard
 import com.sw.dualscreen.ext.visible
 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
 
 class CollectedFoodActivity : BaseActivity<ActivityCollectedFoodBinding>() {
 
@@ -42,7 +40,7 @@ class CollectedFoodActivity : BaseActivity<ActivityCollectedFoodBinding>() {
         CollectedFoodNewAdapter(list).apply {
 //            isStateViewEnable = true
             addOnItemChildClickListener(R.id.ivDeleteFood) { _, _, position ->
-                deleteGoods(position)
+                loadDeleteDialog(position)
             }
         }
     }
@@ -182,17 +180,22 @@ class CollectedFoodActivity : BaseActivity<ActivityCollectedFoodBinding>() {
         //}
     }
 
-    private fun deleteGoods(position: Int) {
+    private fun loadDeleteDialog(position: Int) {
         WarnDialog(
             context = context,
             content = "请确认是否删除菜品：${list[position].foodName}？",
             confirmBlock = {
+                deleteGoods(position)
+            }).show()
+    }
+
+    private fun deleteGoods(position: Int) {
+        val food = list[position]
+        showWaitingDialog("加载中……")
+        viewModel.deleteCollectFood(food.foodId, GlobalData.foodModelVersion) { deleteSuccess ->
+            if (deleteSuccess) {
                 Thread {
-                    runOnUiThread {
-                        showWaitingDialog("加载中……")
-                    }
-                    val name = list[position].foodName
-                    val filterIdList = box?.all?.filter { it.name == name }?.map { it.id }
+                    val filterIdList = box?.all?.filter { it.foodName == food.foodName }?.map { it.id }
                     box?.removeByIds(filterIdList)
                     runOnUiThread {
                         hideWaitingDialog()
@@ -203,7 +206,8 @@ class CollectedFoodActivity : BaseActivity<ActivityCollectedFoodBinding>() {
                         }
                     }
                 }.start()
-            }).show()
+            }
+        }
     }