From c44b10e4447e84dbdfa9105edf460ef364a8f2b3 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 30 十一月 2020 19:53:35 +0800
Subject: [PATCH] Merge branch 'master' into WJC
---
HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
index 129449a..b6277f1 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
@@ -23,8 +23,8 @@
{
bodyView.dimmerBar.Progress = uFunction.brightness;
}
- bodyView.dimmerBar.ProgressBarColor = uFunction.trait_on_off.value.ToString() == "on" ? CSS.CSS_Color.AuxiliaryColor1 : CSS.CSS_Color.PromptingColor2;
- bodyView.btnSwitch.IsSelected = uFunction.trait_on_off.value.ToString() == "on";
+ bodyView.dimmerBar.ProgressBarColor = uFunction.trait_on_off.curValue.ToString() == "on" ? CSS.CSS_Color.AuxiliaryColor1 : CSS.CSS_Color.PromptingColor2;
+ bodyView.btnSwitch.IsSelected = uFunction.trait_on_off.curValue.ToString() == "on";
bodyView.btnCurColor.BackgroundColor = (uint)(0xFF000000 + bodyView.light.redColor * 256 * 256 + bodyView.light.greenColor * 256 + bodyView.light.blueColor);
}
}
@@ -48,6 +48,7 @@
actionRefresh = () => {
btnFunctionName.Text = btnFunctionName_Out.Text = light.name;
btnFromFloor_Out.Text = btnFromFoorAndRoom.Text = light.GetRoomListName();
+ light.SaveFunctionData();
};
}
@@ -115,7 +116,7 @@
}
btnSwitch.IsSelected = e > 0 ? true : false;
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)
{
@@ -168,9 +169,9 @@
dimmerBar.ProgressBarColor = btnSwitch.IsSelected ? CSS.CSS_Color.AuxiliaryColor1 : CSS.CSS_Color.PromptingColor2;
new System.Threading.Thread(() =>
{
- light.trait_on_off.value = btnSwitch.IsSelected ? "on" : "off";
+ light.trait_on_off.curValue = 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.value.ToString());
+ d.Add("on_off", light.trait_on_off.curValue.ToString());
Control.Ins.SendWriteCommand(light, d);
})
{ IsBackground = true }.Start();
--
Gitblit v1.8.0