From 23bbed132eea46eef51c6d01c21b346238e29ee2 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 30 六月 2022 13:39:12 +0800
Subject: [PATCH] Merge branch 'wxr0114' into V1.5.9
---
HDL_ON/UI/UI2/1-HomePage/HomePage.cs | 87 +++++++++++++++----------------------------
1 files changed, 31 insertions(+), 56 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index d4c6a4c..33dc5d2 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -206,6 +206,19 @@
// 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
@@ -580,7 +593,7 @@
//FunctionList.List.Functions.Add(new Function
//{
- // name = "娴嬭瘯闂ㄩ攣",
+ // name = "闂ㄩ攣",
// spk = SPK.DoorLock,
// sid = "12345",
// attributes = new List<FunctionAttributes> {
@@ -689,41 +702,10 @@
//{
// 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 },
// },
//});
@@ -932,7 +914,6 @@
/// <summary>
/// 鍔犺浇璁惧鍔熻兘鏄剧ず鍖哄煙
- /// Tag 鏀惰棌鍗＄墖
/// </summary>
void LoadDeviceFunctionControlZone()
{
@@ -1020,10 +1001,10 @@
index++;
- //if (!function.online)
- //{
- // btnbg.UnSelectedImagePath = "Collection/FunctionOfflineBg.png";
- //}
+ if (!function.online)
+ {
+ btnbg.UnSelectedImagePath = "Collection/FunctionOfflineBg.png";
+ }
}
if (index == 0)
@@ -1146,7 +1127,6 @@
/// <summary>
/// 鍔犺浇鍔熻兘鎺у埗鍗＄墖
- /// Tag 鍗＄墖鑷畾涔�
/// </summary>
void LoadDeviceFunctionDiv(FrameLayout view, Function function)
{
@@ -1360,11 +1340,6 @@
LoadEvent_ControlClothesHanger(function, btnUp, btnDown);
}
- //绱ф�ユ眰鍔�
- else if (function.spk == SPK.SensorHelp)
- {
-
- }
else
{
@@ -1412,19 +1387,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