合并了新代码

黄学彪

2019-12-12 7e863a33397f317ffc3ffd9288496d0e4f16aa66

 ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs

@@ -30,6 +30,7 @@
                Height = Application.GetRealHeight(69),
                Y = Application.GetRealHeight(92),
                TextID = MyInternationalizationString.custompush,
                IsBold = true,
            };
            topRowLayout.AddChidren(titleName);

@@ -74,7 +75,7 @@
            {
                Width = Application.GetRealWidth(1080),
                Height = Application.GetRealHeight(600),
                TextAlignment = TextAlignment.CenterLeft,
                TextAlignment = TextAlignment.TopLeft,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
                Text = Common.Logic.CurrentLogic.LogicCustomPushText,
@@ -101,12 +102,11 @@
            middle.AddChidren(btnsave);
            btnsave.MouseUpEventHandler += (sender, e) =>
             {
                 Common.Logic.CurrentLogic.LogicCustomPushText = textBox.Text.Trim();
                 if (Common.Logic.CurrentLogic.LogicId != 0)
                 {
                     ///只改推送内容；
                     Send.LogicControlSwitch(Common.Logic.CurrentLogic);
                 }
                 else {
                     Send.AddModifyLogic(Common.Logic.CurrentLogic);
                 }
                 RemoveFromParent();