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

Adds additional check for if DisablePhonebookAutoDownload is true to CustomActivate method. Fixes issue where layout was not being set properly on sharing end.

Browse Source
This commit is contained in:
Alex Johnson
2020-10-08 11:43:12 -04:00
parent c58a1874ca
commit 5f1b92ca62
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -552,9 +552,13 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
{ {
CrestronConsole.AddNewConsoleCommand(SetCommDebug, "SetCodecCommDebug", "0 for Off, 1 for on", CrestronConsole.AddNewConsoleCommand(SetCommDebug, "SetCodecCommDebug", "0 for Off, 1 for on",
ConsoleAccessLevelEnum.AccessOperator); ConsoleAccessLevelEnum.AccessOperator);
CrestronConsole.AddNewConsoleCommand(s => SendText("zCommand Phonebook List Offset: 0 Limit: 512"), if (!_props.DisablePhonebookAutoDownload)
"GetZoomRoomContacts", "Triggers a refresh of the codec phonebook", {
ConsoleAccessLevelEnum.AccessOperator); CrestronConsole.AddNewConsoleCommand(s => SendText("zCommand Phonebook List Offset: 0 Limit: 512"),
"GetZoomRoomContacts", "Triggers a refresh of the codec phonebook",
ConsoleAccessLevelEnum.AccessOperator);
}
CrestronConsole.AddNewConsoleCommand(s => GetBookings(), "GetZoomRoomBookings", CrestronConsole.AddNewConsoleCommand(s => GetBookings(), "GetZoomRoomBookings",
"Triggers a refresh of the booking data for today", ConsoleAccessLevelEnum.AccessOperator); "Triggers a refresh of the booking data for today", ConsoleAccessLevelEnum.AccessOperator);
@@ -816,7 +820,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
SendText("zFeedback Register Op: ex Path: /Event/InfoResult/info/callout_country_list"); SendText("zFeedback Register Op: ex Path: /Event/InfoResult/info/callout_country_list");
Thread.Sleep(100); Thread.Sleep(100);
if (_props.DisablePhonebookAutoDownload) if (!_props.DisablePhonebookAutoDownload)
{ {
SendText("zFeedback Register Op: ex Path: /Event/Phonebook/AddedContact"); SendText("zFeedback Register Op: ex Path: /Event/Phonebook/AddedContact");
} }
@@ -1063,6 +1067,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
{ {
JsonConvert.PopulateObject(responseObj.ToString(), Status.Call.Sharing); JsonConvert.PopulateObject(responseObj.ToString(), Status.Call.Sharing);
SetLayout();
break; break;
} }
case "incomingcallindication": case "incomingcallindication":
@@ -1222,8 +1228,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
{ {
JsonConvert.PopulateObject(responseObj.ToString(), Status.Sharing); JsonConvert.PopulateObject(responseObj.ToString(), Status.Sharing);
SetLayout();
break; break;
} }
case "numberofscreens": case "numberofscreens":
@@ -1758,6 +1762,10 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
SelfviewPipPositionSet(SelfviewPipPositions[nextPipPositionIndex]); SelfviewPipPositionSet(SelfviewPipPositions[nextPipPositionIndex]);
} }
else
{
SelfviewPipPositionSet(SelfviewPipPositions[0]);
}
} }
public List<CodecCommandWithLabel> SelfviewPipPositions = new List<CodecCommandWithLabel>() public List<CodecCommandWithLabel> SelfviewPipPositions = new List<CodecCommandWithLabel>()