fix: testing debugging config ui extensions

PepperDash · May 1, 2024 · 11e9065 · 11e9065
1 parent c86899f
commit 11e9065
Show file tree

Hide file tree

Showing 9 changed files with 2,848 additions and 69 deletions.
diff --git a/src/CiscoCodecConfig.cs b/src/CiscoCodecConfig.cs
@@ -81,16 +81,16 @@ public class CiscoCodecConfig
         /// They are used to pass back UI Extension Widget events
         /// </summary>
         [JsonProperty("Widgets")]
-        public Dictionary<string, WidgetConfig> WidgetBlocks { get; set; }
-
-        public CiscoCodecConfig()
+        public Dictionary<string, WidgetConfig> WidgetBlocks { get; set; }
+
+		[JsonProperty("extensions")]
+		public Extensions Extensions { get; set; }
+
+		public CiscoCodecConfig()
         {
             CameraInfo = new List<CameraInfo>();
             PhonebookMode = "corporate";
         }
-
-        [JsonProperty("extensions")]
-        public Extensions Extensions { get; set; }
     }
 
     public class SharingProperties

diff --git a/src/CiscoRoomOsCodec.cs b/src/CiscoRoomOsCodec.cs
diff --git a/src/UserInterfaceExtensions/Extensions.cs b/src/UserInterfaceExtensions/Extensions.cs
@@ -23,6 +23,7 @@ public class Extensions: ICiscoCodecUiExtensions
 		[XmlElement("Version")]
 		public string Version { get; set; }
 
+		[XmlIgnore]
 		[JsonProperty("configId")] //0-40
 		public ushort ConfigId { get; set; }
 
@@ -31,16 +32,21 @@ public class Extensions: ICiscoCodecUiExtensions
 		public List<Panel> Panels { get; set; }
 		//other extensions later
 
+		[JsonIgnore]
+		[XmlIgnore]
 		public PanelsHandler PanelsHandler { get; set; }
 
-		public void Initialize(IKeyed parent, IBasicCommunication coms)
+		public void Initialize(IKeyed parent, IBasicCommunication coms, Action<string> enqueueCommand)
 		{
-			PanelsHandler = new PanelsHandler(parent, coms, Panels);
-			coms.SendText(xCommand());
+			Debug.LogMessage(LogEventLevel.Debug, "Extensions Initialize, Panels from config: null: {0}, length: {1}", parent, Panels == null, Panels.Count);
+			PanelsHandler = new PanelsHandler(parent, coms, enqueueCommand, Panels);
+			Debug.LogMessage(LogEventLevel.Debug, xCommand(), parent);
+			enqueueCommand(xCommand());
+			//coms.SendText(xCommand());
 		}
 
 		/// <summary>
-		/// string literal for multiline command
+		/// string literal for multiline command 
 		/// </summary>
 		/// <returns></returns>
 		public string xCommand() => $@"xCommand UserInterface Extensions Set ConfigId: {ConfigId}

diff --git a/src/UserInterfaceExtensions/ICiscoCodecUiExtensions.cs b/src/UserInterfaceExtensions/ICiscoCodecUiExtensions.cs
@@ -15,7 +15,7 @@ public interface ICiscoCodecUiExtensions
 
 		PanelsHandler PanelsHandler { get; }
 
-		void Initialize(IKeyed parent, IBasicCommunication coms);
+		void Initialize(IKeyed parent, IBasicCommunication coms, Action<string> enqueueCommand);
 
 		string xCommand();
 	}

diff --git a/src/UserInterfaceExtensions/Panels/PanelsHandler.cs b/src/UserInterfaceExtensions/Panels/PanelsHandler.cs
@@ -15,50 +15,65 @@
 namespace epi_videoCodec_ciscoExtended.UserInterfaceExtensions.Panels
 {
 
-    public class PanelsHandler: ICiscoCodecUiExtensionsHandler
-    {
-        private readonly IKeyed _parent;
-        private readonly IBasicCommunication _coms;
-        private readonly List<Panel> _panelConfigs;
+	public class PanelsHandler : ICiscoCodecUiExtensionsHandler
+	{
+		private readonly IKeyed _parent;
+		private readonly IBasicCommunication _coms;
+		private readonly List<Panel> _panelConfigs;
+		private Action<string> EnqueueCommand;
 
-        public PanelsHandler(IKeyed parent, IBasicCommunication coms, List<Panel> config)
-        {
-            _parent = parent;
-            _coms = coms;
-            _panelConfigs = config;
-            if (config == null || config.Count == 0)
-            {
-                Debug.LogMessage(
-                    Serilog.Events.LogEventLevel.Information, 
-                    "No Cisco Panels Configured {0}", _parent, config);
-                return;
-            }
-            RegisterFeedback();
-        }
+		public PanelsHandler(IKeyed parent, IBasicCommunication coms, Action<string> enqueueCommand, List<Panel> config)
+		{
+			Debug.LogMessage(Serilog.Events.LogEventLevel.Debug, "Constructing PanelsHandler", parent);
+			_parent = parent;
+			_coms = coms;
+			_panelConfigs = config;
+			EnqueueCommand = enqueueCommand;
+			if (config == null || config.Count == 0)
+			{
+				Debug.LogMessage(
+					Serilog.Events.LogEventLevel.Information,
+					"No Cisco Panels Configured {0}", _parent, config);
+				return;
+			}
+			RegisterFeedback();
+		}
 
-        public void ParseStatus(CiscoCodecEvents.Panel panel)
-        {
-            var pconfig = _panelConfigs.FirstOrDefault((Panel p) => p.PanelId == panel.Clicked.PanelId.Value);
-            if (pconfig == null) return;
-            pconfig.OnClickedEvent();
-        }
+		public void ParseStatus(CiscoCodecEvents.Panel panel)
+		{
+			Debug.LogMessage(Serilog.Events.LogEventLevel.Debug, "PanelsHandler Parse Status Panel Clicked: {0}", _parent, panel.Clicked.PanelId.Value);
+			var pconfig = _panelConfigs.FirstOrDefault((Panel p) => p.PanelId == panel.Clicked.PanelId.Value);
+			if (pconfig == null)
+			{
+				Debug.LogMessage(Serilog.Events.LogEventLevel.Debug, "Panel not found in config id: {0}", _parent, panel.Id);
+				return;
+			}
+			pconfig.OnClickedEvent();
+		}
 
-        public void RegisterFeedback()
-        {
-            //detect button changes for panel buttons ROOM OS
-            _coms.SendText("xfeedback register /Event/UserInterface/Extensions/Panel/Clicked" + CiscoCodec.Delimiter);
-        }
+		public void RegisterFeedback()
+		{
+			Debug.LogMessage(Serilog.Events.LogEventLevel.Debug, "PanelsHandler RegisterFeedback", _parent);
+			//detect button changes for panel buttons ROOM OS
+			var cmd = "xfeedback register /Event/UserInterface/Extensions/Panel/Clicked" + CiscoCodec.Delimiter;
+			//_coms.SendText(cmd);
+			EnqueueCommand(cmd);
+		}
 
-        public void DeregisterFeedback()
-        {
-            _coms.SendText("xfeedback deregister /Event/UserInterface/Extensions/Panel/Clicked" + CiscoCodec.Delimiter);
-        }
+		public void DeregisterFeedback()
+		{
+			Debug.LogMessage(Serilog.Events.LogEventLevel.Debug, "PanelsHandler DeregisterFeedback", _parent);
+			var cmd = "xfeedback deregister /Event/UserInterface/Extensions/Panel/Clicked" + CiscoCodec.Delimiter;
+			//_coms.SendText(cmd);
+			EnqueueCommand(cmd);
+		}
 
-        public void LinkToApi(BasicTriList trilist, CiscoCodecJoinMap joinMap)
-        {
-            //add simpl stuff later
-        }
-    }
+		public void LinkToApi(BasicTriList trilist, CiscoCodecJoinMap joinMap)
+		{
+			Debug.LogMessage(Serilog.Events.LogEventLevel.Debug, "PanelsHandler LinkToApi. NOT IMPLEMENTED", _parent);
+			//add simpl stuff later
+		}
+	}
 }
 
 /*

diff --git a/src/UserInterfaceExtensions/UiExtensionsHandler.cs b/src/UserInterfaceExtensions/UiExtensionsHandler.cs
@@ -13,31 +13,40 @@ public class UiExtensionsHandler : ICiscoCodecUiExtensionsHandler, IVideoCodecUi
 	{
 		private readonly IKeyed _parent;
 		private readonly IBasicCommunication _coms;
+		private readonly Action<string> EnqueuCommand;
 
 		public Action<UiWebViewDisplayActionArgs> UiWebViewDisplayAction { get; set; }
 
 		public event EventHandler<UiExtensionsClickedEventArgs> UiExtensionsClickedEvent;
 
-		public UiExtensionsHandler(IKeyed parent, IBasicCommunication coms)
+		public UiExtensionsHandler(IKeyed parent, IBasicCommunication coms, Action<string> enqueueCommand)
 
 		{
 			_parent = parent;
 			_coms = coms;
-
+			EnqueuCommand = enqueueCommand;
 			//set the action that will run when called with args from elsewhere via interface
 			UiWebViewDisplayAction =
 				new Action<UiWebViewDisplayActionArgs>((UiWebViewDisplayActionArgs args) =>
 				{
+					Debug.LogMessage(Serilog.Events.LogEventLevel.Debug, "WebViewDisplayAction URL: {0}", _parent, args.Url);
+					Debug.LogMessage(Serilog.Events.LogEventLevel.Debug, "WebViewDisplayAction Header: {0}", _parent, args.Header);
+					Debug.LogMessage(Serilog.Events.LogEventLevel.Debug, "WebViewDisplayAction Mode: {0}", _parent, args.Mode);
+					Debug.LogMessage(Serilog.Events.LogEventLevel.Debug, "WebViewDisplayAction Title: {0}", _parent, args.Title);
+					Debug.LogMessage(Serilog.Events.LogEventLevel.Debug, "WebViewDisplayAction Target: {0}", _parent, args.Target);
 					UiWebViewDisplay uwvd = new UiWebViewDisplay { Header = args.Header, Url = args.Url, Mode = args.Mode, Title = args.Title };
-					coms.SendText(uwvd.xCommand());
+					//coms.SendText(uwvd.xCommand());
+					EnqueuCommand(uwvd.xCommand());
 				});
 
 		}
 
 		public void ParseStatus(Panels.CiscoCodecEvents.Panel panel)
 		{
+			Debug.LogMessage(Serilog.Events.LogEventLevel.Debug, "UiExtensionsHandler Parse Status Panel Clicked: {0}", _parent, panel.Clicked.PanelId.Value);
 			if (panel.Clicked != null && panel.Clicked.PanelId != null && panel.Clicked.PanelId.Value != null)
 			{
+				Debug.LogMessage(Serilog.Events.LogEventLevel.Debug, "UiExtensionsHandler Parse Status Panel Clicked Raise Event: {0}", _parent, panel.Clicked.PanelId.Value);
 				UiExtensionsClickedEvent?.Invoke(this, new UiExtensionsClickedEventArgs(true, panel.Clicked.PanelId.Value));
 			}
 		}

diff --git a/src/UserInterfaceWebViewDisplay/UiWebViewDisplay.cs b/src/UserInterfaceWebViewDisplay/UiWebViewDisplay.cs
@@ -45,8 +45,30 @@ public class UiWebViewDisplay
 		/// <returns></returns>
 		public string xCommand()
 		{
-			return string.Format($"xCommand UserInterface WebView Display Header: {Header} Mode: {Mode} Options: {Options} Target: {Target} Title: {Title} Url: {Url}{CiscoCodec.Delimiter}");
-		}	
+			var command = "xCommand UserInterface WebView Display";
+
+			if (!string.IsNullOrEmpty(Header))
+				command += $" Header: \"{Header}\"";
+
+			if (!string.IsNullOrEmpty(Mode))
+				command += $" Mode: \"{Mode}\"";
+
+			if (!string.IsNullOrEmpty(Options))
+				command += $" Options: \"{Options}\"";
+
+			if (!string.IsNullOrEmpty(Target))
+				command += $" Target: \"{Target}\"";
+
+			if (!string.IsNullOrEmpty(Title))
+				command += $" Title: \"{Title}\"";
+
+			if (!string.IsNullOrEmpty(Url))
+				command += $" Url: \"{Url}\"";
+
+			command += CiscoCodec.Delimiter;
+
+			return command;
+		}
 
 	}
 }
diff --git a/src/Xml/XmlConverter.cs b/src/Xml/XmlConverter.cs
@@ -1,18 +1,28 @@
 using System.IO;
+using System.Xml;
 using System.Xml.Serialization;
 
 namespace epi_videoCodec_ciscoExtended.Xml
 {
-    public class XmlConverter
-    {
-        public static string SerializeObject<T>(T toSerialize)
-        {
-            XmlSerializer xmlSerializer = new XmlSerializer(typeof(T));
-            using (StringWriter textWriter = new StringWriter())
-            {
-                xmlSerializer.Serialize(textWriter, toSerialize);
-                return textWriter.ToString();
-            }
-        }
-    }
+	public static class XmlConverter
+	{
+		public static string SerializeObject<T>(T value)
+		{
+			var emptyNamespaces = new XmlSerializerNamespaces(new[] { XmlQualifiedName.Empty });
+			var serializer = new XmlSerializer(value.GetType());
+			var settings = new XmlWriterSettings
+			{
+				OmitXmlDeclaration = true, // Do not include XML declaration
+				Indent = true, // Indent XML for readability
+			};
+
+			using (var stream = new StringWriter())
+			using (var writer = XmlWriter.Create(stream, settings))
+			{
+				serializer.Serialize(writer, value, emptyNamespaces);
+				return stream.ToString();
+			}
+		}
+	}
+
 }
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-2444" />
+    <PackageReference Include="PepperDashEssentials" Version="2.0.0-alpha-2466" />
     <PackageReference Include="WebSocketSharp-netstandard" Version="1.0.1" />
   </ItemGroup>