From 9acd3887f1f8db40d59f991b1726a61aa7c7637c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 12 五月 2021 15:13:56 +0800
Subject: [PATCH] Merge branch 'CJL' into wxr4

---
 HDL_ON/Entity/FunctionList.cs |   18 +++++++++++++++++-
 1 files changed, 17 insertions(+), 1 deletions(-)

diff --git a/HDL_ON/Entity/FunctionList.cs b/HDL_ON/Entity/FunctionList.cs
index fdb28f3..bef3882 100644
--- a/HDL_ON/Entity/FunctionList.cs
+++ b/HDL_ON/Entity/FunctionList.cs
@@ -108,8 +108,19 @@
         {
             return Functions.FindAll((obj) => obj.spk == SPK.IrModule);
         }
-
         #endregion
+
+        /// <summary>
+        /// 闊充箰鍒楄〃
+        /// </summary>
+        /// <returns></returns>
+        public List<Function> GetMusicList()
+        {
+            var spkList = SPK.MusicSpkList();
+            return Functions.FindAll((obj) => spkList.Contains(obj.spk));
+        }
+
+
         /// <summary>
         /// 鐜浼犳劅鍣ㄥ垪琛�
         /// </summary>
@@ -164,6 +175,11 @@
                     FileUtlis.Files.DeleteFile(filePath);
                     return;
                 }
+                //闊充箰閮ㄥ垎瑕佷慨鏀�
+                //if(tempFunction.spk.ToString() == SPK.MusicStandard)
+                //{
+                //    UI.Music.A31MusicModel.A31MusicModelList.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<UI.Music.A31MusicModel>(functionDataString));
+                //}
                 if (checkRepeat == true)
                 {
                     //妫�娴嬮噸澶�

--
Gitblit v1.8.0