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

Merge branch 'feature/I18N-Support' of https://github.com/PepperDash/Essentials into feature/I18N-Support

Browse Source
This commit is contained in:
Andrew Welker
2020-10-15 17:00:01 -06:00
parent 36fd1dcda9 812b9b731b
commit 765d90214d
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs
View File

@@ -812,8 +812,10 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
CallStatusChange += (sender, args) => CallStatusChange += (sender, args) =>
{ {
trilist.SetBool(joinMap.HookState.JoinNumber, IsInCall); trilist.SetBool(joinMap.HookState.JoinNumber, IsInCall);
trilist.SetBool(joinMap.IncomingCall.JoinNumber, args.CallItem.Direction == eCodecCallDirection.Incoming); Debug.Console(1, this, "Call Direction: {0}", args.CallItem.Direction);
Debug.Console(1, this, "Call is incoming: {0}", args.CallItem.Direction == eCodecCallDirection.Incoming);
trilist.SetBool(joinMap.IncomingCall.JoinNumber, args.CallItem.Direction == eCodecCallDirection.Incoming && args.CallItem.Status != eCodecCallStatus.Disconnected);
if (args.CallItem.Direction == eCodecCallDirection.Incoming) if (args.CallItem.Direction == eCodecCallDirection.Incoming)
{ {

12
essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs
View File

@@ -1605,6 +1605,12 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
public override void AcceptCall(CodecActiveCallItem call) public override void AcceptCall(CodecActiveCallItem call)
{ {
SendText(string.Format("zCommand Call Accept callerJID: {0}", call.Id)); SendText(string.Format("zCommand Call Accept callerJID: {0}", call.Id));
call.Status = eCodecCallStatus.Connected;
OnCallStatusChange(call);
UpdateCallStatus();
} }
public void RejectCall() public void RejectCall()
@@ -1619,6 +1625,12 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
public override void RejectCall(CodecActiveCallItem call) public override void RejectCall(CodecActiveCallItem call)
{ {
SendText(string.Format("zCommand Call Reject callerJID: {0}", call.Id)); SendText(string.Format("zCommand Call Reject callerJID: {0}", call.Id));
call.Status = eCodecCallStatus.Disconnected;
OnCallStatusChange(call);
UpdateCallStatus();
} }
public override void Dial(Meeting meeting) public override void Dial(Meeting meeting)