~wjc/HomeApp.git

			@@ -32,14 +32,15 @@

			var titleName = new Button
			{
			TextSize = 16,
			TextSize = 17,
			TextColor = ZigbeeColor.Current.LogicTextBlackColor,
			TextAlignment = TextAlignment.CenterLeft,
			X = Application.GetRealWidth(176),
			Width = Application.GetRealWidth(400),
			Width = Application.GetRealWidth(600),
			Height = Application.GetRealHeight(69),
			Y = Application.GetRealHeight(92),
			TextID = MyInternationalizationString.addtime,
			IsBold = true,
			};
			topRowLayout.AddChidren(titleName);

			@@ -98,6 +99,7 @@
			BackgroundColor = ZigbeeColor.Current.LogicBtnSaveBackgroundColor,
			TextID = MyInternationalizationString.Save,
			TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
			TextSize = 16,
			};
			fra.AddChidren(btnsave);
			#endregion
			@@ -129,7 +131,8 @@
			Text = Language.StringByID(MyInternationalizationString.type),
			TextAlignment = TextAlignment.CenterLeft,
			TextColor = ZigbeeColor.Current.LogicTextBlackColor,
			Width = Application.GetRealWidth(265)
			Width = Application.GetRealWidth(265),
			TextSize = 14,
			};
			typeRowlayout.AddChidren(btnTypeTextTitle);

			@@ -142,6 +145,7 @@
			TextAlignment = TextAlignment.CenterRight,
			TextColor = ZigbeeColor.Current.LogicTextBlackColor,
			TextID = MyInternationalizationString.timeframe,
			TextSize = 14,
			};
			typeRowlayout.AddChidren(btnimmediateexecution);

			@@ -183,7 +187,8 @@
			Text = Language.StringByID(MyInternationalizationString.starttime),
			TextAlignment = TextAlignment.CenterLeft,
			TextColor = ZigbeeColor.Current.LogicTextBlackColor,
			Width = Application.GetRealWidth(265)
			Width = Application.GetRealWidth(265),
			TextSize = 14,

			};
			timestartrow.AddChidren(btnstarttimetext);
			@@ -196,6 +201,7 @@
			TextAlignment = TextAlignment.CenterRight,
			TextColor = ZigbeeColor.Current.LogicTextBlackColor,
			Tag = "0",
			TextSize = 14,
			};
			timestartrow.AddChidren(btnstarttime);

			@@ -235,6 +241,7 @@
			TextAlignment = TextAlignment.CenterLeft,
			TextColor = ZigbeeColor.Current.LogicTextBlackColor,
			Width = Application.GetRealWidth(265),
			TextSize = 14,

			};
			timeendrow.AddChidren(btnendtimetext);
			@@ -247,6 +254,7 @@
			TextAlignment = TextAlignment.CenterRight,
			TextColor = ZigbeeColor.Current.LogicTextBlackColor,
			Tag = "0",
			TextSize = 14,
			};
			timeendrow.AddChidren(btnendtime);

			@@ -359,17 +367,19 @@

			if (btnendtime.Tag.ToString() != "0" && startval.ToString()==btnendtime.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()))
			{
			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;
			}
			@@ -433,17 +443,19 @@

			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));

			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 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;
			}
			@@ -471,23 +483,30 @@
			///完成点击事件
			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");

			if (string.IsNullOrEmpty(btnstarttime.Text) \|\| string.IsNullOrEmpty(btnendtime.Text))
			{
			var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
			var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
			Language.StringByID(MyInternationalizationString.completeNext),
			Language.StringByID(MyInternationalizationString.complete));
			Language.StringByID(MyInternationalizationString.confrim));
			alert.Show();
			return;
			}
			if (btnstarttime.Text == btnendtime.Text)
			{
			var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
			Language.StringByID(MyInternationalizationString.sametime),
			Language.StringByID(MyInternationalizationString.complete));
			var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
			Language.StringByID(MyInternationalizationString.sametime),
			Language.StringByID(MyInternationalizationString.confrim));
			alert.Show();
			return;
			}