优化

app/src/main/java/com/sw/inbound/activity/GoodsListActivity.kt

@@ -41,6 +41,7 @@ import com.sw.inbound.model.response.SearchGoodsInfo
 import com.sw.inbound.objbox.Food
 import com.sw.inbound.objbox.FoodModule
 import com.sw.inbound.objbox.FoodModule.IdNameScore
+import com.sw.inbound.objbox.FoodModule.bitmap2FloatArray
 import com.sw.inbound.objbox.Food_
 import com.sw.inbound.objbox.ObjectBox
 import com.sw.inbound.sdk.SensorScaleUtils
@@ -49,6 +50,7 @@ import com.sw.inbound.utils.BitmapCropper
 import com.sw.inbound.utils.BitmapSaver
 import com.sw.inbound.utils.CameraUtils
 import com.sw.inbound.utils.DateTimeUtils
+import com.sw.inbound.utils.FileUtils
 import com.sw.inbound.utils.ImageUtil
 import com.sw.inbound.utils.LogSaveUtil
 import com.sw.inbound.utils.PreciseDelayHandler
@@ -369,13 +371,20 @@ abstract class GoodsListActivity : ComponentActivity() {
         //物品名称
         //foodList = foodList.map { it.split("WP")[0] }
 
-        val foodList = FoodModule.getFoodScoreList(bitmap)
-        if (bitmap.isRecycled.not()) {
-            bitmap.recycle()
-        }
-//            if (newBmp.isRecycled.not()) {
-//                newBmp.recycle()
+        // TODO: ---------------------------
+//        file?.let {
+//            FileUtils.fileToBitmap(it)?.let { bitmap2 ->
+//                val floatArray = bitmap2FloatArray(bitmap2, false)
+//                val floatArray2 = bitmap2FloatArray(bitmap, false)
+//
+//                val arrayJson = floatArray.toJsonString()
+//                val arrayJson2 = floatArray2.toJsonString()
+//                toast("${arrayJson == arrayJson2}")
 //            }
+//        }
+        // TODO: ---------------------------
+
+        val foodList = FoodModule.getFoodScoreList(bitmap)
 //            val count = foodList.count { it.score < 0.15 }
         val count = foodList.size
         if (count == 0) {
@@ -428,6 +437,12 @@ abstract class GoodsListActivity : ComponentActivity() {
                 offsetX = 30, offsetY = 100
             )
             readBitmap(newBmp)
+            if (newBmp.isRecycled.not()) {
+                newBmp.recycle()
+            }
+            if (bitmap.isRecycled.not()) {
+                bitmap.recycle()
+            }
         }
     }