优化0到负数临界情况发送与判断。

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip

zqtoolkit/build.gradle

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

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

@@ -72,14 +72,33 @@ abstract class ScaleBaseKit : ScaleBaseAction, ScaleUpdateAction {
         }
     }
 
+    private fun String?.toDoubleOrZero(): Double {
+        return try {
+            this?.toDouble() ?: 0.0
+        } catch (e: Exception) {
+            0.0
+        }
+    }
+
+    private var lastLivingWeight: LivingWeight? = null
+
+    /**
+     * 判断是否需要立即发送
+     */
+    private fun shouldEmitOnce(weight: LivingWeight): Boolean {
+        val lastNum = lastLivingWeight?.weight.toDoubleOrZero()
+        val num = weight.weight.toDoubleOrZero()
+        return (lastNum >= 0 && num < 0.0) || (lastNum <= 0 && num > 0)
+    }
+
     override fun updateWeight(weight: LivingWeight) {
         GlobalScope.launch {
             //稳定状态且读数正常
-            if (weight.isStable && !weight.isReadErr) {
+            if (weight.isStable && !weight.isReadErr && !shouldEmitOnce(weight)) {
                 readErrCache.clear()
                 when {
                     stableWeight.size == STABLE_COUNT -> {
-                        var single = stableWeight.distinctBy { it.weight }
+                        val single = stableWeight.distinctBy { it.weight }
                         if (single.size == 1) {
                             //给业务的unit要小写
                             if (weight.unit.isNotEmpty())
@@ -90,9 +109,8 @@ abstract class ScaleBaseKit : ScaleBaseAction, ScaleUpdateAction {
                         }
                         stableWeight.clear()
                     }
-                    stableWeight.size > STABLE_COUNT -> {
-                        stableWeight.clear()
-                    }
+
+                    stableWeight.size > STABLE_COUNT -> stableWeight.clear()
                     else -> stableWeight.add(weight)
                 }
             } else {
@@ -104,9 +122,11 @@ abstract class ScaleBaseKit : ScaleBaseAction, ScaleUpdateAction {
                                 disconnect()
                             connectCache.clear()
                         }
+
                         else -> readErrCache.add(true)
                     }
             }
+            lastLivingWeight = weight
         }
     }