修改登录业务代码，便于储存当前用户信息

sovetskyfish · Apr 24, 2019 · 6722fd6 · 6722fd6
1 parent d6abb0c
commit 6722fd6
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 9 deletions.
diff --git a/PixivFSUWP/Data/CurrentUser.cs b/PixivFSUWP/Data/CurrentUser.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PixivFSUWP.Data
+{
+    class CurrentUser
+    {
+    }
+}
diff --git a/PixivFSUWP/LoginPage.xaml.cs b/PixivFSUWP/LoginPage.xaml.cs
@@ -22,6 +22,7 @@
 using System.Diagnostics;
 using Windows.Security.Credentials;
 using static PixivFSUWP.Data.OverAll;
+using FSharp.Data;
 
 // https://go.microsoft.com/fwlink/?LinkId=234238 上介绍了“空白页”项模板
 
@@ -86,38 +87,39 @@ private async void Login()
             //异步执行登录
             var logintask = Task.Run(() =>
             {
+                JsonValue res = null;
                 try
                 {
                     if (useToken)
-                        GlobalBaseAPI.csfriendly_auth(refresh_token: refreshToken);
+                        res = GlobalBaseAPI.csfriendly_auth(refresh_token: refreshToken);
                     else
-                        GlobalBaseAPI.csfriendly_auth(username, password);
-                    return true;
+                        res = GlobalBaseAPI.csfriendly_auth(username, password);
+                    return (true, res);
                 }
                 catch
                 {
-                    if(useToken)
+                    if (useToken)
                     {
                         useToken = false;
                         try
                         {
-                            GlobalBaseAPI.csfriendly_auth(username, password);
-                            return true;
+                            res = GlobalBaseAPI.csfriendly_auth(username, password);
+                            return (true, res);
                         }
                         catch
                         {
-                            return false;
+                            return (false, res);
                         }
                     }
-                    return false;
+                    return (false, res);
                 }
             });
             stkTxts.Visibility = Visibility.Collapsed;
             stkBtns.Visibility = Visibility.Collapsed;
             btnTrouble.Visibility = Visibility.Collapsed;
             ringProgress.IsActive = true;
             grdLoading.Visibility = Visibility.Visible;
-            var loginres = await logintask;
+            (var loginres, var jsonres) = await logintask;
             if (loginres)
             {
                 //登录成功

diff --git a/PixivFSUWP/PixivFSUWP.csproj b/PixivFSUWP/PixivFSUWP.csproj
@@ -136,6 +136,7 @@
     <Compile Include="Data\BigImageDetail.cs" />
     <Compile Include="Data\BookmarkIllustsCollection.cs" />
     <Compile Include="Data\CommentsCollection.cs" />
+    <Compile Include="Data\CurrentUser.cs" />
     <Compile Include="Data\FollowingIllustsCollection.cs" />
     <Compile Include="Data\IllustCommentItem.cs" />
     <Compile Include="Data\IllustDetail.cs" />