解决冲突

sovetskyfish · May 31, 2020 · 494e65d · 494e65d
2 parents 684a3ec + 463af07
commit 494e65d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/PixivFSUWP/Data/OverAll.cs b/PixivFSUWP/Data/OverAll.cs
@@ -23,7 +23,7 @@ namespace PixivFSUWP.Data
     public static class OverAll
     {
         public static Uri AppUri = null;
-        public static PixivBaseAPI GlobalBaseAPI = new PixivBaseAPI(null, null, null, false, 0);
+        public static PixivBaseAPI GlobalBaseAPI = new PixivBaseAPI();
         public const string passwordResource = "PixivFSUWPPassword";
         public const string refreshTokenResource = "PixivFSUWPRefreshToken";
         public static CurrentUser currentUser = null;

diff --git a/PixivFSUWP/PixivFSUWP.csproj b/PixivFSUWP/PixivFSUWP.csproj
@@ -307,10 +307,10 @@
       <Version>6.0.0</Version>
     </PackageReference>
     <PackageReference Include="PixivCS">
-      <Version>0.5.4</Version>
+      <Version>0.5.9</Version>
     </PackageReference>
     <PackageReference Include="Win2D.uwp">
-      <Version>1.24.0</Version>
+      <Version>1.25.0</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>

diff --git a/PixivFSUWP/SearchPage.xaml.cs b/PixivFSUWP/SearchPage.xaml.cs
@@ -241,7 +241,7 @@ private async void btnSauceNAO_Click(object sender, RoutedEventArgs e)
             //ImgurNaoAPI imgurNaoApi = new ImgurNaoAPI(SAUCENAO_API_KEY, IMGUR_API_KEY);
             //string image = imgurNaoApi.UpLoad(await StorageFileExt.AsByteArray(file)).GetNamedString("link");
             //int retPid = (int)imgurNaoApi.DownLoad(image).GetNamedNumber("pixiv_id");
-            //Frame.Navigate(typeof(IllustDetailPage), retPid, App.FromRightTransitionInfo);
+            //Frame.Navigate(typeof(IllustDetailPage), retPid);
         }
         private void GoPixivID_QuerySubmitted(AutoSuggestBox sender, AutoSuggestBoxQuerySubmittedEventArgs args)
         {