From 452e8cef1c740d18ee398be6971d9952e41dbd4a Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 12 四月 2023 16:11:50 +0800
Subject: [PATCH] 1
---
HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs | 67 ++++++++++++++++++++++++---------
1 files changed, 48 insertions(+), 19 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs
index 46a2a47..168d4b0 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs
@@ -182,17 +182,31 @@
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 += () =>
{
- System.Threading.Tasks.Task.Run((Action)(() =>
+ myListView.verticalScrolViewLayout.EndHeaderRefreshing(); //缁撴潫鍒锋柊
+ loading.Start();
+ System.Threading.Tasks.Task.Run((() =>
{
try
{
A31MusicModel.Current.CurrentPlayMusicInfoList.Clear();
if (A31MusicModel.Current.CurrentPlayMusicInfoList.Count == 0)
{
- SendMethod.Current.GetCurrentPalyList(A31MusicModel.Current.functionMusic);
+ SendMethod.Current.GetCurrentPalyList(A31MusicModel.Current.functionMusic, () =>
+ {
+
+ Application.RunOnMainThread(() =>
+ {
+ myListView.verticalScrolViewLayout.RemoveAll();
+ var listName = A31MusicModel.Current.functionMusic.GetAttrState(KeyProperty.playlist_name);
+ var source = A31MusicModel.Current.functionMusic.GetAttrState(KeyProperty.source);
+ var musicList = A31MusicModel.Current.GetSongList(listName);
+ A31SongPlay.SongListView(myListView.verticalScrolViewLayout, musicList, listName, source, myListView.popFra);
+ });
+ });
}
}
@@ -203,17 +217,17 @@
{
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);
- var musicList = A31MusicModel.Current.GetSongList(listName);
+ 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);
+ //var musicList = A31MusicModel.Current.GetSongList(listName);
- A31SongPlay.SongListView(myListView.verticalScrolViewLayout, musicList, listName, source, myListView.popFra);
+ //A31SongPlay.SongListView(myListView.verticalScrolViewLayout, musicList, listName, source, myListView.popFra);
});
}
}));
- //缁撴潫鍒锋柊
};
///绉婚櫎鐣岄潰
@@ -222,14 +236,14 @@
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);
//new A31SongPlay { }.SongListView(myListView.verticalScrolViewLayout, musicList, listName);
- PlayListView(myListView.popFra, myListView.verticalScrolViewLayout);
- UpdateSelectedMusic(myListView.popFra, myListView.verticalScrolViewLayout);
+ this.PlayListView(myListView.popFra, myListView.verticalScrolViewLayout, loading);
+ this.UpdateSelectedMusic(myListView.popFra, myListView.verticalScrolViewLayout);
};
///闊抽噺鍥炬爣鐐瑰嚮浜嬩欢
@@ -599,16 +613,17 @@
/// 鍔犺浇鎾斁闊充箰鍒楄〃View
/// </summary>
/// <param name="verticalScrolViewLayout"></param>
- void PlayListView(FrameLayout frameLayout, VerticalRefreshLayout verticalScrolViewLayout)
+ private void PlayListView(FrameLayout frameLayout, VerticalRefreshLayout verticalScrolViewLayout, Loading loading)
{
verticalScrolViewLayout.RemoveAll();
var listName = A31MusicModel.Current.functionMusic.GetAttrState(KeyProperty.playlist_name);
var source = A31MusicModel.Current.functionMusic.GetAttrState(KeyProperty.source);
//鑾峰彇缂撳瓨姝屾洸鍒楄〃
var musicList = A31MusicModel.Current.GetSongList(listName);
+ loading.Start();
if (musicList.Count == 0)
{
- System.Threading.Tasks.Task.Run((Action)(() =>
+ System.Threading.Tasks.Task.Run((() =>
{
try
{
@@ -616,7 +631,16 @@
if (A31MusicModel.Current.CurrentPlayMusicInfoList.Count == 0)
{
//鑾峰彇姝屾洸鍒楄〃
- SendMethod.Current.GetCurrentPalyList(A31MusicModel.Current.functionMusic);
+ SendMethod.Current.GetCurrentPalyList(A31MusicModel.Current.functionMusic, () =>
+ {
+
+ Application.RunOnMainThread(() =>
+ {
+ musicList = A31MusicModel.Current.GetSongList(listName);
+ A31SongPlay.SongListView(verticalScrolViewLayout, musicList, listName, source, frameLayout);
+
+ });
+ });
}
}
@@ -627,21 +651,26 @@
{
Application.RunOnMainThread(() =>
{
- musicList = A31MusicModel.Current.GetSongList(listName);
- A31SongPlay.SongListView(verticalScrolViewLayout, musicList, listName, source, frameLayout);
+ loading.Hide();
+ //musicList = A31MusicModel.Current.GetSongList(listName);
+ //A31SongPlay.SongListView(verticalScrolViewLayout, musicList, listName, source, frameLayout);
});
}
}));
}
else
{
- A31SongPlay.SongListView(verticalScrolViewLayout, musicList, listName, source, frameLayout);
+ Application.RunOnMainThread(() =>
+ {
+ loading.Hide();
+ A31SongPlay.SongListView(verticalScrolViewLayout, musicList, listName, source, frameLayout);
+ });
}
}
/// <summary>
/// 瀹氭椂鏇存柊褰撳墠鎾斁闊充箰
/// </summary>
- void UpdateSelectedMusic(FrameLayout frameLayout, VerticalRefreshLayout middViewLayout)
+ private void UpdateSelectedMusic(FrameLayout frameLayout, VerticalRefreshLayout middViewLayout)
{
UpdateThread.updateCurrMusicThread(frameLayout, middViewLayout, A31MusicModel.Current);
}
--
Gitblit v1.8.0