From 737c036a39176fd2085ce82b7c60391da8cb508c Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 31 十二月 2019 19:17:47 +0800
Subject: [PATCH] 合并了代码
---
ZigbeeApp/Shared/Phone/Device/Logic/TimePage.cs | 45 ++++++++++++++++++++++++++++-----------------
1 files changed, 28 insertions(+), 17 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/TimePage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/TimePage.cs
index 9b01d9d..dbf1f56 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/TimePage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/TimePage.cs
@@ -367,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;
}
@@ -441,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;
}
@@ -479,13 +483,20 @@
///瀹屾垚鐐瑰嚮浜嬩欢
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.confrim));
alert.Show();
@@ -493,9 +504,9 @@
}
if (btnstarttime.Text == btnendtime.Text)
{
- var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
- Language.StringByID(MyInternationalizationString.sametime),
- Language.StringByID(MyInternationalizationString.confrim));
+ var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
+ Language.StringByID(MyInternationalizationString.sametime),
+ Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
return;
}
--
Gitblit v1.8.0