From ed3bfb7462d44747230437717e8673a5192f833f Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 30 十一月 2020 20:34:51 +0800
Subject: [PATCH] 2020-11-30-2
---
HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs
index 18f6eb6..44b8230 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs
@@ -25,7 +25,7 @@
bodyView.dimmerBar.Progress = uFunction.brightness;
}
- if (uFunction.trait_on_off.curValue.ToString() == "on")
+ if (uFunction.trait_on_off.value.ToString() == "on")
{
bodyView.dimmerBar.SetProgressBarColors(CSS_Color.AuxiliaryColor1, CSS_Color.AuxiliaryColor1);
}
@@ -33,7 +33,7 @@
{
bodyView.dimmerBar.SetProgressBarColors(CSS_Color.DividingLineColor, CSS_Color.DividingLineColor);
}
- bodyView.btnSwitch.IsSelected = uFunction.trait_on_off.curValue.ToString() == "on";
+ bodyView.btnSwitch.IsSelected = uFunction.trait_on_off.value.ToString() == "on";
bodyView.btnBrightnessText.Y = ((100 - uFunction.brightness) * Application.GetRealHeight(288 - 16 - 16) / 100) + Application.GetRealWidth(40);
bodyView.btnBrightnessText.Text = uFunction.brightness + "%";
@@ -56,7 +56,6 @@
actionRefresh = () => {
btnFunctionName.Text = btnFunctionName_Out.Text = light.name;
btnFromFloor_Out.Text = btnFromFoorAndRoom.Text = light.GetRoomListName();
- light.SaveFunctionData();
};
}
/// <summary>
@@ -96,7 +95,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.Ins.SendWriteCommand(light, d);
+ Control.ins.SendWriteCommand(light, d);
light.fadeTime = barFadeTime.Progress;
};
dimmerBar.OnProgressChangedEvent = (sender, e) => {
@@ -107,14 +106,14 @@
}
btnSwitch.IsSelected = e > 0 ? true : false;
light.brightness = e;
- light.trait_on_off.curValue = e > 0 ? "on" : "off";
+ light.trait_on_off.value = e > 0 ? "on" : "off";
if (e == 0 || e == 100)
{
//Control.Send(CommandType_A.write, this.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
{
@@ -125,7 +124,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();
}
@@ -155,10 +154,10 @@
}
new System.Threading.Thread(() =>
{
- light.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";
+ light.trait_on_off.value = btnSwitch.IsSelected ? "on" : "off";
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- d.Add("on_off", light.trait_on_off.curValue.ToString());
- Control.Ins.SendWriteCommand(light, d);
+ d.Add("on_off", light.trait_on_off.value.ToString());
+ Control.ins.SendWriteCommand(light, d);
})
{ IsBackground = true }.Start();
};
--
Gitblit v1.8.0