From d3cff64fbe05ade519e2e1fff0109516f093f323 Mon Sep 17 00:00:00 2001
From: xiaowusky <chenyangyang3858@dingtalk.com>
Date: Mon, 27 Nov 2023 17:56:55 +0800
Subject: [PATCH] =?UTF-8?q?desc:=E5=8E=BB=E6=8E=89=E6=B0=B4=E5=8D=B0?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=EF=BC=8C=E5=AD=97=E4=BD=93=E6=94=BE=E5=A4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/yinuo/safetywatcher/watcher/port/GasUtilss.kt    | 3 +++
 library-push/src/main/java/org/easydarwin/TxtOverlay.kt       | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/port/GasUtilss.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/port/GasUtilss.kt
index ba066ad..1a05361 100644
--- a/app/src/main/java/com/yinuo/safetywatcher/watcher/port/GasUtilss.kt
+++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/port/GasUtilss.kt
@@ -176,6 +176,9 @@ fun convertData(
     unit: String,
     localGasUnit: String
 ): Float {
+    if (value <= 0f) {
+        return 0f
+    }
     var retValue = value
     // lel需要先转ppm
     if (unit == UNIT_LEL) {
diff --git a/library-push/src/main/java/org/easydarwin/TxtOverlay.kt b/library-push/src/main/java/org/easydarwin/TxtOverlay.kt
index a3a8bf9..af25c25 100644
--- a/library-push/src/main/java/org/easydarwin/TxtOverlay.kt
+++ b/library-push/src/main/java/org/easydarwin/TxtOverlay.kt
@@ -52,8 +52,8 @@ object TxtOverlay {
             // 文字转bitmap
             YUVUtils.generateBitmap(
                 bmp,
-                dateFormat.format(lastTipUpdateTime) + "@" + mToDoShowTip,
-                40,
+                /*dateFormat.format(lastTipUpdateTime) + "@" +*/ mToDoShowTip,
+                45,
                 Color.WHITE
             )
             yuv = YUVUtils.getYUVByBitmap(bmp)