From 7d005a7618e3d7a80d8ede3baf6ecc4bf8019cd5 Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期二, 01 九月 2020 15:22:09 +0800 Subject: [PATCH] 2020-09-01 --- HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs index 00cd0d1..4f4e38d 100644 --- a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs +++ b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs @@ -22,8 +22,8 @@ { bodyView.dimmerBar.Progress = uFunction.brightness; } - bodyView.dimmerBar.ProgressBarColor = uFunction.on_off == "on" ? CSS.CSS_Color.AuxiliaryColor1 : CSS.CSS_Color.PromptingColor2; - bodyView.btnSwitch.IsSelected = uFunction.on_off == "on"; + 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.btnCurColor.BackgroundColor = (uint)(0xFF000000 + bodyView.light.redColor * 256 * 256 + bodyView.light.greenColor * 256 + bodyView.light.blueColor); } } @@ -84,7 +84,7 @@ { btnCollection.MouseUpEventHandler += (sender, e) => { btnCollection.IsSelected = light.collection = btnCollection_Out.IsSelected = !btnCollection.IsSelected; - DB_ResidenceData.residenceData.SaveResidenceData(); + light.SaveFunctionData(); }; } @@ -111,7 +111,7 @@ } btnSwitch.IsSelected = e > 0 ? true : false; light.brightness = e; - light.on_off = e > 0 ? "on" : "off"; + light.trait_on_off.value = e > 0 ? "on" : "off"; if (e == 0 || e == 100) { @@ -153,9 +153,9 @@ dimmerBar.ProgressBarColor = btnSwitch.IsSelected ? CSS.CSS_Color.AuxiliaryColor1 : CSS.CSS_Color.PromptingColor2; new System.Threading.Thread(() => { - light.on_off = 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.on_off.ToString()); + d.Add("on_off", light.trait_on_off.value.ToString()); Control.SendWriteCommand(light, d); //Control.Send(CommandType_A.write, this.light); }) -- Gitblit v1.8.0