请合并代码，优化面板问题

xm

2020-05-18 cf0bffdf072bae11bdb8c780d0a355818700f713

 ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceFunctionSettionForm.cs

old mode 100755
new mode 100644
@@ -329,6 +329,19 @@
                        frameBack.Height = this.GetPictrueRealSize(354);

                        frameBack.Y = Application.GetRealHeight(153);

                        frameBack.Gravity = Gravity.Center;

                    }

                    //如果是PM2.5
                    if (deviceObj.Type == DeviceType.PMSensor)

                    {

                        frame.RemoveFromParent();

                        frameBorder.Y = Application.GetRealHeight(0);

                        frameBorder.Height = Application.GetRealHeight(708);

                        frameBack.BackgroundImagePath = "RealDevice/SensorPMTwoPointFive.png";

                        frameBack.Width = this.GetPictrueRealSize(418);

                        frameBack.Height = this.GetPictrueRealSize(403);

                        frameBack.Y = Application.GetRealHeight(153);

                        frameBack.Gravity = Gravity.Center;

                    }



                    //如果是PM2.5

@@ -355,7 +368,7 @@
                //计算真实高度

                int realHeight = this.GetPictrueRealSize(58 + 58);//上下间距

                realHeight += frameBack.ChildrenCount * this.GetPictrueRealSize(124);//圆圈高度

                realHeight += (frameBack.ChildrenCount-1) * this.GetPictrueRealSize(60);//圆圈间距

                realHeight += (frameBack.ChildrenCount - 1) * this.GetPictrueRealSize(60);//圆圈间距

                if (realHeight > frameBack.Height)

                {

                    //变更高度