Commit b5a4f652 authored by tongzifang's avatar tongzifang

修复zq sunmi 负数稳定

parent 2dfbd1ea
...@@ -30,7 +30,7 @@ android { ...@@ -30,7 +30,7 @@ android {
} }
} }
group 'com.qmai.android.zqtoolkit' group 'com.qmai.android.zqtoolkit'
version '1.0.7.2' version '1.0.7.3'
gradlePublish { gradlePublish {
......
...@@ -2,7 +2,6 @@ package com.qmai.zqtoolkit.base ...@@ -2,7 +2,6 @@ package com.qmai.zqtoolkit.base
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.content.Context import android.content.Context
import android.os.RemoteException
import android.util.Log import android.util.Log
import com.qmai.zqtoolkit.ConnectState import com.qmai.zqtoolkit.ConnectState
import com.qmai.zqtoolkit.LivingWeight import com.qmai.zqtoolkit.LivingWeight
...@@ -58,7 +57,7 @@ object SunmiScaleKit : ScaleBaseKit() { ...@@ -58,7 +57,7 @@ object SunmiScaleKit : ScaleBaseKit() {
) )
updateWeight( updateWeight(
LivingWeight( LivingWeight(
i2 == 1, i2 and 1 == 1,
decimalFormat.format((i * 1.0f / 1000).toDouble()), decimalFormat.format((i * 1.0f / 1000).toDouble()),
"kg", "kg",
decimalFormat.format((i1 * 1.0f / 1000).toDouble()), decimalFormat.format((i1 * 1.0f / 1000).toDouble()),
......
...@@ -2,6 +2,7 @@ package com.qmai.zqtoolkit.base ...@@ -2,6 +2,7 @@ package com.qmai.zqtoolkit.base
import android.content.Context import android.content.Context
import android.util.Log import android.util.Log
import com.blankj.utilcode.util.NumberUtils
import com.qmai.zqtoolkit.ConnectState import com.qmai.zqtoolkit.ConnectState
import com.qmai.zqtoolkit.LivingWeight import com.qmai.zqtoolkit.LivingWeight
import com.qmai.zqtoolkit.base.scale.ScaleBaseKit import com.qmai.zqtoolkit.base.scale.ScaleBaseKit
...@@ -9,6 +10,7 @@ import com.zqebsdk.zqebsdk ...@@ -9,6 +10,7 @@ import com.zqebsdk.zqebsdk
import com.zqprintersdk.PrinterConst import com.zqprintersdk.PrinterConst
import kotlinx.coroutines.* import kotlinx.coroutines.*
import kotlinx.coroutines.flow.* import kotlinx.coroutines.flow.*
import java.math.BigDecimal
/** /**
* author : tongzi * author : tongzi
...@@ -143,7 +145,11 @@ object ZqScaleKit : ScaleBaseKit() { ...@@ -143,7 +145,11 @@ object ZqScaleKit : ScaleBaseKit() {
var strUnitTare = strRet[2].replace("[^a-z^A-Z]".toRegex(), "") var strUnitTare = strRet[2].replace("[^a-z^A-Z]".toRegex(), "")
strTare = strRet[2].replace(strUnitTare, "") strTare = strRet[2].replace(strUnitTare, "")
} }
if (Integer.valueOf(strRet[0]) == 0) {
//0是读取成功 2且读数<0也是稳定
if (Integer.valueOf(strRet[0]) == 0 || (Integer.valueOf(strRet[0]) == 2
&& strWeight.isNotEmpty() && strWeight.toFloat() < 0)
) {
strState = "OK" strState = "OK"
when { when {
stableWeight.size == 4 -> { stableWeight.size == 4 -> {
......
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