diff --git a/src/DownKyi.Core/BiliApi/Login/LoginQR.cs b/src/DownKyi.Core/BiliApi/Login/LoginQR.cs index a04e2d7..35009f4 100644 --- a/src/DownKyi.Core/BiliApi/Login/LoginQR.cs +++ b/src/DownKyi.Core/BiliApi/Login/LoginQR.cs @@ -120,7 +120,7 @@ namespace DownKyi.Core.BiliApi.Login public static BitmapImage GetLoginQRCode(string url) { // 设置的参数影响app能否成功扫码 - Bitmap qrCode = Utils.QRCode.EncodeQRCode(url, 10, 10, null, 0, 0, false); + Bitmap qrCode = Utils.QRCode.EncodeQRCode(url, 12, 10, null, 0, 0, false); MemoryStream ms = new MemoryStream(); qrCode.Save(ms, System.Drawing.Imaging.ImageFormat.Bmp); diff --git a/src/DownKyi.Core/BiliApi/LoginNew/LoginQR.cs b/src/DownKyi.Core/BiliApi/LoginNew/LoginQR.cs index 8e0d86e..c51d0d4 100644 --- a/src/DownKyi.Core/BiliApi/LoginNew/LoginQR.cs +++ b/src/DownKyi.Core/BiliApi/LoginNew/LoginQR.cs @@ -83,7 +83,7 @@ namespace DownKyi.Core.BiliApi.LoginNew public static BitmapImage GetLoginQRCode(string url) { // 设置的参数影响app能否成功扫码 - Bitmap qrCode = Utils.QRCode.EncodeQRCode(url, 10, 10, null, 0, 0, false); + Bitmap qrCode = Utils.QRCode.EncodeQRCode(url, 12, 10, null, 0, 0, false); MemoryStream ms = new MemoryStream(); qrCode.Save(ms, System.Drawing.Imaging.ImageFormat.Bmp); diff --git a/src/DownKyi.Core/DownKyi.Core.csproj b/src/DownKyi.Core/DownKyi.Core.csproj index a6ac3ea..67ed5f0 100644 --- a/src/DownKyi.Core/DownKyi.Core.csproj +++ b/src/DownKyi.Core/DownKyi.Core.csproj @@ -52,20 +52,20 @@ ..\packages\Brotli.NET.2.1.1\lib\net45\Brotli.Core.dll - - ..\packages\Google.Protobuf.3.21.12\lib\net45\Google.Protobuf.dll + + ..\packages\Google.Protobuf.3.29.3\lib\net45\Google.Protobuf.dll - ..\packages\Newtonsoft.Json.13.0.2\lib\net45\Newtonsoft.Json.dll + ..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll - - ..\packages\QRCoder.1.4.3\lib\net40\QRCoder.dll + + ..\packages\QRCoder.1.6.0\lib\net40\QRCoder.dll - - ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll + + ..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll @@ -73,15 +73,15 @@ - - ..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll + + ..\packages\System.Memory.4.6.0\lib\net462\System.Memory.dll - - ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll + + ..\packages\System.Numerics.Vectors.4.6.0\lib\net462\System.Numerics.Vectors.dll - - ..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll + + ..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\System.Runtime.CompilerServices.Unsafe.dll ..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll @@ -393,9 +393,9 @@ - + - + \ No newline at end of file diff --git a/src/DownKyi.Core/Utils/Format.cs b/src/DownKyi.Core/Utils/Format.cs index 14653ef..6e4d77b 100644 --- a/src/DownKyi.Core/Utils/Format.cs +++ b/src/DownKyi.Core/Utils/Format.cs @@ -199,7 +199,7 @@ namespace DownKyi.Core.Utils destName = Regex.Replace(destName, @"\p{C}+", string.Empty); // 如果只有空白字符、dot符 - if (destName == " " || destName == ".") + if (string.IsNullOrWhiteSpace(destName) || destName == ".") { return "[empty title]"; } diff --git a/src/DownKyi.Core/app.config b/src/DownKyi.Core/app.config index a1e2bff..ef77b31 100644 --- a/src/DownKyi.Core/app.config +++ b/src/DownKyi.Core/app.config @@ -4,11 +4,11 @@ - + - + diff --git a/src/DownKyi.Core/packages.config b/src/DownKyi.Core/packages.config index 7aae0de..8b9b06b 100644 --- a/src/DownKyi.Core/packages.config +++ b/src/DownKyi.Core/packages.config @@ -1,15 +1,15 @@  - - - - - + + + + + - - - + + + \ No newline at end of file diff --git a/src/DownKyi/DownKyi.csproj b/src/DownKyi/DownKyi.csproj index 5063eb6..f88bef8 100644 --- a/src/DownKyi/DownKyi.csproj +++ b/src/DownKyi/DownKyi.csproj @@ -563,10 +563,10 @@ - 1.1.0 + 2.0.1 - 13.0.2 + 13.0.3 diff --git a/src/DownKyi/ViewModels/ViewUserSpaceViewModel.cs b/src/DownKyi/ViewModels/ViewUserSpaceViewModel.cs index 24994ec..a0b7f8e 100644 --- a/src/DownKyi/ViewModels/ViewUserSpaceViewModel.cs +++ b/src/DownKyi/ViewModels/ViewUserSpaceViewModel.cs @@ -362,7 +362,7 @@ namespace DownKyi.ViewModels sexUri = new Uri($"pack://application:,,,/Resources/sex/female.png"); } // 显示vip信息 - if (userInfo.Vip.Label.Text == null || userInfo.Vip.Label.Text == "") + if (userInfo.Vip == null || userInfo.Vip.Label.Text == null || userInfo.Vip.Label.Text == "") { VipTypeVisibility = Visibility.Collapsed; } diff --git a/src/NuGet.config b/src/NuGet.config new file mode 100644 index 0000000..d3d56d1 --- /dev/null +++ b/src/NuGet.config @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file