2021-12-01-01

xm

2021-12-01 6d73bf6e816570291865674bef8bce8972e4de3f

 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>
@@ -65,13 +65,12 @@
        public Button mergeBtn = new Button
        {
            TextID=StringId.merge,
            X = Application.GetRealWidth(214 + 33),
            X = Language.CurrentLanguage == "Chinese" ? Application.GetRealWidth(214 + 33): Application.GetRealWidth(214 + 28),
            Y = Application.GetRealHeight(18 + 4),
            Width = Application.GetRealWidth(24+3+5),
            Width = Language.CurrentLanguage == "Chinese" ? Application.GetRealWidth(24+3+5) : Application.GetRealWidth(24 + 3 + 15),
            Height = Application.GetRealHeight(17),
            TextColor = MusicColor.TextColor,
            TextSize=TextSize.Text12,

            TextSize= Language.CurrentLanguage == "Chinese" ? TextSize.Text12 :CSS.CSS_FontSize.PromptFontSize_SecondaryLevel,
        };
        /// <summary>
        ///收藏图标
@@ -80,8 +79,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 +156,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 +168,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 +180,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",
        };