From 7167334c0e89dd84827d59e726123d14776e3a09 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 16 六月 2020 11:14:13 +0800
Subject: [PATCH] 2020-06-16-1
---
HDL_ON/UI/Music/MusicMain.cs | 27 +++++++++++++++++++++++----
1 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/UI/Music/MusicMain.cs b/HDL_ON/UI/Music/MusicMain.cs
index 997df56..fd99774 100644
--- a/HDL_ON/UI/Music/MusicMain.cs
+++ b/HDL_ON/UI/Music/MusicMain.cs
@@ -93,6 +93,14 @@
{
continue;
}
+ if (A31MusicModel.A31MusicModelList.Count - 1 == i)
+ {
+ a31player.IsEnd = true;
+ }
+ else
+ {
+ a31player.IsEnd = false;
+ }
///鍔犺浇鐣岄潰鏃堕粯璁や笉鍦ㄧ嚎
///杩欓噷鏍囪鏄负浜嗕笉璇诲彇涓嶅湪绾挎挱鏀惧櫒鐘舵��
a31player.IsOnLine = false;
@@ -106,7 +114,7 @@
if (obj == null)
{
///杩欓噷瑕佽鍙栦富浠庡叧绯�
- //readServerOrClientMode();
+ readServerOrClientMode();
A31MusicModel.Save();
return;
}
@@ -165,8 +173,17 @@
{
continue;
}
+ if (A31MusicModel.A31MusicModelList.Count - 1 == i)
+ {
+ a31player.IsEnd = true;
+ }
+ else
+ {
+ a31player.IsEnd = false;
+ }
MusicListView(a31player);
}
+
});
return;
}
@@ -203,7 +220,9 @@
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);
+ }
EventHandler<MouseEventArgs> clickMergence = (sender, e) =>
{
if (a31player.ServerClientType == 0)
@@ -360,7 +379,7 @@
UniqueDeviceName = slave.uuid.Replace("uuid:", ""),
Name = slave.name,
IsCanShow = false,
- IsOnLine = false,
+ IsOnLine = false,//true浣滅敤涓轰簡璇诲彇浠庢挱鏀惧櫒鐨勯煶閲�
});
}
//濡傛灉鎵惧埌灏辨洿鏂颁负浠庣殑
@@ -372,7 +391,7 @@
tempA31Player.Name = slave.name;
tempA31Player.UniqueDeviceName = slave.uuid.Replace("uuid:", "");
tempA31Player.IsCanShow = false;
- tempA31Player.IsOnLine = false;
+ tempA31Player.IsOnLine = false;//true浣滅敤涓轰簡璇诲彇浠庢挱鏀惧櫒鐨勯煶閲�
}
}
--
Gitblit v1.8.0