diff --git a/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.projectinfo b/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.projectinfo index ee8c8987..b6936dce 100644 Binary files a/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.projectinfo and b/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.projectinfo differ diff --git a/Essentials DM/Essentials_DM/Essentials_DM.projectinfo b/Essentials DM/Essentials_DM/Essentials_DM.projectinfo index 39965f7a..d071b712 100644 Binary files a/Essentials DM/Essentials_DM/Essentials_DM.projectinfo and b/Essentials DM/Essentials_DM/Essentials_DM.projectinfo differ diff --git a/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.projectinfo b/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.projectinfo index 0c9c0cb1..da52e959 100644 Binary files a/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.projectinfo and b/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.projectinfo differ diff --git a/Essentials/PepperDashEssentials/Fusion/FusionSystemController.cs b/Essentials/PepperDashEssentials/Fusion/FusionSystemController.cs index d7ee0254..c4aed8fc 100644 --- a/Essentials/PepperDashEssentials/Fusion/FusionSystemController.cs +++ b/Essentials/PepperDashEssentials/Fusion/FusionSystemController.cs @@ -45,10 +45,19 @@ namespace PepperDash.Essentials.Fusion Event CurrentMeeting; - string RoomGuid; + string RoomGuid + { + get + { + return GUIDs.RoomGuid; + } + + } uint IpId; + FusionRoomGuids GUIDs; + bool GuidFileExists; bool IsRegisteredForSchedulePushNotifications = false; @@ -75,6 +84,7 @@ namespace PepperDash.Essentials.Fusion StaticAssets = new List(); + GUIDs = new FusionRoomGuids(); var mac = CrestronEthernetHelper.GetEthernetParameter(CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_MAC_ADDRESS, 0); @@ -94,7 +104,7 @@ namespace PepperDash.Essentials.Fusion Guid roomGuid = Guid.NewGuid(); - RoomGuid = string.Format("{0}-{1}-{2}", slot, mac, roomGuid.ToString()); + GUIDs.RoomGuid = string.Format("{0}-{1}-{2}", slot, mac, roomGuid.ToString()); } CreateSymbolAndBasicSigs(IpId); @@ -159,7 +169,7 @@ namespace PepperDash.Essentials.Fusion Debug.Console(1, this, "Writing GUIDs to file"); - var GUIDs = new FusionRoomGuids(Room.Name, IpId, RoomGuid, StaticAssets); + GUIDs = new FusionRoomGuids(Room.Name, IpId, RoomGuid, StaticAssets); var JSON = JsonConvert.SerializeObject(GUIDs, Newtonsoft.Json.Formatting.Indented); @@ -208,12 +218,10 @@ namespace PepperDash.Essentials.Fusion { var JSON = File.ReadToEnd(filePath, Encoding.ASCII); - var GUIDs = JsonConvert.DeserializeObject(JSON); + GUIDs = JsonConvert.DeserializeObject(JSON); IpId = GUIDs.IpId; - RoomGuid = GUIDs.RoomGuid; - StaticAssets = GUIDs.StaticAssets; } @@ -452,7 +460,7 @@ namespace PepperDash.Essentials.Fusion string.Format("{0}", dtEnd.ToString("s")) + "AdHoc Meeting" + "Room User" + - "" + + "Example Message" + "" + ""; @@ -460,6 +468,10 @@ namespace PepperDash.Essentials.Fusion FusionRoom.ExtenderRoomViewSchedulingDataReservedSigs.CreateMeeting.StringValue = createMeetingRequest; + //Debug.Console(1, this, "Sending CreateMeeting Request: \n{0}", command); + + //FusionRoom.ExtenderRoomViewSchedulingDataReservedSigs.CreateMeeting.StringValue = command; + } /// @@ -616,7 +628,7 @@ namespace PepperDash.Essentials.Fusion } else if (element.Name == "Event") { - Debug.Console(1, this, "Event Found:\n{0}", element.OuterXml); + Debug.Console(2, this, "Event Found:\n{0}", element.OuterXml); XmlReader reader = new XmlReader(element.OuterXml); @@ -1071,6 +1083,11 @@ namespace PepperDash.Essentials.Fusion public string RoomGuid { get; set; } public List StaticAssets { get; set; } + public FusionRoomGuids() + { + StaticAssets = new List(); + } + public FusionRoomGuids(string roomName, uint ipId, string roomGuid, List staticAssets) { RoomName = roomName; diff --git a/Essentials/PepperDashEssentials/PepperDashEssentials.projectinfo b/Essentials/PepperDashEssentials/PepperDashEssentials.projectinfo index bec487cd..161f6048 100644 Binary files a/Essentials/PepperDashEssentials/PepperDashEssentials.projectinfo and b/Essentials/PepperDashEssentials/PepperDashEssentials.projectinfo differ