From 263401d40b2d9d2c1b36a24f33d45c5cb7192518 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 23 十二月 2020 15:51:54 +0800
Subject: [PATCH] 20201223-6
---
HDL_ON/UI/UI2/3-Intelligence/Automation/TimeTpye.cs | 191 +++++++++++++++++++++++++++++++++++++++--------
1 files changed, 159 insertions(+), 32 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/TimeTpye.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/TimeTpye.cs
old mode 100644
new mode 100755
index f8a497a..edf6086
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/TimeTpye.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/TimeTpye.cs
@@ -74,6 +74,8 @@
};
//娣诲姞涓荤晫闈�
this.AddChidren(fLayout);
+ //var fLayout = GetFrame(this,"2");
+
TimeHorizon(fLayout, false, 0);
};
@@ -92,19 +94,60 @@
timePointView.FLayoutView(fLayout);
EventHandler<MouseEventArgs> removefLayout = (sender, e1) =>
{
- //绉婚櫎fLayout鐣岄潰
- fLayout.RemoveFromParent();
+ //绉婚櫎fLayout鐣岄潰
+ fLayout.RemoveFromParent();
};
//鍙栨秷鐐瑰嚮浜嬩欢
- timePointView.btnCancel.MouseUpEventHandler += removefLayout;
+ timePointView.btnCancel.MouseUpEventHandler += removefLayout;
//鍔犺浇鏁版嵁鐣岄潰鐨勮缃柟娉�(鍒楄〃浜掍笉鑱斿姩)
timePointView.mUIPickerView.setNPicker(timePointView.GethStringList(), timePointView.GetmStringList(), null);
- //榛樿鍒濆閫変腑鐘舵��
- timePointView.mUIPickerView.setCurrentItems(0, 30, 0);
- //瀹氫箟涓�涓眬閮ㄥ彉閲忚褰曢�変腑鏃堕棿
- string timepoint = "01:30";
+ var systemHour = DateTime.Now.Hour; //鑾峰彇灏忔椂
+ var systeMinute = DateTime.Now.Minute;//鑾峰彇鍒嗛挓
+ int systemHourIndex = 0;
+ int systeMinuteIndex = 0;
+ for (int i = 0; i < timePointView.GethIntList().Count; i++)
+ {
+ var currhour = timePointView.GethIntList()[i];
+ if (systemHour == currhour)
+ {
+ systemHourIndex = i;
+ break;
+ }
+ }
+ for (int i = 0; i < timePointView.GetmIntList().Count; i++)
+ {
+ var currminute = timePointView.GetmIntList()[i];
+ if (systeMinute == currminute)
+ {
+ systeMinuteIndex = i;
+ break;
+ }
+ }
+
+ //榛樿鍒濆閫変腑鐘舵��
+ timePointView.mUIPickerView.setCurrentItems(systemHourIndex, systeMinuteIndex, 0);
+ string currH = "";
+ string currM = "";
+ if (systemHour < 10)
+ {
+ currH = "0" + systemHour.ToString();
+ }
+ else
+ {
+ currH = systemHour.ToString();
+ }
+ if (systeMinute < 10)
+ {
+ currM = "0" + systeMinute.ToString();
+ }
+ else
+ {
+ currM = systeMinute.ToString();
+ }
+ //瀹氫箟涓�涓眬閮ㄥ彉閲忚褰曢�変腑鏃堕棿
+ string timepoint = currH + ":" + currM;
if (edit)
{
Input inputs = Logic.currlogic.input[index];
@@ -117,12 +160,11 @@
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);
+ timePointView.mUIPickerView.setCurrentItems(hIndex, mIndex, 0);
timepoint = timeValue;
}
}
}
-
//閫変腑鏃堕棿鍥炶皟鏂规硶,鏃堕棿鍙樺寲涓�娆″洖璋冧竴娆�
timePointView.mUIPickerView.OnSelectChangeEvent += (index1, index2, index3) =>
@@ -169,7 +211,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 +230,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 +253,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,36 +266,52 @@
#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;
}
@@ -264,7 +322,7 @@
LogicMethod.dictionary(dic, "key", "timesection");
LogicMethod.dictionary(dic, "comparator", "=");
LogicMethod.dictionary(dic, "data_type", "string");
- LogicMethod.dictionary(dic, "value", btnStartTimeText.Text+"~"+btnEndTimeText.Text);
+ LogicMethod.dictionary(dic, "value", btnStartTimeText.Text + "-" + btnEndTimeText.Text);
inputTime.condition.Add(dic);
if (edit)
{
@@ -298,8 +356,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;
@@ -327,11 +385,53 @@
timePointView.btnCancel.MouseUpEventHandler += RemovefLayout;
//鍔犺浇鏁版嵁鐣岄潰鐨勮缃柟娉�(鍒楄〃浜掍笉鑱斿姩)
timePointView.mUIPickerView.setNPicker(timePointView.GethStringList(), timePointView.GetmStringList(), null);
+
+ var systemHour = DateTime.Now.Hour; //鑾峰彇灏忔椂
+ var systeMinute = DateTime.Now.Minute;//鑾峰彇鍒嗛挓
+ int systemHourIndex = 0;
+ int systeMinuteIndex = 0;
+ for (int i = 0; i < timePointView.GethIntList().Count; i++)
+ {
+ var currhour = timePointView.GethIntList()[i];
+ if (systemHour == currhour)
+ {
+ systemHourIndex = i;
+ break;
+ }
+ }
+ for (int i = 0; i < timePointView.GetmIntList().Count; i++)
+ {
+ var currminute = timePointView.GetmIntList()[i];
+ if (systeMinute == currminute)
+ {
+ systeMinuteIndex = i;
+ break;
+ }
+ }
+
//榛樿鍒濆閫変腑鐘舵��
- timePointView.mUIPickerView.setCurrentItems(0, 30, 0);
+ timePointView.mUIPickerView.setCurrentItems(systemHourIndex, systeMinuteIndex, 0);
+ string currH = "";
+ string currM = "";
+ if (systemHour < 10)
+ {
+ currH = "0" + systemHour.ToString();
+ }
+ else
+ {
+ currH = systemHour.ToString();
+ }
+ if (systeMinute < 10)
+ {
+ currM = "0" + systeMinute.ToString();
+ }
+ else
+ {
+ currM = systeMinute.ToString();
+ }
//瀹氫箟涓�涓眬閮ㄥ彉閲忚褰曢�変腑鏃堕棿
- string timepoint = "01:30";
- int sumTime = 90;
+ string timepoint = currH + ":" + currM;
+ int sumTime = systemHour*60+ systeMinute;
if (btn.Tag.ToString() != "0")
{
@@ -359,13 +459,13 @@
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);
+ timePointView.mUIPickerView.setCurrentItems(hourIndex, minuteIndex, 0);
}
//閫変腑鏃堕棿鍥炶皟鏂规硶,鏃堕棿鍙樺寲涓�娆″洖璋冧竴娆�
timePointView.mUIPickerView.OnSelectChangeEvent += (index1, index2, index3) =>
{
-
+
string hour = timePointView.GethStringList()[index1].Split(' ')[0];
string minuet = timePointView.GetmStringList()[index2].Split(' ')[0];
timepoint = hour + ":" + minuet;
@@ -382,5 +482,32 @@
timePointView.frameLayout.RemoveFromParent();
};
}
+ /// <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();
+ }
+ }
+
+
+ FrameLayout fLayout = new FrameLayout()
+ {
+ BackgroundColor = CSS.CSS_Color.viewTrans60lucence,
+
+ };
+ frame.AddChidren(fLayout);
+
+
+ return fLayout;
+ }
}
}
--
Gitblit v1.8.0