Compare commits
No commits in common. "8902795ecd1db5b56d15b944f8a907fe2845680c" and "5c15af8349bf08624760f9e6032ab037d2934724" have entirely different histories.
8902795ecd
...
5c15af8349
@ -1,5 +1,4 @@
|
|||||||
using Newtonsoft.Json;
|
using Newtonsoft.Json;
|
||||||
using Newtonsoft.Json.Linq;
|
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
|
||||||
@ -9,10 +8,6 @@ public class Question
|
|||||||
{
|
{
|
||||||
public int index;
|
public int index;
|
||||||
public string promptId;
|
public string promptId;
|
||||||
|
|
||||||
[JsonConverter(typeof(ArrayToDictionaryConverter<Proposition>))]
|
|
||||||
public Dictionary<int, Proposition> propositions;
|
public Dictionary<int, Proposition> propositions;
|
||||||
|
|
||||||
public double creationDate;
|
public double creationDate;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2,15 +2,12 @@
|
|||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using Newtonsoft.Json;
|
using Newtonsoft.Json;
|
||||||
using Newtonsoft.Json.Linq;
|
|
||||||
|
|
||||||
[Serializable]
|
[Serializable]
|
||||||
[JsonObject]
|
[JsonObject]
|
||||||
public class Room
|
public class Room
|
||||||
{
|
{
|
||||||
public string code;
|
public string code;
|
||||||
|
|
||||||
[JsonConverter(typeof(ArrayToDictionaryConverter<Question>))]
|
|
||||||
public Dictionary<int, Question> questions;
|
public Dictionary<int, Question> questions;
|
||||||
public Dictionary<string, Player> players;
|
public Dictionary<string, Player> players;
|
||||||
public string currentQuestionId;
|
public string currentQuestionId;
|
||||||
@ -95,43 +92,3 @@ public List<Proposition> GetPropositionsByPlayer(Player player)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public class ArrayToDictionaryConverter<T> : JsonConverter<Dictionary<int, T>>
|
|
||||||
{
|
|
||||||
public override Dictionary<int, T> ReadJson(JsonReader reader, Type objectType, Dictionary<int, T> existingValue, bool hasExistingValue, JsonSerializer serializer)
|
|
||||||
{
|
|
||||||
if (reader.TokenType == JsonToken.StartArray)
|
|
||||||
{
|
|
||||||
var jsonArray = JArray.Load(reader);
|
|
||||||
var dictionary = new Dictionary<int, T>();
|
|
||||||
|
|
||||||
for (int i = 0; i < jsonArray.Count; i++)
|
|
||||||
{
|
|
||||||
var item = jsonArray[i].ToObject<T>(serializer);
|
|
||||||
dictionary.Add(i, item);
|
|
||||||
}
|
|
||||||
|
|
||||||
return dictionary;
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
public override void WriteJson(JsonWriter writer, Dictionary<int, T> value, JsonSerializer serializer)
|
|
||||||
{
|
|
||||||
if (value != null)
|
|
||||||
{
|
|
||||||
var jsonArray = new JArray();
|
|
||||||
|
|
||||||
foreach (var kvp in value)
|
|
||||||
{
|
|
||||||
var itemJson = JToken.FromObject(kvp.Value, serializer);
|
|
||||||
jsonArray.Add(itemJson);
|
|
||||||
}
|
|
||||||
|
|
||||||
jsonArray.WriteTo(writer);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user