From 0c1b0cdf903114c4214f6b9298ecd440972a42b5 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 14 一月 2022 13:13:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wjc' into wxr0114
---
HDL_ON/UI/UI2/FuntionControlView/Music/View/SongView.cs | 29 ++++++++++-------------------
1 files changed, 10 insertions(+), 19 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/View/SongView.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/View/SongView.cs
index cc67593..26b9e2f 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/View/SongView.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/View/SongView.cs
@@ -94,39 +94,30 @@
/// 甯冨眬姝屾洸淇℃伅鐨刅iew
/// </summary>
/// <returns></returns>
- public void SongFrameLayout(VerticalRefreshLayout refreshLayout, MusicInfo songs)
+ public void SongFrameLayout(VerticalRefreshLayout refreshLayout, Songs songs)
{
musicViewFl.AddChidren(playIconBtn);
musicViewFl.AddChidren(songBtn);
- musicViewFl.AddChidren(singerBtn);
+ //musicViewFl.AddChidren(singerBtn);
musicViewFl.AddChidren(clickBtn);
- musicViewFl.AddChidren(loveIcon);
- musicViewFl.AddChidren(addIcon);
+ //musicViewFl.AddChidren(loveIcon);
+ //musicViewFl.AddChidren(addIcon);
refreshLayout.AddChidren(musicViewFl);
playIconBtn.Tag = songs.URL;
- songBtn.Tag = songs.URL;
- singerBtn.Tag = songs.URL;
+ songBtn.Tag = songs.name;
+ singerBtn.Tag = songs.name;
clickBtn.Tag = songs;//鏍囪鎾斁鍝竴棣栨瓕鏇�
- songBtn.Text = string.IsNullOrEmpty(songs.Title) ? "Unkonw" : songs.Title.Trim();
+ songBtn.Text = string.IsNullOrEmpty(songs.name) ? "Unkonw" : songs.name.Trim();
var wText = songBtn.GetTextWidth() + Application.GetRealWidth(15);
- if (wText > Application.GetRealWidth(220))
+ if (wText > Application.GetRealWidth(250))
{
- wText = Application.GetRealWidth(220);//(姝屾洸+姝屾墜)瀹藉害鏈�澶у�兼椂220
+ wText = Application.GetRealWidth(250);//(姝屾洸+姝屾墜)瀹藉害鏈�澶у�兼椂220
}
songBtn.Width = wText;
singerBtn.X = songBtn.Right;
singerBtn.Width = Application.GetRealWidth(220) - wText;//姝屽悕闀垮害灏忎簬220鎵嶅彲浠ユ樉绀烘瓕鎵嬪嚭鏉�
- singerBtn.Text = string.IsNullOrEmpty(songs.Artist) ? "-Unkonw" : "-" + songs.Artist.Trim();
- var music = A31MusicModel.Current.LoveMusicInfoList.Find((m) => m.URL == songs.URL);
- if (music != null)
- {
- loveIcon.IsSelected = true;
- }
- else
- {
- loveIcon.IsSelected = false;
- }
+ singerBtn.Text = string.IsNullOrEmpty(songs.name) ? "-Unkonw" : "-" + songs.name.Trim();
}
--
Gitblit v1.8.0