From e2a009ca812c2f933e195c4276b79c34ed31862a Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期五, 17 十二月 2021 18:29:10 +0800
Subject: [PATCH] 2021-12-17-01
---
HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicModel.cs | 104 +++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 83 insertions(+), 21 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicModel.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicModel.cs
index 13991b2..15371bc 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicModel.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicModel.cs
@@ -7,7 +7,7 @@
{
[System.Serializable]
- public class A31MusicModel : Function
+ public class A31MusicModel
{
public static List<A31MusicModel> A31MusicModelList = new List<A31MusicModel> { };
static readonly string a31MusiceModeListFilePath = "A31MusiceModeListFilePath";
@@ -46,15 +46,19 @@
}
}
}
-
+ /// <summary>
+ /// 闊充箰鍔熻兘
+ /// </summary>
+ public Function functionMusic = new Function();
/// <summary>
/// 绉婚櫎涔嬪墠鐨勭嚎绋�
/// </summary>
- public static void RemoveListThread() {
+ public static void RemoveListThread()
+ {
for (int i = 0; i < updataMusicStatesListThread.Count;)
{
try
- {
+ {
var thread = updataMusicStatesListThread[i];
if (thread.IsAlive)
{
@@ -81,7 +85,7 @@
{
for (int i = 0; i < A31MusicModelList.Count; i++)
{
- if (A31MusicModelList[i].collect)
+ if (A31MusicModelList[i].functionMusic.collect)
{
return true; //鏌ヨ鏄惁鏈夐煶涔愯鏀惰棌杩�
}
@@ -160,7 +164,7 @@
/// <summary>
///褰撳墠鎾斁鐨勫垪琛ㄤ俊鎭�
/// </summary>
- public List<MusicInfo> CurrentPlayMusicInfoList = new List<MusicInfo>();
+ public List<Songs> CurrentPlayMusicInfoList = new List<Songs>();
/// <summary>
/// 鏄惁鍏佽鏄剧ず
@@ -172,43 +176,49 @@
/// </summary>
public bool IsOnLine = true;
+
+ /// <summary>
+ /// 鍒楄〃
+ /// </summary>
+ public List<PalyListInfo> palyListInfos = new List<PalyListInfo>();
+
/// <summary>
/// 鍠滅埍闊充箰鍒楄〃
/// </summary>
- public List<MusicInfo> LoveMusicInfoList = new List<MusicInfo>();
+ public List<Songs> LoveMusicInfoList = new List<Songs>();
/// <summary>
/// DLNA鎵�鏈夊垪琛�
/// </summary>
- public List<MusicInfo> dlnaMusicInfoLists = new List<MusicInfo>();
+ public List<Songs> dlnaMusicInfoLists = new List<Songs>();
/// <summary>
/// 鐢靛彴鎵�鏈夊垪琛�
/// </summary>
- public List<MusicInfo> CnRadioInfoList = new List<MusicInfo>();
+ public List<Songs> CnRadioInfoList = new List<Songs>();
/// <summary>
/// vTuner鐢靛彴鎵�鏈夊垪琛�
/// </summary>
- public List<MusicInfo> vTunerList = new List<MusicInfo>();
+ public List<Songs> vTunerList = new List<Songs>();
/// <summary>
/// 鍠滅埍鐢靛彴鍒楄〃
/// </summary>
- public List<MusicInfo> LoveRadioInfoList = new List<MusicInfo>();
+ public List<Songs> LoveRadioInfoList = new List<Songs>();
/// <summary>
/// Pandora鐢靛彴鎵�鏈夊垪琛�
/// </summary>
- public List<MusicInfo> PanRadioInfoList = new List<MusicInfo>();
+ public List<Songs> PanRadioInfoList = new List<Songs>();
/// <summary>
/// usb鍒楄〃
/// </summary>
- public List<MusicInfo> USBList = new List<MusicInfo>();
+ public List<Songs> USBList = new List<Songs>();
/// <summary>
/// Tidal鍠滅埍鍒楄〃
/// </summary>
- public List<MusicInfo> TidalLikelist = new List<MusicInfo>();
+ public List<Songs> TidalLikelist = new List<Songs>();
/// <summary>
///鍒涘缓闊充箰鏂囦欢鍒楄〃
/// </summary>
@@ -231,9 +241,9 @@
set
{
_ServerClientType = value;
- if(value == 0)
+ if (value == 0)
{
- name = Name;
+ //name = Name;
}
}
}
@@ -255,11 +265,23 @@
set
{
_MainPlayName = value;
- if(ServerClientType == 1)
- {
- name = value;
- }
+ //if(ServerClientType == 1)
+ //{
+ // name = value;
+ //}
}
+ }
+ /// <summary>
+ /// 鎸囧畾鍒楄〃鍚嶈幏鍙栭煶涔愬垪琛�
+ /// </summary>
+ /// <returns></returns>
+ public List<Songs> GetSongList(string listName)
+ {
+ var list = palyListInfos.Find((o)=>o.group==listName);
+ if (list==null) {
+ return new List<Songs>();
+ }
+ return list.songs;
}
/// <summary>
/// 璁板綍涓绘挱鏀惧櫒鏄惁琚敹钘�(绉�妗″畾涔夌殑)
@@ -310,7 +332,7 @@
/// <summary>
/// 鍒楄〃姝屾洸淇℃伅
/// </summary>
- public List<MusicInfo> MusicInfoList = new List<MusicInfo>();
+ public List<Songs> MusicInfoList = new List<Songs>();
}
[System.Serializable]
public class TidalMusicInfo : MusicInfo
@@ -339,5 +361,45 @@
public string version = string.Empty;
public string uuid = string.Empty;
}
+ [System.Serializable]
+ /// <summary>
+ /// 鍒楄〃淇℃伅
+ /// </summary>
+ public class PalyListInfo
+ {
+ /// <summary>
+ /// 鍒楄〃鍚�
+ /// </summary>
+ public string group = string.Empty;
+ /// <summary>
+ /// 鍒楄〃姝屾洸淇℃伅
+ /// </summary>
+ public List<Songs> songs = new List<Songs>();
+ }
+ [System.Serializable]
+ public class Songs:MusicInfo
+ {
+ /// <summary>
+ /// 姝屾洸鍚嶇О
+ /// </summary>
+ public string name = string.Empty;
+ /// <summary>
+ /// 澶у皬
+ /// </summary>
+ public string size = string.Empty;
+ /// <summary>
+ /// 鏃堕暱
+ /// </summary>
+ public string time = string.Empty;
+ /// <summary>
+ /// 绫诲瀷<鑷繁鐢�>
+ /// </summary>
+ public string type = string.Empty;
+
+
+
+
+ }
+
}
\ No newline at end of file
--
Gitblit v1.8.0