diff --git a/FishMusic/FishMusic/FishMusic.csproj b/FishMusic/FishMusic/FishMusic.csproj index b2db92a..c8a6a76 100644 --- a/FishMusic/FishMusic/FishMusic.csproj +++ b/FishMusic/FishMusic/FishMusic.csproj @@ -33,6 +33,9 @@ prompt 4 + + Resources\Images\fish.ico + ..\packages\Bass.NET\Bass.Net.dll @@ -508,5 +511,8 @@ AnyListen + + + \ No newline at end of file diff --git a/FishMusic/FishMusic/MainWindow.xaml b/FishMusic/FishMusic/MainWindow.xaml index 06eb2e0..afdf305 100644 --- a/FishMusic/FishMusic/MainWindow.xaml +++ b/FishMusic/FishMusic/MainWindow.xaml @@ -17,6 +17,7 @@ MinWidth="920" Height="622" Width="920" + Icon="Resources/Images/fish.ico" ShowTitleBar="False" GlowBrush="LightGray" ShowIconOnTitleBar="False"> diff --git a/FishMusic/FishMusic/Properties/AssemblyInfo.cs b/FishMusic/FishMusic/Properties/AssemblyInfo.cs index 4b5f1b4..6707e5c 100644 --- a/FishMusic/FishMusic/Properties/AssemblyInfo.cs +++ b/FishMusic/FishMusic/Properties/AssemblyInfo.cs @@ -7,12 +7,12 @@ // 有关程序集的一般信息由以下 // 控制。更改这些特性值可修改 // 与程序集关联的信息。 -[assembly: AssemblyTitle("FishMusic")] -[assembly: AssemblyDescription("")] +[assembly: AssemblyTitle("鱼声音乐")] +[assembly: AssemblyDescription("windows 平台易用的小众音乐软件")] [assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] +[assembly: AssemblyCompany("Shelher")] [assembly: AssemblyProduct("FishMusic")] -[assembly: AssemblyCopyright("Copyright © 2018")] +[assembly: AssemblyCopyright("Copyright © 2019")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -51,5 +51,5 @@ // 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号 // 方法是按如下所示使用“*”: : // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyVersion("5.0.0.0")] +[assembly: AssemblyFileVersion("5.0.0.0")] diff --git a/FishMusic/FishMusic/Resources/Images/fish.ico b/FishMusic/FishMusic/Resources/Images/fish.ico new file mode 100644 index 0000000..5ff6a2b Binary files /dev/null and b/FishMusic/FishMusic/Resources/Images/fish.ico differ diff --git a/FishMusic/FishMusic/ViewModel/DownloadViewModel.cs b/FishMusic/FishMusic/ViewModel/DownloadViewModel.cs index 0dfea12..d012ff5 100644 --- a/FishMusic/FishMusic/ViewModel/DownloadViewModel.cs +++ b/FishMusic/FishMusic/ViewModel/DownloadViewModel.cs @@ -163,7 +163,7 @@ private void ChangeID3(DownloadInfo downloadInfo) { return; } - if (filePath.FullName.Contains("ogg")) + if (filePath.FullName.Contains("ogg") || filePath.FullName.Contains("wav")) { var id3V1 = file.GetTag(TagTypes.Id3v1, true); if (!string.IsNullOrEmpty(songResult.SongName)) diff --git a/FishMusic/FishMusic/ViewModel/SearchViewModel.cs b/FishMusic/FishMusic/ViewModel/SearchViewModel.cs index c2977ab..00c606a 100644 --- a/FishMusic/FishMusic/ViewModel/SearchViewModel.cs +++ b/FishMusic/FishMusic/ViewModel/SearchViewModel.cs @@ -168,7 +168,7 @@ private void DownloadSong(object song) { return; } - var filePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Music", songResult.SongId + Helper.CommonHelper.GetFormat(downLink)); + var filePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Music", songResult.ArtistName + "-" + songResult.SongName + Helper.CommonHelper.GetFormat(downLink)); var download = new DownloadInfo { DownLink = AnyListen.AnyListen.GetRealUrl(downLink), diff --git a/FishMusic/FishMusic/bin/Debug/download/MiniThunderPlatform.exe b/FishMusic/FishMusic/bin/Debug/download/MiniThunderPlatform.exe new file mode 100644 index 0000000..22adf91 Binary files /dev/null and b/FishMusic/FishMusic/bin/Debug/download/MiniThunderPlatform.exe differ diff --git a/FishMusic/FishMusic/bin/Debug/download/XLBugHandler.dll b/FishMusic/FishMusic/bin/Debug/download/XLBugHandler.dll new file mode 100644 index 0000000..26b4529 Binary files /dev/null and b/FishMusic/FishMusic/bin/Debug/download/XLBugHandler.dll differ diff --git a/FishMusic/FishMusic/bin/Debug/download/XLBugReport.exe b/FishMusic/FishMusic/bin/Debug/download/XLBugReport.exe new file mode 100644 index 0000000..4417dab Binary files /dev/null and b/FishMusic/FishMusic/bin/Debug/download/XLBugReport.exe differ diff --git a/FishMusic/FishMusic/bin/Debug/download/atl71.dll b/FishMusic/FishMusic/bin/Debug/download/atl71.dll new file mode 100644 index 0000000..66f9cf7 Binary files /dev/null and b/FishMusic/FishMusic/bin/Debug/download/atl71.dll differ diff --git a/FishMusic/FishMusic/bin/Debug/download/dc.ini b/FishMusic/FishMusic/bin/Debug/download/dc.ini new file mode 100644 index 0000000..e28f7ad --- /dev/null +++ b/FishMusic/FishMusic/bin/Debug/download/dc.ini @@ -0,0 +1,3 @@ +[op] +ps=1 +pp=1 \ No newline at end of file diff --git a/FishMusic/FishMusic/bin/Debug/download/dl_peer_id.dll b/FishMusic/FishMusic/bin/Debug/download/dl_peer_id.dll new file mode 100644 index 0000000..8b28b17 Binary files /dev/null and b/FishMusic/FishMusic/bin/Debug/download/dl_peer_id.dll differ diff --git a/FishMusic/FishMusic/bin/Debug/download/download_engine.dll b/FishMusic/FishMusic/bin/Debug/download/download_engine.dll new file mode 100644 index 0000000..3e22c24 Binary files /dev/null and b/FishMusic/FishMusic/bin/Debug/download/download_engine.dll differ diff --git a/FishMusic/FishMusic/bin/Debug/download/id.dat b/FishMusic/FishMusic/bin/Debug/download/id.dat new file mode 100644 index 0000000..f7192c7 --- /dev/null +++ b/FishMusic/FishMusic/bin/Debug/download/id.dat @@ -0,0 +1,4 @@ +[partner] +id = 80000043 +ver = 3.2.1.46 + diff --git a/FishMusic/FishMusic/bin/Debug/download/mini_unzip_dll.dll b/FishMusic/FishMusic/bin/Debug/download/mini_unzip_dll.dll new file mode 100644 index 0000000..2d27340 Binary files /dev/null and b/FishMusic/FishMusic/bin/Debug/download/mini_unzip_dll.dll differ diff --git a/FishMusic/FishMusic/bin/Debug/download/minizip.dll b/FishMusic/FishMusic/bin/Debug/download/minizip.dll new file mode 100644 index 0000000..0040849 Binary files /dev/null and b/FishMusic/FishMusic/bin/Debug/download/minizip.dll differ diff --git a/FishMusic/FishMusic/bin/Debug/download/msvcp71.dll b/FishMusic/FishMusic/bin/Debug/download/msvcp71.dll new file mode 100644 index 0000000..5f1a87b Binary files /dev/null and b/FishMusic/FishMusic/bin/Debug/download/msvcp71.dll differ diff --git a/FishMusic/FishMusic/bin/Debug/download/msvcr71.dll b/FishMusic/FishMusic/bin/Debug/download/msvcr71.dll new file mode 100644 index 0000000..b50a30d Binary files /dev/null and b/FishMusic/FishMusic/bin/Debug/download/msvcr71.dll differ diff --git a/FishMusic/FishMusic/bin/Debug/download/zlib1.dll b/FishMusic/FishMusic/bin/Debug/download/zlib1.dll new file mode 100644 index 0000000..8c3f7e1 Binary files /dev/null and b/FishMusic/FishMusic/bin/Debug/download/zlib1.dll differ diff --git a/FishMusic/FishMusic/bin/Debug/xldl.dll b/FishMusic/FishMusic/bin/Debug/xldl.dll new file mode 100644 index 0000000..1179313 Binary files /dev/null and b/FishMusic/FishMusic/bin/Debug/xldl.dll differ