From 52c945d6f5628e7fac328a5df8bc295ccfc5966b Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 10 一月 2022 20:53:54 +0800
Subject: [PATCH] 2021-1-10-01
---
HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicModel.cs | 182 +++------------------------------------------
1 files changed, 13 insertions(+), 169 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicModel.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicModel.cs
index 52b7c03..16da59d 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicModel.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicModel.cs
@@ -16,83 +16,13 @@
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 Function functionMusic = new Function();
- /// <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].functionMusic.collect)
- {
- return true; //鏌ヨ鏄惁鏈夐煶涔愯鏀惰棌杩�
- }
- }
- return false;
- }
- }
+
+
/// <summary>
///淇濆瓨褰撳墠闊充箰鍒楄〃
/// </summary>
@@ -120,44 +50,20 @@
A31MusicModelList.RemoveAll((obj) => obj == null);
}
- /// <summary>
- /// 闊充箰鎾斁鍣ㄥ悕绉�
- /// </summary>
- public string Name = string.Empty;
+
/// <summary>
/// 涓婁竴娆℃洿鏂扮殑鏃堕棿
/// 璁板綍鏁版嵁鍙嶉鐨勬椂闂�(鍥犱负鏈夋椂闂寸綉缁滃樊鏁版嵁涓嶅洖澶嶏紝瀵艰嚧鍒锋柊褰撳墠鎾斁闊充箰鏃堕棿涓嶆纭�)
/// ((褰撳墠鏃堕棿)DateTime.Now - (璁板綍鏃堕棿)LastDateTimeLastDateTime).TotalSeconds=璇樊鏃堕棿(绉�)
/// </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;
+
/// <summary>
/// 闊充箰鎾斁鍣↖D
/// </summary>
public string UniqueDeviceName = string.Empty;
- /// <summary>
- /// 褰撳墠鎾斁鐘舵��
- /// </summary>
- public A31PlayStatus A31PlayStatus = new A31PlayStatus();
+
public MusicInfo CurrentMusic = new MusicInfo();
@@ -193,33 +99,6 @@
public List<Songs> dlnaMusicInfoLists = new List<Songs>();
/// <summary>
- /// 鐢靛彴鎵�鏈夊垪琛�
- /// </summary>
- public List<Songs> CnRadioInfoList = new List<Songs>();
-
- /// <summary>
- /// vTuner鐢靛彴鎵�鏈夊垪琛�
- /// </summary>
- public List<Songs> vTunerList = new List<Songs>();
-
- /// <summary>
- /// 鍠滅埍鐢靛彴鍒楄〃
- /// </summary>
- public List<Songs> LoveRadioInfoList = new List<Songs>();
-
- /// <summary>
- /// Pandora鐢靛彴鎵�鏈夊垪琛�
- /// </summary>
- public List<Songs> PanRadioInfoList = new List<Songs>();
- /// <summary>
- /// usb鍒楄〃
- /// </summary>
- public List<Songs> USBList = new List<Songs>();
- /// <summary>
- /// Tidal鍠滅埍鍒楄〃
- /// </summary>
- public List<Songs> TidalLikelist = new List<Songs>();
- /// <summary>
///鍒涘缓闊充箰鏂囦欢鍒楄〃
/// </summary>
public List<FileListInfo> FileLists = new List<FileListInfo>();
@@ -228,49 +107,9 @@
/// </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
- {
- get
- {
- return _MainPlayName;
- }
- set
- {
- _MainPlayName = value;
- //if(ServerClientType == 1)
- //{
- // name = value;
- //}
- }
- }
/// <summary>
/// 鎸囧畾鍒楄〃鍚嶈幏鍙栭煶涔愬垪琛�
/// </summary>
@@ -294,6 +133,11 @@
/// </summary>
public static DateTime ProgressDateTime = DateTime.Now;
+ /// <summary>
+ /// 鍒ゆ柇鏄惁鏄痡son鏁版嵁
+ /// </summary>
+ /// <param name="json"></param>
+ /// <returns></returns>
public static bool IsJson(string json)
{
try
--
Gitblit v1.8.0