From d891541b4e76fb38e94c3f6aa501fb2998090c54 Mon Sep 17 00:00:00 2001 From: leiurayer <1432593898@qq.com> Date: Sat, 12 Oct 2024 15:12:21 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81=E6=97=A0=E6=B3=95=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=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/BiliApi/Login/LoginQR.cs | 2 +- src/DownKyi.Core/BiliApi/LoginNew/LoginQR.cs | 2 +- src/DownKyi/ViewModels/ViewUserSpaceViewModel.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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/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; } From 1088b70cc8ee5da50f24b8af97c1839a90c87ca4 Mon Sep 17 00:00:00 2001 From: leiurayer <1432593898@qq.com> Date: Wed, 5 Feb 2025 20:09:14 +0800 Subject: [PATCH 2/4] Add local NuGet --- src/NuGet.config | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/NuGet.config 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 From e0ac25efbc4c85bf085ef9766f27876aa9c2236d Mon Sep 17 00:00:00 2001 From: leiurayer <1432593898@qq.com> Date: Wed, 5 Feb 2025 20:27:24 +0800 Subject: [PATCH 3/4] Update package --- src/DownKyi.Core/DownKyi.Core.csproj | 30 ++++++++++++++-------------- src/DownKyi.Core/app.config | 4 ++-- src/DownKyi.Core/packages.config | 16 +++++++-------- src/DownKyi/DownKyi.csproj | 4 ++-- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/DownKyi.Core/DownKyi.Core.csproj b/src/DownKyi.Core/DownKyi.Core.csproj index 7012acb..cb85a1d 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 @@ -392,9 +392,9 @@ - + - + \ No newline at end of file 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 32eca1c..a4b3f02 100644 --- a/src/DownKyi/DownKyi.csproj +++ b/src/DownKyi/DownKyi.csproj @@ -562,10 +562,10 @@ - 1.1.0 + 2.0.1 - 13.0.2 + 13.0.3 From 2c227d5d26d68ecd5f42d0337e1567798c258b70 Mon Sep 17 00:00:00 2001 From: leiurayer <1432593898@qq.com> Date: Wed, 5 Feb 2025 20:36:14 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=A0=87=E9=A2=98?= =?UTF-8?q?=E4=B8=AD=E6=97=A0=E5=90=88=E6=B3=95=E5=AD=97=E7=AC=A6=E6=97=B6?= =?UTF-8?q?=E5=B4=A9=E6=BA=83=E7=9A=84=E9=97=AE=E9=A2=98=20#1143?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/DownKyi.Core/Utils/Format.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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]"; }