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/CustomText.cs |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs b/ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs
index 13ba0c4..64287ce 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs
@@ -116,7 +116,7 @@
                  Common.Logic.CurrentLogic.LogicCustomPushText = textBox.Text.Trim();
                  if (string.IsNullOrEmpty(Common.Logic.CurrentLogic.LogicCustomPushText))
                  {
-                     var alert = new ShowMsgControl(ShowMsgType.Normal,
+                     var alert = new UserCenter.ShowMsgControl(ShowMsgType.Normal,
                            Language.StringByID(MyInternationalizationString.tiptextnull),
                            Language.StringByID(MyInternationalizationString.confrim));
                            alert.Show();

--
Gitblit v1.8.0