From 5de5a26d3825b3182a7d3a18ed1cbdbb78a3f9aa Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 23 七月 2020 16:39:59 +0800
Subject: [PATCH] 2020-07-23
---
HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs | 28 +++++++++++++---------------
1 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs
index bd49772..37fa78b 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs
@@ -54,7 +54,7 @@
this.BackgroundColor = Color.ViewColor;
var topView = new TopView();
this.AddChidren(topView.TopFLayoutView());
- topView.topNameBtn.TextID =StringId.a31Music;
+ topView.topNameBtn.TextID = StringId.a31Music;
topView.clickBackBtn.MouseUpEventHandler += (sender, e) =>
{
RemoveFromParent();
@@ -82,7 +82,7 @@
else
{
clearA31Threads();
- //verticalRefresh.RemoveAll();
+ //verticalRefresh.RemoveAll();
for (int i = 0; i < A31MusicModel.A31MusicModelList.Count; i++)
{
var a31player = A31MusicModel.A31MusicModelList[i];
@@ -210,16 +210,15 @@
/// </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);
+ if (a31player.IsEnd)
+ {
+ musicView.muiscFl.Height = Application.GetRealHeight(12 + 139 + 12);
}
EventHandler<MouseEventArgs> clickMergence = (sender, e) =>
{
@@ -230,18 +229,16 @@
else if (a31player.ServerClientType == 1)
{
new View.DialogView { }.DetachPlayMergence(a31player);
-
}
};
musicView.mergeBjBtn.MouseUpEventHandler += clickMergence;
musicView.mergeBtn.MouseUpEventHandler += clickMergence;
musicView.mergeIconBtn.MouseUpEventHandler += clickMergence;
-
musicView.clickBtn.MouseUpEventHandler += (sender, e) =>
{
A31MusicModel.Current = a31player;//褰撳墠鎾斁鍣�
- var a31PlayMusicPage = new A31PlayMusicPage();
+ var a31PlayMusicPage = new A31PlayMusicPage();
MainPage.BasePageView.AddChidren(a31PlayMusicPage);
a31PlayMusicPage.Show();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
@@ -281,6 +278,12 @@
musicView.nextBtn.MouseUpEventHandler += (sender, e) =>
{
musicView.nextBtn.IsSelected = false;
+ };
+
+ musicView.collectIconBtn.MouseUpEventHandler = (sender, e) =>
+ {
+ musicView.collectIconBtn.IsSelected = !musicView.collectIconBtn.IsSelected;
+ a31player.collection = musicView.collectIconBtn.IsSelected ? true : false;
};
System.Threading.Tasks.Task.Run(() =>
@@ -363,7 +366,6 @@
string str = a31player.Name;
for (int j = 0; j < a31player.Slave.slave_list.Count; j++)
{
-
var slave = a31player.Slave.slave_list[j];
str = str + "+" + slave.name;
var tempA31Player = A31MusicModel.A31MusicModelList.Find((obj) => slave.uuid.Replace("uuid:", "") == obj.UniqueDeviceName);
@@ -390,7 +392,6 @@
tempA31Player.UniqueDeviceName = slave.uuid.Replace("uuid:", "");
tempA31Player.IsCanShow = false;
tempA31Player.IsOnLine = false;//true浣滅敤涓轰簡璇诲彇浠庢挱鏀惧櫒鐨勯煶閲�
-
}
}
a31player.MainPlayName = str;
@@ -401,11 +402,8 @@
var ss = e.Message;
}
}
-
}
catch { }
}
-
}
-
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0