Merge branch 'WJC' into NewFilePath

wxr

2020-12-17 1b42f39e34492ba8d4ce6336cc913877b9e064cb

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

@@ -32,8 +32,8 @@
        {
            X = Application.GetRealWidth(10),
            Y = Application.GetRealHeight(15),
            Width = Application.GetMinRealAverage(32),
            Height = Application.GetMinRealAverage(32),
            Width = Application.GetRealWidth(32),
            Height = Application.GetRealWidth(32),
            UnSelectedImagePath = "MusicIcon/playStatus.png",
        };
        /// <summary>
@@ -55,8 +55,8 @@
        {
            X = Application.GetRealWidth(214 + 13),
            Y = Application.GetRealHeight(18 + 5),
            Width = Application.GetMinRealAverage(16),
            Height = Application.GetMinRealAverage(16),
            Width = Application.GetRealWidth(16),
            Height = Application.GetRealWidth(16),
            UnSelectedImagePath = "MusicIcon/Merge.png",
        };
        /// <summary>
@@ -80,8 +80,8 @@
        {
            X = Application.GetRealWidth(299),
            Y = Application.GetRealHeight(10),
            Width = Application.GetMinRealAverage(40),
            Height = Application.GetMinRealAverage(40),
            Width = Application.GetRealWidth(40),
            Height = Application.GetRealWidth(40),
            UnSelectedImagePath = "MusicIcon/collect.png",
            SelectedImagePath = "MusicIcon/collectSelected.png",
        };
@@ -157,8 +157,8 @@
        {
            X = Application.GetRealWidth(163),
            Y = Application.GetRealHeight(101),
            Width = Application.GetMinRealAverage(32),
            Height = Application.GetMinRealAverage(32),
            Width = Application.GetRealWidth(32),
            Height = Application.GetRealWidth(32),
            UnSelectedImagePath = "MusicIcon/prev.png",
            SelectedImagePath = "MusicIcon/prevSeletced.png",
        };
@@ -169,8 +169,8 @@
        {
            X = Application.GetRealWidth(233),
            Y = Application.GetRealHeight(101),
            Width = Application.GetMinRealAverage(32),
            Height = Application.GetMinRealAverage(32),
            Width = Application.GetRealWidth(32),
            Height = Application.GetRealWidth(32),
            UnSelectedImagePath = "MusicIcon/pause.png",
            SelectedImagePath = "MusicIcon/play.png",
        };
@@ -181,8 +181,8 @@
        {
            X = Application.GetRealWidth(303),
            Y = Application.GetRealHeight(101),
            Width = Application.GetMinRealAverage(32),
            Height = Application.GetMinRealAverage(32),
            Width = Application.GetRealWidth(32),
            Height = Application.GetRealWidth(32),
            UnSelectedImagePath = "MusicIcon/next.png",
            SelectedImagePath = "MusicIcon/nextSelected.png",
        };