From 6d3ba9484472d090532434e53667c096652149ce Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 25 九月 2020 09:56:14 +0800
Subject: [PATCH] 202009251
---
HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs | 25 +++++++------------------
1 files changed, 7 insertions(+), 18 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs
index 1df2ad4..f4c3dbb 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs
@@ -296,12 +296,13 @@
{
btn.MouseUpEventHandler = (sender, e) => {
btn.IsSelected = !btn.IsSelected;
- switch(functionCategory)
+ var onoff = btn.IsSelected ? "on" : "off";
+ switch (functionCategory)
{
case ShowFunction.AC:
foreach(var f in DB_ResidenceData.functionList.aCs)
{
- f.trait_on_off.value = btn.IsSelected ? "on" : "off";
+ f.trait_on_off.value = onoff;
//Control.Send(CommandType_A.write, f);
Dictionary<string, string> d = new Dictionary<string, string>();
d.Add("on_off", f.trait_on_off.value.ToString());
@@ -314,7 +315,7 @@
case ShowFunction.Light:
foreach (var f in DB_ResidenceData.functionList.lights)
{
- f.trait_on_off.value = btn.IsSelected ? "on" : "off";
+ f.trait_on_off.value = onoff;
//Control.Send(CommandType_A.write, f);
Dictionary<string, string> d = new Dictionary<string, string>();
d.Add("on_off", f.trait_on_off.value.ToString());
@@ -334,16 +335,10 @@
{
btnOpen.MouseUpEventHandler = (sender, e) =>
{
- if (btnOpen.IsSelected)
- {
- return;
- }
- btnOpen.IsSelected = true;
- btnClose.IsSelected = false;
foreach (var f in DB_ResidenceData.functionList.curtains)
{
f.trait_on_off.value = "on";
- //Control.Send(CommandType_A.write, f);
+ f.percent = 100;
Dictionary<string, string> d = new Dictionary<string, string>();
d.Add("on_off", f.trait_on_off.value.ToString());
Control.SendWriteCommand(f, d);
@@ -352,17 +347,11 @@
btnClose.MouseUpEventHandler = (sender, e) =>
{
- if (btnClose.IsSelected)
- {
- return;
- }
- btnClose.IsSelected = true;
- btnOpen.IsSelected = false;
foreach (var f in DB_ResidenceData.functionList.curtains)
{
f.trait_on_off.value = "off";
- //Control.Send(CommandType_A.write, f);
- System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+ f.percent = 0;
+ Dictionary<string, string> d = new Dictionary<string, string>();
d.Add("on_off", f.trait_on_off.value.ToString());
Control.SendWriteCommand(f, d);
}
--
Gitblit v1.8.0