From 30b2b178a920113099b83a435c833ab2191e0a11 Mon Sep 17 00:00:00 2001
From: lvmeng <848755140@qq.com>
Date: Wed, 8 Apr 2026 10:59:07 +0800
Subject: [PATCH] =?UTF-8?q?refactor(SensorScaleUtils):=20=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E9=87=8D=E9=87=8F=E8=AF=BB=E5=8F=96=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除状态字符串转换的日志代码
- 简化稳定状态判断逻辑，移除重复的lastWeight比较
- 将重量单位转换提取为独立变量，提高代码可读性
- 保持原有的回调机制和重量单位转换功能
---
 .../com/sw/dualscreen/sdk/SensorScaleUtils.kt | 27 ++++++++++---------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/com/sw/dualscreen/sdk/SensorScaleUtils.kt b/app/src/main/java/com/sw/dualscreen/sdk/SensorScaleUtils.kt
index e96d935..e7f68cd 100644
--- a/app/src/main/java/com/sw/dualscreen/sdk/SensorScaleUtils.kt
+++ b/app/src/main/java/com/sw/dualscreen/sdk/SensorScaleUtils.kt
@@ -31,21 +31,24 @@ object SensorScaleUtils {
              * 读取重量
              */
             override fun readWeight(state: Int, value: Double) {
-                val stateStr = when (state) {
-                    SensorScale.STATE_STABLE -> "稳定"
-                    SensorScale.STATE_UNSTABLE -> "不稳定"
-                    SensorScale.STATE_OVER_WEIGHT -> "量程溢出"
-                    else -> "未知"
-                }
+//                val stateStr = when (state) {
+//                    SensorScale.STATE_STABLE -> "稳定"
+//                    SensorScale.STATE_UNSTABLE -> "不稳定"
+//                    SensorScale.STATE_OVER_WEIGHT -> "量程溢出"
+//                    else -> "未知"
+//                }
 //                Log.d(TAG, "readWeight state = ${stateStr}, weight = $value")
                 // 只使用稳定值
-                if (state == SensorScale.STATE_STABLE && lastWeight != value) {
-                    lastWeight = value
-                    callback?.invoke(value)
-                }
+                if (state == SensorScale.STATE_STABLE) {
+                    if (lastWeight != value) {
+                        lastWeight = value
+                        callback?.invoke(value)
+                    }
 
-                weightCallbackList.forEach {
-                    it.invoke((value * 1000).roundToInt())
+                    weightCallbackList.forEach {
+                        val currentWeight = value * 1000
+                        it.invoke(currentWeight.roundToInt())
+                    }
                 }
             }