From a499dceb02f181e64956431ed0c682dd7d2ce7d7 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 04 八月 2020 17:45:20 +0800
Subject: [PATCH] 2020-08-04-1

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

diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/View/DialogView.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/View/DialogView.cs
index 3bc6869..c97b330 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/View/DialogView.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/View/DialogView.cs
@@ -15,7 +15,7 @@
             //涓绘帶浠�
             Dialog dialog = new Dialog()
             {
-                BackgroundColor = Color.PopupBackgroundColor,
+                BackgroundColor = MusicColor.PopupBackgroundColor,
             };
             dialog.Show();
             //鐖舵帶浠�
@@ -32,7 +32,7 @@
                 Y = Application.GetRealHeight(187),
                 Width = Application.GetRealWidth(344),
                 Height = Application.GetRealHeight(460),
-                BackgroundColor = Color.WhiteColor,
+                BackgroundColor = MusicColor.WhiteColor,
                 Radius = (uint)Application.GetRealHeight(12),
             };
             frame.AddChidren(dialogFra);
@@ -52,7 +52,7 @@
                 Height = Application.GetRealHeight(20),
                 TextID = StringId.cancelMusic,
                 TextAlignment = TextAlignment.CenterLeft,
-                TextColor = Color.MusicNoTxetColor,
+                TextColor = MusicColor.MusicNoTxetColor,
                 TextSize = TextSize.Text14,
             };
             topFra.AddChidren(cancelnBtn);
@@ -67,7 +67,7 @@
                 Y = Application.GetRealHeight(23),
                 Width = Application.GetRealWidth(152),
                 Height = Application.GetRealHeight(22),
-                TextColor = Color.TextColor,
+                TextColor = MusicColor.TextColor,
                 TextSize = TextSize.Text16,
                 TextAlignment = TextAlignment.Center,
                 TextID = StringId.myList,
@@ -123,7 +123,7 @@
                 RowLayout addFlieRow = new RowLayout
                 {
                     Height = Application.GetRealHeight(78),
-                    LineColor = Color.WhiteColor,
+                    LineColor = MusicColor.WhiteColor,
                     SubViewWidth = Application.GetRealWidth(80),//鏀瑰彉缂栬緫鎺т欢瀹藉害澶氬皯锛�
                 };
                 verticalScrolViewLayout.AddChidren(addFlieRow);
@@ -145,7 +145,7 @@
                     Y = Application.GetRealHeight(29),
                     Width = Application.GetRealWidth(189),
                     Height = Application.GetRealHeight(20),
-                    TextColor = Color.TextColor,
+                    TextColor = MusicColor.TextColor,
                     TextSize = TextSize.Text14,
                     TextAlignment = TextAlignment.CenterLeft,
                     Text = list.ListName,
@@ -155,9 +155,9 @@
                 ///缂栬緫鎺т欢
                 var editBtn = new Button
                 {
-                    BackgroundColor = Color.MusicEditColor,
+                    BackgroundColor = MusicColor.MusicEditColor,
                     Text = Language.StringByID(StringId.editMusic),
-                    TextColor = Color.WhiteColor,
+                    TextColor = MusicColor.WhiteColor,
                     TextSize = TextSize.Text16,
                 };
                 addFlieRow.AddRightView(editBtn);
@@ -188,9 +188,9 @@
                 ///鍒犻櫎鎺т欢
                 var delBtn = new Button
                 {
-                    BackgroundColor = Color.MusicDelColor,
+                    BackgroundColor = MusicColor.MusicDelColor,
                     Text = Language.StringByID(StringId.delMusic),
-                    TextColor = Color.WhiteColor,
+                    TextColor = MusicColor.WhiteColor,
                     TextSize = TextSize.Text16,
                 };
                 addFlieRow.AddRightView(delBtn);
@@ -234,7 +234,7 @@
             //涓绘帶浠�
             Dialog dialog = new Dialog()
             {
-                BackgroundColor = Color.PopupBackgroundColor,
+                BackgroundColor = MusicColor.PopupBackgroundColor,
             };
             dialog.Show();
             //鐖舵帶浠�
@@ -251,7 +251,7 @@
                 Y = Application.GetRealHeight(397),
                 Width = Application.GetRealWidth(344),
                 Height = Application.GetRealHeight(250),
-                BackgroundColor = Color.WhiteColor,
+                BackgroundColor = MusicColor.WhiteColor,
                 Radius = (uint)Application.GetRealHeight(12),
             };
             frame.AddChidren(dialogFra);
@@ -271,7 +271,7 @@
                 Height = Application.GetRealHeight(20),
                 TextID = StringId.cancelMusic,
                 TextAlignment = TextAlignment.CenterLeft,
-                TextColor = Color.MusicNoTxetColor,
+                TextColor = MusicColor.MusicNoTxetColor,
                 TextSize = TextSize.Text14,
             };
             topFra.AddChidren(cancelnBtn);
@@ -286,7 +286,7 @@
                 Y = Application.GetRealHeight(14),
                 Width = Application.GetRealWidth(152),
                 Height = Application.GetRealHeight(22),
-                TextColor = Color.TextColor,
+                TextColor = MusicColor.TextColor,
                 TextSize = TextSize.Text16,
                 TextAlignment = TextAlignment.Center,
                 TextID = StringId.selectedMergence,
@@ -303,7 +303,7 @@
                 Height = Application.GetRealHeight(20),
                 TextID = StringId.confirmMusic,
                 TextAlignment = TextAlignment.CenterRight,
-                TextColor = Color.SelectedColor,
+                TextColor = MusicColor.SelectedColor,
                 TextSize = TextSize.Text14,
             };
             topFra.AddChidren(confirmBtn);
@@ -327,7 +327,7 @@
                 RowLayout PlayRow = new RowLayout
                 {
                     Height = Application.GetRealHeight(50),
-                    LineColor = Color.WhiteColor,
+                    LineColor = MusicColor.WhiteColor,
                     SubViewWidth = Application.GetRealWidth(80),//鏀瑰彉缂栬緫鎺т欢瀹藉害澶氬皯锛�
                 };
                 verticalScrolViewLayout.AddChidren(PlayRow);
@@ -340,7 +340,7 @@
                     Y = Application.GetRealHeight(15),
                     Width = Application.GetRealWidth(150),
                     Height = Application.GetRealHeight(20),
-                    TextColor = Color.TextColor,
+                    TextColor = MusicColor.TextColor,
                     TextSize = TextSize.Text14,
                     TextAlignment = TextAlignment.CenterLeft,
                     Text = NamePlayer(player),
@@ -398,7 +398,7 @@
                     X = Application.GetRealWidth(20),
                     Width = Application.GetRealWidth(304),
                     Height = 1,
-                    BackgroundColor = Color.LineColor,
+                    BackgroundColor = MusicColor.LineColor,
                 };
                 PlayRow.AddChidren(lineBtn);
             }
@@ -490,7 +490,7 @@
                 Y = Application.GetRealHeight(397),
                 Width = Application.GetRealWidth(344),
                 Height = Application.GetRealHeight(250),
-                BackgroundColor = Color.WhiteColor,
+                BackgroundColor = MusicColor.WhiteColor,
                 Radius = (uint)Application.GetRealHeight(12),
             };
             frame.AddChidren(dialogFra);
@@ -510,7 +510,7 @@
                 Height = Application.GetRealHeight(20),
                 TextID = StringId.cancelMusic,
                 TextAlignment = TextAlignment.CenterLeft,
-                TextColor = Color.MusicNoTxetColor,
+                TextColor = MusicColor.MusicNoTxetColor,
                 TextSize = TextSize.Text14,
             };
             topFra.AddChidren(cancelnBtn);
@@ -525,7 +525,7 @@
                 Y = Application.GetRealHeight(14),
                 Width = Application.GetRealWidth(152),
                 Height = Application.GetRealHeight(22),
-                TextColor = Color.TextColor,
+                TextColor = MusicColor.TextColor,
                 TextSize = TextSize.Text16,
                 TextAlignment = TextAlignment.Center,
                 TextID = StringId.readyPlay,
@@ -541,7 +541,7 @@
                 Height = Application.GetRealHeight(20),
                 TextID = StringId.confirmMusic,
                 TextAlignment = TextAlignment.CenterRight,
-                TextColor = Color.SelectedColor,
+                TextColor = MusicColor.SelectedColor,
                 TextSize = TextSize.Text14,
             };
             topFra.AddChidren(confirmBtn);
@@ -561,7 +561,7 @@
                 RowLayout addFlieRow = new RowLayout
                 {
                     Height = Application.GetRealHeight(50),
-                    LineColor = Color.WhiteColor,
+                    LineColor = MusicColor.WhiteColor,
                 };
                 verticalScrolViewLayout.AddChidren(addFlieRow);
 
@@ -573,7 +573,7 @@
                         Y = Application.GetRealHeight(15),
                         Width = Application.GetRealWidth(150),
                         Height = Application.GetRealHeight(20),
-                        TextColor = Color.TextColor,
+                        TextColor = MusicColor.TextColor,
                         TextSize = TextSize.Text14,
                         TextAlignment = TextAlignment.CenterLeft,
                         Text = player.A31PlayStatus.Title,
@@ -596,7 +596,7 @@
                         Y = Application.GetRealHeight(15),
                         Width = Application.GetRealWidth(220)- wText,
                         Height = Application.GetRealHeight(20),
-                        TextColor = Color.MusicNoTxetColor,
+                        TextColor = MusicColor.MusicNoTxetColor,
                         TextSize = TextSize.Text12,
                         TextAlignment = TextAlignment.CenterLeft,
                         Text = "-" + player.A31PlayStatus.Artist.Trim(),
@@ -612,7 +612,7 @@
                         Y = Application.GetRealHeight(15),
                         Width = Application.GetRealWidth(150),
                         Height = Application.GetRealHeight(20),
-                        TextColor = Color.TextColor,
+                        TextColor = MusicColor.TextColor,
                         TextSize = TextSize.Text14,
                         TextAlignment = TextAlignment.CenterLeft,
                         Text = NamePlayer(player),
@@ -653,7 +653,7 @@
                     X = Application.GetRealWidth(20),
                     Width = Application.GetRealWidth(304),
                     Height = 1,
-                    BackgroundColor = Color.LineColor,
+                    BackgroundColor = MusicColor.LineColor,
                 };
                 addFlieRow.AddChidren(lineBtn);
             }
@@ -683,7 +683,7 @@
             //涓绘帶浠�
             Dialog dialog = new Dialog()
             {
-                BackgroundColor = Color.PopupBackgroundColor,
+                BackgroundColor = MusicColor.PopupBackgroundColor,
             };
             dialog.Show();
             //鐖舵帶浠�
@@ -700,7 +700,7 @@
                 Y = Application.GetRealHeight(397),
                 Width = Application.GetRealWidth(344),
                 Height = Application.GetRealHeight(250),
-                BackgroundColor = Color.WhiteColor,
+                BackgroundColor = MusicColor.WhiteColor,
                 Radius = (uint)Application.GetRealHeight(12),
             };
             frame.AddChidren(dialogFra);
@@ -720,7 +720,7 @@
                 Height = Application.GetRealHeight(20),
                 TextID = StringId.cancelMusic,
                 TextAlignment = TextAlignment.CenterLeft,
-                TextColor = Color.MusicNoTxetColor,
+                TextColor = MusicColor.MusicNoTxetColor,
                 TextSize = TextSize.Text14,
             };
             topFra.AddChidren(cancelnBtn);
@@ -735,7 +735,7 @@
                 Y = Application.GetRealHeight(14),
                 Width = Application.GetRealWidth(152),
                 Height = Application.GetRealHeight(22),
-                TextColor = Color.TextColor,
+                TextColor = MusicColor.TextColor,
                 TextSize = TextSize.Text16,
                 TextAlignment = TextAlignment.Center,
                 TextID = StringId.checkTheReleasePlayer,
@@ -753,7 +753,7 @@
                 Height = Application.GetRealHeight(20),
                 TextID = StringId.confirmMusic,
                 TextAlignment = TextAlignment.CenterRight,
-                TextColor = Color.SelectedColor,
+                TextColor = MusicColor.SelectedColor,
                 TextSize = TextSize.Text14,
             };
             topFra.AddChidren(confirmBtn);
@@ -786,7 +786,7 @@
                 RowLayout PlayRow = new RowLayout
                 {
                     Height = Application.GetRealHeight(50),
-                    LineColor = Color.WhiteColor,
+                    LineColor = MusicColor.WhiteColor,
                     SubViewWidth = Application.GetRealWidth(80),//鏀瑰彉缂栬緫鎺т欢瀹藉害澶氬皯锛�
                 };
                 verticalScrolViewLayout.AddChidren(PlayRow);
@@ -799,7 +799,7 @@
                     Y = Application.GetRealHeight(15),
                     Width = Application.GetRealWidth(150),
                     Height = Application.GetRealHeight(20),
-                    TextColor = Color.TextColor,
+                    TextColor = MusicColor.TextColor,
                     TextSize = TextSize.Text14,
                     TextAlignment = TextAlignment.CenterLeft,
                     Text = NamePlayer(player),
@@ -854,7 +854,7 @@
                     X = Application.GetRealWidth(20),
                     Width = Application.GetRealWidth(304),
                     Height = 1,
-                    BackgroundColor = Color.LineColor,
+                    BackgroundColor = MusicColor.LineColor,
                 };
                 PlayRow.AddChidren(lineBtn);
             }
@@ -1184,7 +1184,7 @@
                 Y = Application.GetRealHeight(397-20),
                 Width = Application.GetRealWidth(344),
                 Height = Application.GetRealHeight(250+20),
-                BackgroundColor = Color.WhiteColor,
+                BackgroundColor = MusicColor.WhiteColor,
                 Radius = (uint)Application.GetRealHeight(12),
             };
             frame.AddChidren(dialogFra);
@@ -1205,7 +1205,7 @@
                 Height = Application.GetRealHeight(20),
                 TextID = StringId.cancelMusic,
                 TextAlignment = TextAlignment.CenterLeft,
-                TextColor = Color.MusicNoTxetColor,
+                TextColor = MusicColor.MusicNoTxetColor,
                 TextSize = TextSize.Text14,
             };
             topFra.AddChidren(cancelnBtn);
@@ -1216,7 +1216,7 @@
                 Y = Application.GetRealHeight(14),
                 Width = Application.GetRealWidth(152),
                 Height = Application.GetRealHeight(22),
-                TextColor = Color.TextColor,
+                TextColor = MusicColor.TextColor,
                 TextSize = TextSize.Text16,
                 TextAlignment = TextAlignment.Center,
                 TextID = StringId.volumeAdjustment,
@@ -1232,7 +1232,7 @@
                 Height = Application.GetRealHeight(20),
                 TextID = StringId.confirmMusic,
                 TextAlignment = TextAlignment.CenterRight,
-                TextColor = Color.SelectedColor,
+                TextColor = MusicColor.SelectedColor,
                 TextSize = TextSize.Text14,
             };
             topFra.AddChidren(confirmBtn);
@@ -1268,7 +1268,7 @@
                 Y = Application.GetRealHeight(8),
                 Width = Application.GetRealWidth(200),
                 Height = Application.GetRealHeight(14),
-                TextColor = Color.MusicNoTxetColor,
+                TextColor = MusicColor.MusicNoTxetColor,
                 TextSize = TextSize.Text10,
                 TextAlignment = TextAlignment.CenterLeft,
                 Text = Language.StringByID(StringId.totalVolume),
@@ -1282,7 +1282,7 @@
                 Height = Application.GetRealHeight(54),//杩涘害鏉$埗鎺т欢鑳屾櫙楂樺害
                 IsProgressTextShow = false,//鏄剧ず鐧惧垎姣�
                 IsClickable = true,//杩涘害鏉℃槸鍚︽粦鍔�
-                ProgressBarColor = Color.SelectedColor,//閫変腑杩涘害鏉¢鑹�
+                ProgressBarColor = MusicColor.SelectedColor,//閫変腑杩涘害鏉¢鑹�
                 ThumbImagePath = "MusicIcon/progressIcon.png",//杩涘害鏉℃寜閽浘鏍�
                 ThumbImageHeight = Application.GetMinRealAverage(54),//杩涘害鏉℃寜閽浘鏍囩殑楂樺害锛堥粯璁ゆ鏂瑰舰锛氬鍜岄珮涓�鏍凤級
                 SeekBarViewHeight = Application.GetMinRealAverage(8),//杩涘害鏉$殑楂樺害
@@ -1297,7 +1297,7 @@
                 Y = Application.GetRealHeight(31),
                 Width = Application.GetRealWidth(26 + 15),
                 Height = Application.GetRealHeight(17),
-                TextColor = Color.MusicNoTxetColor,
+                TextColor = MusicColor.MusicNoTxetColor,
                 TextSize = TextSize.Text12,
                 TextAlignment = TextAlignment.CenterLeft,
                 Text = totalVolSeekBar.Progress.ToString() + "%",
@@ -1328,7 +1328,7 @@
                     Y = Application.GetRealHeight(8),
                     Width = Application.GetRealWidth(200),
                     Height = Application.GetRealHeight(14),
-                    TextColor = Color.MusicNoTxetColor,
+                    TextColor = MusicColor.MusicNoTxetColor,
                     TextSize = TextSize.Text10,
                     TextAlignment = TextAlignment.CenterLeft,
                     Text = player.Name + Language.StringByID(StringId.volumeMusic),
@@ -1344,7 +1344,7 @@
                     Height = Application.GetRealHeight(54),//杩涘害鏉$埗鎺т欢鑳屾櫙楂樺害
                     IsProgressTextShow = false,//鏄剧ず鐧惧垎姣�
                     IsClickable = true,//杩涘害鏉℃槸鍚︽粦鍔�
-                    ProgressBarColor = Color.SelectedColor,//閫変腑杩涘害鏉¢鑹�
+                    ProgressBarColor = MusicColor.SelectedColor,//閫変腑杩涘害鏉¢鑹�
                     ThumbImagePath = "MusicIcon/progressIcon.png",//杩涘害鏉℃寜閽浘鏍�
                     ThumbImageHeight = Application.GetMinRealAverage(54),//杩涘害鏉℃寜閽浘鏍囩殑楂樺害锛堥粯璁ゆ鏂瑰舰锛氬鍜岄珮涓�鏍凤級
                     SeekBarViewHeight = Application.GetMinRealAverage(8),//杩涘害鏉$殑楂樺害
@@ -1359,7 +1359,7 @@
                     Y = Application.GetRealHeight(31),
                     Width = Application.GetRealWidth(26+15),
                     Height = Application.GetRealHeight(17),
-                    TextColor = Color.MusicNoTxetColor,
+                    TextColor = MusicColor.MusicNoTxetColor,
                     TextSize = TextSize.Text12,
                     TextAlignment = TextAlignment.CenterLeft,
                     Text = player.A31PlayStatus.vol + "%",

--
Gitblit v1.8.0