From 024703246120fee33e2f6c2f662383f1facdecd2 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 14 四月 2022 15:35:00 +0800
Subject: [PATCH] 2022年04月14日15:34:55
---
HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicModel.cs | 269 +++++++++++++++++------------------------------------
1 files changed, 88 insertions(+), 181 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicModel.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicModel.cs
index 13991b2..0f8eabb 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicModel.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicModel.cs
@@ -7,88 +7,22 @@
{
[System.Serializable]
- public class A31MusicModel : Function
+ public class A31MusicModel
{
public static List<A31MusicModel> A31MusicModelList = new List<A31MusicModel> { };
static readonly string a31MusiceModeListFilePath = "A31MusiceModeListFilePath";
static A31MusicModel()
{
- Refresh();
+ //Refresh();
}
- static List<System.Threading.Thread> updataMusicStatesListThread = new List<System.Threading.Thread>();
+
/// <summary>
- /// 璇诲彇闊充箰鐘舵��
+ /// 闊充箰鍔熻兘
/// </summary>
- public static void ReadMusicStates()
- {
- RemoveListThread();
- if (GetCollection)
- {
- for (int i = 0; i < A31MusicModelList.Count; i++)
- {
- var a31player = A31MusicModelList[i];
- var musicThread = new System.Threading.Thread(() =>
- {
- while (true)
- {
- System.Threading.Thread.Sleep(1000);
- if (!a31player.IsOnLine)
- {
- continue;
- }
- SendMethod.ReadStatus(a31player);
- }
- })
- { IsBackground = true, Name = "A31" };
- musicThread.Start();
- updataMusicStatesListThread.Add(musicThread);
- }
- }
- }
-
- /// <summary>
- /// 绉婚櫎涔嬪墠鐨勭嚎绋�
- /// </summary>
- public static void RemoveListThread() {
- for (int i = 0; i < updataMusicStatesListThread.Count;)
- {
- try
- {
- var thread = updataMusicStatesListThread[i];
- if (thread.IsAlive)
- {
- thread.Abort();
- }
- updataMusicStatesListThread.Remove(thread);
- }
- catch (Exception e)
- {
- MainPage.Log("clearA31Threads error : " + e.Message);
- }
- finally
- {
- MainPage.Log("clearA31Threads over");
- }
- }
- }
- /// <summary>
- /// 闊充箰鍒楄〃閲屾槸鍚︽湁闊充箰琚敹钘忚繃
- /// </summary>
- static bool GetCollection
- {
- get
- {
- for (int i = 0; i < A31MusicModelList.Count; i++)
- {
- if (A31MusicModelList[i].collect)
- {
- return true; //鏌ヨ鏄惁鏈夐煶涔愯鏀惰棌杩�
- }
- }
- return false;
- }
- }
+ public Function functionMusic = new Function();
+
+
/// <summary>
///淇濆瓨褰撳墠闊充箰鍒楄〃
/// </summary>
@@ -116,10 +50,7 @@
A31MusicModelList.RemoveAll((obj) => obj == null);
}
- /// <summary>
- /// 闊充箰鎾斁鍣ㄥ悕绉�
- /// </summary>
- public string Name = string.Empty;
+
/// <summary>
/// 涓婁竴娆℃洿鏂扮殑鏃堕棿
/// 璁板綍鏁版嵁鍙嶉鐨勬椂闂�(鍥犱负鏈夋椂闂寸綉缁滃樊鏁版嵁涓嶅洖澶嶏紝瀵艰嚧鍒锋柊褰撳墠鎾斁闊充箰鏃堕棿涓嶆纭�)
@@ -127,40 +58,20 @@
/// </summary>
public DateTime LastDateTime;
/// <summary>
- /// IP鍦板潃
+ /// 璁板綍婊戝姩闊抽噺鏉℃椂闂�<鐢ㄦ潵澶勭悊闊抽噺璺冲姩>
/// </summary>
- public string IPAddress = "192.168.1.100";
-
- /// <summary>
- /// 绔彛
- /// </summary>
- public int Port = 49153;
-
- /// <summary>
- /// 鏄惁鏄挱鏀惧櫒鍒楄〃鏈�鍚庝竴涓�(true)
- /// </summary>
- public bool IsEnd = false;
-
- public int A31DeviceType;
-
- //public string a31Source = "wifi";
- //public string a31Source = string.Empty;
+ public static DateTime ProgressDateTime = DateTime.MinValue;
/// <summary>
/// 闊充箰鎾斁鍣↖D
/// </summary>
public string UniqueDeviceName = string.Empty;
-
- /// <summary>
- /// 褰撳墠鎾斁鐘舵��
- /// </summary>
- public A31PlayStatus A31PlayStatus = new A31PlayStatus();
public MusicInfo CurrentMusic = new MusicInfo();
/// <summary>
///褰撳墠鎾斁鐨勫垪琛ㄤ俊鎭�
/// </summary>
- public List<MusicInfo> CurrentPlayMusicInfoList = new List<MusicInfo>();
+ public List<Songs> CurrentPlayMusicInfoList = new List<Songs>();
/// <summary>
/// 鏄惁鍏佽鏄剧ず
@@ -168,47 +79,15 @@
public bool IsCanShow = true;
/// <summary>
- /// 鏄惁鍦ㄧ嚎锛屽鏋滃湪绾垮氨鍏佽璇诲彇淇℃伅
+ /// 鍒楄〃
/// </summary>
- public bool IsOnLine = true;
+ public List<PalyList> palyLists = new List<PalyList>();
/// <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>();
-
- /// <summary>
- /// 鐢靛彴鎵�鏈夊垪琛�
- /// </summary>
- public List<MusicInfo> CnRadioInfoList = new List<MusicInfo>();
-
- /// <summary>
- /// vTuner鐢靛彴鎵�鏈夊垪琛�
- /// </summary>
- public List<MusicInfo> vTunerList = new List<MusicInfo>();
-
- /// <summary>
- /// 鍠滅埍鐢靛彴鍒楄〃
- /// </summary>
- public List<MusicInfo> LoveRadioInfoList = new List<MusicInfo>();
-
- /// <summary>
- /// Pandora鐢靛彴鎵�鏈夊垪琛�
- /// </summary>
- public List<MusicInfo> PanRadioInfoList = new List<MusicInfo>();
- /// <summary>
- /// usb鍒楄〃
- /// </summary>
- public List<MusicInfo> USBList = new List<MusicInfo>();
- /// <summary>
- /// Tidal鍠滅埍鍒楄〃
- /// </summary>
- public List<MusicInfo> TidalLikelist = new List<MusicInfo>();
/// <summary>
///鍒涘缓闊充箰鏂囦欢鍒楄〃
/// </summary>
@@ -218,60 +97,31 @@
/// </summary>
public static A31MusicModel Current;
- public int _ServerClientType;
- /// <summary>
- /// -1琛ㄧず浠庣殑0琛ㄧず榛樿1琛ㄧず涓荤殑
- /// </summary>
- public int ServerClientType
- {
- get
- {
- return _ServerClientType;
- }
- set
- {
- _ServerClientType = value;
- if(value == 0)
- {
- name = Name;
- }
- }
- }
- /// <summary>
- /// 璁板綍涓绘挱鏀惧櫒IP
- /// </summary>
- public string MainPlayIP = string.Empty;
+
+
- public string _MainPlayName = string.Empty;
/// <summary>
- /// 璁板綍涓绘挱鏀惧櫒鍚嶇О
+ /// 鎸囧畾鍒楄〃鍚嶈幏鍙栭煶涔愬垪琛�
/// </summary>
- public string MainPlayName
+ /// <returns></returns>
+ public List<Songs> GetSongList(string listName)
{
- get
- {
- return _MainPlayName;
+ var list = palyLists.Find((o)=>o.group==listName);
+ if (list==null) {
+ return new List<Songs>();
}
- set
- {
- _MainPlayName = value;
- if(ServerClientType == 1)
- {
- name = value;
- }
- }
+ return list.songs;
}
- /// <summary>
- /// 璁板綍涓绘挱鏀惧櫒鏄惁琚敹钘�(绉�妗″畾涔夌殑)
- /// </summary>
- public bool MainPlayCollection = false;
+
public Slaves Slave = new Slaves();
- /// <summary>
- /// 璁板綍鏃堕棿
- /// </summary>
- public static DateTime ProgressDateTime = DateTime.Now;
+
+ /// <summary>
+ /// 鍒ゆ柇鏄惁鏄痡son鏁版嵁
+ /// </summary>
+ /// <param name="json"></param>
+ /// <returns></returns>
public static bool IsJson(string json)
{
try
@@ -310,7 +160,7 @@
/// <summary>
/// 鍒楄〃姝屾洸淇℃伅
/// </summary>
- public List<MusicInfo> MusicInfoList = new List<MusicInfo>();
+ public List<Songs> MusicInfoList = new List<Songs>();
}
[System.Serializable]
public class TidalMusicInfo : MusicInfo
@@ -340,4 +190,61 @@
public string uuid = string.Empty;
}
+ [System.Serializable]
+ /// <summary>
+ /// 鏀寔澶氫釜闊充箰
+ /// </summary>
+ public class PalyListInfo
+ {
+ /// <summary>
+ /// 闊充箰sid
+ /// </summary>
+ public string sid = string.Empty;
+ /// <summary>
+ /// 瑙ｉ噴澶氫釜闊充箰
+ /// </summary>
+ public List<PalyList> playlist = new List<PalyList>();
+ }
+
+ [System.Serializable]
+ /// <summary>
+ /// 鍒楄〃淇℃伅
+ /// </summary>
+ public class PalyList
+ {
+ /// <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