From 25429f085093d89d543a0b90e30d0d62d1b7dac9 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 30 八月 2022 09:37:38 +0800
Subject: [PATCH] 合并了IOS的代码
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceOtherLogic.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceOtherLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceOtherLogic.cs
index 109732b..cd21d5b 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceOtherLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceOtherLogic.cs
@@ -97,7 +97,7 @@
{
return Language.StringByID(R.MyInternationalizationString.Close);
}
- return $"{(int)((device as DimmableLight).Level * 1.0 / 254 * 100)}%";
+ return HdlDeviceCommonLogic.Current.CalculateLightLevelPersent((device as DimmableLight).Level) + "%";
}
else if (device.Type == DeviceType.ColorTemperatureLight)
{
@@ -110,7 +110,7 @@
{
return Language.StringByID(R.MyInternationalizationString.Close);
}
- return $"{(int)((device as ColorTemperatureLight).Level * 1.0 / 254 * 100)}%";
+ return HdlDeviceCommonLogic.Current.CalculateLightLevelPersent((device as ColorTemperatureLight).Level) + "%";
}
else if (device.Type == DeviceType.WindowCoveringDevice)
{
@@ -432,8 +432,8 @@
humidity = $"{tempera.currentHumidity}%";
temperature = $"{tempera.currentTemperature}鈩�";
pm = $"{tempera.currentPmData}渭g/m鲁";
- co2 = $"{tempera.currentCO2}ppm";
- return $"{curQuality},{pm},{co2},{temperature},{humidity}";
+ //co2 = $"{tempera.currentCO2}ppm";
+ return $"{curQuality},{pm},{temperature},{humidity}";
}
else
{
--
Gitblit v1.8.0