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/A31SongPlay.cs | 53 +++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 45 insertions(+), 8 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/A31SongPlay.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/A31SongPlay.cs
index f036a0b..139f635 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/A31SongPlay.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/A31SongPlay.cs
@@ -2,6 +2,7 @@
using Shared;
using HDL_ON.UI.Music;
using System.Collections.Generic;
+using HDL_ON.UI.UI2.FuntionControlView.Music;
namespace HDL_ON.UI.Music
{
@@ -13,13 +14,14 @@
Tag = "Music";
}
- public void Show(List<Songs> musicList,string listName)
+
+ public void Show(SongList songLists)
{
this.BackgroundColor = MusicColor.ViewColor;
var topView = new TopView();
this.AddChidren(topView.TopFLayoutView());
- topView.topNameBtn.TextID = StringId.localMusic;
+ topView.topNameBtn.Text=songLists.group;
topView.clickBackBtn.MouseUpEventHandler += (sender, e) =>
{
this.RemoveFromParent();
@@ -33,10 +35,33 @@
this.AddChidren(vv);
vv.BeginHeaderRefreshingAction += () =>
{
- vv.EndHeaderRefreshing();
+ System.Threading.Tasks.Task.Run(() =>
+ {
+ try
+ {
+ //鑾峰彇姝屾洸鍒楄〃
+ var songList = SendMethod.Current.GetSingleSongList(A31MusicModel.Current.functionMusic, songLists.group, songLists.source);
+ CommonMethod.Current.AddSongListMemory(songList, songLists.source);//淇濆瓨缂撳瓨
+ }
+ catch
+ {
+ }
+ finally
+ {
+ Application.RunOnMainThread(() =>
+ {
+ vv.EndHeaderRefreshing();
+ //浠庣紦瀛樻嬁鍒楄〃
+ var songListMemory = CommonMethod.Current.GetSongListMemory(songLists.group, songLists.source);
+ ///鍔犺浇闊充箰鍒楄〃
+ SongListView(vv, songListMemory.songs, songListMemory.group, songLists.source);
+
+ });
+ }
+ });
};
///鍔犺浇闊充箰鍒楄〃
- SongListView(vv, musicList, listName);
+ SongListView(vv, songLists.songs, songLists.group,songLists.source);
}
@@ -46,8 +71,12 @@
/// <param name="vv">鐖舵帶浠�</param>
/// <param name="musicList">闊充箰鍒楄〃</param>
/// <param name="listName">鍒楄〃鍚�</param>
- public static void SongListView(VerticalRefreshLayout vv,List<Songs> musicList,string listName, FrameLayout frame = null) {
-
+ /// <param name="source">闊充箰婧�</param>
+ public static void SongListView(VerticalRefreshLayout vv, List<SongInfo> musicList, string listName,string source, FrameLayout frame = null)
+ {
+ if (vv!=null) {
+ vv.RemoveAll();
+ }
for (int i = 0; i < musicList.Count; i++)
{
var songs = musicList[i];
@@ -66,7 +95,7 @@
System.Threading.Thread.Sleep(50);
Application.RunOnMainThread(() =>
{
- //绉婚櫎鐣岄潰
+ //淇敼缂撳瓨灞炴�х姸鎬佸��
A31MusicModel.Current.functionMusic.SetAttrState("song_name", songView.songBtn.Text);
A31MusicModel.Current.functionMusic.SetAttrState("playlist_name", listName);
//绉婚櫎鐣岄潰
@@ -78,6 +107,14 @@
Dictionary<string, string> dic = new Dictionary<string, string>();
dic.Add("song_name", songView.songBtn.Text);
dic.Add("playlist_name", listName);
+ if (!string.IsNullOrEmpty(songs.url))
+ {
+ dic.Add("url", songs.url);
+ }
+ if (!string.IsNullOrEmpty(source))
+ {
+ dic.Add("source", source);
+ }
SendMethod.Current.SendControlCommand(A31MusicModel.Current.functionMusic, dic);
});
});
@@ -144,6 +181,6 @@
});
updateSelectedMusicThread.Start();
}
-
+
}
}
--
Gitblit v1.8.0