From a1f2f085e9a2790daecdb5a12d1075b64b2a3d92 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 24 一月 2022 11:45:43 +0800
Subject: [PATCH] 备份

---
 HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs
index e1d37c4..d87c19f 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs
@@ -102,10 +102,10 @@
 
             verticalRefresh.BeginHeaderRefreshingAction += () =>
             {
-
+               
+                ////鍙戦�佽鍙栭煶涔愭挱鏀惧櫒鐘舵�佺嚎绋�
                 SeachMusic();
                 verticalRefresh.EndHeaderRefreshing();
-
             };
             this.AddChidren(loading);
             SeachMusic();
@@ -116,15 +116,18 @@
         /// </summary>
         void SeachMusic()
         {
+
             Application.RunOnMainThread(() =>
             {
                 verticalRefresh.RemoveAll();
-
-                var musicListFunction = SendMethod.mMethod.GetMusicList;
+                var musicListFunction = FunctionList.List.GetMusicList();
                 for (int i = 0; i < musicListFunction.Count; i++)
                 {
                     var function = musicListFunction[i];
-                    var music = A31MusicModel.A31MusicModelList.Find((music) => music.functionMusic.deviceId == function.deviceId);
+                    var music = A31MusicModel.A31MusicModelList.Find((obj) =>
+                   (obj.functionMusic.deviceId == function.deviceId && function.spk == "music.standard") || (
+                     obj.functionMusic.deviceId == function.deviceId && function.spk == "av.music")
+                    );
                     if (music == null)
                     {
                         A31MusicModel.A31MusicModelList.Add(new A31MusicModel { functionMusic = function });
@@ -144,6 +147,7 @@
                         //涓嶅湪绾夸笉鏄剧ず
                         continue;
                     }
+                  
                     Application.RunOnMainThread(() =>
                     {
                         MusicListView(a31player);

--
Gitblit v1.8.0