mirror of
https://github.com/PepperDash/Essentials.git
synced 2026-02-15 12:44:58 +00:00
Added codec dial and end commands
This commit is contained in:
@@ -236,7 +236,6 @@ namespace PepperDash.Essentials.Room.Cotija
|
|||||||
EISC.PulseBool(BoolJoin.SourceHasChanged);
|
EISC.PulseBool(BoolJoin.SourceHasChanged);
|
||||||
}));
|
}));
|
||||||
|
|
||||||
#warning CHANGE to activityshare. Perhaps
|
|
||||||
Parent.AddAction(@"/room/room1/defaultsource", new Action(() =>
|
Parent.AddAction(@"/room/room1/defaultsource", new Action(() =>
|
||||||
EISC.PulseBool(BoolJoin.ActivitySharePress)));
|
EISC.PulseBool(BoolJoin.ActivitySharePress)));
|
||||||
|
|
||||||
|
|||||||
@@ -55,7 +55,7 @@ namespace PepperDash.Essentials
|
|||||||
// doesn't need to know about everything.
|
// doesn't need to know about everything.
|
||||||
|
|
||||||
// Source Changes and room off
|
// Source Changes and room off
|
||||||
Parent.AddAction(string.Format(@"/room/{0}/status", Room.Key), new Action(() => Room_RoomFullStatus(Room)));
|
Parent.AddAction(string.Format(@"/room/{0}/status", Room.Key), new Action(() => SendFullStatus(Room)));
|
||||||
|
|
||||||
var routeRoom = Room as IRunRouteAction;
|
var routeRoom = Room as IRunRouteAction;
|
||||||
if(routeRoom != null)
|
if(routeRoom != null)
|
||||||
@@ -94,6 +94,17 @@ namespace PepperDash.Essentials
|
|||||||
codec.CallStatusChange += new EventHandler<CodecCallStatusItemChangeEventArgs>(codec_CallStatusChange);
|
codec.CallStatusChange += new EventHandler<CodecCallStatusItemChangeEventArgs>(codec_CallStatusChange);
|
||||||
|
|
||||||
vcRoom.IsSharingFeedback.OutputChange += new EventHandler<FeedbackEventArgs>(IsSharingFeedback_OutputChange);
|
vcRoom.IsSharingFeedback.OutputChange += new EventHandler<FeedbackEventArgs>(IsSharingFeedback_OutputChange);
|
||||||
|
|
||||||
|
Parent.AddAction("/device/videoCodec/dial", new Action<string>(s => codec.Dial(s)));
|
||||||
|
Parent.AddAction("/device/videoCodec/endCall", new Action<string>(s =>
|
||||||
|
{
|
||||||
|
var call = codec.ActiveCalls.FirstOrDefault(c => c.Id == s);
|
||||||
|
if (call != null)
|
||||||
|
{
|
||||||
|
codec.EndCall(call);
|
||||||
|
}
|
||||||
|
}));
|
||||||
|
Parent.AddAction("/device/videoCodec/endAllCalls", new Action(() => codec.EndAllCalls()));
|
||||||
}
|
}
|
||||||
|
|
||||||
Parent.AddAction(string.Format(@"/room/{0}/shutdownStart", Room.Key), new Action(() => Room.StartShutdown(eShutdownType.Manual)));
|
Parent.AddAction(string.Format(@"/room/{0}/shutdownStart", Room.Key), new Action(() => Room.StartShutdown(eShutdownType.Manual)));
|
||||||
@@ -119,7 +130,7 @@ namespace PepperDash.Essentials
|
|||||||
// sharing source
|
// sharing source
|
||||||
string shareText;
|
string shareText;
|
||||||
bool isSharing;
|
bool isSharing;
|
||||||
|
#warning This share update needs to happen on source change as well!
|
||||||
var vcRoom = Room as IHasVideoCodec;
|
var vcRoom = Room as IHasVideoCodec;
|
||||||
var srcInfoRoom = Room as IHasCurrentSourceInfoChange;
|
var srcInfoRoom = Room as IHasCurrentSourceInfoChange;
|
||||||
if (vcRoom.VideoCodec.SharingContentIsOnFeedback.BoolValue && srcInfoRoom.CurrentSourceInfo != null)
|
if (vcRoom.VideoCodec.SharingContentIsOnFeedback.BoolValue && srcInfoRoom.CurrentSourceInfo != null)
|
||||||
@@ -149,9 +160,11 @@ namespace PepperDash.Essentials
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
void codec_CallStatusChange(object sender, CodecCallStatusItemChangeEventArgs e)
|
void codec_CallStatusChange(object sender, CodecCallStatusItemChangeEventArgs e)
|
||||||
{
|
{
|
||||||
|
var codec = sender as VideoCodecBase;
|
||||||
PostStatusMessage(new
|
PostStatusMessage(new
|
||||||
{
|
{
|
||||||
calls = GetCallsMessageObject()
|
calls = GetCallsMessageObject(),
|
||||||
|
vtc = GetVtcCallsMessageObject()
|
||||||
});
|
});
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -382,7 +395,7 @@ namespace PepperDash.Essentials
|
|||||||
/// Posts the full status of the room to the server
|
/// Posts the full status of the room to the server
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="room"></param>
|
/// <param name="room"></param>
|
||||||
void Room_RoomFullStatus(EssentialsRoomBase room)
|
void SendFullStatus(EssentialsRoomBase room)
|
||||||
{
|
{
|
||||||
var sourceKey = room is IHasCurrentSourceInfoChange ? (room as IHasCurrentSourceInfoChange).CurrentSourceInfoKey : null;
|
var sourceKey = room is IHasCurrentSourceInfoChange ? (room as IHasCurrentSourceInfoChange).CurrentSourceInfoKey : null;
|
||||||
|
|
||||||
@@ -397,27 +410,12 @@ namespace PepperDash.Essentials
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//var callRm = room as IHasVideoCodec;
|
|
||||||
//object calls = null;
|
|
||||||
//if(callRm != null)
|
|
||||||
//{
|
|
||||||
// calls = new {
|
|
||||||
// activeCalls = callRm.VideoCodec.ActiveCalls,
|
|
||||||
// callType = callRm.CallTypeFeedback.IntValue,
|
|
||||||
// inCall = callRm.InCallFeedback.BoolValue,
|
|
||||||
// isSharing = callRm.IsSharingFeedback.BoolValue,
|
|
||||||
// privacyModeIsOn = callRm.PrivacyModeIsOnFeedback.BoolValue
|
|
||||||
// };
|
|
||||||
//}
|
|
||||||
|
|
||||||
PostStatusMessage(new
|
PostStatusMessage(new
|
||||||
{
|
{
|
||||||
calls = GetCallsMessageObject(),
|
calls = GetCallsMessageObject(),
|
||||||
isOn = room.OnFeedback.BoolValue,
|
isOn = room.OnFeedback.BoolValue,
|
||||||
selectedSourceKey = sourceKey,
|
selectedSourceKey = sourceKey,
|
||||||
videoCodec = new {
|
vtc = GetVtcCallsMessageObject(),
|
||||||
|
|
||||||
},
|
|
||||||
volumes = volumes
|
volumes = volumes
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -440,6 +438,26 @@ namespace PepperDash.Essentials
|
|||||||
privacyModeIsOn = callRm.PrivacyModeIsOnFeedback.BoolValue
|
privacyModeIsOn = callRm.PrivacyModeIsOnFeedback.BoolValue
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Helper method to build call status for vtc
|
||||||
|
/// </summary>
|
||||||
|
/// <returns></returns>
|
||||||
|
object GetVtcCallsMessageObject()
|
||||||
|
{
|
||||||
|
var callRm = Room as IHasVideoCodec;
|
||||||
|
object vtc = null;
|
||||||
|
if (callRm != null)
|
||||||
|
{
|
||||||
|
var codec = callRm.VideoCodec;
|
||||||
|
vtc = new
|
||||||
|
{
|
||||||
|
isInCall = codec.IsInCall,
|
||||||
|
calls = codec.ActiveCalls
|
||||||
|
};
|
||||||
|
}
|
||||||
|
return vtc;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -202,8 +202,6 @@ namespace PepperDash.Essentials.UIDrivers.VC
|
|||||||
{
|
{
|
||||||
string roomNumberSipUri = "";
|
string roomNumberSipUri = "";
|
||||||
|
|
||||||
#warning FIX PHONE FORMATTING TO ONLY SHOW WHEN APPROPRIATE - TALK TO NEIL
|
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty(Codec.CodecInfo.SipUri)) // If both values are present, format the string with a pipe divider
|
if (!string.IsNullOrEmpty(Codec.CodecInfo.SipUri)) // If both values are present, format the string with a pipe divider
|
||||||
roomNumberSipUri = string.Format("{0} | {1}", GetFormattedPhoneNumber(Codec.CodecInfo.SipPhoneNumber), Codec.CodecInfo.SipUri);
|
roomNumberSipUri = string.Format("{0} | {1}", GetFormattedPhoneNumber(Codec.CodecInfo.SipPhoneNumber), Codec.CodecInfo.SipUri);
|
||||||
else // If only one value present, just show the phone number
|
else // If only one value present, just show the phone number
|
||||||
|
|||||||
Reference in New Issue
Block a user