From 2e12a9190f431565e576d0b05866366d15bcc9ae Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 23 六月 2022 11:07:37 +0800
Subject: [PATCH] 修复场景闪退问题
---
HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs | 47 +++++++++++++++++++++++++++++++++++++++++------
1 files changed, 41 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
index 9866147..4b7c2fa 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
@@ -68,6 +68,7 @@
lightSwitchView.btnText.TextID = StringId.switchLogic;
fLayout.AddChidren(lightSwitchView.FLayoutView());
+
///璁惧寤舵椂iewv
DelayView(fLayout, lightSwitchView.frameLayout.Bottom);
#endregion
@@ -101,7 +102,7 @@
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
@@ -127,15 +128,12 @@
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());
- ///璁惧寤舵椂iewv
DelayView(fLayout, curtainSwitchView.frameLayout.Bottom);
#endregion
#region 鐐瑰嚮浜嬩欢
@@ -148,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, 2);
+ };
+ ///鐧惧垎姣旂偣鍑讳簨浠�
+ crtainPercentumView.btnClick.MouseUpEventHandler += (sender, e) =>
+ {
+ BrightnessMethod(device, crtainPercentumView.btnState, crtainPercentumView.btnText.Text);
+ };
+ if (edit)
+ {
+ //鏄剧ず缂栬緫涔嬪墠鐨勮澶囩姸鎬�
+ GetEditState(device, index, curtainSwitchView.btnState, crtainPercentumView.btnState, null, null);
}
#endregion
}
@@ -604,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 鐣岄潰
--
Gitblit v1.8.0