From 95a02925d5bfd593c0d5b07116573e2beab8808d Mon Sep 17 00:00:00 2001 From: leiurayer <1432593898@qq.com> Date: Sun, 20 Mar 2022 00:29:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=99=BB=E5=BD=95=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E5=90=8E=E9=97=AA=E9=80=80=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/DownKyi.Core/Storage/StorageCover.cs | 10 +- src/DownKyi.Core/Storage/StorageHeader.cs | 10 +- src/DownKyi/ViewModels/ViewIndexViewModel.cs | 96 +++++++++++--------- src/DownKyi/ViewModels/ViewLoginViewModel.cs | 40 ++++---- 4 files changed, 86 insertions(+), 70 deletions(-) diff --git a/src/DownKyi.Core/Storage/StorageCover.cs b/src/DownKyi.Core/Storage/StorageCover.cs index a1556aa..eb0a115 100644 --- a/src/DownKyi.Core/Storage/StorageCover.cs +++ b/src/DownKyi.Core/Storage/StorageCover.cs @@ -90,7 +90,7 @@ namespace DownKyi.Core.Storage }; coverDb.Update(newCover); - coverDb.Close(); + //coverDb.Close(); return $"{StorageManager.GetCover()}/{cover.Md5}"; } else @@ -108,12 +108,12 @@ namespace DownKyi.Core.Storage }; coverDb.Update(newCover); - coverDb.Close(); + //coverDb.Close(); return $"{StorageManager.GetCover()}/{md5}"; } else { - coverDb.Close(); + //coverDb.Close(); return null; } } @@ -133,12 +133,12 @@ namespace DownKyi.Core.Storage }; coverDb.Insert(newCover); - coverDb.Close(); + //coverDb.Close(); return $"{StorageManager.GetCover()}/{md5}"; } else { - coverDb.Close(); + //coverDb.Close(); return null; } } diff --git a/src/DownKyi.Core/Storage/StorageHeader.cs b/src/DownKyi.Core/Storage/StorageHeader.cs index 09a768a..a0d3077 100644 --- a/src/DownKyi.Core/Storage/StorageHeader.cs +++ b/src/DownKyi.Core/Storage/StorageHeader.cs @@ -73,7 +73,7 @@ namespace DownKyi.Core.Storage Md5 = header.Md5 }; headerDb.Update(newHeader); - headerDb.Close(); + //headerDb.Close(); return $"{StorageManager.GetHeader()}/{header.Md5}"; } else @@ -89,12 +89,12 @@ namespace DownKyi.Core.Storage Md5 = md5 }; headerDb.Insert(newHeader); - headerDb.Close(); + //headerDb.Close(); return $"{StorageManager.GetHeader()}/{md5}"; } else { - headerDb.Close(); + //headerDb.Close(); return null; } } @@ -112,12 +112,12 @@ namespace DownKyi.Core.Storage Md5 = md5 }; headerDb.Insert(newHeader); - headerDb.Close(); + //headerDb.Close(); return $"{StorageManager.GetHeader()}/{md5}"; } else { - headerDb.Close(); + //headerDb.Close(); return null; } } diff --git a/src/DownKyi/ViewModels/ViewIndexViewModel.cs b/src/DownKyi/ViewModels/ViewIndexViewModel.cs index ff0a93d..66a230d 100644 --- a/src/DownKyi/ViewModels/ViewIndexViewModel.cs +++ b/src/DownKyi/ViewModels/ViewIndexViewModel.cs @@ -227,65 +227,73 @@ namespace DownKyi.ViewModels /// private async void UpdateUserInfo() { - LoginPanelVisibility = Visibility.Hidden; - - // 检查本地是否存在login文件，没有则说明未登录 - if (!File.Exists(StorageManager.GetLogin())) + try { - LoginPanelVisibility = Visibility.Visible; - Header = new BitmapImage(new Uri("pack://application:,,,/Resources/default_header.jpg")); - UserName = null; - return; - } + LoginPanelVisibility = Visibility.Hidden; - await Task.Run(new Action(() => - { - // 获取用户信息 - var userInfo = UserInfo.GetUserInfoForNavigation(); - if (userInfo != null) - { - SettingsManager.GetInstance().SetUserInfo(new UserInfoSettings - { - Mid = userInfo.Mid, - Name = userInfo.Name, - IsLogin = userInfo.IsLogin, - IsVip = userInfo.VipStatus == 1 - }); - } - else + // 检查本地是否存在login文件，没有则说明未登录 + if (!File.Exists(StorageManager.GetLogin())) { - SettingsManager.GetInstance().SetUserInfo(new UserInfoSettings - { - Mid = -1, - Name = "", - IsLogin = false, - IsVip = false - }); + LoginPanelVisibility = Visibility.Visible; + Header = new BitmapImage(new Uri("pack://application:,,,/Resources/default_header.jpg")); + UserName = null; + return; } - PropertyChangeAsync(new Action(() => + await Task.Run(new Action(() => { - LoginPanelVisibility = Visibility.Visible; - + // 获取用户信息 + var userInfo = UserInfo.GetUserInfoForNavigation(); if (userInfo != null) { - if (userInfo.Face != null) + SettingsManager.GetInstance().SetUserInfo(new UserInfoSettings { - Header = new StorageHeader().GetHeaderThumbnail(userInfo.Mid, userInfo.Name, userInfo.Face, 36, 36); + Mid = userInfo.Mid, + Name = userInfo.Name, + IsLogin = userInfo.IsLogin, + IsVip = userInfo.VipStatus == 1 + }); + } + else + { + SettingsManager.GetInstance().SetUserInfo(new UserInfoSettings + { + Mid = -1, + Name = "", + IsLogin = false, + IsVip = false + }); + } + + PropertyChangeAsync(new Action(() => + { + LoginPanelVisibility = Visibility.Visible; + + if (userInfo != null) + { + if (userInfo.Face != null) + { + Header = new StorageHeader().GetHeaderThumbnail(userInfo.Mid, userInfo.Name, userInfo.Face, 36, 36); + } + else + { + Header = new BitmapImage(new Uri("pack://application:,,,/Resources/default_header.jpg")); + } + UserName = userInfo.Name; } else { Header = new BitmapImage(new Uri("pack://application:,,,/Resources/default_header.jpg")); + UserName = null; } - UserName = userInfo.Name; - } - else - { - Header = new BitmapImage(new Uri("pack://application:,,,/Resources/default_header.jpg")); - UserName = null; - } + })); })); - })); + } + catch (Exception e) + { + Core.Utils.Debugging.Console.PrintLine("UpdateUserInfo()发生异常: {0}", e); + LogManager.Error(Tag, e); + } } #endregion diff --git a/src/DownKyi/ViewModels/ViewLoginViewModel.cs b/src/DownKyi/ViewModels/ViewLoginViewModel.cs index 6767e83..4b89904 100644 --- a/src/DownKyi/ViewModels/ViewLoginViewModel.cs +++ b/src/DownKyi/ViewModels/ViewLoginViewModel.cs @@ -98,26 +98,34 @@ namespace DownKyi.ViewModels /// private void Login() { - var loginUrl = LoginQR.GetLoginUrl(); - if (loginUrl == null) { return; } - - if (loginUrl.Status != true) + try { - ExecuteBackSpace(); - return; - } + var loginUrl = LoginQR.GetLoginUrl(); + if (loginUrl == null) { return; } - if (loginUrl.Data == null || loginUrl.Data.Url == null) - { - eventAggregator.GetEvent().Publish(DictionaryResource.GetString("GetLoginUrlFailed")); - return; - } + if (loginUrl.Status != true) + { + ExecuteBackSpace(); + return; + } - PropertyChangeAsync(new Action(() => { LoginQRCode = LoginQR.GetLoginQRCode(loginUrl.Data.Url); })); - Core.Utils.Debugging.Console.PrintLine(loginUrl.Data.Url + "\n"); - LogManager.Debug(Tag, loginUrl.Data.Url); + if (loginUrl.Data == null || loginUrl.Data.Url == null) + { + eventAggregator.GetEvent().Publish(DictionaryResource.GetString("GetLoginUrlFailed")); + return; + } + + PropertyChangeAsync(new Action(() => { LoginQRCode = LoginQR.GetLoginQRCode(loginUrl.Data.Url); })); + Core.Utils.Debugging.Console.PrintLine(loginUrl.Data.Url + "\n"); + LogManager.Debug(Tag, loginUrl.Data.Url); - GetLoginStatus(loginUrl.Data.OauthKey); + GetLoginStatus(loginUrl.Data.OauthKey); + } + catch (Exception e) + { + Core.Utils.Debugging.Console.PrintLine("Login()发生异常: {0}", e); + LogManager.Error(Tag, e); + } } ///