From 66a9965c44ecc32a6696abca876ab9d1cd091584 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 28 二月 2020 15:25:13 +0800
Subject: [PATCH] 2020.2.28
---
ZigbeeApp/Shared/Phone/Device/Logic/TimePage.cs | 49 +++++++++++++++++++++++++++++++------------------
1 files changed, 31 insertions(+), 18 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/TimePage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/TimePage.cs
index 93d702f..dbf1f56 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/TimePage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/TimePage.cs
@@ -40,6 +40,7 @@
Height = Application.GetRealHeight(69),
Y = Application.GetRealHeight(92),
TextID = MyInternationalizationString.addtime,
+ IsBold = true,
};
topRowLayout.AddChidren(titleName);
@@ -253,6 +254,7 @@
TextAlignment = TextAlignment.CenterRight,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
Tag = "0",
+ TextSize = 14,
};
timeendrow.AddChidren(btnendtime);
@@ -365,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;
}
@@ -439,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;
}
@@ -477,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;
}
--
Gitblit v1.8.0