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

TONS of UI misbehaviors. Lost track of issues

Browse Source
This commit is contained in:
Heath Volmer
2017-10-19 20:00:10 -06:00
parent 8dfa05293c
commit c959f20204
4 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Essentials/PepperDashEssentials/UIDrivers/EssentialsHuddleVTC/EssentialsHuddleVtc1PanelAvFunctionsDriver.cs
View File

@@ -271,11 +271,13 @@ namespace PepperDash.Essentials
if (CurrentRoom.OnFeedback.BoolValue)
{
TriList.SetBool(UIBoolJoin.TapToBeginVisible, false);
SetupActivityFooterWhenRoomOn();
}
else
{
TriList.SetBool(UIBoolJoin.StartPageVisible, true);
TriList.SetBool(UIBoolJoin.TapToBeginVisible, true);
SetupActivityFooterWhenRoomOff();
}
ShowCurrentDisplayModeSigsInUse();
@@ -288,10 +290,10 @@ namespace PepperDash.Essentials
TriList.SetSigFalseAction(UIBoolJoin.VolumeDefaultPress, () => CurrentRoom.SetDefaultLevels());
TriList.SetString(UIStringJoin.AdvancedVolumeSlider1Text, "Room");
if (TriList is CrestronApp)
TriList.BooleanInput[UIBoolJoin.GearButtonVisible].BoolValue = false;
else
TriList.BooleanInput[UIBoolJoin.GearButtonVisible].BoolValue = true;
//if (TriList is CrestronApp)
// TriList.BooleanInput[UIBoolJoin.GearButtonVisible].BoolValue = false;
//else
// TriList.BooleanInput[UIBoolJoin.GearButtonVisible].BoolValue = true;
// power-related functions
// Note: some of these are not directly-related to the huddle space UI, but are held over
@@ -1070,6 +1072,7 @@ namespace PepperDash.Essentials
MeetingOrContactMethodModalSrl.GetBoolFeedbackSig(i, 1).SetSigFalseAction(() =>
{
PopupInterlock.Hide();
ActivityCallButtonPressed();
var d = CurrentRoom.ScheduleSource as VideoCodecBase;
if (d != null)
RoomOnAndDialMeeting(mm);

7
Essentials/PepperDashEssentials/UIDrivers/VC/EssentialsVideoCodecUiDriver.cs
View File

@@ -33,7 +33,7 @@ namespace PepperDash.Essentials.UIDrivers.VC
/// <summary>
/// To drive UI elements outside of this driver that may be dependent on this.
/// </summary>
BoolFeedback InCall;
//BoolFeedback InCall;
BoolFeedback LocalPrivacyIsMuted;
/// <summary>
@@ -120,7 +120,7 @@ namespace PepperDash.Essentials.UIDrivers.VC
else
codec.IsReadyChange += (o, a) => Codec_IsReady();
InCall = new BoolFeedback(() => false);
//InCall = new BoolFeedback(() => false);
LocalPrivacyIsMuted = new BoolFeedback(() => false);
VCControlsInterlock = new JoinedSigInterlock(triList);
@@ -378,6 +378,7 @@ namespace PepperDash.Essentials.UIDrivers.VC
/// </summary>
void AcceptIncomingCall(CodecActiveCallItem call)
{
Parent.PrepareForCodecIncomingCall();
Parent.ActivityCallButtonPressed();
Codec.AcceptCall(call);
}
@@ -902,7 +903,7 @@ namespace PepperDash.Essentials.UIDrivers.VC
/// </summary>
void ShowKeypad()
{
uint join = CodecHasFavorites ? UIBoolJoin.VCKeypadWithFavoritesVisible : UIBoolJoin.VCKeypadVisible;
uint join = Codec.IsInCall ? UIBoolJoin.VCKeypadVisible : UIBoolJoin.VCKeypadWithFavoritesVisible;
if (IsVisible)
VCControlsInterlock.ShowInterlocked(join);
else