From bdc8f378f6d736fda030b3ceceab3acd91505679 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 28 三月 2023 16:10:50 +0800
Subject: [PATCH] Merge branch 'wjc' into dev-cqy（1.5.9）
---
HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs
index 8674b0d..168d4b0 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs
@@ -182,9 +182,12 @@
UI2.FuntionControlView.Music.View.MyListView myListView = new UI2.FuntionControlView.Music.View.MyListView();
myListView.frameLayout(this, A31MusicModel.Current);
myListView.dialogFra.AddChidren(loading);//dialogFra鍒锋柊鍥炬爣鐖舵帶浠�
+ loading.Start();
///涓嬫媺鍒锋柊
myListView.verticalScrolViewLayout.BeginHeaderRefreshingAction += () =>
{
+ myListView.verticalScrolViewLayout.EndHeaderRefreshing(); //缁撴潫鍒锋柊
+ loading.Start();
System.Threading.Tasks.Task.Run((() =>
{
try
@@ -197,7 +200,6 @@
Application.RunOnMainThread(() =>
{
- //myListView.verticalScrolViewLayout.EndHeaderRefreshing();
myListView.verticalScrolViewLayout.RemoveAll();
var listName = A31MusicModel.Current.functionMusic.GetAttrState(KeyProperty.playlist_name);
var source = A31MusicModel.Current.functionMusic.GetAttrState(KeyProperty.source);
@@ -215,7 +217,8 @@
{
Application.RunOnMainThread(() =>
{
- myListView.verticalScrolViewLayout.EndHeaderRefreshing();
+ loading.Hide();
+ //myListView.verticalScrolViewLayout.EndHeaderRefreshing();
//myListView.verticalScrolViewLayout.RemoveAll();
//var listName = A31MusicModel.Current.functionMusic.GetAttrState(KeyProperty.playlist_name);
//var source = A31MusicModel.Current.functionMusic.GetAttrState(KeyProperty.source);
@@ -225,7 +228,6 @@
});
}
}));
- //缁撴潫鍒锋柊
};
///绉婚櫎鐣岄潰
@@ -234,7 +236,7 @@
myListView.popFra.RemoveFromParent();
};
myListView.backIextBtn.MouseUpEventHandler += removeFromParentView;
- myListView.popFra.MouseUpEventHandler += removeFromParentView;
+ //myListView.popFra.MouseUpEventHandler += removeFromParentView;
#endregion
//var listName = A31MusicModel.Current.functionMusic.GetAttribute("playlist_name").ToString();
//var musicList = A31MusicModel.Current.GetSongList(listName);
@@ -658,7 +660,11 @@
}
else
{
- A31SongPlay.SongListView(verticalScrolViewLayout, musicList, listName, source, frameLayout);
+ Application.RunOnMainThread(() =>
+ {
+ loading.Hide();
+ A31SongPlay.SongListView(verticalScrolViewLayout, musicList, listName, source, frameLayout);
+ });
}
}
/// <summary>
--
Gitblit v1.8.0