Merge remote-tracking branch 'origin/dev-tzy' into dev-2020xm

xm

2020-05-07 c1de48884fa145a16a0f8bcee93274dcfaa0ff82

 ZigbeeApp/Shared/Phone/Category/AdjustTargetAddDeviceForm.cs

@@ -333,11 +333,11 @@


            //设备图标背景控件

            var frameIconBackGroud = new FrameLayout();

            frameIconBackGroud.Height = Application.GetMinRealAverage(112);

            frameIconBackGroud.Width = Application.GetMinRealAverage(112);

            frameIconBackGroud.Height = this.GetPictrueRealSize(112);

            frameIconBackGroud.Width = this.GetPictrueRealSize(112);

            frameIconBackGroud.Gravity = Gravity.CenterVertical;

            frameIconBackGroud.X = Application.GetRealWidth(46);

            frameIconBackGroud.Radius = (uint)Application.GetMinRealAverage(112 / 2);

            frameIconBackGroud.Radius = (uint)this.GetPictrueRealSize(112 / 2);

            frameIconBackGroud.BackgroundColor = Common.ZigbeeColor.Current.GXCGrayBackgroundColor;

            rowDevice.AddChidren(frameIconBackGroud, ChidrenBindMode.NotBind);

            frameIconBackGroud.Y += rowDevice.chidrenYaxis;