From b764dff5c4f4a7b0cde45a8d3eb28ff2a315cc29 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 19 八月 2020 16:46:53 +0800
Subject: [PATCH] 2020-08-19-1
---
HDL_ON/UI/UI2/FuntionControlView/Music/View/DialogView.cs | 187 ++++++++++++++++++++++++++++++----------------
1 files changed, 120 insertions(+), 67 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/View/DialogView.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/View/DialogView.cs
index c97b330..c4d2d9f 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/View/DialogView.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/View/DialogView.cs
@@ -228,7 +228,17 @@
/// </summary>
public void PlayMergence(A31MusicModel a31MusicModel)
{
-
+ int number1 = 0;
+ for (int i = 0; i < A31MusicModel.A31MusicModelList.Count; i++)
+ {
+ var player = A31MusicModel.A31MusicModelList[i];
+ if (!player.IsOnLine)
+ {
+ //涓嶅湪绾夸笉鏄剧ず;
+ continue;
+ }
+ number1 = number1 + 1;
+ }
#region
//涓绘帶浠�
@@ -248,9 +258,9 @@
FrameLayout dialogFra = new FrameLayout()
{
X = Application.GetRealWidth(16),
- Y = Application.GetRealHeight(397),
+ Y = Application.GetRealHeight(667 - (50 + number1 * 50) - 20),
Width = Application.GetRealWidth(344),
- Height = Application.GetRealHeight(250),
+ Height = Application.GetRealHeight(50 + number1 * 50),
BackgroundColor = MusicColor.WhiteColor,
Radius = (uint)Application.GetRealHeight(12),
};
@@ -307,14 +317,33 @@
TextSize = TextSize.Text14,
};
topFra.AddChidren(confirmBtn);
-
- VerticalScrolViewLayout verticalScrolViewLayout = new VerticalScrolViewLayout
+ ///澶т簬4鐢ㄤ笂涓嬫粦鍔ㄦ帶浠�
+ VerticalScrolViewLayout verticalScrolViewLayout = null;
+ FrameLayout frameLayout = null;
+ if (number1 > 4)
{
- Y = Application.GetRealHeight(50),
- Height = dialogFra.Height - Application.GetRealHeight(50),
- Width = Application.GetRealWidth(344),
- };
- dialogFra.AddChidren(verticalScrolViewLayout);
+ verticalScrolViewLayout = new VerticalScrolViewLayout
+ {
+ Y = Application.GetRealHeight(50),
+ Height = dialogFra.Height - Application.GetRealHeight(50),
+ Width = Application.GetRealWidth(344),
+
+ };
+ dialogFra.AddChidren(verticalScrolViewLayout);
+
+ }
+ else
+ {
+ frameLayout = new FrameLayout
+ {
+ Y = Application.GetRealHeight(50),
+ Height = dialogFra.Height - Application.GetRealHeight(50),
+ Width = Application.GetRealWidth(344),
+
+ };
+ dialogFra.AddChidren(frameLayout);
+ }
+
var playList1 = new List<A31MusicModel>();
for (int i = 0; i < A31MusicModel.A31MusicModelList.Count; i++)
{
@@ -327,11 +356,17 @@
RowLayout PlayRow = new RowLayout
{
Height = Application.GetRealHeight(50),
- LineColor = MusicColor.WhiteColor,
- SubViewWidth = Application.GetRealWidth(80),//鏀瑰彉缂栬緫鎺т欢瀹藉害澶氬皯锛�
+ LineColor = 0x00000000,
};
- verticalScrolViewLayout.AddChidren(PlayRow);
-
+ if (number1 > 4)
+ {
+ verticalScrolViewLayout.AddChidren(PlayRow);
+ }
+ else
+ {
+ PlayRow.Y = Application.GetRealHeight(i * 50);
+ frameLayout.AddChidren(PlayRow);
+ }
//鎾斁鍣ㄥ悕绉版帶浠�
Button PlayNameBtn = new Button
@@ -358,7 +393,7 @@
SelectedImagePath = "MusicIcon/selectedIcon.png",
};
PlayRow.AddChidren(selectedIconBtn);
-
+
///鍔犲ぇ鍑犵偣鑼冨洿
Button clickBtn = new Button
@@ -391,16 +426,6 @@
}
}
};
- //绾�
- Button lineBtn = new Button
- {
- Y = PlayRow.Height - 1,
- X = Application.GetRealWidth(20),
- Width = Application.GetRealWidth(304),
- Height = 1,
- BackgroundColor = MusicColor.LineColor,
- };
- PlayRow.AddChidren(lineBtn);
}
#endregion
confirmBtn.MouseUpEventHandler += (sender, e) =>
@@ -581,7 +606,7 @@
addFlieRow.AddChidren(songNameBtn);
var wText = songNameBtn.GetTextWidth();//鑾峰彇鏂囨湰瀹藉害
- if (wText >Application.GetRealWidth(220))
+ if (wText > Application.GetRealWidth(220))
{
songNameBtn.Width = Application.GetRealWidth(220);
}
@@ -594,7 +619,7 @@
{
X = songNameBtn.Right,
Y = Application.GetRealHeight(15),
- Width = Application.GetRealWidth(220)- wText,
+ Width = Application.GetRealWidth(220) - wText,
Height = Application.GetRealHeight(20),
TextColor = MusicColor.MusicNoTxetColor,
TextSize = TextSize.Text12,
@@ -678,7 +703,17 @@
/// </summary>
public void DetachPlayMergence(A31MusicModel a31player)
{
-
+ int number1 = 0;
+ for (int i = 0; i < A31MusicModel.A31MusicModelList.Count; i++)
+ {
+ var player = A31MusicModel.A31MusicModelList[i];
+ if (!player.IsOnLine)
+ {
+ //涓嶅湪绾夸笉鏄剧ず;
+ continue;
+ }
+ number1 = number1 + 1;
+ }
#region
//涓绘帶浠�
Dialog dialog = new Dialog()
@@ -697,9 +732,9 @@
FrameLayout dialogFra = new FrameLayout()
{
X = Application.GetRealWidth(16),
- Y = Application.GetRealHeight(397),
+ Y = Application.GetRealHeight(667 - (50 + number1 * 50) - 20),
Width = Application.GetRealWidth(344),
- Height = Application.GetRealHeight(250),
+ Height = Application.GetRealHeight(50 + number1 * 50),
BackgroundColor = MusicColor.WhiteColor,
Radius = (uint)Application.GetRealHeight(12),
};
@@ -757,14 +792,32 @@
TextSize = TextSize.Text14,
};
topFra.AddChidren(confirmBtn);
-
- VerticalScrolViewLayout verticalScrolViewLayout = new VerticalScrolViewLayout
+ ///澶т簬4鐢ㄤ笂涓嬫粦鍔ㄦ帶浠�
+ VerticalScrolViewLayout verticalScrolViewLayout = null;
+ FrameLayout frameLayout = null;
+ if (number1 > 4)
{
- Y = Application.GetRealHeight(50),
- Height = dialogFra.Height - Application.GetRealHeight(50),
- Width = Application.GetRealWidth(344),
- };
- dialogFra.AddChidren(verticalScrolViewLayout);
+ verticalScrolViewLayout = new VerticalScrolViewLayout
+ {
+ Y = Application.GetRealHeight(50),
+ Height = dialogFra.Height - Application.GetRealHeight(50),
+ Width = Application.GetRealWidth(344),
+
+ };
+ dialogFra.AddChidren(verticalScrolViewLayout);
+
+ }
+ else
+ {
+ frameLayout = new FrameLayout
+ {
+ Y = Application.GetRealHeight(50),
+ Height = dialogFra.Height - Application.GetRealHeight(50),
+ Width = Application.GetRealWidth(344),
+
+ };
+ dialogFra.AddChidren(frameLayout);
+ }
var playList1 = new List<A31MusicModel>();
playList1.Add(a31player);
@@ -786,11 +839,17 @@
RowLayout PlayRow = new RowLayout
{
Height = Application.GetRealHeight(50),
- LineColor = MusicColor.WhiteColor,
- SubViewWidth = Application.GetRealWidth(80),//鏀瑰彉缂栬緫鎺т欢瀹藉害澶氬皯锛�
+ LineColor =0x00000000, //MusicColor.WhiteColor,
};
- verticalScrolViewLayout.AddChidren(PlayRow);
-
+ if (number1 > 4)
+ {
+ verticalScrolViewLayout.AddChidren(PlayRow);
+ }
+ else
+ {
+ PlayRow.Y = Application.GetRealHeight(i * 50);
+ frameLayout.AddChidren(PlayRow);
+ }
//鎾斁鍣ㄥ悕绉版帶浠�
Button PlayNameBtn = new Button
@@ -847,16 +906,7 @@
}
}
};
- //绾�
- Button lineBtn = new Button
- {
- Y = PlayRow.Height - 1,
- X = Application.GetRealWidth(20),
- Width = Application.GetRealWidth(304),
- Height = 1,
- BackgroundColor = MusicColor.LineColor,
- };
- PlayRow.AddChidren(lineBtn);
+
}
#endregion
confirmBtn.MouseUpEventHandler += (sender, e) =>
@@ -878,7 +928,7 @@
void MergeThreading(A31MusicModel serverMusic, List<A31MusicModel> musicList1)
{
A31MusicModel mainModel = null;
- bool mainModelCollection = false;
+ bool mainModelCollection = false;
MusicMain.loading.Start(Language.StringByID(StringId.inConfiguration));
bool _if = false;
System.Threading.Tasks.Task.Run(() =>
@@ -939,7 +989,7 @@
for (int j = 0; j < A31MusicModel.A31MusicModelList.Count; j++)
{
var music = A31MusicModel.A31MusicModelList[j];
- if(music.collection && !mainModelCollection)
+ if (music.collection && !mainModelCollection)
{
mainModelCollection = true;
}
@@ -965,9 +1015,9 @@
}
}
serverMusic.MainPlayName = str;
- foreach(var music in A31MusicModel.A31MusicModelList)
+ foreach (var music in A31MusicModel.A31MusicModelList)
{
- if(music.ServerClientType == 1)
+ if (music.ServerClientType == 1)
{
music.MainPlayCollection = mainModelCollection;
}
@@ -1011,7 +1061,7 @@
MusicMain.loading.Start(Language.StringByID(StringId.lifting));
var slaveList = new List<Slave>();
slaveList.AddRange(a31player.Slave.slave_list);
- // bool host_If = false; //琛ㄧず鏄惁鏄剧ず瑙ｉ櫎鐨勬挱鏀�
+ // bool host_If = false; //琛ㄧず鏄惁鏄剧ず瑙ｉ櫎鐨勬挱鏀�
bool _if = false;
System.Threading.Tasks.Task.Run(() =>
{
@@ -1145,12 +1195,12 @@
return a31player.Name;
}
}
-
+
List<A31MusicModel> volumePlayList = new List<A31MusicModel>();
A31MusicModel currVolumePlay = null;//褰撳墠鐨勬挱鏀惧櫒
int startVolume = 0;//涔嬪墠鐨勯煶閲�
int endVolume = 0;//鐜板湪鐨勯煶閲�
- string if_volume ="";//鏍囪鏄皟鑺傛�婚煶閲忚繕鏄崟涓挱鏀惧櫒闊抽噺;
+ string if_volume = "";//鏍囪鏄皟鑺傛�婚煶閲忚繕鏄崟涓挱鏀惧櫒闊抽噺;
/// <summary>
/// 鎾斁鍣ㄩ煶閲忕殑鐣岄潰
/// </summary>
@@ -1181,9 +1231,9 @@
FrameLayout dialogFra = new FrameLayout()
{
X = Application.GetRealWidth(16),
- Y = Application.GetRealHeight(397-20),
+ Y = Application.GetRealHeight(397 - 20),
Width = Application.GetRealWidth(344),
- Height = Application.GetRealHeight(250+20),
+ Height = Application.GetRealHeight(250 + 20),
BackgroundColor = MusicColor.WhiteColor,
Radius = (uint)Application.GetRealHeight(12),
};
@@ -1237,7 +1287,8 @@
};
topFra.AddChidren(confirmBtn);
- EventHandler<MouseEventArgs> eventHandler= (sen,e) => {
+ EventHandler<MouseEventArgs> eventHandler = (sen, e) =>
+ {
volumedialog.Close();
if (updateVolumeThread != null)
{
@@ -1307,8 +1358,8 @@
VerticalScrolViewLayout volumeViewLayout = new VerticalScrolViewLayout
{
- Y =Application.GetRealHeight(58+64),
- Height = dialogFra.Height - Application.GetRealHeight(58+64),
+ Y = Application.GetRealHeight(58 + 64),
+ Height = dialogFra.Height - Application.GetRealHeight(58 + 64),
Width = Application.GetRealWidth(343),
};
dialogFra.AddChidren(volumeViewLayout);
@@ -1357,7 +1408,7 @@
{
X = Application.GetRealWidth(289),
Y = Application.GetRealHeight(31),
- Width = Application.GetRealWidth(26+15),
+ Width = Application.GetRealWidth(26 + 15),
Height = Application.GetRealHeight(17),
TextColor = MusicColor.MusicNoTxetColor,
TextSize = TextSize.Text12,
@@ -1407,10 +1458,12 @@
System.Threading.Thread updateVolumeThread;
public void UpdateVolume()
{
- if (updateVolumeThread != null) {
+ if (updateVolumeThread != null)
+ {
try
{
- if (updateVolumeThread.IsAlive) {
+ if (updateVolumeThread.IsAlive)
+ {
updateVolumeThread.Abort();
}
}
@@ -1439,7 +1492,7 @@
}
}
- else if(if_volume == "Volume")
+ else if (if_volume == "Volume")
{
if (currVolumePlay == null)
{
--
Gitblit v1.8.0