Merge branch 'WJC'

wxr

2020-12-08 145b157ba183ebf877c93ed2dbb01ec737c993d3

 HDL_ON/UI/UI2/FuntionControlView/Music/View/TopView.cs

@@ -34,7 +34,7 @@
        public Button backBtn = new Button
        {
            Width = Application.GetRealWidth(12),
            Height = Application.GetRealHeight(20),
            Height = Application.GetRealWidth(20),
            X = Application.GetRealWidth(16),
            Y = Application.GetRealHeight(32),
            UnSelectedImagePath = "MusicIcon/MusicBack.png",
@@ -55,8 +55,8 @@
        {
            Y = Application.GetRealHeight(29),
            X = Application.GetRealWidth(337),
            Width = Application.GetMinRealAverage(28),
            Height = Application.GetMinRealAverage(28),
            Width = Application.GetRealWidth(28),
            Height = Application.GetRealWidth(28),
            UnSelectedImagePath = "MusicIcon/set.png",
            Visible=false,
        };
@@ -74,8 +74,8 @@
        public Button clickSetBtn = new Button
        {
            X = Application.GetRealWidth(337 - 37),
            Width = Application.GetMinRealAverage(28 + 37),
            Height = Application.GetMinRealAverage(28 + 7 + 29),
            Width = Application.GetRealWidth(28 + 37),
            Height = Application.GetRealWidth(28 + 7 + 29),
        };
        /// <summary>
        /// 最上面的那块方法