From b88f0d4dd35615302186c0c238d1b61825a74892 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 23 二月 2022 11:04:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wjc' into release0123
---
HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs
index d87c19f..c1811aa 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs
@@ -75,10 +75,7 @@
/// 瀹氫箟鍏ㄥ眬瀵硅薄
/// </summary>
VerticalRefreshLayout verticalRefresh;
- /// <summary>
- /// 涓轰簡闊充箰鍒锋柊鐘舵�佸畾涔夊叏灞�瀵硅薄
- /// </summary>
- MusicView musicView = new MusicView();
+
public void Show()
{
#region 鐣岄潰甯冨眬
@@ -120,6 +117,7 @@
Application.RunOnMainThread(() =>
{
verticalRefresh.RemoveAll();
+ A31MusicModel.A31MusicModelList.Clear();
var musicListFunction = FunctionList.List.GetMusicList();
for (int i = 0; i < musicListFunction.Count; i++)
{
@@ -142,12 +140,12 @@
{
var a31player = A31MusicModel.A31MusicModelList[i];
- if (a31player.functionMusic.online == false)
- {
- //涓嶅湪绾夸笉鏄剧ず
- continue;
- }
-
+ //if (a31player.functionMusic.online == false)
+ //{
+ // //涓嶅湪绾夸笉鏄剧ず
+ // continue;
+ //}
+
Application.RunOnMainThread(() =>
{
MusicListView(a31player);
@@ -184,6 +182,10 @@
/// </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);
--
Gitblit v1.8.0