音视频贴图结束，开始倒计时 And 二次确认自动发送音视频贴图开始时间戳

VIZ.FGOUT/VIZ.FGOUT.Connection/UDP/Algorithm/AlgorithmPackageProvider.cs

@@ -49,6 +49,10 @@ namespace VIZ.FGOUT.Connection
                 try
                 try
                 {
                 {
                     AlgorithmPackageBase @base = Newtonsoft.Json.JsonConvert.DeserializeObject<AlgorithmPackageBase>(info.Json);
                     AlgorithmPackageBase @base = Newtonsoft.Json.JsonConvert.DeserializeObject<AlgorithmPackageBase>(info.Json);
+                    if(@base.signal == "MaskMsg" || @base.signal == "ReplayResp")
+                    {
+                        log.Info(info.Json);
+                    }
                     foreach (IAlgorithmPackageProvider provider in this.providers)
                     foreach (IAlgorithmPackageProvider provider in this.providers)
                     {
                     {
                         if (string.Equals(provider.Signal, @base.signal))
                         if (string.Equals(provider.Signal, @base.signal))

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

@@ -11,7 +11,6 @@ using System.Threading.Tasks;
 using System.Windows;
 using System.Windows;
 using System.Windows.Input;
 using System.Windows.Input;
 using System.Windows.Interop;
 using System.Windows.Interop;
-using System.Windows.Threading;
 using VIZ.FGOUT.Connection;
 using VIZ.FGOUT.Connection;
 using VIZ.FGOUT.Connection.UDP.Clip.Signal.Send;
 using VIZ.FGOUT.Connection.UDP.Clip.Signal.Send;
 using VIZ.FGOUT.Domain;
 using VIZ.FGOUT.Domain;
@@ -251,16 +250,18 @@ namespace VIZ.FGOUT.Module
 
 
         private void OnClipMessage__MaskMsg(ClipMessage__MaskMsg msg)
         private void OnClipMessage__MaskMsg(ClipMessage__MaskMsg msg)
         {
         {
-            if (msg?.data?.status == 3)
+            if (msg?.data?.status == 1)
             {
             {
                 var config = ApplicationDomainEx.LiteDbContext.AlgorithmSaveMatImage.FindAll().FirstOrDefault();
                 var config = ApplicationDomainEx.LiteDbContext.AlgorithmSaveMatImage.FindAll().FirstOrDefault();
                 if (config == null) config = new AlgorithmSaveMatImage();
                 if (config == null) config = new AlgorithmSaveMatImage();
                 config.start = msg.data.timestamp;
                 config.start = msg.data.timestamp;
                 ApplicationDomainEx.LiteDbContext.AlgorithmSaveMatImage.Upsert(config);
                 ApplicationDomainEx.LiteDbContext.AlgorithmSaveMatImage.Upsert(config);
-
+            }
+            else if(msg?.data?.status == 3)
+            {
                 WPFHelper.BeginInvoke(() =>
                 WPFHelper.BeginInvoke(() =>
                 {
                 {
-                    AutoSendCount = AutoSendIntervalTime;
+                    AutoSendCount = AutoSendIntervalTime - 1;
                     _autoSend_Timer.Stop();
                     _autoSend_Timer.Stop();
                     _autoSend_Timer.Start();
                     _autoSend_Timer.Start();
                 });
                 });
@@ -491,6 +492,7 @@ namespace VIZ.FGOUT.Module
                 {
                 {
                     if (AutoSendCount == 0)
                     if (AutoSendCount == 0)
                     {
                     {
+                        AutoSend();
                         //if (_count == 1)
                         //if (_count == 1)
                         _autoSend_Timer.Stop();
                         _autoSend_Timer.Stop();
                         //else
                         //else
@@ -1226,6 +1228,11 @@ namespace VIZ.FGOUT.Module
             AutoSendCount = AutoSendIntervalTime;
             AutoSendCount = AutoSendIntervalTime;
         }
         }
 
 
+        private void AutoSend()
+        {
+            ApplicationDomain.MessageManager.Send(_reconfirmSendModel);
+        }
+
         private Visibility _timeCountDefaultVisibility = Visibility.Visible;
         private Visibility _timeCountDefaultVisibility = Visibility.Visible;
         /// <summary>
         /// <summary>
         /// 倒计时默认
         /// 倒计时默认

VIZ.FGOUT/VIZ.FGOUT/Properties/AssemblyInfo.cs

@@ -55,5 +55,5 @@ using System.Windows;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.6.0")]
-[assembly: AssemblyFileVersion("1.0.6.0")]
+[assembly: AssemblyVersion("1.0.7.0")]
+[assembly: AssemblyFileVersion("1.0.7.0")]