From eda3fb873e59544ff36301b51e05aef64f87b0f9 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 八月 2021 13:21:21 +0800
Subject: [PATCH] Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into newBranch1
---
HDL_ON/UI/UI2/3-Intelligence/Automation/TimeTpye.cs | 280 ++++++++++++++++++++++++++++---------------------------
1 files changed, 141 insertions(+), 139 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/TimeTpye.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/TimeTpye.cs
index f8a497a..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 鏃堕棿鐐� 鏃堕棿鑼冨洿鐐瑰嚮浜嬩欢
@@ -74,9 +85,19 @@
};
//娣诲姞涓荤晫闈�
this.AddChidren(fLayout);
+ //var fLayout = GetFrame(this,"2");
+
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
}
@@ -88,23 +109,8 @@
/// <param name="index">缂栬緫鏉′欢鐨勭储寮�</param>
public void TimePoint(FrameLayout fLayout, bool edit, int index)
{
- LogicView.TimeView timePointView = new LogicView.TimeView();
- timePointView.FLayoutView(fLayout);
- EventHandler<MouseEventArgs> removefLayout = (sender, e1) =>
- {
- //绉婚櫎fLayout鐣岄潰
- fLayout.RemoveFromParent();
- };
- //鍙栨秷鐐瑰嚮浜嬩欢
- timePointView.btnCancel.MouseUpEventHandler += removefLayout;
-
- //鍔犺浇鏁版嵁鐣岄潰鐨勮缃柟娉�(鍒楄〃浜掍笉鑱斿姩)
- timePointView.mUIPickerView.setNPicker(timePointView.GethStringList(), timePointView.GetmStringList(), null);
- //榛樿鍒濆閫変腑鐘舵��
- timePointView.mUIPickerView.setCurrentItems(0, 30, 0);
- //瀹氫箟涓�涓眬閮ㄥ彉閲忚褰曢�変腑鏃堕棿
- string timepoint = "01:30";
-
+ //缂栬緫涔嬪墠鐨勬椂闂寸姸鎬佸��
+ string editTime= "";
if (edit)
{
Input inputs = Logic.currlogic.input[index];
@@ -114,54 +120,26 @@
foreach (var dic in dicList)
{
string timeValue = dic["value"];
- int hIndex = timePointView.GetValueIndex(timeValue, 0, 1, timePointView.GethIntList());
- int mIndex = timePointView.GetValueIndex(timeValue, 1, 0, timePointView.GetmIntList());
- //鏇存柊鍒濆鐘舵��
- timePointView.mUIPickerView.setCurrentItems(hIndex - 1, mIndex, 0);
- timepoint = timeValue;
+ editTime = timeValue;
+ break;
}
}
}
-
-
- //閫変腑鏃堕棿鍥炶皟鏂规硶,鏃堕棿鍙樺寲涓�娆″洖璋冧竴娆�
- timePointView.mUIPickerView.OnSelectChangeEvent += (index1, index2, index3) =>
- {
- string hour = timePointView.GethStringList()[index1].Split(' ')[0];
- string minuet = timePointView.GetmStringList()[index2].Split(' ')[0];
- timepoint = hour + ":" + minuet;
- };
- //纭畾鐐瑰嚮浜嬩欢
- timePointView.btnConfirm.MouseUpEventHandler += (sender, e3) =>
- {
+ LogicView.TimeView timePointView = new LogicView.TimeView();
+ 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", timepoint);
+ 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);
- if (edit)
- {
- //绉婚櫎鏃ф暟鎹�
- Logic.currlogic.input.RemoveAt(index);
- //鏂版暟鎹彃鍏ユ棫鏁版嵁鐨勪綅缃�;
- Logic.currlogic.input.Insert(index, inputTime);
- }
- else
- {
- //娣诲姞涓�涓柊鐨勬椂闂寸偣鏉′欢
- Logic.currlogic.input.Add(inputTime);
- }
- LogicMethod.RemoveAllView();
- AddLogic addLogic = new AddLogic();
- MainPage.BasePageView.AddChidren(addLogic);
- addLogic.Show();
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
-
- };
+ AddCondition(inputTime, edit, index);
+ });
+
}
/// <summary>
/// 鏃堕棿鑼冨洿鏂规硶
@@ -169,7 +147,7 @@
/// <param name="fLayout">鍦ㄥ摢涓晫闈㈡樉绀�</param>
/// <param name="edit">锛坱rue=缂栬緫锛沠alse=鏂板缓锛�</param>
/// <param name="index">缂栬緫鏉′欢鐨勭储寮�</param>
- public void TimeHorizon(FrameLayout fLayout,bool edit,int index)
+ public void TimeHorizon(FrameLayout fLayout, bool edit, int index)
{
#region 鐣岄潰甯冨眬
LogicView.TimeHorizonView timeHorizonView = new LogicView.TimeHorizonView();
@@ -188,11 +166,11 @@
Button btnStartTimeText = new Button
{
TextSize = LogicView.TextSize.text12,
- Width = Application.GetRealWidth(32 + 3),
- Height = Application.GetRealHeight(20),
+ Width = Application.GetRealWidth(32 + 3+20),
+ Height = Application.GetRealHeight(17),
TextColor = CSS.CSS_Color.textCancelColor,
Y = Application.GetRealHeight(17),
- X = Application.GetRealWidth(260),
+ X = Application.GetRealWidth(260-20),
Tag = "0",
};
startTimeView.frameLayout.AddChidren(btnStartTimeText);
@@ -211,11 +189,11 @@
Button btnEndTimeText = new Button
{
TextSize = LogicView.TextSize.text12,
- Width = Application.GetRealWidth(32 + 3),
- Height = Application.GetRealHeight(20),
+ Width = Application.GetRealWidth(32 + 3+20),
+ Height = Application.GetRealHeight(17),
TextColor = CSS.CSS_Color.textCancelColor,
Y = Application.GetRealHeight(17),
- X = Application.GetRealWidth(260),
+ X = Application.GetRealWidth(260-20),
Tag = "0",
};
endTimeView.frameLayout.AddChidren(btnEndTimeText);
@@ -224,66 +202,65 @@
#region 鐐瑰嚮浜嬩欢
//寮�濮嬫椂闂寸偣鍑讳簨浠�
- startTimeView.btnClick.MouseUpEventHandler += (sender, e) =>
- {
+ EventHandler<MouseEventArgs> StartTimeClick = (sender,e) => {
SelectedTimeHorizon(fLayout, btnStartTimeText);
};
+ startTimeView.btnClick.MouseUpEventHandler += StartTimeClick;
+ btnStartTimeText.MouseUpEventHandler += StartTimeClick;
//缁撴潫鏃堕棿鐐瑰嚮浜嬩欢
- endTimeView.btnClick.MouseUpEventHandler += (sender, e) =>
- {
+ EventHandler<MouseEventArgs> EndTimeClick = (sender, e) => {
SelectedTimeHorizon(fLayout, btnEndTimeText);
};
+ endTimeView.btnClick.MouseUpEventHandler += EndTimeClick;
+ btnEndTimeText.MouseUpEventHandler += EndTimeClick;
+
+
//纭畾鐐瑰嚮浜嬩欢
timeHorizonView.btnConfirm.MouseUpEventHandler += (sender, e) =>
{
+
+ if (btnStartTimeText.Tag.ToString() == "0"&& btnEndTimeText.Tag.ToString() == "0")
+ {
+ //鎻愮ず锛氭椂闂存湭璁剧疆锛岃璁剧疆鏃堕棿銆�
+ new LogicView.TipPopView().TipBox(StringId.tip, StringId.timeNoSet);
+ return;
+ }
+
if (btnStartTimeText.Tag.ToString() == "0")
{
- //鎻愮ず锛氳閫変腑寮�濮嬫椂闂�
+ //鎻愮ず锛氬紑濮嬫椂闂存湭璁剧疆锛岃璁剧疆寮�濮嬫椂闂淬��
+ new LogicView.TipPopView().TipBox(StringId.tip,StringId.setStartTime);
return;
}
if (btnEndTimeText.Tag.ToString() == "0")
{
- //鎻愮ず锛氳閫変腑缁撴潫鏃堕棿
+ //鎻愮ず锛氱粨鏉熸椂闂存湭璁剧疆锛岃璁剧疆缁撴潫鏃堕棿銆�
+ new LogicView.TipPopView().TipBox(StringId.tip, StringId.setEndTime);
return;
}
if (btnStartTimeText.Tag.ToString() == btnEndTimeText.Tag.ToString())
{
- //鎻愮ず锛氭椂闂翠竴鏍风殑
+ //鎻愮ず锛氬紑濮嬫椂闂村拰缁撴潫鏃堕棿涓嶈兘涓�鏍枫��
+ new LogicView.TipPopView().TipBox(StringId.tip, StringId.unlikeTime);
return;
}
if (int.Parse(btnStartTimeText.Tag.ToString()) > int.Parse(btnEndTimeText.Tag.ToString()))
{
- //鎻愮ず锛氬紑濮嬫椂闂翠笉鑳藉ぇ浜庣粨鏉熸椂闂�
+ //鎻愮ず锛氬紑濮嬫椂闂翠笉鑳藉ぇ浜庣粨鏉熸椂闂淬��
+ new LogicView.TipPopView().TipBox(StringId.tip, StringId.startTimeLessThanEndTime);
return;
}
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);
- if (edit)
- {
- //绉婚櫎鏃ф暟鎹�
- Logic.currlogic.input.RemoveAt(index);
- //鏂版暟鎹彃鍏ユ棫鏁版嵁鐨勪綅缃�
- Logic.currlogic.input.Insert(index, inputTime);
- fLayout.RemoveFromParent();
- }
- else
- {
- //娣诲姞涓�涓柊鐨勬椂闂寸偣鏉′欢
- Logic.currlogic.input.Add(inputTime);
- }
- LogicMethod.RemoveAllView();
- AddLogic addLogic = new AddLogic();
- MainPage.BasePageView.AddChidren(addLogic);
- addLogic.Show();
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ AddCondition(inputTime, edit, index);
};
@@ -298,8 +275,8 @@
foreach (var dic in dicList)
{
string value = dic["value"];
- string startTime = value.Split('~')[0];
- string endtTime = value.Split('~')[1];
+ string startTime = value.Split('-')[0];
+ string endtTime = value.Split('-')[1];
btnStartTimeText.Text = startTime;
btnStartTimeText.Tag = int.Parse(startTime.Split(':')[0]) * 60 + int.Parse(startTime.Split(':')[1]);
btnEndTimeText.Text = endtTime;
@@ -309,34 +286,18 @@
}
}
/// <summary>
- /// 璁剧疆鏃堕棿娈垫椂闂寸殑鏂规硶
+ /// 璁剧疆鏃堕棿娈靛��
/// </summary>
/// <param name="fLayout"></param>
/// <param name="btn"></param>
public void SelectedTimeHorizon(FrameLayout fLayout, Button btn)
{
-
- LogicView.TimeView timePointView = new LogicView.TimeView();
- timePointView.FLayoutView(fLayout);
- EventHandler<MouseEventArgs> RemovefLayout = (sender, e1) =>
- {
- //鍙Щ闄ゆ椂闂村脊绐楃晫闈�
- timePointView.frameLayout.RemoveFromParent();
- };
- //鍙栨秷鐐瑰嚮浜嬩欢
- timePointView.btnCancel.MouseUpEventHandler += RemovefLayout;
- //鍔犺浇鏁版嵁鐣岄潰鐨勮缃柟娉�(鍒楄〃浜掍笉鑱斿姩)
- timePointView.mUIPickerView.setNPicker(timePointView.GethStringList(), timePointView.GetmStringList(), null);
- //榛樿鍒濆閫変腑鐘舵��
- timePointView.mUIPickerView.setCurrentItems(0, 30, 0);
- //瀹氫箟涓�涓眬閮ㄥ彉閲忚褰曢�変腑鏃堕棿
- string timepoint = "01:30";
- int sumTime = 90;
-
+ //缂栬緫涔嬪墠鐨勬椂闂寸姸鎬佸��
+ string editTime = "";
if (btn.Tag.ToString() != "0")
{
string h = "", m = "";
- sumTime = int.Parse(btn.Tag.ToString());
+ int sumTime = int.Parse(btn.Tag.ToString());
if ((sumTime / 60) < 10)
{
h = "0" + (sumTime / 60).ToString();
@@ -354,33 +315,74 @@
{
m = (sumTime % 60).ToString();
}
- timepoint = h + ":" + m;
+ editTime = h + ":" + m;
+ }
+ LogicView.TimeView timePointView = new LogicView.TimeView();
+ timePointView.FLayoutView(fLayout);
+ timePointView.TimePoint(timePointView.frameLayout, editTime, (timeValue) =>
+ {
+ int hour = int.Parse(timeValue.Split(':')[0]);
+ int minuet = int.Parse(timeValue.Split(':')[1]);
+ int intValueTag = hour * 60 + minuet;
+ //鏍囪鍊�,鐢ㄤ簬姣旇緝寮�濮嬫椂闂村拰缁撴潫鏃堕棿澶у皬;
+ btn.Tag = intValueTag;
+ //鏄剧ず鏃堕棿鏂囨湰
+ btn.Text = timeValue;
+ });
+ }
+
+ /// <summary>
+ /// 娣诲姞鏉′欢
+ /// </summary>
+ /// <param name="input"></param>
+ private void AddCondition(Input input,bool edit,int index)
+ {
+ if (edit)
+ {
+ //绉婚櫎鏃ф暟鎹�
+ Logic.currlogic.input.RemoveAt(index);
+ //鏂版暟鎹彃鍏ユ棫鏁版嵁鐨勪綅缃�
+ Logic.currlogic.input.Insert(index, input);
+ }
+ else
+ {
+ //娣诲姞涓�涓柊鐨勬椂闂存潯浠�
+ Logic.currlogic.input.Add(input);
+ }
+ LogicMethod.CurrLogicMethod.RemoveAllView();
+ AddLogic addLogic = new AddLogic();
+ MainPage.BasePageView.AddChidren(addLogic);
+ addLogic.Show();
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- int hourIndex = timePointView.GetValueIndex(timepoint, 0, 1, timePointView.GethIntList());
- int minuteIndex = timePointView.GetValueIndex(timepoint, 1, 0, timePointView.GetmIntList());
- //鏇存柊鐘舵��
- timePointView.mUIPickerView.setCurrentItems(hourIndex - 1, minuteIndex, 0);
+ }
+
+ /// <summary>
+ /// 鐏拌壊寮规鐖舵帶浠�
+ /// </summary>
+ /// <param name="frame">鏄剧ず鍦ㄥ摢涓晫闈�</param>
+ /// <returns></returns>
+ public FrameLayout GetFrame(FrameLayout frame, string tagKey)
+ {
+ for (int i = 0; i < frame.ChildrenCount; i++)
+ {
+ var fra = frame.GetChildren(i);
+ if (fra != null)
+ {
+ fra.RemoveFromParent();
+ }
}
- //閫変腑鏃堕棿鍥炶皟鏂规硶,鏃堕棿鍙樺寲涓�娆″洖璋冧竴娆�
- timePointView.mUIPickerView.OnSelectChangeEvent += (index1, index2, index3) =>
- {
-
- string hour = timePointView.GethStringList()[index1].Split(' ')[0];
- string minuet = timePointView.GetmStringList()[index2].Split(' ')[0];
- timepoint = hour + ":" + minuet;
- sumTime = int.Parse(hour) * 60 + int.Parse(minuet);
+ FrameLayout fLayout = new FrameLayout()
+ {
+ BackgroundColor = CSS.CSS_Color.viewTrans60lucence,
};
- //纭畾鐐瑰嚮浜嬩欢
- timePointView.btnConfirm.MouseUpEventHandler += (sender1, e3) =>
- {
- btn.Tag = sumTime;
- btn.Text = timepoint;
- //鍙Щ闄ゆ椂闂村脊绐楃晫闈�
- timePointView.frameLayout.RemoveFromParent();
- };
+ frame.AddChidren(fLayout);
+
+
+ return fLayout;
}
}
}
--
Gitblit v1.8.0