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)