合并了代码

黄学彪

2019-12-31 737c036a39176fd2085ce82b7c60391da8cb508c

 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)
                 {
                     ///只改推送内容；