From 652243206427f35a256400a149a1734085824cb9 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 02 九月 2020 17:35:03 +0800
Subject: [PATCH] 2020-09-02-4
---
ZigbeeApp/Shared/Phone/Device/Logic/TimePage.cs | 496 ++++++++++++++++++++----------------------------------
1 files changed, 184 insertions(+), 312 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/TimePage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/TimePage.cs
old mode 100644
new mode 100755
index 444f69b..63e792d
--- a/ZigbeeApp/Shared/Phone/Device/Logic/TimePage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/TimePage.cs
@@ -3,6 +3,7 @@
using Shared;
using Shared.Common;
using Shared.Phone;
+using Shared.Phone.Device.Logic.LogicView;
using Shared.R;
using ZigBee.Device;
@@ -14,198 +15,84 @@
{
Tag = "Logic";
}
- public bool IsDeviceEditor1;
+ public bool IsEditor;
public string str1;
Dictionary<string, string> timeBucketConditionsInfo = new Dictionary<string, string>();
public void Show()
{
- this.BackgroundColor = ZigbeeColor.Current.LogicTopViewBackgroundColor;
- this.AddChidren(new Button
- {
- Height = Application.GetRealHeight(80),
- });
- var topFrameLayout = new FrameLayout
- {
- Height = Application.GetRealHeight(140),
- Y = Application.GetRealHeight(80),
- };
- AddChidren(topFrameLayout);
-
- var titleName = new Button
- {
- Text = Language.StringByID(MyInternationalizationString.addtime),
- TextSize = 17,
- TextColor = ZigbeeColor.Current.LogicTextBlackColor,
- TextAlignment = TextAlignment.CenterLeft,
- X = Application.GetRealWidth(150),
- };
- topFrameLayout.AddChidren(titleName);
-
-
- var back = new Button
- {
- Width = Application.GetRealWidth(110),
- Height = Application.GetRealHeight(110),
- X = Application.GetRealWidth(20),
- Gravity = Gravity.CenterVertical,
- UnSelectedImagePath = "ZigeeLogic/Back.png",
- };
- topFrameLayout.AddChidren(back);
- back.MouseDownEventHandler += (sender, e) =>
- {
- RemoveFromParent();
- IsDeviceEditor1 = false;
- };
-
-
- var middle = new VerticalScrolViewLayout();
- middle.Y = topFrameLayout.Bottom;
- middle.Height = Application.GetRealHeight(1920- 220 - 200);
- middle.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
- this.AddChidren(middle);
-
-
- #region -----绔嬪嵆鎵ц
- var row = new RowLayout
- {
- Height = Application.GetRealHeight(250),
- };
- middle.AddChidren(row);
-
- var btnTextTitle = new Button
- {
- Height = Application.GetRealHeight(50),
- Width = Application.GetRealWidth(800),
- Y = Application.GetRealHeight(20),
- X = Application.GetRealWidth(40),
- // Text = "璇烽�夋嫨鏃堕棿绫诲瀷",
- TextAlignment = TextAlignment.CenterLeft,
- TextColor = ZigbeeColor.Current.LogicTextBlackColor,
- TextID = MyInternationalizationString.Selectedtimetype,
- };
- row.AddChidren(btnTextTitle);
-
- var btnTypeTextTitle = new Button
- {
- Y = Application.GetRealHeight(20 + 50),
- // Text = "绫诲瀷",
- X = Application.GetRealWidth(40),
- TextAlignment = TextAlignment.CenterLeft,
- Height = Application.GetRealHeight(180),
- Width = Application.GetRealWidth(400),
- TextColor = ZigbeeColor.Current.LogicTextBlackColor,
- TextID = MyInternationalizationString.type,
- };
- row.AddChidren(btnTypeTextTitle);
-
- var btnTypeText = new Button
- {
- Y = Application.GetRealHeight(20 + 50),
- X = Application.GetRealWidth(1080 - 500 - 40),
- //Text = "鏃堕棿鑼冨洿",
- TextAlignment = TextAlignment.CenterRight,
- Height = Application.GetRealHeight(180),
- Width = Application.GetRealWidth(500),
- TextColor = ZigbeeColor.Current.LogicTextBlackColor,
- TextID = MyInternationalizationString.timeframe,
- };
- row.AddChidren(btnTypeText);
+ #region 涓婇潰鐨勫竷灞�浠ｇ爜
+ TopView view = new TopView();
+ this.AddChidren(view.TopRowView());
+ view.toptitleNameBtn.TextID = MyInternationalizationString.selection;
+ view.clickBtn.MouseDownEventHandler += (sender, e) => { RemoveFromParent(); };
#endregion
- var timestartrow = new RowLayout
+ #region 鏈�涓嬮潰鐨勫竷灞�浠ｇ爜
+ var middle = new FrameLayout
{
- Height = Application.GetRealHeight(180),
+ Y = view.topRowLayout.Bottom,
+ Height = Application.GetRealHeight(Method.H - 184 - 260),
+ BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
};
- middle.AddChidren(timestartrow);
+ this.AddChidren(middle);
+ //淇濆瓨
+ SaveView saveView = new SaveView();
+ saveView.frameLayout.Y = middle.Bottom;
+ this.AddChidren(saveView.Show());
+ #endregion
- var btnstarttimetext = new Button
- {
- TextAlignment = TextAlignment.CenterLeft,
- Width = Application.GetRealWidth(300),
- X = Application.GetRealWidth(30),
- TextID = MyInternationalizationString.starttime,
- TextColor = ZigbeeColor.Current.LogicTextBlackColor,
- };
- timestartrow.AddChidren(btnstarttimetext);
+ #region -----鏃堕棿鑼冨洿 寮�濮嬫椂闂� 缁撴潫鏃堕棿
+ #region -----鏃堕棿鑼冨洿
- var btnstarttime = new Button
- {
- X = Application.GetRealWidth(330),
- Gravity = Gravity.CenterVertical,
- Width = Application.GetRealWidth(600),
- TextAlignment = TextAlignment.CenterLeft,
- Tag = "0",
- TextColor = ZigbeeColor.Current.LogicTextBlackColor,
- };
- timestartrow.AddChidren(btnstarttime);
+ TypeView typeView = new TypeView();
+ middle.AddChidren(typeView.Show());
+ typeView.textBtn.TextID = MyInternationalizationString.type;
+ typeView.titleBtn.Width = Application.GetRealWidth(630 + 70);
+ typeView.titleBtn.TextID = MyInternationalizationString.timeframe;
+ typeView.backBtn.Visible = false;
- var btnstartback = new Button
- {
- Width = Application.GetRealWidth(110),
- Height = Application.GetRealHeight(110),
- UnSelectedImagePath = "ZigeeLogic/next.png",
- SelectedImagePath = "ZigeeLogic/NextSelecte.png",
- X = Application.GetRealWidth(1080-140),
- Gravity = Gravity.CenterVertical,
- };
- timestartrow.AddChidren(btnstartback);
+ #endregion
- var timeendrow = new RowLayout
- {
- Height = Application.GetRealHeight(180),
- };
- middle.AddChidren(timeendrow);
- var btnendtimetext = new Button
- {
- TextAlignment = TextAlignment.CenterLeft,
- Width = Application.GetRealWidth(300),
- X = Application.GetRealWidth(30),
- TextID = MyInternationalizationString.endtime,
- TextColor = ZigbeeColor.Current.LogicTextBlackColor,
- };
- timeendrow.AddChidren(btnendtimetext);
+ #region -----寮�濮嬫椂闂�
- var btnendtime = new Button
- {
- X = Application.GetRealWidth(330),
- Gravity = Gravity.CenterVertical,
- Width = Application.GetRealWidth(600),
- TextAlignment = TextAlignment.CenterLeft,
- Tag = "0",
- TextColor = ZigbeeColor.Current.LogicTextBlackColor,
- };
- timeendrow.AddChidren(btnendtime);
+ TypeView startView = new TypeView();
+ startView.frameLayout.Y = typeView.frameLayout.Bottom;
+ middle.AddChidren(startView.Show());
+ startView.textBtn.TextID = MyInternationalizationString.starttime;
+ startView.titleBtn.Tag = "0";
+ #endregion
- var btnendtimeback = new Button
- {
- Width = Application.GetRealWidth(110),
- Height = Application.GetRealHeight(110),
- UnSelectedImagePath = "ZigeeLogic/next.png",
- SelectedImagePath = "ZigeeLogic/NextSelecte.png",
- X = Application.GetRealWidth(1080-140),
- Gravity = Gravity.CenterVertical,
- };
- timeendrow.AddChidren(btnendtimeback);
+ #region -----缁撴潫鏃堕棿
+ TypeView endView = new TypeView();
+ endView.frameLayout.Y = startView.frameLayout.Bottom;
+ endView.frameLayout.Height = Application.GetRealHeight(160 + 20);//鏈�鍚庝竴琛屽鍔�20楂樺害;
+ middle.AddChidren(endView.Show());
+ endView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor;//鏀瑰彉鏈�鍚庝竴琛岀嚎棰滆壊;
+ endView.textBtn.TextID = MyInternationalizationString.endtime;
+ endView.titleBtn.Tag = "0";
- if (IsDeviceEditor1)
+ #endregion
+ #endregion
+
+ if (IsEditor)
{
if (str1 != null)
{
-
+
string[] timestr = str1.Split('-');
string[] starttime = timestr[0].Split(':');
string[] endtime = timestr[1].Split(':');
string s1 = "", s2 = "";
if (starttime[1].Length < 2)
{
- s1 = "0" + starttime[1];
+ s1 = "0" + starttime[1];
}
else
{
- s1 = starttime[1];
+ s1 = starttime[1];
}
if (endtime[1].Length < 2)
{
@@ -215,8 +102,8 @@
{
s2 = endtime[1];
}
- btnstarttime.Text = starttime[0] + ":" + s1;
- btnendtime.Text =endtime[0] + ":" + s2;
+ startView.titleBtn.Text = starttime[0] + ":" + s1;
+ endView.titleBtn.Text = endtime[0] + ":" + s2;
//btnstarttime.Text = timestr[0];
//btnendtime.Text = timestr[1];
@@ -240,16 +127,16 @@
timeBucketConditionsInfo.Add("StartMin", starttime[1]);
timeBucketConditionsInfo.Add("StopHour", endtime[0]);
timeBucketConditionsInfo.Add("StopMin", endtime[1]);
- btnstarttime.Tag = int.Parse(starttime[0]) * 60 + int.Parse(starttime[1]);
- btnendtime.Tag = int.Parse(endtime[0]) * 60 + int.Parse(endtime[1]);
+ startView.titleBtn.Tag = int.Parse(starttime[0]) * 60 + int.Parse(starttime[1]);
+ endView.titleBtn.Tag = int.Parse(endtime[0]) * 60 + int.Parse(endtime[1]);
}
}
- EventHandler<MouseEventArgs> stattimeclick = (sender, e) =>
+ startView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
{
- var flMain = new FrameLayout { BackgroundColor = 0x00000000 };
+ var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicTranslucentColor };
AddChidren(flMain);
flMain.MouseUpEventHandler += (sender11, e11) =>
{
@@ -260,7 +147,7 @@
{
Y = Application.GetRealHeight(1920 - 600),
Height = Application.GetRealHeight(600),
- BackgroundColor =ZigbeeColor.Current.LogicTimeViewColor,
+ BackgroundColor = ZigbeeColor.Current.LogicTimeViewColor,
Width = Application.GetRealWidth(1080),
};
flMain.AddChidren(timeview);
@@ -273,7 +160,7 @@
Height = Application.GetRealHeight(150),
Text = Language.StringByID(MyInternationalizationString.complete),
// TextColor = 0xFF121212,
- TextColor =ZigbeeColor.Current.LogicTimeViewSaveButton,
+ TextColor = ZigbeeColor.Current.LogicTimeViewSaveButton,
//TextAlignment = TextAlignment.CenterRight
X = Application.GetRealWidth(1080 - 200),
};
@@ -285,19 +172,21 @@
var startval = timeview.Hour * 60 + timeview.Minute;
- if (btnendtime.Tag.ToString() != "0" && startval.ToString()==btnendtime.Tag.ToString())
+ if (endView.titleBtn.Tag.ToString() != "0" && startval.ToString() == endView.titleBtn.Tag.ToString())
{
- var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
- Language.StringByID(MyInternationalizationString.nottime),
- Language.StringByID(MyInternationalizationString.confrim));
+
+ var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
+ Language.StringByID(MyInternationalizationString.nottime),
+ Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
return;
}
- if (btnendtime.Tag.ToString() != "0" && startval > int.Parse(btnendtime.Tag.ToString()))
+ if (endView.titleBtn.Tag.ToString() != "0" && startval > int.Parse(endView.titleBtn.Tag.ToString()))
{
- var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
- Language.StringByID(MyInternationalizationString.timesetting),
- Language.StringByID(MyInternationalizationString.confrim));
+
+ var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
+ Language.StringByID(MyInternationalizationString.timesetting),
+ Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
return;
}
@@ -309,166 +198,149 @@
{
timeBucketConditionsInfo.Remove("StartMin");
}
- btnstarttime.Tag = timeview.Hour * 60 + timeview.Minute;
+ startView.titleBtn.Tag = timeview.Hour * 60 + timeview.Minute;
timeBucketConditionsInfo.Add("StartHour", timeview.Hour.ToString());
timeBucketConditionsInfo.Add("StartMin", timeview.Minute.ToString());
- btnstarttime.Text = timeview.Hour.ToString() + ":" + (timeview.Minute.ToString().Length < 2?"0"+timeview.Minute.ToString():timeview.Minute.ToString());
+ startView.titleBtn.Text = timeview.Hour.ToString() + ":" + (timeview.Minute.ToString().Length < 2 ? "0" + timeview.Minute.ToString() : timeview.Minute.ToString());
};
};
- timestartrow.MouseUpEventHandler += stattimeclick;
- btnstarttimetext.MouseUpEventHandler += stattimeclick;
- btnstarttime.MouseUpEventHandler += stattimeclick;
- btnstartback.MouseUpEventHandler += stattimeclick;
- EventHandler<MouseEventArgs> endtimeclick = (sender, e) =>
- {
+ endView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
+ {
- var flMain = new FrameLayout { BackgroundColor = 0x00000000 };
- AddChidren(flMain);
- flMain.MouseUpEventHandler += (sender11, e11) =>
- {
- flMain.RemoveFromParent();
- };
+ var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicTranslucentColor };
+ AddChidren(flMain);
+ flMain.MouseUpEventHandler += (sender11, e11) =>
+ {
+ flMain.RemoveFromParent();
+ };
- var timeview = new TimeView
- {
- Y = Application.GetRealHeight(1920 - 600),
- Height = Application.GetRealHeight(600),
- BackgroundColor =ZigbeeColor.Current.LogicTimeViewColor,
- Width = Application.GetRealWidth(1080),
- };
- flMain.AddChidren(timeview);
+ var timeview = new TimeView
+ {
+ Y = Application.GetRealHeight(1920 - 600),
+ Height = Application.GetRealHeight(600),
+ BackgroundColor = ZigbeeColor.Current.LogicTimeViewColor,
+ Width = Application.GetRealWidth(1080),
+ };
+ flMain.AddChidren(timeview);
- var btnSave = new Button
- {
- Y = Application.GetRealHeight(1920 - 600),
- Width = Application.GetRealWidth(200),
- Height = Application.GetRealHeight(150),
- Text = Language.StringByID(MyInternationalizationString.complete),
+ var btnSave = new Button
+ {
+ Y = Application.GetRealHeight(1920 - 600),
+ Width = Application.GetRealWidth(200),
+ Height = Application.GetRealHeight(150),
+ Text = Language.StringByID(MyInternationalizationString.complete),
//TextColor = 0xFF121212,
- TextColor =ZigbeeColor.Current.LogicTimeViewSaveButton,
+ TextColor = ZigbeeColor.Current.LogicTimeViewSaveButton,
//TextAlignment = TextAlignment.CenterRight
X = Application.GetRealWidth(1080 - 200),
- };
- flMain.AddChidren(btnSave);
+ };
+ flMain.AddChidren(btnSave);
- btnSave.MouseUpEventHandler += (sender2, e2) =>
- {
- flMain.RemoveFromParent();
+ btnSave.MouseUpEventHandler += (sender2, e2) =>
+ {
+ flMain.RemoveFromParent();
- var endval = timeview.Hour * 60 + timeview.Minute;
+ var endval = timeview.Hour * 60 + timeview.Minute;
- if (btnstarttime.Tag.ToString() != "0" && endval.ToString() == btnstarttime.Tag.ToString())
- {
- var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
- Language.StringByID(MyInternationalizationString.nottime),
- Language.StringByID(MyInternationalizationString.confrim));
- alert.Show();
- return;
- }
- if (btnstarttime.Tag.ToString() != "0" && endval < int.Parse(btnstarttime.Tag.ToString()))
- {
- var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
- Language.StringByID(MyInternationalizationString.timesetting),
- Language.StringByID(MyInternationalizationString.confrim));
- alert.Show();
- return;
- }
-
- if (timeBucketConditionsInfo.ContainsKey("StopHour"))
- {
- timeBucketConditionsInfo.Remove("StopHour");
- }
- if (timeBucketConditionsInfo.ContainsKey("StopMin"))
- {
- timeBucketConditionsInfo.Remove("StopMin");
- }
- btnendtime.Tag = timeview.Hour * 60 + timeview.Minute;
- timeBucketConditionsInfo.Add("StopHour",timeview.Hour.ToString());
- timeBucketConditionsInfo.Add("StopMin", timeview.Minute.ToString());
- btnendtime.Text = timeview.Hour.ToString() + ":" + (timeview.Minute.ToString().Length < 2?"0"+timeview.Minute.ToString():timeview.Minute.ToString());
- };
- };
- timeendrow.MouseUpEventHandler += endtimeclick;
- btnendtimetext.MouseUpEventHandler += endtimeclick;
- btnendtime.MouseUpEventHandler += endtimeclick;
- btnendtimeback.MouseUpEventHandler += endtimeclick;
+ if (startView.titleBtn.Tag.ToString() != "0" && endval.ToString() == startView.titleBtn.Tag.ToString())
+ {
- var fra = new FrameLayout
- {
- Y = middle.Bottom,
- Height = Application.GetRealHeight(200),
- BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
- };
- this.AddChidren(fra);
- var btncomplete = new Button
- {
- X = Application.GetRealWidth(290),
- Height = Application.GetRealHeight(150),//194
- Width = Application.GetRealWidth(500),
- Radius = (uint)Application.GetRealHeight(50),
- BackgroundColor = ZigbeeColor.Current.LogicButtonBlueColor,
- TextID = MyInternationalizationString.Save,
- };
- fra.AddChidren(btncomplete);
+ var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
+ Language.StringByID(MyInternationalizationString.nottime),
+ Language.StringByID(MyInternationalizationString.confrim));
+ alert.Show();
+ return;
+ }
+ if (startView.titleBtn.Tag.ToString() != "0" && endval < int.Parse(startView.titleBtn.Tag.ToString()))
+ {
- timeBucketConditionsInfo.Add("Type","5");
- timeBucketConditionsInfo.Add("IsValid", "1");
+ var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
+ Language.StringByID(MyInternationalizationString.timesetting),
+ Language.StringByID(MyInternationalizationString.confrim));
+ alert.Show();
+ return;
+ }
+
+ if (timeBucketConditionsInfo.ContainsKey("StopHour"))
+ {
+ timeBucketConditionsInfo.Remove("StopHour");
+ }
+ if (timeBucketConditionsInfo.ContainsKey("StopMin"))
+ {
+ timeBucketConditionsInfo.Remove("StopMin");
+ }
+ endView.titleBtn.Tag = timeview.Hour * 60 + timeview.Minute;
+ timeBucketConditionsInfo.Add("StopHour", timeview.Hour.ToString());
+ timeBucketConditionsInfo.Add("StopMin", timeview.Minute.ToString());
+ endView.titleBtn.Text = timeview.Hour.ToString() + ":" + (timeview.Minute.ToString().Length < 2 ? "0" + timeview.Minute.ToString() : timeview.Minute.ToString());
+ };
+ };
+
+
///瀹屾垚鐐瑰嚮浜嬩欢
- EventHandler<MouseEventArgs>completeclick=(sender, e) =>
- {
+ saveView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
+ {
+ if (timeBucketConditionsInfo.ContainsKey("Type"))
+ {
+ timeBucketConditionsInfo.Remove("Type");
+ }
+ if (timeBucketConditionsInfo.ContainsKey("IsValid"))
+ {
+ timeBucketConditionsInfo.Remove("IsValid");
+ }
+ timeBucketConditionsInfo.Add("Type", "5");
+ timeBucketConditionsInfo.Add("IsValid", "1");
- if (string.IsNullOrEmpty(btnstarttime.Text) || string.IsNullOrEmpty(btnendtime.Text))
- {
- var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
- Language.StringByID(MyInternationalizationString.completeNext),
- Language.StringByID(MyInternationalizationString.complete));
- alert.Show();
- return;
- }
- if (btnstarttime.Text == btnendtime.Text)
- {
- var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
- Language.StringByID(MyInternationalizationString.sametime),
- Language.StringByID(MyInternationalizationString.complete));
- alert.Show();
- return;
- }
+ if (string.IsNullOrEmpty(startView.titleBtn.Text) || string.IsNullOrEmpty(endView.titleBtn.Text))
+ {
+ var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
+ Language.StringByID(MyInternationalizationString.completeNext),
+ Language.StringByID(MyInternationalizationString.confrim));
+ alert.Show();
+ return;
+ }
+ if (startView.titleBtn.Text == endView.titleBtn.Text)
+ {
+ var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
+ Language.StringByID(MyInternationalizationString.sametime),
+ Language.StringByID(MyInternationalizationString.confrim));
+ alert.Show();
+ return;
+ }
- if (IsDeviceEditor1)
- {
- for (int i = 0; i < Common.Logic.CurrentLogic.Conditions.Count; i++)
- {
- if (Common.Logic.CurrentLogic.Conditions[i]["Type"] == "5")
- {
+ if (IsEditor)
+ {
+ for (int i = 0; i < Common.Logic.CurrentLogic.Conditions.Count; i++)
+ {
+ if (Common.Logic.CurrentLogic.Conditions[i]["Type"] == "5")
+ {
- var timeBucketInfo = Common.Logic.CurrentLogic.Conditions[i];
- var s = timeBucketInfo["StartHour"] + ":" + timeBucketInfo["StartMin"] + "-" + timeBucketInfo["StopHour"] + ":" + timeBucketInfo["StopMin"];
- if (str1 == s)
- {
- Common.Logic.CurrentLogic.Conditions.RemoveAt(i);
- Common.Logic.CurrentLogic.Conditions.Insert(i, timeBucketConditionsInfo);
- }
+ var timeBucketInfo = Common.Logic.CurrentLogic.Conditions[i];
+ var s = timeBucketInfo["StartHour"] + ":" + timeBucketInfo["StartMin"] + "-" + timeBucketInfo["StopHour"] + ":" + timeBucketInfo["StopMin"];
+ if (str1 == s)
+ {
+ Common.Logic.CurrentLogic.Conditions.RemoveAt(i);
+ Common.Logic.CurrentLogic.Conditions.Insert(i, timeBucketConditionsInfo);
+ }
- }
- }
- }
- else
- {
- Common.Logic.CurrentLogic.Conditions.Add(timeBucketConditionsInfo);
- }
+ }
+ }
+ }
+ else
+ {
+ Common.Logic.CurrentLogic.Conditions.Add(timeBucketConditionsInfo);
+ }
//LogicIfon.logicIfon.Addconditions(timeBucketConditionsInfo,timeBucketConditionsInfo.Type);
- var logicCommunalPage = new LogicCommunalPage { };
- UserView.HomePage.Instance.AddChidren(logicCommunalPage);
- UserView.HomePage.Instance.PageIndex += 1;
- logicCommunalPage.Show(() => { });
- };
+ var logicCommunalPage = new LogicCommunalPage { };
+ UserView.HomePage.Instance.AddChidren(logicCommunalPage);
+ UserView.HomePage.Instance.PageIndex += 1;
+ logicCommunalPage.Show(() => { });
- fra.MouseUpEventHandler += completeclick;
- btncomplete.MouseUpEventHandler += completeclick;
+ };
}
}
--
Gitblit v1.8.0