From 452e8cef1c740d18ee398be6971d9952e41dbd4a Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 12 四月 2023 16:11:50 +0800
Subject: [PATCH] 1
---
HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicModel.cs | 123 +++++++++++++++++++++++++++++------------
1 files changed, 87 insertions(+), 36 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicModel.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicModel.cs
index 1e519bd..fdf19dd 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicModel.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicModel.cs
@@ -16,13 +16,15 @@
//Refresh();
}
-
+
/// <summary>
/// 闊充箰鍔熻兘
/// </summary>
public Function functionMusic = new Function();
-
-
+
+
+
+
/// <summary>
///淇濆瓨褰撳墠闊充箰鍒楄〃
/// </summary>
@@ -50,43 +52,48 @@
A31MusicModelList.RemoveAll((obj) => obj == null);
}
-
+
/// <summary>
/// 涓婁竴娆℃洿鏂扮殑鏃堕棿
- /// 璁板綍鏁版嵁鍙嶉鐨勬椂闂�(鍥犱负鏈夋椂闂寸綉缁滃樊鏁版嵁涓嶅洖澶嶏紝瀵艰嚧鍒锋柊褰撳墠鎾斁闊充箰鏃堕棿涓嶆纭�)
+ /// 璁板綍鏁版嵁鍙嶉鐨勬椂闂�(鍥犱负鏈夋椂鍊欑綉缁滃樊鏁版嵁涓嶅洖澶嶏紝瀵艰嚧鍒锋柊褰撳墠鎾斁闊充箰鏃堕棿涓嶆纭�)
/// ((褰撳墠鏃堕棿)DateTime.Now - (璁板綍鏃堕棿)LastDateTimeLastDateTime).TotalSeconds=璇樊鏃堕棿(绉�)
/// </summary>
public DateTime LastDateTime;
-
+ /// <summary>
+ /// 璁板綍婊戝姩闊抽噺鏉℃椂闂�<鐢ㄦ潵澶勭悊闊抽噺璺冲姩>
+ /// </summary>
+ public static DateTime ProgressDateTime = DateTime.MinValue;
+
/// <summary>
/// 闊充箰鎾斁鍣↖D
/// </summary>
public string UniqueDeviceName = string.Empty;
-
public MusicInfo CurrentMusic = new MusicInfo();
- /// <summary>
- ///褰撳墠鎾斁鐨勫垪琛ㄤ俊鎭�
- /// </summary>
- public List<Songs> CurrentPlayMusicInfoList = new List<Songs>();
/// <summary>
/// 鏄惁鍏佽鏄剧ず
/// </summary>
public bool IsCanShow = true;
-
+
/// <summary>
- /// 鍒楄〃
+ /// 褰撳墠鎾斁姝屾洸鍒楄〃
/// </summary>
- public List<PalyList> palyLists = new List<PalyList>();
-
+ public List<SongList> CurrentPlayMusicInfoList = new List<SongList>();
/// <summary>
/// 鍠滅埍闊充箰鍒楄〃
/// </summary>
- public List<Songs> LoveMusicInfoList = new List<Songs>();
-
+ public List<SongInfo> LoveMusicInfoList = new List<SongInfo>();
+ /// <summary>
+ /// 鎵�鏈夈�愰煶涔愬垪琛ㄣ��
+ /// </summary>
+ public List<SongList> AllMusicLists = new List<SongList>();
+ /// <summary>
+ /// 鎵�鏈夈�愰煶涔愭簮銆戠殑鍒楄〃
+ /// </summary>
+ public List<GroupList> AllSourceGroupList = new List<GroupList>();
/// <summary>
///鍒涘缓闊充箰鏂囦欢鍒楄〃
/// </summary>
@@ -96,28 +103,25 @@
/// </summary>
public static A31MusicModel Current;
-
-
+
+
/// <summary>
/// 鎸囧畾鍒楄〃鍚嶈幏鍙栭煶涔愬垪琛�
/// </summary>
/// <returns></returns>
- public List<Songs> GetSongList(string listName)
+ public List<SongInfo> GetSongList(string listName)
{
- var list = palyLists.Find((o)=>o.group==listName);
- if (list==null) {
- return new List<Songs>();
+ var list = CurrentPlayMusicInfoList.Find((o) => o.group == listName);
+ if (list == null)
+ {
+ return new List<SongInfo>();
}
return list.songs;
}
-
+
public Slaves Slave = new Slaves();
- /// <summary>
- /// 璁板綍鏃堕棿
- /// </summary>
- public static DateTime ProgressDateTime = DateTime.MinValue;
/// <summary>
/// 鍒ゆ柇鏄惁鏄痡son鏁版嵁
@@ -162,7 +166,7 @@
/// <summary>
/// 鍒楄〃姝屾洸淇℃伅
/// </summary>
- public List<Songs> MusicInfoList = new List<Songs>();
+ public List<SongInfo> MusicInfoList = new List<SongInfo>();
}
[System.Serializable]
public class TidalMusicInfo : MusicInfo
@@ -196,35 +200,43 @@
/// <summary>
/// 鏀寔澶氫釜闊充箰
/// </summary>
- public class PalyListInfo
- {
+ public class PalyerSongListInfo
+ {
/// <summary>
/// 闊充箰sid
/// </summary>
public string sid = string.Empty;
/// <summary>
- /// 瑙ｉ噴澶氫釜闊充箰
+ /// 闊充箰婧�
/// </summary>
- public List<PalyList> playlist = new List<PalyList>();
+ public string source = string.Empty;
+ /// <summary>
+ /// 鍒楄〃淇℃伅
+ /// </summary>
+ public List<SongList> playlist = new List<SongList>();
}
[System.Serializable]
/// <summary>
/// 鍒楄〃淇℃伅
/// </summary>
- public class PalyList
+ public class SongList
{
/// <summary>
/// 鍒楄〃鍚�
/// </summary>
public string group = string.Empty;
/// <summary>
+ /// 鑷繁瀹氫箟鐨�(鐢ㄨ瘑鍒槸閭ｄ釜闊充箰婧愮殑鍒楄〃)
+ /// </summary>
+ public string source = string.Empty;
+ /// <summary>
/// 鍒楄〃姝屾洸淇℃伅
/// </summary>
- public List<Songs> songs = new List<Songs>();
+ public List<SongInfo> songs = new List<SongInfo>();
}
[System.Serializable]
- public class Songs:MusicInfo
+ public class SongInfo : MusicInfo
{
/// <summary>
/// 姝屾洸鍚嶇О
@@ -239,14 +251,53 @@
/// </summary>
public string time = string.Empty;
/// <summary>
+ /// 姝屾洸鍦板潃
+ /// </summary>
+ public string url = string.Empty;
+ /// <summary>
/// 绫诲瀷<鑷繁鐢�>
/// </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 string source = 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