From dd7e4794fd611de967c6322dd0bb7ffda41c2f7b Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期一, 29 十一月 2021 16:32:55 +0800 Subject: [PATCH] 增加了安防相关功能 --- HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs | 51 ++++++++++++++++++++++++++++----------------------- 1 files changed, 28 insertions(+), 23 deletions(-) diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs index dcbac35..e6f0701 100644 --- a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs +++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs @@ -47,7 +47,34 @@ #region 缂栬緫璁惧鐘舵�� switch (device.spk) { - //寮�鍏崇伅鍏� light.Switch + //寮�鍏崇伅鍏� + case SPK.AirSwitch: + case SPK.LightSwitch: + //鎻掑骇 + case SPK.PanelSocket: + case SPK.ElectricSocket: + { + #region 鐣岄潰 + ///寮�鍏� + LogicView.FunTypeView lightSwitchView = new LogicView.FunTypeView(); + lightSwitchView.btnText.TextID = StringId.switchLogic; + fLayout.AddChidren(lightSwitchView.FLayoutView()); + #endregion + #region 鐐瑰嚮浜嬩欢 + ///寮�鍏崇偣鍑讳簨浠� + lightSwitchView.btnClick.MouseUpEventHandler += (sender, e) => + { + SwitchViewMethod(device, lightSwitchView.btnState, 2); + }; + if (edit) + { + //鏄剧ず缂栬緫涔嬪墠鐨勮澶囩姸鎬� + GetEditState(device, index, lightSwitchView.btnState, null, null, null); + } + #endregion + } + break; + //鐏厜寮�鍏� 浜害 case SPK.LightDimming: case SPK.LightRGB: case SPK.LightRGBW: @@ -80,28 +107,6 @@ { //鏄剧ず缂栬緫涔嬪墠鐨勮澶囩姸鎬� GetEditState(device, index, lightSwitchView.btnState, brightnessView.btnState, null, null); - } - #endregion - } - break; - case SPK.LightSwitch: - { - #region 鐣岄潰 - ///寮�鍏� - LogicView.FunTypeView lightSwitchView = new LogicView.FunTypeView(); - lightSwitchView.btnText.TextID = StringId.switchLogic; - fLayout.AddChidren(lightSwitchView.FLayoutView()); - #endregion - #region 鐐瑰嚮浜嬩欢 - ///寮�鍏崇偣鍑讳簨浠� - lightSwitchView.btnClick.MouseUpEventHandler += (sender, e) => - { - SwitchViewMethod(device, lightSwitchView.btnState, 2); - }; - if (edit) - { - //鏄剧ず缂栬緫涔嬪墠鐨勮澶囩姸鎬� - GetEditState(device, index, lightSwitchView.btnState, null, null, null); } #endregion } -- Gitblit v1.8.0