From d5088d3bb198c0f53d4716022f010a02ac393977 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 25 八月 2022 15:06:01 +0800
Subject: [PATCH] 2022年08月25日15:04:41
---
HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicModel.cs | 62 +++++++++++++++++++++++--------
1 files changed, 46 insertions(+), 16 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicModel.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicModel.cs
index 698abcd..360d7c0 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicModel.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicModel.cs
@@ -16,13 +16,13 @@
//Refresh();
}
-
+
/// <summary>
/// 闊充箰鍔熻兘
/// </summary>
public Function functionMusic = new Function();
-
-
+
+
/// <summary>
///淇濆瓨褰撳墠闊充箰鍒楄〃
/// </summary>
@@ -50,7 +50,7 @@
A31MusicModelList.RemoveAll((obj) => obj == null);
}
-
+
/// <summary>
/// 涓婁竴娆℃洿鏂扮殑鏃堕棿
/// 璁板綍鏁版嵁鍙嶉鐨勬椂闂�(鍥犱负鏈夋椂鍊欑綉缁滃樊鏁版嵁涓嶅洖澶嶏紝瀵艰嚧鍒锋柊褰撳墠鎾斁闊充箰鏃堕棿涓嶆纭�)
@@ -81,7 +81,7 @@
/// <summary>
/// 鍒楄〃
/// </summary>
- public List<PalyList> palyLists = new List<PalyList>();
+ public List<PalyList> palyLists = new List<PalyList>();
/// <summary>
/// 鍠滅埍闊充箰鍒楄〃
@@ -97,8 +97,8 @@
/// </summary>
public static A31MusicModel Current;
-
-
+
+
/// <summary>
/// 鎸囧畾鍒楄〃鍚嶈幏鍙栭煶涔愬垪琛�
@@ -106,16 +106,17 @@
/// <returns></returns>
public List<Songs> GetSongList(string listName)
{
- var list = palyLists.Find((o)=>o.group==listName);
- if (list==null) {
+ var list = palyLists.Find((o) => o.group == listName);
+ if (list == null)
+ {
return new List<Songs>();
}
return list.songs;
}
-
+
public Slaves Slave = new Slaves();
-
+
/// <summary>
/// 鍒ゆ柇鏄惁鏄痡son鏁版嵁
@@ -222,7 +223,7 @@
public List<Songs> songs = new List<Songs>();
}
[System.Serializable]
- public class Songs:MusicInfo
+ public class Songs : MusicInfo
{
/// <summary>
/// 姝屾洸鍚嶇О
@@ -240,11 +241,40 @@
/// 绫诲瀷<鑷繁鐢�>
/// </summary>
public string type = string.Empty;
-
-
-
-
+ /// <summary>
+ /// 鍒楄〃鍚嶅拰group缁勫悕鏄竴鏍风殑
+ /// </summary>
+ public string listName = string.Empty;
}
+ [System.Serializable]
+ /// <summary>
+ /// 鍒楄〃鍚嶅垪琛�
+ /// </summary>
+ public class GroupList
+ {
+ /// <summary>
+ ///璁惧sid
+ /// </summary>
+ public string sid = string.Empty;
+ /// <summary>
+ /// 鍒楄〃鍚嶉泦鍚�
+ /// </summary>
+ public List<ListName> groupList = new List<ListName>();
+
+ }
+ [System.Serializable]
+ /// <summary>
+ /// 鍒楄〃鍚�
+ /// </summary>
+ public class ListName
+ {
+ /// <summary>
+ /// 缁勫悕=鍒楄〃鍚�
+ /// </summary>
+ public string group = string.Empty;
+
+ }
+
}
\ No newline at end of file
--
Gitblit v1.8.0