From f75a1ba69f5922cab8d2ab43f4447b74bd9b9ea9 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 26 五月 2022 09:52:34 +0800
Subject: [PATCH] 备份
---
HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs | 105 +++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 98 insertions(+), 7 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
index 4e8a634..e5894e8 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
@@ -12,6 +12,14 @@
Tag = "Logic";
}
/// <summary>
+ /// 璁惧寤舵椂鏃堕棿
+ /// </summary>
+ private string strdelay = "0";
+ /// <summary>
+ /// 鏄剧ず璁惧寤舵椂鏃堕棿
+ /// </summary>
+ private Button btnDelay =null;
+ /// <summary>
/// 瀹氫箟涓�涓褰曢�変腑璁惧鐘舵�佸垪琛紱
/// </summary>
private List<Dictionary<string, string>> dicSateteList = new List<Dictionary<string, string>>();
@@ -59,6 +67,10 @@
LogicView.FunTypeView lightSwitchView = new LogicView.FunTypeView();
lightSwitchView.btnText.TextID = StringId.switchLogic;
fLayout.AddChidren(lightSwitchView.FLayoutView());
+
+
+ ///璁惧寤舵椂iewv
+ DelayView(fLayout, lightSwitchView.frameLayout.Bottom);
#endregion
#region 鐐瑰嚮浜嬩欢
///寮�鍏崇偣鍑讳簨浠�
@@ -90,7 +102,9 @@
brightnessView.frameLayout.Y = lightSwitchView.frameLayout.Bottom;
brightnessView.btnText.TextID = StringId.brightnesLogic;
fLayout.AddChidren(brightnessView.FLayoutView());
- brightnessView.btnState.Text = "5%";//浜у搧缁忕悊鏅撹緣瑕佹眰鏀圭殑 2021-11-06
+ //brightnessView.btnState.Text = "5%";//浜у搧缁忕悊鏅撹緣瑕佹眰鏀圭殑 2021-11-06
+ ///璁惧寤舵椂iewv
+ DelayView(fLayout, brightnessView.frameLayout.Bottom);
#endregion
#region 鐐瑰嚮浜嬩欢
///寮�鍏崇偣鍑讳簨浠�
@@ -114,14 +128,13 @@
break;
//绐楀笜
case SPK.CurtainSwitch:
- case SPK.CurtainTrietex:
- case SPK.CurtainRoller:
{
#region 鐣岄潰
///寮�鍏�
LogicView.FunTypeView curtainSwitchView = new LogicView.FunTypeView();
curtainSwitchView.btnText.TextID = StringId.switchLogic;
fLayout.AddChidren(curtainSwitchView.FLayoutView());
+ DelayView(fLayout, curtainSwitchView.frameLayout.Bottom);
#endregion
#region 鐐瑰嚮浜嬩欢
///寮�鍏崇偣鍑讳簨浠�
@@ -133,6 +146,42 @@
{
//鏄剧ず缂栬緫涔嬪墠鐨勮澶囩姸鎬�
GetEditState(device, index, curtainSwitchView.btnState, null, null, null);
+ }
+ #endregion
+ }
+ break;
+ case SPK.CurtainTrietex:
+ case SPK.CurtainRoller:
+ {
+ #region 鐣岄潰
+ ///寮�鍏�
+ LogicView.FunTypeView curtainSwitchView = new LogicView.FunTypeView();
+ curtainSwitchView.btnText.TextID = StringId.switchLogic;
+ fLayout.AddChidren(curtainSwitchView.FLayoutView());
+ ///鐧惧垎姣�
+ LogicView.FunTypeView crtainPercentumView = new LogicView.FunTypeView();
+ crtainPercentumView.frameLayout.Y = curtainSwitchView.frameLayout.Bottom;
+ crtainPercentumView.btnText.TextID = StringId.percentum;
+ fLayout.AddChidren(crtainPercentumView.FLayoutView());
+ crtainPercentumView.btnState.Text = "5%";//浜у搧缁忕悊鏅撹緣瑕佹眰鏀圭殑 2021-11-06
+ ///璁惧寤舵椂iewv
+ DelayView(fLayout, crtainPercentumView.frameLayout.Bottom);
+ #endregion
+ #region 鐐瑰嚮浜嬩欢
+ ///寮�鍏崇偣鍑讳簨浠�
+ curtainSwitchView.btnClick.MouseUpEventHandler += (sender, e) =>
+ {
+ SwitchViewMethod(device, curtainSwitchView.btnState, 3);
+ };
+ ///鐧惧垎姣旂偣鍑讳簨浠�
+ crtainPercentumView.btnClick.MouseUpEventHandler += (sender, e) =>
+ {
+ BrightnessMethod(device, crtainPercentumView.btnState, crtainPercentumView.btnText.Text);
+ };
+ if (edit)
+ {
+ //鏄剧ず缂栬緫涔嬪墠鐨勮澶囩姸鎬�
+ GetEditState(device, index, curtainSwitchView.btnState, crtainPercentumView.btnState, null, null);
}
#endregion
}
@@ -163,6 +212,8 @@
acSpeedView.frameLayout.Y = acModehView.frameLayout.Bottom;
acSpeedView.btnText.TextID = StringId.speedLogic;
fLayout.AddChidren(acSpeedView.FLayoutView());
+ ///璁惧寤舵椂iewv
+ DelayView(fLayout, acModehView.frameLayout.Bottom);
#endregion
#region 鐐瑰嚮浜嬩欢
///寮�鍏崇偣鍑讳簨浠�
@@ -260,7 +311,8 @@
floorHeatingModehView.btnText.TextID = StringId.modeLogic;
fLayout.AddChidren(floorHeatingModehView.FLayoutView());
-
+ ///璁惧寤舵椂iewv
+ DelayView(fLayout, floorHeatingModehView.frameLayout.Bottom);
#endregion
#region 鐐瑰嚮浜嬩欢
///寮�鍏崇偣鍑讳簨浠�
@@ -333,6 +385,9 @@
AirFreshSpeedView.frameLayout.Y = AirFreshSwitchVie.frameLayout.Bottom;
AirFreshSpeedView.btnText.TextID = StringId.speedLogic;
fLayout.AddChidren(AirFreshSpeedView.FLayoutView());
+
+ ///璁惧寤舵椂iewv
+ DelayView(fLayout, AirFreshSpeedView.frameLayout.Bottom);
#endregion
#region 鐐瑰嚮浜嬩欢
///寮�鍏崇偣鍑讳簨浠�
@@ -413,6 +468,7 @@
Output outputDevice = new Output();
outputDevice.target_type = "1";
outputDevice.sid = device.sid;
+ outputDevice.delay= strdelay;
switch (device.spk)
{
case SPK.LightDimming:
@@ -477,7 +533,7 @@
if (edit)
{
//鏇存柊寤舵椂鏃堕棿
- outputDevice.delay = Logic.currlogic.output[index].delay;
+ outputDevice.delay = strdelay;//Logic.currlogic.output[index].delay;
//绉婚櫎鏃ф暟鎹�
Logic.currlogic.output.RemoveAt(index);
//鏂版暟鎹彃鍏ユ棫鏁版嵁鐨勪綅缃�;
@@ -508,6 +564,34 @@
#endregion
}
+ /// <summary>
+ /// 寤舵椂View
+ /// </summary>
+ /// <param name="fLayout">鐖舵帶浠�</param>
+ /// <param name="bottomY">鍦ㄥ摢涓帶浠朵笅闈�</param>
+ private void DelayView(FrameLayout fLayout, int bottomY)
+ {
+ LogicView.FunTypeView delayView = new LogicView.FunTypeView();
+ delayView.frameLayout.Y = bottomY;
+ delayView.btnText.TextID = StringId.Delay;
+ delayView.btnState.Text = strdelay + "s";
+ fLayout.AddChidren(delayView.FLayoutView());
+ ///璧嬪�煎璞�
+ this.btnDelay = delayView.btnState;
+ ///寤舵椂鐐瑰嚮浜嬩欢
+ delayView.btnClick.MouseUpEventHandler += (sender, e) =>
+ {
+ InpOrOutLogicMethod inpOrOutLogicMethod = new InpOrOutLogicMethod();
+ inpOrOutLogicMethod.Delayed(this, strdelay, (value) =>
+ {
+ selectedState = "delay_" + strdelay;
+ strdelay = value.ToString();
+ delayView.btnState.Text = strdelay + "s";
+ });
+ };
+
+ }
+
/// <summary>
/// 寮�鍏�=鍔熻兘涓嬩竴绾х晫闈�
/// </summary>
@@ -554,8 +638,9 @@
/// <summary>
/// 浜害/鐧惧垎姣�=鍔熻兘涓嬩竴绾х晫闈�
/// </summary>
- /// <param name="device"></param>
- /// <param name="button"></param>
+ /// <param name="device">璁惧瀵硅薄</param>
+ /// <param name="button">鏄剧ず鐘舵�佸璞�</param>
+ /// <param name="titleName">鏍囬</param>
private void BrightnessMethod(Entity.Function device, Button button, string titleName)
{
#region 鐣岄潰
@@ -613,6 +698,12 @@
//鏈夋暟鎹噸鏂拌祴鍊�
dicSateteList = dicList;
}
+ if (this.btnDelay != null)
+ {
+ ///寤舵椂鏄剧ず鏂囨湰
+ this.btnDelay.Text = outputs.delay + "s";
+ this.strdelay = outputs.delay;
+ }
InpOrOutLogicMethod.EditState(device, dicList, button1, button2, button3, button4);
}
/// <summary>
--
Gitblit v1.8.0