From 307e554fb2ef6491d08afc58a6c0a852f44b4f46 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 01 十二月 2020 17:04:50 +0800
Subject: [PATCH] 2020-12-01-1
---
HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs | 42 +++++++++++++++++++++---------------------
1 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs b/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs
index 5795611..c05e024 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";
}
}
}
@@ -75,7 +75,7 @@
void LoadEvent_ControlScene()
{
EventHandler<MouseEventArgs> upEvent = (sender, e) => {
- Control.ins.ControlScene(function as Scene);
+ Control.Ins.ControlScene(function as Scene);
string msg = function.name + Language.StringByID(StringId.AlreadyOpened);
new PublicAssmebly().TipMsgAutoClose(msg, false);
};
@@ -94,11 +94,11 @@
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());
- Control.ins.SendWriteCommand(function, d);
+ d.Add("on_off", function.trait_on_off.curValue.ToString());
+ Control.Ins.SendWriteCommand(function, d);
})
{ IsBackground = true }.Start();
};
@@ -118,11 +118,11 @@
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());
- Control.ins.SendWriteCommand(function, d);
+ d.Add("on_off", function.trait_on_off.curValue.ToString());
+ Control.Ins.SendWriteCommand(function, d);
}
})
{ IsBackground = true }.Start();
@@ -147,18 +147,18 @@
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.ins.SendWriteCommand(light, d);
+ Control.Ins.SendWriteCommand(light, d);
};
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)
{
//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.ins.SendWriteCommand(light, d);
+ Control.Ins.SendWriteCommand(light, d);
}
else
{
@@ -171,7 +171,7 @@
{
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
d.Add("brightness", light.brightness.ToString());
- Control.ins.SendWriteCommand(light, d);
+ Control.Ins.SendWriteCommand(light, d);
})
{ IsBackground = true }.Start();
}
@@ -197,11 +197,11 @@
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());
- Control.ins.SendWriteCommand(curtain, d);
+ d.Add("on_off", curtain.trait_on_off.curValue.ToString());
+ Control.Ins.SendWriteCommand(curtain, d);
};
btnStop.MouseDownEventHandler = (sender, e) =>
@@ -215,11 +215,11 @@
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());
- Control.ins.SendWriteCommand(curtain, d);
+ d.Add("on_off", curtain.trait_on_off.curValue.ToString());
+ Control.Ins.SendWriteCommand(curtain, d);
};
btnOpen.MouseUpEventHandler = (sender, e) =>
@@ -227,11 +227,11 @@
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());
- Control.ins.SendWriteCommand(curtain, d);
+ d.Add("on_off", curtain.trait_on_off.curValue.ToString());
+ Control.Ins.SendWriteCommand(curtain, d);
};
}
#endregion
--
Gitblit v1.8.0