Merge remote-tracking branch 'origin/hotfix/password-prompt-clear-and…

…-share-info' into hotfix/SIMPL-bridge-updates
PepperDash · Sep 23, 2022 · 88d4ca0 · 88d4ca0
2 parents c5bd2b5 + 19ebf2e
commit 88d4ca0
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 27 deletions.
diff --git a/3-series/Messengers/VideoCodecBaseMessenger.cs b/3-series/Messengers/VideoCodecBaseMessenger.cs
@@ -339,6 +339,7 @@ protected override void CustomRegisterWithAppServer(MobileControlSystemControlle
                     Debug.Console(2, this, "Adding IPasswordPrompt Actions");
 
                     appServerController.AddAction(MessagePath + "/password", new Action<string>((s) => pwCodec.SubmitPassword(s)));
+                    appServerController.AddAction(MessagePath + "/cancelPasswordPrompt", new Action(() => pwCodec.CancelPasswordPrompt()));
                 }
 
                 var farEndContentStatus = Codec as IHasFarEndContentStatus;

diff --git a/3-series/Messengers/ZoomRoomMessenger.cs b/3-series/Messengers/ZoomRoomMessenger.cs
@@ -177,13 +177,26 @@ protected override void CustomRegisterWithAppServer(MobileControlSystemControlle
                     scheduleCodec.CodecSchedule.MeetingsListHasChanged += CodecSchedule_MeetingsListHasChanged;
                 }
 
+                var sharingInfo = Codec as IZoomWirelessShareInstructions;
+                if (sharingInfo != null)
+                {
+                    Debug.Console(2, this, "Adding IZoomWirelessSharingInstructions Subscriptions");
+                    sharingInfo.ShareInfoChanged += SharingInfo_ShareInfoChanged;
+                }
+
             }
             catch (Exception e)
             {
                 Debug.Console(2, this, "Error: {0}", e);
             }
         }
 
+        private void SharingInfo_ShareInfoChanged(object sender, ShareInfoEventArgs e)
+        {
+            var status = new ZoomRoomStateMessage();
+
+            status.ShareInfo = e.SharingStatus;
+        }
 
         private void CodecSchedule_MeetingsListHasChanged(object sender, EventArgs e)
         {
@@ -310,6 +323,7 @@ protected override void SendFullStatus()
             zoomStatus.Participants = _codec.Participants.CurrentParticipants;
             zoomStatus.CameraIsMuted = _codec.CameraIsMutedFeedback.BoolValue;
             zoomStatus.RecordConsentPromptIsVisible = _codec.RecordConsentPromptIsVisible.BoolValue;
+            zoomStatus.ShareInfo = _codec.SharingState;
 
             PostStatusMessage(zoomStatus);
         }
@@ -339,6 +353,9 @@ public class ZoomRoomStateMessage : VideoCodecBaseStateMessage
 
         [JsonProperty("recordConsentPromptIsVisible", NullValueHandling = NullValueHandling.Ignore)]
         public bool? RecordConsentPromptIsVisible { get; set; }
+
+        [JsonProperty("shareInfo", NullValueHandling = NullValueHandling.Ignore)]
+        public zStatus.Sharing ShareInfo { get; set; }
     }
 
     public class ZoomRoomEventMessage: DeviceEventMessageBase

diff --git a/4-series/epi-essentials-mobile-control.csproj b/4-series/epi-essentials-mobile-control.csproj
@@ -41,64 +41,64 @@
       <HintPath>packages\Crestron.SimplSharp.SDK.ProgramLibrary.2.18.112\lib\net47\Crestron.SimplSharpPro.CrestronConnected.dll</HintPath>
     </Reference>
     <Reference Include="Crestron.SimplSharpPro.DeviceSupport, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
-      <HintPath>packages\Crestron.SimplSharp.SDK.ProgramLibrary.2.18.112\lib\net47\Crestron.SimplSharpPro.DeviceSupport.dll</HintPath>
+      <HintPath>packages\PepperDashEssentials.1.10.11-hotfix-1948\lib\net47\Crestron.SimplSharpPro.DeviceSupport.dll</HintPath>
     </Reference>
     <Reference Include="Crestron.SimplSharpPro.DM, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
-      <HintPath>packages\Crestron.SimplSharp.SDK.ProgramLibrary.2.18.112\lib\net47\Crestron.SimplSharpPro.DM.dll</HintPath>
+      <HintPath>packages\PepperDashEssentials.1.10.11-hotfix-1948\lib\net47\Crestron.SimplSharpPro.DM.dll</HintPath>
     </Reference>
     <Reference Include="Crestron.SimplSharpPro.EthernetCommunications, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
-      <HintPath>packages\Crestron.SimplSharp.SDK.ProgramLibrary.2.18.112\lib\net47\Crestron.SimplSharpPro.EthernetCommunications.dll</HintPath>
+      <HintPath>packages\PepperDashEssentials.1.10.11-hotfix-1948\lib\net47\Crestron.SimplSharpPro.EthernetCommunications.dll</HintPath>
     </Reference>
     <Reference Include="Crestron.SimplSharpPro.Fusion, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
-      <HintPath>packages\Crestron.SimplSharp.SDK.ProgramLibrary.2.18.112\lib\net47\Crestron.SimplSharpPro.Fusion.dll</HintPath>
+      <HintPath>packages\PepperDashEssentials.1.10.11-hotfix-1948\lib\net47\Crestron.SimplSharpPro.Fusion.dll</HintPath>
     </Reference>
     <Reference Include="Crestron.SimplSharpPro.Gateways, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
-      <HintPath>packages\Crestron.SimplSharp.SDK.ProgramLibrary.2.18.112\lib\net47\Crestron.SimplSharpPro.Gateways.dll</HintPath>
+      <HintPath>packages\PepperDashEssentials.1.10.11-hotfix-1948\lib\net47\Crestron.SimplSharpPro.Gateways.dll</HintPath>
     </Reference>
     <Reference Include="Crestron.SimplSharpPro.GeneralIO, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
-      <HintPath>packages\Crestron.SimplSharp.SDK.ProgramLibrary.2.18.112\lib\net47\Crestron.SimplSharpPro.GeneralIO.dll</HintPath>
+      <HintPath>packages\PepperDashEssentials.1.10.11-hotfix-1948\lib\net47\Crestron.SimplSharpPro.GeneralIO.dll</HintPath>
     </Reference>
     <Reference Include="Crestron.SimplSharpPro.Keypads, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <HintPath>packages\Crestron.SimplSharp.SDK.ProgramLibrary.2.18.112\lib\net47\Crestron.SimplSharpPro.Keypads.dll</HintPath>
     </Reference>
     <Reference Include="Crestron.SimplSharpPro.Lighting, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
-      <HintPath>packages\Crestron.SimplSharp.SDK.ProgramLibrary.2.18.112\lib\net47\Crestron.SimplSharpPro.Lighting.dll</HintPath>
+      <HintPath>packages\PepperDashEssentials.1.10.11-hotfix-1948\lib\net47\Crestron.SimplSharpPro.Lighting.dll</HintPath>
     </Reference>
     <Reference Include="Crestron.SimplSharpPro.Media, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <HintPath>packages\Crestron.SimplSharp.SDK.ProgramLibrary.2.18.112\lib\net47\Crestron.SimplSharpPro.Media.dll</HintPath>
     </Reference>
     <Reference Include="Crestron.SimplSharpPro.Remotes, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
-      <HintPath>packages\Crestron.SimplSharp.SDK.ProgramLibrary.2.18.112\lib\net47\Crestron.SimplSharpPro.Remotes.dll</HintPath>
+      <HintPath>packages\PepperDashEssentials.1.10.11-hotfix-1948\lib\net47\Crestron.SimplSharpPro.Remotes.dll</HintPath>
     </Reference>
     <Reference Include="Crestron.SimplSharpPro.Shades, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
-      <HintPath>packages\Crestron.SimplSharp.SDK.ProgramLibrary.2.18.112\lib\net47\Crestron.SimplSharpPro.Shades.dll</HintPath>
+      <HintPath>packages\PepperDashEssentials.1.10.11-hotfix-1948\lib\net47\Crestron.SimplSharpPro.Shades.dll</HintPath>
     </Reference>
     <Reference Include="Crestron.SimplSharpPro.Thermostats, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <HintPath>packages\Crestron.SimplSharp.SDK.ProgramLibrary.2.18.112\lib\net47\Crestron.SimplSharpPro.Thermostats.dll</HintPath>
     </Reference>
     <Reference Include="Crestron.SimplSharpPro.ThreeSeriesCards, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
-      <HintPath>packages\Crestron.SimplSharp.SDK.ProgramLibrary.2.18.112\lib\net47\Crestron.SimplSharpPro.ThreeSeriesCards.dll</HintPath>
+      <HintPath>packages\PepperDashEssentials.1.10.11-hotfix-1948\lib\net47\Crestron.SimplSharpPro.ThreeSeriesCards.dll</HintPath>
     </Reference>
     <Reference Include="Crestron.SimplSharpPro.UC, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <HintPath>packages\Crestron.SimplSharp.SDK.ProgramLibrary.2.18.112\lib\net47\Crestron.SimplSharpPro.UC.dll</HintPath>
     </Reference>
     <Reference Include="Crestron.SimplSharpPro.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
-      <HintPath>packages\Crestron.SimplSharp.SDK.ProgramLibrary.2.18.112\lib\net47\Crestron.SimplSharpPro.UI.dll</HintPath>
+      <HintPath>packages\PepperDashEssentials.1.10.11-hotfix-1948\lib\net47\Crestron.SimplSharpPro.UI.dll</HintPath>
     </Reference>
-    <Reference Include="Essentials Devices Common, Version=1.10.8.31519, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>packages\PepperDashEssentials.1.10.8-hotfix-1917\lib\net47\Essentials Devices Common.dll</HintPath>
+    <Reference Include="Essentials Devices Common, Version=1.10.11.34723, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>packages\PepperDashEssentials.1.10.11-hotfix-1948\lib\net47\Essentials Devices Common.dll</HintPath>
     </Reference>
-    <Reference Include="PepperDashEssentials, Version=1.10.8.31526, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>packages\PepperDashEssentials.1.10.8-hotfix-1917\lib\net47\PepperDashEssentials.dll</HintPath>
+    <Reference Include="PepperDashEssentials, Version=1.10.11.34731, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>packages\PepperDashEssentials.1.10.11-hotfix-1948\lib\net47\PepperDashEssentials.dll</HintPath>
     </Reference>
     <Reference Include="PepperDash_Core, Version=1.1.1.32703, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>packages\PepperDashEssentials.1.10.8-hotfix-1917\lib\net47\PepperDash_Core.dll</HintPath>
+      <HintPath>packages\PepperDashEssentials.1.10.11-hotfix-1948\lib\net47\PepperDash_Core.dll</HintPath>
     </Reference>
-    <Reference Include="PepperDash_Essentials_Core, Version=1.10.8.31514, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>packages\PepperDashEssentials.1.10.8-hotfix-1917\lib\net47\PepperDash_Essentials_Core.dll</HintPath>
+    <Reference Include="PepperDash_Essentials_Core, Version=1.10.11.34717, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>packages\PepperDashEssentials.1.10.11-hotfix-1948\lib\net47\PepperDash_Essentials_Core.dll</HintPath>
     </Reference>
-    <Reference Include="PepperDash_Essentials_DM, Version=1.10.8.31522, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>packages\PepperDashEssentials.1.10.8-hotfix-1917\lib\net47\PepperDash_Essentials_DM.dll</HintPath>
+    <Reference Include="PepperDash_Essentials_DM, Version=1.10.11.34727, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>packages\PepperDashEssentials.1.10.11-hotfix-1948\lib\net47\PepperDash_Essentials_DM.dll</HintPath>
     </Reference>
     <Reference Include="SimplSharpAutoUpdateInterface, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <HintPath>packages\Crestron.SimplSharp.SDK.Library.2.18.112\lib\net47\SimplSharpAutoUpdateInterface.dll</HintPath>
@@ -107,7 +107,7 @@
       <HintPath>packages\Crestron.SimplSharp.SDK.Library.2.18.112\lib\net47\SimplSharpCryptographyInterface.dll</HintPath>
     </Reference>
     <Reference Include="SimplSharpCustomAttributesInterface, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
-      <HintPath>packages\Crestron.SimplSharp.SDK.Library.2.18.112\lib\net47\SimplSharpCustomAttributesInterface.dll</HintPath>
+      <HintPath>packages\PepperDashEssentials.1.10.11-hotfix-1948\lib\net47\SimplSharpCustomAttributesInterface.dll</HintPath>
     </Reference>
     <Reference Include="SimplSharpCWSHelperInterface, Version=2.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <HintPath>packages\Crestron.SimplSharp.SDK.Library.2.18.112\lib\net47\SimplSharpCWSHelperInterface.dll</HintPath>
@@ -116,10 +116,10 @@
       <HintPath>packages\Crestron.SimplSharp.SDK.Library.2.18.112\lib\net47\SimplSharpExchangeWebServices.dll</HintPath>
     </Reference>
     <Reference Include="SimplSharpHelperInterface, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
-      <HintPath>packages\Crestron.SimplSharp.SDK.Library.2.18.112\lib\net47\SimplSharpHelperInterface.dll</HintPath>
+      <HintPath>packages\PepperDashEssentials.1.10.11-hotfix-1948\lib\net47\SimplSharpHelperInterface.dll</HintPath>
     </Reference>
     <Reference Include="SimplSharpNewtonsoft, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
-      <HintPath>packages\Crestron.SimplSharp.SDK.Library.2.18.112\lib\net47\SimplSharpNewtonsoft.dll</HintPath>
+      <HintPath>packages\PepperDashEssentials.1.10.11-hotfix-1948\lib\net47\SimplSharpNewtonsoft.dll</HintPath>
     </Reference>
     <Reference Include="SimplSharpOnvifInterface, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <HintPath>packages\Crestron.SimplSharp.SDK.Library.2.18.112\lib\net47\SimplSharpOnvifInterface.dll</HintPath>
@@ -131,13 +131,13 @@
       <HintPath>packages\Crestron.SimplSharp.SDK.Library.2.18.112\lib\net47\SimplSharpProgrammingInterfaces.dll</HintPath>
     </Reference>
     <Reference Include="SimplSharpReflectionInterface, Version=1.0.5583.25238, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
-      <HintPath>packages\Crestron.SimplSharp.SDK.Library.2.18.112\lib\net47\SimplSharpReflectionInterface.dll</HintPath>
+      <HintPath>packages\PepperDashEssentials.1.10.11-hotfix-1948\lib\net47\SimplSharpReflectionInterface.dll</HintPath>
     </Reference>
     <Reference Include="SimplSharpSQLHelperInterface, Version=1.0.92.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
-      <HintPath>packages\Crestron.SimplSharp.SDK.Library.2.18.112\lib\net47\SimplSharpSQLHelperInterface.dll</HintPath>
+      <HintPath>packages\PepperDashEssentials.1.10.11-hotfix-1948\lib\net47\SimplSharpSQLHelperInterface.dll</HintPath>
     </Reference>
     <Reference Include="SimplSharpTimerEventInterface, Version=1.0.6197.20052, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
-      <HintPath>packages\Crestron.SimplSharp.SDK.Library.2.18.112\lib\net47\SimplSharpTimerEventInterface.dll</HintPath>
+      <HintPath>packages\PepperDashEssentials.1.10.11-hotfix-1948\lib\net47\SimplSharpTimerEventInterface.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/4-series/packages.config b/4-series/packages.config
@@ -3,6 +3,6 @@
   <package id="Crestron.SimplSharp.SDK.Library" version="2.18.112" targetFramework="net48" />
   <package id="Crestron.SimplSharp.SDK.ProgramLibrary" version="2.18.112" targetFramework="net48" />
   <package id="PepperDashCore" version="1.1.2" targetFramework="net48" />
-  <package id="PepperDashEssentials" version="1.10.8-hotfix-1917" targetFramework="net48" />
+  <package id="PepperDashEssentials" version="1.10.11-hotfix-1948" targetFramework="net48" />
   <package id="WebSocketSharp-netstandard" version="1.0.1" targetFramework="net47" />
 </packages>