diff --git a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IHasCallHistoryMessenger.cs b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IHasCallHistoryMessenger.cs index 388f6a3c..52bf9cce 100644 --- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IHasCallHistoryMessenger.cs +++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IHasCallHistoryMessenger.cs @@ -31,6 +31,7 @@ namespace PepperDash.Essentials.AppServer.Messengers base.RegisterActions(); AddAction("/fullStatus", (id, content) => PostCallHistory()); + AddAction("/callHistoryStatus", (id, content) => PostCallHistory()); AddAction("/getCallHistory", (id, content) => PostCallHistory()); } diff --git a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IHasCodecCamerasMessenger.cs b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IHasCodecCamerasMessenger.cs index 9ea151bc..75e0c2e0 100644 --- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IHasCodecCamerasMessenger.cs +++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IHasCodecCamerasMessenger.cs @@ -27,6 +27,8 @@ namespace PepperDash.Essentials.AppServer.Messengers { _codec = codec ?? throw new ArgumentNullException(nameof(codec)); _cameraCodec = codec as IHasCodecCameras ?? throw new ArgumentException("codec must implement IHasCodecCameras", nameof(codec)); + + _cameraCodec.CameraSelected += CameraCodec_CameraSelected; } /// @@ -38,7 +40,8 @@ namespace PepperDash.Essentials.AppServer.Messengers _cameraCodec.CameraSelected += CameraCodec_CameraSelected; - AddAction("/fullStatus", (id, content) => PostSelectedCamera()); + AddAction("/fullStatus", (id, content) => SendFullStatus()); + AddAction("/codecCamerasStatus", (id, content) => SendFullStatus()); AddAction("/cameraSelect", (id, content) => { diff --git a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IHasCodecRoomPresetsMessenger.cs b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IHasCodecRoomPresetsMessenger.cs index 4bcbe254..608b24b7 100644 --- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IHasCodecRoomPresetsMessenger.cs +++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IHasCodecRoomPresetsMessenger.cs @@ -31,6 +31,7 @@ namespace PepperDash.Essentials.AppServer.Messengers base.RegisterActions(); AddAction("/fullStatus", (id, content) => SendFullStatus(id)); + AddAction("/roomPresetsStatus", (id, content) => SendFullStatus(id)); } private void Presets_ListHasChanged(object sender, EventArgs e) diff --git a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IHasContentSharingMessenger.cs b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IHasContentSharingMessenger.cs index 159c9a02..69ebadb0 100644 --- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IHasContentSharingMessenger.cs +++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IHasContentSharingMessenger.cs @@ -29,6 +29,7 @@ namespace PepperDash.Essentials.AppServer.Messengers base.RegisterActions(); AddAction("/fullStatus", (id, content) => SendFullStatus(id)); + AddAction("/contentSharingStatus", (id, content) => SendFullStatus(id)); AddAction("/sharingStart", (id, content) => _sharing.StartSharing()); AddAction("/sharingStop", (id, content) => _sharing.StopSharing()); } diff --git a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IRoomEventScheduleMessenger.cs b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IRoomEventScheduleMessenger.cs index 1112a85d..8d5322a0 100644 --- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IRoomEventScheduleMessenger.cs +++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IRoomEventScheduleMessenger.cs @@ -33,7 +33,12 @@ public class IRoomEventScheduleMessenger : MessengerBase protected override void RegisterActions() { AddAction("/saveScheduledEvents", (id, content) => SaveScheduledEvents(content.ToObject>())); - AddAction("/status", (id, content) => + AddAction("/fullStatus", (id, content) => + { + var events = _room.GetScheduledEvents(); + SendFullStatus(events, id); + }); + AddAction("/roomEventStatus", (id, content) => { var events = _room.GetScheduledEvents(); diff --git a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IShutdownPromptTimerMessenger.cs b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IShutdownPromptTimerMessenger.cs index f3b21d7b..73872b54 100644 --- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IShutdownPromptTimerMessenger.cs +++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/IShutdownPromptTimerMessenger.cs @@ -27,8 +27,7 @@ namespace PepperDash.Essentials.AppServer.Messengers /// protected override void RegisterActions() { - AddAction("/status", (id, content) => SendFullStatus(id)); - + AddAction("/fullStatus", (id, content) => SendFullStatus(id)); AddAction("/shutdownPromptStatus", (id, content) => SendFullStatus(id)); AddAction("/setShutdownPromptSeconds", (id, content) => diff --git a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/ITechPasswordMessenger.cs b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/ITechPasswordMessenger.cs index c511c68c..a2d49cde 100644 --- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/ITechPasswordMessenger.cs +++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/ITechPasswordMessenger.cs @@ -27,8 +27,7 @@ namespace PepperDash.Essentials.AppServer.Messengers protected override void RegisterActions() { - AddAction("/status", (id, content) => SendFullStatus(id)); - + AddAction("/fullStatus", (id, content) => SendFullStatus(id)); AddAction("/techPasswordStatus", (id, content) => SendFullStatus(id)); AddAction("/validateTechPassword", (id, content) => diff --git a/src/PepperDash.Essentials.MobileControl/MessengerFactoryRegistry.cs b/src/PepperDash.Essentials.MobileControl/MessengerFactoryRegistry.cs index ae757962..6caae7b2 100644 --- a/src/PepperDash.Essentials.MobileControl/MessengerFactoryRegistry.cs +++ b/src/PepperDash.Essentials.MobileControl/MessengerFactoryRegistry.cs @@ -11,8 +11,6 @@ using PepperDash.Essentials.Core.Shades; using PepperDash.Essentials.Devices.Common.AudioCodec; using PepperDash.Essentials.Devices.Common.Cameras; using PepperDash.Essentials.Devices.Common.Codec; -using PepperDash.Essentials.Devices.Common.Displays; -using PepperDash.Essentials.Devices.Common.SoftCodec; using PepperDash.Essentials.Devices.Common.VideoCodec; using PepperDash.Essentials.Devices.Common.VideoCodec.Interfaces; using PepperDash.Essentials.Room.MobileControl; diff --git a/src/PepperDash.Essentials.MobileControl/RoomBridges/MobileControlEssentialsRoomBridge.cs b/src/PepperDash.Essentials.MobileControl/RoomBridges/MobileControlEssentialsRoomBridge.cs index 93924b24..b6aca416 100644 --- a/src/PepperDash.Essentials.MobileControl/RoomBridges/MobileControlEssentialsRoomBridge.cs +++ b/src/PepperDash.Essentials.MobileControl/RoomBridges/MobileControlEssentialsRoomBridge.cs @@ -107,7 +107,7 @@ namespace PepperDash.Essentials.RoomBridges // Source Changes and room off - AddAction("/status", (id, content) => + AddAction("/fullStatus", (id, content) => { SendFullStatusForClientId(id, Room); });