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 | 59 ++++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 44 insertions(+), 15 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs
index fd99774..a190998 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs
@@ -45,12 +45,12 @@
/// <summary>
/// 鏄剧ず鍔犺浇鐣岄潰
/// </summary>
- public static Loading loading = new Loading();
+ public static Loading loading = new Loading();
VerticalRefreshLayout verticalRefresh;
public void Show()
{
-
+
#region 鐣岄潰甯冨眬
this.BackgroundColor = Color.ViewColor;
@@ -212,17 +212,31 @@
/// </summary>
void MusicListView(A31MusicModel a31player)
{
-
-
+
MusicView musicView = new MusicView();
musicView.View(verticalRefresh);
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)
@@ -239,15 +253,20 @@
musicView.mergeBtn.MouseUpEventHandler += clickMergence;
musicView.mergeIconBtn.MouseUpEventHandler += clickMergence;
-
- musicView.clickBtn.MouseUpEventHandler += (sender, e) =>
- {
- A31MusicModel.Current = a31player;//褰撳墠鎾斁鍣�
+ EventHandler<MouseEventArgs> clickPlayView = (sender, e) =>
+ {
+ A31MusicModel.Current = a31player;//褰撳墠鎾斁鍣�
var a31PlayMusicPage = new A31PlayMusicPage();
- MainPage.BasePageView.AddChidren(a31PlayMusicPage);
- a31PlayMusicPage.Show();
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- };
+ MainPage.BasePageView.AddChidren(a31PlayMusicPage);
+ a31PlayMusicPage.Show();
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ };
+ 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) =>
{
@@ -310,11 +329,21 @@
{
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