From 9118585babf132b7e8a7a93da8c6ebf79510b72c Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期四, 26 十一月 2020 20:21:20 +0800
Subject: [PATCH] 2020-11-26-2
---
HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs | 41 ++++++++++++++++++++++++++++-------------
1 files changed, 28 insertions(+), 13 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs
index d9c4b1d..232f022 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs
@@ -11,11 +11,7 @@
{
Tag = "Logic";
}
- /// <summary>
- /// 琛ㄧず杩斿洖鏇存柊鐣岄潰
- /// (瀹氫箟闈欐�佹槸鍥犱负璇ョ晫闈細琚叾瀹冪晫闈㈢Щ闄わ紝杩斿洖鏃朵細鍑虹幇action绌哄紓甯�)
- /// </summary>
- public static Action action;
+
public void Show()
{
this.BackgroundColor = CSS.CSS_Color.viewMiddle;
@@ -93,11 +89,34 @@
viewLayout.AddChidren(cyclicTextView.FLayoutView(54, 20));
///閫夋嫨鍛ㄦ湡绫诲瀷View
LogicView.LogicTypeTitleView cyclicTitle = new LogicView.LogicTypeTitleView();
- cyclicTextView.frameLayout.Height = Application.GetRealHeight(50);
- cyclicTitle.frameLayout.SetCornerWithSameRadius(Application.GetRealHeight(12), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight | HDLUtils.RectCornerBottomLeft | HDLUtils.RectCornerBottomRight);
- //cyclicTitle.frameLayout.Radius = (uint)Application.GetRealHeight(12);
+ cyclicTitle.frameLayout.Height = Application.GetRealHeight(50);
+ cyclicTitle.frameLayout.Radius = (uint)Application.GetRealHeight(12);
cyclicTitle.btnText.TextID = StringId.days;
viewLayout.AddChidren(cyclicTitle.FLayoutView());
+ cyclicTitle.btnClick.MouseUpEventHandler += (sender, e) =>
+ {
+ FrameLayout fLayout = new FrameLayout
+ {
+ BackgroundColor = CSS.CSS_Color.viewTrans60lucence,
+ };
+ this.AddChidren(fLayout);
+ LogicView.DateView dateView = new LogicView.DateView();
+ dateView.FLayoutView(fLayout, 7);
+ dateView.btnCancel.MouseUpEventHandler += (sender2, e2) =>
+ {
+ //绉婚櫎fLayout鐣岄潰
+ fLayout.RemoveFromParent();
+ };
+ for (int i = 0; i < 7; i++) {
+ LogicView.SelectTypeView dateTypeView = new LogicView.SelectTypeView();
+ dateTypeView.frameLayout.Y = Application.GetRealHeight(56 + 50 * i);
+ dateTypeView.btnIcon.Visible = false;
+ dateTypeView.btnText.X = Application.GetRealWidth(20);
+ dateTypeView.btnText.TextID = StringId.time;
+ dateTypeView.btnNextIcon.X = Application.GetRealWidth(307);
+ dateView.AddChidren(dateTypeView.FLayoutView());
+ }
+ };
#endregion
#region 鎵ц鎺ㄩ�� 鍙戦�侀�氱煡
@@ -126,12 +145,8 @@
saveView.btnClick.MouseUpEventHandler += (sender, e) =>
{
Logic.LogicList.Add(Logic.currlogic);
- action();
- if (action != null)
- {
- action = null;
- }
LogicMethod.RemoveAllView();
+ MainView.MainShow();
};
//saveView.frameLayout.Y = this.Height - saveView.frameLayout.Height;
--
Gitblit v1.8.0