负数 优化

zqtoolkit/build.gradle

@@ -30,7 +30,7 @@ android {
     }
 }
 group 'com.qmai.android.zqtoolkit'
-version '1.2.8'
+version '1.2.8.1'
 
 gradlePublish {
 

zqtoolkit/src/main/java/com/qmai/zqtoolkit/base/scale/ScaleBaseKit.kt

@@ -13,6 +13,7 @@ import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.SharedFlow
 import kotlinx.coroutines.launch
+import java.math.BigDecimal
 
 /**
  * tongzi
@@ -77,23 +78,27 @@ abstract class ScaleBaseKit : ScaleBaseAction, ScaleUpdateAction {
             //稳定状态且读数正常
             if (weight.isStable && !weight.isReadErr) {
                 readErrCache.clear()
-                when {
-                    stableWeight.size == STABLE_COUNT -> {
-                        var single = stableWeight.distinctBy { it.weight }
-                        if (single.size == 1) {
-                            //给业务的unit要小写
-                            if (weight.unit.isNotEmpty())
-                                weight.unit = weight.unit.lowercase()
-                            single.firstOrNull()?.let {
-                                _livingWeight.emit(it)
+                if (BigDecimal(weight.weight) < BigDecimal.ZERO) {
+                    _livingWeight.emit(weight)
+                } else {
+                    when {
+                        stableWeight.size == STABLE_COUNT -> {
+                            var single = stableWeight.distinctBy { it.weight }
+                            if (single.size == 1) {
+                                //给业务的unit要小写
+                                if (weight.unit.isNotEmpty())
+                                    weight.unit = weight.unit.lowercase()
+                                single.firstOrNull()?.let {
+                                    _livingWeight.emit(it)
+                                }
                             }
+                            stableWeight.clear()
                         }
-                        stableWeight.clear()
-                    }
-                    stableWeight.size > STABLE_COUNT -> {
-                        stableWeight.clear()
+                        stableWeight.size > STABLE_COUNT -> {
+                            stableWeight.clear()
+                        }
+                        else -> stableWeight.add(weight)
                     }
-                    else -> stableWeight.add(weight)
                 }
             } else {
                 _livingWeight.emit(weight)