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

cisco-spark-2 merge

Browse Source
This commit is contained in:
Heath Volmer
2017-09-18 17:42:18 -06:00
parent cc6e555f25 b0fd837cdc
commit fed06bc025
6 changed files with 38 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Essentials Core/PepperDashEssentialsBase/Devices/CodecInterfaces.cs
View File

@@ -14,10 +14,10 @@ namespace PepperDash.Essentials.Core
// Add requirements for Dialer functionality // Add requirements for Dialer functionality
void Dial(string number); void Dial(string number);
void EndCall(string number); void EndCall(object activeCall);
void EndAllCalls();
void AcceptCall(); void AcceptCall();
void RejectCall(); void RejectCall();
void SendDtmf(string digit); void SendDtmf(string digit);
IntFeedback ActiveCallCountFeedback { get; } IntFeedback ActiveCallCountFeedback { get; }

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

@@ -551,9 +551,17 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
SendText(string.Format("xCommand Dial BookingId: {0}", s)); SendText(string.Format("xCommand Dial BookingId: {0}", s));
} }
public override void EndCall(string s) public override void EndCall(CodecActiveCallItem activeCall)
{ {
SendText(string.Format("xCommand Call Disconnect CallId: {0}", GetCallId())); SendText(string.Format("xCommand Call Disconnect CallId: {0}", activeCall.Id));
}
public override void EndAllCalls()
{
foreach (CodecActiveCallItem activeCall in ActiveCalls)
{
SendText(string.Format("xCommand Call Disconnect CallId: {0}", activeCall.Id));
}
} }
public override void AcceptCall() public override void AcceptCall()

20
Essentials Devices Common/Essentials Devices Common/VideoCodec/CodecActiveCallItem.cs
View File

@@ -9,22 +9,24 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
{ {
public class CodecActiveCallItem public class CodecActiveCallItem
{ {
public string Name { get; private set; } public string Name { get; set; }
public string Number { get; private set; } public string Number { get; set; }
public eCodecCallType Type { get; private set; } public eCodecCallType Type { get; set; }
public CodecActiveCallItem(string name, string number, eCodecCallType type) public eCodecCallStatus Status { get; set; }
{
Name = name; public string Id { get; set; }
Number = number;
Type = type;
}
} }
public enum eCodecCallType public enum eCodecCallType
{ {
None, Audio, Video None, Audio, Video
} }
public enum eCodecCallStatus
{
Dialing, Established, Incoming
}
} }

9
Essentials Devices Common/Essentials Devices Common/VideoCodec/MockVC/MockVC.cs
View File

@@ -71,11 +71,18 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
public override void EndCall(string s) public override void EndCall(CodecActiveCallItem activeCall)
{ {
Debug.Console(1, this, "EndCall"); Debug.Console(1, this, "EndCall");
ActiveCalls.RemoveAll(i => i.Name == s); ActiveCalls.RemoveAll(i => i.Name == s);
ActiveCallCountFeedback.FireUpdate(); ActiveCallCountFeedback.FireUpdate();
//_InCall = false;
//IsInCall.FireUpdate();
}
public override void EndAllCalls()
{
} }
/// <summary> /// <summary>

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

@@ -80,7 +80,12 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
#region IHasDialer Members #region IHasDialer Members
public abstract void Dial(string s); public abstract void Dial(string s);
public abstract void EndCall(string s); public void EndCall(object activeCall)
{
}
public abstract void EndCall(CodecActiveCallItem activeCall);
public abstract void EndAllCalls();
public abstract void AcceptCall(); public abstract void AcceptCall();
public abstract void RejectCall(); public abstract void RejectCall();
public abstract void SendDtmf(string s); public abstract void SendDtmf(string s);

2
Essentials/PepperDashEssentials/UIDrivers/VC/EssentialsVideoCodecUiDriver.cs
View File

@@ -191,7 +191,7 @@ namespace PepperDash.Essentials.UIDrivers.VC
void ConnectPress() void ConnectPress()
{ {
if (Codec.IsInCall) if (Codec.IsInCall)
Codec.EndCall("end whatever is selected"); Codec.EndAllCalls();
else else
Codec.Dial(DialStringBuilder.ToString()); Codec.Dial(DialStringBuilder.ToString());
} }