倒计时显示优化

VIZ.FGOUT/VIZ.FGOUT.Module/NDIMainView/ViewModel/NDIMainViewModel.cs

@@ -241,8 +241,11 @@ namespace VIZ.FGOUT.Module
 
 
             //Refresh();
             //Refresh();
 
 
-            TimeCountActVisibility = Visibility.Visible;
-            TimeCountDefaultVisibility = Visibility.Collapsed;
+            WPFHelper.BeginInvoke(() =>
+            {
+                TimeCountActVisibility = Visibility.Visible;
+                TimeCountDefaultVisibility = Visibility.Collapsed;
+            });
         }
         }
 
 
         #region 自动发送倒计时器
         #region 自动发送倒计时器
@@ -1121,6 +1124,9 @@ namespace VIZ.FGOUT.Module
             var manager = ConnectionManager.UdpConnection.GetEndpointManager(NDIViewKeys.CAM_1__CLIP);
             var manager = ConnectionManager.UdpConnection.GetEndpointManager(NDIViewKeys.CAM_1__CLIP);
             if (manager == null) return;
             if (manager == null) return;
             manager.SendJson(replayPackage);
             manager.SendJson(replayPackage);
+
+            TimeCountActVisibility = Visibility.Collapsed;
+            TimeCountDefaultVisibility = Visibility.Visible;
         }
         }
 
 
         #endregion
         #endregion

VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/View/NDIView.xaml.cs

-using System;
+using log4net;
+using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Windows;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Controls;
@@ -18,7 +19,12 @@ namespace VIZ.FGOUT.Module
     /// </summary>
     /// </summary>
     public partial class NDIView : UserControl
     public partial class NDIView : UserControl
     {
     {
-       public NDIViewModel vm = new NDIViewModel();
+        /// <summary>
+        /// 日志
+        /// </summary>
+        private static ILog log = LogManager.GetLogger(typeof(NDIView));
+
+        public NDIViewModel vm = new NDIViewModel();
 
 
        // Rectangle rectStart = new Rectangle();
        // Rectangle rectStart = new Rectangle();
 
 
@@ -387,23 +393,34 @@ namespace VIZ.FGOUT.Module
                     //当有跟踪框的时候，就不用拖一个出来了
                     //当有跟踪框的时候，就不用拖一个出来了
                     if (NDIViewModel._cam3StaticInfos.Count > 0)
                     if (NDIViewModel._cam3StaticInfos.Count > 0)
                     {
                     {
-                        foreach (var info in NDIViewModel._cam3StaticInfos)
+                        try
                         {
                         {
-                            if (info.SrcRect.Left >= 0 && info.SrcRect.Right >= 0 && info.SrcRect.Top >= 0 && info.SrcRect.Bottom >= 0)
+                            foreach (var info in NDIViewModel._cam3StaticInfos)
                             {
                             {
-                                //计算四个方向到点的距离取绝对值
-                                //var difference = Math.Abs(x - info.SrcRect.Left) + Math.Abs(info.SrcRect.Right - x)
-                                //    + Math.Abs(y - info.SrcRect.Top) + Math.Abs(info.SrcRect.Bottom - y);
-                                //计算点到矩形中心点的距离的绝对值
-                                //var difference = Math.Abs(x - (info.SrcRect.Right - info.SrcRect.Left)) + Math.Abs(y - (info.SrcRect.Bottom - info.SrcRect.Top));
-                                var difference = Math.Sqrt(Math.Pow((((info.SrcRect.Right + info.SrcRect.Left)) / 2 - x), 2.0) + Math.Pow(((info.SrcRect.Bottom + info.SrcRect.Top) / 2 - y), 2.0));
-                                if (difference < minDistance)
+                                if (info.SrcRect.Left >= 0 && info.SrcRect.Right >= 0 && info.SrcRect.Top >= 0 &&
+                                    info.SrcRect.Bottom >= 0)
                                 {
                                 {
-                                    saveInfo = info;
-                                    minDistance = difference;
+                                    //计算四个方向到点的距离取绝对值
+                                    //var difference = Math.Abs(x - info.SrcRect.Left) + Math.Abs(info.SrcRect.Right - x)
+                                    //    + Math.Abs(y - info.SrcRect.Top) + Math.Abs(info.SrcRect.Bottom - y);
+                                    //计算点到矩形中心点的距离的绝对值
+                                    //var difference = Math.Abs(x - (info.SrcRect.Right - info.SrcRect.Left)) + Math.Abs(y - (info.SrcRect.Bottom - info.SrcRect.Top));
+                                    var difference =
+                                        Math.Sqrt(Math.Pow((((info.SrcRect.Right + info.SrcRect.Left)) / 2 - x), 2.0) +
+                                                  Math.Pow(((info.SrcRect.Bottom + info.SrcRect.Top) / 2 - y), 2.0));
+                                    if (difference < minDistance)
+                                    {
+                                        saveInfo = info;
+                                        minDistance = difference;
+                                    }
                                 }
                                 }
                             }
                             }
                         }
                         }
+                        catch (Exception ex)
+                        {
+                            log.Error(ex);
+                            return;
+                        }
                     }
                     }
                     var gameName = ApplicationDomainEx.LiteDbContext.ViewConfig.FindOne(p => p.ViewKey == NDIViewKeys.CAM_1).GameName;
                     var gameName = ApplicationDomainEx.LiteDbContext.ViewConfig.FindOne(p => p.ViewKey == NDIViewKeys.CAM_1).GameName;
                     //当双人3m跳水,双人10m跳水,双人速度攀岩时，保存2个入点框
                     //当双人3m跳水,双人10m跳水,双人速度攀岩时，保存2个入点框