canteen/StallDualScreen
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改菜品识别逻辑

Browse Source
This commit is contained in:
mazengfei
2025-11-06 14:18:48 +08:00
parent cd883af92f
commit cc2fd2d743
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/sw/dualscreen/activity/MainActivity.kt
+4 -3
View File
@@ -210,9 +210,10 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
Timber.d("registerDataChange weight = $weight") Timber.d("registerDataChange weight = $weight")
presentation?.updateWeight(weight) presentation?.updateWeight(weight)
// if (weight <= 0.005) {//检测到秤上没有东西，重新启动识别菜品 if (weight <= 0.005 && presentation?.mealPickupMode == 1) {//余量取餐，检测到秤上没有东西，重新启动识别菜品
// isRecognitionFood = true isRecognitionFood = true
// } }
if (weight - lastWeight > 0.05 && isRecognitionFood) { // 大于50g if (weight - lastWeight > 0.05 && isRecognitionFood) { // 大于50g
if (presentation?.mealPickupMode == 1) { if (presentation?.mealPickupMode == 1) {
isRecognitionFood = false isRecognitionFood = false
app/src/main/java/com/sw/dualscreen/presentation/SecondaryScreenPresentation.kt
+7 -1
View File
@@ -797,12 +797,18 @@ class SecondaryScreenPresentation(
Timber.d("postUserData userNutritionData = ${userNutritionData == null}, currentFood = ${currentFood == null}") Timber.d("postUserData userNutritionData = ${userNutritionData == null}, currentFood = ${currentFood == null}")
return return
} }
var eatWeight = 0.0
if (mealPickupMode == 0) {//即放即取
eatWeight = recognitionWeight - 0
} else {
eatWeight = recognitionWeight - lastWeight
}
val userNutritionParam = UserNutritionParam( val userNutritionParam = UserNutritionParam(
userId = userNutritionData?.userId!!, userId = userNutritionData?.userId!!,
foodId = currentFood?.id!!, foodId = currentFood?.id!!,
faceTime = recognitionTime, faceTime = recognitionTime,
faceEndTime = System.currentTimeMillis(), faceEndTime = System.currentTimeMillis(),
eatWeight = recognitionWeight - lastWeight, eatWeight = eatWeight,//lastWeight
foodWeight = lastWeight foodWeight = lastWeight
) )
viewModel.postUserNutritionData(listOf<UserNutritionParam>(userNutritionParam)) viewModel.postUserNutritionData(listOf<UserNutritionParam>(userNutritionParam))