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

wxr

2022-03-08 f8bafd162ad7adf2f21986389568d650b71f976b

 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()
            {