From 54fc655d739d28beed4b9adc10501efe8faf1d25 Mon Sep 17 00:00:00 2001
From: lvmeng <848755140@qq.com>
Date: Mon, 1 Dec 2025 10:38:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96-=E5=BE=85=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sw/inbound/activity/FoodCollectionActivity.kt  | 14 ++++++++++----
 .../sw/inbound/adapter/FoodCollectionAdapter.kt    |  3 ++-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/sw/inbound/activity/FoodCollectionActivity.kt b/app/src/main/java/com/sw/inbound/activity/FoodCollectionActivity.kt
index 57093f8..0a138ed 100644
--- a/app/src/main/java/com/sw/inbound/activity/FoodCollectionActivity.kt
+++ b/app/src/main/java/com/sw/inbound/activity/FoodCollectionActivity.kt
@@ -265,7 +265,7 @@ class FoodCollectionActivity : ComponentActivity() {
     }
 
     private val cameraCallback: (Uri) -> Unit = { uri ->
-        val index = collectList.indexOfFirst { it.bitmap == null }
+        val index = collectList.indexOfFirst { it.imageFile == null }
         if (index == -1) {
             toast("每次只允许保存6条数据")
             rerurn@cameraCallback
@@ -295,19 +295,25 @@ class FoodCollectionActivity : ComponentActivity() {
                     cropBitmap, this, "IMG_CROP_${System.currentTimeMillis()}.jpg"
                 )
                 Timber.d("${this.javaClass.simpleName}-searchFood-裁剪bitmap保存文件路径：${file?.absolutePath}")
-
                 collectList[index].let {
                     it.imageVector = imageVector
-                    it.bitmap = cropBitmap
+                    it.bitmap = null
                     it.imageFile = file
                     it.isShowCamera = false
                 }
                 collectionAdapter.notifyItemChanged(index)
                 val count = collectList.count { it.imageFile!=null && it.uploadSuccess.not() }
                 binding.btnUploadImage.text = "待上传图片${count}张"
+                if (cropBitmap.isRecycled.not()) {
+                    cropBitmap.recycle()
+                }
+                if (bitmap.isRecycled.not()) {
+                    bitmap.recycle()
+                }
             }
         } catch (e: Exception) {
             e.printStackTrace()
+            toast("程序异常")
         }
     }
 
@@ -353,7 +359,7 @@ class FoodCollectionActivity : ComponentActivity() {
                 )
             )
             collectList[position].let {
-                it.imageVector = imageVector
+//                it.imageVector = imageVector
                 it.isFinish = true
             }
             runOnUiThread {
diff --git a/app/src/main/java/com/sw/inbound/adapter/FoodCollectionAdapter.kt b/app/src/main/java/com/sw/inbound/adapter/FoodCollectionAdapter.kt
index a49ea57..c020827 100644
--- a/app/src/main/java/com/sw/inbound/adapter/FoodCollectionAdapter.kt
+++ b/app/src/main/java/com/sw/inbound/adapter/FoodCollectionAdapter.kt
@@ -38,7 +38,8 @@ class FoodCollectionAdapter (var list: MutableList<FoodCollectionBean>) :
                     scaleType = ImageView.ScaleType.FIT_CENTER
                     //setImageURI(it.imageUri)
                     //load(it.bitmap)
-                    setImageBitmap(it.bitmap!!)
+//                    setImageBitmap(it.bitmap!!)
+                    load(it.imageFile)
                 }
             }
         }