From 1a0a7f736c6d2e7129e7591d40bed67ec7c0f09a Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 05 二月 2021 10:47:42 +0800
Subject: [PATCH] 2021-02-05 1.编译冲突修改
---
HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs | 83 ++++++++++++++++++++++-------------------
1 files changed, 44 insertions(+), 39 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs b/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs
index 6e50522..531d926 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs
@@ -66,14 +66,14 @@
btnCollectionIcon.MouseUpEventHandler += (sender, e) =>
{
btnCollectionIcon.IsSelected = function.collect = !btnCollectionIcon.IsSelected;
- function.SaveFunctionData(true);
+ function.CollectFunction();
};
}
/// <summary>
/// 寮�鍏充簨浠�
/// </summary>
- void LoadEvent_SwitchFunction(Button btnSwitch)
+ void LoadEvent_SwitchFunction(Button btnSwitch,FunctionAttributes fadeTime = null)
{
btnSwitch.MouseUpEventHandler = (sender, e) =>
{
@@ -81,9 +81,14 @@
new System.Threading.Thread(() =>
{
function.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";
- //Control.Send(CommandType_A.write, function);
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- d.Add("on_off", function.trait_on_off.curValue.ToString());
+ d.Add(FunctionAttributeKey.OnOff, function.trait_on_off.curValue.ToString());
+ if(fadeTime!= null)
+ {
+ int result = 0;
+ int.TryParse(fadeTime.curValue.ToString(), out result);
+ d.Add(FunctionAttributeKey.FadeTime, result.ToString());
+ }
Control.Ins.SendWriteCommand(function, d);
})
{ IsBackground = true }.Start();
@@ -101,7 +106,7 @@
btnSwitch.IsSelected = !btnSwitch.IsSelected;
new System.Threading.Thread(() =>
{
- if (function.functionCategory == FunctionCategory.Light)
+ if (function.Spk_Prefix == FunctionCategory.Light)
{
var light = function as Light;
light.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";
@@ -120,7 +125,7 @@
/// </summary>
void LoadEvent_LightDimming(DiyImageSeekBar dimmerControlBar)
{
- if(function.functionType == FunctionType.Dimmer || function.functionType == FunctionType.RGB)
+ if(function.spk == SPK.LightDimming || function.spk == SPK.LightRGB)
{
var light = function as Light;
dimmerControlBar.OnStartTrackingTouchEvent = (sender, e) => {
@@ -136,32 +141,33 @@
Control.Ins.SendWriteCommand(light, d);
};
dimmerControlBar.OnProgressChangedEvent = (sender, e) => {
- light.brightness = e;
- light.trait_on_off.curValue = e > 0 ? "on" : "off";
+ dimmerControlBar.ProgressBarColor = CSS.CSS_Color.AuxiliaryColor1;
+ //light.brightness = e;
+ //light.trait_on_off.curValue = e > 0 ? "on" : "off";
- if (e == 0 || e == 100)
- {
- //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);
- }
- else
- {
- var tm = (DateTime.Now - light.refreshTime).TotalMilliseconds;
- Console.WriteLine("skip time "+tm);
- if (300 < tm)
- {
- light.refreshTime = DateTime.Now;
- new System.Threading.Thread(() =>
- {
- 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();
- }
- }
+ //if (e == 0 || e == 100)
+ //{
+ // //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);
+ //}
+ //else
+ //{
+ // var tm = (DateTime.Now - light.refreshTime).TotalMilliseconds;
+ // Console.WriteLine("skip time "+tm);
+ // if (300 < tm)
+ // {
+ // light.refreshTime = DateTime.Now;
+ // new System.Threading.Thread(() =>
+ // {
+ // 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();
+ // }
+ //}
};
}
@@ -190,19 +196,18 @@
Control.Ins.SendWriteCommand(curtain, d);
};
- btnStop.MouseDownEventHandler = (sender, e) =>
+ //btnStop.MouseDownEventHandler = (sender, e) =>
+ //{
+ // btnStop.IsSelected = true;
+ // btnClose.IsSelected = false;
+ // btnOpen.IsSelected = false;
+ //};
+ btnStop.MouseUpEventHandler = (sender, e) =>
{
btnStop.IsSelected = true;
btnClose.IsSelected = false;
btnOpen.IsSelected = false;
- };
- btnStop.MouseUpEventHandler = (sender, e) =>
- {
- btnOpen.IsSelected = true;
- btnClose.IsSelected = false;
- btnStop.IsSelected = false;
curtain.trait_on_off.curValue = "stop";
- //curtain.percent = 0;
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
d.Add("on_off", curtain.trait_on_off.curValue.ToString());
Control.Ins.SendWriteCommand(curtain, d);
--
Gitblit v1.8.0