From 46a5de6e9871c5c52ba4195576c1c2a4725abb08 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 20 八月 2021 09:11:51 +0800
Subject: [PATCH] Merge branch 'WJC' into wxr7
---
HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs | 28 +++++++++++++++++++---------
1 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs b/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
index f85bcf3..8cb90b4 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
@@ -32,7 +32,7 @@
if (bodyView != null)
{
var humiSensorList = FunctionList.List.GetEnvirSensorsList().FindAll((obj) => obj.spk == SPK.SensorHumidity);
- var enviSensorList = FunctionList.List.GetEnvirSensorsList().FindAll((obj) => obj.spk == SPK.SensorEnvironment);
+ var enviSensorList = FunctionList.List.GetEnvirSensorsList().FindAll((obj) => SPK.EvironmentSensorList().Contains(obj.spk ));
foreach (var enviTemp in enviSensorList)
{
var tempAttr = enviTemp.attributes.Find((obj) => obj.key == "humidity");
@@ -43,21 +43,26 @@
name = enviTemp.name,
sid = enviTemp.sid,
deviceId = enviTemp.deviceId,
- attributes = new List<FunctionAttributes> { new FunctionAttributes { key = "value", value = tempAttr.value } },
+ attributes = new List<FunctionAttributes> { new FunctionAttributes { key = "value", state = tempAttr.state, curValue = tempAttr.curValue } },
};
humiSensorList.Add(newTemp);
}
}
double humiTotalValues = 0;
+ int humiTotalCount = 0;
foreach (var temp in humiSensorList)
{
double humiValue = 0;
double.TryParse(temp.GetAttrState(FunctionAttributeKey.Value), out humiValue);
- humiTotalValues += humiValue;
+ if(humiValue > 0)
+ {
+ humiTotalValues += humiValue;
+ humiTotalCount++;
+ }
}
if (humiTotalValues > 0)
{
- bodyView.btnIndoorHumiValues.Text = "/" + humiTotalValues + "%";
+ bodyView.btnIndoorHumiValues.Text = "/" + (humiTotalValues /humiTotalCount).ToString("0")+ "%";
}
bodyView.btnIndoorHumiValues.Width = bodyView.btnIndoorHumiValues.GetTextWidth();
}
@@ -65,7 +70,7 @@
}
/// <summary>
- /// 鏇存柊瀹ゅ唴浼犳劅鍣ㄦ暟鎹�-鏅氱偣
+ /// 鏇存柊瀹ゅ唴浼犳劅鍣ㄦ暟鎹�
/// </summary>
public static void LoadEvent_RefreshEnvirIndoorTemp()
{
@@ -74,7 +79,7 @@
if (bodyView != null)
{
var tempSensorList = FunctionList.List.GetEnvirSensorsList().FindAll((obj) => obj.spk == SPK.SensorTemperature);
- var enviSensorList = FunctionList.List.GetEnvirSensorsList().FindAll((obj) => obj.spk == SPK.SensorEnvironment);
+ var enviSensorList = FunctionList.List.GetEnvirSensorsList().FindAll((obj) => SPK.EvironmentSensorList().Contains(obj.spk));
foreach (var enviTemp in enviSensorList)
{
var tempAttr = enviTemp.attributes.Find((obj) => obj.key == "temperature");
@@ -85,21 +90,26 @@
name = enviTemp.name,
sid = enviTemp.sid,
deviceId = enviTemp.deviceId,
- attributes = new List<FunctionAttributes> { new FunctionAttributes { key = "value", value = tempAttr.value } },
+ attributes = new List<FunctionAttributes> { new FunctionAttributes { key = "value", state = tempAttr.state, curValue = tempAttr.curValue } },
};
tempSensorList.Add(newTemp);
}
}
double tempTotalValues = 0;
+ int 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)
{
- bodyView.btnIndoorTempValues.Text = "/" + tempTotalValues + "掳";
+ bodyView.btnIndoorTempValues.Text = "/" + (tempTotalValues /tempTotalCount).ToString("0.0")+ "掳";
}
bodyView.btnIndoorTempValues.Width = bodyView.btnIndoorTempValues.GetTextWidth();
}
--
Gitblit v1.8.0