完成一部分迁移

sovetskyfish · May 18, 2019 · 8b64d89 · 8b64d89
1 parent 4aad529
commit 8b64d89
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 14 deletions.
diff --git a/PixivFSUWP/Data/WaterfallItem.cs b/PixivFSUWP/Data/WaterfallItem.cs
@@ -1,9 +1,9 @@
-using FSharp.Data;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Windows.Data.Json;
 
 namespace PixivFSUWP.Data
 {
@@ -18,18 +18,18 @@ public class WaterfallItem
         public bool IsBookmarked { get; set; }
         public int Width { get; set; }
         public int Height { get; set; }
-        public static WaterfallItem FromJsonValue(JsonValue Source)
+        public static WaterfallItem FromJsonValue(JsonObject Source)
         {
             var toret = new WaterfallItem();
-            toret.Id = Source.TryGetProperty("id").Value.AsInteger();
-            toret.Title = Source.TryGetProperty("title").Value.AsString();
-            toret.Author = Source.TryGetProperty("user").Value.TryGetProperty("name").Value.AsString();
-            toret.ImageUri = Source.TryGetProperty("image_urls").Value.TryGetProperty("medium").Value.AsString();
-            toret.Stars = Source.TryGetProperty("total_bookmarks").Value.AsInteger();
-            toret.Pages = Source.TryGetProperty("page_count").Value.AsInteger();
-            toret.IsBookmarked = Source.TryGetProperty("is_bookmarked").Value.AsBoolean();
-            toret.Width = Source.TryGetProperty("width").Value.AsInteger();
-            toret.Height = Source.TryGetProperty("height").Value.AsInteger();
+            toret.Id = Convert.ToInt32(Source["id"].GetString());
+            toret.Title = Source["title"].GetString();
+            toret.Author = Source["user"].GetObject()["name"].GetString();
+            toret.ImageUri = Source["image_urls"].GetObject()["medium"].GetString();
+            toret.Stars = Convert.ToInt32(Source["total_bookmarks"].GetString());
+            toret.Pages = Convert.ToInt32(Source["page_count"].GetString());
+            toret.IsBookmarked = Source["is_bookmarked"].GetBoolean();
+            toret.Width = Convert.ToInt32(Source["width"].GetString());
+            toret.Height = Convert.ToInt32(Source["height"].GetString());
             return toret;
         }
     }

diff --git a/PixivFSUWP/ViewModels/WaterfallItemViewModel.cs b/PixivFSUWP/ViewModels/WaterfallItemViewModel.cs
@@ -5,8 +5,6 @@
 using System.Threading.Tasks;
 using PixivFSUWP.Data;
 using Windows.UI.Xaml.Media.Imaging;
-using PixivFSCS;
-using PixivFS;
 using System.IO;
 
 namespace PixivFSUWP.ViewModels