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 |  532 ++++++++++++++++++----------------------------------------
 1 files changed, 165 insertions(+), 367 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 dbf1f56..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;
 
@@ -21,252 +22,57 @@
         public void Show()
         {
 
-            #region  鏈�涓婇潰鐨勫竷灞�浠g爜
-            var topRowLayout = new RowLayout
-            {
-                BackgroundColor = ZigbeeColor.Current.LogicTopBackgroundColor,
-                Height = Application.GetRealHeight(184),
-                LineColor = ZigbeeColor.Current.LogicRowLayoutTopLineColor,
-            };
-            this.AddChidren(topRowLayout);
-
-            var titleName = new Button
-            {
-                TextSize = 17,
-                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-                TextAlignment = TextAlignment.CenterLeft,
-                X = Application.GetRealWidth(176),
-                Width = Application.GetRealWidth(600),
-                Height = Application.GetRealHeight(69),
-                Y = Application.GetRealHeight(92),
-                TextID = MyInternationalizationString.addtime,
-                IsBold = true,
-            };
-            topRowLayout.AddChidren(titleName);
-
-            var clickBtn = new Button
-            {
-                Width = Application.GetRealWidth(81 + 51),
-                Height = Application.GetRealHeight(58 + 40),
-                Y = Application.GetRealHeight(98 - 40),
-            };
-            topRowLayout.AddChidren(clickBtn);
-            clickBtn.MouseDownEventHandler += (sender, e) =>
-            {
-                RemoveFromParent();
-            };
-
-            var back = new Button
-            {
-                Width = Application.GetRealWidth(30),
-                Height = Application.GetRealHeight(51),
-                X = Application.GetRealWidth(81),
-                Y = Application.GetRealHeight(98),
-                //Gravity = Gravity.CenterVertical;
-                UnSelectedImagePath = "ZigeeLogic/back.png",
-            };
-            topRowLayout.AddChidren(back);
-            back.MouseDownEventHandler += (sender, e) => {
-                RemoveFromParent();
-            };
+            #region  涓婇潰鐨勫竷灞�浠g爜
+            TopView view = new TopView();
+            this.AddChidren(view.TopRowView());
+            view.toptitleNameBtn.TextID = MyInternationalizationString.selection;
+            view.clickBtn.MouseDownEventHandler += (sender, e) => { RemoveFromParent(); };
             #endregion
-
-
-            
 
             #region  鏈�涓嬮潰鐨勫竷灞�浠g爜
             var middle = new FrameLayout
             {
-                Y = topRowLayout.Bottom,
-                Height = Application.GetRealHeight(1920 - 184-260),
+                Y = view.topRowLayout.Bottom,
+                Height = Application.GetRealHeight(Method.H - 184 - 260),
                 BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
             };
             this.AddChidren(middle);
-
-            var fra = new FrameLayout
-            {
-                Y = middle.Bottom,
-                Height = Application.GetRealHeight(260),
-                BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
-            };
-            this.AddChidren(fra);
-            var btnsave = new Button
-            {
-                X = Application.GetRealWidth(85),
-                Height = Application.GetRealHeight(130),//194
-                Width = Application.GetRealWidth(910),
-                Radius = (uint)Application.GetRealHeight(60),
-                BackgroundColor = ZigbeeColor.Current.LogicBtnSaveBackgroundColor,
-                TextID = MyInternationalizationString.Save,
-                TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
-                TextSize = 16,
-            };
-            fra.AddChidren(btnsave);
+            //淇濆瓨
+            SaveView saveView = new SaveView();
+            saveView.frameLayout.Y = middle.Bottom;
+            this.AddChidren(saveView.Show());
             #endregion
 
             #region   -----鏃堕棿鑼冨洿  寮�濮嬫椂闂�  缁撴潫鏃堕棿
             #region   -----鏃堕棿鑼冨洿
 
-
-            var typeFramelayout = new FrameLayout
-            {
-                Height = Application.GetRealHeight(160),
-                BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
-            };
-            middle.AddChidren(typeFramelayout);
-
-
-            var typeRowlayout = new RowLayout
-            {
-                Y = Application.GetRealHeight(30),
-                Width = Application.GetRealWidth(965),
-                Height = Application.GetRealHeight(130),
-                X = Application.GetRealWidth(58),
-                LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
-            };
-            typeFramelayout.AddChidren(typeRowlayout);
-
-            var btnTypeTextTitle = new Button
-            {
-                Text = Language.StringByID(MyInternationalizationString.type),
-                TextAlignment = TextAlignment.CenterLeft,
-                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-                Width = Application.GetRealWidth(265),
-                TextSize = 14,
-            };
-            typeRowlayout.AddChidren(btnTypeTextTitle);
-            
-            
-            var btnimmediateexecution = new Button
-            {
-                X = btnTypeTextTitle.Right,
-                Gravity = Gravity.CenterVertical,
-                Width = Application.GetRealWidth(630),
-                TextAlignment = TextAlignment.CenterRight,
-                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-                TextID = MyInternationalizationString.timeframe,
-                TextSize = 14,
-            };
-            typeRowlayout.AddChidren(btnimmediateexecution);
-
-
-            var btnimmediateexecutionBack = new Button
-            {
-                Width = Application.GetRealWidth(58),
-                Height = Application.GetRealHeight(58),
-                UnSelectedImagePath = "ZigeeLogic/next.png",
-                X = btnimmediateexecution.Right + Application.GetRealWidth(12),
-                Gravity = Gravity.CenterVertical,
-            };
-            typeRowlayout.AddChidren(btnimmediateexecutionBack);
-
+            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;
 
             #endregion
 
             #region  -----寮�濮嬫椂闂�
-            var timestarFramelayout = new FrameLayout
-            {
-                Height = Application.GetRealHeight(160),
-                BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
-                Y= typeFramelayout.Bottom,
-            };
-            middle.AddChidren(timestarFramelayout);
 
-            var timestartrow = new RowLayout
-            {
-                Y = Application.GetRealHeight(30),
-                Width = Application.GetRealWidth(965),
-                Height = Application.GetRealHeight(130),
-                X = Application.GetRealWidth(58),
-                LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
-            };
-            timestarFramelayout.AddChidren(timestartrow);
-
-            var btnstarttimetext = new Button
-            {
-                Text = Language.StringByID(MyInternationalizationString.starttime),
-                TextAlignment = TextAlignment.CenterLeft,
-                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-                Width = Application.GetRealWidth(265),
-                TextSize = 14,
-
-            };
-            timestartrow.AddChidren(btnstarttimetext);
-
-            var btnstarttime = new Button
-            {
-                X = btnstarttimetext.Right,
-                Gravity = Gravity.CenterVertical,
-                Width = Application.GetRealWidth(630),
-                TextAlignment = TextAlignment.CenterRight,
-                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-                Tag = "0",
-                TextSize = 14,
-            };
-            timestartrow.AddChidren(btnstarttime);
-
-            var btnstartback = new Button
-            {
-                Width = Application.GetRealWidth(58),
-                Height = Application.GetRealHeight(58),
-                UnSelectedImagePath = "ZigeeLogic/next.png",
-                X = btnstarttime.Right + Application.GetRealWidth(12),
-                Gravity = Gravity.CenterVertical,
-            };
-            timestartrow.AddChidren(btnstartback);
-
+            TypeView startView = new TypeView();
+            startView.frameLayout.Y = typeView.frameLayout.Bottom;
+            middle.AddChidren(startView.Show());
+            startView.textBtn.TextID = MyInternationalizationString.starttime;
+            startView.titleBtn.Tag = "0";
             #endregion
 
             #region  -----缁撴潫鏃堕棿
-            var timeendFramelayout = new FrameLayout
-            {
-                Height = Application.GetRealHeight(160),
-                BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
-                Y = timestarFramelayout.Bottom,
-            };
-            middle.AddChidren(timeendFramelayout);
 
-            var timeendrow = new RowLayout
-            {
-                Y = Application.GetRealHeight(30),
-                Width = Application.GetRealWidth(965),
-                Height = Application.GetRealHeight(130),
-                X = Application.GetRealWidth(58),
-                LineColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
-            };
-            timeendFramelayout.AddChidren(timeendrow);
-            var btnendtimetext = new Button
-            {
-                Text = Language.StringByID(MyInternationalizationString.endtime),
-                TextAlignment = TextAlignment.CenterLeft,
-                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-                Width = Application.GetRealWidth(265),
-                TextSize = 14,
-
-            };
-            timeendrow.AddChidren(btnendtimetext);
-
-            var btnendtime = new Button
-            {
-                X = btnendtimetext.Right,
-                Gravity = Gravity.CenterVertical,
-                Width = Application.GetRealWidth(630),
-                TextAlignment = TextAlignment.CenterRight,
-                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
-                Tag = "0",
-                TextSize = 14,
-            };
-            timeendrow.AddChidren(btnendtime);
-
-            var btnendtimeback = new Button
-            {
-                Width = Application.GetRealWidth(58),
-                Height = Application.GetRealHeight(58),
-                UnSelectedImagePath = "ZigeeLogic/next.png",
-                X = btnendtime.Right + Application.GetRealWidth(12),
-                Gravity = Gravity.CenterVertical,
-            };
-            timeendrow.AddChidren(btnendtimeback);
+            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";
 
             #endregion
             #endregion
@@ -275,18 +81,18 @@
             {
                 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)
                     {
@@ -296,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];
@@ -321,12 +127,13 @@
                     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 = ZigbeeColor.Current.LogicTranslucentColor };
@@ -340,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);
@@ -353,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),
                 };
@@ -365,18 +172,18 @@
 
                     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 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 UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
                                         Language.StringByID(MyInternationalizationString.timesetting),
                                        Language.StringByID(MyInternationalizationString.confrim));
@@ -391,158 +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;
-            timestarFramelayout.MouseUpEventHandler += stattimeclick;
-            EventHandler<MouseEventArgs> endtimeclick = (sender, e) =>
-            {
 
-                var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicTranslucentColor };
-                AddChidren(flMain);
-                flMain.MouseUpEventHandler += (sender11, e11) =>
-                {
-                    flMain.RemoveFromParent();
-                };
+            endView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
+             {
 
-                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 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 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 UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
-                                        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 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");
-                    }
-                    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;
-            timeendFramelayout.MouseUpEventHandler += endtimeclick;
+                     if (startView.titleBtn.Tag.ToString() != "0" && endval.ToString() == startView.titleBtn.Tag.ToString())
+                     {
+
+                         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()))
+                     {
+
+                         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) =>
-            {
-                if (timeBucketConditionsInfo.ContainsKey("Type"))
-                {
-                    timeBucketConditionsInfo.Remove("Type");
-                }
-                if (timeBucketConditionsInfo.ContainsKey("IsValid"))
-                {
-                    timeBucketConditionsInfo.Remove("IsValid");
-                }
-                timeBucketConditionsInfo.Add("Type", "5");
-                timeBucketConditionsInfo.Add("IsValid", "1");
+            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 UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
-                                           Language.StringByID(MyInternationalizationString.completeNext),
-                                          Language.StringByID(MyInternationalizationString.confrim));
-                    alert.Show();
-                    return;
-                }
-                if (btnstarttime.Text == btnendtime.Text)
-                {
-                    var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
-                                           Language.StringByID(MyInternationalizationString.sametime),
-                                          Language.StringByID(MyInternationalizationString.confrim));
-                    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 (IsEditor)
-                {
-                    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(() => { });
-            };
-            fra.MouseUpEventHandler += completeclick;
-            btnsave.MouseUpEventHandler += completeclick;
+                var logicCommunalPage = new LogicCommunalPage { };
+                 UserView.HomePage.Instance.AddChidren(logicCommunalPage);
+                 UserView.HomePage.Instance.PageIndex += 1;
+                 logicCommunalPage.Show(() => { });
+
+             };
         }
 
     }

--
Gitblit v1.8.0