Add QRCode Login For Linux

Improve #9
kengwang · Jun 13, 2020 · a2b03dc · a2b03dc
1 parent c7edacd
commit a2b03dc
Show file tree

Hide file tree

Showing 9 changed files with 481 additions and 20 deletions.
diff --git a/BiliDuang/BiliDuang.csproj b/BiliDuang/BiliDuang.csproj
@@ -44,6 +44,11 @@
     <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
+    <Reference Include="QRCoder, Version=1.3.9.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\QRCoder.1.3.9\lib\net40\QRCoder.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
@@ -55,6 +60,7 @@
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
+    <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="DownloadObject.cs" />
@@ -66,6 +72,8 @@
     <Compile Include="JSONCallback\Danmaku.cs" />
     <Compile Include="JSONCallback\Interaction.cs" />
     <Compile Include="JSONCallback\LikeBoxItem.cs" />
+    <Compile Include="JSONCallback\QRLoginInfo.cs" />
+    <Compile Include="JSONCallback\QRUrl.cs" />
     <Compile Include="JSONCallback\Season.cs" />
     <Compile Include="JSONCallback\Player.cs" />
     <Compile Include="JSONCallback\UpUpload.cs" />
@@ -144,6 +152,12 @@
     <Compile Include="UI\LikeSelectItem.Designer.cs">
       <DependentUpon>LikeSelectItem.cs</DependentUpon>
     </Compile>
+    <Compile Include="UI\QRLogin.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="UI\QRLogin.Designer.cs">
+      <DependentUpon>QRLogin.cs</DependentUpon>
+    </Compile>
     <Compile Include="UI\UpUpload.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -224,6 +238,9 @@
     <EmbeddedResource Include="UI\LikeSelectItem.resx">
       <DependentUpon>LikeSelectItem.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="UI\QRLogin.resx">
+      <DependentUpon>QRLogin.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="UI\UpUpload.resx">
       <DependentUpon>UpUpload.cs</DependentUpon>
     </EmbeddedResource>

diff --git a/BiliDuang/JSONCallback/QRLoginInfo.cs b/BiliDuang/JSONCallback/QRLoginInfo.cs
@@ -0,0 +1,79 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BiliDuang.JSONCallback.QRLoginInfo
+{
+    public class Data
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        public string url { get; set; }
+    }
+
+    public class QRLoginInfoNoData
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        public int code { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string status { get; set; }
+        //public int data { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public int ts { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string message { get; set; }
+    }
+
+    public class QRLoginInfoDataInt
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        public int code { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string status { get; set; }
+        public int data { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public int ts { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string message { get; set; }
+    }
+
+    public class QRLoginInfoData
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        public int code { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string status { get; set; }
+        public Data data { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public int ts { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string message { get; set; }
+    }
+}
diff --git a/BiliDuang/JSONCallback/QRUrl.cs b/BiliDuang/JSONCallback/QRUrl.cs
@@ -0,0 +1,41 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BiliDuang.JSONCallback.QRUrl
+{
+    public class Data
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        public string url { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string oauthKey { get; set; }
+    }
+
+    public class QRUrl
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        public int code { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string status { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public int ts { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public Data data { get; set; }
+    }
+
+}
diff --git a/BiliDuang/MainForm.Designer.cs b/BiliDuang/MainForm.Designer.cs
diff --git a/BiliDuang/MainForm.cs b/BiliDuang/MainForm.cs
@@ -374,8 +374,7 @@ private void LoginButton_MouseDown(object sender, MouseEventArgs e)
                 }
                 else
                 {
-                    Dialog.Show("你的系统不支持账号密码和二维码登录,请手动输入Cookie");
-                    EditSession form = new EditSession();
+                    QRLogin form = new QRLogin();
                     form.ShowDialog();
                     RefreshUserData();
                 }

diff --git a/BiliDuang/UI/QRLogin.Designer.cs b/BiliDuang/UI/QRLogin.Designer.cs