From caaea3a4804cd52c6d1fd189a166c821d8ce4344 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A9=AC=E5=A2=9E=E9=A3=9E?= <331023091@qq.com>
Date: Wed, 12 Nov 2025 20:13:00 +0800
Subject: [PATCH] =?UTF-8?q?=E8=81=94=E8=B0=83=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../activity/FoodCollectionActivity.kt        | 20 +++++++++----------
 .../res/layout/activity_food_collection.xml   |  5 +++--
 2 files changed, 13 insertions(+), 12 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 287ff67..a25dfb2 100644
--- a/app/src/main/java/com/sw/inbound/activity/FoodCollectionActivity.kt
+++ b/app/src/main/java/com/sw/inbound/activity/FoodCollectionActivity.kt
@@ -49,14 +49,7 @@ class FoodCollectionActivity : ComponentActivity() {
     private val TAG = "FoodCollectionActivity"
 
     private var box: Box<Food>? = null
-    private val collectList: MutableList<FoodCollectionBean> = mutableListOf(
-        FoodCollectionBean(isShowCamera = true),
-        FoodCollectionBean(isShowCamera = true),
-        FoodCollectionBean(isShowCamera = true),
-        FoodCollectionBean(isShowCamera = true),
-        FoodCollectionBean(isShowCamera = true),
-        FoodCollectionBean(isShowCamera = true)
-    )
+    private val collectList: MutableList<FoodCollectionBean> = mutableListOf<FoodCollectionBean>()
     private lateinit var binding: ActivityFoodCollectionBinding
     private lateinit var previewView: PreviewView
 
@@ -119,6 +112,11 @@ class FoodCollectionActivity : ComponentActivity() {
             it.adapter = collectionAdapter
         }
 
+        repeat(MAX_COUNT) {
+            collectList.add(FoodCollectionBean(isShowCamera = true))
+        }
+        collectionAdapter.notifyDataSetChanged()
+
         binding.ivGoodsSearch.setOnClickListener { searchGoods() }
         binding.etGoodsInput.let { v ->
             v.addOnActionSearchListener {
@@ -195,11 +193,13 @@ class FoodCollectionActivity : ComponentActivity() {
         }
     }
 
+    val MAX_COUNT = 100
+
     @SuppressLint("NotifyDataSetChanged")
     private fun takePhoto() {
         val count = collectList.count { it.bitmap != null }
-        if (count == 6) {
-            toast("每次只允许保存6条数据")
+        if (count == MAX_COUNT) {
+            toast("每次只允许保存${MAX_COUNT}条数据")
             return
         }
         cameraUtils.takePhoto(cameraCallback)
diff --git a/app/src/main/res/layout/activity_food_collection.xml b/app/src/main/res/layout/activity_food_collection.xml
index 688bc62..30873a8 100644
--- a/app/src/main/res/layout/activity_food_collection.xml
+++ b/app/src/main/res/layout/activity_food_collection.xml
@@ -164,14 +164,15 @@
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/rvFoodCollection"
             android:layout_width="620dp"
-            android:layout_height="wrap_content"
+            android:layout_height="0dp"
             android:layout_marginStart="20dp"
             android:overScrollMode="never"
             app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
             app:layout_constraintStart_toEndOf="@id/flPreview"
             app:layout_constraintTop_toTopOf="@id/flPreview"
             app:spanCount="3"
-            tools:itemCount="6"
+            tools:itemCount="18"
+            app:layout_constraintBottom_toBottomOf="parent"
             tools:listitem="@layout/list_item_food_collection" />