采集向量数据接口调试

app/src/main/java/com/sw/dualscreen/utils/ImageUploader.kt

@@ -5,8 +5,8 @@ import java.util.concurrent.atomic.AtomicInteger
 
 class ImageUploader(
     private val totalList: List<FoodCollectionBean>,
-    private val uploadImage: suspend (List<FoodCollectionBean>)-> Boolean,
-    private val onProgress: (Int, List<FoodCollectionBean>) -> Unit,
+    private val uploadImage: suspend (List<FoodCollectionBean>)-> List<String>?,
+    private val onProgress: (Int, List<FoodCollectionBean>, List<String>) -> Unit,
     private val onError:(List<FoodCollectionBean>) -> Unit,
     private val onComplete:() -> Unit
 ) {
@@ -16,18 +16,18 @@ class ImageUploader(
     private val uploadedCount = AtomicInteger(0)
 
     suspend fun processUploads() {
-        val batches = totalList.chunked(BATCH_SIZE)
+        val batches = totalList.filter { it.imageVector!=null }.chunked(BATCH_SIZE)
 
         for (batch in batches) {
-            val success = uploadImage(batch)
-            if (!success) {
+            val idList = uploadImage(batch)
+            if (idList.isNullOrEmpty()) {
                 //println("上传失败，终止流程")
                 onError(batch)
                 return
             }
             val fileCount = batch.count { it.imageFile!=null }
             uploadedCount.addAndGet(fileCount)
-            onProgress(uploadedCount.get(), batch)
+            onProgress(uploadedCount.get(), batch, idList)
             //println("已上传 ${uploadedCount.get()}/$totalImages")
         }