Merge pull request #206 from xibosignage/release/wolf

Release v2 R257

InfoScreen.xaml.cs

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2020 Xibo Signage Ltd
+ * Copyright (C) 2021 Xibo Signage Ltd
  *
  * Xibo - Digital Signage - http://www.xibo.org.uk
  *

Logic/ApplicationSettings.cs

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2020 Xibo Signage Ltd
+ * Copyright (C) 2021 Xibo Signage Ltd
  *
  * Xibo - Digital Signage - http://www.xibo.org.uk
  *
@@ -50,9 +50,9 @@ private static readonly Lazy<ApplicationSettings>
         /// </summary>
         private List<string> ExcludedProperties;
 
-        public string ClientVersion { get; } = "2 R256.7";
+        public string ClientVersion { get; } = "2 R257.1";
         public string Version { get; } = "5";
-        public int ClientCodeVersion { get; } = 256;
+        public int ClientCodeVersion { get; } = 257;
 
         private ApplicationSettings()
         {
@@ -579,6 +579,7 @@ public bool InDownloadWindow
         public bool PreventSleep { get; set; }
         public bool ScreenShotRequested { get; set; }
         public bool FallbackToInternetExplorer { get; set; }
+        public bool IsRecordGeoLocationOnProofOfPlay { get; set; }
 
         // XMDS Status Flags
         private DateTime _xmdsLastConnection;

Logic/CacheManager.cs

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2020 Xibo Signage Ltd
+ * Copyright (C) 2021 Xibo Signage Ltd
  *
  * Xibo - Digital Signage - http://www.xibo.org.uk
  *
@@ -19,6 +19,7 @@
  * along with Xibo.  If not, see <http://www.gnu.org/licenses/>.
  */
 using System;
+using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Diagnostics;
 using System.IO;
@@ -51,6 +52,10 @@ public static CacheManager Instance
         /// </summary>
         private Collection<UnsafeItem> _unsafeItems = new Collection<UnsafeItem>();
 
+        /// <summary>
+        /// List of layout durations
+        /// </summary>
+        private Dictionary<int, int> _layoutDurations = new Dictionary<int, int>();
 
         private CacheManager()
         {
@@ -480,6 +485,38 @@ private string UnsafeListAsString()
         }
 
         #endregion
+
+        #region Layout Durations
+
+        /// <summary>
+        /// Record Layout Duration
+        /// </summary>
+        /// <param name="layoutId"></param>
+        /// <param name="duration"></param>
+        public void RecordLayoutDuration(int layoutId, int duration)
+        {
+            _layoutDurations[layoutId] = duration;
+        }
+
+        /// <summary>
+        /// Get Layout Duration
+        /// </summary>
+        /// <param name="layoutId"></param>
+        /// <param name="defaultValue"></param>
+        /// <returns></returns>
+        public int GetLayoutDuration(int layoutId, int defaultValue)
+        {
+            if (_layoutDurations.ContainsKey(layoutId))
+            {
+                return _layoutDurations[layoutId];
+            }
+            else
+            {
+                return defaultValue;
+            }
+        }
+
+        #endregion
     }
 
     /// <summary>