fix: interfaces for ui and mc

PepperDash · May 7, 2024 · 4e15dcb · 4e15dcb
1 parent 04c0e78
commit 4e15dcb
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/src/UserInterface/CiscoCodecUserInterface/CiscoCodecUserInterface.cs b/src/UserInterface/CiscoCodecUserInterface/CiscoCodecUserInterface.cs
@@ -14,11 +14,11 @@
 
 namespace epi_videoCodec_ciscoExtended.UserInterface.CiscoCodecUserInterface
 {
-    public class CiscoCodecUserInterface : ReconfigurableDevice, ICiscoCodecUserInterface, IReconfigurableDevice
-    {
+    public class CiscoCodecUserInterface : ReconfigurableDevice, ICiscoCodecUserInterface, IReconfigurableDevice, IVideoCodecUiExtensions
+	{
         public CiscoCodec UisCiscoCodec { get; private set; }
         public CiscoCodecUserInterfaceConfig ConfigProps { get; }
-        public IVideoCodecUiExtensionsHandler VideoCodecUiExtensionsHandler { get; private set; }
+        public IVideoCodecUiExtensionsHandler VideoCodecUiExtensionsHandler { get; set; }
 
         public ICiscoCodecUiExtensions UiExtensions { get; private set; }
 
@@ -30,10 +30,10 @@ public T ParseConfigProps<T>(DeviceConfig config)
         public CiscoCodecUserInterface(DeviceConfig config) : base(config)
         {
             ConfigProps = ParseConfigProps<CiscoCodecUserInterfaceConfig>(config);
-
+            AddPreActivationAction(PreActivateAction);
         }
 
-        public override bool CustomActivate()
+        public void PreActivateAction()
         {
             Debug.LogMessage(LogEventLevel.Debug, "[DEBUG] Activating Video Codec UI Extensions", this);
 			UisCiscoCodec = DeviceManager.GetDeviceForKey(ConfigProps.VideoCodecKey) as CiscoCodec;
@@ -42,7 +42,8 @@ public override bool CustomActivate()
             {
                 var msg = $"Video codec UserInterface could not find codec with key '{ConfigProps.VideoCodecKey}'.";
                 Debug.LogMessage(new NullReferenceException(msg), msg, this);
-                return base.CustomActivate();
+                //return base.CustomActivate();
+                return;
             }
 
             UiExtensions = ConfigProps.Extensions;
@@ -61,7 +62,8 @@ public override bool CustomActivate()
                 UiExtensions.Initialize(this, UisCiscoCodec.EnqueueCommand);
                 Debug.LogMessage(LogEventLevel.Debug, "[DEBUG] Video Codec UI Extensions Handler Initilizing", this);
             };
-            return base.CustomActivate();
+            //return base.CustomActivate();
+            return;
         }
     }
 }
diff --git a/src/UserInterface/CiscoCodecUserInterface/ICiscoCodecUserInterface.cs b/src/UserInterface/CiscoCodecUserInterface/ICiscoCodecUserInterface.cs
@@ -10,10 +10,9 @@
 namespace epi_videoCodec_ciscoExtended.UserInterface.CiscoCodecUserInterface
 {
     public interface ICiscoCodecUserInterface : IKeyed
-    {
+	{
         CiscoCodec UisCiscoCodec { get; }
         CiscoCodecUserInterfaceConfig ConfigProps { get; }
-        IVideoCodecUiExtensionsHandler VideoCodecUiExtensionsHandler { get; }
         ICiscoCodecUiExtensions UiExtensions { get; }
     }
 }
diff --git a/src/UserInterface/CiscoCodecUserInterface/MobileControl/MobileControlTouchpanelController.cs b/src/UserInterface/CiscoCodecUserInterface/MobileControl/MobileControlTouchpanelController.cs
@@ -3,6 +3,7 @@
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Config;
 using PepperDash.Essentials.Core.DeviceTypeInterfaces;
+using PepperDash.Essentials.Devices.Common.VideoCodec.Interfaces;
 using System;
 using System.Linq;
 using Feedback = PepperDash.Essentials.Core.Feedback;

diff --git a/src/epi-videoCodec-ciscoExtended.4Series.csproj b/src/epi-videoCodec-ciscoExtended.4Series.csproj
@@ -38,7 +38,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="PepperDashEssentials" Version="2.0.0-alpha-2469" />
+    <PackageReference Include="PepperDashEssentials" Version="2.0.0-alpha-2475" />
     <PackageReference Include="WebSocketSharp-netstandard" Version="1.0.1" />
   </ItemGroup>