From 4f61757a216eb4d36ad628c7d16d17a6e442e95a Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 22 十二月 2020 16:12:55 +0800
Subject: [PATCH] 2020-12-22 1.登录、注册、忘记密码增加键盘关闭时间
---
HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs b/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs
index e070d16..4029e1b 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();
+ function.SaveFunctionData(true);
};
}
/// <summary>
/// 寮�鍏充簨浠�
/// </summary>
- void LoadEvent_SwitchFunction(Button btnSwitch)
+ void LoadEvent_SwitchFunction(Button btnSwitch,FunctionAttributes fadeTime = null)
{
btnSwitch.MouseUpEventHandler = (sender, e) =>
{
@@ -81,9 +81,12 @@
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)
+ {
+ d.Add(FunctionAttributeKey.FadeTime, fadeTime.curValue.ToString());
+ }
Control.Ins.SendWriteCommand(function, d);
})
{ IsBackground = true }.Start();
@@ -190,19 +193,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