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

WJC

2019-11-07 2109463fab2eb1caed189e4f258e0e763c5cea7b

 ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelButtonSettionForm.cs

@@ -369,7 +369,7 @@
            var btnIcon = new NormalViewControl(Application.GetMinRealAverage(52), Application.GetMinRealAverage(52), false);

            btnIcon.Name = "btn" + device.DeviceEpoint;

            btnIcon.Gravity = Gravity.Center;

            btnIcon.Radius = (uint)Application.GetMinRealAverage(6);

            btnIcon.Radius = 6;

            btnIcon.BorderWidth = 2;

            btnIcon.BorderColor = 0xff979797;

            frame.AddChidren(btnIcon, ChidrenBindMode.BindEventOnly);