1.0.7 Released.

ludoux · Jul 12, 2017 · 5a9a439 · 5a9a439
1 parent c5377a2
commit 5a9a439
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 16 deletions.
diff --git a/LrcHelper/LrcHelper.csproj b/LrcHelper/LrcHelper.csproj
@@ -153,7 +153,6 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="Lyrics.ico" />
-    <Content Include="www.ico.la_3744f2ca9b2d03154c468725a2a328f6_128X128.ico" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

diff --git a/LrcHelper/NeteaseMusic.cs b/LrcHelper/NeteaseMusic.cs
@@ -48,11 +48,11 @@ public enum LyricsStatus {[Description("未命中")] Unmatch = -2, [Description(
         internal LyricsStatus Status { get => _status; private set { if (_status == LyricsStatus.Unsured) { _status = value; } } }//_status 仅可供修改一次，设计是不可以对外更改的
 
 
-        private bool HasOriLyrics;
-        private bool HasTransLyrics;
+        private bool hasOriLyrics;
+        private bool hasTransLyrics;
         private string _errorLog = "";
         internal string ErrorLog { get => _errorLog; private set => _errorLog = value; }
-        Lyrics MixedLyrics = new Lyrics();//翻译作为trans来保存
+        private Lyrics mixedLyrics = new Lyrics();//翻译作为trans来保存
 
         public ExtendedLyrics(long ID)
 		{
@@ -63,8 +63,8 @@ public ExtendedLyrics(long ID)
         /// </summary>
         internal void FetchOnlineLyrics()
 		{
-            HasOriLyrics = false;
-            HasTransLyrics = false;
+            hasOriLyrics = false;
+            hasTransLyrics = false;
             Lyrics tempOriLyric = new Lyrics();
             Lyrics tempTransLyric = new Lyrics();
             string sLRC = "";
@@ -97,8 +97,8 @@ internal void FetchOnlineLyrics()
                 { ErrorLog += "<CAN NOT FIND LYRIC LABEL>"; return; }
                 sLRC = o["lyric"].ToString();
                 tempOriLyric.ArrangeLyrics(sLRC);
-                HasOriLyrics = true;
-                MixedLyrics.ArrangeLyrics(sLRC);
+                hasOriLyrics = true;
+                mixedLyrics.ArrangeLyrics(sLRC);
 
                 //===========翻译
                 sContent = hr.GetContent("https://music.163.com/api/song/lyric?os=pc&id=" + ID + "&tv=-1");
@@ -121,12 +121,12 @@ internal void FetchOnlineLyrics()
                         if (tempOriLyric[j].Timeline != tempTransLyric[i].Timeline)
                             continue;
                         if(tempTransLyric[i].OriLyrics != null && tempTransLyric[i].OriLyrics != "")
-                            MixedLyrics[j].SetTransLyrics("#", tempTransLyric[i].OriLyrics);//Mix是以外文歌词的j来充填，当没有trans的时候留空
+                            mixedLyrics[j].SetTransLyrics("#", tempTransLyric[i].OriLyrics);//Mix是以外文歌词的j来充填，当没有trans的时候留空
                         i++;
                     }
-                    HasTransLyrics = true;
+                    hasTransLyrics = true;
                 }
-                MixedLyrics.Sort();
+                mixedLyrics.Sort();
                 tempOriLyric = null;
                 tempTransLyric = null;
             }
@@ -141,7 +141,7 @@ internal void FetchOnlineLyrics()
         }
         public override string ToString()
         {
-            return MixedLyrics.ToString();
+            return mixedLyrics.ToString();
         }
         /// <summary>
         /// 应该在GetOnlineLyric()后使用,若无翻译将直接返回ori
@@ -151,7 +151,7 @@ public override string ToString()
         /// <returns>返回的lrc文本</returns>
         public string GetCustomLyric(int ModelIndex, int DelayMsec)
         {
-            string[] result = MixedLyrics.GetWalkmanStyleLyrics(ModelIndex, new object[] { DelayMsec });
+            string[] result = mixedLyrics.GetWalkmanStyleLyrics(ModelIndex, new object[] { DelayMsec });
             ErrorLog += result[1];
             return result[0];
         }

diff --git a/LrcHelper/Properties/AssemblyInfo.cs b/LrcHelper/Properties/AssemblyInfo.cs
@@ -34,6 +34,6 @@
 // 方法是按如下所示使用“*”: :
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.6.0")]
+[assembly: AssemblyFileVersion("1.0.7.0")]
 [assembly: NeutralResourcesLanguage("en-001")]
 
diff --git a/README.md b/README.md
@@ -53,7 +53,8 @@
 
 ## 更新信息（最近在上）
 
-* 2017.7.11  修 bugs；更改了新的功能（case 1）中部分符号的大小（倍率？），增加了新的符号；更改了关键函数的实现，部分更改为属性；写了点注释。
+* 2017.7.12 优化了下代码，使用枚举。（v1.0.7 #Release）
+* 2017.7.11 修 bugs；更改了新的功能（case 1）中部分符号的大小（倍率？），增加了新的符号；更改了关键函数的实现，部分更改为属性；写了点注释。
 * 2017.7.10 新的功能正式提供了，可以在高级设置中启用（填 1）；高级设置也支持调整延时。（v1.0.6 #Release）
 * 2017.7.6  或许支持了新的翻译歌词显示形式：尽可能地同屏显示原文和翻译。
 * 2017.6.7  （v1.0.5 #Release）

diff --git a/UpdateInfo/UpInfo.txt b/UpdateInfo/UpInfo.txt
@@ -9,7 +9,7 @@
 
 ;Lastest Released Version
 [Ver]
-<1.0.6.0>
+<1.0.7.0>
 
 ;WebLink, not software download link.
 [WebLink]