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

xm

2020-05-13 99da2604f81af29afc6b3c6f4f128b4e5a8a5649

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

@@ -343,6 +343,19 @@
                        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

                {