From 592974441a4df95fffd9167c90192da1a390b1c2 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 06 六月 2023 11:51:12 +0800
Subject: [PATCH] Merge branch 'Dev-Branch'
---
HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicModel.cs | 67 ++++++++++++++++++++++-----------
1 files changed, 45 insertions(+), 22 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicModel.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicModel.cs
index 360d7c0..fdf19dd 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicModel.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicModel.cs
@@ -23,6 +23,8 @@
public Function functionMusic = new Function();
+
+
/// <summary>
///淇濆瓨褰撳墠闊充箰鍒楄〃
/// </summary>
@@ -61,33 +63,37 @@
/// 璁板綍婊戝姩闊抽噺鏉℃椂闂�<鐢ㄦ潵澶勭悊闊抽噺璺冲姩>
/// </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>
@@ -104,19 +110,18 @@
/// 鎸囧畾鍒楄〃鍚嶈幏鍙栭煶涔愬垪琛�
/// </summary>
/// <returns></returns>
- public List<Songs> GetSongList(string listName)
+ public List<SongInfo> GetSongList(string listName)
{
- var list = palyLists.Find((o) => o.group == listName);
+ var list = CurrentPlayMusicInfoList.Find((o) => o.group == listName);
if (list == null)
{
- return new List<Songs>();
+ return new List<SongInfo>();
}
return list.songs;
}
public Slaves Slave = new Slaves();
-
/// <summary>
/// 鍒ゆ柇鏄惁鏄痡son鏁版嵁
@@ -161,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
@@ -195,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>
/// 姝屾洸鍚嶇О
@@ -237,6 +250,10 @@
/// 鏃堕暱
/// </summary>
public string time = string.Empty;
+ /// <summary>
+ /// 姝屾洸鍦板潃
+ /// </summary>
+ public string url = string.Empty;
/// <summary>
/// 绫诲瀷<鑷繁鐢�>
/// </summary>
@@ -259,6 +276,10 @@
/// </summary>
public string sid = string.Empty;
/// <summary>
+ /// 闊充箰婧�
+ /// </summary>
+ public string source = string.Empty;
+ /// <summary>
/// 鍒楄〃鍚嶉泦鍚�
/// </summary>
public List<ListName> groupList = new List<ListName>();
@@ -277,4 +298,6 @@
}
+
+
}
\ No newline at end of file
--
Gitblit v1.8.0