From f1532873e3029b2fb17cb84c1b9da1e2f66247c4 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 02 九月 2021 10:43:38 +0800
Subject: [PATCH] 代码合并
---
HDL_ON/UI/UI2/1-HomePage/HomePage.cs | 34 +++++++++++++++++++++-------------
1 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index 51e02a0..81aecbf 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -392,6 +392,14 @@
if (temp.status == "enable")
{
btnSecurityStatus.IsSelected = true;
+ if (temp.alarm)
+ {
+ btnSecurityStatus.SelectedImagePath = "Collection/DefenseAlarmIcon.png";
+ }
+ else
+ {
+ btnSecurityStatus.SelectedImagePath = "Collection/DefenseStatusIcon.png";
+ }
break;
}
}
@@ -539,29 +547,29 @@
#if DEBUG
- //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.AirFreshStandard,
- name = "娴嬭瘯鏂伴",
+ spk = SPK.AirSwitch,
+ name = "鏅鸿兘绌哄紑",
attributes = new List<FunctionAttributes>()
{
new FunctionAttributes(){ key = "on_off",curValue= "on",state = "on" },
- new FunctionAttributes(){ key = "fan",curValue= "low",state = "low" ,value = new List<string>(){ "high", "medium", "low" } },
},
});
//FunctionList.List.Functions.Add(new Function()
//{
+ // spk = SPK.AirFreshStandard,
+ // name = "娴嬭瘯鏂伴",
+ // attributes = new List<FunctionAttributes>()
+ // {
+ // new FunctionAttributes(){ key = "on_off",curValue= "on",state = "on" },
+ // new FunctionAttributes(){ key = "fan",curValue= "low",state = "low" ,value = new List<string>(){ "high", "medium", "low" } },
+ // },
+ //});
+
+ //FunctionList.List.Functions.Add(new Function()
+ //{
// spk = SPK.SensorGas,
// name = "鐕冩皵浼犳劅鍣�",
// attributes = new List<FunctionAttributes>()
--
Gitblit v1.8.0