Merge branch 'WJC' into NewFilePath

wxr

2021-01-14 d987694e57c3bce76bd5a208d74a3696db222a4a

 HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs

@@ -253,9 +253,9 @@
            btnSwitch = new Button()
            {
                Gravity = Gravity.CenterHorizontal,
                Y = Application.GetRealHeight(462),
                Width = Application.GetRealWidth(40),
                Height = Application.GetRealWidth(40),
                Y = Application.GetRealHeight(466),
                Width = Application.GetRealWidth(32),
                Height = Application.GetRealWidth(32),
                UnSelectedImagePath = "Public/PowerClose.png",
                SelectedImagePath = "Public/PowerOpen.png",
                IsSelected = aC.trait_on_off.curValue.ToString() == "on"