单位小写

app/src/main/java/com/qimai/android/widget/ZqToolActivity.kt

@@ -193,12 +193,12 @@ class ZqToolActivity : AppCompatActivity() {
                         tvState?.text = "稳定"
                         tvState?.setBackgroundColor(Color.GREEN)
                         tvLivingWeight?.text =
-                            "实时重量" + it.weight + "time:" + System.currentTimeMillis()
+                            "实时重量" + it.weight +" 单位" + it.unit + "time:" + System.currentTimeMillis()
                     } else {
                         tvState?.setBackgroundColor(Color.RED)
                         tvState?.text = "不稳定"
                         tvLivingWeight?.text =
-                            "实时重量" + it.weight + "time:" + System.currentTimeMillis()
+                            "实时重量" + it.weight +" 单位" + it.unit+ "time:" + System.currentTimeMillis()
                     }
                 }
             }

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

@@ -8,7 +8,7 @@ package com.qmai.zqtoolkit
 data class LivingWeight(
     val isStable: Boolean,
     val weight: String,
-    val unit: String,
+    var unit: String,
     val tare: String,
     val isReadErr: Boolean
 )

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

@@ -62,6 +62,9 @@ abstract class ScaleBaseKit : ScaleBaseAction, ScaleUpdateAction {
                 when {
                     stableWeight.size == STABLE_COUNT -> {
                         if (stableWeight.toSet().size == 1) {
+                            //给业务的unit要小写
+                            if (weight.unit.isNotEmpty())
+                                weight.unit = weight.unit.lowercase()
                             _livingWeight.emit(weight)
                         }
                         stableWeight.clear()