Commit 53317202 authored by chuxiaoshan's avatar chuxiaoshan

优化0临界值判断。

parent fd7760d1
...@@ -6,7 +6,7 @@ package com.qmai.zqtoolkit ...@@ -6,7 +6,7 @@ package com.qmai.zqtoolkit
* description : * description :
*/ */
data class LivingWeight( data class LivingWeight(
val isStable: Boolean, var isStable: Boolean,
val weight: String, val weight: String,
var unit: String, var unit: String,
val tare: String,//皮重 val tare: String,//皮重
......
package com.qmai.zqtoolkit.base.scale package com.qmai.zqtoolkit.base.scale
import android.content.Context import android.content.Context
import android.util.Log
import com.blankj.utilcode.util.GsonUtils
import com.qmai.zqtoolkit.ConnectState import com.qmai.zqtoolkit.ConnectState
import com.qmai.zqtoolkit.LivingWeight import com.qmai.zqtoolkit.LivingWeight
import com.qmai.zqtoolkit.ScaleInfo import com.qmai.zqtoolkit.ScaleInfo
import com.qmai.zqtoolkit.base.ZqScaleKit
import com.qmai.zqtoolkit.config.QmScaleBrand import com.qmai.zqtoolkit.config.QmScaleBrand
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.GlobalScope
...@@ -88,7 +85,7 @@ abstract class ScaleBaseKit : ScaleBaseAction, ScaleUpdateAction { ...@@ -88,7 +85,7 @@ abstract class ScaleBaseKit : ScaleBaseAction, ScaleUpdateAction {
private fun shouldEmitOnce(weight: LivingWeight): Boolean { private fun shouldEmitOnce(weight: LivingWeight): Boolean {
val lastNum = lastLivingWeight?.weight.toDoubleOrZero() val lastNum = lastLivingWeight?.weight.toDoubleOrZero()
val num = weight.weight.toDoubleOrZero() val num = weight.weight.toDoubleOrZero()
return (lastNum >= 0 && num < 0.0) || (lastNum <= 0 && num > 0) return (lastNum > 0 && num <= 0.0) || (lastNum < 0 && num >= 0)
} }
override fun updateWeight(weight: LivingWeight) { override fun updateWeight(weight: LivingWeight) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment