Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-11-07 a4924de3136289d10cabbf2f61a228387d44ded7

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

@@ -215,7 +215,7 @@
            {

                menuCount = 2;

            }

            var frame = new TopRightMenuControl(menuCount);

            var frame = new TopRightMenuControl(this, menuCount);

            if (canTest == true)

            {

                //定位

@@ -365,7 +365,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);