优化稳定状态判断

app/build.gradle

@@ -8,9 +8,9 @@ android {
     defaultConfig {
         applicationId "com.qimai.android.widget"
         minSdkVersion 21
-        targetSdkVersion 28
-        versionCode 11
-        versionName "1.0.11"
+        targetSdkVersion 29
+        versionCode 14
+        versionName "1.0.14"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
     }

zqtoolkit/build.gradle

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

zqtoolkit/src/main/java/com/qmai/zqtoolkit/LivingWeight.kt

@@ -10,5 +10,5 @@ data class LivingWeight(
     val weight: String,
     val unit: String,
     val tare: String,
-    val isReadErr: Boolean?
+    val isReadErr: Boolean
 )

zqtoolkit/src/main/java/com/qmai/zqtoolkit/base/AclasScaleKit.kt

@@ -22,6 +22,8 @@ import com.qmai.zqtoolkit.utils.ScaleChecker
 object AclasScaleKit : ScaleBaseKit() {
     override val TAG: String
         get() = "AclasScaleKit"
+    override val STABLE_COUNT: Int
+        get() = 4
     override val SCALE_TYPE: QmScaleType
         get() = QmScaleType.ACLAS
     private var aclasScaler: AclasScaler? = null

zqtoolkit/src/main/java/com/qmai/zqtoolkit/base/SunmiScaleKit.kt

@@ -20,7 +20,8 @@ import java.text.DecimalFormat
 object SunmiScaleKit : ScaleBaseKit() {
     override val TAG: String
         get() = "SunmiScaleKit"
-
+    override val STABLE_COUNT: Int
+        get() = 3
     override val SCALE_TYPE: QmScaleType
         get() = QmScaleType.SUNMI
 
@@ -66,7 +67,7 @@ object SunmiScaleKit : ScaleBaseKit() {
                             decimalFormat.format((i * 1.0f / 1000).toDouble()),
                             "kg",
                             decimalFormat.format((i1 * 1.0f / 1000).toDouble()),
-                            i2 == 1
+                            i2 and 1 != 1,
                         )
                     )
                 }

zqtoolkit/src/main/java/com/qmai/zqtoolkit/base/ZqScaleKit.kt

@@ -21,10 +21,11 @@ import kotlinx.coroutines.flow.flowOn
 object ZqScaleKit : ScaleBaseKit() {
     override val TAG: String
         get() = "ZqScaleKit"
-
+    override val STABLE_COUNT: Int
+        get() = 4
     override val SCALE_TYPE: QmScaleType
         get() = QmScaleType.ZQEB
-    private var stableWeight = mutableListOf<String>()
+
     override fun connect(cxt: Context?, port: String?, buad: String?) {
         super.connect(cxt, port, buad)
         val ebConnect =
@@ -155,9 +156,6 @@ object ZqScaleKit : ScaleBaseKit() {
                     && strWeight.isNotEmpty() && strWeight.toFloat() < 0)
         ) {
             strState = "OK"
-            when {
-                stableWeight.size == 4 -> {
-                    if (stableWeight.toSet().size == 1) {
             updateWeight(
                 LivingWeight(
                     true,
@@ -167,14 +165,6 @@ object ZqScaleKit : ScaleBaseKit() {
                     false
                 )
             )
-                    }
-                    stableWeight.clear()
-                }
-                stableWeight.size > 4 -> {
-                    stableWeight.clear()
-                }
-                else -> stableWeight.add(strWeight)
-            }
         } else {
 //            when (Integer.valueOf(strRet[0])) {
 //                -3 -> strState = "Data wrong"

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

@@ -5,6 +5,7 @@ import com.qmai.zqtoolkit.ConnectState
 import com.qmai.zqtoolkit.LivingWeight
 import com.qmai.zqtoolkit.ScaleHub
 import com.qmai.zqtoolkit.ScaleInfo
+import com.qmai.zqtoolkit.base.ZqScaleKit
 import com.qmai.zqtoolkit.base.scale.ScaleBaseAction
 import com.qmai.zqtoolkit.base.scale.ScaleUpdateAction
 import com.qmai.zqtoolkit.config.QmScaleType
@@ -22,6 +23,7 @@ abstract class ScaleBaseKit : ScaleBaseAction, ScaleUpdateAction {
 
     abstract val TAG: String
     abstract val SCALE_TYPE: QmScaleType
+    abstract val STABLE_COUNT: Int //顶尖称有假稳定情况，设置稳定达到一定次数后再给业务发数据
     var lastTryScale: ScaleInfo? = null
     private var lastConnectScale: ScaleInfo? = null
 
@@ -31,6 +33,7 @@ abstract class ScaleBaseKit : ScaleBaseAction, ScaleUpdateAction {
     val _livingWeight = MutableSharedFlow<LivingWeight>()
     val livingWeight: SharedFlow<LivingWeight> = _livingWeight
 
+    private var stableWeight = mutableListOf<String>()
 
     override fun connect(cxt: Context?, port: String?, buad: String?) {
         lastTryScale = ScaleInfo(port, buad, SCALE_TYPE)
@@ -54,8 +57,22 @@ abstract class ScaleBaseKit : ScaleBaseAction, ScaleUpdateAction {
 
     override fun updateWeight(weight: LivingWeight) {
         GlobalScope.launch(context = Dispatchers.IO) {
+            //稳定状态且读数正常
+            if (weight.isStable && !weight.isReadErr) {
+                when {
+                    stableWeight.size == STABLE_COUNT -> {
+                        if (stableWeight.toSet().size == 1) {
                             _livingWeight.emit(weight)
                         }
+                        stableWeight.clear()
+                    }
+                    stableWeight.size > STABLE_COUNT -> {
+                        stableWeight.clear()
+                    }
+                    else -> stableWeight.add(weight.weight)
+                }
+            } else _livingWeight.emit(weight)
+        }
     }