From 99251846b303790a1f68f6bbaff16d642892195d Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 29 五月 2020 16:59:20 +0800
Subject: [PATCH] 2020-05-29-1

---
 HDL_ON/UI/Music/MusicMain.cs |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/HDL_ON/UI/Music/MusicMain.cs b/HDL_ON/UI/Music/MusicMain.cs
index ba9b21f..1f4b697 100644
--- a/HDL_ON/UI/Music/MusicMain.cs
+++ b/HDL_ON/UI/Music/MusicMain.cs
@@ -195,14 +195,16 @@
             musicView.songNameBtn.Text = a31player.A31PlayStatus.Title;
             musicView.musicNameBtn.Text = a31player.Name;
             musicView.regionBtn.TextID = StringId.region;
-            if (a31player.A31PlayStatus.status == "play")
+
+            EventHandler<MouseEventArgs> clickMergence = (sender, e) =>
             {
-                musicView.playBtn.IsSelected = true;
-            }
-            else
-            {
-                musicView.playBtn.IsSelected = false;
-            }
+                new View.DialogView { }.PlayMergence();
+            };
+            musicView.mergeBjBtn.MouseUpEventHandler += clickMergence;
+            musicView.mergeBtn.MouseUpEventHandler += clickMergence;
+            musicView.mergeIconBtn.MouseUpEventHandler += clickMergence;
+
+
             musicView.clickBtn.MouseUpEventHandler += (sender, e) =>
              {
                  A31MusicModel.Current = a31player;//褰撳墠鎾斁鍣�
@@ -211,7 +213,6 @@
                  a31PlayMusicPage.Show();
                  MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
              };
-
             ///涓婁竴鏇茬偣鍑讳簨浠�
             musicView.prevBtn.MouseDownEventHandler += (sender, e) =>
             {

--
Gitblit v1.8.0