From 52e317b95d830f8cd1156b403ff5a34fb8f9bccb Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 31 七月 2020 17:43:42 +0800
Subject: [PATCH] 2020-7-31-2
---
HDL_ON/UI/UI2/FuntionControlView/Music/View/DialogView.cs | 61 +++++++++++++++++++-----------
1 files changed, 38 insertions(+), 23 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..fe5d085 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/View/DialogView.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/View/DialogView.cs
@@ -216,6 +216,7 @@
string msg = Language.StringByID(StringId.addMusicList) + list.ListName;
new PublicAssmebly().TipMsgAutoClose(msg, false);
};
+ fileIconBtn.MouseUpEventHandler += click;
fileNameBtn.MouseUpEventHandler += click;
addFlieRow.MouseUpEventHandler += click;
}
@@ -225,7 +226,7 @@
/// <summary>
/// 閫変腑缁勫悎鐨勬挱鏀惧櫒鐨勭晫闈�
/// </summary>
- public void PlayMergence()
+ public void PlayMergence(A31MusicModel a31MusicModel)
{
#region
@@ -357,6 +358,7 @@
SelectedImagePath = "MusicIcon/selectedIcon.png",
};
PlayRow.AddChidren(selectedIconBtn);
+
///鍔犲ぇ鍑犵偣鑼冨洿
Button clickBtn = new Button
@@ -364,7 +366,11 @@
Height = Application.GetRealHeight(50),
};
PlayRow.AddChidren(clickBtn);
-
+ if (a31MusicModel.UniqueDeviceName == player.UniqueDeviceName)
+ {
+ clickBtn.IsSelected = selectedIconBtn.IsSelected = true;
+ playList1.Add(a31MusicModel);
+ }
clickBtn.MouseUpEventHandler += (sender, e) =>
{
clickBtn.IsSelected = !clickBtn.IsSelected;
@@ -423,7 +429,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 +437,6 @@
{
playList2.Add(musics);
}
-
}
if (playList2.Count == 0)
@@ -577,20 +581,20 @@
addFlieRow.AddChidren(songNameBtn);
var wText = songNameBtn.GetTextWidth();//鑾峰彇鏂囨湰瀹藉害
- if (wText > 280)
+ if (wText >Application.GetRealWidth(220))
{
- songNameBtn.Width = Application.GetRealWidth(280);
+ songNameBtn.Width = Application.GetRealWidth(220);
}
else
{
- songNameBtn.Width = wText + 5;
+ songNameBtn.Width = wText + Application.GetRealWidth(15);
}
//姝屾墜鎺т欢
Button singerBtn = new Button
{
X = songNameBtn.Right,
Y = Application.GetRealHeight(15),
- Width = Application.GetRealWidth(280 - songNameBtn.Width),
+ Width = Application.GetRealWidth(220)- wText,
Height = Application.GetRealHeight(20),
TextColor = Color.MusicNoTxetColor,
TextSize = TextSize.Text12,
@@ -598,11 +602,6 @@
Text = "-" + player.A31PlayStatus.Artist.Trim(),
};
addFlieRow.AddChidren(singerBtn);
- if (wText > 280)
- {
- ///姝屽悕闀垮害灏忎簬250鎵嶅彲浠ユ樉绀烘瓕鎵嬪嚭鏉�
- singerBtn.Width = Application.GetRealWidth(0);
- }
}
else
{
@@ -878,6 +877,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 +939,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 +965,17 @@
}
}
serverMusic.MainPlayName = str;
+ foreach(var music in A31MusicModel.A31MusicModelList)
+ {
+ if(music.ServerClientType == 1)
+ {
+ music.MainPlayCollection = mainModelCollection;
+ }
+ }
A31MusicModel.Save();
break;
}
}
-
-
}
catch { }
}
@@ -1050,7 +1060,6 @@
{
if (tmepSlaves.slave_list.Count == 0)
{
-
var host_music = A31MusicModel.A31MusicModelList.Find((c) => c.UniqueDeviceName == a31player.UniqueDeviceName);
if (host_music != null)
{
@@ -1082,7 +1091,6 @@
music.IsOnLine = false;//鍏堜笉鍏佽璇诲彇
}
}
-
}
var host_a31player = A31MusicModel.A31MusicModelList.Find((c) => c.UniqueDeviceName == a31player.UniqueDeviceName);
@@ -1123,7 +1131,9 @@
});
}
-
+ /// <summary>
+ /// 鎾斁鍣ㄥ悕绉�
+ /// </summary>
public string NamePlayer(A31MusicModel a31player)
{
if (a31player.ServerClientType == 1)
@@ -1328,7 +1338,7 @@
{
X = Application.GetRealWidth(289),
Y = Application.GetRealHeight(31),
- Width = Application.GetRealWidth(26),
+ Width = Application.GetRealWidth(26+15),
Height = Application.GetRealHeight(17),
TextColor = Color.MusicNoTxetColor,
TextSize = TextSize.Text12,
@@ -1336,7 +1346,6 @@
Text = player.A31PlayStatus.vol + "%",
};
volumeFra.AddChidren(valueBtn);
-
///闊抽噺杩涘害鏉＄偣鍑讳簨浠�
EventHandler<int> progressClick = (sender, e) =>
@@ -1350,7 +1359,6 @@
if (player.ServerClientType == -1)
{
valueBtn.Text = volSeekBar.Progress + "%";
- //SendMethod.ControlVolume(volSeekBar.Progress, player);
}
else if (player.ServerClientType == 1)
{
@@ -1362,7 +1370,6 @@
var button = (Button)frameLayout.GetChildren(2);
diyImageSeekBar.Progress = volSeekBar.Progress;
button.Text = volSeekBar.Progress + "%";
- //SendMethod.ControlVolume(volSeekBar.Progress, music);
}
}
};
@@ -1406,9 +1413,17 @@
}
else if (currVolumePlay.ServerClientType == 1)
{
+ //鍏堝彂涓绘挱鏀惧櫒闊抽噺鍛戒护
+ SendMethod.ControlVolume(endVolume, currVolumePlay);
for (int j = 0; j < volumePlayList.Count; j++)
{
var music = volumePlayList[j];
+ if (music.ServerClientType == 1)
+ {
+ continue;
+ }
+ System.Threading.Thread.Sleep(500);
+ //姣忎釜500姣鍙戜粠鎾斁鍣ㄩ煶閲忓懡浠�
SendMethod.ControlVolume(endVolume, music);
}
}
--
Gitblit v1.8.0