diff --git a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/ISelectableItemsMessenger.cs b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/ISelectableItemsMessenger.cs index 553d31c6..4fb8f912 100644 --- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/ISelectableItemsMessenger.cs +++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/ISelectableItemsMessenger.cs @@ -1,6 +1,4 @@ using Newtonsoft.Json; -using Newtonsoft.Json.Converters; -using Newtonsoft.Json.Linq; using PepperDash.Core; using PepperDash.Core.Logging; using PepperDash.Essentials.Core.DeviceTypeInterfaces; @@ -10,17 +8,37 @@ using System.Collections.Generic; namespace PepperDash.Essentials.AppServer.Messengers { public class ISelectableItemsMessenger : MessengerBase - { - private static readonly JsonSerializer serializer = new JsonSerializer { Converters = { new StringEnumConverter() } }; + { private readonly ISelectableItems itemDevice; private readonly string _propName; + + /// + /// Constructs a messenger for a device that implements ISelectableItems + /// + /// + /// + /// + /// public ISelectableItemsMessenger(string key, string messagePath, ISelectableItems device, string propName) : base(key, messagePath, device as IKeyName) { itemDevice = device; _propName = propName; } + /// + /// Constructs a messenger for a device that implements IHasInputs + /// + /// + /// + /// + /// + public ISelectableItemsMessenger(string key, string messagePath, IHasInputs device, string propName) : base(key, messagePath, device) + { + itemDevice = device.Inputs; + _propName = propName; + } + protected override void RegisterActions() { base.RegisterActions(); diff --git a/src/PepperDash.Essentials.MobileControl/MobileControlSystemController.cs b/src/PepperDash.Essentials.MobileControl/MobileControlSystemController.cs index 76823bb4..496fd332 100644 --- a/src/PepperDash.Essentials.MobileControl/MobileControlSystemController.cs +++ b/src/PepperDash.Essentials.MobileControl/MobileControlSystemController.cs @@ -766,7 +766,7 @@ namespace PepperDash.Essentials var messenger = new ISelectableItemsMessenger( $"{device.Key}-inputs-{Key}", $"/device/{device.Key}", - stringInputs.Inputs, + stringInputs, "inputs" ); @@ -782,7 +782,7 @@ namespace PepperDash.Essentials var messenger = new ISelectableItemsMessenger( $"{device.Key}-inputs-{Key}", $"/device/{device.Key}", - byteInputs.Inputs, + byteInputs, "inputs" ); @@ -798,7 +798,7 @@ namespace PepperDash.Essentials var messenger = new ISelectableItemsMessenger( $"{device.Key}-inputs-{Key}", $"/device/{device.Key}", - intInputs.Inputs, + intInputs, "inputs" );