Merge remote-tracking branch 'origin/wjc' into wxr0114

wxr

2022-03-08 41b934c1780d1a18fe8068f3bfc0e59b3b892479

 HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs

@@ -243,7 +243,7 @@
            {
                Gravity = Gravity.CenterHorizontal,
                Y = Application.GetRealHeight(50),
                Height = Application.GetRealHeight(400),
                Height = Application.GetRealHeight(390),
                Radius = (uint)Application.GetRealWidth(12),
                BorderColor = 0x00000000,
                BorderWidth = 0,