From 05fd07b753b9cc043b48569d514af3d829bd039c Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期四, 28 五月 2020 13:08:33 +0800
Subject: [PATCH] 2020-05-28-1

---
 HDL_ON/UI/Music/MusicMain.cs |   33 ++++++++++++++-------------------
 1 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/HDL_ON/UI/Music/MusicMain.cs b/HDL_ON/UI/Music/MusicMain.cs
index 830a4b4..ba9b21f 100644
--- a/HDL_ON/UI/Music/MusicMain.cs
+++ b/HDL_ON/UI/Music/MusicMain.cs
@@ -81,7 +81,7 @@
             else
             {
                 clearA31Threads();
-                verticalRefresh.RemoveAll();
+               //verticalRefresh.RemoveAll();
                 for (int i = 0; i < A31MusicModel.A31MusicModelList.Count; i++)
                 {
                     var a31player = A31MusicModel.A31MusicModelList[i];
@@ -203,25 +203,20 @@
             {
                 musicView.playBtn.IsSelected = false;
             }
-            EventHandler<MouseEventArgs> clickPlay = (sender, e) =>
-            {
-                A31MusicModel.Current = a31player;//褰撳墠鎾斁鍣�
+            musicView.clickBtn.MouseUpEventHandler += (sender, e) =>
+             {
+                 A31MusicModel.Current = a31player;//褰撳墠鎾斁鍣�
                 var a31PlayMusicPage = new A31PlayMusicPage();
-                MainPage.BasePageView.AddChidren(a31PlayMusicPage);
-                a31PlayMusicPage.Show();
-                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
-            };
-
-            musicView.singerBtn.MouseUpEventHandler += clickPlay;
-            musicView.songNameBtn.MouseUpEventHandler += clickPlay;
-            musicView.musicNameBtn.MouseUpEventHandler += clickPlay;
-            musicView.regionBtn.MouseUpEventHandler += clickPlay;
+                 MainPage.BasePageView.AddChidren(a31PlayMusicPage);
+                 a31PlayMusicPage.Show();
+                 MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+             };
 
             ///涓婁竴鏇茬偣鍑讳簨浠�
             musicView.prevBtn.MouseDownEventHandler += (sender, e) =>
             {
                 musicView.prevBtn.IsSelected = true;
-                SendMethod.Previous();
+                SendMethod.Previous(a31player);
             };
             musicView.prevBtn.MouseUpEventHandler += (sender, e) =>
             {
@@ -233,21 +228,21 @@
                 if (musicView.playBtn.IsSelected)
                 {
                     musicView.playBtn.IsSelected = false;
-                    SendMethod.Pause();
-                    A31MusicModel.Current.A31PlayStatus.status = "pause";
+                    SendMethod.Pause(a31player);
+                    a31player.A31PlayStatus.status = "pause";
                 }
                 else
                 {
                     musicView.playBtn.IsSelected = true;
-                    SendMethod.Play();
-                    A31MusicModel.Current.A31PlayStatus.status = "play";
+                    SendMethod.Play(a31player);
+                    a31player.A31PlayStatus.status = "play";
                 }
             };
             ///涓嬩竴鏇茬偣鍑讳簨浠�
             musicView.nextBtn.MouseDownEventHandler += (sender, e) =>
             {
                 musicView.nextBtn.IsSelected = true;
-                SendMethod.Next();
+                SendMethod.Next(a31player);
             };
             musicView.nextBtn.MouseUpEventHandler += (sender, e) =>
             {

--
Gitblit v1.8.0