1.修复音乐下载连接失效

2.修复伴奏下载连接失效 3.添加m4a格式的下载
hzexe · Mar 27, 2019 · 7956407 · 7956407
1 parent db6d90c
commit 7956407
Show file tree

Hide file tree

Showing 13 changed files with 170 additions and 74 deletions.
diff --git a/Example/Basic-Console/Program.cs b/Example/Basic-Console/Program.cs
@@ -43,6 +43,8 @@ static void Main(string[] args)
                     downloadType |= (type & EnumFileType.Mp3_320k);
                 if (downloadType == 0)
                     downloadType |= (type & EnumFileType.Mp3_128k);
+                if (downloadType == 0)
+                    downloadType |= (type & EnumFileType.M4a);
 
                 var t = api.downloadSongAsync(song, dir, downloadType);//建立下载的task,下载文件最大并保存到当前目录
                 //可选:当然也可以尝试lrc的歌词下载下来

diff --git a/Example/WindowsFormsApp/Form1.Designer.cs b/Example/WindowsFormsApp/Form1.Designer.cs
diff --git a/Example/WindowsFormsApp/Form1.cs b/Example/WindowsFormsApp/Form1.cs
@@ -117,6 +117,7 @@ private async void button1_Click(object sender, EventArgs e)
                         Flac = ( x.file.size_flac > 0) ? "下载" : null,
                         Mp3_128k = ( x.file.size_128 > 0) ? "下载" : null,
                         Mp3_320k = ( x.file.size_320 > 0) ? "下载" : null,
+                        M4a = (x.file.size_aac > 0) ? "下载" : null,
                     });
 
 
@@ -167,6 +168,10 @@ private void dataGridView1_CellContentClick(object sender, DataGridViewCellEvent
             {
                 fun(EnumFileType.Mp3_128k, si);
             }
+            else if ("M4a" == col.DataPropertyName)
+            {
+                fun(EnumFileType.M4a, si);
+            }
             else if ("Play" == col.DataPropertyName)
             {
                 EnumFileType type = si.file.GetAvailableFileType();//取当前歌曲可用的类型
@@ -178,6 +183,9 @@ private void dataGridView1_CellContentClick(object sender, DataGridViewCellEvent
                     downloadType |= (type & EnumFileType.Mp3_320k);
                 if (downloadType == 0)
                     downloadType |= (type & EnumFileType.Mp3_128k);
+                if (downloadType == 0)
+                    downloadType |= (type & EnumFileType.M4a);
+
 
 
                 string url = api.GetDownloadSongUrl(si, downloadType);

diff --git a/Example/WindowsFormsApp/Form1.resx b/Example/WindowsFormsApp/Form1.resx
@@ -123,6 +123,9 @@
   <metadata name="Mp3_320k.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="M4a.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="Ape.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

diff --git a/Example/WindowsFormsApp/TableModel.cs b/Example/WindowsFormsApp/TableModel.cs
@@ -25,6 +25,8 @@ class TableModel
         public string Flac { get; set; }
         [DisplayName("Mp3_320k")]
         public string Mp3_320k { get; set; }
+        [DisplayName("M4a")]
+        public string M4a { get; set; }
         [DisplayName("Api格式")]
         public string Mp3_128k { get; set; }
         [DisplayName("高质量试听")]

diff --git a/Example/Windows_x64/Windows_x64.cpp b/Example/Windows_x64/Windows_x64.cpp
@@ -49,6 +49,8 @@ int main()
 			downloadType = Flac;
 		else if (type&Mp3_320k)
 			downloadType = Mp3_320k;
+		else if (type&m4a)
+			downloadType = m4a;
 		else
 			downloadType = Mp3_128k;
 		const wchar_t dir[] = L"./"; //下载存放的目录