From fa6bcb2e9907772480f99205f36ec2a1ce735a22 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 09 一月 2020 14:11:07 +0800
Subject: [PATCH] 合并代码
---
ZigbeeApp/Shared/Phone/Device/Logic/TemplateIgnore.cs | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/TemplateIgnore.cs b/ZigbeeApp/Shared/Phone/Device/Logic/TemplateIgnore.cs
index 6c9f1f6..f410c1d 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/TemplateIgnore.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/TemplateIgnore.cs
@@ -245,9 +245,10 @@
{
if (!edit)
{
- var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
- Language.StringByID(MyInternationalizationString.delaytip),
- Language.StringByID(MyInternationalizationString.confrim));
+
+ var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
+ Language.StringByID(MyInternationalizationString.delaytip),
+ Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
return;
}
--
Gitblit v1.8.0