From cda315b3a19919cae922bdbe96bc20eab4e29fcc Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 30 六月 2022 18:03:24 +0800
Subject: [PATCH] 版本合并冲突修改
---
HDL_ON/UI/UI2/1-HomePage/HomePage.cs | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 53 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index 15e8fd4..33dc5d2 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -210,11 +210,11 @@
Function function_online = FunctionList.List.GetLightList().Find((obj) => obj.sid == "0001017DB92D2602020100010101");
if(ddd%2 == 0)
{
- function_online.online2d = true;
+ function_online.online = true;
}
else
{
- function_online.online2d = false;
+ function_online.online = false;
}
HomePage.LoadEvent_RefreshDevcieOnline(function_online);
@@ -579,6 +579,17 @@
#if DEBUG
+ FunctionList.List.Functions.Add(new Function
+ {
+ name = "娴嬭瘯姊﹀够绐楀笜",
+ spk = SPK.CurtainDream,
+ sid = "1234577",
+ attributes = new List<FunctionAttributes> {
+ new FunctionAttributes(){ key = "on_off",curValue= "on",state = "on" },
+ new FunctionAttributes(){ key = "percent",curValue= "100",state = "100" },
+ new FunctionAttributes(){ key = "angle",curValue= "0",state = "0" },
+ }
+ });
//FunctionList.List.Functions.Add(new Function
//{
@@ -637,6 +648,43 @@
// 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" },
// },
//});
@@ -953,7 +1001,7 @@
index++;
- if (!function.online2d)
+ if (!function.online)
{
btnbg.UnSelectedImagePath = "Collection/FunctionOfflineBg.png";
}
@@ -1094,10 +1142,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()
@@ -1169,6 +1215,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";
@@ -1350,7 +1397,7 @@
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
TextAlignment = TextAlignment.CenterLeft,
Tag = "OnlineTag",
- Visible = !function.online2d
+ Visible = !function.online
};
view.AddChidren(btnOffline);
--
Gitblit v1.8.0