From 1fcf2302f79f9cbea5ef17c3688311ed65cfabb4 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 28 一月 2021 19:54:25 +0800
Subject: [PATCH] Win7新版本

---
 HDL_ON/UI/UI2/FuntionControlView/Music/View/DialogView.cs |   32 +++++++++++++++++---------------
 1 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/View/DialogView.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/View/DialogView.cs
index c97b330..1c15666 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/View/DialogView.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/View/DialogView.cs
@@ -80,8 +80,8 @@
             {
                 X = Application.GetRealWidth(304),
                 Y = Application.GetRealHeight(20),
-                Width = Application.GetMinRealAverage(28),
-                Height = Application.GetMinRealAverage(28),
+                Width = Application.GetRealWidth(28),
+                Height = Application.GetRealWidth(28),
                 UnSelectedImagePath = "MusicIcon/addMusic.png",
             };
             topFra.AddChidren(addIconBtn);
@@ -132,8 +132,8 @@
                 {
                     X = Application.GetRealWidth(12),
                     Y = Application.GetRealHeight(8),
-                    Width = Application.GetMinRealAverage(62),
-                    Height = Application.GetMinRealAverage(62),
+                    Width = Application.GetRealWidth(62),
+                    Height = Application.GetRealWidth(62),
                     UnSelectedImagePath = "MusicIcon/file.png",
                 };
                 addFlieRow.AddChidren(fileIconBtn);
@@ -352,8 +352,8 @@
                 {
                     X = Application.GetRealWidth(303),
                     Y = Application.GetRealHeight(11),
-                    Width = Application.GetMinRealAverage(28),
-                    Height = Application.GetMinRealAverage(28),
+                    Width = Application.GetRealWidth(28),
+                    Height = Application.GetRealWidth(28),
                     UnSelectedImagePath = "MusicIcon/noSelectedIcon.png",
                     SelectedImagePath = "MusicIcon/selectedIcon.png",
                 };
@@ -626,8 +626,8 @@
                 {
                     X = Application.GetRealWidth(303),
                     Y = Application.GetRealHeight(11),
-                    Width = Application.GetMinRealAverage(28),
-                    Height = Application.GetMinRealAverage(28),
+                    Width = Application.GetRealWidth(28),
+                    Height = Application.GetRealWidth(28),
                     UnSelectedImagePath = "MusicIcon/noSelectedIcon.png",
                     SelectedImagePath = "MusicIcon/selectedIcon.png",
                     Tag = player,
@@ -812,8 +812,8 @@
                 {
                     X = Application.GetRealWidth(303),
                     Y = Application.GetRealHeight(11),
-                    Width = Application.GetMinRealAverage(28),
-                    Height = Application.GetMinRealAverage(28),
+                    Width = Application.GetRealWidth(28),
+                    Height = Application.GetRealWidth(28),
                     UnSelectedImagePath = "MusicIcon/noSelectedIcon.png",
                     SelectedImagePath = "MusicIcon/selectedIcon.png",
                 };
@@ -939,7 +939,7 @@
                                     for (int j = 0; j < A31MusicModel.A31MusicModelList.Count; j++)
                                     {
                                         var music = A31MusicModel.A31MusicModelList[j];
-                                        if(music.collection && !mainModelCollection)
+                                        if(music.collect && !mainModelCollection)
                                         {
                                             mainModelCollection = true;
                                         }
@@ -1284,9 +1284,10 @@
                 IsClickable = true,//杩涘害鏉℃槸鍚︽粦鍔�
                 ProgressBarColor = MusicColor.SelectedColor,//閫変腑杩涘害鏉¢鑹�
                 ThumbImagePath = "MusicIcon/progressIcon.png",//杩涘害鏉℃寜閽浘鏍�
-                ThumbImageHeight = Application.GetMinRealAverage(54),//杩涘害鏉℃寜閽浘鏍囩殑楂樺害锛堥粯璁ゆ鏂瑰舰锛氬鍜岄珮涓�鏍凤級
-                SeekBarViewHeight = Application.GetMinRealAverage(8),//杩涘害鏉$殑楂樺害
+                ThumbImageHeight = Application.GetRealWidth(54),//杩涘害鏉℃寜閽浘鏍囩殑楂樺害锛堥粯璁ゆ鏂瑰舰锛氬鍜岄珮涓�鏍凤級
+                SeekBarViewHeight = Application.GetRealWidth(8),//杩涘害鏉$殑楂樺害
                 Progress = int.Parse(a31player.A31PlayStatus.vol),
+                SeekBarPadding = Application.GetRealWidth(20),
                 //ProgressChangeDelayTime=
             };
             totalVolumeFra.AddChidren(totalVolSeekBar);
@@ -1346,9 +1347,10 @@
                     IsClickable = true,//杩涘害鏉℃槸鍚︽粦鍔�
                     ProgressBarColor = MusicColor.SelectedColor,//閫変腑杩涘害鏉¢鑹�
                     ThumbImagePath = "MusicIcon/progressIcon.png",//杩涘害鏉℃寜閽浘鏍�
-                    ThumbImageHeight = Application.GetMinRealAverage(54),//杩涘害鏉℃寜閽浘鏍囩殑楂樺害锛堥粯璁ゆ鏂瑰舰锛氬鍜岄珮涓�鏍凤級
-                    SeekBarViewHeight = Application.GetMinRealAverage(8),//杩涘害鏉$殑楂樺害
+                    ThumbImageHeight = Application.GetRealWidth(54),//杩涘害鏉℃寜閽浘鏍囩殑楂樺害锛堥粯璁ゆ鏂瑰舰锛氬鍜岄珮涓�鏍凤級
+                    SeekBarViewHeight = Application.GetRealWidth(8),//杩涘害鏉$殑楂樺害
                     Progress = int.Parse(player.A31PlayStatus.vol),
+                        SeekBarPadding = Application.GetRealWidth(20),
                     //ProgressChangeDelayTime=
                 };
                 volumeFra.AddChidren(volSeekBar);

--
Gitblit v1.8.0