From 2d84e3e043c5b7e0336f2479a38f05a17d80a7d7 Mon Sep 17 00:00:00 2001 From: Andrew Welker Date: Fri, 21 Jun 2024 10:26:37 -0500 Subject: [PATCH] fix: change how Zoom in-call and incoming call feedback is managed --- .../Touchpanel/ITswZoomControlMessenger.cs | 2 ++ .../MobileControlTouchpanelController.cs | 29 ++++++++++++++++--- 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/4-series/epi-essentials-mobile-control/Touchpanel/ITswZoomControlMessenger.cs b/4-series/epi-essentials-mobile-control/Touchpanel/ITswZoomControlMessenger.cs index 51ff355..da59d93 100644 --- a/4-series/epi-essentials-mobile-control/Touchpanel/ITswZoomControlMessenger.cs +++ b/4-series/epi-essentials-mobile-control/Touchpanel/ITswZoomControlMessenger.cs @@ -34,6 +34,7 @@ protected override void RegisterActions() PostStatusMessage(JToken.FromObject(new { incomingCall = a.BoolValue, + inCall = _zoomControl.ZoomInCallFeedback.BoolValue })); }; @@ -44,6 +45,7 @@ protected override void RegisterActions() new { inCall = a.BoolValue, + incomingCall = _zoomControl.ZoomIncomingCallFeedback.BoolValue })); }; } diff --git a/4-series/epi-essentials-mobile-control/Touchpanel/MobileControlTouchpanelController.cs b/4-series/epi-essentials-mobile-control/Touchpanel/MobileControlTouchpanelController.cs index 87180b7..1313bf1 100644 --- a/4-series/epi-essentials-mobile-control/Touchpanel/MobileControlTouchpanelController.cs +++ b/4-series/epi-essentials-mobile-control/Touchpanel/MobileControlTouchpanelController.cs @@ -155,12 +155,13 @@ public void UpdateTheme(string theme) } private void RegisterForExtenders() - { + { if (Panel is TswXX70Base x70Panel) { x70Panel.ExtenderApplicationControlReservedSigs.DeviceExtenderSigChange += (e, a) => { Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, this, $"X70 App Control Device Extender args: {a.Event}:{a.Sig}:{a.Sig.Type}:{a.Sig.BoolValue}:{a.Sig.UShortValue}:{a.Sig.StringValue}"); + UpdateZoomFeedbacks(); if (!x70Panel.ExtenderApplicationControlReservedSigs.HideOpenedApplicationFeedback.BoolValue) @@ -178,7 +179,15 @@ private void RegisterForExtenders() x70Panel.ExtenderZoomRoomAppReservedSigs.DeviceExtenderSigChange += (e, a) => { Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, this, $"X70 Zoom Room Ap Device Extender args: {a.Event}:{a.Sig}:{a.Sig.Type}:{a.Sig.BoolValue}:{a.Sig.UShortValue}:{a.Sig.StringValue}"); - UpdateZoomFeedbacks(); + + if (a.Sig.Number == x70Panel.ExtenderZoomRoomAppReservedSigs.ZoomRoomIncomingCallFeedback.Number) + { + ZoomIncomingCallFeedback.FireUpdate(); + } + else if (a.Sig.Number == x70Panel.ExtenderZoomRoomAppReservedSigs.ZoomRoomActiveFeedback.Number) + { + ZoomInCallFeedback.FireUpdate(); + } }; @@ -218,12 +227,24 @@ private void RegisterForExtenders() x60withZoomApp.ExtenderApplicationControlReservedSigs.DeviceExtenderSigChange += (e, a) => { Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, this, $"X60 App Control Device Extender args: {a.Event}:{a.Sig}:{a.Sig.Type}:{a.Sig.BoolValue}:{a.Sig.UShortValue}:{a.Sig.StringValue}"); - UpdateZoomFeedbacks(); + + if (a.Sig.Number == x60withZoomApp.ExtenderApplicationControlReservedSigs.HideOpenApplicationFeedback.Number) + { + AppOpenFeedback.FireUpdate(); + } }; x60withZoomApp.ExtenderZoomRoomAppReservedSigs.DeviceExtenderSigChange += (e, a) => { Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, this, $"X60 Zoom Room App Device Extender args: {a.Event}:{a.Sig}:{a.Sig.Type}:{a.Sig.BoolValue}:{a.Sig.UShortValue}:{a.Sig.StringValue}"); - UpdateZoomFeedbacks(); + + if (a.Sig.Number == x60withZoomApp.ExtenderZoomRoomAppReservedSigs.ZoomRoomIncomingCallFeedback.Number) + { + ZoomIncomingCallFeedback.FireUpdate(); + } + else if (a.Sig.Number == x60withZoomApp.ExtenderZoomRoomAppReservedSigs.ZoomRoomActiveFeedback.Number) + { + ZoomInCallFeedback.FireUpdate(); + } }; x60withZoomApp.ExtenderEthernetReservedSigs.DeviceExtenderSigChange += (e, a) =>