From a6cef6155b73204e99a6069b0164210d3ccaf644 Mon Sep 17 00:00:00 2001
From: lvmeng <848755140@qq.com>
Date: Wed, 20 Aug 2025 14:53:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E9=87=87=E6=A0=B7=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E3=80=81=E5=88=B6=E4=BD=9C=E7=B1=BB=E5=88=AB=E8=8F=9C=E5=93=81?=
 =?UTF-8?q?=E9=87=8D=E9=87=8F=E8=BF=9B=E8=A1=8C=E6=A0=BC=E5=BC=8F=E5=8C=96?=
 =?UTF-8?q?=E4=BF=9D=E7=95=993=E4=BD=8D=E5=B0=8F=E6=95=B0=EF=BC=8C?=
 =?UTF-8?q?=E9=87=87=E6=A0=B7=E6=B7=BB=E5=8A=A0=E9=A3=9F=E6=9D=90=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E9=9D=9E=E9=9B=B6=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/shuwei/dish/match/adapter/DishShowAdapter.kt  | 7 +++++--
 .../java/com/shuwei/dish/match/adapter/SamplingAdapter.kt  | 6 ++++--
 .../java/com/shuwei/dish/match/ui/DishSamplingActivity.kt  | 5 +++--
 app/src/main/java/com/shuwei/dish/match/ui/HomeActivity.kt | 6 +++---
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/shuwei/dish/match/adapter/DishShowAdapter.kt b/app/src/main/java/com/shuwei/dish/match/adapter/DishShowAdapter.kt
index 62df657..7fd7dab 100644
--- a/app/src/main/java/com/shuwei/dish/match/adapter/DishShowAdapter.kt
+++ b/app/src/main/java/com/shuwei/dish/match/adapter/DishShowAdapter.kt
@@ -11,6 +11,7 @@ import com.shuwei.dish.match.entity.FoodRecord
 import com.shuwei.dish.match.databinding.ListItemDishBinding
 import com.shuwei.dish.match.utils.ext.gone
 import com.shuwei.dish.match.utils.ext.visible
+import java.text.DecimalFormat
 
 class DishShowAdapter(list: MutableList<FoodRecord>) :
     BaseQuickAdapter<FoodRecord, DishShowAdapter.VH>(list) {
@@ -43,8 +44,8 @@ class DishShowAdapter(list: MutableList<FoodRecord>) :
                 clBlock.setBackgroundResource(R.drawable.shape_white_fb_15_corners)
                 tvDishCount.visible()
                 tvDishCount.text =
-                    "累计统计：${totalWeight / 1000.0F}kg(${item.count}次)"
-                tvShowState.text = "${(item.foodWeight ?: 0.toDouble()) / 1000.0F}kg"
+                    "累计统计：${df.format(totalWeight / 1000.0F)}kg(${item.count}次)"
+                tvShowState.text = "${df.format((item.foodWeight ?: 0.toDouble()) / 1000.0F)}kg"
             } else {
                 tvDishName.setTextColor(
                     ContextCompat.getColor(holder.itemView.context, R.color.black999)
@@ -56,4 +57,6 @@ class DishShowAdapter(list: MutableList<FoodRecord>) :
         }
     }
 
+    val df = DecimalFormat("0.000")
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/shuwei/dish/match/adapter/SamplingAdapter.kt b/app/src/main/java/com/shuwei/dish/match/adapter/SamplingAdapter.kt
index ce5aef9..3ae27b6 100644
--- a/app/src/main/java/com/shuwei/dish/match/adapter/SamplingAdapter.kt
+++ b/app/src/main/java/com/shuwei/dish/match/adapter/SamplingAdapter.kt
@@ -11,6 +11,7 @@ import com.shuwei.dish.match.entity.FoodRecord
 import com.shuwei.dish.match.databinding.ListItemDishBinding
 import com.shuwei.dish.match.utils.ext.gone
 import com.shuwei.dish.match.utils.ext.visible
+import java.text.DecimalFormat
 
 class SamplingAdapter(list: MutableList<FoodRecord>) :
     BaseQuickAdapter<FoodRecord, SamplingAdapter.VH>(list) {
@@ -43,10 +44,11 @@ class SamplingAdapter(list: MutableList<FoodRecord>) :
                 tvShowState.text =  "烹饪中"
             } else {
                 val useWeight = if (totalWeight > 0.toDouble()) totalWeight else (item.foodWeight ?: 0.toDouble())
-                tvDishCount.text = "累计统计：${useWeight / 1000.0F}kg(${item.count}次)"
-                tvShowState.text = "${(item.foodWeight ?: 0.toDouble()) / 1000.0F}kg"
+                tvDishCount.text = "累计统计：${df.format(useWeight / 1000.0F)}kg(${item.count}次)"
+                tvShowState.text = "${df.format((item.foodWeight ?: 0.toDouble()) / 1000.0F)}kg"
             }
         }
     }
 
+    val df = DecimalFormat("0.000")
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/shuwei/dish/match/ui/DishSamplingActivity.kt b/app/src/main/java/com/shuwei/dish/match/ui/DishSamplingActivity.kt
index 9ab38ce..a3a78a4 100644
--- a/app/src/main/java/com/shuwei/dish/match/ui/DishSamplingActivity.kt
+++ b/app/src/main/java/com/shuwei/dish/match/ui/DishSamplingActivity.kt
@@ -196,8 +196,9 @@ class DishSamplingActivity : BaseActivity() {
                 toast("请选择主辅材类型")
                 return@setOnClickListener
             }
-            if (tempDishEntity!!.useWeight == null) {
-                toast("请将食材放在称上称重")
+            val realWeight = tempDishEntity!!.useWeight ?: 0.0
+            if (realWeight < 0.toDouble()) {
+                toast("食材用量需要大于0")
                 return@setOnClickListener
             }
             tempDishEntity!!.apply {
diff --git a/app/src/main/java/com/shuwei/dish/match/ui/HomeActivity.kt b/app/src/main/java/com/shuwei/dish/match/ui/HomeActivity.kt
index 780910d..fda3431 100644
--- a/app/src/main/java/com/shuwei/dish/match/ui/HomeActivity.kt
+++ b/app/src/main/java/com/shuwei/dish/match/ui/HomeActivity.kt
@@ -74,9 +74,9 @@ class HomeActivity : BaseActivity() {
 //      appViewModel.clearAllSeasoning(){}
 
 
-        binding.btnDeviceConfig.setOnClickListener {
-            startActivity<SubmitFoodActivity>{}
-        }
+//        binding.btnDeviceConfig.setOnClickListener {
+//            startActivity<SubmitFoodActivity>{}
+//        }
     }
 
     private fun initRecyclerView() {