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/2-Classification/FunctionPage.cs | 46 +++++++++++++++++++++++-----------------------
1 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
index 0d410f0..0af5488 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
@@ -70,32 +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++;
+ //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);
+ // 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>
--
Gitblit v1.8.0