From 80e4fc87ee91231d1b452c845ff8a57727d4dc44 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期五, 14 一月 2022 13:10:28 +0800
Subject: [PATCH] 2021-1-14-1
---
HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs
index e1d37c4..2d2a565 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs
@@ -102,10 +102,9 @@
verticalRefresh.BeginHeaderRefreshingAction += () =>
{
-
- SeachMusic();
verticalRefresh.EndHeaderRefreshing();
-
+ ////鍙戦�佽鍙栭煶涔愭挱鏀惧櫒鐘舵�佺嚎绋�
+ SeachMusic();
};
this.AddChidren(loading);
SeachMusic();
@@ -116,15 +115,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((music) =>
+ (music.functionMusic.deviceId == function.deviceId && function.spk == "music.standard") || (
+ music.functionMusic.deviceId == function.deviceId && function.spk == "av.music")
+ );
if (music == null)
{
A31MusicModel.A31MusicModelList.Add(new A31MusicModel { functionMusic = function });
@@ -144,6 +146,7 @@
//涓嶅湪绾夸笉鏄剧ず
continue;
}
+
Application.RunOnMainThread(() =>
{
MusicListView(a31player);
--
Gitblit v1.8.0