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 | 34 +++++++++++++++-------------------
1 files changed, 15 insertions(+), 19 deletions(-)
diff --git a/HDL_ON/UI/Music/MusicMain.cs b/HDL_ON/UI/Music/MusicMain.cs
index 4bfa00e..1f4b697 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];
@@ -195,28 +195,24 @@
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;
- }
- EventHandler<MouseEventArgs> clickPlay = (sender, e) =>
- {
- A31MusicModel.Current = a31player;//褰撳墠鎾斁鍣�
- var a31PlayMusicPage = new A31PlayMusicPage();
- MainPage.BasePageView.AddChidren(a31PlayMusicPage);
- a31PlayMusicPage.Show();
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ new View.DialogView { }.PlayMergence();
};
+ musicView.mergeBjBtn.MouseUpEventHandler += clickMergence;
+ musicView.mergeBtn.MouseUpEventHandler += clickMergence;
+ musicView.mergeIconBtn.MouseUpEventHandler += clickMergence;
- musicView.singerBtn.MouseUpEventHandler += clickPlay;
- musicView.songNameBtn.MouseUpEventHandler += clickPlay;
- musicView.musicNameBtn.MouseUpEventHandler += clickPlay;
- musicView.regionBtn.MouseUpEventHandler += clickPlay;
+ 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.prevBtn.MouseDownEventHandler += (sender, e) =>
{
--
Gitblit v1.8.0