优化

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

@@ -3,6 +3,7 @@ package com.sw.inbound.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.inbound.MyApp
@@ -60,7 +61,11 @@ object FoodModule {
             NO_STD_RGB    // [0.229, 0.224, 0.225] TORCHVISION_NORM_STD_RGB
         )
         val outputTensor = module_mobile.forward(IValue.from(inputTensor)).toTensor()
-        return outputTensor.dataAsFloatArray
+        val floatArray = outputTensor.dataAsFloatArray
+        if (bitmap.isRecycled.not()) {
+            bitmap.recycle()
+        }
+        return floatArray
     }
 
     fun queryFood(uri: Uri, queryCount: Int = 15): List<String>? {
@@ -69,40 +74,63 @@ object FoodModule {
         }
     }
 
+    /**
+     * 返回识别物品名称列表
+     */
     fun queryFood(bitmap: Bitmap, queryCount: Int = 15): List<String> {
-        val inputTensor =
-            TensorImageUtils.bitmapToFloat32Tensor(
-                bitmap,
-                NO_MEAN_RGB, // [0.485, 0.456, 0.406] TORCHVISION_NORM_MEAN_RGB
-                NO_STD_RGB    // [0.229, 0.224, 0.225] TORCHVISION_NORM_STD_RGB
-            )
-        val outputTensor = module_mobile.forward(IValue.from(inputTensor)).toTensor()
-        val floatArray = outputTensor.dataAsFloatArray
-        if (bitmap.isRecycled.not()) {
-            bitmap.recycle()
-        }
+        val floatArray = bitmap2FloatArray(bitmap)
         return queryFood(floatArray, queryCount)
     }
 
-    fun queryFood(floatArray: FloatArray, queryCount: Int = 15): List<String> {
+    /**
+     * 返回识别物品IdNameScore对象列表
+     */
+    fun queryFoodNameScore(bitmap: Bitmap, queryCount: Int = 15): List<IdNameScore> {
+        val floatArray = bitmap2FloatArray(bitmap)
+        return queryFoodNameScore(floatArray, queryCount)
+    }
+
+    fun queryFoodNameScore(floatArray: FloatArray, queryCount: Int = 15): List<IdNameScore> {
         val query: Query<Food> =
             box.query(Food_.foodVector.nearestNeighbors(floatArray, queryCount)).build()
         //查询比较分数
 //        val tempList = query.findWithScores().sortedBy { it.score }.map { "${it.get().name}|${it.get().foodIdx}|${it.score}" }
-        val map = mutableMapOf<String, Int>()
         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))
         }
         Timber.tag("FoodModule").d("queryFood数据：${nameScoreList.toJsonString()}")
-        idScoreList.filter { it.score < 0.05 }.forEach {
-            val food = box.get(it.id)
-            //FoodQueryResult(id = it.id, name = food.name, foodIdx = food.foodIdx, score = it.score)
-            food.name?.let { key ->
-                val count = map[key] ?: 0
-                map[key] = count + 1
-            }
+
+        return nameScoreList
+    }
+    fun getFoodScoreList(bitmap: Bitmap, queryCount: Int = 15): List<IdNameScore> {
+        val floatArray = bitmap2FloatArray(bitmap)
+        val nameScoreList = queryFoodNameScore(floatArray, queryCount)
+        val maxScoreList = nameScoreList.groupBy { it.name }.map { (_, value) -> value.maxByOrNull { it.score }!! }.toMutableList()
+        val map = mutableMapOf<String, Int>()
+        nameScoreList.forEach {
+            val key = it.name
+            val count = map[key] ?: 0
+            map[key] = count + 1
+        }
+        val orderList = map.entries.sortedByDescending { it.value }.map { it.key }.toMutableList()
+        val firstFood = nameScoreList[0].name
+        orderList.remove(firstFood)
+        orderList.add(0, firstFood)
+
+        val sortedScoreList = maxScoreList.sortedWith(compareBy {
+            orderList.indexOf(it.name)
+        })
+        Timber.tag("FoodModule").d("getFoodScoreList数据：${sortedScoreList.toJsonString()}")
+        return sortedScoreList
+    }
+    fun queryFood(floatArray: FloatArray, queryCount: Int = 15): List<String> {
+        val map = mutableMapOf<String, Int>()
+        val nameScoreList = queryFoodNameScore(floatArray, queryCount)
+        nameScoreList.filter { it.score < 0.05 }.forEach {
+            val count = map[it.name] ?: 0
+            map[it.name] = count + 1
         }
         val list = map.entries.sortedByDescending { it.value }.map { it.key }
         return list