From 66c72ee19b9e3543537621b8dd25685c9b5c03c4 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 02 八月 2022 14:05:30 +0800
Subject: [PATCH] RGB色盘优化，第三方平台对接功能
---
HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs | 39 +++++++++++++++++++++++----------------
1 files changed, 23 insertions(+), 16 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs
index e1d37c4..fb59e14 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs
@@ -49,6 +49,7 @@
/// </summary>
static void clearA31Threads()
{
+
var threads = threadLists.FindAll((obj) => { return obj.Name == "A31"; });
foreach (var thread in threads)
{
@@ -75,10 +76,7 @@
/// 瀹氫箟鍏ㄥ眬瀵硅薄
/// </summary>
VerticalRefreshLayout verticalRefresh;
- /// <summary>
- /// 涓轰簡闊充箰鍒锋柊鐘舵�佸畾涔夊叏灞�瀵硅薄
- /// </summary>
- MusicView musicView = new MusicView();
+
public void Show()
{
#region 鐣岄潰甯冨眬
@@ -102,10 +100,10 @@
verticalRefresh.BeginHeaderRefreshingAction += () =>
{
-
+
+ ////鍙戦�佽鍙栭煶涔愭挱鏀惧櫒鐘舵�佺嚎绋�
SeachMusic();
verticalRefresh.EndHeaderRefreshing();
-
};
this.AddChidren(loading);
SeachMusic();
@@ -116,15 +114,19 @@
/// </summary>
void SeachMusic()
{
+
Application.RunOnMainThread(() =>
{
verticalRefresh.RemoveAll();
-
- var musicListFunction = SendMethod.mMethod.GetMusicList;
+ A31MusicModel.A31MusicModelList.Clear();
+ 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 function = musicListFunction[i];
+ var music = A31MusicModel.A31MusicModelList.Find((obj) =>
+ (obj.functionMusic.deviceId == function.deviceId && function.spk == SPK.MusicStandard) || (
+ obj.functionMusic.deviceId == function.deviceId && function.spk == SPK.AvMusic)
+ );
if (music == null)
{
A31MusicModel.A31MusicModelList.Add(new A31MusicModel { functionMusic = function });
@@ -139,11 +141,12 @@
{
var a31player = A31MusicModel.A31MusicModelList[i];
- if (a31player.functionMusic.online == false)
- {
- //涓嶅湪绾夸笉鏄剧ず
- continue;
- }
+ //if (a31player.functionMusic.online == false)
+ //{
+ // //涓嶅湪绾夸笉鏄剧ず
+ // continue;
+ //}
+
Application.RunOnMainThread(() =>
{
MusicListView(a31player);
@@ -180,12 +183,16 @@
/// </summary>
void MusicListView(A31MusicModel player)
{
+ /// <summary>
+ /// 涓轰簡闊充箰鍒锋柊鐘舵�佸畾涔夊叏灞�瀵硅薄
+ /// </summary>
+ MusicView musicView = new MusicView();
musicView.ViewAddChidren(verticalRefresh);
musicView.muiscFl.Tag = player.functionMusic;//澶氫釜闊充箰鎾斁鍣ㄦ洿鏂扮姸鎬佽鐢ㄥ埌
musicView.singerBtn.Text = player.functionMusic.GetAttrState(KeyProperty.song_name);
musicView.songNameBtn.Text = player.functionMusic.GetAttrState(KeyProperty.song_name);
musicView.musicNameBtn.Text = player.functionMusic.name;
-
+ musicView.collectIconBtn.Visible = false;//鍏堟殏鏃堕殣钘忔敹钘忓姛鑳�
///鏀惰棌浜嬩欢
musicView.collectIconBtn.MouseUpEventHandler += (sender, e) =>
{
--
Gitblit v1.8.0