From c484347d42f8c14f03f498e689069a14a45abc93 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期五, 03 二月 2023 17:56:45 +0800
Subject: [PATCH] 2023年02月03日17:56:24
---
HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs | 36 +++++++++++++++++++-----------------
1 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs
index a74585d..46a2a47 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs
@@ -43,7 +43,7 @@
{
///1绉掑畾鏃舵洿鏂扮姸鎬�
- timerUpdateStatus();
+ TimerUpdateStatus();
#region ---鐣岄潰甯冨眬---
this.BackgroundColor = MusicColor.ViewColor;
topView = new TopView();
@@ -161,7 +161,7 @@
return name == musicInfo.name;
}))
{
- A31MusicModel.Current.LoveMusicInfoList.Add(new Songs { name = name, time = songTime });
+ A31MusicModel.Current.LoveMusicInfoList.Add(new SongInfo { name = name, time = songTime });
}
}
else
@@ -185,14 +185,14 @@
///涓嬫媺鍒锋柊
myListView.verticalScrolViewLayout.BeginHeaderRefreshingAction += () =>
{
- System.Threading.Tasks.Task.Run(() =>
+ System.Threading.Tasks.Task.Run((Action)(() =>
{
try
{
- A31MusicModel.Current.palyLists.Clear();
- if (A31MusicModel.Current.palyLists.Count == 0)
+ A31MusicModel.Current.CurrentPlayMusicInfoList.Clear();
+ if (A31MusicModel.Current.CurrentPlayMusicInfoList.Count == 0)
{
- SendMethod.Current.GetPalyList(A31MusicModel.Current.functionMusic);
+ SendMethod.Current.GetCurrentPalyList(A31MusicModel.Current.functionMusic);
}
}
@@ -206,11 +206,13 @@
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, myListView.popFra);
+
+ A31SongPlay.SongListView(myListView.verticalScrolViewLayout, musicList, listName, source, myListView.popFra);
});
}
- });
+ }));
//缁撴潫鍒锋柊
};
@@ -329,7 +331,7 @@
/// <summary>
/// 瀹氭椂鏇存柊鐘舵��
/// </summary>
- void timerUpdateStatus()
+ void TimerUpdateStatus()
{
timerThread = new System.Threading.Thread((obj) =>
{
@@ -600,21 +602,21 @@
void PlayListView(FrameLayout frameLayout, VerticalRefreshLayout verticalScrolViewLayout)
{
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);
if (musicList.Count == 0)
{
- System.Threading.Tasks.Task.Run(() =>
+ System.Threading.Tasks.Task.Run((Action)(() =>
{
try
{
- A31MusicModel.Current.palyLists.Clear();
- if (A31MusicModel.Current.palyLists.Count == 0)
+ A31MusicModel.Current.CurrentPlayMusicInfoList.Clear();
+ if (A31MusicModel.Current.CurrentPlayMusicInfoList.Count == 0)
{
//鑾峰彇姝屾洸鍒楄〃
- SendMethod.Current.GetPalyList(A31MusicModel.Current.functionMusic);
+ SendMethod.Current.GetCurrentPalyList(A31MusicModel.Current.functionMusic);
}
}
@@ -626,14 +628,14 @@
Application.RunOnMainThread(() =>
{
musicList = A31MusicModel.Current.GetSongList(listName);
- A31SongPlay.SongListView(verticalScrolViewLayout, musicList, listName, frameLayout);
+ A31SongPlay.SongListView(verticalScrolViewLayout, musicList, listName, source, frameLayout);
});
}
- });
+ }));
}
else
{
- A31SongPlay.SongListView(verticalScrolViewLayout, musicList, listName, frameLayout);
+ A31SongPlay.SongListView(verticalScrolViewLayout, musicList, listName, source, frameLayout);
}
}
/// <summary>
--
Gitblit v1.8.0