fix: 修复<帮助-检查更新>在多次请求时可能引起的失败或错误

Signed-off-by: Leven <levenchn@163.com>
leven99 · Oct 14, 2019 · 3bf1aaf · 3bf1aaf
1 parent 38a5fbe
commit 3bf1aaf
Showing 1 changed file with 22 additions and 33 deletions.
diff --git a/ViewModels/MainWindowVM.cs b/ViewModels/MainWindowVM.cs
@@ -23,10 +23,6 @@ class MainWindowViewModel : MainWindowBase, IDisposable
         private readonly Uri gitee_uri = new Uri("https://gitee.com/api/v5/repos/leven9/OSDA/releases/latest");
         private readonly Uri github_cri = new Uri("https://api.github.com/repos/leven99/OSDA/releases/latest");
 
-        private HttpClient httpClient = new HttpClient();
-
-        private readonly DataContractJsonSerializer ReleaseDeserializer = new DataContractJsonSerializer(typeof(GitRelease));
-
         private string DataRecvPath = string.Empty;   /* 数据接收路径 */
 
         /// <summary>
@@ -361,19 +357,21 @@ public void Reduced_Enable()
         #region 帮助
         public async void UpdateAsync()
         {
+            var ReleaseDeserializer = new DataContractJsonSerializer(typeof(GitRelease));
+
             LatestRelease = await DownloadJsonObjectAsync<GitRelease>(github_cri, ReleaseDeserializer, "github")
                 .ConfigureAwait(false);
 
             if(LatestRelease == default)
             {
-                DepictInfo = string.Format(cultureInfo, "GitHub.com 服务器请求/响应异常，更换服务器......请稍后");
+                DepictInfo = string.Format(cultureInfo, "更换服务器......请稍后");
 
                 LatestRelease = await DownloadJsonObjectAsync<GitRelease>(gitee_uri, ReleaseDeserializer, "gitee")
                     .ConfigureAwait(false);
 
                 if (LatestRelease == default)
                 {
-                    DepictInfo = string.Format(cultureInfo, "服务器异常，请检查网络或稍后再试！");
+                    DepictInfo = string.Format(cultureInfo, "请检查网络或稍后再试！");
 
                     return;
                 }
@@ -386,40 +384,34 @@ protected async Task<T> DownloadJsonObjectAsync<T>(Uri address, DataContractJson
         {
             try
             {
-                httpClient.DefaultRequestHeaders.Add("User-Agent", "Other");
-                httpClient.Timeout = TimeSpan.FromMilliseconds(3000);
-
-                if (git == "github")
-                {
-                    DepictInfo = string.Format(cultureInfo, "正在向 GitHub.com 请求数据......");
-                }
-                else if (git == "gitee")
+                using (var _httpClient = new HttpClient())
                 {
-                    DepictInfo = string.Format(cultureInfo, "正在向 Gitee.com 请求数据......");
-                }
+                    _httpClient.DefaultRequestHeaders.Add("User-Agent", "Other");
+                    _httpClient.Timeout = TimeSpan.FromMilliseconds(3000);
 
-                var _resPonse = await httpClient.GetAsync(address).ConfigureAwait(false);
+                    if (git == "github")
+                    {
+                        DepictInfo = string.Format(cultureInfo, "等待 GitHub.com 响应数据......");
+                    }
+                    else if (git == "gitee")
+                    {
+                        DepictInfo = string.Format(cultureInfo, "等待 Gitee.com 响应数据......");
+                    }
 
-                if (git == "github")
-                {
-                    DepictInfo = string.Format(cultureInfo, "等待 GitHub.com 响应数据......");
-                }
-                else if (git == "gitee")
-                {
-                    DepictInfo = string.Format(cultureInfo, "等待 Gitee.com 响应数据......");
-                }
+                    var _resPonse = await _httpClient.GetAsync(address).ConfigureAwait(false);
+                    _resPonse.EnsureSuccessStatusCode();
 
-                var _jsonData = await _resPonse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                    var _jsonData = await _resPonse.Content.ReadAsStringAsync().ConfigureAwait(false);
 
-                using (var jsonStream = new MemoryStream(Encoding.UTF8.GetBytes(_jsonData)))
-                {
-                    return (T)serializer.ReadObject(jsonStream);
+                    using (var _jsonStream = new MemoryStream(Encoding.UTF8.GetBytes(_jsonData)))
+                    {
+                        return (T)serializer.ReadObject(_jsonStream);
+                    }
                 }
             }
             catch
             {
                 return default;
-                throw;
             }
         }
 
@@ -1096,9 +1088,6 @@ protected virtual void Dispose(bool disposing)
                 SPserialPort.Dispose();
                 SPserialPort = null;
 
-                httpClient.Dispose();
-                httpClient = null;
-
                 disposedValue = true;
             }
         }