From 4c586bb23cdcae56ae4e4c62e90e148dc10b9d90 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 17 五月 2022 14:19:31 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into wxr1215
---
HDL_ON/UI/UI2/1-HomePage/HomePage.cs | 124 +++++++++++++++++++++++++++++++----------
1 files changed, 93 insertions(+), 31 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index d93097d..fc4e748 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -206,19 +206,6 @@
// Control.Ins.OneKeyUnlocking(new Function(), UserInfo.Current.doorPasswordString);
//}
- ddd++;
- Function function_online = FunctionList.List.GetLightList().Find((obj) => obj.sid == "0001017DB92D2602020100010101");
- if(ddd%2 == 0)
- {
- function_online.online = true;
- }
- else
- {
- function_online.online = false;
- }
- HomePage.LoadEvent_RefreshDevcieOnline(function_online);
-
-
};
#endif
@@ -582,7 +569,7 @@
//FunctionList.List.Functions.Add(new Function
//{
- // name = "闂ㄩ攣",
+ // name = "娴嬭瘯闂ㄩ攣",
// spk = SPK.DoorLock,
// sid = "12345",
// attributes = new List<FunctionAttributes> {
@@ -640,6 +627,43 @@
// },
//});
+ 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()
//{
// spk = SPK.AirSwitch,
@@ -654,10 +678,41 @@
//{
// 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.HvacCac,
+ // name = "娴嬭瘯閲戣寕娓╂帶",
+ // attributes = new List<FunctionAttributes>()
+ // {
+ // new FunctionAttributes(){ key = "on_off",curValue= "on",state = "on" },
+ // new FunctionAttributes(){ key = "mode",curValue= "cool",state = "cool" ,value = new List<string>(){ "cool", "heat" } },
+ // new FunctionAttributes(){ key = "set_temp",curValue= "22",state = "22" ,value = new List<string>(){},min = 0,max = 30 },
+ // //new FunctionAttributes(){ key = "set_temp_step",curValue= "low",state = "low" ,value = new List<string>(){ "high", "medium", "low", "auto", "stop" } },
+ // new FunctionAttributes(){ key = "humidity",curValue= "0",state = "0" ,value = new List<string>(){ },min = 0,max = 100 },
+ // new FunctionAttributes(){ key = "room_temp",curValue= "26",state = "26" ,value = new List<string>(){ },min = 0,max = 100 },
+ // new FunctionAttributes(){ key = "dew_point_temp",curValue= "20",state = "20" ,value = new List<string>(){ },min = 0,max = 100 },
+ // new FunctionAttributes(){ key = "room_humidity",curValue= "20",state = "20" ,value = new List<string>(){ },min = 0,max = 1000 },
+ // //new FunctionAttributes(){ key = "tvoc",curValue= "20",state = "20" ,value = new List<string>(){ },min = 0,max = 100 },
// },
//});
@@ -866,6 +921,7 @@
/// <summary>
/// 鍔犺浇璁惧鍔熻兘鏄剧ず鍖哄煙
+ /// Tag 鏀惰棌鍗＄墖
/// </summary>
void LoadDeviceFunctionControlZone()
{
@@ -953,10 +1009,10 @@
index++;
- if (!function.online)
- {
- btnbg.UnSelectedImagePath = "Collection/FunctionOfflineBg.png";
- }
+ //if (!function.online)
+ //{
+ // btnbg.UnSelectedImagePath = "Collection/FunctionOfflineBg.png";
+ //}
}
if (index == 0)
@@ -1079,6 +1135,7 @@
/// <summary>
/// 鍔犺浇鍔熻兘鎺у埗鍗＄墖
+ /// Tag 鍗＄墖鑷畾涔�
/// </summary>
void LoadDeviceFunctionDiv(FrameLayout view, Function function)
{
@@ -1293,6 +1350,11 @@
LoadEvent_ControlClothesHanger(function, btnUp, btnDown);
}
+ //绱ф�ユ眰鍔�
+ else if (function.spk == SPK.SensorHelp)
+ {
+
+ }
else
{
@@ -1340,19 +1402,19 @@
UpdataFunctionStates(function);
}
- var btnOffline = new Button()
- {
- X = btnIcon.Right,
- Y = Application.GetRealWidth(16),
- Height = Application.GetMinRealAverage(32),
- TextID = StringId.DeviceOffline,
- TextColor = CSS_Color.WarningColor,
- TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- TextAlignment = TextAlignment.CenterLeft,
- Tag = "OnlineTag",
- Visible = !function.online
- };
- view.AddChidren(btnOffline);
+ //var btnOffline = new Button()
+ //{
+ // X = btnIcon.Right,
+ // Y = Application.GetRealWidth(16),
+ // Height = Application.GetMinRealAverage(32),
+ // TextID = StringId.DeviceOffline,
+ // TextColor = CSS_Color.WarningColor,
+ // TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ // TextAlignment = TextAlignment.CenterLeft,
+ // Tag = "OnlineTag",
+ // Visible = !function.online
+ //};
+ //view.AddChidren(btnOffline);
}
catch (Exception ex)
--
Gitblit v1.8.0