Merge branch 'WJC' into temp-wxr

wxr

2021-03-31 3532db3610381f37eca1a6ac783d882517847c91

 HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs

@@ -485,8 +485,8 @@

            var bodyView = new FrameLayout()
            {
                Y = Application.GetRealHeight(423),
                Height = Application.GetRealHeight(296),
                Y = Application.GetRealHeight(427),//667
                Height = Application.GetRealHeight(240),
                BackgroundColor = CSS_Color.MainBackgroundColor,
            };
            div.AddChidren(bodyView);
@@ -496,7 +496,6 @@
                Y = Application.GetRealHeight(16),
                Gravity = Gravity.CenterHorizontal,
                Width = Application.GetRealWidth(296+200),
                
            };
            bodyView.AddChidren(contentView);