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/CustomText.cs | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs b/ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs
index 6c565cfc..cdaedb0 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs
@@ -103,6 +103,14 @@
btnsave.MouseUpEventHandler += (sender, e) =>
{
Common.Logic.CurrentLogic.LogicCustomPushText = textBox.Text.Trim();
+ if (string.IsNullOrEmpty(Common.Logic.CurrentLogic.LogicCustomPushText))
+ {
+ var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
+ Language.StringByID(MyInternationalizationString.tiptextnull),
+ Language.StringByID(MyInternationalizationString.confrim));
+ alert.Show();
+ return;
+ }
if (Common.Logic.CurrentLogic.LogicId != 0)
{
///鍙敼鎺ㄩ�佸唴瀹癸紱
--
Gitblit v1.8.0