From 9f4190da49187e9df86cec915f6ba82baf6058ac Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期四, 04 六月 2020 17:45:22 +0800
Subject: [PATCH] 2020-06-04-3

---
 HDL_ON/UI/Music/MusicMain.cs |   21 ++-------------------
 1 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/HDL_ON/UI/Music/MusicMain.cs b/HDL_ON/UI/Music/MusicMain.cs
index ec4a084..997df56 100644
--- a/HDL_ON/UI/Music/MusicMain.cs
+++ b/HDL_ON/UI/Music/MusicMain.cs
@@ -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;

--
Gitblit v1.8.0