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? = null - private val collectList: MutableList = mutableListOf( - FoodCollectionBean(isShowCamera = true), - FoodCollectionBean(isShowCamera = true), - FoodCollectionBean(isShowCamera = true), - FoodCollectionBean(isShowCamera = true), - FoodCollectionBean(isShowCamera = true), - FoodCollectionBean(isShowCamera = true) - ) + private val collectList: MutableList = mutableListOf() 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 @@