From db68ee28e538f1de22db27216f194d131240f901 Mon Sep 17 00:00:00 2001 From: 陈嘉乐 <cjl@hdlchina.com.cn> Date: 星期一, 23 十一月 2020 17:46:30 +0800 Subject: [PATCH] 2020-11-23-1 --- HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs index 3968f80..5f03fd0 100644 --- a/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs +++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs @@ -1,5 +1,6 @@ 锘縰sing System; using Shared; +using System.Collections.Generic; namespace HDL_ON.UI.UI2.Intelligence.Automation @@ -8,14 +9,14 @@ { public AddLogic() { - + Tag = "Logic"; } public void Show() { this.BackgroundColor = CSS.CSS_Color.viewMiddle; LogicView.TopView topView = new LogicView.TopView(); - this.AddChidren(topView.TopFLayoutView()); + this.AddChidren(topView.FLayoutView()); topView.clickBackBtn.MouseUpEventHandler += (e, sen) => { RemoveFromParent(); @@ -26,7 +27,7 @@ { Y = Application.GetRealHeight(64), Width = Application.GetRealWidth(LogicView.TextSize.view375), - Height = Application.GetRealHeight(LogicView.TextSize.view667 - 64-76), + Height = Application.GetRealHeight(LogicView.TextSize.view667 - 64 - 76), BackgroundColor = CSS.CSS_Color.viewMiddle, }; this.AddChidren(viewLayout); @@ -37,12 +38,11 @@ viewLayout.AddChidren(addInputTextView.FLayoutView(46, 12)); ///婊¤冻浠ヤ笅鏉′欢鐨刅iew LogicView.LogicTypeTitleView titleCondition = new LogicView.LogicTypeTitleView(); - titleCondition.frameLayout.SetCornerWithSameRadius(12,HDLUtils.RectCornerTopLeft| HDLUtils.RectCornerTopRight); + titleCondition.frameLayout.SetCornerWithSameRadius(12, HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight); titleCondition.btnText.TextID = StringId.whenTheFollowingConditionsAreMet; viewLayout.AddChidren(titleCondition.FLayoutView()); - ///杈撳叆鍚勭鏉′欢鐨刅iew - LogicView.AddOutputInputView InputView = new LogicView.AddOutputInputView(); - viewLayout.AddChidren(InputView.FLayoutView()); + // 杈撳叆鏉′欢澶勭悊鏂规硶 + InpOrOutLogicMethod.InputCondition(this, viewLayout); ///娣诲姞鍥炬爣鐨刅iew LogicView.LogicAddView addInputIcon = new LogicView.LogicAddView(); addInputIcon.frameLayout.SetCornerWithSameRadius(12, HDLUtils.RectCornerBottomLeft | HDLUtils.RectCornerBottomRight); @@ -82,9 +82,9 @@ cyclicTextView.btnIf.TextID = StringId.cyclic; viewLayout.AddChidren(cyclicTextView.FLayoutView(54, 20)); ///閫夋嫨鍛ㄦ湡绫诲瀷View - LogicView.LogicTypeTitleView cyclicTitle= new LogicView.LogicTypeTitleView(); + LogicView.LogicTypeTitleView cyclicTitle = new LogicView.LogicTypeTitleView(); cyclicTextView.frameLayout.Height = Application.GetRealHeight(50); - cyclicTitle.frameLayout.SetCornerWithSameRadius(12, HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight|HDLUtils.RectCornerBottomLeft|HDLUtils.RectCornerBottomRight); + cyclicTitle.frameLayout.SetCornerWithSameRadius(12, HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight | HDLUtils.RectCornerBottomLeft | HDLUtils.RectCornerBottomRight); //cyclicTitle.frameLayout.Radius = (uint)Application.GetRealHeight(12); cyclicTitle.btnText.TextID = StringId.days; viewLayout.AddChidren(cyclicTitle.FLayoutView()); @@ -92,7 +92,7 @@ #region 鎵ц鎺ㄩ�� 鍙戦�侀�氱煡 ///涓婁笅闂撮殧12鍍忕礌 - viewLayout.AddChidren(new FrameLayout { Height = Application.GetRealHeight(12)}); + viewLayout.AddChidren(new FrameLayout { Height = Application.GetRealHeight(12) }); ///鎵ц鎺ㄩ�乮ew LogicView.LogicTypeTitleView push = new LogicView.LogicTypeTitleView(); push.frameLayout.Height = Application.GetRealHeight(50); @@ -105,13 +105,13 @@ notification.btnText.TextID = StringId.notification; viewLayout.AddChidren(notification.FLayoutView()); ///涓婁笅闂撮殧62鍍忕礌 - viewLayout.AddChidren(new FrameLayout { Height = Application.GetRealHeight(62)}); + viewLayout.AddChidren(new FrameLayout { Height = Application.GetRealHeight(62) }); #endregion #region 淇濆瓨 ///淇濆瓨View LogicView.SaveView saveView = new LogicView.SaveView(); - saveView.frameLayout.SetCornerWithSameRadius(24,HDLUtils.RectCornerTopLeft|HDLUtils.RectCornerTopRight); + saveView.frameLayout.SetCornerWithSameRadius(24, HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight); this.AddChidren(saveView.FLayoutView()); //saveView.frameLayout.Y = this.Height - saveView.frameLayout.Height; #endregion -- Gitblit v1.8.0