From 3ab5a7455fbd9e046950bca248aee40aea25cf34 Mon Sep 17 00:00:00 2001 From: xiaowusky Date: Tue, 21 Nov 2023 14:46:26 +0800 Subject: [PATCH] =?UTF-8?q?desc:=E5=B8=83=E5=B1=80=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yinuo/safetywatcher/watcher/port/ParseHelper.kt | 4 ++-- app/src/main/res/layout/activity_home.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/port/ParseHelper.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/port/ParseHelper.kt index 27f3e00..88393af 100644 --- a/app/src/main/java/com/yinuo/safetywatcher/watcher/port/ParseHelper.kt +++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/port/ParseHelper.kt @@ -105,13 +105,13 @@ object ParseHelper { val rangHex: String = HexUtils.byteArrToHex(it, 11, 11 + 2) val rangHexLong: Long = HexUtils.hexToLong(rangHex) - LogUtils.w("receive msg 单位转换前 $type.desc, 浓度 = $value $unit") + LogUtils.w("receive msg 单位转换前 $type, 浓度 = $value $unit") //根据单位进行数值转换 val localGasUnit = getLocalGasUnit(type.desc) if (localGasUnit != unit) { value = convertData(type, value, unit, localGasUnit) - LogUtils.w("receive msg 单位转换后 $type.desc, 浓度 = $value $localGasUnit") + LogUtils.w("receive msg 单位转换后 $type, 浓度 = $value $localGasUnit") } // 插入 diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml index 0c3ae98..396e574 100644 --- a/app/src/main/res/layout/activity_home.xml +++ b/app/src/main/res/layout/activity_home.xml @@ -20,7 +20,7 @@ android:id="@+id/tip_View" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/_100dp" + android:layout_marginTop="220px" android:layout_marginStart="@dimen/_100dp"/>