fix: change how Zoom in-call and incoming call feedback is managed

PepperDash · Jun 21, 2024 · 2d84e3e · 2d84e3e
1 parent 34b490e
commit 2d84e3e
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 4 deletions.
diff --git 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
@@ -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) =>