From b5d11d4b592f2ee398d5174ad6e2e22f1db367e8 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 18 八月 2021 11:51:52 +0800
Subject: [PATCH] 2021-08-18 1.完善Android对接LinphoneSDK 2.完善SIP相关接口对接
---
HDL_ON/UI/UI2/1-HomePage/HomePage.cs | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index 1959c82..189c239 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -273,15 +273,20 @@
{
btnIndoorTempValues.Text = "/--掳";
double tempTotalValues = 0;
+ double tempTotalCount = 0;
foreach (var temp in tempSensorList)
{
double tempValue = 0;
double.TryParse(temp.GetAttrState(FunctionAttributeKey.Value), out tempValue);
- tempTotalValues += tempValue;
+ if (tempValue > 0)
+ {
+ tempTotalValues += tempValue;
+ tempTotalCount++;
+ }
}
if (tempTotalValues > 0)
{
- btnIndoorTempValues.Text = "/" + tempTotalValues + "掳";
+ btnIndoorTempValues.Text = "/" + (tempTotalValues/ tempTotalCount).ToString("0.0") + "掳";
}
}
btnIndoorTempValues.Width = btnIndoorTempValues.GetTextWidth();
@@ -322,15 +327,20 @@
{
btnIndoorHumiValues.Text = "/--%";
double humiTotalValues = 0;
+ double humiTotalCount = 0;
foreach (var humi in humiSensorList)
{
double humiValue = 0;
double.TryParse(humi.GetAttrState(FunctionAttributeKey.Value), out humiValue);
- humiTotalValues += humiValue;
+ if (humiValue > 0)
+ {
+ humiTotalValues += humiValue;
+ humiTotalCount++;
+ }
}
if (humiTotalValues > 0)
{
- btnIndoorHumiValues.Text = "/" + humiTotalValues + "%";
+ btnIndoorHumiValues.Text = "/" + (humiTotalValues / humiTotalCount).ToString("0") + "%";
}
}
btnIndoorHumiValues.Width = btnIndoorHumiValues.GetTextWidth();
--
Gitblit v1.8.0