From 09dfbfd9b77ec887c17b10f15799a1d3f56e4e17 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 15 十二月 2020 12:04:42 +0800
Subject: [PATCH] 2020-12-15-1
---
HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs | 84 +++++++++++++++++++++++++++++++++---------
1 files changed, 66 insertions(+), 18 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs
index b940fe2..18bd9d9 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs
@@ -1,5 +1,7 @@
锘縰sing System;
+using HDL_ON.DriverLayer;
using HDL_ON.Entity;
+using HDL_ON.UI.CSS;
using Shared;
namespace HDL_ON.UI
{
@@ -18,9 +20,23 @@
return;
if (uFunction.functionType == bodyView.light.functionType && uFunction.sid == bodyView.light.sid)
{
- bodyView.dimmerBar.Progress = uFunction.brightness;
- bodyView.dimmerBar.WaveColor = uFunction.on_off == "on" ? CSS.CSS_Color.AuxiliaryColor1 : CSS.CSS_Color.PromptingColor2;
- bodyView.btnSwitch.IsSelected = uFunction.on_off == "on";
+ if (!bodyView.onDimmerBar)
+ {
+ bodyView.dimmerBar.Progress = uFunction.brightness;
+ }
+
+ if (uFunction.trait_on_off.curValue.ToString() == "on")
+ {
+ bodyView.dimmerBar.SetProgressBarColors(CSS_Color.AuxiliaryColor1, CSS_Color.AuxiliaryColor1);
+ }
+ else
+ {
+ bodyView.dimmerBar.SetProgressBarColors(CSS_Color.DividingLineColor, CSS_Color.DividingLineColor);
+ }
+ bodyView.btnSwitch.IsSelected = uFunction.trait_on_off.curValue.ToString() == "on";
+
+ bodyView.btnBrightnessText.Y = ((100 - uFunction.brightness) * Application.GetRealHeight(288 - 16 - 16) / 100) + Application.GetRealWidth(40);
+ bodyView.btnBrightnessText.Text = uFunction.brightness + "%";
}
}
catch (Exception ex)
@@ -35,10 +51,23 @@
LoadSwitchEvent();
LoadCollectionEvent();
LoadEvent_DimmerBar();
+ LoadEvet_ChangeFadeTime();
//鍥為��鍒锋柊淇℃伅浜嬩欢
actionRefresh = () => {
btnFunctionName.Text = btnFunctionName_Out.Text = light.name;
btnFromFloor_Out.Text = btnFromFoorAndRoom.Text = light.GetRoomListName();
+ //light.SaveFunctionData(true);
+ };
+ }
+ /// <summary>
+ /// 淇敼鐏厜娓愬彉鏃堕棿
+ /// </summary>
+ void LoadEvet_ChangeFadeTime()
+ {
+ barFadeTime.OnProgressChangedEvent = (sender, e) =>
+ {
+ light.fadeTime = e;
+ light.SaveFunctionData(false);
};
}
@@ -48,8 +77,8 @@
void LoadCollectionEvent()
{
btnCollection.MouseUpEventHandler += (sender, e) => {
- btnCollection.IsSelected = light.collection = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
- DB_ResidenceData.residenceData.SaveResidenceData();
+ btnCollection.IsSelected = light.collect = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
+ light.SaveFunctionData(true);
};
}
@@ -64,20 +93,28 @@
dimmerBar.OnStopTrackingTouchEvent = (sender, e) => {
onDimmerBar = false;
light.brightness = dimmerBar.Progress;
- Control.Send(CommandType_A.write, light);
+ //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);
+ light.fadeTime = barFadeTime.Progress;
};
dimmerBar.OnProgressChangedEvent = (sender, e) => {
+ light.fadeTime = 0;
if (!btnSwitch.IsSelected)
{
- dimmerBar.WaveColor = CSS.CSS_Color.AuxiliaryColor1;
- }
+ dimmerBar.SetProgressBarColors(CSS_Color.AuxiliaryColor1, CSS_Color.AuxiliaryColor1);
+ }
btnSwitch.IsSelected = e > 0 ? true : false;
light.brightness = e;
- light.on_off = e > 0 ? "on" : "off";
+ light.trait_on_off.curValue = e > 0 ? "on" : "off";
if (e == 0 || e == 100)
{
- Control.Send(CommandType_A.write, this.light);
+ //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);
}
else
{
@@ -86,15 +123,16 @@
light.refreshTime = DateTime.Now;
new System.Threading.Thread(() =>
{
- 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);
})
{ IsBackground = true }.Start();
}
- else
- {
- MainPage.Log("skip control!!");
- }
}
+
+ btnBrightnessText.Y = ((100 - dimmerBar.Progress) * Application.GetRealHeight(288 - 16 - 16) / 100) + Application.GetRealWidth(40);
+ btnBrightnessText.Text = light.brightness + "%";
};
}
@@ -105,12 +143,22 @@
{
btnSwitch.MouseUpEventHandler += (sender, e) =>
{
+ light.fadeTime = barFadeTime.Progress;
btnSwitch.IsSelected = !btnSwitch.IsSelected;
- dimmerBar.WaveColor = btnSwitch.IsSelected ? CSS.CSS_Color.AuxiliaryColor1 : CSS.CSS_Color.PromptingColor2;
+ if (btnSwitch.IsSelected)
+ {
+ dimmerBar.SetProgressBarColors(CSS_Color.AuxiliaryColor1, CSS_Color.AuxiliaryColor1);
+ }
+ else
+ {
+ dimmerBar.SetProgressBarColors(CSS_Color.DividingLineColor, CSS_Color.DividingLineColor);
+ }
new System.Threading.Thread(() =>
{
- light.on_off = btnSwitch.IsSelected ? "on" : "off";
- Control.Send(CommandType_A.write, this.light);
+ 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.curValue.ToString());
+ Control.Ins.SendWriteCommand(light, d);
})
{ IsBackground = true }.Start();
};
--
Gitblit v1.8.0