修正小问题

sovetskyfish · May 18, 2019 · f73a40a · f73a40a
1 parent 5bda804
commit f73a40a
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 deletions.
diff --git a/PixivFSUWP/Data/BookmarkIllustsCollection.cs b/PixivFSUWP/Data/BookmarkIllustsCollection.cs
@@ -89,7 +89,7 @@ protected async Task<LoadMoreItemsResult> LoadMoreItemsAsync(CancellationToken c
                         throw new Exception();
                     }
                     await Task.Run(() => pause.WaitOne());
-                    Data.WaterfallItem recommendi = Data.WaterfallItem.FromJsonValue(recillust as JsonObject);
+                    Data.WaterfallItem recommendi = Data.WaterfallItem.FromJsonValue(recillust.GetObject());
                     var recommendmodel = ViewModels.WaterfallItemViewModel.FromItem(recommendi);
                     await recommendmodel.LoadImageAsync();
                     Add(recommendmodel);

diff --git a/PixivFSUWP/Data/CommentsCollection.cs b/PixivFSUWP/Data/CommentsCollection.cs
@@ -83,7 +83,7 @@ protected async Task<LoadMoreItemsResult> LoadMoreItemsAsync(CancellationToken c
                         throw new Exception();
                     }
                     await Task.Run(() => pause.WaitOne());
-                    Data.IllustCommentItem recommendi = Data.IllustCommentItem.FromJsonValue(recillust as JsonObject);
+                    Data.IllustCommentItem recommendi = Data.IllustCommentItem.FromJsonValue(recillust.GetObject());
                     var recommendmodel = ViewModels.CommentViewModel.FromItem(recommendi);
                     //await recommendmodel.LoadAvatarAsync();
                     Add(recommendmodel);

diff --git a/PixivFSUWP/Data/FollowingIllustsCollection.cs b/PixivFSUWP/Data/FollowingIllustsCollection.cs
@@ -80,7 +80,7 @@ protected async Task<LoadMoreItemsResult> LoadMoreItemsAsync(CancellationToken c
                         throw new Exception();
                     }
                     await Task.Run(() => pause.WaitOne());
-                    Data.WaterfallItem recommendi = Data.WaterfallItem.FromJsonValue(recillust as JsonObject);
+                    Data.WaterfallItem recommendi = Data.WaterfallItem.FromJsonValue(recillust.GetObject());
                     var recommendmodel = ViewModels.WaterfallItemViewModel.FromItem(recommendi);
                     await recommendmodel.LoadImageAsync();
                     Add(recommendmodel);

diff --git a/PixivFSUWP/Data/IllustDetail.cs b/PixivFSUWP/Data/IllustDetail.cs
@@ -46,7 +46,7 @@ public static IllustDetail FromJsonValue(JsonObject Source)
             var tags = Source["illust"].GetObject()["tags"].GetArray();
             toret.Tags = new List<string>();
             foreach (var tag in tags)
-                toret.Tags.Add(((JsonObject)tag)["name"].GetString());
+                toret.Tags.Add(tag.GetObject()["name"].GetString());
             var tools = Source["illust"].GetObject()["tools"].GetArray();
             toret.Tools = new List<string>();
             foreach (var tool in tools)
@@ -60,7 +60,7 @@ public static IllustDetail FromJsonValue(JsonObject Source)
             {
                 var pages = Source["illust"].GetObject()["meta_pages"].GetArray();
                 foreach (var page in pages)
-                    toret.OriginalUrls.Add(((JsonObject)page)["image_urls"].GetObject()["original"].GetString());
+                    toret.OriginalUrls.Add(page.GetObject()["image_urls"].GetObject()["original"].GetString());
             }
             toret.Width = Convert.ToInt32(Source["illust"].GetObject()["width"].GetString());
             toret.Height = Convert.ToInt32(Source["illust"].GetObject()["height"].GetString());

diff --git a/PixivFSUWP/Data/RecommendIllustsCollection.cs b/PixivFSUWP/Data/RecommendIllustsCollection.cs
@@ -81,7 +81,6 @@ protected async Task<LoadMoreItemsResult> LoadMoreItemsAsync(CancellationToken c
                             IncludePrivacyPolicy: getparam("include_privacy_policy"));
                 }
                 nexturl = recommendres["next_url"].GetString();
-                var test = recommendres["illusts"].GetArray();
                 foreach (var recillust in recommendres["illusts"].GetArray())
                 {
                     if (_emergencyStop)
@@ -90,7 +89,7 @@ protected async Task<LoadMoreItemsResult> LoadMoreItemsAsync(CancellationToken c
                         throw new Exception();
                     }
                     await Task.Run(() => pause.WaitOne());
-                    Data.WaterfallItem recommendi = Data.WaterfallItem.FromJsonValue(recillust as JsonObject);
+                    Data.WaterfallItem recommendi = Data.WaterfallItem.FromJsonValue(recillust.GetObject());
                     var recommendmodel = ViewModels.WaterfallItemViewModel.FromItem(recommendi);
                     await recommendmodel.LoadImageAsync();
                     Add(recommendmodel);