From 23706dae7f3dc4470de80f9988a24595878bfcc0 Mon Sep 17 00:00:00 2001
From: Richasy <Thansy@foxmail.com>
Date: Sun, 24 Sep 2023 15:10:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=8C=E7=BB=B4=E7=A0=81?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=B9=B6=E6=9B=B4=E6=96=B0=E8=AF=81=E4=B9=A6?=
 =?UTF-8?q?=20(#1773)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App/App.csproj                            |   1 +
 src/App/App_TemporaryKey.pfx                  | Bin 2520 -> 2520 bytes
 .../AuthorizeProvider.Extension.cs            |  31 +++++++++++-------
 src/Lib/SignIn.Uwp/SignIn.Uwp.csproj          |   6 ++--
 src/Lib/SignIn.Uwp/SignInDialog.xaml.cs       |   7 ++--
 .../Models.App/Constants/ApiConstants.cs      |   5 +--
 6 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/src/App/App.csproj b/src/App/App.csproj
index ee13ca13b..431b28d3b 100644
--- a/src/App/App.csproj
+++ b/src/App/App.csproj
@@ -26,6 +26,7 @@
     <HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
     <PackageCertificateKeyFile>App_TemporaryKey.pfx</PackageCertificateKeyFile>
     <AppxSymbolPackageEnabled>False</AppxSymbolPackageEnabled>
+    <PackageCertificateThumbprint>C3B9A35BB185E430F381F524A644B2598DDF2500</PackageCertificateThumbprint>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
diff --git a/src/App/App_TemporaryKey.pfx b/src/App/App_TemporaryKey.pfx
index 2269759f8dd0c8a8ea1260ed7b9c809877145835..50b9911fabe78f53f7ca85b7996a6a3693b4d751 100644
GIT binary patch
delta 2267
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

delta 2267
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

diff --git a/src/Lib/SignIn.Uwp/AuthorizeProvider/AuthorizeProvider.Extension.cs b/src/Lib/SignIn.Uwp/AuthorizeProvider/AuthorizeProvider.Extension.cs
index eea101d77..2d4a310b6 100644
--- a/src/Lib/SignIn.Uwp/AuthorizeProvider/AuthorizeProvider.Extension.cs
+++ b/src/Lib/SignIn.Uwp/AuthorizeProvider/AuthorizeProvider.Extension.cs
@@ -2,6 +2,8 @@
 
 using System;
 using System.Collections.Generic;
+using System.Drawing.Imaging;
+using System.IO;
 using System.Linq;
 using System.Net.Http;
 using System.Runtime.InteropServices.WindowsRuntime;
@@ -17,13 +19,13 @@
 using Bili.Models.Enums;
 using Bili.Toolkit.Interfaces;
 using Newtonsoft.Json.Linq;
+using QRCoder;
 using Windows.Security.Cryptography.Core;
 using Windows.Storage;
+using Windows.Storage.Streams;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Media.Imaging;
 using Windows.Web.Http.Filters;
-using ZXing;
-using ZXing.Common;
 using static Bili.Models.App.Constants.ApiConstants;
 using static Bili.Models.App.Constants.ServiceConstants;
 
@@ -229,7 +231,7 @@ internal async Task<string> GetConfirmUriAsync()
             return null;
         }
 
-        internal async Task<WriteableBitmap> GetQRImageAsync()
+        internal async Task<BitmapImage> GetQRImageAsync()
         {
             try
             {
@@ -244,17 +246,22 @@ internal async Task<WriteableBitmap> GetQRImageAsync()
                 var result = await httpProvider.ParseAsync<ServerResponse<QRInfo>>(response);
 
                 _internalQRAuthCode = result.Data.AuthCode;
-                var barcodeWriter = new BarcodeWriter();
-                barcodeWriter.Format = BarcodeFormat.QR_CODE;
-                barcodeWriter.Options = new EncodingOptions()
+                var generator = new QRCodeGenerator();
+                var data = generator.CreateQrCode(result.Data.Url, QRCodeGenerator.ECCLevel.Q);
+                var code = new BitmapByteQRCode(data);
+                var image = code.GetGraphic(20);
+                using (var stream = new InMemoryRandomAccessStream())
                 {
-                    Margin = 1,
-                    Height = 200,
-                    Width = 200,
-                };
+                    using (var writer = new DataWriter(stream.GetOutputStreamAt(0)))
+                    {
+                        writer.WriteBytes(image);
+                        await writer.StoreAsync();
+                    }
 
-                var img = barcodeWriter.Write(result.Data.Url);
-                return img;
+                    var bitmap = new BitmapImage();
+                    await bitmap.SetSourceAsync(stream);
+                    return bitmap;
+                }
             }
             catch
             {
diff --git a/src/Lib/SignIn.Uwp/SignIn.Uwp.csproj b/src/Lib/SignIn.Uwp/SignIn.Uwp.csproj
index e222b8534..56ac8056c 100644
--- a/src/Lib/SignIn.Uwp/SignIn.Uwp.csproj
+++ b/src/Lib/SignIn.Uwp/SignIn.Uwp.csproj
@@ -133,12 +133,12 @@
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
       <Version>6.2.14</Version>
     </PackageReference>
+    <PackageReference Include="QRCoder">
+      <Version>1.4.3</Version>
+    </PackageReference>
     <PackageReference Include="QueryString.NET">
       <Version>1.0.0</Version>
     </PackageReference>
-    <PackageReference Include="ZXing.Net">
-      <Version>0.16.8</Version>
-    </PackageReference>
   </ItemGroup>
   <ItemGroup>
     <Page Include="SignInDialog.xaml">
diff --git a/src/Lib/SignIn.Uwp/SignInDialog.xaml.cs b/src/Lib/SignIn.Uwp/SignInDialog.xaml.cs
index eb82f0528..431cfc849 100644
--- a/src/Lib/SignIn.Uwp/SignInDialog.xaml.cs
+++ b/src/Lib/SignIn.Uwp/SignInDialog.xaml.cs
@@ -172,11 +172,12 @@ private async Task LoadQRCodeAsync()
         {
             HideQRTip();
             QRLoadingRing.IsActive = true;
-            var imgSource = await _authorizeProvider.GetQRImageAsync();
-            if (imgSource != null)
+            var bitmapImage = await _authorizeProvider.GetQRImageAsync();
+            if (bitmapImage != null)
             {
-                QRCodeImage.Source = imgSource;
+                QRCodeImage.Source = bitmapImage;
                 _authorizeProvider.StartQRLoginListener();
+                QRTipBlock.Visibility = Visibility.Visible;
             }
             else
             {
diff --git a/src/Models/Models.App/Constants/ApiConstants.cs b/src/Models/Models.App/Constants/ApiConstants.cs
index 62fc6097d..e13270600 100644
--- a/src/Models/Models.App/Constants/ApiConstants.cs
+++ b/src/Models/Models.App/Constants/ApiConstants.cs
@@ -14,6 +14,7 @@ public static class ApiConstants
         public const string _vcBase = "https://api.vc.bilibili.com";
         public const string _liveBase = "https://api.live.bilibili.com";
         public const string _passBase = "https://passport.bilibili.com";
+        public const string _passSnmBase = "https://passport.snm0516.aisee.tv";
         public const string _bangumiBase = "https://bangumi.bilibili.com";
         public const string _grpcBase = "https://grpc.biliapi.net";
 
@@ -50,12 +51,12 @@ public static class Passport
             /// <summary>
             /// 获取登录二维码.
             /// </summary>
-            public const string QRCode = _passBase + "/x/passport-tv-login/qrcode/auth_code";
+            public const string QRCode = _passSnmBase + "/x/passport-tv-login/qrcode/auth_code";
 
             /// <summary>
             /// 登录二维码轮询状态.
             /// </summary>
-            public const string QRCodeCheck = _passBase + "/x/passport-tv-login/qrcode/poll";
+            public const string QRCodeCheck = _passSnmBase + "/x/passport-tv-login/qrcode/poll";
 
             /// <summary>
             /// cookie转访问令牌.