From d6c09ce6fdb01350db2336d287bbd3c123289a30 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期日, 09 十月 2022 16:52:08 +0800
Subject: [PATCH] 图片key加密问题修复，百叶帘
---
HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicModel.cs | 72 ++++++++++++++++++++++++++----------
1 files changed, 52 insertions(+), 20 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicModel.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicModel.cs
index 40ee2ef..1207c0b 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,14 +52,18 @@
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>
@@ -80,7 +86,7 @@
/// <summary>
/// 鍒楄〃
/// </summary>
- public List<PalyList> palyLists = new List<PalyList>();
+ public List<PalyList> palyLists = new List<PalyList>();
/// <summary>
/// 鍠滅埍闊充箰鍒楄〃
@@ -96,8 +102,8 @@
/// </summary>
public static A31MusicModel Current;
-
-
+
+
/// <summary>
/// 鎸囧畾鍒楄〃鍚嶈幏鍙栭煶涔愬垪琛�
@@ -105,19 +111,16 @@
/// <returns></returns>
public List<Songs> GetSongList(string listName)
{
- var list = palyLists.Find((o)=>o.group==listName);
- if (list==null) {
+ var list = palyLists.Find((o) => o.group == listName);
+ if (list == null)
+ {
return new List<Songs>();
}
return list.songs;
}
-
+
public Slaves Slave = new Slaves();
- /// <summary>
- /// 璁板綍鏃堕棿
- /// </summary>
- public static DateTime ProgressDateTime = DateTime.Now;
/// <summary>
/// 鍒ゆ柇鏄惁鏄痡son鏁版嵁
@@ -224,7 +227,7 @@
public List<Songs> songs = new List<Songs>();
}
[System.Serializable]
- public class Songs:MusicInfo
+ public class Songs : MusicInfo
{
/// <summary>
/// 姝屾洸鍚嶇О
@@ -242,11 +245,40 @@
/// 绫诲瀷<鑷繁鐢�>
/// </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 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