diff --git a/app/src/main/java/com/sw/inbound/activity/GoodsListActivity.kt b/app/src/main/java/com/sw/inbound/activity/GoodsListActivity.kt index 98f9e06..3983827 100644 --- a/app/src/main/java/com/sw/inbound/activity/GoodsListActivity.kt +++ b/app/src/main/java/com/sw/inbound/activity/GoodsListActivity.kt @@ -230,6 +230,14 @@ abstract class GoodsListActivity : ComponentActivity() { Timber.d("${this.javaClass.simpleName}-searchFood-裁剪bitmap保存文件路径:${file?.absolutePath}") val foodNameList = FoodModule.queryFood(newBmp) runOnUiThread { + if (foodNameList.isEmpty()) { + handleGoodsResult( + goodsList = mutableListOf(), + file = file, + name = null + ) + return@runOnUiThread + } viewModel.recognizeGoodsList(foodNameList) { goodsList -> handleGoodsResult( goodsList = if (goodsList.size == foodNameList.size) goodsList else mutableListOf(), diff --git a/app/src/main/java/com/sw/inbound/dialog/BaseDialog.kt b/app/src/main/java/com/sw/inbound/dialog/BaseDialog.kt index e9cc696..bc9965b 100644 --- a/app/src/main/java/com/sw/inbound/dialog/BaseDialog.kt +++ b/app/src/main/java/com/sw/inbound/dialog/BaseDialog.kt @@ -15,7 +15,7 @@ import com.sw.inbound.utils.ext.hideKeyboard abstract class BaseDialog( context: Context, var defWidth: Int = 1500.dp, - var defHeight: Int = 800.dp + var defHeight: Int = 900.dp ) : Dialog(context, R.style.DialogTheme) { override fun onCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/java/com/sw/inbound/objbox/FoodModule.kt b/app/src/main/java/com/sw/inbound/objbox/FoodModule.kt index 9b746d0..26b823c 100644 --- a/app/src/main/java/com/sw/inbound/objbox/FoodModule.kt +++ b/app/src/main/java/com/sw/inbound/objbox/FoodModule.kt @@ -96,7 +96,7 @@ object FoodModule { 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.2 }.forEach { + idScoreList.filter { it.score < 0.01 }.forEach { val food = box.get(it.id) //FoodQueryResult(id = it.id, name = food.name, foodIdx = food.foodIdx, score = it.score) food.name?.let { key ->