From 56dfdc1bf7e7f2bb2456f29c3686dfa935a89e80 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 30 六月 2022 13:59:45 +0800
Subject: [PATCH] 2022年06月30日13:59:08
---
HDL_ON/UI/UI2/1-HomePage/HomePage.cs | 232 ++++++++++++++++++++++++++++++---------------------------
1 files changed, 121 insertions(+), 111 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index 2552139..d4c6a4c 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -566,103 +566,114 @@
#if DEBUG
-
FunctionList.List.Functions.Add(new Function
{
- name = "娴嬭瘯闂ㄩ攣",
- spk = SPK.DoorLock,
- sid = "12345",
+ name = "娴嬭瘯姊﹀够绐楀笜",
+ spk = SPK.CurtainDream,
+ sid = "1234577",
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" },
+ new FunctionAttributes(){ key = "percent",curValue= "100",state = "100" },
+ new FunctionAttributes(){ key = "angle",curValue= "0",state = "0" },
}
});
- 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
+ //{
+ // 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.SensorPm25,
- name = "娴嬭瘯Pm2.5",
- attributes = new List<FunctionAttributes>()
- {
- new FunctionAttributes(){ key = "pm25",curValue= "70",state = "70" },
- },
- attrKeyConfigs = new List<AttrKeyConfig>()
- {
- new AttrKeyConfig (){
- key = "pm2.5",
- type = "interval" ,
- unit = "ug/m虏",
- configs = new List<AttrKeyInfo>(){
- new AttrKeyInfo(){ start = "0",end = "75",color = 0xFFADE764, desc = "鑹ソ"},
- new AttrKeyInfo(){ start = "76",end = "150",color = 0xFFFFD154,desc = "杞�/涓害姹℃煋"},
- new AttrKeyInfo(){ start = "151",end = "500",color = 0xFFFF9D54,desc = "閲嶅害/涓ラ噸姹℃煋"},
- }
- }
- },
- });
+ //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()
- {
- spk = SPK.SensorHelp,
- name = "娴嬭瘯绱ф�ユ眰鍔╂寜閽�",
- attributes = new List<FunctionAttributes>()
- {
- new FunctionAttributes(){ key = "status",curValue= "on",state = "on" },
- new FunctionAttributes(){ key = "alarm_status",curValue= "alarm",state = "alarm" },
- new FunctionAttributes(){ key = "battery_value",curValue= "200",state = "200" },
- new FunctionAttributes(){ key = "battery_percentage",curValue= "10",state = "10" },
- new FunctionAttributes(){ key = "battery_state",curValue= "low",state = "low" },
- },
- });
+ //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.SensorPm25,
+ // name = "娴嬭瘯Pm2.5",
+ // attributes = new List<FunctionAttributes>()
+ // {
+ // new FunctionAttributes(){ key = "pm25",curValue= "70",state = "70" },
+ // },
+ // attrKeyConfigs = new List<AttrKeyConfig>()
+ // {
+ // new AttrKeyConfig (){
+ // key = "pm2.5",
+ // type = "interval" ,
+ // unit = "ug/m虏",
+ // configs = new List<AttrKeyInfo>(){
+ // new AttrKeyInfo(){ start = "0",end = "75",color = "0xFFADE764", desc = "鑹ソ"},
+ // new AttrKeyInfo(){ start = "76",end = "150",color = "0xFFFFD154",desc = "杞�/涓害姹℃煋"},
+ // new AttrKeyInfo(){ start = "151",end = "500",color = "0xFFFF9D54",desc = "閲嶅害/涓ラ噸姹℃煋"},
+ // }
+ // }
+ // },
+ //});
+
+ //FunctionList.List.Functions.Add(new Function()
+ //{
+ // spk = SPK.SensorHelp,
+ // name = "娴嬭瘯绱ф�ユ眰鍔╂寜閽�",
+ // attributes = new List<FunctionAttributes>()
+ // {
+ // new FunctionAttributes(){ key = "status",curValue= "on",state = "on" },
+ // new FunctionAttributes(){ key = "alarm_status",curValue= "alarm",state = "alarm" },
+ // new FunctionAttributes(){ key = "battery_value",curValue= "200",state = "200" },
+ // new FunctionAttributes(){ key = "battery_percentage",curValue= "10",state = "10" },
+ // new FunctionAttributes(){ key = "battery_state",curValue= "low",state = "low" },
+ // },
+ //});
//FunctionList.List.Functions.Add(new Function()
//{
@@ -674,28 +685,28 @@
// },
//});
- FunctionList.List.Functions.Add(new Function()
- {
- spk = SPK.AirFreshStandard,
- name = "娴嬭瘯鏂伴",
- sid = "098765433242342342",
- 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 = "娴嬭瘯鏂伴",
+ // sid = "098765433242342342",
+ // 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.PanelEnvironment,
- name = "娴嬭瘯鐜闈㈡澘",
- targetSids = new List<string> {
- "098765433242342342",
- "ac1",
- "floorheat1"
- }
- });
+ //FunctionList.List.Functions.Add(new Function()
+ //{
+ // spk = SPK.PanelEnvironment,
+ // name = "娴嬭瘯鐜闈㈡澘",
+ // targetSids = new List<string> {
+ // "098765433242342342",
+ // "ac1",
+ // "floorheat1"
+ // }
+ //});
//FunctionList.List.Functions.Add(new Function()
@@ -1151,10 +1162,8 @@
};
view.AddChidren(btnIcon);
-
btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_blue.png";
btnIcon.SelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_white.png";
-
Button btnName;
btnName = new Button()
@@ -1226,6 +1235,7 @@
LoadEvent_FunctionCollection(btnCollection, function);
if (//SPK.CurtainSpkList().Contains(function.spk))
function.spk == SPK.CurtainRoller || function.spk == SPK.CurtainShades ||
+ function.spk == SPK.CurtainDream ||
function.spk == SPK.CurtainSwitch || function.spk == SPK.CurtainTrietex )
{
btnIcon.UnSelectedImagePath = "FunctionIcon/Curtain/CurtainIcon.png";
--
Gitblit v1.8.0