From d8e2f8cd51efc432e684a5801922a3d151a03d8c Mon Sep 17 00:00:00 2001 From: Joshua_Gutenplan <18546589+jgutenplan@users.noreply.github.com> Date: Thu, 25 Apr 2024 10:03:38 -0700 Subject: [PATCH 1/5] feat: IVideoCodecUiExtensions --- .../Interfaces/IVideoCodecUiExtensions.cs | 12 +++++++ .../IVideoCodecUiExtensionsClickedAction.cs | 35 +++++++++++++++++++ .../IVideoCodecUiExtensionsClickedEvent.cs | 25 +++++++++++++ 3 files changed, 72 insertions(+) create mode 100644 src/PepperDash.Essentials.Devices.Common/VideoCodec/Interfaces/IVideoCodecUiExtensions.cs create mode 100644 src/PepperDash.Essentials.Devices.Common/VideoCodec/Interfaces/IVideoCodecUiExtensionsClickedAction.cs create mode 100644 src/PepperDash.Essentials.Devices.Common/VideoCodec/Interfaces/IVideoCodecUiExtensionsClickedEvent.cs diff --git a/src/PepperDash.Essentials.Devices.Common/VideoCodec/Interfaces/IVideoCodecUiExtensions.cs b/src/PepperDash.Essentials.Devices.Common/VideoCodec/Interfaces/IVideoCodecUiExtensions.cs new file mode 100644 index 00000000..32e7f0c8 --- /dev/null +++ b/src/PepperDash.Essentials.Devices.Common/VideoCodec/Interfaces/IVideoCodecUiExtensions.cs @@ -0,0 +1,12 @@ +namespace PepperDash.Essentials.Devices.Common.VideoCodec.Interfaces +{ + public interface IVideoCodecUiExtensionsHandler : IVideoCodecUiExtensionsWebViewDisplayAction, IVideoCodecUiExtensionsClickedEvent + { + } + + public interface IVideoCodecUiExtensions + { + IVideoCodecUiExtensionsHandler VideoCodecUiExtensionsHandler { get; set; } + } + +} \ No newline at end of file diff --git a/src/PepperDash.Essentials.Devices.Common/VideoCodec/Interfaces/IVideoCodecUiExtensionsClickedAction.cs b/src/PepperDash.Essentials.Devices.Common/VideoCodec/Interfaces/IVideoCodecUiExtensionsClickedAction.cs new file mode 100644 index 00000000..aba77e13 --- /dev/null +++ b/src/PepperDash.Essentials.Devices.Common/VideoCodec/Interfaces/IVideoCodecUiExtensionsClickedAction.cs @@ -0,0 +1,35 @@ +using System; + +namespace PepperDash.Essentials.Devices.Common.VideoCodec.Interfaces +{ + public interface IVideoCodecUiExtensionsWebViewDisplayAction + { + Action UiWebViewDisplayAction { get; set; } + } + + public class UiWebViewDisplayActionArgs + { + + /// + /// Required <0 - 2000> The URL of the web page. + /// + public string Url { get; set; } + + /// + /// Fullscreen, Modal Full screen: Display the web page on the entire screen.Modal: Display the web page in a window. + /// + + public string Mode { get; set; } + + /// + /// <0 - 255> The title of the web page. + /// + public string Title { get; set; } + + /// + /// <0 - 8192> An HTTP header field.You can add up 15 Header parameters in one command, each holding one HTTP header field. + /// + public string Header { get; set; } + } + +} diff --git a/src/PepperDash.Essentials.Devices.Common/VideoCodec/Interfaces/IVideoCodecUiExtensionsClickedEvent.cs b/src/PepperDash.Essentials.Devices.Common/VideoCodec/Interfaces/IVideoCodecUiExtensionsClickedEvent.cs new file mode 100644 index 00000000..9e9bb63d --- /dev/null +++ b/src/PepperDash.Essentials.Devices.Common/VideoCodec/Interfaces/IVideoCodecUiExtensionsClickedEvent.cs @@ -0,0 +1,25 @@ +using System; + +namespace PepperDash.Essentials.Devices.Common.VideoCodec.Interfaces +{ + public interface IVideoCodecUiExtensionsClickedEvent + { + event EventHandler UiExtensionsClickedEvent; + } + + public class UiExtensionsClickedEventArgs : EventArgs + { + public bool Clicked { get; set; } + public string Id { get; set; } + + public UiExtensionsClickedEventArgs(bool clicked, string id) + { + Clicked = clicked; + Id = id; + } + + public UiExtensionsClickedEventArgs() + { + } + } +} From 06d806687d60fb10118663c19d421f7096f577df Mon Sep 17 00:00:00 2001 From: Joshua_Gutenplan <18546589+jgutenplan@users.noreply.github.com> Date: Thu, 25 Apr 2024 15:29:44 -0700 Subject: [PATCH 2/5] feat: IMobileControlTouchpanelController --- .../DeviceTypeInterfaces/IMobileControl.cs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IMobileControl.cs b/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IMobileControl.cs index 7f1d1621..84e31595 100644 --- a/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IMobileControl.cs +++ b/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IMobileControl.cs @@ -106,4 +106,11 @@ namespace PepperDash.Essentials.Core.DeviceTypeInterfaces Action Action { get; } } + public interface IMobileControlTouchpanelController + { + StringFeedback AppUrlFeedback { get; } + string DefaultRoomKey { get; } + string DeviceKey { get; } + } + } \ No newline at end of file From e1b50649fd92f7b9ebb1810c5070fb40ff65f0e5 Mon Sep 17 00:00:00 2001 From: Joshua_Gutenplan <18546589+jgutenplan@users.noreply.github.com> Date: Tue, 30 Apr 2024 21:41:53 -0700 Subject: [PATCH 3/5] fix: UiWebViewDisplayActionArgs add target --- .../Interfaces/IVideoCodecUiExtensionsClickedAction.cs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/PepperDash.Essentials.Devices.Common/VideoCodec/Interfaces/IVideoCodecUiExtensionsClickedAction.cs b/src/PepperDash.Essentials.Devices.Common/VideoCodec/Interfaces/IVideoCodecUiExtensionsClickedAction.cs index aba77e13..1c9cafa0 100644 --- a/src/PepperDash.Essentials.Devices.Common/VideoCodec/Interfaces/IVideoCodecUiExtensionsClickedAction.cs +++ b/src/PepperDash.Essentials.Devices.Common/VideoCodec/Interfaces/IVideoCodecUiExtensionsClickedAction.cs @@ -30,6 +30,12 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Interfaces /// <0 - 8192> An HTTP header field.You can add up 15 Header parameters in one command, each holding one HTTP header field. /// public string Header { get; set; } + + /// + /// OSD, Controller, PersistentWebApp Controller: Only for Cisco internal use. + /// OSD: Close the web view that is displayed on the screen of the device.PersistentWebApp: Only for Cisco internal use. + /// + public string Target { get; set; } } } From e9954b30812d389b1b93d1c1dcefd61aee93e909 Mon Sep 17 00:00:00 2001 From: Joshua_Gutenplan <18546589+jgutenplan@users.noreply.github.com> Date: Thu, 2 May 2024 12:07:00 -0700 Subject: [PATCH 4/5] fix: add GetRoomMessenger to IMobileControl --- .../DeviceTypeInterfaces/IMobileControl.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IMobileControl.cs b/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IMobileControl.cs index b856a7c0..c30edebd 100644 --- a/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IMobileControl.cs +++ b/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IMobileControl.cs @@ -44,7 +44,10 @@ namespace PepperDash.Essentials.Core.DeviceTypeInterfaces void AddDeviceMessenger(IMobileControlMessenger messenger); bool CheckForDeviceMessenger(string key); - } + + IMobileControlRoomMessenger GetRoomMessenger(string key); + + } /// /// Describes a mobile control messenger From 5a55a701d638d5933651e7a83c76dc60cd1e757c Mon Sep 17 00:00:00 2001 From: Joshua_Gutenplan <18546589+jgutenplan@users.noreply.github.com> Date: Thu, 9 May 2024 12:10:42 -0700 Subject: [PATCH 5/5] fix: remove codec interfaces that are only needed in cisco epi now --- .gitignore | 1 + .../Interfaces/IVideoCodecUiExtensions.cs | 12 ------ .../IVideoCodecUiExtensionsClickedAction.cs | 41 ------------------- .../IVideoCodecUiExtensionsClickedEvent.cs | 25 ----------- 4 files changed, 1 insertion(+), 78 deletions(-) delete mode 100644 src/PepperDash.Essentials.Devices.Common/VideoCodec/Interfaces/IVideoCodecUiExtensions.cs delete mode 100644 src/PepperDash.Essentials.Devices.Common/VideoCodec/Interfaces/IVideoCodecUiExtensionsClickedAction.cs delete mode 100644 src/PepperDash.Essentials.Devices.Common/VideoCodec/Interfaces/IVideoCodecUiExtensionsClickedEvent.cs diff --git a/.gitignore b/.gitignore index 36d84cbc..c9469ffd 100644 --- a/.gitignore +++ b/.gitignore @@ -391,3 +391,4 @@ FodyWeavers.xsd essentials-framework/Essentials Interfaces/PepperDash_Essentials_Interfaces/PepperDash_Essentials_Interfaces.csproj .DS_Store /._PepperDash.Essentials.sln +.vscode/settings.json diff --git a/src/PepperDash.Essentials.Devices.Common/VideoCodec/Interfaces/IVideoCodecUiExtensions.cs b/src/PepperDash.Essentials.Devices.Common/VideoCodec/Interfaces/IVideoCodecUiExtensions.cs deleted file mode 100644 index 32e7f0c8..00000000 --- a/src/PepperDash.Essentials.Devices.Common/VideoCodec/Interfaces/IVideoCodecUiExtensions.cs +++ /dev/null @@ -1,12 +0,0 @@ -namespace PepperDash.Essentials.Devices.Common.VideoCodec.Interfaces -{ - public interface IVideoCodecUiExtensionsHandler : IVideoCodecUiExtensionsWebViewDisplayAction, IVideoCodecUiExtensionsClickedEvent - { - } - - public interface IVideoCodecUiExtensions - { - IVideoCodecUiExtensionsHandler VideoCodecUiExtensionsHandler { get; set; } - } - -} \ No newline at end of file diff --git a/src/PepperDash.Essentials.Devices.Common/VideoCodec/Interfaces/IVideoCodecUiExtensionsClickedAction.cs b/src/PepperDash.Essentials.Devices.Common/VideoCodec/Interfaces/IVideoCodecUiExtensionsClickedAction.cs deleted file mode 100644 index 1c9cafa0..00000000 --- a/src/PepperDash.Essentials.Devices.Common/VideoCodec/Interfaces/IVideoCodecUiExtensionsClickedAction.cs +++ /dev/null @@ -1,41 +0,0 @@ -using System; - -namespace PepperDash.Essentials.Devices.Common.VideoCodec.Interfaces -{ - public interface IVideoCodecUiExtensionsWebViewDisplayAction - { - Action UiWebViewDisplayAction { get; set; } - } - - public class UiWebViewDisplayActionArgs - { - - /// - /// Required <0 - 2000> The URL of the web page. - /// - public string Url { get; set; } - - /// - /// Fullscreen, Modal Full screen: Display the web page on the entire screen.Modal: Display the web page in a window. - /// - - public string Mode { get; set; } - - /// - /// <0 - 255> The title of the web page. - /// - public string Title { get; set; } - - /// - /// <0 - 8192> An HTTP header field.You can add up 15 Header parameters in one command, each holding one HTTP header field. - /// - public string Header { get; set; } - - /// - /// OSD, Controller, PersistentWebApp Controller: Only for Cisco internal use. - /// OSD: Close the web view that is displayed on the screen of the device.PersistentWebApp: Only for Cisco internal use. - /// - public string Target { get; set; } - } - -} diff --git a/src/PepperDash.Essentials.Devices.Common/VideoCodec/Interfaces/IVideoCodecUiExtensionsClickedEvent.cs b/src/PepperDash.Essentials.Devices.Common/VideoCodec/Interfaces/IVideoCodecUiExtensionsClickedEvent.cs deleted file mode 100644 index 9e9bb63d..00000000 --- a/src/PepperDash.Essentials.Devices.Common/VideoCodec/Interfaces/IVideoCodecUiExtensionsClickedEvent.cs +++ /dev/null @@ -1,25 +0,0 @@ -using System; - -namespace PepperDash.Essentials.Devices.Common.VideoCodec.Interfaces -{ - public interface IVideoCodecUiExtensionsClickedEvent - { - event EventHandler UiExtensionsClickedEvent; - } - - public class UiExtensionsClickedEventArgs : EventArgs - { - public bool Clicked { get; set; } - public string Id { get; set; } - - public UiExtensionsClickedEventArgs(bool clicked, string id) - { - Clicked = clicked; - Id = id; - } - - public UiExtensionsClickedEventArgs() - { - } - } -}