V5.0.0预览版

AnyListen · Dec 31, 2018 · 3142e55 · 3142e55
1 parent 4e1ddfd
commit 3142e55
Show file tree

Hide file tree

Showing 20 changed files with 22 additions and 8 deletions.
diff --git a/FishMusic/FishMusic/FishMusic.csproj b/FishMusic/FishMusic/FishMusic.csproj
@@ -33,6 +33,9 @@
  <ErrorReport>prompt</ErrorReport>
  <WarningLevel>4</WarningLevel>
  </PropertyGroup>
+ <PropertyGroup>
+ <ApplicationIcon>Resources\Images\fish.ico</ApplicationIcon>
+ </PropertyGroup>
  <ItemGroup>
  <Reference Include="Bass.Net">
  <HintPath>..\packages\Bass.NET\Bass.Net.dll</HintPath>
@@ -508,5 +511,8 @@
  <Name>AnyListen</Name>
  </ProjectReference>
  </ItemGroup>
+ <ItemGroup>
+ <Resource Include="Resources\Images\fish.ico" />
+ </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
diff --git 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
@@ -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
diff --git 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
@@ -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
diff --git a/FishMusic/FishMusic/bin/Debug/download/XLBugHandler.dll b/FishMusic/FishMusic/bin/Debug/download/XLBugHandler.dll
diff --git a/FishMusic/FishMusic/bin/Debug/download/XLBugReport.exe b/FishMusic/FishMusic/bin/Debug/download/XLBugReport.exe
diff --git a/FishMusic/FishMusic/bin/Debug/download/atl71.dll b/FishMusic/FishMusic/bin/Debug/download/atl71.dll
diff --git a/FishMusic/FishMusic/bin/Debug/download/dc.ini b/FishMusic/FishMusic/bin/Debug/download/dc.ini
@@ -0,0 +1,3 @@
+[op]
+ps=1
+pp=1
diff --git a/FishMusic/FishMusic/bin/Debug/download/dl_peer_id.dll b/FishMusic/FishMusic/bin/Debug/download/dl_peer_id.dll
diff --git a/FishMusic/FishMusic/bin/Debug/download/download_engine.dll b/FishMusic/FishMusic/bin/Debug/download/download_engine.dll
diff --git a/FishMusic/FishMusic/bin/Debug/download/id.dat 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
diff --git a/FishMusic/FishMusic/bin/Debug/download/minizip.dll b/FishMusic/FishMusic/bin/Debug/download/minizip.dll
diff --git a/FishMusic/FishMusic/bin/Debug/download/msvcp71.dll b/FishMusic/FishMusic/bin/Debug/download/msvcp71.dll
diff --git a/FishMusic/FishMusic/bin/Debug/download/msvcr71.dll b/FishMusic/FishMusic/bin/Debug/download/msvcr71.dll
diff --git a/FishMusic/FishMusic/bin/Debug/download/zlib1.dll b/FishMusic/FishMusic/bin/Debug/download/zlib1.dll
diff --git a/FishMusic/FishMusic/bin/Debug/xldl.dll b/FishMusic/FishMusic/bin/Debug/xldl.dll