From 9eec81850e418a3c16410b4870910bde142b06e3 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 14 九月 2022 15:50:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/Dev-Branch' into wjc
---
HDL_ON/UI/UI2/2-Classification/FunctionPage.cs | 32 ++++++++++++++++++++++++++------
1 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
index 624ea5d..0af5488 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
@@ -70,7 +70,32 @@
#if DEBUG
-
+ //Button testBtn = new Button()
+ //{
+ // X = Application.GetRealWidth(80),
+ // Height = Application.GetRealHeight(64),
+ // BackgroundColor = 0xFFFF0000
+ //};
+ //bodyView.AddChidren(testBtn);
+ //int ddd = 0;
+ //testBtn.MouseUpEventHandler = (sender, e) => {
+ // 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);
+ // FunctionPage.UpdataOnline(function_online);
+ // RoomPage.UpdataOnline(function_online);
+
+
+ //};
#endif
/// <summary>
@@ -114,7 +139,6 @@
};
bodyView.AddChidren(functionListView);
- //Tag 鏄剧ず鍒楄〃
if (titleId == StringId.Lights)
{
functionList.AddRange(FunctionList.List.GetLightList());
@@ -157,10 +181,6 @@
else if (titleId == StringId.FreshAir)
{
functionList.AddRange(FunctionList.List.GetAirFreshList());
- }
- else if (titleId == StringId.SmartPanel)
- {
- functionList.AddRange(FunctionList.List.GetPanelList());
}
functionList.OrderByDescending(o => o.controlCounter).ToList();
--
Gitblit v1.8.0