From e6a26ee148587327478d9a82624a820c907b6e16 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 04 十一月 2020 14:58:15 +0800
Subject: [PATCH] 20201104
---
HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs | 41 +++++++++++++++++++++++++++--------------
1 files changed, 27 insertions(+), 14 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
index 00cd0d1..41a0ab6 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
@@ -1,4 +1,5 @@
锘縰sing System;
+using HDL_ON.DriverLayer;
using HDL_ON.Entity;
using Shared;
namespace HDL_ON.UI
@@ -22,8 +23,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);
}
}
@@ -42,6 +43,7 @@
LoadSwitchEvent();
LoadEvent_BackCenterColor();
LoadEvent_DimmerBar();
+ LoadEvet_ChangeFadeTime();
//鍥為��鍒锋柊淇℃伅浜嬩欢
actionRefresh = () => {
btnFunctionName.Text = btnFunctionName_Out.Text = light.name;
@@ -66,7 +68,7 @@
//Control.Send(CommandType_A.write, this.light);
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
d.Add("color", (light.redColor * 256 * 256 + light.greenColor * 256 + light.blueColor).ToString());
- Control.SendWriteCommand(light, d);
+ Control.ins.SendWriteCommand(light, d);
}
};
colorPicker.MouseUpEventHandler = (sender, e) =>
@@ -84,7 +86,7 @@
{
btnCollection.MouseUpEventHandler += (sender, e) => {
btnCollection.IsSelected = light.collection = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
- DB_ResidenceData.residenceData.SaveResidenceData();
+ light.SaveFunctionData();
};
}
@@ -101,24 +103,26 @@
light.brightness = dimmerBar.Progress;
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
d.Add("brightness", light.brightness.ToString());
- Control.SendWriteCommand(light, d);
+ Control.ins.SendWriteCommand(light, d);
+ light.fadeTime = barFadeTime.Progress;
//Control.Send(CommandType_A.write, light);
};
dimmerBar.OnProgressChangedEvent = (sender, e) => {
+ light.fadeTime = 0;
if (!btnSwitch.IsSelected)
{
dimmerBar.ProgressBarColor = CSS.CSS_Color.AuxiliaryColor1;
}
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)
{
//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.SendWriteCommand(light, d);
+ Control.ins.SendWriteCommand(light, d);
}
else
{
@@ -130,7 +134,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.SendWriteCommand(light, d);
+ Control.ins.SendWriteCommand(light, d);
})
{ IsBackground = true }.Start();
}
@@ -143,6 +147,17 @@
}
/// <summary>
+ /// 淇敼鐏厜娓愬彉鏃堕棿
+ /// </summary>
+ void LoadEvet_ChangeFadeTime()
+ {
+ barFadeTime.OnProgressChangedEvent = (sender, e) =>
+ {
+ light.fadeTime = e;
+ light.SaveFunctionData();
+ };
+ }
+ /// <summary>
/// 鍔犺浇寮�鍏充簨浠�
/// </summary>
void LoadSwitchEvent()
@@ -153,11 +168,10 @@
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());
- Control.SendWriteCommand(light, d);
- //Control.Send(CommandType_A.write, this.light);
+ d.Add("on_off", light.trait_on_off.value.ToString());
+ Control.ins.SendWriteCommand(light, d);
})
{ IsBackground = true }.Start();
};
@@ -171,10 +185,9 @@
{
light.color = 0xFFFFFF;
btnCurColor.BackgroundColor = 0xFFFFFFFF;
- //Control.Send(CommandType_A.write, this.light);
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
d.Add("color", "FFFFFF");
- Control.SendWriteCommand(light, d);
+ Control.ins.SendWriteCommand(light, d);
};
}
--
Gitblit v1.8.0