完成一部分迁移

sovetskyfish · May 18, 2019 · eb58dfd · eb58dfd
1 parent 91524a6
commit eb58dfd
Showing 1 changed file with 16 additions and 16 deletions.
diff --git a/PixivFSUWP/Data/RecommendIllustsCollection.cs b/PixivFSUWP/Data/RecommendIllustsCollection.cs
@@ -1,4 +1,4 @@
-using PixivFSCS;
+using PixivCS;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -9,8 +9,8 @@
 using System.Threading.Tasks;
 using Windows.Foundation;
 using Windows.UI.Xaml.Data;
-using FSharp.Data;
 using System.Web;
+using Windows.Data.Json;
 
 namespace PixivFSUWP.Data
 {
@@ -59,29 +59,29 @@ protected async Task<LoadMoreItemsResult> LoadMoreItemsAsync(CancellationToken c
             {
                 if (!HasMoreItems) return new LoadMoreItemsResult() { Count = 0 };
                 LoadMoreItemsResult toret = new LoadMoreItemsResult() { Count = 0 };
-                JsonValue recommendres = null;
+                JsonObject recommendres = null;
                 if (nexturl == "begin")
-                    recommendres = await Task.Run(() => new PixivFS
+                    recommendres = await Task.Run(() => new PixivCS
                         .PixivAppAPI(OverAll.GlobalBaseAPI)
-                        .csfriendly_illust_recommended());
+                        .IllustRecommended());
                 else
                 {
                     Uri next = new Uri(nexturl);
                     string getparam(string param) => HttpUtility.ParseQueryString(next.Query).Get(param);
-                    recommendres = await Task.Run(() => new PixivFS
+                    recommendres = await Task.Run(() => new PixivCS
                         .PixivAppAPI(OverAll.GlobalBaseAPI)
-                        .csfriendly_illust_recommended(content_type:
+                        .IllustRecommended(ContentType:
                             getparam("content_type"),
-                            include_ranking_label: bool.Parse(getparam("include_ranking_label")),
-                            filter: getparam("filter"),
-                            min_bookmark_id_for_recent_illust: getparam("min_bookmark_id_for_recent_illust"),
-                            max_bookmark_id_for_recommend: getparam("max_bookmark_id_for_recommend"),
-                            offset: getparam("offset"),
-                            include_ranking_illusts: bool.Parse(getparam("include_ranking_illusts")),
-                            include_privacy_policy: getparam("include_privacy_policy")));
+                            IncludeRankingLabel: bool.Parse(getparam("include_ranking_label")),
+                            Filter: getparam("filter"),
+                            MinBookmarkIDForRecentIllust: getparam("min_bookmark_id_for_recent_illust"),
+                            MaxBookmarkIDForRecommended: getparam("max_bookmark_id_for_recommend"),
+                            Offset: getparam("offset"),
+                            IncludeRankingIllusts: bool.Parse(getparam("include_ranking_illusts")),
+                            IncludePrivacyPolicy: getparam("include_privacy_policy")));
                 }
-                nexturl = recommendres.TryGetProperty("next_url").Value.AsString();
-                foreach (var recillust in recommendres.TryGetProperty("illusts").Value.AsArray())
+                nexturl = recommendres["next_url"].GetString();
+                foreach (JsonObject recillust in recommendres["illusts"].GetArray())
                 {
                     if (_emergencyStop)
                     {