Merge pull request #95 from LeoChen98/dev

[BiliAccount @ 2.5.5.27]
LeoChen98 · Jan 15, 2022 · 7d85336 · 7d85336
2 parents 75db797 + a2dd89b
commit 7d85336
Show file tree

Hide file tree

Showing 5 changed files with 83 additions and 12 deletions.
diff --git a/BiliAccount.Geetest.Controls/BiliAccount.Geetest.Controls.csproj b/BiliAccount.Geetest.Controls/BiliAccount.Geetest.Controls.csproj
@@ -105,8 +105,8 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)'=='Release'">
-    <DebugType>none</DebugType>
-    <DebugSymbols>false</DebugSymbols>
+    <DebugType>portable</DebugType>
+    <DebugSymbols>true</DebugSymbols>
     <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
   </PropertyGroup>
 

diff --git a/BiliAccount/BiliAccount.csproj b/BiliAccount/BiliAccount.csproj
@@ -6,21 +6,23 @@
     <RootNamespace>BiliAccount</RootNamespace>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageId>BiliAccount</PackageId>
-    <Version>2.5.4.26</Version>
+    <Version>2.5.5.27</Version>
     <Authors>LeoChen</Authors>
     <Company>zhangbudademao.com</Company>
     <Product>BiliAccount</Product>
     <Description>用于处理B站账号类的操作</Description>
-    <Copyright>Copyright © 2020 zhangbudademao.com, all rights reserved.</Copyright>
+    <Copyright>Copyright © 2022 zhangbudademao.com, all rights reserved.</Copyright>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageProjectUrl>https://github.com/LeoChen98/BiliAccount</PackageProjectUrl>
     <RepositoryUrl>https://github.com/LeoChen98/BiliAccount</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <PackageTags>bilibili bililive bililogin biliaccount</PackageTags>
     <PackageIcon>favicon_4.png</PackageIcon>
     <PackageReleaseNotes>
-     fixes:
-	    1. 修复了由于破站改接口导致无法通过密码登录的问题。
+      adds:
+        1. 新增 `Linq.ByQRCode.LoginByQrCodeUrl`。
+      enhancements:
+        1. 更新引用库版本。
     </PackageReleaseNotes>
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
@@ -114,9 +116,9 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'netstandard2.1' OR '$(TargetFramework)' == 'netcoreapp3.0' OR '$(TargetFramework)' == 'netcoreapp3.1'">
-    <PackageReference Include="QRCoder" Version="1.4.1" />
+    <PackageReference Include="QRCoder" Version="1.4.3" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="System.Drawing.Common" Version="5.0.2" />
+    <PackageReference Include="System.Drawing.Common" Version="5.0.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/BiliAccount/Core/ByPassword.cs b/BiliAccount/Core/ByPassword.cs
@@ -395,7 +395,8 @@ private static void LoginSuccess(DoLogin_DataTemplete obj, ref Account account)
                     account.LoginStatus = Account.LoginStatusEnum.NeedTelVerify;
                     break;
 
-                case 3://设备登录验证
+                case 2://设备登录验证
+                case 3:
                     account.Url = obj.data.url;
                     account.LoginStatus = Account.LoginStatusEnum.NeedSafeVerify;
                     break;

diff --git a/BiliAccount/Core/ByQRCode.cs b/BiliAccount/Core/ByQRCode.cs
@@ -49,6 +49,42 @@ public static void CancelLogin()
             Refresher.Dispose();
         }
 
+        /// <summary>
+        /// 获取二维码要包含的登录url
+        /// </summary>
+        /// <returns>二维码要包含的登录url</returns>
+        public static string GetQrcodeUrl()
+        {
+            return Http.GetBody("https://passport.bilibili.com/qrcode/getLoginUrl", null, "https://passport.bilibili.com/login", $"BiliAccount/{Config.Dll_Version}"); 
+        }
+
+        /// <summary>
+        /// 获取二维码(只返回登录url）
+        /// </summary>
+        /// <returns>登录url</returns>
+        public static string GetQrcode()
+        {
+        re:
+            string str = GetQrcodeUrl();
+            if (!string.IsNullOrEmpty(str))
+            {
+#if NETSTANDARD2_0 || NETCORE3_0
+                GetQrcode_DataTemplete obj = JsonConvert.DeserializeObject<GetQrcode_DataTemplete>(str);
+#else
+                GetQrcode_DataTemplete obj = (new JavaScriptSerializer()).Deserialize<GetQrcode_DataTemplete>(str);
+#endif
+
+                if (obj.code == 0)
+                {
+                    Monitor = new Timer(MonitorCallback, obj.data.oauthKey, 1000, 1000);
+                    Refresher = new Timer(RefresherCallback, null, 180000, Timeout.Infinite);
+                }
+            }
+            else goto re;
+
+            return str;
+        }
+
         /// <summary>
         /// 获取二维码
         /// </summary>
@@ -60,8 +96,7 @@ public static Bitmap GetQrcode(Color Foreground,Color Background,bool IsBorderVi
         {
             Bitmap qrCodeImage = null;
         re:
-            //获取二维码要包含的url
-            string str = Http.GetBody("https://passport.bilibili.com/qrcode/getLoginUrl", null, "https://passport.bilibili.com/login",$"BiliAccount/{Config.Dll_Version}");
+            string str = GetQrcodeUrl();
             if (!string.IsNullOrEmpty(str))
             {
 #if NETSTANDARD2_0 || NETCORE3_0
@@ -201,7 +236,10 @@ private static void MonitorCallback(object o)
         /// <param name="state"></param>
         private static void RefresherCallback(object state)
         {
-            Linq.ByQRCode.RaiseQrCodeRefresh(GetQrcode((Color)((List<object>)state)[0], (Color)((List<object>)state)[1], (bool)((List<object>)state)[2]));
+            if (state == null)
+                Linq.ByQRCode.RaiseQrCodeRefresh(GetQrcode());
+            else
+                Linq.ByQRCode.RaiseQrCodeRefresh(GetQrcode((Color)((List<object>)state)[0], (Color)((List<object>)state)[1], (bool)((List<object>)state)[2]));
         }
 
         #endregion Private Methods

diff --git a/BiliAccount/Linq/ByQRCode.cs b/BiliAccount/Linq/ByQRCode.cs
@@ -30,6 +30,12 @@ public class ByQRCode
         /// <param name="newQrCode">新二维码</param>
         public delegate void QrCodeRefresh_Handle(Bitmap newQrCode);
 
+        /// <summary>
+        /// 二维码刷新处理程序(仅登录url）
+        /// </summary>
+        /// <param name="newQrCodeUrl">新二维码</param>
+        public delegate void QrCodeUrlRefresh_Handle(string newQrCodeUrl);
+
         /// <summary>
         /// 二维码登录状态变更处理程序
         /// </summary>
@@ -46,6 +52,11 @@ public class ByQRCode
         /// </summary>
         public static event QrCodeRefresh_Handle QrCodeRefresh;
 
+        /// <summary>
+        /// 登录Url刷新事件
+        /// </summary>
+        public static event QrCodeUrlRefresh_Handle QrCodeUrlRefresh;
+
         /// <summary>
         /// 二维码登录状态变更事件
         /// </summary>
@@ -120,6 +131,16 @@ public static ImageSource GetQrCodeImageSource(Bitmap qrCodeImage)
 
 #endif
 
+        /// <summary>
+        /// 获取登录Url
+        /// </summary>
+        /// <returns>登录Url</returns>
+        /// <exception cref="Exceptions.InvalidColorValue">传入了错误的颜色值</exception>
+        public static string LoginByQrCodeUrl()
+        {
+            return Core.ByQRCode.GetQrcode();
+        }
+
         /// <summary>
         /// 获取二维码
         /// </summary>
@@ -168,6 +189,15 @@ internal static void RaiseQrCodeRefresh(Bitmap newQrCode)
             QrCodeRefresh?.Invoke(newQrCode);
         }
 
+        /// <summary>
+        /// 调起二维码刷新
+        /// </summary>
+        /// <param name="newQrCodeUrl">新二维码</param>
+        internal static void RaiseQrCodeRefresh(string newQrCodeUrl)
+        {
+            QrCodeUrlRefresh?.Invoke(newQrCodeUrl);
+        }
+
         /// <summary>
         /// 调起二维码登录状态变更
         /// </summary>