pepperdash/Essentials
1
0
Fork 0
mirror of https://github.com/PepperDash/Essentials.git synced 2026-02-14 20:24:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(essentials): #865 Adds SelectedContactMethodCount join to report the number of methods for the selected contact

Browse Source
This commit is contained in:
Neil Dorin
2021-12-07 16:45:14 -07:00
parent 4552a15cbb
commit 90e22e9136
2 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/VideoCodecControllerJoinMap.cs
View File

@@ -1204,6 +1204,20 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
JoinType = eJoinType.Analog JoinType = eJoinType.Analog
}); });
[JoinName("SelectedContactMethodCount")]
public JoinDataComplete SelectedContactMethodCount = new JoinDataComplete(
new JoinData
{
JoinNumber = 102,
JoinSpan = 1
},
new JoinMetadata
{
Description = "Reports the number of contact methods for the selected contact",
JoinCapabilities = eJoinCapabilities.FromSIMPL,
JoinType = eJoinType.Analog
});
[JoinName("CameraPresetSelect")] [JoinName("CameraPresetSelect")]
public JoinDataComplete CameraPresetSelect = new JoinDataComplete( public JoinDataComplete CameraPresetSelect = new JoinDataComplete(
new JoinData new JoinData

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

@@ -972,6 +972,7 @@ ScreenIndexIsPinnedTo: {8} (a{17})
if (entry is DirectoryFolder) if (entry is DirectoryFolder)
{ {
codec.GetDirectoryFolderContents(entry.FolderId); codec.GetDirectoryFolderContents(entry.FolderId);
trilist.SetUshort(joinMap.SelectedContactMethodCount.JoinNumber, 0);
return; return;
} }
@@ -998,10 +999,16 @@ ScreenIndexIsPinnedTo: {8} (a{17})
// If auto dial is disabled... // If auto dial is disabled...
var entryToDial = entry as DirectoryContact; var entryToDial = entry as DirectoryContact;
if (entryToDial == null) return; if (entryToDial == null)
{
trilist.SetUshort(joinMap.SelectedContactMethodCount.JoinNumber, 0);
return;
}
trilist.SetSigFalseAction(joinMap.DirectoryDialSelectedLine.JoinNumber, () => Dial(entryToDial.ContactMethods[0].Number)); trilist.SetSigFalseAction(joinMap.DirectoryDialSelectedLine.JoinNumber, () => Dial(entryToDial.ContactMethods[0].Number));
trilist.SetUshort(joinMap.SelectedContactMethodCount.JoinNumber, (ushort)entryToDial.ContactMethods.Count);
var clearBytes = XSigHelpers.ClearOutputs(); var clearBytes = XSigHelpers.ClearOutputs();
trilist.SetString(joinMap.ContactMethods.JoinNumber, trilist.SetString(joinMap.ContactMethods.JoinNumber,