pepperdash/Essentials
1
0
Fork 0
mirror of https://github.com/PepperDash/Essentials.git synced 2026-02-16 13:15:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(essentials): Removes enabled property from Environment config. Adds StringEnumConverter to enum properties

Browse Source
This commit is contained in:
Neil Dorin
2021-12-07 10:51:39 -07:00
parent 6bc966a869
commit 908296793a
4 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
PepperDashEssentials/Room/Config/EssentialsRoomConfig.cs
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; }

6
PepperDashEssentials/Room/Types/EssentialsHuddleSpaceRoom.cs
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);
} }
} //}
} }
} }

6
PepperDashEssentials/Room/Types/EssentialsHuddleVtc1Room.cs
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);
} }
} //}
} }
} }

3
essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/Interfaces/IHasCodecLayouts.cs
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)]