优化新风模块和新风面板的测试功能，请合并代码

xm

2020-05-13 da3634e011bbda29cf4e1c168997b780fe795b20

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

old mode 100755
new mode 100644
@@ -84,7 +84,7 @@
            //初始化桌布

            this.tableContr = new InformationEditorControl();



            if (this.deviceObj.Type == DeviceType.FreshAir)

            if (this.deviceObj.Type == DeviceType.FreshAir || this.deviceObj.Type == DeviceType.PMSensor)

            {

                this.listview = tableContr.InitControl(listBackControl.frameTable, Language.StringByID(R.MyInternationalizationString.uDeviceEditor), 1028);

            }

@@ -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;

                    }

                }

                else

@@ -342,7 +355,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)

                {

                    //变更高度