Merge branch 'main' into hotfix/SIMPL-bridge-updates

PepperDash · Sep 23, 2022 · c5bd2b5 · c5bd2b5
2 parents cc9675d + 568b05d
commit c5bd2b5
Show file tree

Hide file tree

Showing 6 changed files with 61 additions and 54 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -16,7 +16,7 @@ env:
   # Do not edit this, we're just creating it here
   VERSION: 0.0.0-buildtype-buildnumber
   # Defaults to debug for build type
-  BUILD_TYPE: Debug
+  BUILD_TYPE: Release
   # Defaults to master as the release branch.  Change as necessary
   RELEASE_BRANCH: main
 jobs:
@@ -118,7 +118,7 @@ jobs:
         with:
           tag_name: ${{ env.VERSION  }}
           release_name: ${{ env.VERSION }}
-          prerelease: ${{contains('debug', env.BUILD_TYPE)}}
+          prerelease: true
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       # Upload the build package to the release
@@ -202,7 +202,7 @@ jobs:
       - name: Build Solution
         shell: powershell
         run: |
-          msbuild ./4-series/$($Env:SOLUTION_FILE).sln /p:platform="Any CPU" /p:configuration="Debug"
+          msbuild ./4-series/$($Env:SOLUTION_FILE).sln /p:platform="Any CPU" /p:configuration="Release"
       # Zip up the output files as needed
       - name: Zip Build Output
         shell: powershell
@@ -265,7 +265,7 @@ jobs:
         with:
           tag_name: ${{ env.VERSION  }}-4-Series
           release_name: ${{ env.VERSION }}-4-Series
-          prerelease: ${{contains('debug', env.BUILD_TYPE)}}
+          prerelease: true
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       # Upload the build package to the release

diff --git a/3-series/MobileControlFactory.cs b/3-series/MobileControlFactory.cs
@@ -14,7 +14,7 @@ public class MobileControlFactory : EssentialsPluginDeviceFactory<MobileControlS
     {
         public MobileControlFactory()
         {
-            MinimumEssentialsFrameworkVersion = "1.10.1";
+            MinimumEssentialsFrameworkVersion = "1.10.8";
             TypeNames = new List<string> {"appserver", "mobilecontrol", "webserver" };
         }
 
@@ -37,7 +37,7 @@ public class MobileControlSimplFactory : EssentialsPluginDeviceFactory<MobileCon
     {
         public MobileControlSimplFactory()
         {
-            MinimumEssentialsFrameworkVersion = "1.10.1";
+            MinimumEssentialsFrameworkVersion = "1.10.8";
             TypeNames = new List<string> {"mobilecontrolbridge-ddvc01", "mobilecontrolbridge-simpl"};
         }
 

diff --git a/3-series/RoomBridges/MobileControlEssentialsRoomBridge.cs b/3-series/RoomBridges/MobileControlEssentialsRoomBridge.cs
@@ -9,6 +9,7 @@
 using PepperDash.Essentials.Core.Config;
 using PepperDash.Essentials.Core.DeviceTypeInterfaces;
 using PepperDash.Essentials.Room.MobileControl;
+using PepperDash.Essentials.Room.Config;
 using PepperDash.Essentials.Devices.Common.VideoCodec;
 using PepperDash.Essentials.Devices.Common.AudioCodec;
 using PepperDash.Essentials.Devices.Common.Cameras;
@@ -779,16 +780,20 @@ private RoomConfiguration GetRoomConfiguration(IEssentialsRoom room)
         {
             var configuration = new RoomConfiguration();
 
+
             var huddleRoom = room as IEssentialsHuddleSpaceRoom;
             if (huddleRoom != null && !string.IsNullOrEmpty(huddleRoom.PropertiesConfig.HelpMessageForDisplay))
             {
                 configuration.HelpMessage = huddleRoom.PropertiesConfig.HelpMessageForDisplay;
+                configuration.UiBehavior = huddleRoom.PropertiesConfig.UiBehavior;
+
             }
 
             var vtc1Room = room as IEssentialsHuddleVtc1Room;
             if (vtc1Room != null && !string.IsNullOrEmpty(vtc1Room.PropertiesConfig.HelpMessageForDisplay))
             {
                 configuration.HelpMessage = vtc1Room.PropertiesConfig.HelpMessageForDisplay;
+                configuration.UiBehavior = vtc1Room.PropertiesConfig.UiBehavior;
             }
 
             var techRoom = room as EssentialsTechRoom;
@@ -972,8 +977,10 @@ public class RoomConfiguration
         [JsonProperty("helpMessage", NullValueHandling = NullValueHandling.Ignore)]
         public string HelpMessage { get; set; }
 
+        [JsonProperty("uiBehavior", NullValueHandling = NullValueHandling.Ignore)]
+        public EssentialsRoomUiBehaviorConfig UiBehavior { get; set; }
 
-        public RoomConfiguration()
+public RoomConfiguration()
         {
             DisplayKeys = new List<string>();
             EnvironmentalDevices = new List<EnvironmentalDeviceConfiguration>();