From e322d91c7325019710bfdb046c5fea673031455a Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 29 七月 2020 11:53:01 +0800
Subject: [PATCH] 20200729
---
HDL_ON/UI/UI2/FuntionControlView/Music/View/DialogView.cs | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/View/DialogView.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/View/DialogView.cs
index b136a9a..253b383 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/View/DialogView.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/View/DialogView.cs
@@ -423,7 +423,6 @@
var host_Music_If = playList1.Find((c) => c.ServerClientType == 1);
if (host_Music_If == null)
{
-
var playList2 = new List<A31MusicModel>();
for (int i = 0; i < playList1.Count; i++)
{
@@ -432,7 +431,6 @@
{
playList2.Add(musics);
}
-
}
if (playList2.Count == 0)
@@ -878,6 +876,8 @@
/// <param name="musicList1"></param>
void MergeThreading(A31MusicModel serverMusic, List<A31MusicModel> musicList1)
{
+ A31MusicModel mainModel = null;
+ bool mainModelCollection = false;
MusicMain.loading.Start(Language.StringByID(StringId.inConfiguration));
bool _if = false;
System.Threading.Tasks.Task.Run(() =>
@@ -938,10 +938,14 @@
for (int j = 0; j < A31MusicModel.A31MusicModelList.Count; j++)
{
var music = A31MusicModel.A31MusicModelList[j];
+ if(music.collection && !mainModelCollection)
+ {
+ mainModelCollection = true;
+ }
if (music.UniqueDeviceName == serverMusic.UniqueDeviceName)
{
-
music.ServerClientType = 1;
+ mainModel = music;
music.Slave = tmepSlaves;
//杩囨护鎺変富鎾斁鍣�;
continue;
@@ -960,12 +964,17 @@
}
}
serverMusic.MainPlayName = str;
+ foreach(var music in A31MusicModel.A31MusicModelList)
+ {
+ if(music.ServerClientType == 1)
+ {
+ music.MainPlayCollection = mainModelCollection;
+ }
+ }
A31MusicModel.Save();
break;
}
}
-
-
}
catch { }
}
@@ -1050,7 +1059,6 @@
{
if (tmepSlaves.slave_list.Count == 0)
{
-
var host_music = A31MusicModel.A31MusicModelList.Find((c) => c.UniqueDeviceName == a31player.UniqueDeviceName);
if (host_music != null)
{
@@ -1082,7 +1090,6 @@
music.IsOnLine = false;//鍏堜笉鍏佽璇诲彇
}
}
-
}
var host_a31player = A31MusicModel.A31MusicModelList.Find((c) => c.UniqueDeviceName == a31player.UniqueDeviceName);
@@ -1123,7 +1130,9 @@
});
}
-
+ /// <summary>
+ /// 鎾斁鍣ㄥ悕绉�
+ /// </summary>
public string NamePlayer(A31MusicModel a31player)
{
if (a31player.ServerClientType == 1)
--
Gitblit v1.8.0