pepperdash/Essentials
1
0
Fork 0
mirror of https://github.com/PepperDash/Essentials.git synced 2026-02-14 04:04:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updates to call status tracking and Call History. Added CiscoCodecPropertiesConfig class

Browse Source
This commit is contained in:
Neil Dorin
2017-09-21 18:00:43 -06:00
parent 3b3ea98dea
commit 1d46f8520d
12 changed files with 1191 additions and 1194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Essentials Devices Common/Essentials Devices Common/Codec/CodecActiveCallItem.cs
View File

@@ -17,9 +17,11 @@ namespace PepperDash.Essentials.Devices.Common.Codec
public eCodecCallStatus Status { get; set; } public eCodecCallStatus Status { get; set; }
public eCodecCallDirection Direction { get; set; }
public string Id { get; set; } public string Id { get; set; }
public object CallMetaData { get; set; } //public object CallMetaData { get; set; }
/// <summary> /// <summary>
/// Returns true when this call is any status other than /// Returns true when this call is any status other than

69
Essentials Devices Common/Essentials Devices Common/Codec/eCodecCallStatus.cs
View File

@@ -22,4 +22,73 @@ namespace PepperDash.Essentials.Devices.Common.Codec
Preserved, Preserved,
RemotePreserved, RemotePreserved,
} }
public class CodecCallStatus
{
/// <summary>
/// Takes the Cisco call type and converts to the matching enum
/// </summary>
/// <param name="s"></param>
/// <returns></returns>
public static eCodecCallStatus ConvertToStatusEnum(string s)
{
switch (s)
{
case "Connected":
{
return eCodecCallStatus.Connected;
}
case "Connecting":
{
return eCodecCallStatus.Connecting;
}
case "Dialling":
{
return eCodecCallStatus.Dialing;
}
case "Disconnected":
{
return eCodecCallStatus.Disconnected;
}
case "Disconnecting":
{
return eCodecCallStatus.Disconnecting;
}
case "EarlyMedia":
{
return eCodecCallStatus.EarlyMedia;
}
case "Idle":
{
return eCodecCallStatus.Idle;
}
case "Incoming":
{
return eCodecCallStatus.Incoming;
}
case "OnHold":
{
return eCodecCallStatus.OnHold;
}
case "Ringing":
{
return eCodecCallStatus.Ringing;
}
case "Preserved":
{
return eCodecCallStatus.Preserved;
}
case "RemotePreserved":
{
return eCodecCallStatus.RemotePreserved;
}
default:
return eCodecCallStatus.Unknown;
}
}
}
} }

26
Essentials Devices Common/Essentials Devices Common/Codec/iHasCallFavorites.cs Normal file
View File

@@ -0,0 +1,26 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using Crestron.SimplSharp;
namespace PepperDash.Essentials.Devices.Common.Codec
{
public interface iHasCallFavorites
{
CodecCallFavorites CallFavorites { get; }
}
/// <summary>
/// Represents favorites entries for a codec device
/// </summary>
public class CodecCallFavorites
{
public List<CodecActiveCallItem> Favorites { get; set; }
public CodecCallFavorites()
{
Favorites = new List<CodecActiveCallItem>();
}
}
}

69
Essentials Devices Common/Essentials Devices Common/Codec/iHasCallHistory.cs
View File

@@ -4,15 +4,15 @@ using System.Linq;
using System.Text; using System.Text;
using Crestron.SimplSharp; using Crestron.SimplSharp;
using PepperDash.Core;
namespace PepperDash.Essentials.Devices.Common.Codec namespace PepperDash.Essentials.Devices.Common.Codec
{ {
public interface IHasCallHistory public interface IHasCallHistory
{ {
event EventHandler<EventArgs> RecentCallsListHasChanged; CodecCallHistory CallHistory { get; }
List<CallHistory.CallHistoryEntry> RecentCalls { get; } void RemoveCallHistoryEntry(CodecCallHistory.CallHistoryEntry entry);
void RemoveEntry(CallHistory.CallHistoryEntry entry);
} }
public enum eCodecOccurrenctType public enum eCodecOccurrenctType
@@ -23,8 +23,54 @@ namespace PepperDash.Essentials.Devices.Common.Codec
NoAnswer NoAnswer
} }
public class CallHistory /// <summary>
/// Represents the recent call history for a codec device
/// </summary>
public class CodecCallHistory
{ {
event EventHandler<EventArgs> RecentCallsListHasChanged;
public List<CallHistoryEntry> RecentCalls { get; private set; }
/// <summary>
/// Item that gets added to the list when there are no recent calls in history
/// </summary>
CallHistoryEntry ListEmptyEntry;
public CodecCallHistory()
{
ListEmptyEntry = new CallHistoryEntry() { Name = "No Recent Calls" };
RecentCalls = new List<CallHistoryEntry>();
RecentCalls.Add(ListEmptyEntry);
}
void OnRecentCallsListChange()
{
var handler = RecentCallsListHasChanged;
if (handler != null)
{
handler(this, new EventArgs());
if (Debug.Level == 1)
{
Debug.Console(1, "RecentCalls:\n");
foreach (CodecCallHistory.CallHistoryEntry entry in RecentCalls)
{
Debug.Console(1, "\nName: {0}\nNumber: {1}\nStartTime: {2}\nType: {3}\n", entry.Name, entry.Number, entry.StartTime.ToString(), entry.OccurenceType);
}
}
}
}
public void RemoveEntry(CallHistoryEntry entry)
{
RecentCalls.Remove(entry);
OnRecentCallsListChange();
}
/// <summary> /// <summary>
/// Generic call history entry, not device specific /// Generic call history entry, not device specific
@@ -41,7 +87,7 @@ namespace PepperDash.Essentials.Devices.Common.Codec
/// </summary> /// </summary>
/// <param name="entries"></param> /// <param name="entries"></param>
/// <returns></returns> /// <returns></returns>
public static List<CallHistoryEntry> ConvertCiscoCallHistoryToGeneric(List<CiscoCallHistory.Entry> entries) public void ConvertCiscoCallHistoryToGeneric(List<CiscoCallHistory.Entry> entries)
{ {
var genericEntries = new List<CallHistoryEntry>(); var genericEntries = new List<CallHistoryEntry>();
@@ -57,15 +103,19 @@ namespace PepperDash.Essentials.Devices.Common.Codec
}); });
} }
return genericEntries; // Check if list is empty and if so, add an item to display No Recent Calls
if(genericEntries.Count == 0)
genericEntries.Add(ListEmptyEntry);
RecentCalls = genericEntries;
OnRecentCallsListChange();
} }
/// <summary> /// <summary>
/// Takes the Cisco occurence type and converts it to the matching enum /// Takes the Cisco occurence type and converts it to the matching enum
/// </summary> /// </summary>
/// <param name="s"></para /// <param name="s"></para
public static eCodecOccurrenctType ConvertToOccurenceTypeEnum(string s) public eCodecOccurrenctType ConvertToOccurenceTypeEnum(string s)
{ {
switch (s) switch (s)
{ {
@@ -89,9 +139,6 @@ namespace PepperDash.Essentials.Devices.Common.Codec
} }
public class CiscoCallHistory public class CiscoCallHistory
{ {

2
Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.csproj
View File

@@ -107,6 +107,7 @@
<Compile Include="Codec\eCodecCallType.cs" /> <Compile Include="Codec\eCodecCallType.cs" />
<Compile Include="Codec\eCodecCallStatus.cs" /> <Compile Include="Codec\eCodecCallStatus.cs" />
<Compile Include="Codec\iCodecAudio.cs" /> <Compile Include="Codec\iCodecAudio.cs" />
<Compile Include="Codec\iHasCallFavorites.cs" />
<Compile Include="Codec\iHasCallHistory.cs" /> <Compile Include="Codec\iHasCallHistory.cs" />
<Compile Include="Codec\iHasDialer.cs" /> <Compile Include="Codec\iHasDialer.cs" />
<Compile Include="Crestron\Gateways\CenRfgwController.cs" /> <Compile Include="Crestron\Gateways\CenRfgwController.cs" />
@@ -134,6 +135,7 @@
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Streaming\Roku.cs" /> <Compile Include="Streaming\Roku.cs" />
<Compile Include="VideoCodec\CiscoCodec\CiscoCodec.cs" /> <Compile Include="VideoCodec\CiscoCodec\CiscoCodec.cs" />
<Compile Include="VideoCodec\CiscoCodec\CiscoCodecPropertiesConfig.cs" />
<Compile Include="VideoCodec\CiscoCodec\xConfiguration.cs" /> <Compile Include="VideoCodec\CiscoCodec\xConfiguration.cs" />
<Compile Include="VideoCodec\CiscoCodec\xEvent.cs" /> <Compile Include="VideoCodec\CiscoCodec\xEvent.cs" />
<Compile Include="VideoCodec\CiscoCodec\HttpApiServer.cs" /> <Compile Include="VideoCodec\CiscoCodec\HttpApiServer.cs" />

387
Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoCodec.cs
View File

@@ -19,10 +19,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
{ {
enum eCommandType { SessionStart, SessionEnd, Command, GetStatus, GetConfiguration }; enum eCommandType { SessionStart, SessionEnd, Command, GetStatus, GetConfiguration };
public class CiscoCodec : VideoCodecBase, IHasCallHistory public class CiscoCodec : VideoCodecBase, IHasCallHistory, iHasCallFavorites
{ {
public event EventHandler<EventArgs> RecentCallsListHasChanged;
public IBasicCommunication Communication { get; private set; } public IBasicCommunication Communication { get; private set; }
public CommunicationGather PortGather { get; private set; } public CommunicationGather PortGather { get; private set; }
public CommunicationGather JsonGather { get; private set; } public CommunicationGather JsonGather { get; private set; }
@@ -37,19 +35,17 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
public BoolFeedback SpeakerTrackIsOnFeedback { get; private set; } public BoolFeedback SpeakerTrackIsOnFeedback { get; private set; }
private CiscoOneButtonToPush CodecObtp; //private CiscoOneButtonToPush CodecObtp;
private Corporate_Phone_Book PhoneBook; //private Corporate_Phone_Book PhoneBook;
private CiscoCodecConfiguration.RootObject CodecConfiguration; private CiscoCodecConfiguration.RootObject CodecConfiguration;
private CiscoCodecStatus.RootObject CodecStatus; private CiscoCodecStatus.RootObject CodecStatus;
private CiscoCallHistory.RootObject CodecCallHistory; public CodecCallHistory CallHistory { get; private set; }
public List<CallHistory.CallHistoryEntry> RecentCalls { get; private set; } public CodecCallFavorites CallFavorites { get; private set; }
//private CiscoCodecEvents.RootObject CodecEvent;
/// <summary> /// <summary>
/// Gets and returns the scaled volume of the codec /// Gets and returns the scaled volume of the codec
@@ -122,10 +118,10 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
} }
} }
protected override Func<int> ActiveCallCountFeedbackFunc //protected override Func<int> ActiveCallCountFeedbackFunc
{ //{
get { return () => ActiveCalls.Count; } // get { return () => ActiveCalls.Count; }
} //}
//private HttpsClient Client; //private HttpsClient Client;
@@ -147,14 +143,16 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
private bool JsonFeedbackMessageIsIncoming; private bool JsonFeedbackMessageIsIncoming;
public bool CommDebuggingIsOn;
string Delimiter = "\r\n"; string Delimiter = "\r\n";
int PresentationSource; int PresentationSource;
public bool CommDebuggingIsOn; string PhoneBookMode;
// Constructor for IBasicCommunication // Constructor for IBasicCommunication
public CiscoCodec(string key, string name, IBasicCommunication comm, int serverPort) public CiscoCodec(string key, string name, IBasicCommunication comm, CiscoCodecPropertiesConfig props )
: base(key, name) : base(key, name)
{ {
StandbyIsOnFeedback = new BoolFeedback(StandbyStateFeedbackFunc); StandbyIsOnFeedback = new BoolFeedback(StandbyStateFeedbackFunc);
@@ -162,9 +160,21 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
PeopleCountFeedback = new IntFeedback(PeopleCountFeedbackFunc); PeopleCountFeedback = new IntFeedback(PeopleCountFeedbackFunc);
SpeakerTrackIsOnFeedback = new BoolFeedback(SpeakerTrackIsOnFeedbackFunc); SpeakerTrackIsOnFeedback = new BoolFeedback(SpeakerTrackIsOnFeedbackFunc);
Communication = comm; Communication = comm;
if (props.CommunicationMonitorProperties != null)
{
CommunicationMonitor = new GenericCommunicationMonitor(this, Communication, props.CommunicationMonitorProperties);
}
else
{
CommunicationMonitor = new GenericCommunicationMonitor(this, Communication, 2000, 120000, 300000, "xStatus SystemUnit Software Version\r");
}
DeviceManager.AddDevice(CommunicationMonitor);
PhoneBookMode = props.PhonebookMode;
SyncState = new CodecSyncState(key + "--sync"); SyncState = new CodecSyncState(key + "--sync");
SyncState.InitialSyncCompleted += new EventHandler<EventArgs>(SyncState_InitialSyncCompleted); SyncState.InitialSyncCompleted += new EventHandler<EventArgs>(SyncState_InitialSyncCompleted);
@@ -173,16 +183,19 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
PortGather.IncludeDelimiter = true; PortGather.IncludeDelimiter = true;
PortGather.LineReceived += this.Port_LineReceived; PortGather.LineReceived += this.Port_LineReceived;
CodecObtp = new CiscoOneButtonToPush(); //CodecObtp = new CiscoOneButtonToPush();
PhoneBook = new Corporate_Phone_Book(); //PhoneBook = new Corporate_Phone_Book();
CodecConfiguration = new CiscoCodecConfiguration.RootObject(); CodecConfiguration = new CiscoCodecConfiguration.RootObject();
CodecStatus = new CiscoCodecStatus.RootObject(); CodecStatus = new CiscoCodecStatus.RootObject();
CodecCallHistory = new CiscoCallHistory.RootObject(); CallHistory = new CodecCallHistory();
CallFavorites = new CodecCallFavorites();
CallFavorites.Favorites = props.Favorites;
//Set Feedback Actions
CodecStatus.Status.Audio.Volume.ValueChangedAction = VolumeLevelFeedback.FireUpdate; CodecStatus.Status.Audio.Volume.ValueChangedAction = VolumeLevelFeedback.FireUpdate;
CodecStatus.Status.Audio.VolumeMute.ValueChangedAction = MuteFeedback.FireUpdate; CodecStatus.Status.Audio.VolumeMute.ValueChangedAction = MuteFeedback.FireUpdate;
CodecStatus.Status.Audio.Microphones.Mute.ValueChangedAction = PrivacyModeIsOnFeedback.FireUpdate; CodecStatus.Status.Audio.Microphones.Mute.ValueChangedAction = PrivacyModeIsOnFeedback.FireUpdate;
@@ -190,12 +203,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
CodecStatus.Status.RoomAnalytics.PeoplePresence.ValueChangedAction = RoomIsOccupiedFeedback.FireUpdate; CodecStatus.Status.RoomAnalytics.PeoplePresence.ValueChangedAction = RoomIsOccupiedFeedback.FireUpdate;
CodecStatus.Status.RoomAnalytics.PeopleCount.Current.ValueChangedAction = PeopleCountFeedback.FireUpdate; CodecStatus.Status.RoomAnalytics.PeopleCount.Current.ValueChangedAction = PeopleCountFeedback.FireUpdate;
CodecStatus.Status.Cameras.SpeakerTrack.Status.ValueChangedAction = SpeakerTrackIsOnFeedback.FireUpdate; CodecStatus.Status.Cameras.SpeakerTrack.Status.ValueChangedAction = SpeakerTrackIsOnFeedback.FireUpdate;
//ServerPort = serverPort;
//Client = new HttpsClient();
//Server = new HttpApiServer();
} }
/// <summary> /// <summary>
@@ -205,7 +212,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
/// <param name="e"></param> /// <param name="e"></param>
void SyncState_InitialSyncCompleted(object sender, EventArgs e) void SyncState_InitialSyncCompleted(object sender, EventArgs e)
{ {
SendText("xCommand CallHistory Recents Limit: 20 Order: OccurrenceTime"); GetCallHistory();
// Get bookings for the day // Get bookings for the day
//SendText("xCommand Bookings List Days: 1 DayOffset: 0"); //SendText("xCommand Bookings List Days: 1 DayOffset: 0");
@@ -223,8 +230,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
CrestronConsole.AddNewConsoleCommand(SendText, "send" + Key, "", ConsoleAccessLevelEnum.AccessOperator); CrestronConsole.AddNewConsoleCommand(SendText, "send" + Key, "", ConsoleAccessLevelEnum.AccessOperator);
CrestronConsole.AddNewConsoleCommand(SetCommDebug, "SetCiscoCommDebug", "0 for Off, 1 for on", ConsoleAccessLevelEnum.AccessOperator); CrestronConsole.AddNewConsoleCommand(SetCommDebug, "SetCiscoCommDebug", "0 for Off, 1 for on", ConsoleAccessLevelEnum.AccessOperator);
Communication.Connect(); Communication.Connect();
var socket = Communication as ISocketStatus; var socket = Communication as ISocketStatus;
if (socket != null) if (socket != null)
@@ -235,37 +240,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
InputPorts.Add(new RoutingInputPort(RoutingPortNames.HdmiIn1, eRoutingSignalType.AudioVideo, eRoutingPortConnectionType.Hdmi, new Action(SelectPresentationSource1), this)); InputPorts.Add(new RoutingInputPort(RoutingPortNames.HdmiIn1, eRoutingSignalType.AudioVideo, eRoutingPortConnectionType.Hdmi, new Action(SelectPresentationSource1), this));
InputPorts.Add(new RoutingInputPort(RoutingPortNames.HdmiIn2, eRoutingSignalType.AudioVideo, eRoutingPortConnectionType.Hdmi, new Action(SelectPresentationSource2), this)); InputPorts.Add(new RoutingInputPort(RoutingPortNames.HdmiIn2, eRoutingSignalType.AudioVideo, eRoutingPortConnectionType.Hdmi, new Action(SelectPresentationSource2), this));
//Debug.Console(1, this, "Starting Cisco API Server"); string prefix = "xFeedback register ";
//Server.Start(ServerPort);
//Server.ApiRequest += new EventHandler<Crestron.SimplSharp.Net.Http.OnHttpRequestArgs>(Server_ApiRequest);
//CodecUrl = string.Format("http://{0}", (Communication as GenericSshClient).Hostname);
CommunicationMonitor = new GenericCommunicationMonitor(this, Communication, 2000, 120000, 300000, "xStatus SystemUnit Software Version\r");
DeviceManager.AddDevice(CommunicationMonitor);
//Client = new HttpsClient();
//Client.Verbose = true;
//Client.KeepAlive = true;
// Temp feedback registration
//FeedbackRegistrationExpression =
// "<Command><HttpFeedback><Register command=\"True\"><FeedbackSlot>1</FeedbackSlot>" +
// string.Format("<ServerUrl>http://{0}:{1}/cisco/api</ServerUrl>", CrestronEthernetHelper.GetEthernetParameter(CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_IP_ADDRESS, 0), ServerPort) +
// "<Format>JSON</Format>" +
// "<Expression item=\"1\">/Configuration</Expression>" +
// "<Expression item=\"2\">/Event/CallDisconnect</Expression>" +
// "<Expression item=\"3\">/Status/Call</Expression>" +
// "</Register>" +
// "</HttpFeedback>" +
// "</Command>";
string prefix = "xFeedback register ";
CliFeedbackRegistrationExpression = CliFeedbackRegistrationExpression =
prefix + "/Configuration" + Delimiter + prefix + "/Configuration" + Delimiter +
prefix + "/Status/Audio" + Delimiter + prefix + "/Status/Audio" + Delimiter +
@@ -278,14 +254,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
prefix + "/Bookings" + Delimiter + prefix + "/Bookings" + Delimiter +
prefix + "/Event/CallDisconnect" + Delimiter; prefix + "/Event/CallDisconnect" + Delimiter;
//StartHttpsSession();
//CodecObtp.Initialize();
//CodecObtp.GetMeetings();
//PhoneBook.DownloadPhoneBook(Corporate_Phone_Book.ePhoneBookLocation.Corporate);
return base.CustomActivate(); return base.CustomActivate();
} }
@@ -305,7 +273,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
void socket_ConnectionChange(object sender, GenericSocketStatusChageEventArgs e) void socket_ConnectionChange(object sender, GenericSocketStatusChageEventArgs e)
{ {
// Reset sync status on disconnect
if (!e.Client.IsConnected) if (!e.Client.IsConnected)
SyncState.CodecDisconnected(); SyncState.CodecDisconnected();
} }
@@ -388,167 +355,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
Communication.SendText(command + Delimiter); Communication.SendText(command + Delimiter);
} }
//private void StartHttpsSession()
//{
// SendHttpCommand("", eCommandType.SessionStart);
//}
//private void EndHttpsSession()
//{
// SendHttpCommand("", eCommandType.SessionEnd);
//}
//private void SendHttpCommand(string command, eCommandType commandType)
//{
// //HttpsClientRequest request = new HttpsClientRequest();
// //string urlSuffix = null;
// //Client.UserName = null;
// //Client.Password = null;
// //Client.PeerVerification = false;
// //Client.HostVerification = false;
// //request.RequestType = RequestType.Post;
// //if(!string.IsNullOrEmpty(HttpSessionId))
// // request.Header.SetHeaderValue("Cookie", HttpSessionId);
// //switch (commandType)
// //{
// // case eCommandType.Command:
// // {
// // urlSuffix = "/putxml";
// // request.ContentString = command;
// // request.Header.SetHeaderValue("Content-Type", "text/xml");
// // break;
// // }
// // case eCommandType.SessionStart:
// // {
// // urlSuffix = "/xmlapi/session/begin";
// // Client.UserName = (Communication as GenericSshClient).Username;
// // Client.Password = (Communication as GenericSshClient).Password;
// // break;
// // }
// // case eCommandType.SessionEnd:
// // {
// // urlSuffix = "/xmlapi/session/end";
// // request.Header.SetHeaderValue("Cookie", HttpSessionId);
// // break;
// // }
// // case eCommandType.GetStatus:
// // {
// // request.RequestType = RequestType.Get;
// // request.Header.SetHeaderValue("Content-Type", "text/xml");
// // urlSuffix = "/getxml?location=/Status";
// // break;
// // }
// // case eCommandType.GetConfiguration:
// // {
// // request.RequestType = RequestType.Get;
// // request.Header.SetHeaderValue("Content-Type", "text/xml");
// // urlSuffix = "/getxml?location=/Configuration";
// // break;
// // }
// //}
// //var requestUrl = CodecUrl + urlSuffix;
// //request.Header.RequestVersion = "HTTP/1.1";
// //request.Url.Parse(requestUrl);
// //Debug.Console(1, this, "Sending HTTP request to Cisco Codec at {0}\nHeader:\n{1}\nContent:\n{2}", requestUrl, request.Header, request.ContentString);
// //Client.DispatchAsync(request, PostConnectionCallback);
//}
//void PostConnectionCallback(HttpsClientResponse resp, HTTPS_CALLBACK_ERROR err)
//{
// //try
// //{
// // if (resp != null)
// // {
// // if (resp.Code == 200)
// // {
// // Debug.Console(1, this, "Http Post to Cisco Codec Successful. Code: {0}\nContent: {1}", resp.Code, resp.ContentString);
// // if (resp.ContentString.IndexOf("<HttpFeedbackRegisterResult status=\"OK\">") > 1)
// // {
// // // Get the initial configruation for sync purposes
// // SendHttpCommand("", eCommandType.GetConfiguration);
// // }
// // else
// // {
// // try
// // {
// // if (resp.ContentString.IndexOf("</Configuration>") > -1)
// // {
// // XmlReaderSettings settings = new XmlReaderSettings();
// // XmlReader reader = new XmlReader(resp.ContentString, settings);
// // CodecConfiguration = CrestronXMLSerialization.DeSerializeObject<CiscoCodecConfiguration.RootObject>(reader);
// // //Debug.Console(1, this, "Product Name: {0} Software Version: {1} ApiVersion: {2}", CodecConfiguration.Configuration.Product, CodecConfiguration.Version, CodecConfiguration.ApiVersion);
// // // Get the initial status for sync purposes
// // SendHttpCommand("", eCommandType.GetStatus);
// // }
// // else if (resp.ContentString.IndexOf("</Status>") > -1)
// // {
// // XmlReaderSettings settings = new XmlReaderSettings();
// // XmlReader reader = new XmlReader(resp.ContentString, settings);
// // CodecStatus = CrestronXMLSerialization.DeSerializeObject<CiscoCodecStatus.RootObject>(reader);
// // //Debug.Console(1, this, "Product Name: {0} Software Version: {1} ApiVersion: {2} Volume: {3}", CodecStatus.Product, CodecStatus.Version, CodecStatus.ApiVersion, CodecStatus.Audio.Volume);
// // }
// // }
// // catch (Exception ex)
// // {
// // Debug.Console(1, this, "Error Deserializing XML document from codec: {0}", ex);
// // }
// // }
// // }
// // else if (resp.Code == 204)
// // {
// // Debug.Console(1, this, "Response Code: {0}\nHeader:\n{1}Content:\n{1}", resp.Code, resp.Header, resp.ContentString);
// // HttpSessionId = resp.Header.GetHeaderValue("Set-Cookie");
// // //var chunks = HttpSessionId.Split(';');
// // //HttpSessionId = chunks[0];
// // //HttpSessionId = HttpSessionId.Substring(HttpSessionId.IndexOf("=") + 1);
// // // Register for feedbacks once we have a valid session
// // SendHttpCommand(FeedbackRegistrationExpression, eCommandType.Command);
// // }
// // else
// // {
// // Debug.Console(1, this, "Response Code: {0}\nHeader:\n{1}Content:\n{1}Err:\n{2}", resp.Code, resp.Header, resp.ContentString, err);
// // }
// // }
// // else
// // Debug.Console(1, this, "Null response received from server");
// //}
// //catch (Exception e)
// //{
// // Debug.Console(1, this, "Error Initializing HTTPS Client: {0}", e);
// //}
//}
//void Server_ApiRequest(object sender, Crestron.SimplSharp.Net.Http.OnHttpRequestArgs e)
//{
// Debug.Console(1, this, "Api Reqeust from Codec: {0}", e.Request.ContentString);
// e.Response.Code = 200;
// e.Response.ContentString = "OK";
// DeserializeResponse(e.Request.ContentString);
//}
void DeserializeResponse(string response) void DeserializeResponse(string response)
{ {
try try
@@ -563,42 +369,58 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
{ {
// Status Message // Status Message
// Temp object so we can inpsect for call data before simply deserializing
CiscoCodecStatus.RootObject tempCodecStatus = new CiscoCodecStatus.RootObject();
JsonConvert.PopulateObject(response, tempCodecStatus);
// Check to see if this is a call status message received after the initial status message // Check to see if this is a call status message received after the initial status message
if(SyncState.InitialStatusMessageWasReceived && response.IndexOf("\"Call\":{") > -1) if (tempCodecStatus.Status.Call.Count > 0)
{ {
CiscoCodecStatus.RootObject callStatus = new CiscoCodecStatus.RootObject();
JsonConvert.PopulateObject(response, callStatus);
// Iterate through the call objects in the response // Iterate through the call objects in the response
foreach (CiscoCodecStatus.Call call in callStatus.Status.Call) foreach (CiscoCodecStatus.Call call in tempCodecStatus.Status.Call)
{ {
// Look for a matching call id in the existing status structure var tempActiveCall = ActiveCalls.FirstOrDefault(c => c.Id.Equals(call.id));
var existingCall = CodecStatus.Status.Call.FirstOrDefault(c => c.id.Equals(call.id));
if (existingCall != null) if (tempActiveCall != null)
{ {
// If an existing call object is found with a matching ID, populate the existing call with the new data. // Store previous status to pass to event handler
// (must reserialize the object so that we can use PopulateObject() to overlay the new or updated properties on the existing object)
JsonConvert.PopulateObject(JsonConvert.SerializeObject(call), existingCall);
var tempActiveCall = ActiveCalls.FirstOrDefault(c => c.Id.Equals(call.id));
// store previous status to pass to event handler
var previousStatus = tempActiveCall.Status; var previousStatus = tempActiveCall.Status;
bool changeDetected = false;
// Update properties of ActiveCallItem // Update properties of ActiveCallItem
tempActiveCall.Status = CodecCallStatus.ConvertToStatusEnum(call.Status.Value); if(call.Status != null)
tempActiveCall.Type = CodecCallType.ConvertToTypeEnum(call.CallType.Value); if (!string.IsNullOrEmpty(call.Status.Value))
tempActiveCall.Name = call.DisplayName.Value; {
#warning Something here is evaluating as Unknown when the Display Name changes....
tempActiveCall.Status = CodecCallStatus.ConvertToStatusEnum(call.Status.Value);
changeDetected = true;
if(tempActiveCall.Status == eCodecCallStatus.Connected)
GetCallHistory();
}
if (call.CallType != null)
if (!string.IsNullOrEmpty(call.CallType.Value))
{
tempActiveCall.Type = CodecCallType.ConvertToTypeEnum(call.CallType.Value);
changeDetected = true;
}
if (call.DisplayName != null)
if (!string.IsNullOrEmpty(call.DisplayName.Value))
{
tempActiveCall.Name = call.DisplayName.Value;
changeDetected = true;
}
SetNewCallStatusAndFireCallStatusChange(previousStatus, tempActiveCall); if (changeDetected)
{
ListCalls();
SetNewCallStatusAndFireCallStatusChange(previousStatus, tempActiveCall);
}
} }
else else if( call.ghost == null ) // if the ghost value is present the call has ended already
{ {
// Add the call // Create a new call item
callStatus.Status.Call.Add(call);
var newCallItem = new CodecActiveCallItem() var newCallItem = new CodecActiveCallItem()
{ {
Id = call.id, Id = call.id,
@@ -608,14 +430,16 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
Type = CodecCallType.ConvertToTypeEnum(call.CallType.Value) Type = CodecCallType.ConvertToTypeEnum(call.CallType.Value)
}; };
// Add a call to the ActiveCalls List // Add it to the ActiveCalls List
ActiveCalls.Add(newCallItem); ActiveCalls.Add(newCallItem);
SetNewCallStatusAndFireCallStatusChange(newCallItem.Status, newCallItem); ListCalls();
SetNewCallStatusAndFireCallStatusChange(eCodecCallStatus.Unknown, newCallItem);
} }
// Handle call.status to determine if we need to fire an event notifying of an incoming call or a call disconnect
} }
} }
JsonConvert.PopulateObject(response, CodecStatus); JsonConvert.PopulateObject(response, CodecStatus);
@@ -623,7 +447,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
if (!SyncState.InitialStatusMessageWasReceived) if (!SyncState.InitialStatusMessageWasReceived)
{ {
SyncState.InitialStatusMessageReceived(); SyncState.InitialStatusMessageReceived();
if(!SyncState.InitialConfigurationMessageWasReceived) if (!SyncState.InitialConfigurationMessageWasReceived)
SendText("xConfiguration"); SendText("xConfiguration");
} }
} }
@@ -659,20 +483,15 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
if (response.IndexOf("\"CallHistoryRecentsResult\":{") > -1) if (response.IndexOf("\"CallHistoryRecentsResult\":{") > -1)
{ {
JsonConvert.PopulateObject(response, CodecCallHistory); var codecCallHistory = new CiscoCallHistory.RootObject();
RecentCalls = CallHistory.ConvertCiscoCallHistoryToGeneric(CodecCallHistory.CommandResponse.CallHistoryRecentsResult.Entry); JsonConvert.PopulateObject(response, codecCallHistory);
if (Debug.Level == 1) CallHistory.ConvertCiscoCallHistoryToGeneric(codecCallHistory.CommandResponse.CallHistoryRecentsResult.Entry);
{ }
else if (response.IndexOf("\"CallHistoryDeleteEntryResult\":{") > -1)
Debug.Console(1, this, "RecentCalls:\n"); {
GetCallHistory();
foreach (CallHistory.CallHistoryEntry entry in RecentCalls)
{
Debug.Console(1, this, "\nName: {0}\nNumber: {1}\nStartTime: {2}\nType: {3}\n", entry.Name, entry.Number, entry.StartTime.ToString(), entry.OccurenceType);
}
}
} }
} }
@@ -693,21 +512,19 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
{ {
if (eventReceived.Event.CallDisconnect != null) if (eventReceived.Event.CallDisconnect != null)
{ {
var tempCall = CodecStatus.Status.Call.FirstOrDefault(c => c.id.Equals(eventReceived.Event.CallDisconnect.CallId.Value)); var tempActiveCall = ActiveCalls.FirstOrDefault(c => c.Id.Equals(eventReceived.Event.CallDisconnect.CallId.Value));
if(tempCall != null) // Remove the call from the Active calls list
if (tempActiveCall != null)
{ {
// Remove the call from the xStatus object ActiveCalls.Remove(tempActiveCall);
CodecStatus.Status.Call.Remove(tempCall);
var tempActiveCall = ActiveCalls.FirstOrDefault(c => c.Id.Equals(eventReceived.Event.CallDisconnect.CallId.Value)); ListCalls();
// Remove the call from the Active calls list
if (tempActiveCall != null)
ActiveCalls.Remove(tempActiveCall);
// Notify of the call disconnection // Notify of the call disconnection
SetNewCallStatusAndFireCallStatusChange(eCodecCallStatus.Disconnected, tempActiveCall); SetNewCallStatusAndFireCallStatusChange(eCodecCallStatus.Disconnected, tempActiveCall);
GetCallHistory();
} }
} }
} }
@@ -736,6 +553,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
} }
private void GetCallHistory()
{
SendText("xCommand CallHistory Recents Limit: 20 Order: OccurrenceTime");
}
public override void Dial(string s) public override void Dial(string s)
{ {
SendText(string.Format("xCommand Dial Number: \"{0}\"", s)); SendText(string.Format("xCommand Dial Number: \"{0}\"", s));
@@ -904,15 +726,10 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
SendText("xCommand SystemUnit Boot Action: Restart"); SendText("xCommand SystemUnit Boot Action: Restart");
} }
public void RemoveEntry(CallHistory.CallHistoryEntry entry) public void RemoveCallHistoryEntry(CodecCallHistory.CallHistoryEntry entry)
{ {
if (RecentCalls != null) SendText(string.Format("xCommand CallHistory DeleteEntry CallHistoryId: {0} AcknowledgeConsecutiveDuplicates: True", entry.OccurrenceHistoryId));
{
RecentCalls.Remove(entry);
}
} }
} }
/// <summary> /// <summary>

26
Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoCodecPropertiesConfig.cs Normal file
View File

@@ -0,0 +1,26 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using Crestron.SimplSharp;
using PepperDash.Core;
using PepperDash.Essentials.Core;
namespace PepperDash.Essentials.Devices.Common.Codec
{
public class CiscoCodecPropertiesConfig
{
public CommunicationMonitorConfig CommunicationMonitorProperties { get; set; }
//public ControlPropertiesConfig Control { get; set; }
public List<CodecActiveCallItem> Favorites { get; set; }
/// <summary>
/// Valid values: "Local" or "Corporate"
/// </summary>
public string PhonebookMode { get; set; }
}
}

1
Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/xStatus.cs
View File

@@ -1682,6 +1682,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
public Duration Duration { get; set; } public Duration Duration { get; set; }
public Encryption Encryption { get; set; } public Encryption Encryption { get; set; }
public FacilityServiceId FacilityServiceId { get; set; } public FacilityServiceId FacilityServiceId { get; set; }
public string ghost { get; set; }
public HoldReason HoldReason { get; set; } public HoldReason HoldReason { get; set; }
public PlacedOnHold PlacedOnHold { get; set; } public PlacedOnHold PlacedOnHold { get; set; }
public Protocol Protocol { get; set; } public Protocol Protocol { get; set; }

3
Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs
View File

@@ -157,10 +157,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
/// </summary> /// </summary>
public virtual void ListCalls() public virtual void ListCalls()
{ {
Debug.Console(1, this, "Active Calls List:\n");
var sb = new StringBuilder(); var sb = new StringBuilder();
foreach (var c in ActiveCalls) foreach (var c in ActiveCalls)
sb.AppendFormat("{0} {1} -- {2} {3}\r", c.Id, c.Number, c.Name, c.Status); sb.AppendFormat("{0} {1} -- {2} {3}\r", c.Id, c.Number, c.Name, c.Status);
Debug.Console(1, "{0}", sb.ToString()); Debug.Console(1, this, "{0}", sb.ToString());
} }
} }

8
Essentials/PepperDashEssentials/ControlSystem.cs
View File

@@ -132,8 +132,14 @@ namespace PepperDash.Essentials
{ {
GenericSshClient TestCodecClient = new GenericSshClient("TestCodec-1--SshClient", "10.11.50.135", 22, "crestron", "2H3Zu&OvgXp6"); GenericSshClient TestCodecClient = new GenericSshClient("TestCodec-1--SshClient", "10.11.50.135", 22, "crestron", "2H3Zu&OvgXp6");
var props = new PepperDash.Essentials.Devices.Common.Codec.CiscoCodecPropertiesConfig();
props.PhonebookMode = "Local";
props.Favorites = new System.Collections.Generic.List<PepperDash.Essentials.Devices.Common.Codec.CodecActiveCallItem>();
props.Favorites.Add(new PepperDash.Essentials.Devices.Common.Codec.CodecActiveCallItem() { Name = "NYU Cisco Webex", Number = "10.11.50.211" });
PepperDash.Essentials.Devices.Common.VideoCodec.Cisco.CiscoCodec TestCodec = PepperDash.Essentials.Devices.Common.VideoCodec.Cisco.CiscoCodec TestCodec =
new PepperDash.Essentials.Devices.Common.VideoCodec.Cisco.CiscoCodec("TestCodec-1", "Cisco Spark Room Kit", TestCodecClient, 8080); new PepperDash.Essentials.Devices.Common.VideoCodec.Cisco.CiscoCodec("TestCodec-1", "Cisco Spark Room Kit", TestCodecClient, props);
TestCodec.CommDebuggingIsOn = true; TestCodec.CommDebuggingIsOn = true;