From 0f2e0147e8990e913d16d99bc1b94fb6bc53abd7 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期四, 03 十二月 2020 15:35:42 +0800
Subject: [PATCH] 2020-12-03-1
---
HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs | 40 +++++++++++++---------------------------
1 files changed, 13 insertions(+), 27 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs b/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs
index 913f630..e070d16 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs
@@ -28,7 +28,7 @@
{
if (btn.Tag.ToString() == upfunc.sid + "_Switch")// + "_DimmerBar")
{
- btn.IsSelected = upfunc.trait_on_off.value.ToString() == "on";
+ btn.IsSelected = upfunc.trait_on_off.curValue.ToString() == "on";
}
}
}
@@ -65,23 +65,9 @@
{
btnCollectionIcon.MouseUpEventHandler += (sender, e) =>
{
- btnCollectionIcon.IsSelected = function.collection = !btnCollectionIcon.IsSelected;
+ btnCollectionIcon.IsSelected = function.collect = !btnCollectionIcon.IsSelected;
function.SaveFunctionData();
};
- }
- /// <summary>
- /// 鍔犺浇鍦烘櫙鎺у埗浜嬩欢
- /// </summary>
- void LoadEvent_ControlScene()
- {
- EventHandler<MouseEventArgs> upEvent = (sender, e) => {
- Control.Ins.ControlScene(function as Scene);
- string msg = function.name + Language.StringByID(StringId.AlreadyOpened);
- new PublicAssmebly().TipMsgAutoClose(msg, false);
- };
- btnName.MouseUpEventHandler = upEvent;
- btnFromFloor.MouseUpEventHandler = upEvent;
- bodyDiv.MouseUpEventHandler = upEvent;
}
/// <summary>
@@ -94,10 +80,10 @@
btnSwitch.IsSelected = !btnSwitch.IsSelected;
new System.Threading.Thread(() =>
{
- function.trait_on_off.value = btnSwitch.IsSelected ? "on" : "off";
+ function.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";
//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());
+ d.Add("on_off", function.trait_on_off.curValue.ToString());
Control.Ins.SendWriteCommand(function, d);
})
{ IsBackground = true }.Start();
@@ -118,10 +104,10 @@
if (function.functionCategory == FunctionCategory.Light)
{
var light = function as Light;
- light.trait_on_off.value = btnSwitch.IsSelected ? "on" : "off";
+ light.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";
//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());
+ d.Add("on_off", function.trait_on_off.curValue.ToString());
Control.Ins.SendWriteCommand(function, d);
}
})
@@ -151,7 +137,7 @@
};
dimmerControlBar.OnProgressChangedEvent = (sender, e) => {
light.brightness = e;
- light.trait_on_off.value = e > 0 ? "on" : "off";
+ light.trait_on_off.curValue = e > 0 ? "on" : "off";
if (e == 0 || e == 100)
{
@@ -197,10 +183,10 @@
btnClose.IsSelected = true;
btnStop.IsSelected = false;
btnOpen.IsSelected = false;
- curtain.trait_on_off.value = "off";
+ curtain.trait_on_off.curValue = "off";
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());
+ d.Add("on_off", curtain.trait_on_off.curValue.ToString());
Control.Ins.SendWriteCommand(curtain, d);
};
@@ -215,10 +201,10 @@
btnOpen.IsSelected = true;
btnClose.IsSelected = false;
btnStop.IsSelected = false;
- curtain.trait_on_off.value = "stop";
+ curtain.trait_on_off.curValue = "stop";
//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());
+ d.Add("on_off", curtain.trait_on_off.curValue.ToString());
Control.Ins.SendWriteCommand(curtain, d);
};
@@ -227,10 +213,10 @@
btnOpen.IsSelected = true;
btnClose.IsSelected = false;
btnStop.IsSelected = false;
- curtain.trait_on_off.value = "on";
+ curtain.trait_on_off.curValue = "on";
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());
+ d.Add("on_off", curtain.trait_on_off.curValue.ToString());
Control.Ins.SendWriteCommand(curtain, d);
};
}
--
Gitblit v1.8.0