From e71c57108e6dd407c2c6f0361f68150f2ff9aed5 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 15 十二月 2021 13:41:16 +0800
Subject: [PATCH] 版本备份
---
HDL_ON/UI/UI2/1-HomePage/HomePage.cs | 72 +++++++++++++++++++++++------------
1 files changed, 47 insertions(+), 25 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index c639ccd..4d75015 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -52,6 +52,8 @@
/// 褰撳墠娓╁害淇℃伅-瀹ゅ唴
/// </summary>
TextButton btnIndoorTempValues;
+ Button btnHumidityIcon;
+ Button btnPm25Icon;
/// <summary>
/// 褰撳墠婀垮害淇℃伅-瀹ゅ唴
/// </summary>
@@ -188,10 +190,10 @@
topView.AddChidren(btnResidenceName);
#if DEBUG
- //鎼滅储缃戝叧
+ int msdId = 111;
btnResidenceName.MouseUpEventHandler = (sender, e) =>
{
-
+ Control.Ins.AuthGateway();
};
#endif
@@ -287,7 +289,7 @@
foreach (var temp in tempSensorList)
{
double tempValue = 0;
- double.TryParse(temp.GetAttrState(FunctionAttributeKey.Value), out tempValue);
+ double.TryParse(temp.GetAttrState("temperature"), out tempValue);
if (tempValue > 0)
{
tempTotalValues += tempValue;
@@ -302,7 +304,7 @@
btnIndoorTempValues.Width = btnIndoorTempValues.GetTextWidth();
environmentalView.AddChidren(btnIndoorTempValues);
- Button btnHumidityIcon = new Button()
+ btnHumidityIcon = new Button()
{
X = btnIndoorTempValues.Right + Application.GetRealWidth(8),
Gravity = Gravity.CenterVertical,
@@ -341,7 +343,7 @@
foreach (var humi in humiSensorList)
{
double humiValue = 0;
- double.TryParse(humi.GetAttrState(FunctionAttributeKey.Value), out humiValue);
+ double.TryParse(humi.GetAttrState("humidity"), out humiValue);
if (humiValue > 0)
{
humiTotalValues += humiValue;
@@ -356,7 +358,7 @@
btnIndoorHumiValues.Width = btnIndoorHumiValues.GetTextWidth();
environmentalView.AddChidren(btnIndoorHumiValues);
- Button btnPm25Icon = new Button()
+ btnPm25Icon = new Button()
{
X = btnIndoorHumiValues.Right + Application.GetRealWidth(4),
Gravity = Gravity.CenterVertical,
@@ -388,8 +390,9 @@
SelectedImagePath = "Collection/DefenseStatusIcon.png",
UnSelectedImagePath = "Collection/DisarmStatusIcon.png"
};
- if (DB_ResidenceData.Instance.GatewayType == 1)
+ if (false && DB_ResidenceData.Instance.GatewayType == 1)
{
+
topView.AddChidren(btnSecurityStatus);
foreach (var temp in FunctionList.List.securities)
{
@@ -551,25 +554,25 @@
#if DEBUG
- FunctionList.List.Functions.Add(new Function()
- {
- spk = SPK.SensorDryContact,
- name = "骞叉帴鐐�",
- attributes = new List<FunctionAttributes>()
- {
- new FunctionAttributes(){ key = "status",curValue= "on",state = "on" },
- },
- });
+ //FunctionList.List.Functions.Add(new Function()
+ //{
+ // spk = SPK.SensorDryContact,
+ // name = "骞叉帴鐐�",
+ // attributes = new List<FunctionAttributes>()
+ // {
+ // new FunctionAttributes(){ key = "status",curValue= "on",state = "on" },
+ // },
+ //});
- FunctionList.List.Functions.Add(new Function()
- {
- spk = SPK.AirSwitch,
- name = "鏅鸿兘绌哄紑",
- attributes = new List<FunctionAttributes>()
- {
- new FunctionAttributes(){ key = "on_off",curValue= "on",state = "on" },
- },
- });
+ //FunctionList.List.Functions.Add(new Function()
+ //{
+ // spk = SPK.AirSwitch,
+ // name = "鏅鸿兘绌哄紑",
+ // attributes = new List<FunctionAttributes>()
+ // {
+ // new FunctionAttributes(){ key = "on_off",curValue= "on",state = "on" },
+ // },
+ //});
//FunctionList.List.Functions.Add(new Function()
//{
@@ -582,6 +585,25 @@
// },
//});
+
+ FunctionList.List.Functions.Add(new Function()
+ {
+ spk = SPK.HvacAirFreshJinmao,
+ name = "娴嬭瘯閲戣寕鏂伴",
+ attributes = new List<FunctionAttributes>()
+ {
+ new FunctionAttributes(){ key = "on_off",curValue= "on",state = "on" },
+ new FunctionAttributes(){ key = "mode",curValue= "humidification",state = "humidification" ,value = new List<string>(){ "humidification", "fan" } },
+ new FunctionAttributes(){ key = "energy",curValue= "true",state = "true" ,value = new List<string>(){ "true", "false" } },
+ new FunctionAttributes(){ key = "fan",curValue= "level_1",state = "level_1" ,value = new List<string>(){ "level_1", "level_2", "level_3","auto" } },
+ new FunctionAttributes(){ key = "humidity",curValue= "0",state = "0" ,value = new List<string>(){ },min = 0,max = 100 },
+ new FunctionAttributes(){ key = "indoor_temp",curValue= "26",state = "26" ,value = new List<string>(){ },min = 0,max = 100 },
+ new FunctionAttributes(){ key = "indoor_humidity",curValue= "0",state = "0" ,value = new List<string>(){ },min = 0,max = 100 },
+ new FunctionAttributes(){ key = "filter_remain",curValue= "0",state = "0" ,value = new List<string>(){ },min = 0,max = 100 },
+ new FunctionAttributes(){ key = "filter_timeout",curValue= "false",state = "false" ,value = new List<string>(){ "true", "false" }},
+ },
+ });
+
//FunctionList.List.Functions.Add(new Function()
//{
// spk = SPK.SensorGas,
--
Gitblit v1.8.0