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/2-Classification/FunctionPage.cs | 32 ++++++--------------------------
1 files changed, 6 insertions(+), 26 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
index 0d410f0..624ea5d 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
@@ -70,32 +70,7 @@
#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>
@@ -139,6 +114,7 @@
};
bodyView.AddChidren(functionListView);
+ //Tag 鏄剧ず鍒楄〃
if (titleId == StringId.Lights)
{
functionList.AddRange(FunctionList.List.GetLightList());
@@ -182,6 +158,10 @@
{
functionList.AddRange(FunctionList.List.GetAirFreshList());
}
+ else if (titleId == StringId.SmartPanel)
+ {
+ functionList.AddRange(FunctionList.List.GetPanelList());
+ }
functionList.OrderByDescending(o => o.controlCounter).ToList();
ShowFunctionRow(functionList);
--
Gitblit v1.8.0