Compare commits

...

2 Commits

5 changed files with 15 additions and 7 deletions

View File

@@ -240,7 +240,8 @@ namespace PepperDash.Essentials.Room.Config
public class EssentialsEnvironmentPropertiesConfig public class EssentialsEnvironmentPropertiesConfig
{ {
public bool Enabled { get; set; } //[JsonProperty("enabled")]
//public bool Enabled { get; set; }
[JsonProperty("deviceKeys")] [JsonProperty("deviceKeys")]
public List<string> DeviceKeys { get; set; } public List<string> DeviceKeys { get; set; }

View File

@@ -213,14 +213,14 @@ namespace PepperDash.Essentials
{ {
if (PropertiesConfig.Environment != null) if (PropertiesConfig.Environment != null)
{ {
if (PropertiesConfig.Environment.Enabled) //if (PropertiesConfig.Environment.Enabled)
{ //{
foreach (var d in PropertiesConfig.Environment.DeviceKeys) foreach (var d in PropertiesConfig.Environment.DeviceKeys)
{ {
var envDevice = DeviceManager.GetDeviceForKey(d) as EssentialsDevice; var envDevice = DeviceManager.GetDeviceForKey(d) as EssentialsDevice;
EnvironmentalControlDevices.Add(envDevice); EnvironmentalControlDevices.Add(envDevice);
} }
} //}
} }
} }

View File

@@ -350,14 +350,14 @@ namespace PepperDash.Essentials
{ {
if (PropertiesConfig.Environment != null) if (PropertiesConfig.Environment != null)
{ {
if (PropertiesConfig.Environment.Enabled) //if (PropertiesConfig.Environment.Enabled)
{ //{
foreach (var d in PropertiesConfig.Environment.DeviceKeys) foreach (var d in PropertiesConfig.Environment.DeviceKeys)
{ {
var envDevice = DeviceManager.GetDeviceForKey(d) as EssentialsDevice; var envDevice = DeviceManager.GetDeviceForKey(d) as EssentialsDevice;
EnvironmentalControlDevices.Add(envDevice); EnvironmentalControlDevices.Add(envDevice);
} }
} //}
} }
} }

View File

@@ -113,9 +113,12 @@ namespace PepperDash.Essentials.Core.Lighting
public class LightingScene public class LightingScene
{ {
[JsonProperty("name", NullValueHandling=NullValueHandling.Ignore)]
public string Name { get; set; } public string Name { get; set; }
[JsonProperty("id", NullValueHandling = NullValueHandling.Ignore)]
public string ID { get; set; } public string ID { get; set; }
bool _IsActive; bool _IsActive;
[JsonProperty("isActive", NullValueHandling = NullValueHandling.Ignore)]
public bool IsActive public bool IsActive
{ {
get get
@@ -128,6 +131,7 @@ namespace PepperDash.Essentials.Core.Lighting
IsActiveFeedback.FireUpdate(); IsActiveFeedback.FireUpdate();
} }
} }
[JsonIgnore]
public BoolFeedback IsActiveFeedback { get; set; } public BoolFeedback IsActiveFeedback { get; set; }
public LightingScene() public LightingScene()

View File

@@ -7,6 +7,7 @@ using Crestron.SimplSharp;
using PepperDash.Essentials.Core; using PepperDash.Essentials.Core;
using Newtonsoft.Json; using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
namespace PepperDash.Essentials.Devices.Common.VideoCodec namespace PepperDash.Essentials.Devices.Common.VideoCodec
{ {
@@ -47,8 +48,10 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
public class LayoutInfoChangedEventArgs : EventArgs public class LayoutInfoChangedEventArgs : EventArgs
{ {
[JsonConverter(typeof(StringEnumConverter))]
[JsonProperty("availableLayouts", NullValueHandling = NullValueHandling.Ignore)] [JsonProperty("availableLayouts", NullValueHandling = NullValueHandling.Ignore)]
public ZoomRoom.zConfiguration.eLayoutStyle AvailableLayouts { get; set; } public ZoomRoom.zConfiguration.eLayoutStyle AvailableLayouts { get; set; }
[JsonConverter(typeof(StringEnumConverter))]
[JsonProperty("currentSelectedLayout", NullValueHandling = NullValueHandling.Ignore)] [JsonProperty("currentSelectedLayout", NullValueHandling = NullValueHandling.Ignore)]
public ZoomRoom.zConfiguration.eLayoutStyle CurrentSelectedLayout { get; set; } public ZoomRoom.zConfiguration.eLayoutStyle CurrentSelectedLayout { get; set; }
[JsonProperty("canSwapContentWithThumbnail", NullValueHandling = NullValueHandling.Ignore)] [JsonProperty("canSwapContentWithThumbnail", NullValueHandling = NullValueHandling.Ignore)]