From fe3b2466c68b5db70d38e78039703add3b8b1dfe Mon Sep 17 00:00:00 2001 From: 黄学彪 <hxb@hdlchina.com.cn> Date: 星期四, 31 十二月 2020 19:29:43 +0800 Subject: [PATCH] 合并了代码 --- ZigbeeApp/Shared/Phone/Device/Logic/TimePage.cs | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/TimePage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/TimePage.cs index ad6539c..3e79b1e 100755 --- a/ZigbeeApp/Shared/Phone/Device/Logic/TimePage.cs +++ b/ZigbeeApp/Shared/Phone/Device/Logic/TimePage.cs @@ -175,7 +175,7 @@ if (endView.titleBtn.Tag.ToString() != "0" && startval.ToString() == endView.titleBtn.Tag.ToString()) { - var alert = new ShowMsgControl(ShowMsgType.Normal, + var alert = new UserCenter.ShowMsgControl(ShowMsgType.Normal, Language.StringByID(MyInternationalizationString.nottime), Language.StringByID(MyInternationalizationString.confrim)); alert.Show(); @@ -184,7 +184,7 @@ if (endView.titleBtn.Tag.ToString() != "0" && startval > int.Parse(endView.titleBtn.Tag.ToString())) { - var alert = new ShowMsgControl(ShowMsgType.Normal, + var alert = new UserCenter.ShowMsgControl(ShowMsgType.Normal, Language.StringByID(MyInternationalizationString.timesetting), Language.StringByID(MyInternationalizationString.confrim)); alert.Show(); @@ -247,7 +247,7 @@ if (startView.titleBtn.Tag.ToString() != "0" && endval.ToString() == startView.titleBtn.Tag.ToString()) { - var alert = new ShowMsgControl(ShowMsgType.Normal, + var alert = new UserCenter.ShowMsgControl(ShowMsgType.Normal, Language.StringByID(MyInternationalizationString.nottime), Language.StringByID(MyInternationalizationString.confrim)); alert.Show(); @@ -256,7 +256,7 @@ if (startView.titleBtn.Tag.ToString() != "0" && endval < int.Parse(startView.titleBtn.Tag.ToString())) { - var alert = new ShowMsgControl(ShowMsgType.Normal, + var alert = new UserCenter.ShowMsgControl(ShowMsgType.Normal, Language.StringByID(MyInternationalizationString.timesetting), Language.StringByID(MyInternationalizationString.confrim)); alert.Show(); @@ -295,7 +295,7 @@ if (string.IsNullOrEmpty(startView.titleBtn.Text) || string.IsNullOrEmpty(endView.titleBtn.Text)) { - var alert = new ShowMsgControl(ShowMsgType.Normal, + var alert = new UserCenter.ShowMsgControl(ShowMsgType.Normal, Language.StringByID(MyInternationalizationString.completeNext), Language.StringByID(MyInternationalizationString.confrim)); alert.Show(); @@ -303,7 +303,7 @@ } if (startView.titleBtn.Text == endView.titleBtn.Text) { - var alert = new ShowMsgControl(ShowMsgType.Normal, + var alert = new UserCenter.ShowMsgControl(ShowMsgType.Normal, Language.StringByID(MyInternationalizationString.sametime), Language.StringByID(MyInternationalizationString.confrim)); alert.Show(); -- Gitblit v1.8.0