From af4101b1d8461331bc3163b738fc75d4bf67c85c Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 28 七月 2020 17:47:44 +0800
Subject: [PATCH] 2020-07-28-1
---
HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs | 35 +++++++++++++++++++++++++++++++----
1 files changed, 31 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs
index 243d488..a190998 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs
@@ -50,7 +50,7 @@
public void Show()
{
-
+
#region 鐣岄潰甯冨眬
this.BackgroundColor = Color.ViewColor;
@@ -218,10 +218,25 @@
musicView.singerBtn.Text = a31player.A31PlayStatus.Artist;
musicView.songNameBtn.Text = a31player.A31PlayStatus.Title;
musicView.musicNameBtn.Text = new View.DialogView { }.NamePlayer(a31player);
- musicView.regionBtn.TextID = StringId.region;
+
if (a31player.IsEnd) {
musicView.muiscFl.Height =Application.GetRealHeight(12 + 139 + 12);
}
+
+ musicView.collectIconBtn.MouseUpEventHandler += (sender, e) =>
+ {
+ musicView.collectIconBtn.IsSelected = !musicView.collectIconBtn.IsSelected;
+ if (musicView.collectIconBtn.IsSelected)
+ {
+ a31player.collection = true;
+ }
+ else
+ {
+ a31player.collection = false;
+ }
+
+ };
+
EventHandler<MouseEventArgs> clickMergence = (sender, e) =>
{
if (a31player.ServerClientType == 0)
@@ -248,7 +263,10 @@
};
musicView.musicIfonFl.MouseUpEventHandler += clickPlayView;
musicView.clickBtn.MouseUpEventHandler += clickPlayView;//
-
+ musicView.singerBtn.MouseUpEventHandler += clickPlayView;
+ musicView.songNameBtn.MouseUpEventHandler += clickPlayView;//
+ musicView.musicNameBtn.MouseUpEventHandler += clickPlayView;
+ musicView.regionBtn.MouseUpEventHandler += clickPlayView;//
///涓婁竴鏇茬偣鍑讳簨浠�
musicView.prevBtn.MouseDownEventHandler += (sender, e) =>
{
@@ -311,11 +329,20 @@
{
musicView.playBtn.IsSelected = false;
}
+ musicView.regionBtn.Text = a31player.GetRoomListName();
+ if (a31player.collection)
+ {
+ musicView.collectIconBtn.IsSelected = true;
+ }
+ else
+ {
+ musicView.collectIconBtn.IsSelected = false;
+ }
+
});
}
});
}
-
/// <summary>
--
Gitblit v1.8.0