Compare commits

..

4 Commits

Author SHA1 Message Date
Andrew Welker
14ad0eee48 adding some debug statements to try and suss out what's going on 2020-11-24 16:04:01 -07:00
Andrew Welker
56e106ff32 #512 add null check and return unknown if it is null 2020-11-24 15:46:33 -07:00
Andrew Welker
5ec97f2e31 Merge pull request #506 from PepperDash/hotfix/missing-logo-info-in-room-config
Addresses #505
2020-11-24 10:52:30 -07:00
Neil Dorin
98c20464d7 Addresses #505 2020-11-24 10:26:55 -07:00
2 changed files with 41 additions and 14 deletions

View File

@@ -536,23 +536,31 @@ namespace PepperDash.Essentials
string logoLight = null;
string logo = null;
if (c.Properties["logoDark"] != null)
try
{
logoDark = c.Properties["logoDark"].Value<string>("type");
}
if (c.Properties["logoDark"] != null)
{
logoDark = c.Properties["logoDark"].Value<string>("type");
}
if (c.Properties["logoLight"] != null)
if (c.Properties["logoLight"] != null)
{
logoLight = c.Properties["logoLight"].Value<string>("type");
}
if (c.Properties["logo"] != null)
{
logo = c.Properties["logo"].Value<string>("type");
}
return ((logoDark != null && logoDark == "system") ||
(logoLight != null && logoLight == "system") || (logo != null && logo == "system"));
}
catch (Exception e)
{
logoLight = c.Properties["logoLight"].Value<string>("type");
Debug.Console(1, Debug.ErrorLogLevel.Notice, "Unable to find logo information in any room config");
return false;
}
if (c.Properties["logo"] != null)
{
logo = c.Properties["logo"].Value<string>("type");
}
return ((logoDark != null && logoDark == "system") ||
(logoLight != null && logoLight == "system") || (logo != null && logo == "system"));
}
}
}

View File

@@ -205,7 +205,14 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
protected Func<string> SelfviewPipPositionFeedbackFunc
{
get { return () => _currentSelfviewPipPosition.Command; }
get
{
return
() =>
_currentSelfviewPipPosition != null
? _currentSelfviewPipPosition.Command ?? "Unknown"
: "Unknown";
}
}
protected Func<string> LocalLayoutFeedbackFunc
@@ -1373,6 +1380,9 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
/// </summary>
private void UpdateCallStatus()
{
Debug.Console(1, this, "[UpdateCallStatus] Current Call Status: {0}",
Status.Call != null ? Status.Call.Sharing.State.ToString() : "no call");
if (Status.Call != null)
{
var callStatus = Status.Call.Status;
@@ -1406,6 +1416,9 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
ActiveCalls.Add(newCall);
Debug.Console(1, this, "[UpdateCallStatus] Current Call Status: {0}",
Status.Call != null ? Status.Call.Sharing.State.ToString() : "no call");
OnCallStatusChange(newCall);
}
}
@@ -1423,6 +1436,9 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
break;
}
Debug.Console(1, this, "[UpdateCallStatus] Current Call Status: {0}",
Status.Call != null ? Status.Call.Sharing.State.ToString() : "no call");
OnCallStatusChange(existingCall);
}
}
@@ -1460,6 +1476,9 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
{
base.OnCallStatusChange(item);
Debug.Console(1, this, "[OnCallStatusChange] Current Call Status: {0}",
Status.Call != null ? Status.Call.Sharing.State.ToString() : "no call");
if (_props.AutoDefaultLayouts)
{
SetLayout();