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/MyListView.cs      |   10 
 HDL_ON/UI/UI2/FuntionControlView/Music/View/PlayView.cs        |   18 
 HDL_ON/UI/UI2/FuntionControlView/Music/A31Radio.cs             |   10 
 HDL_ON/UI/UI2/FuntionControlView/Music/View/DialogView.cs      |   90 ++--
 HDL_ON/UI/UI2/FuntionControlView/Music/SendMethod.cs           |   18 
 HDL_ON/UI/UI2/FuntionControlView/Music/View/TipView.cs         |   56 +-
 HDL_ON/UI/UI2/FuntionControlView/Music/View/SongView.cs        |   12 
 HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicSourcePage.cs   |   11 
 HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs     |  216 +++++-------
 HDL_ON/UI/UI2/FuntionControlView/Music/View/MusicView.cs       |   14 
 HDL_ON/UI/UI2/FuntionControlView/Music/A31LocalMusicList.cs    |   68 ---
 HDL_ON/UI/UI2/FuntionControlView/Music/View/SizeClass.cs       |    2 
 .vs/HDL_APP_Project/xs/sqlite3/storage.ide                     |    0 
 .vs/HDL_APP_Project/xs/UserPrefs.xml                           |   26 -
 HDL_ON/UI/UI2/FuntionControlView/Music/A31USBMusicList.cs      |   67 ---
 HDL_ON/UI/UI2/FuntionControlView/Music/UpdateThread.cs         |  149 ++++++++
 HDL_ON/UI/UI2/FuntionControlView/Music/A31MyList.cs            |   18 
 HDL_ON/UI/UI2/FuntionControlView/Music/A31LoveMusicList.cs     |   49 --
 HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicModel.cs        |    1 
 HDL_ON/UI/UI2/FuntionControlView/Music/View/MusicSourceView.cs |   12 
 HDL_ON/UI/UI2/FuntionControlView/Music/View/TopView.cs         |    6 
 HDL_ON/UI/UI2/FuntionControlView/Music/A31MyListMusic.cs       |   82 ----
 HDL_ON/UI/UI2/FuntionControlView/Music/A31LoveList.cs          |    8 
 HDL_ON/UI/UI2/FuntionControlView/Music/A31LoveRadioList.cs     |   10 
 HDL_ON/UI/UI2/FuntionControlView/Music/A31RadioList.cs         |   10 
 HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs            |    3 
 26 files changed, 403 insertions(+), 563 deletions(-)

diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index b4945c4..773ff27 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,16 +1,6 @@
-锘�<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
-  <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008020-001674E61438002E" />
-  <MonoDevelop.Ide.Workbench ActiveDocument="HDL-ON_iOS/ViewController.cs">
-    <Files>
-      <File FileName="HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs" Line="9" Column="29" />
-      <File FileName="HDL-ON_iOS/Info.plist" />
-      <File FileName="HDL-ON_iOS/AppDelegate.cs" Line="26" Column="40" />
-      <File FileName="HDL-ON_iOS/ViewController.cs" Line="37" Column="1" />
-      <File FileName="HDL-ON_iOS/ViewControllerBase.cs" Line="122" Column="43" />
-      <File FileName="HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs" Line="293" Column="30" />
-      <File FileName="HDL_ON/UI/MainPage.cs" Line="10" Column="33" />
-      <File FileName="HDL-ON_iOS/Main.cs" Line="1" Column="1" />
-    </Files>
+锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
+  <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.D4411691-F5B8-40F4-97C1-964F33115DBC" />
+  <MonoDevelop.Ide.Workbench>
     <Pads>
       <Pad Id="ProjectPad">
         <State name="__root__">
@@ -18,15 +8,11 @@
             <Node name="HDL_ON" expanded="True">
               <Node name="UI" expanded="True">
                 <Node name="UI2" expanded="True">
-                  <Node name="FuntionControlView" expanded="True">
-                    <Node name="Music" expanded="True" />
-                  </Node>
+                  <Node name="FuntionControlView" expanded="True" />
                 </Node>
               </Node>
             </Node>
-            <Node name="HDL-ON_iOS" expanded="True">
-              <Node name="ViewController.cs" selected="True" />
-            </Node>
+            <Node name="HDL-ON_iOS" expanded="True" />
           </Node>
         </State>
       </Pad>
@@ -38,7 +24,7 @@
     </Pads>
   </MonoDevelop.Ide.Workbench>
   <MonoDevelop.Ide.DebuggingService.PinnedWatches />
-  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
+  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
   <MonoDevelop.Ide.ItemProperties.HDL-ON__Android AndroidDesignerPreferredTheme="AppTheme" PreferredExecutionTarget="Android.5c86e4357d63" />
   <MonoDevelop.Ide.DebuggingService.Breakpoints>
     <BreakpointStore />
diff --git a/.vs/HDL_APP_Project/xs/sqlite3/storage.ide b/.vs/HDL_APP_Project/xs/sqlite3/storage.ide
index 6268f4b..803cd08 100644
--- a/.vs/HDL_APP_Project/xs/sqlite3/storage.ide
+++ b/.vs/HDL_APP_Project/xs/sqlite3/storage.ide
Binary files differ
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/A31LocalMusicList.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/A31LocalMusicList.cs
index b399c33..89c9543 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/A31LocalMusicList.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/A31LocalMusicList.cs
@@ -17,7 +17,7 @@
         public void Show()
         {
             #region   鐣岄潰甯冨眬------
-            this.BackgroundColor = Color.ViewColor;
+            this.BackgroundColor = MusicColor.ViewColor;
             var topView = new TopView();
             this.AddChidren(topView.TopFLayoutView());
             topView.topNameBtn.TextID = StringId.localMusic;
@@ -27,13 +27,14 @@
             };
              middViewLayout = new VerticalRefreshLayout
             {
-                BackgroundColor = Color.WhiteColor,
+                BackgroundColor = MusicColor.WhiteColor,
                 Y = topView.fLayout.Bottom,
                 Height = Application.GetRealHeight(H_W.H - H_W.T_Height),
             };
             this.AddChidren(middViewLayout);
             middViewLayout.BeginHeaderRefreshingAction += () =>
             {
+                MusicView();
                 middViewLayout.EndHeaderRefreshing();
             };
             #endregion
@@ -45,68 +46,7 @@
         public void MusicView()
         {
             middViewLayout.RemoveAll();
-            for (int i = 0; i < MusicInfo.MusicInfoList.Count; i++)
-            {
-                var songs = MusicInfo.MusicInfoList[i];
-                if (songs == null)
-                {
-                    continue;
-                }
-                songs.URL = "http://" + new Shared.Net.NetWiFi().IpAddress + ":" + com.hdl.on.Server.Port + "/" + songs.ID;
-                View.SongView songView = new View.SongView();
-                songView.SongFrameLayout(middViewLayout,songs);
-                //娣诲姞鍠滅埍闊充箰鎺т欢
-                songView.loveIcon.MouseUpEventHandler += (sender, e) =>
-                {
-                    songView.loveIcon.IsSelected = !songView.loveIcon.IsSelected;
-                    if (songView.loveIcon.IsSelected)
-                    {
-                        ///鏌ユ壘闊充箰鏄惁瀛樺湪鍦ㄥ垪琛�
-                        var music1 = A31MusicModel.Current.LoveMusicInfoList.Find((m) => m.URL == songs.URL);
-                        if (music1 == null)
-                        {
-                            ///娌℃湁瀛樺湪灏辨坊鍔�
-                            A31MusicModel.Current.LoveMusicInfoList.Add(songs);
-                        }
-                    }
-                    else
-                    {
-                        ///鏌ユ壘闊充箰鏄惁瀛樺湪鍦ㄥ垪琛�
-                        var music1 = A31MusicModel.Current.LoveMusicInfoList.Find((m) => m.URL == songs.URL);
-                        if (music1 != null)
-                        {
-                            ///瀛樺湪灏卞垹闄�
-                            A31MusicModel.Current.LoveMusicInfoList.Remove(songs);
-                        }
-
-                    }
-                    A31MusicModel.Save();
-                };
-                //娣诲姞鍒版垜鐨勫垪琛�
-                songView.addIcon.MouseUpEventHandler = (sender, e) =>
-                {
-                    new View.DialogView { }.FieListView(songs);
-                };
-                ///鐐瑰嚮鎾斁浜嬩欢
-                songView.clickBtn.MouseUpEventHandler += (sender, e) =>
-                {
-                    System.Threading.Tasks.Task.Run(() =>
-                    {
-                        System.Threading.Thread.Sleep(50);
-                        Application.RunOnMainThread(() =>
-                        {
-                            //绉婚櫎鐣岄潰
-                            A31MusicModel.Current.A31PlayStatus.Title = songView.songBtn.Text;
-                            MainPage.BasePageView.RemoveViewByTag("Music");
-                            System.Threading.Tasks.Task.Run(() =>
-                            {
-                               SendMethod.PushList(songs, Language.StringByID(StringId.localMusic), MusicInfo.MusicInfoList,A31MusicModel.Current);
-                            });
-                        });
-                    });
-                };
-
-            }
+            UI2.FuntionControlView.Music.UpdateThread.playMusuc(middViewLayout, "鏈湴闊充箰", Language.StringByID(StringId.localMusic), MusicInfo.MusicInfoList, A31MusicModel.Current);
         }
         /// <summary>
         /// 瀹氭椂鏇存柊褰撳墠鎾斁闊充箰
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/A31LoveList.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/A31LoveList.cs
index f20602e..47dff85 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/A31LoveList.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/A31LoveList.cs
@@ -15,7 +15,7 @@
         public void Show()
         {
             #region   鐣岄潰甯冨眬------
-            this.BackgroundColor = Color.ViewColor;
+            this.BackgroundColor = MusicColor.ViewColor;
             var topView = new TopView();
             this.AddChidren(topView.TopFLayoutView());
             topView.topNameBtn.TextID = StringId.myLove;
@@ -40,7 +40,7 @@
 
             middViewLayout = new VerticalScrolViewLayout
             {
-                BackgroundColor = Color.WhiteColor,
+                BackgroundColor = MusicColor.WhiteColor,
                 Y = topView.fLayout.Bottom,
                 Height = Application.GetRealHeight(H_W.H - H_W.T_Height),
             };
@@ -58,7 +58,7 @@
                 RowLayout addFlieRow = new RowLayout
                 {
                     Height = Application.GetRealHeight(104),
-                    LineColor = Color.WhiteColor,
+                    LineColor = MusicColor.WhiteColor,
                     SubViewWidth = Application.GetRealWidth(90),//鏀瑰彉缂栬緫鎺т欢瀹藉害澶氬皯锛�
                 };
                 middViewLayout.AddChidren(addFlieRow);
@@ -92,7 +92,7 @@
                     Y = Application.GetRealHeight(42),
                     Width = Application.GetRealWidth(217),
                     Height = Application.GetRealHeight(20),
-                    TextColor = Color.TextColor,
+                    TextColor = MusicColor.TextColor,
                     TextSize = TextSize.Text14,
                     TextAlignment = TextAlignment.CenterLeft,
                 };
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/A31LoveMusicList.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/A31LoveMusicList.cs
index 8bb1a62..e0a95e1 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/A31LoveMusicList.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/A31LoveMusicList.cs
@@ -21,7 +21,7 @@
         {
             #region   鐣岄潰甯冨眬------
 
-            this.BackgroundColor = Color.ViewColor;
+            this.BackgroundColor = MusicColor.ViewColor;
             var topView = new TopView();
             this.AddChidren(topView.TopFLayoutView());
             topView.topNameBtn.TextID = StringId.myLove;//a31Music;
@@ -31,7 +31,7 @@
             };
             middViewLayout = new VerticalRefreshLayout
             {
-                BackgroundColor = Color.WhiteColor,
+                BackgroundColor = MusicColor.WhiteColor,
                 Y = topView.fLayout.Bottom,
                 Height = Application.GetRealHeight(H_W.H - H_W.T_Height),
             };
@@ -49,50 +49,7 @@
         public void MusicView(string listName)
         {
             middViewLayout.RemoveAll();
-            for (int i = 0; i < A31MusicModel.Current.LoveMusicInfoList.Count; i++)
-            {
-                var songs = A31MusicModel.Current.LoveMusicInfoList[i];
-                View.SongView songView = new View.SongView();
-                songView.SongFrameLayout(middViewLayout, songs);
-                //娣诲姞鏀惰棌
-                songView.loveIcon.MouseUpEventHandler += (sender, e) =>
-                {
-                    var music= A31MusicModel.Current.LoveMusicInfoList.Find((m) => m.URL == songs.URL);
-                    if (music!= null)
-                    {
-                        ///瀛樺湪灏卞垹闄�
-                        A31MusicModel.Current.LoveMusicInfoList.Remove(music);
-                    }
-                    A31MusicModel.Save();
-                    songView.musicViewFl.RemoveFromParent();
-                };
-                //娣诲姞鍒版垜鐨勫垪琛�
-                songView.addIcon.MouseUpEventHandler = (sender, e) =>
-                {
-                    new View.DialogView { }.FieListView(songs);
-                };
-                ///鐐瑰嚮鎾斁浜嬩欢
-                songView.clickBtn.MouseUpEventHandler += (sender, e) =>
-                {
-
-                    System.Threading.Tasks.Task.Run(() =>
-                    {
-                        System.Threading.Thread.Sleep(50);
-                        Application.RunOnMainThread(() =>
-                        {
-                            //绉婚櫎鐣岄潰
-                            A31MusicModel.Current.A31PlayStatus.Title = songView.songBtn.Text;
-                            MainPage.BasePageView.RemoveViewByTag("Music");
-                            System.Threading.Tasks.Task.Run(() =>
-                            {
-                               SendMethod.PushList(songs, listName, A31MusicModel.Current.LoveMusicInfoList,A31MusicModel.Current);
-                            });
-                        });
-                    });
-
-                };
-
-            }
+            UI2.FuntionControlView.Music.UpdateThread.playMusuc(middViewLayout, "鎴戠殑鏈�鐖�", listName, A31MusicModel.Current.LoveMusicInfoList, A31MusicModel.Current);
         }
         /// <summary>
         /// 瀹氭椂鏇存柊褰撳墠鎾斁闊充箰
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/A31LoveRadioList.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/A31LoveRadioList.cs
index 4bfffa5..5767ca5 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/A31LoveRadioList.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/A31LoveRadioList.cs
@@ -20,7 +20,7 @@
         {
             #region   鐣岄潰甯冨眬------
 
-            this.BackgroundColor = Color.ViewColor;
+            this.BackgroundColor = MusicColor.ViewColor;
             var topView = new TopView();
             this.AddChidren(topView.TopFLayoutView());
             topView.topNameBtn.TextID = StringId.radioLove;
@@ -43,7 +43,7 @@
             };
             middViewLayout = new VerticalRefreshLayout
             {
-                BackgroundColor = Color.WhiteColor,
+                BackgroundColor = MusicColor.WhiteColor,
                 Y = topView.fLayout.Bottom,
                 Height = Application.GetRealHeight(H_W.H - H_W.T_Height),
             };
@@ -92,7 +92,7 @@
                     Y = Application.GetRealHeight(23),
                     Width = Application.GetRealWidth(250),
                     Height = Application.GetRealHeight(22),
-                    TextColor = Color.MusicTxet14Color,
+                    TextColor = MusicColor.MusicTxet14Color,
                     TextSize = TextSize.Text16,
                     TextAlignment = TextAlignment.CenterLeft,
                     Tag = radioInfo.URL,
@@ -173,11 +173,11 @@
                                 var songNameBtn = (Button)view.GetChildren(1);//鐩存帴FrameLayout鐖舵帶浠舵壘鍒拌鎺т欢Button
                                 if (A31MusicModel.Current.A31PlayStatus.Title == songNameBtn.Text.ToString())
                                 {
-                                    songNameBtn.TextColor = Color.SelectedColor;
+                                    songNameBtn.TextColor = MusicColor.SelectedColor;
                                 }
                                 else
                                 {
-                                    songNameBtn.TextColor = Color.MusicTxet14Color;
+                                    songNameBtn.TextColor = MusicColor.MusicTxet14Color;
                                 }
 
 
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicModel.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicModel.cs
index d2b6715..69ebfbe 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicModel.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicModel.cs
@@ -51,7 +51,6 @@
         /// 绉婚櫎涔嬪墠鐨勭嚎绋�
         /// </summary>
         public static void RemoveListThread() {
-            var threads = updataMusicStatesListThread.FindAll((obj) => { return obj.Name == "A31"; });
             for (int i = 0; i < updataMusicStatesListThread.Count;)
             {
                 try
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicSourcePage.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicSourcePage.cs
index 042bf25..01344a2 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicSourcePage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicSourcePage.cs
@@ -15,7 +15,7 @@
         public void Show()
         {
             #region   鐣岄潰甯冨眬------
-            this.BackgroundColor = Color.ViewColor;
+            this.BackgroundColor = MusicColor.ViewColor;
             var topView = new TopView();
             this.AddChidren(topView.TopFLayoutView());
             topView.topNameBtn.TextID = StringId.set;
@@ -41,7 +41,7 @@
             View.MusicSourceView musicIfonView = new View.MusicSourceView();
             musicIfonView.fLayout.Height = Application.GetRealHeight(44);
             musicIfonView.textBtn.TextID = StringId.information;
-            musicIfonView.textBtn.TextColor = Color.SelectedColor;
+            musicIfonView.textBtn.TextColor = MusicColor.SelectedColor;
             musicIfonView.textBtn.TextSize = TextSize.Text16;
             musicIfonView.inputTextBtn.Visible = false;
             musicIfonView.nextLevelBtn.Visible = false;
@@ -67,13 +67,12 @@
             areaText.nextLevelBtn.Width = Application.GetMinRealAverage(16);
             areaText.nextLevelBtn.Height = Application.GetMinRealAverage(16);
             areaText.nextLevelBtn.UnSelectedImagePath = "MusicIcon/sourceNetx.png";
-            areaText.lineBtn.BackgroundColor = Color.WhiteColor;
+            areaText.lineBtn.BackgroundColor = MusicColor.WhiteColor;
             areaText.textBtn.X = Application.GetRealWidth(16);
             areaText.textBtn.TextID = StringId.region;
             areaText.inputTextBtn.Text = A31MusicModel.Current.GetRoomListName();
 
             #endregion
-
 
             #region 姝屽崟锛堟垜鐨勬渶鐖� 鎴戠殑鍒楄〃锛�
             FrameLayout fL2 = new FrameLayout
@@ -86,7 +85,7 @@
             View.MusicSourceView playListView = new View.MusicSourceView();
             playListView.fLayout.Height = Application.GetRealHeight(44);
             playListView.textBtn.TextID = StringId.playList;
-            playListView.textBtn.TextColor = Color.SelectedColor;
+            playListView.textBtn.TextColor = MusicColor.SelectedColor;
             playListView.textBtn.TextSize = TextSize.Text16;
             playListView.inputTextBtn.Visible = false;
             playListView.nextLevelBtn.Visible = false;
@@ -117,7 +116,7 @@
             View.MusicSourceView selectedSourceView = new View.MusicSourceView();
             selectedSourceView.fLayout.Height = Application.GetRealHeight(44);
             selectedSourceView.textBtn.TextID = StringId.selectedSource;
-            selectedSourceView.textBtn.TextColor = Color.SelectedColor;
+            selectedSourceView.textBtn.TextColor = MusicColor.SelectedColor;
             selectedSourceView.textBtn.TextSize = TextSize.Text16;
             selectedSourceView.inputTextBtn.Visible = false;
             selectedSourceView.nextLevelBtn.Visible = false;
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/A31MyList.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/A31MyList.cs
index 92ce547..f871783 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/A31MyList.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/A31MyList.cs
@@ -13,7 +13,7 @@
         VerticalScrolViewLayout middViewLayout;
         public void Show()
         {
-            this.BackgroundColor = Color.ViewColor;
+            this.BackgroundColor = MusicColor.ViewColor;
             var topView = new TopView();
             this.AddChidren(topView.TopFLayoutView());
             topView.topNameBtn.TextID = StringId.myList;
@@ -65,7 +65,7 @@
 
             middViewLayout = new VerticalScrolViewLayout
             {
-                BackgroundColor = Color.WhiteColor,
+                BackgroundColor = MusicColor.WhiteColor,
                 Y = topView.fLayout.Bottom,
                 Height = Application.GetRealHeight(H_W.H - H_W.T_Height),
             };
@@ -87,7 +87,7 @@
                 RowLayout addFlieRow = new RowLayout
                 {
                     Height = Application.GetRealHeight(104),
-                    LineColor = Color.WhiteColor,
+                    LineColor = MusicColor.WhiteColor,
                     SubViewWidth = Application.GetRealWidth(90),//鏀瑰彉缂栬緫鎺т欢瀹藉害澶氬皯锛�
                 };
                 middViewLayout.AddChidren(addFlieRow);
@@ -157,7 +157,7 @@
                                     //绉婚櫎鐣岄潰
                                     System.Threading.Tasks.Task.Run(() =>
                                     {
-                                       SendMethod.PushList(songs, list.ListName, list.MusicInfoList,A31MusicModel.Current,true);
+                                       SendMethod.PushList(songs, list.ListName, list.MusicInfoList,A31MusicModel.Current, "鎴戠殑鍒楄〃");
                                     });
                                 });
                             });
@@ -173,7 +173,7 @@
                     Y = Application.GetRealHeight(42),
                     Width = Application.GetRealWidth(217),
                     Height = Application.GetRealHeight(20),
-                    TextColor = Color.TextColor,
+                    TextColor = MusicColor.TextColor,
                     TextSize = TextSize.Text14,
                     TextAlignment = TextAlignment.CenterLeft,
                     Text= list.ListName,
@@ -182,9 +182,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);
@@ -212,9 +212,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);
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/A31MyListMusic.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/A31MyListMusic.cs
index e057aba..f55fa85 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/A31MyListMusic.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/A31MyListMusic.cs
@@ -19,7 +19,7 @@
         {
             #region   鐣岄潰甯冨眬------
 
-            this.BackgroundColor = Color.ViewColor;
+            this.BackgroundColor = MusicColor.ViewColor;
             var topView = new TopView();
             this.AddChidren(topView.TopFLayoutView());
             topView.topNameBtn.Text = fileListInfo.ListName;
@@ -29,7 +29,7 @@
             };
             middViewLayout = new VerticalRefreshLayout
             {
-                BackgroundColor = Color.WhiteColor,
+                BackgroundColor = MusicColor.WhiteColor,
                 Y = topView.fLayout.Bottom,
                 Height = Application.GetRealHeight(H_W.H - H_W.T_Height),
             };
@@ -47,83 +47,7 @@
         public void MusicView(FileListInfo fileListInfo)
         {
             middViewLayout.RemoveAll();
-            for (int i = 0; i < fileListInfo.MusicInfoList.Count; i++)
-            {
-                var songs = fileListInfo.MusicInfoList[i];
-                View.SongView songView = new View.SongView();
-                songView.SongFrameLayout(middViewLayout, songs);
-                //娣诲姞鏀惰棌
-                songView.loveIcon.MouseUpEventHandler += (sender, e) =>
-                {
-
-                    songView.loveIcon.IsSelected = !songView.loveIcon.IsSelected;
-                    if (songView.loveIcon.IsSelected)
-                    {
-                        ///鏌ユ壘闊充箰鏄惁瀛樺湪鍦ㄥ垪琛�
-                        var music1 = A31MusicModel.Current.LoveMusicInfoList.Find((m) => m.URL == songs.URL);
-                        if (music1 == null)
-                        {
-                            ///娌℃湁瀛樺湪灏辨坊鍔�
-                            A31MusicModel.Current.LoveMusicInfoList.Add(songs);
-                        }
-                    }
-                    else
-                    {
-                        ///鏌ユ壘闊充箰鏄惁瀛樺湪鍦ㄥ垪琛�
-                        var music1 = A31MusicModel.Current.LoveMusicInfoList.Find((m) => m.URL == songs.URL);
-                        if (music1 != null)
-                        {
-                            ///瀛樺湪灏卞垹闄�
-                            A31MusicModel.Current.LoveMusicInfoList.Remove(songs);
-                        }
-
-                    }
-                    A31MusicModel.Save();
-                };
-                
-                ///鍒犻櫎鎺т欢
-                var delBtn = new Button
-                {
-                    BackgroundColor = Color.MusicDelColor,
-                    Text = Language.StringByID(StringId.delMusic),
-                    TextColor = Color.WhiteColor,
-                    TextSize = TextSize.Text16,
-                };
-                songView.musicViewFl.AddRightView(delBtn);
-                delBtn.MouseUpEventHandler += (sender, e) =>
-                {
-                    fileListInfo.MusicInfoList.Remove(songs);
-                    A31MusicModel.Save();
-                    songView.musicViewFl.RemoveFromParent();
-                };
-                //娣诲姞鍒版垜鐨勫垪琛�
-                songView.addIcon.MouseUpEventHandler = (sender, e) =>
-                {
-                    new View.DialogView { }.FieListView(songs);
-                };
-                ///鐐瑰嚮鎾斁浜嬩欢
-                songView.clickBtn.MouseUpEventHandler += (sender, e) =>
-                {
-
-                    System.Threading.Tasks.Task.Run(() =>
-                    {
-                        System.Threading.Thread.Sleep(50);
-                        Application.RunOnMainThread(() =>
-                        {
-                            //绉婚櫎鐣岄潰
-              
-                            A31MusicModel.Current.A31PlayStatus.Title = songView.songBtn.Text;
-                            MainPage.BasePageView.RemoveViewByTag("Music");
-                            System.Threading.Tasks.Task.Run(() =>
-                            {
-                             SendMethod.PushList(songs, fileListInfo.ListName, fileListInfo.MusicInfoList,A31MusicModel.Current);
-                            });
-                        });
-                    });
-
-                };
-
-            }
+            UI2.FuntionControlView.Music.UpdateThread.playMusuc(middViewLayout,"鎴戠殑鍒楄〃", fileListInfo.ListName, fileListInfo.MusicInfoList, A31MusicModel.Current);
         }
         /// <summary>
         /// 瀹氭椂鏇存柊褰撳墠鎾斁闊充箰
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs
index f06a00d..9a98f45 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs
@@ -11,9 +11,7 @@
         /// <summary>
         /// 褰撳墠瀵硅薄鏋勯�犲嚱鏁�
         /// </summary>
-        public A31PlayMusicPage()
-        {
-        }
+        public A31PlayMusicPage() { }
         /// <summary>
         /// 閲嶅啓RemoveFromParent鏂规硶
         /// </summary>
@@ -38,13 +36,14 @@
         /// new甯冨眬鐣岄潰
         /// </summary>
         View.PlayView playView = new View.PlayView();
-      
+       
         public void Show()
         {
+            
             ///1绉掑畾鏃舵洿鏂扮姸鎬�
             timerUpdateStatus();
             #region   ---鐣岄潰甯冨眬---
-            this.BackgroundColor = Color.ViewColor;
+            this.BackgroundColor = MusicColor.ViewColor;
             var topView = new TopView();
             topView.setBtn.Visible = true;
             this.AddChidren(topView.TopFLayoutView());
@@ -60,8 +59,6 @@
                 a31MusicSourcePage.Show();
                 MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
             };
-
-
             var middLayout = new FrameLayout
             {
                 Y = topView.fLayout.Bottom,
@@ -70,6 +67,8 @@
             this.AddChidren(middLayout);
             ///鍔犺浇鎾斁闊充箰鐣岄潰鐨勬帶浠舵柟娉�
             playView.viewFrameLayout(middLayout);
+            #endregion
+            #region   ---鎺т欢鐨勭偣鍑讳簨浠�---
             //鏀惰棌鍥炬爣浜嬩欢
             playView.collectIconBtn.MouseUpEventHandler += (sender, e) =>
             {
@@ -84,7 +83,6 @@
                 }
 
             };
-            #endregion
             //蹇繘婊戝姩寮硅捣浜嬩欢;
             playView.diyArcSeekBar.OnStopTrackingTouchEvent+= (sender, e) =>
             {
@@ -202,80 +200,19 @@
                 myListView.popFra.MouseUpEventHandler += removeFromParentView;
                 #endregion
                 loading.Start();
-                System.Threading.Tasks.Task.Run(() =>
+                GetMusicList((listName) =>
                 {
-                    string playListName = "List";
-                    string sourceName = "SourceName";
-                    try
-                    {
-                        if (A31MusicModel.Current.A31PlayStatus.Source == "STATION-NETWORK")
-                        {
-                            A31MusicModel.Current.CurrentPlayMusicInfoList = new List<MusicInfo>();
-                            return;
-                        }
-                        if (A31MusicModel.Current.A31PlayStatus.Source == "AIRPLAY")
-                        {
-                            A31MusicModel.Current.CurrentPlayMusicInfoList = new List<MusicInfo>();
-                            return;
-                        }
-                        var playString = SendMethod.GetCurrentPlayList(A31MusicModel.Current);
-                        A31MusicModel.Current.CurrentPlayMusicInfoList = new List<MusicInfo>();
-                        var se = System.Security.SecurityElement.FromString(playString);
-                        while (se.Children != null)
-                        {
-                            se = se.Children[0] as System.Security.SecurityElement;
-                        }
-                        playListName = SecurityElement.FromString(se.Text).SearchForChildByTag("ListName").Text;
-                        sourceName = SecurityElement.FromString(se.Text).SearchForChildByTag("ListInfo").SearchForTextOfTag("SourceName");
-                        foreach (SecurityElement track in SecurityElement.FromString(se.Text).SearchForChildByTag("Tracks").Children)
-                        {
-                            MusicInfo musicInfo = new MusicInfo();
-                            musicInfo.URL = track.SearchForTextOfTag("URL").Replace("&", "&amp;amp;");
-                            var metadata = track.SearchForTextOfTag("Metadata");
-                            musicInfo.SourceName = track.SearchForTextOfTag("Source");
-                            if (string.IsNullOrEmpty(metadata))
-                            {
-                                continue;
-                            }
-                            if (A31MusicModel.IsJson(metadata))
-                            {
-                                var qqSong = Newtonsoft.Json.JsonConvert.DeserializeObject<SendMethod.A31QQSong>(metadata);
-                                musicInfo.Album = qqSong.album;
-                                musicInfo.Title = qqSong.title;
-                                musicInfo.Artist = qqSong.creator;
-                            }
-                            else
-                            {
-                                metadata = metadata.Replace("<?xml version=\"1.0\" encoding=\"UTF-8\"?>", "").Replace("&", "&amp;amp;");
-                                var item = SecurityElement.FromString(metadata).SearchForChildByTag("item");
-                                musicInfo.Title = item.SearchForTextOfTag("dc:title");
-                                musicInfo.Artist = item.SearchForTextOfTag("upnp:artist");
-                                musicInfo.Album = item.SearchForTextOfTag("upnp:album");
-                                musicInfo.Duration = item.SearchForTextOfTag("res");
-                                musicInfo.AlbumId = item.SearchForTextOfTag("song:albumid");
-                            }
-                            A31MusicModel.Current.CurrentPlayMusicInfoList.Add(musicInfo);
-                        }
-                    }
-                    catch { }
-                    finally
-                    {
-                        Application.RunOnMainThread(() =>
-                        {
-                            loading.Hide();
-                            PlayListView(myListView.popFra, myListView.verticalScrolViewLayout, playListName);
-                            UpdateSelectedMusic(myListView.popFra, myListView.verticalScrolViewLayout);
-                        });
-                    }
+                    loading.Hide();
+                    PlayListView(myListView.popFra, myListView.verticalScrolViewLayout, listName);
+                    UpdateSelectedMusic(myListView.popFra, myListView.verticalScrolViewLayout);
                 });
-
+               
             };
             ///闊抽噺鍥炬爣鐐瑰嚮浜嬩欢
             playView.volIconBtn.MouseUpEventHandler += (sender, e) =>
             {
                 if (A31MusicModel.Current.ServerClientType == 1 && A31MusicModel.Current.Slave.slave_list.Count != 0)
                 { ///涓绘挱鏀惧櫒
-                   //new View.DialogView { }.PlayerVolumeView(A31MusicModel.Current);
                     var volumeView = new View.DialogView { };
                     volumeView.PlayerVolumeView(A31MusicModel.Current);
                     volumeView.UpdateVolume();
@@ -350,7 +287,7 @@
                 }
 
             };
-
+            #endregion
         }
         /// <summary>
         /// 瀹氫箟鍏ㄥ眬绾跨▼
@@ -563,24 +500,6 @@
                     playView.playOrderBtn.Enable = false;
                     break;
                 case "BLUETOOTH"://钃濈墮
-                    playView.loveBtn.Alpha = 0.5f;
-                    playView.loveBtn.Enable = false;
-
-                    playView.playlistBtn.Alpha = 0.5f;
-                    playView.playlistBtn.Enable = false;
-
-                    playView.prevBtn.Alpha = 0.5f;
-                    playView.prevBtn.Enable = false;
-
-                    playView.nextBtn.Alpha = 0.5f;
-                    playView.nextBtn.Enable = false;
-
-                    playView.playOrderBtn.Alpha = 0.5f;
-                    playView.playOrderBtn.Enable = false;
-
-                    break;
-
-
                 case "LINE-IN"://绾胯矾杈撳叆
                     playView.loveBtn.Alpha = 0.5f;
                     playView.loveBtn.Enable = false;
@@ -596,8 +515,8 @@
 
                     playView.playOrderBtn.Alpha = 0.5f;
                     playView.playOrderBtn.Enable = false;
-                    break;
 
+                    break;
                 default:
                     playView.diyArcSeekBar.IsClickable = false;
                     playView.loveBtn.Alpha = 0.5f;
@@ -618,44 +537,13 @@
             }
         }
         /// <summary>
-        /// 鏄剧ず褰撳墠鎾斁闊充箰View
+        /// 鍔犺浇鎾斁闊充箰鍒楄〃View
         /// </summary>
         /// <param name="verticalScrolViewLayout"></param>
         void PlayListView(FrameLayout frameLayout, VerticalRefreshLayout verticalScrolViewLayout, string playListName)
         {
             verticalScrolViewLayout.RemoveAll();
-            int number = 0;
-            for (int i = 0; i < A31MusicModel.Current.CurrentPlayMusicInfoList.Count; i++)
-            {
-                number++;
-                var songs = A31MusicModel.Current.CurrentPlayMusicInfoList[i];
-                View.SongView songView = new View.SongView();
-                songView.SongFrameLayout(verticalScrolViewLayout, songs);
-                songView.loveIcon.Visible = false;
-                songView.addIcon.Visible = false;
-                songView.clickBtn.Width = Application.GetRealWidth(344);
-                songView.clickBtn.Tag = number;//鏍囪鎾斁鍝竴棣栨瓕鏇�
-                ///鐐瑰嚮鎾斁浜嬩欢
-                songView.clickBtn.MouseUpEventHandler += (sender, e) =>
-                {
-                    System.Threading.Tasks.Task.Run(() =>
-                    {
-                        System.Threading.Thread.Sleep(50);
-                        Application.RunOnMainThread(() =>
-                        {
-                            //绉婚櫎鐣岄潰
-                            frameLayout.RemoveFromParent();
-                            A31MusicModel.Current.A31PlayStatus.Title = songView.songBtn.Text;
-                            System.Threading.Tasks.Task.Run(() =>
-                            {
-                                SendMethod.ListMusicPlay(playListName, songView.clickBtn.Tag, A31MusicModel.Current);
-                            });
-                        });
-                    });
-
-                };
-
-            }
+            UI2.FuntionControlView.Music.UpdateThread.playMusuc(verticalScrolViewLayout,"鎾斁鍒楄〃", playListName, A31MusicModel.Current.CurrentPlayMusicInfoList,A31MusicModel.Current,frameLayout);
         }
         /// <summary>
         /// 瀹氭椂鏇存柊褰撳墠鎾斁闊充箰
@@ -664,5 +552,79 @@
         {
             UI2.FuntionControlView.Music.UpdateThread.updateThread(frameLayout, middViewLayout, A31MusicModel.Current);
         }
+        /// <summary>
+        /// 璇诲彇鎾斁闊充箰鍒楄〃
+        /// </summary>
+        /// <param name="action"></param>
+        void GetMusicList(Action<string> action) {
+            System.Threading.Tasks.Task.Run(() =>
+            {
+                string playListName = "List";
+                string sourceName = "SourceName";
+                try
+                {
+                    if (A31MusicModel.Current.A31PlayStatus.Source == "STATION-NETWORK")
+                    {
+                        A31MusicModel.Current.CurrentPlayMusicInfoList = new List<MusicInfo>();
+                        return;
+                    }
+                    if (A31MusicModel.Current.A31PlayStatus.Source == "AIRPLAY")
+                    {
+                        A31MusicModel.Current.CurrentPlayMusicInfoList = new List<MusicInfo>();
+                        return;
+                    }
+                    var playString = SendMethod.GetCurrentPlayList(A31MusicModel.Current);
+                    A31MusicModel.Current.CurrentPlayMusicInfoList = new List<MusicInfo>();
+                    var se = System.Security.SecurityElement.FromString(playString);
+                    while (se.Children != null)
+                    {
+                        se = se.Children[0] as System.Security.SecurityElement;
+                    }
+                    playListName = SecurityElement.FromString(se.Text).SearchForChildByTag("ListName").Text;
+                    sourceName = SecurityElement.FromString(se.Text).SearchForChildByTag("ListInfo").SearchForTextOfTag("SourceName");
+                    foreach (SecurityElement track in SecurityElement.FromString(se.Text).SearchForChildByTag("Tracks").Children)
+                    {
+                        MusicInfo musicInfo = new MusicInfo();
+                        musicInfo.URL = track.SearchForTextOfTag("URL").Replace("&", "&amp;amp;");
+                        var metadata = track.SearchForTextOfTag("Metadata");
+                        musicInfo.SourceName = track.SearchForTextOfTag("Source");
+                        if (string.IsNullOrEmpty(metadata))
+                        {
+                            continue;
+                        }
+                        if (A31MusicModel.IsJson(metadata))
+                        {
+                            var qqSong = Newtonsoft.Json.JsonConvert.DeserializeObject<SendMethod.A31QQSong>(metadata);
+                            musicInfo.Album = qqSong.album;
+                            musicInfo.Title = qqSong.title;
+                            musicInfo.Artist = qqSong.creator;
+                        }
+                        else
+                        {
+                            metadata = metadata.Replace("<?xml version=\"1.0\" encoding=\"UTF-8\"?>", "").Replace("&", "&amp;amp;");
+                            var item = SecurityElement.FromString(metadata).SearchForChildByTag("item");
+                            musicInfo.Title = item.SearchForTextOfTag("dc:title");
+                            musicInfo.Artist = item.SearchForTextOfTag("upnp:artist");
+                            musicInfo.Album = item.SearchForTextOfTag("upnp:album");
+                            musicInfo.Duration = item.SearchForTextOfTag("res");
+                            musicInfo.AlbumId = item.SearchForTextOfTag("song:albumid");
+                        }
+                        A31MusicModel.Current.CurrentPlayMusicInfoList.Add(musicInfo);
+                    }
+                }
+                catch { }
+                finally
+                {
+                    Application.RunOnMainThread(() =>
+                    {
+                        action(playListName);
+                        //loading.Hide();
+                        //PlayListView(myListView.popFra, myListView.verticalScrolViewLayout, playListName);
+                        //UpdateSelectedMusic(myListView.popFra, myListView.verticalScrolViewLayout);
+                    });
+                }
+            });
+
+        }
     }
 }
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/A31Radio.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/A31Radio.cs
index 2776a93..072c1ff 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/A31Radio.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/A31Radio.cs
@@ -20,7 +20,7 @@
         {
             InitList(date);
             #region   鐣岄潰甯冨眬------
-            this.BackgroundColor = Color.ViewColor;
+            this.BackgroundColor = MusicColor.ViewColor;
             var topView = new TopView();
             this.AddChidren(topView.TopFLayoutView());
             topView.topNameBtn.TextID = StringId.radio;
@@ -30,7 +30,7 @@
             };
             middViewLayout = new VerticalRefreshLayout
             {
-                BackgroundColor = Color.WhiteColor,
+                BackgroundColor = MusicColor.WhiteColor,
                 Y = topView.fLayout.Bottom,
                 Height = Application.GetRealHeight(H_W.H - H_W.T_Height),
             };
@@ -55,7 +55,7 @@
                 RowLayout addFlieRow = new RowLayout
                 {
                     Height = Application.GetRealHeight(78),
-                    LineColor = Color.WhiteColor,
+                    LineColor = MusicColor.WhiteColor,
                     SubViewWidth = Application.GetRealWidth(90),//鏀瑰彉缂栬緫鎺т欢瀹藉害澶氬皯锛�
                 };
                 middViewLayout.AddChidren(addFlieRow);
@@ -76,7 +76,7 @@
                     Y = Application.GetRealHeight(29),
                     Width = Application.GetRealWidth(220),
                     Height = Application.GetRealHeight(20),
-                    TextColor = Color.TextColor,
+                    TextColor = MusicColor.TextColor,
                     TextSize = TextSize.Text14,
                     TextAlignment = TextAlignment.CenterLeft,
                     Text = radioInfo.Title,
@@ -107,7 +107,7 @@
                             {
                                 return;
                             }
-                            int startIndex1 = dataString.IndexOf("<body>");
+                            int startIndex1=dataString.IndexOf("<body>");
                             int endIndex1 = dataString.IndexOf("</body>") + "</body>".Length;
                             if (endIndex1 <= startIndex1)
                             {
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/A31RadioList.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/A31RadioList.cs
index b844af0..1379d33 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/A31RadioList.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/A31RadioList.cs
@@ -20,7 +20,7 @@
         {
            
             #region   鐣岄潰甯冨眬------
-            this.BackgroundColor = Color.ViewColor;
+            this.BackgroundColor = MusicColor.ViewColor;
             var topView = new TopView();
             this.AddChidren(topView.TopFLayoutView());
             topView.topNameBtn.Text= listName;
@@ -30,7 +30,7 @@
             };
             middViewLayout = new VerticalRefreshLayout
             {
-                BackgroundColor = Color.WhiteColor,
+                BackgroundColor = MusicColor.WhiteColor,
                 Y = topView.fLayout.Bottom,
                 Height = Application.GetRealHeight(H_W.H - H_W.T_Height),
             };
@@ -83,7 +83,7 @@
                         Y = Application.GetRealHeight(23),
                         Width = Application.GetRealWidth(250),
                         Height = Application.GetRealHeight(22),
-                        TextColor = Color.MusicTxet14Color,
+                        TextColor = MusicColor.MusicTxet14Color,
                         TextSize = TextSize.Text16,
                         TextAlignment = TextAlignment.CenterLeft,
                         Tag = radioInfo.URL,
@@ -176,7 +176,7 @@
                     RowLayout addFlieRow = new RowLayout
                     {
                         Height = Application.GetRealHeight(78),
-                        LineColor = Color.WhiteColor,
+                        LineColor = MusicColor.WhiteColor,
                         SubViewWidth = Application.GetRealWidth(90),//鏀瑰彉缂栬緫鎺т欢瀹藉害澶氬皯锛�
                     };
                     middViewLayout.AddChidren(addFlieRow);
@@ -197,7 +197,7 @@
                         Y = Application.GetRealHeight(29),
                         Width = Application.GetRealWidth(220),
                         Height = Application.GetRealHeight(20),
-                        TextColor = Color.TextColor,
+                        TextColor = MusicColor.TextColor,
                         TextSize = TextSize.Text14,
                         TextAlignment = TextAlignment.CenterLeft,
                         Text = radioInfo.Title,
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/A31USBMusicList.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/A31USBMusicList.cs
index 1fe9556..3faba9c 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/A31USBMusicList.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/A31USBMusicList.cs
@@ -18,7 +18,7 @@
         {
             #region   鐣岄潰甯冨眬------
 
-            this.BackgroundColor = Color.ViewColor;
+            this.BackgroundColor = MusicColor.ViewColor;
             var topView = new TopView();
             this.AddChidren(topView.TopFLayoutView());
             topView.topNameBtn.TextID = StringId.usb;
@@ -28,7 +28,7 @@
             };
             middViewLayout = new VerticalRefreshLayout
             {
-                BackgroundColor = Color.WhiteColor,
+                BackgroundColor = MusicColor.WhiteColor,
                 Y = topView.fLayout.Bottom,
                 Height = Application.GetRealHeight(H_W.H - H_W.T_Height),
             };
@@ -68,68 +68,7 @@
         public void Show()
         {
             middViewLayout.RemoveAll();
-            int number = 0;
-            for (int i = 0; i < A31MusicModel.Current.USBList.Count; i++)
-            {
-                number++;
-                var songs = A31MusicModel.Current.USBList[i];
-                View.SongView songView = new View.SongView();
-                songView.SongFrameLayout(middViewLayout, songs);
-                // 娣诲姞鍠滅埍闊充箰鎺т欢
-                songView.loveIcon.MouseUpEventHandler += (sender, e) =>
-                {
-                    songView.loveIcon.IsSelected = !songView.loveIcon.IsSelected;
-                    if (songView.loveIcon.IsSelected)
-                    {
-                        ///鏌ユ壘闊充箰鏄惁瀛樺湪鍦ㄥ垪琛�
-                        var music1 = A31MusicModel.Current.LoveMusicInfoList.Find((m) => m.URL == songs.URL);
-                        if (music1 == null)
-                        {
-                            ///娌℃湁瀛樺湪灏辨坊鍔�
-                            A31MusicModel.Current.LoveMusicInfoList.Add(songs);
-                        }
-                    }
-                    else
-                    {
-                        ///鏌ユ壘闊充箰鏄惁瀛樺湪鍦ㄥ垪琛�
-                        var music1 = A31MusicModel.Current.LoveMusicInfoList.Find((m) => m.URL == songs.URL);
-                        if (music1 != null)
-                        {
-                            ///瀛樺湪灏卞垹闄�
-                            A31MusicModel.Current.LoveMusicInfoList.Remove(songs);
-                        }
-
-                    }
-                    A31MusicModel.Save();
-                };
-                //娣诲姞鍒版垜鐨勫垪琛�
-                songView.addIcon.MouseUpEventHandler = (sender, e) =>
-                {
-                    new View.DialogView { }.FieListView(songs);
-                };
-                songView.clickBtn.Tag = number;//鏍囪鎾斁鍝竴棣栨瓕鏇�
-                ///鐐瑰嚮鎾斁浜嬩欢
-                songView.clickBtn.MouseUpEventHandler += (sender, e) =>
-                {
-
-                    System.Threading.Tasks.Task.Run(() =>
-                    {
-                        System.Threading.Thread.Sleep(50);
-                        Application.RunOnMainThread(() =>
-                        {
-                            //绉婚櫎鐣岄潰
-                            A31MusicModel.Current.A31PlayStatus.Title = songView.songBtn.Text;
-                            MainPage.BasePageView.RemoveViewByTag("Music");
-                            System.Threading.Tasks.Task.Run(() =>
-                            {
-                                SendMethod.ListMusicPlay("USBDiskQueue", songView.clickBtn.Tag, A31MusicModel.Current);
-                            });
-                        });
-                    });
-
-                };
-
-            }
+            UI2.FuntionControlView.Music.UpdateThread.playMusuc(middViewLayout, "USB", "USBDiskQueue",A31MusicModel.Current.USBList, A31MusicModel.Current);
         }
         /// <summary>
         /// 瀹氭椂鏇存柊褰撳墠鎾斁闊充箰
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs
index 03df9c3..4e9f33b 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs
@@ -65,7 +65,7 @@
         {
 
             #region 鐣岄潰甯冨眬
-            this.BackgroundColor = Color.ViewColor;
+            this.BackgroundColor = MusicColor.ViewColor;
             var topView = new TopView();
             this.AddChidren(topView.TopFLayoutView());
             topView.topNameBtn.TextID =StringId.a31Music;
@@ -234,7 +234,6 @@
             musicView.singerBtn.Text = a31player.A31PlayStatus.Artist;
             musicView.songNameBtn.Text = a31player.A31PlayStatus.Title;
             musicView.musicNameBtn.Text = new View.DialogView { }.NamePlayer(a31player);
-
             if (a31player.IsEnd)
             {
                 musicView.muiscFl.Height = Application.GetRealHeight(12 + 139 + 12);
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/SendMethod.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/SendMethod.cs
index fca24fb..084b6b3 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/SendMethod.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/SendMethod.cs
@@ -209,7 +209,7 @@
                 a31MusicModel.A31PlayStatus.loop = se.SearchForTextOfTag("LoopMode");
                 a31MusicModel.A31PlayStatus.Source = se.SearchForTextOfTag("PlayMedium");
                 a31MusicModel.A31PlayStatus.playSource = se.SearchForTextOfTag("TrackSource");
-                a31MusicModel.A31PlayStatus.TrackURL = se.SearchForTextOfTag("TrackURI");
+                a31MusicModel.A31PlayStatus.TrackURL = se.SearchForTextOfTag("TrackURI").Replace("&", "&amp;amp;"); 
 
             }
             catch (Exception ex)
@@ -520,14 +520,14 @@
             foreach (SecurityElement track in SecurityElement.FromString(se.Text).SearchForChildByTag("Tracks").Children)
             {
                 MusicInfo musicInfo = new MusicInfo();
-                musicInfo.URL = track.SearchForTextOfTag("URL");
+                musicInfo.URL = track.SearchForTextOfTag("URL").Replace("&", "&amp;amp;");
                 var metadata = track.SearchForTextOfTag("Metadata").Replace("&", "&amp;");
                 var item = SecurityElement.FromString(metadata).SearchForChildByTag("item");
-                musicInfo.Title = item.SearchForTextOfTag("dc:title");
-                musicInfo.Artist = item.SearchForTextOfTag("upnp:artist");
-                musicInfo.Album = item.SearchForTextOfTag("upnp:album");
+                musicInfo.Title = item.SearchForTextOfTag("dc:title").Replace("&", "&amp;amp;"); 
+                musicInfo.Artist = item.SearchForTextOfTag("upnp:artist").Replace("&", "&amp;amp;");
+                musicInfo.Album = item.SearchForTextOfTag("upnp:album").Replace("&", "&amp;amp;");
                 musicInfo.Duration = item.SearchForTextOfTag("res");
-                musicInfo.AlbumId = item.SearchForTextOfTag("song:albumid");
+                musicInfo.AlbumId = item.SearchForTextOfTag("song:albumid").Replace("&", "&amp;amp;");
                 musicInfoList.Add(musicInfo);
             }
             return musicInfoList;
@@ -654,7 +654,7 @@
         /// <param name="musicInfo">鎾斁闊充箰</param>
         /// <param name="listName">鍒楄〃鍚嶇О</param>
         /// <param name="musicList">鎺ㄩ�佸垪琛�(榛樿鎺�50棣�)</param>
-        public  static void PushList(MusicInfo musicInfo, string listName, List<MusicInfo> musicList, A31MusicModel a31player,bool bool_listName = false)
+        public  static void PushList(MusicInfo musicInfo, string listName, List<MusicInfo> musicList, A31MusicModel a31player,string musicSource)
         {
 
             //鏈�澶у彂閫佺殑鏉℃暟
@@ -719,7 +719,6 @@
                     tempMusicInfo.URL = "http://" + new Shared.Net.NetWiFi().IpAddress + ":" + com.hdl.on.Server.Port + "/" + tempMusicInfo.ID;
                 }
 
-
                 sb.AppendLine("&lt;Track" + Tracknumber + "&gt;");
                 sb.AppendLine("&lt;URL&gt;" + tempMusicInfo.URL + "&lt;/URL&gt;");
                 sb.AppendLine("&lt;Metadata&gt;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot;?&amp;gt;");
@@ -738,13 +737,12 @@
 
                 sb.AppendLine("&amp;lt;dc:title&amp;gt;" + tempMusicInfo.Title + "&amp;lt;/dc:title&amp;gt;");
                 sb.AppendLine("&amp;lt;dc:creator&amp;gt;DJ Sanny J&amp;lt;/dc:creator&amp;gt;");
-                if (bool_listName) {
+                if (musicSource== "鎴戠殑鍒楄〃") {
                     sb.AppendLine("&amp;lt;upnp:artist&amp;gt;" + listName + "&amp;lt;/upnp:artist&amp;gt;");
                 }
                 else {
                     sb.AppendLine("&amp;lt;upnp:artist&amp;gt;" + tempMusicInfo.Artist + "&amp;lt;/upnp:artist&amp;gt;");
                 }
-
                 sb.AppendLine("&amp;lt;upnp:album&amp;gt;" + tempMusicInfo.Album + "&amp;lt;/upnp:album&amp;gt;");
                 sb.AppendLine("&amp;lt;upnp:albumArtURI&amp;gt;unknown&amp;lt;/upnp:albumArtURI&amp;gt;");
                 sb.AppendLine("&amp;lt;/item&amp;gt;");
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/UpdateThread.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/UpdateThread.cs
index f8baa06..664c342 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/UpdateThread.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/UpdateThread.cs
@@ -21,7 +21,7 @@
             {
                 while (frame.Parent != null)
                 {
-                    A31MusicModel.LogMusic("宸插惎鍔ㄦ洿鏂伴煶涔愬垪琛ㄦ煇涓�鏉￠煶涔愮姸鎬佺殑绾跨▼");
+                    //A31MusicModel.LogMusic("宸插惎鍔ㄦ洿鏂伴煶涔愬垪琛ㄦ煇涓�鏉￠煶涔愮姸鎬佺殑绾跨▼");
                     System.Threading.Thread.Sleep(1000);
                     Application.RunOnMainThread(() =>
                     {
@@ -36,18 +36,18 @@
                                 if (a31MusicModel.A31PlayStatus.TrackURL == songNameBtn.Tag.ToString())
                                 {
                                     volIconBtn.Visible = true;
-                                    songNameBtn.TextColor = UI.Music.Color.SelectedColor;
+                                    songNameBtn.TextColor = UI.Music.MusicColor.SelectedColor;
                                     songNameBtn.X = Application.GetRealWidth(48);
                                     artistNameBtn.X = songNameBtn.Right;
-                                    artistNameBtn.TextColor = UI.Music.Color.SelectedColor;
+                                    artistNameBtn.TextColor = UI.Music.MusicColor.SelectedColor;
                                 }
                                 else
                                 {
                                     volIconBtn.Visible = false;
-                                    songNameBtn.TextColor = UI.Music.Color.MusicTxet14Color;
+                                    songNameBtn.TextColor = UI.Music.MusicColor.MusicTxet14Color;
                                     songNameBtn.X = Application.GetRealWidth(16);
                                     artistNameBtn.X = songNameBtn.Right;
-                                    artistNameBtn.TextColor = UI.Music.Color.MusicNoTxetColor;
+                                    artistNameBtn.TextColor = UI.Music.MusicColor.MusicNoTxetColor;
                                 }
 
 
@@ -60,6 +60,143 @@
             });
             updateSelectedMusicThread.Start();
         }
-       
+        /// <summary>
+        /// 鎾斁闊充箰
+        /// </summary>
+        /// <param name="middViewLayout">涓婁笅鎷夊姩鐖舵帶浠�</param>
+        /// <param name="musicSource">闊充箰婧�</param>
+        /// <param name="listName">鎾斁鍒楄〃鍚�</param>
+        /// <param name="musicList">鎾斁闊充箰鍒楄〃</param>
+        /// <param name="a31MusicModel">闊充箰鎾斁鍣�</param>
+        public static void playMusuc(VerticalRefreshLayout middViewLayout, string musicSource, string listName,List<MusicInfo> musicList, A31MusicModel a31MusicModel, FrameLayout frame=null)
+        {
+            for (int i = 0; i < musicList.Count; i++)
+            {
+                var songs = musicList[i];
+                if (songs == null)
+                {
+                    continue;
+                }
+                UI.Music.View.SongView songView = new UI.Music.View.SongView();
+                songView.SongFrameLayout(middViewLayout, songs);
+                switch (musicSource)
+                {
+                    case "鏈湴闊充箰":
+                        {
+                            songs.URL = "http://" + new Shared.Net.NetWiFi().IpAddress + ":" + com.hdl.on.Server.Port + "/" + songs.ID;
+                        }
+                        break;
+                    case "USB":
+                        {
+                            songView.clickBtn.Tag = i + 1;
+                        }
+                        break;
+                    case "鎴戠殑鍒楄〃":
+                        {
+                            ///鍒犻櫎鎺т欢
+                            var delBtn = new Button
+                            {
+                                BackgroundColor = MusicColor.MusicDelColor,
+                                Text = Language.StringByID(StringId.delMusic),
+                                TextColor = MusicColor.WhiteColor,
+                                TextSize = TextSize.Text16,
+                            };
+                            songView.musicViewFl.AddRightView(delBtn);
+                            delBtn.MouseUpEventHandler += (sender, e) =>
+                            {
+                                musicList.Remove(songs);
+                                A31MusicModel.Save();
+                                songView.musicViewFl.RemoveFromParent();
+                            };
+                        }
+                        break;
+                    case "鎾斁鍒楄〃":
+                        {
+                            songView.loveIcon.Visible = false;
+                            songView.addIcon.Visible = false;
+                            var wText = songView.songBtn.GetTextWidth() + Application.GetRealWidth(15);
+                            if (wText > Application.GetRealWidth(280))
+                            {
+                                wText = Application.GetRealWidth(280);//(姝屾洸+姝屾墜)瀹藉害鏈�澶у�兼椂220
+                            }
+                            songView.songBtn.Width = wText;
+                            songView.singerBtn.X = songView.songBtn.Right;
+                            songView.singerBtn.Width = Application.GetRealWidth(280) - wText;//姝屽悕闀垮害灏忎簬220鎵嶅彲浠ユ樉绀烘瓕鎵嬪嚭鏉�
+                            songView.singerBtn.Text = string.IsNullOrEmpty(songs.Artist) ? "-Unkonw" : "-" + songs.Artist.Trim();
+                            songView.clickBtn.Width = Application.GetRealWidth(344);
+                            songView.clickBtn.Tag = i + 1;//鏍囪鎾斁鍝竴棣栨瓕鏇�
+                        }
+                        break;
+                }
+
+                //娣诲姞鍠滅埍闊充箰鎺т欢
+                songView.loveIcon.MouseUpEventHandler += (sender, e) =>
+                {
+                    songView.loveIcon.IsSelected = !songView.loveIcon.IsSelected;
+                    if (songView.loveIcon.IsSelected)
+                    {
+                        ///鏌ユ壘闊充箰鏄惁瀛樺湪鍦ㄥ垪琛�
+                        var music1 = A31MusicModel.Current.LoveMusicInfoList.Find((m) => m.URL == songs.URL);
+                        if (music1 == null)
+                        {
+                            ///娌℃湁瀛樺湪灏辨坊鍔�
+                            A31MusicModel.Current.LoveMusicInfoList.Add(songs);
+                        }
+                    }
+                    else
+                    {
+                        ///鏌ユ壘闊充箰鏄惁瀛樺湪鍦ㄥ垪琛�
+                        var music1 = A31MusicModel.Current.LoveMusicInfoList.Find((m) => m.URL == songs.URL);
+                        if (music1 != null)
+                        {
+                            ///瀛樺湪灏卞垹闄�
+                            A31MusicModel.Current.LoveMusicInfoList.Remove(songs);
+                        }
+
+                        if (musicSource == "鎴戠殑鏈�鐖�")
+                        {
+                            songView.musicViewFl.RemoveFromParent();
+                        }
+
+                    }
+                    A31MusicModel.Save();
+                };
+                //娣诲姞鍒版垜鐨勫垪琛�
+                songView.addIcon.MouseUpEventHandler = (sender, e) =>
+                {
+                    new HDL_ON.UI.Music.View.DialogView { }.FieListView(songs);
+                };
+                ///鐐瑰嚮鎾斁浜嬩欢
+                songView.clickBtn.MouseUpEventHandler += (sender, e) =>
+                {
+                    System.Threading.Tasks.Task.Run(() =>
+                    {
+                        System.Threading.Thread.Sleep(50);
+                        Application.RunOnMainThread(() =>
+                        {
+                            //绉婚櫎鐣岄潰
+                            A31MusicModel.Current.A31PlayStatus.Title = songView.songBtn.Text;
+                            if (frame != null)
+                            {
+                                frame.RemoveFromParent();
+                            }
+                            MainPage.BasePageView.RemoveViewByTag("Music");
+                            System.Threading.Tasks.Task.Run(() =>
+                            {
+                                if (musicSource == "鏈湴闊充箰"|| musicSource == "鎴戠殑鏈�鐖�"|| musicSource == "鎴戠殑鍒楄〃")
+                                {
+                                    SendMethod.PushList(songs, listName, musicList, a31MusicModel,musicSource);
+                                }
+                                else if (musicSource == "USB"|| musicSource == "鎾斁鍒楄〃")
+                                {
+                                    SendMethod.ListMusicPlay(listName, songView.clickBtn.Tag, A31MusicModel.Current);
+                                }
+                            });
+                        });
+                    });
+                };
+
+            }
+        }
     }
 }
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 + "%",
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/View/MusicSourceView.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/View/MusicSourceView.cs
index 8ca489d..6cb0965 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/View/MusicSourceView.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/View/MusicSourceView.cs
@@ -9,7 +9,7 @@
         /// </summary>
         public FrameLayout fLayout = new FrameLayout
         {
-            BackgroundColor = Color.WhiteColor,
+            BackgroundColor = MusicColor.WhiteColor,
             Height = Application.GetRealHeight(50),
             Width = Application.GetRealWidth(375),
         };
@@ -32,7 +32,7 @@
             Y = Application.GetRealHeight(14),
             Width = Application.GetRealWidth(140),
             Height = Application.GetRealHeight(22),
-            TextColor = Color.TextColor,
+            TextColor = MusicColor.TextColor,
             TextSize = TextSize.Text16,
             TextAlignment = TextAlignment.CenterLeft,
         };
@@ -47,14 +47,14 @@
             Width = Application.GetRealWidth(140),
             Height = Application.GetRealHeight(20),
             TextAlignment=TextAlignment.CenterRight,
-            TextColor = Color.MusicNoTxetColor,
+            TextColor = MusicColor.MusicNoTxetColor,
             TextSize = TextSize.Text14,
         };
 
         /// <summary>
         ///涓嬩竴绾ц彍鍗曞浘鏍�
         /// </summary>
-        public Button nextLevelBtn = new Button
+        public  Button nextLevelBtn = new Button
         {
             X = Application.GetRealWidth(339),
             Y = Application.GetRealHeight(17),
@@ -69,8 +69,8 @@
         public Button lineBtn = new Button
         {
             X = Application.GetRealWidth(16),
-            Width = Application.GetRealWidth(375-16-16),
-            BackgroundColor = Color.LineColor,
+            Width = Application.GetRealWidth(375 - 16 - 16),
+            BackgroundColor = MusicColor.LineColor,
         };
 
         /// <summary>
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/View/MusicView.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/View/MusicView.cs
index 18b724a..7304bb9 100644
--- 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>
@@ -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>
@@ -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,
 
         };
@@ -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,
 
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/View/MyListView.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/View/MyListView.cs
index 982ffc0..a7516e7 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/View/MyListView.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/View/MyListView.cs
@@ -10,7 +10,7 @@
         /// </summary>
         public FrameLayout popFra = new FrameLayout()
         {
-            BackgroundColor = UI.Music.Color.PopupBackgroundColor,
+            BackgroundColor = UI.Music.MusicColor.PopupBackgroundColor,
         };
         /// <summary>
         /// 鏁翠釜鐧借壊鎺т欢鐖�
@@ -21,7 +21,7 @@
             Y = Application.GetRealHeight(187),
             Width = Application.GetRealWidth(344),
             Height = Application.GetRealHeight(460),
-            BackgroundColor = UI.Music.Color.WhiteColor,
+            BackgroundColor = UI.Music.MusicColor.WhiteColor,
             Radius = (uint)Application.GetRealHeight(12),
         };
 
@@ -52,7 +52,7 @@
             Y = Application.GetRealHeight(14),
             Width = Application.GetRealWidth(120),
             Height = Application.GetRealHeight(22),
-            TextColor = UI.Music.Color.TextColor,
+            TextColor = UI.Music.MusicColor.TextColor,
             TextSize = UI.Music.TextSize.Text16,
             TextAlignment = TextAlignment.CenterLeft,
         };
@@ -66,7 +66,7 @@
             Width = Application.GetRealWidth(28 + 12),//28
             Height = Application.GetRealHeight(20),
             TextID = StringId.cancelMusic,
-            TextColor = UI.Music.Color.MusicNoTxetColor,
+            TextColor = UI.Music.MusicColor.MusicNoTxetColor,
             TextSize = UI.Music.TextSize.Text14,
             TextAlignment = TextAlignment.CenterLeft,
         };
@@ -78,7 +78,7 @@
             // Y = topFra.Height - 1,
             Width = Application.GetRealWidth(344),
             //Height = UI.Music.H_W.Line,
-            BackgroundColor = UI.Music.Color.LineColor,
+            BackgroundColor = UI.Music.MusicColor.LineColor,
         };
         /// <summary>
         ///鏄剧ず姝屾洸鍒楄〃鐖舵帶浠�
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/View/PlayView.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/View/PlayView.cs
index 43eaacb..27313be 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/View/PlayView.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/View/PlayView.cs
@@ -24,7 +24,7 @@
             Y = Application.GetRealHeight(16),
             Width = Application.GetRealWidth(100),
             Height = Application.GetRealHeight(33),
-            TextColor = Color.MusicTxet14Color,
+            TextColor = MusicColor.MusicTxet14Color,
             TextSize = TextSize.Text24,
             TextAlignment = TextAlignment.CenterLeft,
             TextID = StringId.a31Music,
@@ -38,7 +38,7 @@
             Y = Application.GetRealHeight(53),
             Width = Application.GetRealWidth(100),
             Height = Application.GetRealHeight(17),
-            TextColor = Color.MusicNoTxetColor,
+            TextColor = MusicColor.MusicNoTxetColor,
             TextSize = TextSize.Text12,
             TextAlignment = TextAlignment.CenterLeft,
             
@@ -85,7 +85,7 @@
         {
             Width = Application.GetMinRealAverage(202),
             Height = Application.GetMinRealAverage(202),
-            ProgressBarColor = Color.SelectedColor,
+            ProgressBarColor = MusicColor.SelectedColor,
             OpenAngle = 0,//寮�鍙ｈ搴�
             ArcWidth = Application.GetRealWidth(4),//杩涘害瀹藉害
             ThumbImagePath = "MusicIcon/thumbImage.png",//杩涘害鏉℃寜閽浘鏍�
@@ -104,7 +104,7 @@
             Y = Application.GetRealHeight(261),
             Width = Application.GetRealWidth(37 + 5),
             Height = Application.GetRealHeight(20),
-            TextColor = Color.TextTimeColor,
+            TextColor = MusicColor.TextTimeColor,
             TextSize = TextSize.Text14,
             TextAlignment = TextAlignment.CenterLeft,
         };
@@ -117,7 +117,7 @@
             Y = Application.GetRealHeight(261),
             Width = Application.GetRealWidth(37 + 5),
             Height = Application.GetRealHeight(20),
-            TextColor = Color.TextTimeColor,
+            TextColor = MusicColor.TextTimeColor,
             TextSize = TextSize.Text14,
             TextAlignment = TextAlignment.CenterRight,
         };
@@ -130,7 +130,7 @@
             Y = Application.GetRealHeight(290),
             Width = Application.GetRealWidth(203),
             Height = Application.GetRealHeight(30),
-            TextColor = Color.TextColor,
+            TextColor = MusicColor.TextColor,
             TextSize = TextSize.Text16,
         };
 
@@ -143,7 +143,7 @@
             Y = Application.GetRealHeight(322),
             Width = Application.GetRealWidth(203),
             Height = Application.GetRealHeight(21),
-            TextColor = Color.MusicNoTxetColor,
+            TextColor = MusicColor.MusicNoTxetColor,
             TextSize = TextSize.Text12,
 
         };
@@ -203,7 +203,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),//杩涘害鏉＄殑楂樺害
@@ -220,7 +220,7 @@
             Width = Application.GetRealWidth(26 + 4),
             Height = Application.GetRealHeight(17),
             Text = "0%",
-            TextColor = Color.MusicNoTxetColor,
+            TextColor = MusicColor.MusicNoTxetColor,
             TextSize = TextSize.Text12,
         };
         /// <summary>
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/View/SizeClass.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/View/SizeClass.cs
index 7c199ee..e2d5c9d 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/View/SizeClass.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/View/SizeClass.cs
@@ -18,7 +18,7 @@
         public static int Text10 = 10;
 
     }
-    public static class Color
+    public static class MusicColor
     {
         /// <summary>
         /// 椤堕儴鑳屾櫙棰滆壊
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/View/SongView.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/View/SongView.cs
index 8c088e6..8be5b91 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/View/SongView.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/View/SongView.cs
@@ -11,7 +11,7 @@
         {
             Width = Application.GetRealWidth(375),
             Height = Application.GetRealHeight(44),
-            LineColor= Color.WhiteColor,
+            LineColor= MusicColor.WhiteColor,
         };
 
         /// <summary>
@@ -37,7 +37,7 @@
             Y = Application.GetRealHeight(11),
             // Width = wText + Application.GetRealWidth(5),
             Height = Application.GetRealHeight(22),
-            TextColor = Color.MusicTxet14Color,
+            TextColor = MusicColor.MusicTxet14Color,
             TextSize = TextSize.Text16,
             TextAlignment = TextAlignment.CenterLeft,
             Name = "song",
@@ -48,9 +48,9 @@
         public Button singerBtn = new Button
         {
             Y = Application.GetRealHeight(11),
-           //Width = Application.GetRealWidth(220) - wText,//姝屽悕闀垮害灏忎簬250鎵嶅彲浠ユ樉绀烘瓕鎵嬪嚭鏉�
+           //Width = Application.GetRealWidth(220) - wText,//姝屽悕闀垮害灏忎簬220鎵嶅彲浠ユ樉绀烘瓕鎵嬪嚭鏉�
             Height = Application.GetRealHeight(22),
-            TextColor = Color.MusicNoTxetColor,
+            TextColor = MusicColor.MusicNoTxetColor,
             TextSize = TextSize.Text12,
             TextAlignment = TextAlignment.CenterLeft,
             //Text =("-" +songs.Artist).Trim(),
@@ -112,11 +112,11 @@
             var wText = songBtn.GetTextWidth() + Application.GetRealWidth(15);
             if (wText > Application.GetRealWidth(220))
             {
-                wText = Application.GetRealWidth(220);//(姝屾洸+姝屾墜)瀹藉害鏈�澶у�兼椂260
+                wText = Application.GetRealWidth(220);//(姝屾洸+姝屾墜)瀹藉害鏈�澶у�兼椂220
             }
             songBtn.Width = wText;
             singerBtn.X = songBtn.Right;
-            singerBtn.Width = Application.GetRealWidth(220) - wText;//姝屽悕闀垮害灏忎簬250鎵嶅彲浠ユ樉绀烘瓕鎵嬪嚭鏉�
+            singerBtn.Width = Application.GetRealWidth(220) - wText;//姝屽悕闀垮害灏忎簬220鎵嶅彲浠ユ樉绀烘瓕鎵嬪嚭鏉�
             singerBtn.Text = string.IsNullOrEmpty(songs.Artist) ? "-Unkonw" : "-" + songs.Artist.Trim();
             var music = A31MusicModel.Current.LoveMusicInfoList.Find((m) => m.URL == songs.URL);
             if (music != null)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/View/TipView.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/View/TipView.cs
index f3ba48c..e92101f 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/View/TipView.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/View/TipView.cs
@@ -29,7 +29,7 @@
         {
             Dialog dialog = new Dialog()
             {
-                BackgroundColor = Color.PopupBackgroundColor,
+                BackgroundColor = MusicColor.PopupBackgroundColor,
             };
 
             FrameLayout whiteView = new FrameLayout()
@@ -39,7 +39,7 @@
                 Y = Application.GetRealHeight(264),
                 Width = Application.GetRealWidth(270),
                 Height = Application.GetRealHeight(172),
-                BackgroundColor = Color.WhiteColor,
+                BackgroundColor = MusicColor.WhiteColor,
                 BorderColor = 0x00000000,
                 BorderWidth = 0,
                 Radius = (uint)Application.GetRealHeight(RradiusFrameLayout),
@@ -52,7 +52,7 @@
                 X=Application.GetRealWidth(35),
                 Height = Application.GetRealHeight(22),
                 Width=Application.GetRealWidth(200),
-                TextColor =Color.SelectedColor,
+                TextColor =MusicColor.SelectedColor,
                 TextSize =TextSize.Text16,
                 TextAlignment = TextAlignment.Center,
                 TextID = titleId,
@@ -67,7 +67,7 @@
                 X=Application.GetRealWidth(24),
                 Width = Application.GetRealWidth(222),
                 Height = Application.GetRealHeight(40),
-                BackgroundColor =Color.ViewColor,
+                BackgroundColor =MusicColor.ViewColor,
                 BorderColor = 0x00000000,
                 BorderWidth = 0,
                 Radius = (uint)Application.GetMinRealAverage(radiusEditFrameLayout),
@@ -81,7 +81,7 @@
                 Width = Application.GetRealWidth(160),
                 Height=Application.GetRealHeight(20),
                 Text = tnputEditTxet,
-                TextColor = Color.TextColor,
+                TextColor = MusicColor.TextColor,
                 TextSize = TextSize.Text14,
                 TextAlignment=TextAlignment.CenterLeft,
           
@@ -106,7 +106,7 @@
             {
                 Y = whiteView.Height-Application.GetRealHeight(44+1),
                 Height = Application.GetRealHeight(1),
-                BackgroundColor =Color.LineColor,
+                BackgroundColor =MusicColor.LineColor,
             };
             whiteView.AddChidren(btnLine);
 
@@ -116,7 +116,7 @@
                 Width = Application.GetRealWidth(135),
                 Height = Application.GetRealHeight(44),
                 TextAlignment = TextAlignment.Center,
-                TextColor = Color.TextCancelColor,
+                TextColor = MusicColor.TextCancelColor,
                 TextSize = TextSize.Text16,
                 TextID = StringId.cancelMusic,
                 Gravity = Gravity.BottomLeft,
@@ -130,11 +130,11 @@
                 Width = Application.GetRealWidth(135),
                 Height = Application.GetRealHeight(44),
                 TextAlignment = TextAlignment.Center,
-                TextColor = Color.WhiteColor,
+                TextColor = MusicColor.WhiteColor,
                 IsBold = true,
                 TextSize = TextSize.Text16,
                 TextID = StringId.confirmMusic,
-                BackgroundColor = Color.SelectedColor,
+                BackgroundColor = MusicColor.SelectedColor,
                 Gravity = Gravity.BottomRight,
             };
             whiteView.AddChidren(btnConfirm);
@@ -177,7 +177,7 @@
                     btnTip.Width = Application.GetRealWidth(222);
                     btnTip.Height = Application.GetRealHeight(17);
                     btnTip.Text = tipMsgString;
-                    btnTip.TextColor = Color.RedColor;
+                    btnTip.TextColor = MusicColor.RedColor;
                     btnTip.TextSize = TextSize.Text12;
                     btnTip.TextAlignment = TextAlignment.CenterLeft;
 
@@ -202,7 +202,7 @@
         {
             Dialog dialog = new Dialog()
             {
-                BackgroundColor = Color.PopupBackgroundColor,
+                BackgroundColor = MusicColor.PopupBackgroundColor,
             };
 
             FrameLayout whiteView = new FrameLayout()
@@ -212,7 +212,7 @@
                 Y = Application.GetRealHeight(264),
                 Width = Application.GetRealWidth(270),
                 Height = Application.GetRealHeight(172),
-                BackgroundColor = Color.WhiteColor,
+                BackgroundColor = MusicColor.WhiteColor,
                 BorderColor = 0x00000000,
                 BorderWidth = 0,
                 Radius = (uint)Application.GetRealHeight(RradiusFrameLayout),
@@ -225,7 +225,7 @@
                 X = Application.GetRealWidth(35),
                 Height = Application.GetRealHeight(22),
                 Width = Application.GetRealWidth(200),
-                TextColor = Color.SelectedColor,
+                TextColor = MusicColor.SelectedColor,
                 TextSize = TextSize.Text16,
                 TextAlignment = TextAlignment.Center,
                 TextID = titleId,
@@ -240,7 +240,7 @@
                 X = Application.GetRealWidth(24),
                 Width = Application.GetRealWidth(222),
                 Height = Application.GetRealHeight(40),
-                BackgroundColor = Color.ViewColor,
+                BackgroundColor = MusicColor.ViewColor,
                 BorderColor = 0x00000000,
                 BorderWidth = 0,
                 Radius = (uint)Application.GetMinRealAverage(radiusEditFrameLayout),
@@ -254,7 +254,7 @@
                 Width = Application.GetRealWidth(160),
                 Height = Application.GetRealHeight(20),
                 Text = tnputEditTxet,
-                TextColor = Color.TextColor,
+                TextColor = MusicColor.TextColor,
                 TextSize = TextSize.Text14,
                 TextAlignment = TextAlignment.CenterLeft,
             };
@@ -278,7 +278,7 @@
             {
                 Y = whiteView.Height - Application.GetRealHeight(44 + 1),
                 Height = Application.GetRealHeight(1),
-                BackgroundColor = Color.LineColor,
+                BackgroundColor = MusicColor.LineColor,
             };
             whiteView.AddChidren(btnLine);
 
@@ -288,7 +288,7 @@
                 Width = Application.GetRealWidth(135),
                 Height = Application.GetRealHeight(44),
                 TextAlignment = TextAlignment.Center,
-                TextColor = Color.TextCancelColor,
+                TextColor = MusicColor.TextCancelColor,
                 TextSize = TextSize.Text16,
                 TextID = StringId.cancelMusic,
                 Gravity = Gravity.BottomLeft,
@@ -303,11 +303,11 @@
                 Width = Application.GetRealWidth(135),
                 Height = Application.GetRealHeight(44),
                 TextAlignment = TextAlignment.Center,
-                TextColor = Color.WhiteColor,
+                TextColor = MusicColor.WhiteColor,
                 IsBold = true,
                 TextSize = TextSize.Text16,
                 TextID = StringId.confirmMusic,
-                BackgroundColor = Color.SelectedColor,
+                BackgroundColor = MusicColor.SelectedColor,
                 Gravity=Gravity.BottomRight,
             };
             whiteView.AddChidren(btnConfirm);
@@ -341,7 +341,7 @@
                     btnTip.Width = Application.GetRealWidth(222);
                     btnTip.Height = Application.GetRealHeight(17);
                     btnTip.Text = Language.StringByID(errorId_IsNullOrEmpty);
-                    btnTip.TextColor = Color.RedColor;
+                    btnTip.TextColor = MusicColor.RedColor;
                     btnTip.TextSize = TextSize.Text12;
                     btnTip.TextAlignment = TextAlignment.CenterLeft;
                     return;
@@ -365,7 +365,7 @@
         {
             Dialog dialog = new Dialog()
             {
-                BackgroundColor = Color.PopupBackgroundColor,
+                BackgroundColor = MusicColor.PopupBackgroundColor,
             };
 
             FrameLayout whiteView = new FrameLayout()
@@ -375,7 +375,7 @@
                 Y = Application.GetRealHeight(264),
                 Width = Application.GetRealWidth(270),
                 Height = Application.GetRealHeight(140),
-                BackgroundColor = Color.WhiteColor,
+                BackgroundColor = MusicColor.WhiteColor,
                 BorderColor = 0x00000000,
                 BorderWidth = 0,
                 Radius = (uint)Application.GetRealHeight(RradiusFrameLayout),
@@ -388,7 +388,7 @@
                 X = Application.GetRealWidth(35),
                 Height = Application.GetRealHeight(22),
                 Width = Application.GetRealWidth(270 - 35 * 2),
-                TextColor = Color.SelectedColor,
+                TextColor = MusicColor.SelectedColor,
                 TextSize = TextSize.Text16,
                 TextAlignment = TextAlignment.Center,
                 TextID = titleId,
@@ -401,7 +401,7 @@
                 X = Application.GetRealWidth(20),
                 Height = Application.GetRealHeight(22),
                 Width = Application.GetRealWidth(270 - 20 * 2),
-                TextColor = Color.TextCancelColor,
+                TextColor = MusicColor.TextCancelColor,
                 TextSize = TextSize.Text12,
                 TextAlignment = TextAlignment.Center,
                 TextID = tipTxet,
@@ -413,7 +413,7 @@
             {
                 Y = whiteView.Height - Application.GetRealHeight(44 + 1),
                 Height = Application.GetRealHeight(1),
-                BackgroundColor = Color.LineColor,
+                BackgroundColor = MusicColor.LineColor,
             };
             whiteView.AddChidren(btnLine);
 
@@ -423,7 +423,7 @@
                 Width = Application.GetRealWidth(135),
                 Height = Application.GetRealHeight(44),
                 TextAlignment = TextAlignment.Center,
-                TextColor = Color.TextCancelColor,
+                TextColor = MusicColor.TextCancelColor,
                 TextSize = TextSize.Text16,
                 TextID = StringId.cancelMusic,
                 Gravity = Gravity.BottomLeft,
@@ -437,11 +437,11 @@
                 Width = Application.GetRealWidth(135),
                 Height = Application.GetRealHeight(44),
                 TextAlignment = TextAlignment.Center,
-                TextColor = Color.WhiteColor,
+                TextColor = MusicColor.WhiteColor,
                 IsBold = true,
                 TextSize = TextSize.Text16,
                 TextID = StringId.confirmMusic,
-                BackgroundColor = Color.SelectedColor,
+                BackgroundColor = MusicColor.SelectedColor,
                 Gravity = Gravity.BottomRight,
             };
             whiteView.AddChidren(btnConfirm);
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/View/TopView.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/View/TopView.cs
index d6341fa..e8030bf 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/View/TopView.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/View/TopView.cs
@@ -12,7 +12,7 @@
         /// </summary>
         public FrameLayout fLayout = new FrameLayout
         {
-            BackgroundColor = Color.TopViewColor,
+            BackgroundColor = MusicColor.TopViewColor,
             Height = Application.GetRealHeight(64),
             Width=Application.GetRealWidth(375),
         };
@@ -22,7 +22,7 @@
         public Button topNameBtn = new Button
         {
             TextSize = TextSize.Text18,
-            TextColor = Color.Text18Color,
+            TextColor = MusicColor.Text18Color,
             Width = Application.GetRealWidth(140),
             Height = Application.GetRealHeight(25),
             Y = Application.GetRealHeight(30),
@@ -45,7 +45,7 @@
         {
             Width = Application.GetRealWidth(375),
             Height = 1,
-            BackgroundColor = Color.LineColor,
+            BackgroundColor = MusicColor.LineColor,
 
         };
         /// <summary>

--
Gitblit v1.8.0