From 3be0abe90546f2a3a45828f5e6c8adc4517ea9e0 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 14 一月 2022 13:12:38 +0800
Subject: [PATCH] Merge branch 'wxr1215'
---
HDL_ON/UI/UI2/1-HomePage/HomePage.cs | 85 +++++++++++++++++++++++++++++++++---------
1 files changed, 67 insertions(+), 18 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index 4d75015..9443a70 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -390,7 +390,7 @@
SelectedImagePath = "Collection/DefenseStatusIcon.png",
UnSelectedImagePath = "Collection/DisarmStatusIcon.png"
};
- if (false && DB_ResidenceData.Instance.GatewayType == 1)
+ if (DB_ResidenceData.Instance.GatewayType == 1)
{
topView.AddChidren(btnSecurityStatus);
@@ -553,6 +553,55 @@
#if DEBUG
+ FunctionList.List.Functions.Add(new Function
+ {
+ name = "闂ㄩ攣",
+ spk = SPK.DoorLock,
+ sid = "12345",
+ attributes = new List<FunctionAttributes> {
+ new FunctionAttributes(){ key = "door_status",curValue= "open",state = "open" },
+ new FunctionAttributes(){ key = "normal_open",curValue= "true",state = "true" },
+ new FunctionAttributes(){ key = "normal_open_countdown",curValue= "10",state = "10" },
+ new FunctionAttributes(){ key = "local_id",curValue= "10",state = "10" },
+ new FunctionAttributes(){ key = "door_volume",curValue= "10",state = "10" },
+ new FunctionAttributes(){ key = "door_volume_step",curValue= "up",state = "up" },
+ new FunctionAttributes(){ key = "battery_value",curValue= "100",state = "100" },
+ new FunctionAttributes(){ key = "battery_percentage",curValue= "100",state = "100" },
+ new FunctionAttributes(){ key = "battery_state",curValue= "high",state = "high" },
+ }
+ });
+ FunctionList.List.Functions.Add(new Function
+ {
+ name = "闂ㄩ攣1",
+ spk = SPK.DoorLock,
+ sid = "123",
+ attributes = new List<FunctionAttributes> {
+ new FunctionAttributes(){ key = "door_status",curValue= "open",state = "open" },
+ new FunctionAttributes(){ key = "normal_open",curValue= "true",state = "true" },
+ new FunctionAttributes(){ key = "normal_open_countdown",curValue= "10",state = "10" },
+ new FunctionAttributes(){ key = "local_id",curValue= "10",state = "10" },
+ new FunctionAttributes(){ key = "door_volume",curValue= "10",state = "10" },
+ new FunctionAttributes(){ key = "door_volume_step",curValue= "up",state = "up" },
+ new FunctionAttributes(){ key = "battery_value",curValue= "100",state = "100" },
+ new FunctionAttributes(){ key = "battery_percentage",curValue= "100",state = "100" },
+ new FunctionAttributes(){ key = "battery_state",curValue= "high",state = "high" },
+ }
+ });
+
+ //FunctionList.List.Functions.Add(new Function()
+ //{
+ // spk = SPK.PanelSocket,
+ // name = "闈㈡澘鎻掑骇",
+ // attributes = new List<FunctionAttributes>
+ // {
+ // new FunctionAttributes(){ key = "on_off",curValue= "on",state = "on" },
+ // new FunctionAttributes(){ key = "on_off_usb",curValue= "on",state = "on" },
+ // new FunctionAttributes(){ key = "active_power",curValue= "220",state = "220" },
+ // new FunctionAttributes(){ key = "voltage",curValue= "5",state = "5" },
+ // new FunctionAttributes(){ key = "current",curValue= "110",state = "110" },
+ // new FunctionAttributes(){ key = "total_electricity",curValue= "123.33",state = "123.33" },
+ // }
+ //});
//FunctionList.List.Functions.Add(new Function()
//{
@@ -586,23 +635,23 @@
//});
- 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.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()
//{
--
Gitblit v1.8.0