From 0891d90cd0d435338cc2851fd0830cd318a17fff Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 23 十二月 2020 14:25:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/WJC' into NewFilePath

---
 HDL_ON/UI/UI2/FuntionControlView/Music/View/MusicView.cs |   38 +++++++++++++++++++-------------------
 1 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/View/MusicView.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/View/MusicView.cs
old mode 100644
new mode 100755
index 18b724a..cb68d38
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/View/MusicView.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/View/MusicView.cs
@@ -22,7 +22,7 @@
             Y = Application.GetRealHeight(12),
             Height = Application.GetRealHeight(139),
             Width = Application.GetRealWidth(375 - 16 * 2),
-            BackgroundColor = Color.WhiteColor,
+            BackgroundColor = MusicColor.WhiteColor,
             Radius= (uint)Application.GetRealHeight(12),
         };
         /// <summary>
@@ -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>
@@ -45,7 +45,7 @@
             Y = Application.GetRealHeight(18),
             Width = Application.GetRealWidth(70),
             Height = Application.GetRealHeight(25),
-            BackgroundColor = Color.ViewColor,
+            BackgroundColor = MusicColor.ViewColor,
             Radius = (uint)Application.GetRealHeight(12),
         };
         /// <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>
@@ -69,7 +69,7 @@
             Y = Application.GetRealHeight(18 + 4),
             Width = Application.GetRealWidth(24+3+5),
             Height = Application.GetRealHeight(17),
-            TextColor = Color.TextColor,
+            TextColor = MusicColor.TextColor,
             TextSize=TextSize.Text12,
 
         };
@@ -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",
         };
@@ -94,7 +94,7 @@
             Y = Application.GetRealHeight(12),
             Width = Application.GetRealWidth(140),
             Height = Application.GetRealHeight(20),
-            TextColor = Color.MusicTxet14Color,
+            TextColor = MusicColor.MusicTxet14Color,
             TextSize = TextSize.Text14,
             TextAlignment = TextAlignment.CenterLeft,
         };
@@ -107,7 +107,7 @@
             Y = Application.GetRealHeight(36),
             Width = Application.GetRealWidth(120),
             Height = Application.GetRealHeight(14),
-            TextColor = Color.MusicNoTxetColor,
+            TextColor = MusicColor.MusicNoTxetColor,
             TextSize = TextSize.Text10,
             TextAlignment = TextAlignment.CenterLeft,
 
@@ -121,7 +121,7 @@
             Y = Application.GetRealHeight(40),//58
             Width = Application.GetRealWidth(140),
             Height = Application.GetRealHeight(17),
-            TextColor = Color.TextCancelColor,
+            TextColor = MusicColor.TextCancelColor,
             TextSize = TextSize.Text12,
             TextAlignment = TextAlignment.CenterLeft,
         };
@@ -135,7 +135,7 @@
             Y = Application.GetRealHeight(61),//79
             Width = Application.GetRealWidth(120),
             Height = Application.GetRealHeight(14),
-            TextColor = Color.MusicNoTxetColor,
+            TextColor = MusicColor.MusicNoTxetColor,
             TextSize = TextSize.Text10,
             TextAlignment = TextAlignment.CenterLeft,
 
@@ -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",
         };

--
Gitblit v1.8.0