From 84ee743ff5199c1186398a0a7339117f73bf5468 Mon Sep 17 00:00:00 2001 From: Neil Dorin Date: Wed, 6 Mar 2019 16:33:00 -0700 Subject: [PATCH] Moved Directory browsing logic from VideoCodecUiDriver down to IHasDirectory Interface to sync better with VideoCodecBaseMessenger for MC --- .../AppServer/CotijaSystemController.cs | 10 +++--- .../Room/Types/EssentialsHuddleVtc1Room.cs | 2 +- .../VC/EssentialsVideoCodecUiDriver.cs | 32 +++++++------------ essentials-framework | 2 +- 4 files changed, 19 insertions(+), 27 deletions(-) diff --git a/PepperDashEssentials/AppServer/CotijaSystemController.cs b/PepperDashEssentials/AppServer/CotijaSystemController.cs index 5fd5e958..4417debf 100644 --- a/PepperDashEssentials/AppServer/CotijaSystemController.cs +++ b/PepperDashEssentials/AppServer/CotijaSystemController.cs @@ -317,10 +317,12 @@ namespace PepperDash.Essentials CrestronConsole.ConsoleCommandResponse(@"Mobile Control Information: Server address: {0} System Name: {1} - System UUID: {2} - System User code: {3} - Connected?: {4} - Seconds Since Last Ack: {5}", url, name, SystemUuid, + System URL: {2} + System UUID: {3} + System User code: {4} + Connected?: {5} + Seconds Since Last Ack: {6}" + , url, name, ConfigReader.ConfigObject.SystemUrl, SystemUuid, code, conn, secSinceLastAck.Seconds); } diff --git a/PepperDashEssentials/Room/Types/EssentialsHuddleVtc1Room.cs b/PepperDashEssentials/Room/Types/EssentialsHuddleVtc1Room.cs index 62b11e49..2c5ca160 100644 --- a/PepperDashEssentials/Room/Types/EssentialsHuddleVtc1Room.cs +++ b/PepperDashEssentials/Room/Types/EssentialsHuddleVtc1Room.cs @@ -279,7 +279,7 @@ namespace PepperDash.Essentials inAudioCall = AudioCodec.IsInCall; if(VideoCodec != null) - inVideoCall = AudioCodec.IsInCall; + inVideoCall = VideoCodec.IsInCall; if (inAudioCall || inVideoCall) return true; diff --git a/PepperDashEssentials/UIDrivers/VC/EssentialsVideoCodecUiDriver.cs b/PepperDashEssentials/UIDrivers/VC/EssentialsVideoCodecUiDriver.cs index 998ccbd9..17eb18b6 100644 --- a/PepperDashEssentials/UIDrivers/VC/EssentialsVideoCodecUiDriver.cs +++ b/PepperDashEssentials/UIDrivers/VC/EssentialsVideoCodecUiDriver.cs @@ -59,7 +59,7 @@ namespace PepperDash.Essentials.UIDrivers.VC SmartObjectDynamicList DirectoryList; - CodecDirectory CurrentDirectoryResult; + //CodecDirectory CurrentDirectoryResult; ///// ///// Tracks the directory browse history when browsing beyond the root directory @@ -174,7 +174,7 @@ namespace PepperDash.Essentials.UIDrivers.VC triList.SetSigFalseAction(UIBoolJoin.VCDirectoryBackPress, GetDirectoryParentFolderContents); - DirectoryBackButtonVisibleFeedback = new BoolFeedback(() => CurrentDirectoryResult != (codec as IHasDirectory).DirectoryRoot); + DirectoryBackButtonVisibleFeedback = (codec as IHasDirectory).CurrentDirectoryResultIsNotDirectoryRoot; DirectoryBackButtonVisibleFeedback .LinkInputSig(triList.BooleanInput[UIBoolJoin.VCDirectoryBackVisible]); @@ -546,12 +546,8 @@ namespace PepperDash.Essentials.UIDrivers.VC codec.PhonebookSyncState.InitialSyncCompleted += new EventHandler(PhonebookSyncState_InitialSyncCompleted); } - - // If there is something here now, show it otherwise wait for the event - if (CurrentDirectoryResult != null && codec.DirectoryRoot.DirectoryResults.Count > 0) - { - RefreshDirectory(); - } + RefreshDirectory(); + } } @@ -560,12 +556,10 @@ namespace PepperDash.Essentials.UIDrivers.VC /// void SetCurrentDirectoryToRoot() { - CurrentDirectoryResult = (Codec as IHasDirectory).DirectoryRoot; + (Codec as IHasDirectory).SetCurrentDirectoryToRoot(); SearchKeypadClear(); - DirectoryBackButtonVisibleFeedback.FireUpdate(); - RefreshDirectory(); } @@ -580,10 +574,8 @@ namespace PepperDash.Essentials.UIDrivers.VC SetCurrentDirectoryToRoot(); - if (CurrentDirectoryResult != null && codec.DirectoryRoot.DirectoryResults.Count > 0) - { - RefreshDirectory(); - } + RefreshDirectory(); + } /// @@ -597,8 +589,6 @@ namespace PepperDash.Essentials.UIDrivers.VC { NextDirectoryResultIsFolderContents = false; } - CurrentDirectoryResult = e.Directory; - DirectoryBackButtonVisibleFeedback.FireUpdate(); RefreshDirectory(); } @@ -622,7 +612,7 @@ namespace PepperDash.Essentials.UIDrivers.VC if (codec != null) { - CurrentDirectoryResult = codec.GetDirectoryParentFolderContents(); + codec.GetDirectoryParentFolderContents(); RefreshDirectory(); } @@ -635,10 +625,10 @@ namespace PepperDash.Essentials.UIDrivers.VC /// void RefreshDirectory() { - if (CurrentDirectoryResult.DirectoryResults.Count > 0) + if ((Codec as IHasDirectory).CurrentDirectoryResult.CurrentDirectoryResults.Count > 0) { ushort i = 0; - foreach (var r in CurrentDirectoryResult.DirectoryResults) + foreach (var r in (Codec as IHasDirectory).CurrentDirectoryResult.CurrentDirectoryResults) { if (i == DirectoryList.MaxCount) { @@ -1092,7 +1082,7 @@ namespace PepperDash.Essentials.UIDrivers.VC SearchStringFeedback.FireUpdate(); SearchStringKeypadCheckEnables(); - if(CurrentDirectoryResult != (Codec as IHasDirectory).DirectoryRoot) + if((Codec as IHasDirectory).CurrentDirectoryResultIsNotDirectoryRoot.BoolValue) SetCurrentDirectoryToRoot(); } diff --git a/essentials-framework b/essentials-framework index d869bc92..efa39eb6 160000 --- a/essentials-framework +++ b/essentials-framework @@ -1 +1 @@ -Subproject commit d869bc92ce177a79dcc3c3e3f385246fca7692d7 +Subproject commit efa39eb6fd171fc53c163a8d348d5af47bc5ccf0