From 157be5220d9d81bce18e8248ef6ac056415405a1 Mon Sep 17 00:00:00 2001
From: Tong <1025782220@qq.com>
Date: 星期二, 31 八月 2021 09:29:45 +0800
Subject: [PATCH] 更新推送库
---
HDL_ON/UI/UI2/3-Intelligence/Automation/TimeTpye.cs | 41 ++++++++++++++++++++++++++++++-----------
1 files changed, 30 insertions(+), 11 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/TimeTpye.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/TimeTpye.cs
index 047b701..fb0a481 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/TimeTpye.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/TimeTpye.cs
@@ -49,6 +49,17 @@
timeHorizonView.btnText.TextID = StringId.timeHorizon;
viewLayout.AddChidren(timeHorizonView.FLayoutView());
+
+ //鏃ュ嚭/鏃ヨ惤/姝ｅ崍
+ LogicView.SelectTypeView timeSpecialView = new LogicView.SelectTypeView();
+ timeSpecialView.frameLayout.Y = timeHorizonView.frameLayout.Bottom;
+ timeSpecialView.btnIcon.Visible = false;
+ timeSpecialView.btnText.X = Application.GetRealWidth(16);
+ timeSpecialView.btnLine.X = Application.GetRealWidth(16);
+ timeSpecialView.btnLine.Width = Application.GetRealWidth(375 - 16 - 16);
+ timeSpecialView.btnText.TextID = StringId.timespecia;
+ viewLayout.AddChidren(timeSpecialView.FLayoutView());
+
#endregion
#region 鏃堕棿鐐� 鏃堕棿鑼冨洿鐐瑰嚮浜嬩欢
@@ -78,7 +89,15 @@
TimeHorizon(fLayout, false, 0);
};
+ //鏃ュ嚭/鏃ヨ惤/姝ｅ崍鐐瑰嚮浜嬩欢
+ timeSpecialView.btnClick.MouseUpEventHandler += (sen, e) =>
+ {
+ SpeciaTime speciaTime = new SpeciaTime();
+ MainPage.BasePageView.AddChidren(speciaTime);
+ speciaTime.Show();
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ };
#endregion
}
@@ -110,13 +129,13 @@
timePointView.FLayoutView(fLayout);
timePointView.TimePoint(fLayout, editTime, (timeValue)=>{
Input inputTime = new Input();
- inputTime.sid = LogicMethod.NewSid();
+ inputTime.sid = LogicMethod.CurrLogicMethod.NewSid();
inputTime.condition_type = "1";
Dictionary<string, string> dic = new Dictionary<string, string>();
- LogicMethod.dictionary(dic, "key", "timepoint");
- LogicMethod.dictionary(dic, "comparator", "=");
- LogicMethod.dictionary(dic, "data_type", "string");
- LogicMethod.dictionary(dic, "value", timeValue);
+ LogicMethod.CurrLogicMethod.dictionary(dic, "key", "timepoint");
+ LogicMethod.CurrLogicMethod.dictionary(dic, "comparator", "=");
+ LogicMethod.CurrLogicMethod.dictionary(dic, "data_type", "string");
+ LogicMethod.CurrLogicMethod.dictionary(dic, "value", timeValue);
inputTime.condition.Add(dic);
AddCondition(inputTime, edit, index);
});
@@ -233,13 +252,13 @@
}
Input inputTime = new Input();
- inputTime.sid = LogicMethod.NewSid();
+ inputTime.sid = LogicMethod.CurrLogicMethod.NewSid();
inputTime.condition_type = "2";
Dictionary<string, string> dic = new Dictionary<string, string>();
- LogicMethod.dictionary(dic, "key", "timesection");
- LogicMethod.dictionary(dic, "comparator", "=");
- LogicMethod.dictionary(dic, "data_type", "string");
- LogicMethod.dictionary(dic, "value", btnStartTimeText.Text + "-" + btnEndTimeText.Text);
+ LogicMethod.CurrLogicMethod.dictionary(dic, "key", "timesection");
+ LogicMethod.CurrLogicMethod.dictionary(dic, "comparator", "=");
+ LogicMethod.CurrLogicMethod.dictionary(dic, "data_type", "string");
+ LogicMethod.CurrLogicMethod.dictionary(dic, "value", btnStartTimeText.Text + "-" + btnEndTimeText.Text);
inputTime.condition.Add(dic);
AddCondition(inputTime, edit, index);
@@ -330,7 +349,7 @@
//娣诲姞涓�涓柊鐨勬椂闂存潯浠�
Logic.currlogic.input.Add(input);
}
- LogicMethod.RemoveAllView();
+ LogicMethod.CurrLogicMethod.RemoveAllView();
AddLogic addLogic = new AddLogic();
MainPage.BasePageView.AddChidren(addLogic);
addLogic.Show();
--
Gitblit v1.8.0