From e2a009ca812c2f933e195c4276b79c34ed31862a Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期五, 17 十二月 2021 18:29:10 +0800
Subject: [PATCH] 2021-12-17-01

---
 HDL_ON/UI/UI2/FuntionControlView/Music/UpdateThread.cs |   24 +++++++++++-------------
 1 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/UpdateThread.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/UpdateThread.cs
index 664c342..0f2196d 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/UpdateThread.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/UpdateThread.cs
@@ -15,7 +15,7 @@
         /// <param name="frame">褰撳墠鐣岄潰</param>
         /// <param name="middViewLayout">姣忎竴鏉¢煶涔愮殑涓绘帶浠�</param>
         /// <param name="a31MusicModel">鐐瑰墠鎾斁鍣�</param>
-        public static void updateThread(FrameLayout frame, VerticalRefreshLayout middViewLayout, A31MusicModel a31MusicModel)
+        public static void updateCurrMusicThread(FrameLayout frame, VerticalRefreshLayout middViewLayout, A31MusicModel a31MusicModel)  
         {
             System.Threading.Thread updateSelectedMusicThread = new System.Threading.Thread(() =>
             {
@@ -68,7 +68,7 @@
         /// <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)
+        public static void PlayMusicClick(VerticalRefreshLayout middViewLayout, string musicSource, string listName,List<Songs> musicList, FrameLayout frame=null) 
         {
             for (int i = 0; i < musicList.Count; i++)
             {
@@ -136,7 +136,7 @@
                     if (songView.loveIcon.IsSelected)
                     {
                         ///鏌ユ壘闊充箰鏄惁瀛樺湪鍦ㄥ垪琛�
-                        var music1 = A31MusicModel.Current.LoveMusicInfoList.Find((m) => m.URL == songs.URL);
+                        var music1 = A31MusicModel.Current.LoveMusicInfoList.Find((m) => m.name == songs.name);
                         if (music1 == null)
                         {
                             ///娌℃湁瀛樺湪灏辨坊鍔�
@@ -146,7 +146,7 @@
                     else
                     {
                         ///鏌ユ壘闊充箰鏄惁瀛樺湪鍦ㄥ垪琛�
-                        var music1 = A31MusicModel.Current.LoveMusicInfoList.Find((m) => m.URL == songs.URL);
+                        var music1 = A31MusicModel.Current.LoveMusicInfoList.Find((m) => m.name == songs.name);
                         if (music1 != null)
                         {
                             ///瀛樺湪灏卞垹闄�
@@ -175,22 +175,20 @@
                         Application.RunOnMainThread(() =>
                         {
                             //绉婚櫎鐣岄潰
-                            A31MusicModel.Current.A31PlayStatus.Title = songView.songBtn.Text;
                             if (frame != null)
                             {
                                 frame.RemoveFromParent();
                             }
                             MainPage.BasePageView.RemoveViewByTag("Music");
+
+                            A31MusicModel.Current.functionMusic.SetAttrState("song_name", songView.songBtn.Text);
+                            A31MusicModel.Current.functionMusic.SetAttrState("playlist_name", listName);
+                            Dictionary<string, string> dic = new Dictionary<string, string>();
+                            dic.Add("song_name", songView.songBtn.Text);
+                            dic.Add("playlist_name", listName);
                             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);
-                                }
+                                SendMethod.sendMethod.SendControlCommand(A31MusicModel.Current.functionMusic, dic);
                             });
                         });
                     });

--
Gitblit v1.8.0