From 6c8946b21635246355ec41f216426783685a14b2 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 14 十月 2020 09:14:09 +0800
Subject: [PATCH] 20201013
---
HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs | 66 +++++++++++++++++++--------------
1 files changed, 38 insertions(+), 28 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs
index 1df2ad4..82cb97c 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs
@@ -191,18 +191,32 @@
{
Action action = () =>
{
- foreach (var f in room.GetRoomFunctions(false))
+ new System.Threading.Thread(() =>
{
- if (f.functionCategory == FunctionCategory.Scene)
+ foreach (var f in room.GetRoomFunctions(false))
{
- continue;
+ if (f.functionCategory == FunctionCategory.Scene)
+ {
+ continue;
+ }
+
+ f.trait_on_off.value = "off";
+ //Control.Send(CommandType_A.write, f);
+ Dictionary<string, string> d = new Dictionary<string, string>();
+ d.Add("on_off", f.trait_on_off.value.ToString());
+ Control.SendWriteCommand(f, d);
}
- f.trait_on_off.value = "off";
- //Control.Send(CommandType_A.write, f);
- Dictionary<string, string> d = new Dictionary<string, string>();
- d.Add("on_off", f.trait_on_off.value.ToString());
- Control.SendWriteCommand(f, d);
- }
+
+ foreach (var m in Music.A31MusicModel.A31MusicModelList)
+ {
+ if (m.roomIdList.Contains(room.sid))
+ {
+ Music.SendMethod.Pause(m);
+ }
+ }
+ })
+ { IsBackground = true }.Start();
+
btn.Visible = false;
};
new PublicAssmebly().TipMsg(StringId.Tip, StringId.TipCloseAllFunctionInRoom, action);
@@ -296,12 +310,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());
@@ -309,12 +324,19 @@
}
break;
case ShowFunction.Curtain:
-
+ //foreach (var f in DB_ResidenceData.functionList.curtains)
+ //{
+ // f.trait_on_off.value = onoff;
+ // //Control.Send(CommandType_A.write, f);
+ // Dictionary<string, string> d = new Dictionary<string, string>();
+ // d.Add("percent", "100");
+ // Control.SendWriteCommand(f, d);
+ //}
break;
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 +356,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 +368,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