Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC

gxc

2020-01-10 c0021397eeb8335d6d1f20990c71533c3d94e7af

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

@@ -135,7 +135,6 @@
                }
            };


            var btnsave = new Button
            {
                Y = middle.Height - Application.GetRealHeight(260),
@@ -163,15 +162,14 @@
                           alert.Show();
                           return;
                 }
                 if (Common.Logic.CurrentLogic.LogicId != 0)
                 {
                     ///只改推送内容；
                     Send.LogicControlSwitch(Common.Logic.CurrentLogic);
                     Send.Data("添加/更新", "/App/HomeLogicConfig", "POST");
                 }
                 Send.Zj(true, Common.Logic.CurrentLogic);
                 RemoveFromParent();

             };




        }
    }
}