From eb51679c618d5027070fbd6f3c0519f0f17e7d7d Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 23 十一月 2020 10:07:53 +0800
Subject: [PATCH] Merge branch 'CJL' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into CJL
---
HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs b/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs
index ce0bb47..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();
}
@@ -200,7 +201,7 @@
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) =>
@@ -218,7 +219,7 @@
//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) =>
@@ -230,7 +231,7 @@
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