Merge branch 'development' into hotfix/zoom-room-views

Hotfix/plugin loading

essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/DeviceJsonApi.cs

@@ -77,10 +77,9 @@ namespace PepperDash.Essentials.Core
                 var mParams = method.GetParameters();
 
                 var convertedParams = mParams
-                                    .Select((p, i) => Convert.ChangeType(action.Params[i], p.ParameterType,
-                                        System.Globalization.CultureInfo.InvariantCulture))
+                                    .Select((p, i) => ConvertType(action.Params[i], p.ParameterType))
                                     .ToArray();
-                var ret = method.Invoke(obj, convertedParams);
+                method.Invoke(obj, convertedParams);
 
 		        CrestronConsole.ConsoleCommandResponse("Method {0} successfully called on device {1}", method.Name,
 		            action.DeviceKey);
@@ -91,6 +90,23 @@ namespace PepperDash.Essentials.Core
 		            ex.Message);}
 		}
 
+	    private static object ConvertType(object value, Type conversionType)
+	    {
+	        if (!conversionType.IsEnum)
+	        {
+	            return Convert.ChangeType(value, conversionType, System.Globalization.CultureInfo.InvariantCulture);
+	        }
+
+	        var stringValue = Convert.ToString(value);
+
+	        if (String.IsNullOrEmpty(stringValue))
+	        {
+	            throw new InvalidCastException(
+	                String.Format("{0} cannot be converted to a string prior to conversion to enum"));
+	        }
+	        return Enum.Parse(conversionType, stringValue, true);
+	    }
+
 		/// <summary>
 		/// Gets the properties on a device
 		/// </summary>
@@ -275,6 +291,8 @@ namespace PepperDash.Essentials.Core
             //var props = t.GetProperties().Select(p => new PropertyNameType(p, obj));
             //return JsonConvert.SerializeObject(props, Formatting.Indented);
         }
+
+        
 	}
 
 	public class DeviceActionWrapper

essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/DeviceManager.cs

@@ -435,7 +435,7 @@ namespace PepperDash.Essentials.Core
                     var min = Convert.ToUInt32(timeout);
 
                     device.StreamDebugging.SetDebuggingWithSpecificTimeout(debugSetting, min);
-                    Debug.Console(0, "Device: '{0}' debug level set to {1) for {2} minutes", deviceKey, debugSetting, min);
+                    Debug.Console(0, "Device: '{0}' debug level set to {1} for {2} minutes", deviceKey, debugSetting, min);
 
                 }
                 catch (Exception e)

essentials-framework/Essentials Core/PepperDashEssentialsBase/Plugins/PluginLoader.cs

@@ -375,7 +375,7 @@ namespace PepperDash.Essentials
                     {
                         try
                         {
-                            if (typeof (IPluginDeviceFactory).IsAssignableFrom(type))
+                            if (typeof (IPluginDeviceFactory).IsAssignableFrom(type) && !type.IsAbstract)
                             {
                                 var plugin =
                                     (IPluginDeviceFactory) Crestron.SimplSharp.Reflection.Activator.CreateInstance(type);

essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ResponseObjects.cs

@@ -1454,16 +1454,16 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 			{
 				if (participants == null)
 				{
-					Debug.Console(1, "SortParticiapntListByHandStatu(participants == null)");
+					//Debug.Console(1, "SortParticiapntListByHandStatu(participants == null)");
 					return null;
 				}
 
 				// debug testing
-				foreach (ListParticipant participant in participants)
-				{
-					Debug.Console(1, "{0} | IsValid: {1} | IsRaiseHand: {2} | HandIsRaisedAndValid: {3}", 
-						participant.UserName, participant.HandStatus.IsValid, participant.HandStatus.IsRaiseHand.ToString(), participant.HandStatus.HandIsRaisedAndValid.ToString());
-				}
+				//foreach (ListParticipant participant in participants)
+				//{
+				//    Debug.Console(1, "{0} | IsValid: {1} | IsRaiseHand: {2} | HandIsRaisedAndValid: {3}", 
+				//        participant.UserName, participant.HandStatus.IsValid, participant.HandStatus.IsRaiseHand.ToString(), participant.HandStatus.HandIsRaisedAndValid.ToString());
+				//}
 
 				List<ListParticipant> handRaisedParticipantsList = participants.Where(p => p.HandStatus.HandIsRaisedAndValid).ToList();
 
@@ -1471,8 +1471,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 				{
 					IOrderedEnumerable<ListParticipant> orderByDescending = handRaisedParticipantsList.OrderByDescending(p => p.HandStatus.TimeStamp);
 
-					foreach (var participant in handRaisedParticipantsList)
-						Debug.Console(1, "handRaisedParticipantList: {0} | {1}", participant.UserName, participant.UserId);
+					//foreach (var participant in handRaisedParticipantsList)
+					//    Debug.Console(1, "handRaisedParticipantList: {0} | {1}", participant.UserName, participant.UserId);
 				}
 
 				List<ListParticipant> allOtherParticipantsList = participants.Where(p => !p.HandStatus.HandIsRaisedAndValid).ToList();
@@ -1481,8 +1481,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 				{
 					allOtherParticipantsList.OrderBy(p => p.UserName);
 
-					foreach (var participant in allOtherParticipantsList)
-						Debug.Console(1, "allOtherParticipantsList: {0} | {1}", participant.UserName, participant.UserId);
+					//foreach (var participant in allOtherParticipantsList)
+					//    Debug.Console(1, "allOtherParticipantsList: {0} | {1}", participant.UserName, participant.UserId);
 				}
 
 				// merge the lists

essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs

@@ -1347,16 +1347,21 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
                                         Debug.Console(1, this, "Pin Status notification for UserId: {0}, ScreenIndex: {1}", status.PinnedUserId, status.ScreenIndex);
 
-                                        // Check for a participant already pinned to the same screen index.
-                                        var alreadyPinnedParticipant = Participants.CurrentParticipants.FirstOrDefault(p => p.ScreenIndexIsPinnedToFb.Equals(status.ScreenIndex));
+                                        Participant alreadyPinnedParticipant = null;
 
-                                        // Make sure that the already pinned participant isn't the same ID as for this message.  If true, clear the pinned fb.
-                                        if (alreadyPinnedParticipant != null && alreadyPinnedParticipant.UserId != status.PinnedUserId)
+                                        // Check for a participant already pinned to the same screen index.
+                                        if (status.PinnedUserId > 0)
                                         {
-                                            Debug.Console(1, this, "Participant: {0} with id: {1} already pinned to screenIndex {2}.  Clearing pinned fb.",
-                                                alreadyPinnedParticipant.Name, alreadyPinnedParticipant.UserId, alreadyPinnedParticipant.ScreenIndexIsPinnedToFb);
-                                            alreadyPinnedParticipant.IsPinnedFb = false;
-                                            alreadyPinnedParticipant.ScreenIndexIsPinnedToFb = -1;
+                                            alreadyPinnedParticipant = Participants.CurrentParticipants.FirstOrDefault(p => p.ScreenIndexIsPinnedToFb.Equals(status.ScreenIndex));
+
+                                            // Make sure that the already pinned participant isn't the same ID as for this message.  If true, clear the pinned fb.
+                                            if (alreadyPinnedParticipant != null && alreadyPinnedParticipant.UserId != status.PinnedUserId)
+                                            {
+                                                Debug.Console(1, this, "Participant: {0} with id: {1} already pinned to screenIndex {2}.  Clearing pinned fb.",
+                                                    alreadyPinnedParticipant.Name, alreadyPinnedParticipant.UserId, alreadyPinnedParticipant.ScreenIndexIsPinnedToFb);
+                                                alreadyPinnedParticipant.IsPinnedFb = false;
+                                                alreadyPinnedParticipant.ScreenIndexIsPinnedToFb = -1;
+                                            }
                                         }
 
 										var participant = Participants.CurrentParticipants.FirstOrDefault(p => p.UserId.Equals(status.PinnedUserId));
@@ -1370,12 +1375,12 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 										{
 											participant = Participants.CurrentParticipants.FirstOrDefault(p => p.ScreenIndexIsPinnedToFb.Equals(status.ScreenIndex));
 
-											if (participant == null)
+											if (participant == null && alreadyPinnedParticipant == null)
 											{
 												Debug.Console(1, this, "no matching participant found by pinned_user_id: {0} or screen_index: {1}", status.PinnedUserId, status.ScreenIndex);
 												return;
 											}
-											else
+											else if (participant != null)
 											{
                                                 Debug.Console(2, this, "Unpinning {0} with id: {1} from screen index: {2}", participant.Name, participant.UserId, status.ScreenIndex);
 												participant.IsPinnedFb = false;
@@ -1812,9 +1817,10 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 					trilist.SetString(joinMap.LayoutStripIsAvailable.JoinNumber, zConfiguration.eLayoutStyle.Strip.ToString());
 					trilist.SetString(joinMap.LayoutShareAllIsAvailable.JoinNumber, zConfiguration.eLayoutStyle.ShareAll.ToString());
 				};
+				
+				trilist.SetSigFalseAction(joinMap.SwapContentWithThumbnail.JoinNumber, () => layoutsCodec.SwapContentWithThumbnail());
 
 				layoutsCodec.CanSwapContentWithThumbnailFeedback.LinkInputSig(trilist.BooleanInput[joinMap.CanSwapContentWithThumbnail.JoinNumber]);
-				trilist.SetSigFalseAction(joinMap.SwapContentWithThumbnail.JoinNumber, () => layoutsCodec.SwapContentWithThumbnail());
 				layoutsCodec.ContentSwappedWithThumbnailFeedback.LinkInputSig(trilist.BooleanInput[joinMap.SwapContentWithThumbnail.JoinNumber]);
 
 				layoutsCodec.LayoutViewIsOnFirstPageFeedback.LinkInputSig(trilist.BooleanInput[joinMap.LayoutIsOnFirstPage.JoinNumber]);
@@ -1874,7 +1880,12 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 			{
 				if (!args.DeviceOnLine) return;
 
-				layoutsCodec.LocalLayoutFeedback.FireUpdate();
+				ComputeAvailableLayouts();
+				layoutsCodec.LocalLayoutFeedback.FireUpdate();								
+				layoutsCodec.CanSwapContentWithThumbnailFeedback.FireUpdate();
+				layoutsCodec.ContentSwappedWithThumbnailFeedback.FireUpdate();
+				layoutsCodec.LayoutViewIsOnFirstPageFeedback.FireUpdate();
+				layoutsCodec.LayoutViewIsOnLastPageFeedback.FireUpdate();
 				pinCodec.NumberOfScreensFeedback.FireUpdate();
 				layoutSizeCodec.SelfviewPipSizeFeedback.FireUpdate();
 			};
@@ -2381,7 +2392,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 				availableLayouts |= zConfiguration.eLayoutStyle.Strip;
 			}
 
-			Debug.Console(1, this, "Available layouts: {0}", availableLayouts);
+			Debug.Console(1, this, "availablelayouts: {0}", availableLayouts);			
 
 			var handler = AvailableLayoutsChanged;
 			if (handler != null)

packages.config

@@ -1,3 +1,3 @@
 <packages>
-  <package id="PepperDashCore" version="1.0.47-hotfix-207" targetFramework="net35" allowedVersions="[1.0,1.1)"/>
+  <package id="PepperDashCore" version="1.0.47" targetFramework="net35" allowedVersions="[1.0,1.1)"/>
 </packages>