From e6a26ee148587327478d9a82624a820c907b6e16 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 04 十一月 2020 14:58:15 +0800
Subject: [PATCH] 20201104
---
HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs b/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs
index 1c95087..5795611 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs
@@ -1,4 +1,5 @@
锘縰sing System;
+using HDL_ON.DriverLayer;
using HDL_ON.Entity;
using HDL_ON.UI.Music;
using Shared;
@@ -74,7 +75,7 @@
void LoadEvent_ControlScene()
{
EventHandler<MouseEventArgs> upEvent = (sender, e) => {
- Control.Send(function);
+ Control.ins.ControlScene(function as Scene);
string msg = function.name + Language.StringByID(StringId.AlreadyOpened);
new PublicAssmebly().TipMsgAutoClose(msg, false);
};
@@ -97,7 +98,7 @@
//Control.Send(CommandType_A.write, function);
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
d.Add("on_off", function.trait_on_off.value.ToString());
- Control.SendWriteCommand(function, d);
+ Control.ins.SendWriteCommand(function, d);
})
{ IsBackground = true }.Start();
};
@@ -121,7 +122,7 @@
//Control.Send(CommandType_A.write, function);
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
d.Add("on_off", function.trait_on_off.value.ToString());
- Control.SendWriteCommand(function, d);
+ Control.ins.SendWriteCommand(function, d);
}
})
{ IsBackground = true }.Start();
@@ -146,7 +147,7 @@
light.brightness = dimmerControlBar.Progress;
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
d.Add("brightness", light.brightness.ToString());
- Control.SendWriteCommand(light, d);
+ Control.ins.SendWriteCommand(light, d);
};
dimmerControlBar.OnProgressChangedEvent = (sender, e) => {
light.brightness = e;
@@ -157,7 +158,7 @@
//Control.Send(CommandType_A.write, light);
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
d.Add("brightness", light.brightness.ToString());
- Control.SendWriteCommand(light, d);
+ Control.ins.SendWriteCommand(light, d);
}
else
{
@@ -170,7 +171,7 @@
{
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
d.Add("brightness", light.brightness.ToString());
- Control.SendWriteCommand(light, d);
+ Control.ins.SendWriteCommand(light, d);
})
{ IsBackground = true }.Start();
}
@@ -197,10 +198,10 @@
btnStop.IsSelected = false;
btnOpen.IsSelected = false;
curtain.trait_on_off.value = "off";
- //Control.Send(CommandType_A.write, curtain);
+ curtain.percent = 0;
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
d.Add("on_off", curtain.trait_on_off.value.ToString());
- Control.SendWriteCommand(curtain, d);
+ Control.ins.SendWriteCommand(curtain, d);
};
btnStop.MouseDownEventHandler = (sender, e) =>
@@ -215,10 +216,10 @@
btnClose.IsSelected = false;
btnStop.IsSelected = false;
curtain.trait_on_off.value = "stop";
- //Control.Send(CommandType_A.write, curtain);
+ //curtain.percent = 0;
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
d.Add("on_off", curtain.trait_on_off.value.ToString());
- Control.SendWriteCommand(curtain, d);
+ Control.ins.SendWriteCommand(curtain, d);
};
btnOpen.MouseUpEventHandler = (sender, e) =>
@@ -227,10 +228,10 @@
btnClose.IsSelected = false;
btnStop.IsSelected = false;
curtain.trait_on_off.value = "on";
- //Control.Send(CommandType_A.write, curtain);
+ curtain.percent = 100;
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
d.Add("on_off", curtain.trait_on_off.value.ToString());
- Control.SendWriteCommand(curtain, d);
+ Control.ins.SendWriteCommand(curtain, d);
};
}
#endregion
--
Gitblit v1.8.0