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

wxr

2022-03-11 4a9844ac95e2ff67b2a2b1082c30f15c561866c6

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

@@ -73,7 +73,7 @@
            };
            bodyView.AddChidren(contentView);

            contentView.AddChidren(new Button() { Height = Application.GetRealHeight(12) });
            contentView.AddChidren(new Button() { Height = Application.GetRealHeight(16) });

            FrameLayout diagramView = new FrameLayout()
            {