DarthAffe/RGB.NET
1
0 Fork 0
mirror of https://github.com/DarthAffe/RGB.NET.git synced 2026-11-10 20:46:24 +00:00
Code Issues Releases Wiki Activity

Changed Json-Serializer to .NET Default

Browse Source
This commit is contained in:
DarthAffe committed 2020-11-12 17:13:19 +01:00
1 parent fdb5022197
commit 42456ad7bd
6 files changed
+24 -21
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

RGB.NET.Devices.SteelSeries/API/Model/CoreProps.cs
+2 -2
View File
@@ -1,10 +1,10 @@
using Newtonsoft.Json;
using System.Text.Json.Serialization;
namespace RGB.NET.Devices.SteelSeries.API.Model
{
internal class CoreProps
{
[JsonProperty(PropertyName = "address")]
[JsonPropertyName("address")]
public string Address { get; set; }
}
}
RGB.NET.Devices.SteelSeries/API/Model/Event.cs
+4 -4
View File
@@ -1,5 +1,5 @@
using System.Collections.Generic;
using Newtonsoft.Json;
using System.Text.Json.Serialization;
namespace RGB.NET.Devices.SteelSeries.API.Model
{
@@ -7,13 +7,13 @@ namespace RGB.NET.Devices.SteelSeries.API.Model
{
#region Properties & Fields
[JsonProperty("game")]
[JsonPropertyName("game")]
public string Game { get; set; }
[JsonProperty("event")]
[JsonPropertyName("event")]
public string Name { get; set; }
[JsonProperty("data")]
[JsonPropertyName("data")]
public Dictionary<string, object> Data { get; } = new Dictionary<string, object>();
#endregion
RGB.NET.Devices.SteelSeries/API/Model/Game.cs
+3 -3
View File
@@ -1,4 +1,4 @@
using Newtonsoft.Json;
using System.Text.Json.Serialization;
namespace RGB.NET.Devices.SteelSeries.API.Model
{
@@ -6,10 +6,10 @@ namespace RGB.NET.Devices.SteelSeries.API.Model
{
#region Properties & Fields
[JsonProperty("game")]
[JsonPropertyName("game")]
public string Name { get; set; }
[JsonProperty("game_display_name")]
[JsonPropertyName("game_display_name")]
public string DisplayName { get; set; }
#endregion
RGB.NET.Devices.SteelSeries/API/Model/GoLispHandler.cs
+3 -3
View File
@@ -1,4 +1,4 @@
using Newtonsoft.Json;
using System.Text.Json.Serialization;
namespace RGB.NET.Devices.SteelSeries.API.Model
{
@@ -6,10 +6,10 @@ namespace RGB.NET.Devices.SteelSeries.API.Model
{
#region Properties & Fields
[JsonProperty("game")]
[JsonPropertyName("game")]
public string Game { get; set; }
[JsonProperty("golisp")]
[JsonPropertyName("golisp")]
public string Handler { get; set; }
#endregion
RGB.NET.Devices.SteelSeries/API/SteelSeriesSDK.cs
+12 -8
View File
@@ -5,7 +5,8 @@ using System.Linq;
using System.Net.Http;
using System.Runtime.InteropServices;
using System.Text;
using Newtonsoft.Json;
using System.Text.Json;
using System.Text.Json.Serialization;
using RGB.NET.Devices.SteelSeries.API.Model;
namespace RGB.NET.Devices.SteelSeries.API
@@ -73,13 +74,16 @@ namespace RGB.NET.Devices.SteelSeries.API
string corePropsPath = GetCorePropsPath();
if (!string.IsNullOrWhiteSpace(corePropsPath) && File.Exists(corePropsPath))
{
CoreProps coreProps = JsonConvert.DeserializeObject<CoreProps>(File.ReadAllText(corePropsPath));
_baseUrl = coreProps.Address;
if (!_baseUrl.StartsWith("http://", StringComparison.Ordinal))
_baseUrl = "http://" + _baseUrl;
CoreProps coreProps = JsonSerializer.Deserialize<CoreProps>(File.ReadAllText(corePropsPath));
_baseUrl = coreProps?.Address;
if (_baseUrl != null)
{
if (!_baseUrl.StartsWith("http://", StringComparison.Ordinal))
_baseUrl = "http://" + _baseUrl;
RegisterGame(_game);
RegisterGoLispHandler(new GoLispHandler(_game, HANDLER));
RegisterGame(_game);
RegisterGoLispHandler(new GoLispHandler(_game, HANDLER));
}
}
}
catch
@@ -122,7 +126,7 @@ namespace RGB.NET.Devices.SteelSeries.API
private static string PostJson(string urlSuffix, object o)
{
string payload = JsonConvert.SerializeObject(o);
string payload = JsonSerializer.Serialize(o);
return _client.PostAsync(_baseUrl + urlSuffix, new StringContent(payload, Encoding.UTF8, "application/json")).Result.Content.ReadAsStringAsync().Result;
}