采集向量数据接口调试

app/src/main/java/com/sw/dualscreen/objbox/FoodModule.kt

@@ -3,7 +3,6 @@ package com.sw.dualscreen.objbox
 import android.content.Context
 import android.graphics.Bitmap
 import android.net.Uri
-import android.util.SparseLongArray
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
 import com.sw.dualscreen.MyApp
@@ -26,7 +25,7 @@ import java.io.InputStream
 object FoodModule {
 
     private const val THRESHOLD = 0.8
-    private var module_mobile: Module?=null
+    private var module_mobile: Module? = null
     private lateinit var box: Box<Food>
     private lateinit var embeddingsList: List<List<Float>>
     private lateinit var labelsList: IntArray
@@ -35,16 +34,18 @@ object FoodModule {
     val NO_STD_RGB = floatArrayOf(1.0f, 1.0f, 1.0f)
     val DEFAULT_FOOD_INDEX = -1
 
-    fun init(context: Context) {
+    fun init(context: Context, block: () -> Unit = {}) {
         Thread {
             module_mobile = Module.load(copyAssetToCache(context, "best_embedding_model_mobile.pt"))
             box = ObjectBox.boxStore.boxFor(Food::class)
-            //if (box.all.isNotEmpty()) {
-            //    box.removeAll()
-            //}
+            //初始化默认重新拉取数据，先清空本地数据
+            if (box.all.isNotEmpty()) {
+                box.removeAll()
+            }
             //if (box.all.isEmpty()) {
             //    initDefFoodData(context)
             //}
+            block()
         }.start()
     }
 
@@ -100,16 +101,25 @@ object FoodModule {
         val idScoreList = query.findIdsWithScores()
         val nameScoreList = mutableListOf<IdNameScore>()
         idScoreList.forEach {
-            nameScoreList.add(IdNameScore(id = it.id, name = box.get(it.id).name?:"", score = it.score))
+            nameScoreList.add(
+                IdNameScore(
+                    id = it.id,
+                    name = box.get(it.id).foodName ?: "",
+                    score = it.score
+                )
+            )
         }
         val nameScoreData = GsonUtils.toJson(nameScoreList)
-        Timber.tag("FoodModule").d("registerDataChange,queryFood，耗时：${System.currentTimeMillis()-startTime},数据：$nameScoreData")
+        Timber.tag("FoodModule")
+            .d("registerDataChange,queryFood，耗时：${System.currentTimeMillis() - startTime},数据：$nameScoreData")
         return nameScoreList
     }
+
     fun getFoodScoreList(bitmap: Bitmap, queryCount: Int = 15): List<IdNameScore> {
         val startTime = System.currentTimeMillis()
         val floatArray = bitmap2FloatArray(bitmap)
-        Timber.tag("FoodModule").d("registerDataChange,bitmap2FloatArray，耗时：${System.currentTimeMillis()-startTime}")
+        Timber.tag("FoodModule")
+            .d("registerDataChange,bitmap2FloatArray，耗时：${System.currentTimeMillis() - startTime}")
         val nameScoreList = queryFoodNameScore(floatArray, queryCount)
         if (nameScoreList.isEmpty()) {
             return emptyList()
@@ -136,6 +146,7 @@ object FoodModule {
         //Timber.tag("FoodModule").d("getFoodScoreList数据：${sortedScoreList.toJsonString()}")
         return sortedScoreList
     }
+
     fun queryFood(floatArray: FloatArray, queryCount: Int = 15): List<String> {
         val query: Query<Food> =
             box.query(Food_.foodVector.nearestNeighbors(floatArray, queryCount)).build()
@@ -144,10 +155,10 @@ object FoodModule {
         val map = mutableMapOf<String, Int>()
         query.findIdsWithScores().forEach {
             val food = box.get(it.id)
-            Timber.d("${food.name}|${food.foodIdx}|${it.score}")
+            Timber.d("${food.foodName}|${food.foodId}|${food.collectId}|${food.version}|${food.otherField}|${it.score}")
             if (1 - it.score >= THRESHOLD) {
                 //FoodQueryResult(id = it.id, name = food.name, foodIdx = food.foodIdx, score = it.score)
-                food.name?.let { key ->
+                food.foodName?.let { key ->
                     val count = map[key] ?: 0
                     map.put(key, count + 1)
                 }
@@ -167,16 +178,16 @@ object FoodModule {
     }
 
     data class IdNameScore(
-        val id:Long,
-        var name:String,
+        val id: Long,
+        var name: String,
         val score: Double
     )
 
-    fun initDefFoodData(context: Context, action:()-> Unit={}) {
-        val count = box.all.count { it.foodIdx == DEFAULT_FOOD_INDEX }
-        if (count > 0) {
-            return
-        }
+    fun initDefFoodData(context: Context, action: () -> Unit = {}) {
+        //val count = box.all.count { it.foodIdx == DEFAULT_FOOD_INDEX }
+        //if (count > 0) {
+        //    return
+        //}
         val embeddingsJson = AssetsTool.readAssetsFile(context, "data/embeddings.json")
         val labelsJson = AssetsTool.readAssetsFile(context, "data/labels.json")
         val classInfoJson = AssetsTool.readAssetsFile(context, "data/class_info.json")
@@ -192,7 +203,13 @@ object FoodModule {
             val classIdx = labelsList[index]
             val foodName = foodMap["$classIdx"]
             val array = floatList.toFloatArray()
-            box.put(Food(name = foodName, foodVector = array, foodIdx = DEFAULT_FOOD_INDEX))
+            box.put(
+                Food(
+                    foodName = foodName,
+                    foodVector = array,
+                    //foodIdx = DEFAULT_FOOD_INDEX
+                )
+            )
         }
         action()
     }