From c209a50cabf524c146fb2d02ce09cfc46c7c2f70 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 26 五月 2020 13:49:02 +0800
Subject: [PATCH] 2020-05-26-1
---
HDL_ON/UI/Music/A31USBMusicList.cs | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/HDL_ON/UI/Music/USBMusicList.cs b/HDL_ON/UI/Music/A31USBMusicList.cs
similarity index 97%
rename from HDL_ON/UI/Music/USBMusicList.cs
rename to HDL_ON/UI/Music/A31USBMusicList.cs
index 32cc5ff..45926e2 100644
--- a/HDL_ON/UI/Music/USBMusicList.cs
+++ b/HDL_ON/UI/Music/A31USBMusicList.cs
@@ -3,9 +3,9 @@
using Shared;
namespace HDL_ON.UI.Music
{
- public class USBMusicList : FrameLayout
+ public class A31USBMusicList : FrameLayout
{
- public USBMusicList()
+ public A31USBMusicList()
{
Tag = "Music";
}
@@ -59,7 +59,7 @@
// });
// }
//});
- var list = SendMethod.GetUsbList();
+ var list = SendMethod.GetUsbList(A31MusicModel.Current);
A31MusicModel.Current.USBList.Clear();
A31MusicModel.Current.USBList.AddRange(list);
Show();
@@ -102,8 +102,8 @@
Width = Application.GetMinRealAverage(24),
Height = Application.GetMinRealAverage(24),
UnSelectedImagePath = "MusicIcon/playStatus.png",
- Visible=false,
- Name= "playStatus",
+ Visible = false,
+ Name = "playStatus",
Tag = songs.URL,
};
musicViewFl.AddChidren(playIconBtn);
@@ -119,14 +119,14 @@
TextAlignment = TextAlignment.CenterLeft,
Name = "song",
Tag = songs.URL,
- Text= songs.Title.Trim()
+ Text = songs.Title.Trim()
};
musicViewFl.AddChidren(songBtn);
var wText = songBtn.GetTextWidth();//鑾峰彇鏂囨湰瀹藉害
///(姝屾洸+姝屾墜)瀹藉害鏈�澶у�兼椂280
if (wText > 280)
{
-
+
songBtn.Width = Application.GetRealWidth(280);
}
else
@@ -146,7 +146,7 @@
//Text =("-" +songs.Artist).Trim(),
Name = "singer",
Tag = songs.URL,
- Text= "-" + songs.Artist.Trim()
+ Text = "-" + songs.Artist.Trim()
};
musicViewFl.AddChidren(singerBtn);
if (wText > 280)
@@ -200,7 +200,7 @@
{
loveIcon.IsSelected = false;
}
-
+
//娣诲姞鍒版垜鐨勫垪琛�
Button addIcon = new Button
{
@@ -238,13 +238,13 @@
MainPage.BasePageView.RemoveViewByTag("Music");
System.Threading.Tasks.Task.Run(() =>
{
- SendMethod.ListMusicPlay("USBDiskQueue", clickBtn.Tag);
+ SendMethod.ListMusicPlay("USBDiskQueue", clickBtn.Tag,A31MusicModel.Current);
});
});
});
};
-
+
}
}
/// <summary>
--
Gitblit v1.8.0