From c26c06ef4a22d6fb9e59dc734abca92fa8a23c47 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 05 六月 2020 17:41:00 +0800
Subject: [PATCH] 2020-06-05-02
---
HDL_ON/UI/Music/MusicMain.cs | 27 +++++----------------------
1 files changed, 5 insertions(+), 22 deletions(-)
diff --git a/HDL_ON/UI/Music/MusicMain.cs b/HDL_ON/UI/Music/MusicMain.cs
index ec4a084..f014ced 100644
--- a/HDL_ON/UI/Music/MusicMain.cs
+++ b/HDL_ON/UI/Music/MusicMain.cs
@@ -106,7 +106,7 @@
if (obj == null)
{
///杩欓噷瑕佽鍙栦富浠庡叧绯�
- //readServerOrClientMode();
+ readServerOrClientMode();
A31MusicModel.Save();
return;
}
@@ -201,18 +201,8 @@
musicView.View(verticalRefresh);
musicView.singerBtn.Text = a31player.A31PlayStatus.Artist;
musicView.songNameBtn.Text = a31player.A31PlayStatus.Title;
- //musicView.musicNameBtn.Text = a31player.Name;
- if (a31player.ServerClientType == 1)
- {
- musicView.musicNameBtn.Text = a31player.MainPlayName;
- }
- else
- {
- musicView.musicNameBtn.Text = a31player.Name;
- }
+ musicView.musicNameBtn.Text = new View.DialogView { }.NamePlayer(a31player);
musicView.regionBtn.TextID = StringId.region;
-
-
EventHandler<MouseEventArgs> clickMergence = (sender, e) =>
{
@@ -292,14 +282,7 @@
{
musicView.singerBtn.Text = a31player.A31PlayStatus.Artist;
musicView.songNameBtn.Text = a31player.A31PlayStatus.Title;
- if (a31player.ServerClientType == 1)
- {
- musicView.musicNameBtn.Text = a31player.MainPlayName;
- }
- else
- {
- musicView.musicNameBtn.Text = a31player.Name;
- }
+ musicView.musicNameBtn.Text = new View.DialogView { }.NamePlayer(a31player);
if (a31player.A31PlayStatus.status == "play")
{
musicView.playBtn.IsSelected = true;
@@ -377,7 +360,7 @@
UniqueDeviceName = slave.uuid.Replace("uuid:", ""),
Name = slave.name,
IsCanShow = false,
- IsOnLine = false,
+ IsOnLine = false,//true浣滅敤涓轰簡璇诲彇浠庢挱鏀惧櫒鐨勯煶閲�
});
}
//濡傛灉鎵惧埌灏辨洿鏂颁负浠庣殑
@@ -389,7 +372,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