From 3f6685c77beeb12baf840733fb890860f4c26e7c Mon Sep 17 00:00:00 2001 From: mac <user@users-MacBook-Pro.local> Date: 星期四, 25 七月 2024 17:25:59 +0800 Subject: [PATCH] 2024年07月25日17:24:45 --- HDL_ON/UI/UI2/FuntionControlView/Light/LightScene/AddLightScene.cs | 152 ++++++++++++++++++++++++++------------------------ 1 files changed, 79 insertions(+), 73 deletions(-) diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/LightScene/AddLightScene.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/LightScene/AddLightScene.cs index a0aef90..746471b 100644 --- a/HDL_ON/UI/UI2/FuntionControlView/Light/LightScene/AddLightScene.cs +++ b/HDL_ON/UI/UI2/FuntionControlView/Light/LightScene/AddLightScene.cs @@ -372,85 +372,91 @@ /// </summary> public void LoadDiv(List<Function> functions,Action action) { - btnIcon = new Button() + try { - X = Application.GetRealWidth(10), - Y = Application.GetRealHeight(15), - Width = Application.GetRealWidth(32), - Height = Application.GetRealWidth(32), - UnSelectedImagePath = $"FunctionIcon/Icon/{function.IconName}.png" - }; - bodyDiv.AddChidren(btnIcon); - - btnName = new Button() - { - X = Application.GetRealWidth(8 + 10 + 32), - Y = Application.GetRealHeight(10), - Width = Application.GetRealWidth(200), - Height = Application.GetRealHeight(24), - Text = function.name, - TextAlignment = TextAlignment.CenterLeft, - TextColor = CSS_Color.FirstLevelTitleColor, - TextSize = CSS_FontSize.TextFontSize, - }; - bodyDiv.AddChidren(btnName); - - btnFromFloor = new Button() - { - X = Application.GetRealWidth(8 + 10 + 32), - Y = Application.GetRealHeight(10 + 24), - Width = Application.GetRealWidth(200), - Height = Application.GetRealHeight(18), - Text = function.GetRoomListName(), - TextAlignment = TextAlignment.CenterLeft, - TextColor = CSS_Color.PromptingColor1, - TextSize = CSS_FontSize.PromptFontSize_FirstLevel, - }; - bodyDiv.AddChidren(btnFromFloor); - - btnSelect = new Button() - { - X = Application.GetRealWidth(303), - Gravity = Gravity.CenterVertical, - Width = Application.GetRealWidth(32), - Height = Application.GetRealWidth(32), - UnSelectedImagePath = "FunctionIcon/Light/LightScene/CheckIcon.png", - SelectedImagePath = "FunctionIcon/Light/LightScene/CheckOnIcon.png", - IsSelected = functions.Find((obj) => obj.deviceId == function.deviceId) != null, - Tag = "ChooseIcon" - }; - if (DB_ResidenceData.Instance.HomeGateway.isSupportGroupControl) - { - btnSelect.X = Application.GetRealWidth(323); - } - bodyDiv.AddChidren(btnSelect); - - btnSelect.MouseUpEventHandler = (sender, e) => { - Application.HideSoftInput(); - btnSelect.IsSelected = !btnSelect.IsSelected; - if(btnSelect.IsSelected) + btnIcon = new Button() { - var addTemp = functions.Find((obj) => obj.deviceId == function.deviceId); - if (addTemp == null) - { - functions.Add(function); - } - } - else + X = Application.GetRealWidth(10), + Y = Application.GetRealHeight(15), + Width = Application.GetRealWidth(32), + Height = Application.GetRealWidth(32), + UnSelectedImagePath = $"FunctionIcon/Icon/{function.IconName}.png" + }; + bodyDiv.AddChidren(btnIcon); + + btnName = new Button() { - var removeTemp = functions.Find((obj) => obj.sid == function.sid); - if (removeTemp != null) - { - functions.Remove(removeTemp); - } + X = Application.GetRealWidth(8 + 10 + 32), + Y = Application.GetRealHeight(10), + Width = Application.GetRealWidth(200), + Height = Application.GetRealHeight(24), + Text = function.name, + TextAlignment = TextAlignment.CenterLeft, + TextColor = CSS_Color.FirstLevelTitleColor, + TextSize = CSS_FontSize.TextFontSize, + }; + bodyDiv.AddChidren(btnName); + + btnFromFloor = new Button() + { + X = Application.GetRealWidth(8 + 10 + 32), + Y = Application.GetRealHeight(10 + 24), + Width = Application.GetRealWidth(200), + Height = Application.GetRealHeight(18), + Text = function.GetRoomListName(), + TextAlignment = TextAlignment.CenterLeft, + TextColor = CSS_Color.PromptingColor1, + TextSize = CSS_FontSize.PromptFontSize_FirstLevel, + }; + bodyDiv.AddChidren(btnFromFloor); + + btnSelect = new Button() + { + X = Application.GetRealWidth(303), + Gravity = Gravity.CenterVertical, + Width = Application.GetRealWidth(32), + Height = Application.GetRealWidth(32), + UnSelectedImagePath = "FunctionIcon/Light/LightScene/CheckIcon.png", + SelectedImagePath = "FunctionIcon/Light/LightScene/CheckOnIcon.png", + IsSelected = functions.Find((obj) => obj.deviceId == function.deviceId) != null, + Tag = "ChooseIcon" + }; + if (DB_ResidenceData.Instance.HomeGateway.isSupportGroupControl) + { + btnSelect.X = Application.GetRealWidth(323); } - ///鍒锋柊鐣岄潰 - //if (functions.Count == 0 || functions.Count == 1) - //{ + bodyDiv.AddChidren(btnSelect); + + btnSelect.MouseUpEventHandler = (sender, e) => + { + Application.HideSoftInput(); + btnSelect.IsSelected = !btnSelect.IsSelected; + if (btnSelect.IsSelected) + { + var addTemp = functions.Find((obj) => obj.deviceId == function.deviceId); + if (addTemp == null) + { + functions.Add(function); + } + } + else + { + var removeTemp = functions.Find((obj) => obj.sid == function.sid); + if (removeTemp != null) + { + functions.Remove(removeTemp); + } + } + ///鍒锋柊鐣岄潰 + //if (functions.Count == 0 || functions.Count == 1) + //{ action(); - //} - }; + //} + }; + }catch (Exception ex) + { + } } -- Gitblit v1.8.0