Merge branch 'WJC'

wxr

2020-12-08 145b157ba183ebf877c93ed2dbb01ec737c993d3

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

@@ -12,7 +12,7 @@
        /// </summary>
        public FrameLayout fLayout = new FrameLayout
        {
            BackgroundColor = Color.TopViewColor,
            BackgroundColor = MusicColor.TopViewColor,
            Height = Application.GetRealHeight(64),
            Width=Application.GetRealWidth(375),
        };
@@ -22,7 +22,7 @@
        public Button topNameBtn = new Button
        {
            TextSize = TextSize.Text18,
            TextColor = Color.Text18Color,
            TextColor = MusicColor.Text18Color,
            Width = Application.GetRealWidth(140),
            Height = Application.GetRealHeight(25),
            Y = Application.GetRealHeight(30),
@@ -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",
@@ -45,7 +45,7 @@
        {
            Width = Application.GetRealWidth(375),
            Height = 1,
            BackgroundColor = Color.LineColor,
            BackgroundColor = MusicColor.LineColor,

        };
        /// <summary>
@@ -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,
        };
@@ -67,6 +67,15 @@
        {
            Width = Application.GetRealWidth(16+12+16),
            Height = Application.GetRealHeight(64),
        };
        /// <summary>
        /// 设置图标增加热键大小
        /// </summary>
        public Button clickSetBtn = new Button
        {
            X = Application.GetRealWidth(337 - 37),
            Width = Application.GetRealWidth(28 + 37),
            Height = Application.GetRealWidth(28 + 7 + 29),
        };
        /// <summary>
        /// 最上面的那块方法
@@ -80,6 +89,7 @@
            fLayout.AddChidren(lineBtn);
            fLayout.AddChidren(setBtn);
            fLayout.AddChidren(clickBackBtn);
            fLayout.AddChidren(clickSetBtn);
            return fLayout;
        }
        #endregion