Replay播放时判断标完入点位置框之后入点是否又移动了

VIZ.FGOUT/VIZ.FGOUT.Common/obj/x64/Debug/GeneratedInternalTypeHelper.g.cs

-
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码由工具生成。
+//     运行时版本:4.0.30319.42000
+//
+//     对此文件的更改可能会导致不正确的行为，并且如果
+//     重新生成代码，这些更改将会丢失。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace XamlGeneratedNamespace {
+    
+    
+    /// <summary>
+    /// GeneratedInternalTypeHelper
+    /// </summary>
+    [System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
+    [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
+    public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper {
+        
+        /// <summary>
+        /// CreateInstance
+        /// </summary>
+        protected override object CreateInstance(System.Type type, System.Globalization.CultureInfo culture) {
+            return System.Activator.CreateInstance(type, ((System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic) 
+                            | (System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.CreateInstance)), null, null, culture);
+        }
+        
+        /// <summary>
+        /// GetPropertyValue
+        /// </summary>
+        protected override object GetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, System.Globalization.CultureInfo culture) {
+            return propertyInfo.GetValue(target, System.Reflection.BindingFlags.Default, null, null, culture);
+        }
+        
+        /// <summary>
+        /// SetPropertyValue
+        /// </summary>
+        protected override void SetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, object value, System.Globalization.CultureInfo culture) {
+            propertyInfo.SetValue(target, value, System.Reflection.BindingFlags.Default, null, null, culture);
+        }
+        
+        /// <summary>
+        /// CreateDelegate
+        /// </summary>
+        protected override System.Delegate CreateDelegate(System.Type delegateType, object target, string handler) {
+            return ((System.Delegate)(target.GetType().InvokeMember("_CreateDelegate", (System.Reflection.BindingFlags.InvokeMethod 
+                            | (System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)), null, target, new object[] {
+                        delegateType,
+                        handler}, null)));
+        }
+        
+        /// <summary>
+        /// AddEventHandler
+        /// </summary>
+        protected override void AddEventHandler(System.Reflection.EventInfo eventInfo, object target, System.Delegate handler) {
+            eventInfo.AddEventHandler(target, handler);
+        }
+    }
+}
 

VIZ.FGOUT/VIZ.FGOUT.Common/obj/x64/Debug/VIZ.FGOUT.Common_MarkupCompile.cache

@@ -10,11 +10,11 @@ none
 false
 
 
-21870986562
+2-725104376
 
-31364711570
-17-1683084370
+3947974750
+17-1462717611
 Themes\Generic.xaml;Widgets\FootballFieldPanel\FootballFieldPanel.xaml;
 
-False
+True
 

VIZ.FGOUT/VIZ.FGOUT.Module.Resource/obj/x64/Debug/VIZ.FGOUT.Module.Resource_MarkupCompile.cache

@@ -10,11 +10,11 @@ none
 false
 DEBUG;TRACE
 
-221979955803
-1470602451
-11-350624472
-24-1321085892
+22-1578589972
+1-1441241311
+11-1602666439
+23-2035776870
 Resources\StringResource.zh-CN.xaml;Resources\StringResource.en.xaml;Style\Button\Button_NdiView.xaml;Style\Button\Button_Setting.xaml;Style\Button\Button_WindowTop.xaml;Style\CheckBox\CheckBox_NdiView.xaml;Style\CheckBox\CheckBox_RaidoButtonStyle.xaml;Style\CheckBox\CheckBox_Setting.xaml;Style\CheckBox\CheckBox_WindowTop.xaml;Style\ComboBox\ComboBox_Setting.xaml;Style\HotkeyBox\HotkeyBox_Setting.xaml;Style\MessageBox\MessageBoxEx.xaml;Style\RadioButton\RadioButton_FootballSide.xaml;Style\RadioButton\RadioButton_NdiMainViewBlue.xaml;Style\RadioButton\RadioButton_NdiView.xaml;Style\RadioButton\RadioButton_Setting.xaml;Style\Slider\Slider_Setting.xaml;Style\TextBlock\TextBlock_Setting.xaml;Style\TextBox\TextBox_Setting.xaml;Style\ToogleButton\ToogleButton_Setting.xaml;Themes\Generic.xaml;Toolkit\NumericUpDown\NumericUpDown.xaml;
 
-False
+True
 

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

@@ -405,6 +405,8 @@ namespace VIZ.FGOUT.Module
                                     //    + 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));

VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/ViewModel/NDIViewModel.Manual_NDI.cs

@@ -198,10 +198,10 @@ namespace VIZ.FGOUT.Module
                 {
                     view.vm.IsReplayStarted = false;
 
-                    if(view.vm.ReplayInPointStartTime > 0)
-                        StartTime = view.vm.ReplayInPointStartTime;
-                    if(view.vm.ReplayOutPointEndTime > 0)
-                        EndTime = view.vm.ReplayOutPointEndTime;
+                    //if(view.vm.ReplayInPointStartTime > 0)
+                    //    StartTime = view.vm.ReplayInPointStartTime;
+                    //if(view.vm.ReplayOutPointEndTime > 0)
+                    //    EndTime = view.vm.ReplayOutPointEndTime;
 
                     //if (view.vm.IsSliderValueChanged)
                     //{
@@ -371,6 +371,9 @@ namespace VIZ.FGOUT.Module
                                             }
                                         }
                                         //view3.video.UpdateTrackingBox(_cam3UpdateInfos);
+
+                                        //记录标红框时入点时间戳
+                                        _RecordStartTime = StartTime;
                                     }
                                     else
                                     {
@@ -382,6 +385,9 @@ namespace VIZ.FGOUT.Module
                                             //把选中框的信息也加到这个集合里
                                             _cam3Infos.Add(info);
                                             //view3.video.UpdateTrackingBox(new List<TrackingBoxInfo>(){ info });
+
+                                            //记录标红框时入点时间戳
+                                            _RecordStartTime = StartTime;
                                         }
                                     }
                                     //先清除跟踪框

VIZ.FGOUT/VIZ.FGOUT.Module/NDIView/ViewModel/NDIViewModel.cs

@@ -71,7 +71,7 @@ namespace VIZ.FGOUT.Module
             //初始化算法
             // this.InitAlgorithm();
 
-            // 初始化定时器
+            // 初始化计时器
             InitTimer();
 
             // 初始化二次确认自动发送定时器
@@ -263,6 +263,7 @@ namespace VIZ.FGOUT.Module
             //单人项目
             if (nDIView.rectsReplay.Count > 0 && nDIView.rectsReplay[0].Width > 0 && nDIView.rectsReplay[0].Height > 0)
             {
+                if (InPointIsMoved()) return; //入点和入点标记框位置不一致，返回
                 inPoints = Coordinate(nDIView.rectsReplay, srcWidth, srcHeight);
                 isInPoint = true;
             }
@@ -271,6 +272,7 @@ namespace VIZ.FGOUT.Module
             {
                 if (nDIView.saveInfos.Count == 2)
                 {
+                    if (InPointIsMoved()) return; //入点和入点标记框位置不一致，返回
                     inPoints = CoordinateTrackingBoxInfos(nDIView.saveInfos, srcWidth, srcHeight);
                     isInPoint = true;
                 }
@@ -312,6 +314,20 @@ namespace VIZ.FGOUT.Module
             //MessageBoxEx.ShowDialog("Replay Start OK.");
         }
 
+        /// <summary>
+        /// 判断标完入点位置框之后入点是否又移动了
+        /// </summary>
+        private bool InPointIsMoved()
+        {
+            if (_RecordStartTime != StartTime)
+            {
+                MessageBoxEx.ShowDialog("入点和入点标记框位置不一致。");
+                return true;
+            }
+
+            return false;
+        }
+
         private void CleanInPoints(CleanInPointsModel cleanInPointsModel)
         {
             if (this.ViewKey != NDIViewKeys.CAM_3) return;
@@ -405,8 +421,8 @@ namespace VIZ.FGOUT.Module
         //滑动条的值
         public int SliderValue;
         public bool IsSliderValueChanged;
-        public long ReplayInPointStartTime;
-        public long ReplayOutPointEndTime;
+        //public long ReplayInPointStartTime;
+        //public long ReplayOutPointEndTime;
         public bool IsReplay;
         public bool IsReplayStarted;
         public bool IsStartValue;
@@ -423,6 +439,8 @@ namespace VIZ.FGOUT.Module
         //public static List<TrackingBoxInfo> _cam3StaticInfos;
         public static List<TrackingBoxInfo> _cam3StaticInfos = new List<TrackingBoxInfo>();
 
+        public long _RecordStartTime;
+
         /// <summary>
         /// Replay选中和SliderValueChanged传值共用这一个方法
         /// </summary>

VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/VIZ.FGOUT.Module_MarkupCompile.cache

@@ -10,11 +10,11 @@ none
 false
 DEBUG;TRACE
 
-25-1434354873
-4-699044453
-97-187026604
-151674092382
+25-429057470
+4-1529606353
+97-1757238199
+151915249285
 NDIMainView\View\NDIMainView.xaml;NDIPreviewView\View\NDIPreviewView.xaml;NDISettingView\View\AlgorithmSettingPanelView.xaml;NDISettingView\View\Algorithm\AlgorithmCablewayPanelView.xaml;NDISettingView\View\Algorithm\AlgorithmNearPanelView.xaml;NDISettingView\View\Algorithm\AlgorithmSinglePanelView.xaml;NDISettingView\View\Algorithm\AlgorithmSixteenPanelView.xaml;NDISettingView\View\Algorithm\AlgorithmTacticsPanelView.xaml;NDISettingView\View\NDISettingPanelView.xaml;NDISettingView\View\NDISettingView.xaml;NDIView\View\NDIView.xaml;SystemSetting\View\AboutPanelView.xaml;SystemSetting\View\CheckDataPanelView.xaml;SystemSetting\View\HotkeySettingPanelView.xaml;SystemSetting\View\LanguagePanelView.xaml;SystemSetting\View\MattingImagePanelView.xaml;SystemSetting\View\NewWindowView.xaml;SystemSetting\View\PackageSettingPanelView.xaml;SystemSetting\View\PreviewSettingPanelView.xaml;SystemSetting\View\ReplayPanelView.xaml;SystemSetting\View\StyleSettingPanelView.xaml;SystemSetting\View\SystemSettingView.xaml;SystemSetting\View\UEControlPanelView.xaml;SystemSetting\View\UESettingPanelView.xaml;Themes\SliderArrange.xaml;
 
-False
+True
 

VIZ.FGOUT/VIZ.FGOUT.Module/obj/x64/Debug/VIZ.FGOUT.Module_MarkupCompile.lref

-
+C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\obj\x64\Debug\GeneratedInternalTypeHelper.g.cs
 
 FC:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\NDIMainView\View\NDIMainView.xaml;;
 FC:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module\NDIPreviewView\View\NDIPreviewView.xaml;;

VIZ.FGOUT/VIZ.FGOUT/obj/x64/Debug/VIZ.FGOUT_MarkupCompile.cache

@@ -10,11 +10,11 @@ none
 false
 DEBUG;TRACE
 C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT\App.xaml
-2-1347366880
+21265083526
 
-6968741766
-43-1958993781
+6-790135758
+421356718200
 CloseAlgorithmWindow.xaml;MainWindow.xaml;
 
-False
+True
 

VIZ.Framework/VIZ.Framework.Common.Resource/bin/x64/Release/VIZ.Framework.Common.Resource.dll.config

@@ -6,6 +6,10 @@
         <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>
\ No newline at end of file

VIZ.Framework/VIZ.Framework.Common.Resource/bin/x64/Release/VIZ.Framework.Common.dll.config

@@ -6,6 +6,10 @@
         <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>
\ No newline at end of file

VIZ.Framework/VIZ.Framework.Common.Resource/obj/x64/Debug/VIZ.Framework.Common.Resource_MarkupCompile.cache

@@ -10,10 +10,10 @@ none
 false
 DEBUG;TRACE
 
-91711917753
+9-721875057
 
-3-1719726047
-201914760168
+3-630027162
+19-1136530284
 Path\ArrowPathResource.xaml;Style\Button\Button_MessageBox.xaml;Style\Button\Button_Normal.xaml;Style\Button\Button_WindowTop.xaml;Style\GridSplitter\GridSplitter_None.xaml;Style\ListBox\ListBox_None.xaml;Style\ScrollView\ScrollView_Default.xaml;Style\TextBox\TextBox_None.xaml;Themes\Generic.xaml;
 
 False

VIZ.Framework/VIZ.Framework.Common.Resource/obj/x64/Release/VIZ.Framework.Common.Resource.csproj.CoreCompileInputs.cache

-c0b9e007c3146fb9ff3a371114861be8a1807eba646a54322be828f3efec59a4
+feb809f2d30e71f8621a209f3ef100351481510c89c69e618a24f2f0629a4190

VIZ.Framework/VIZ.Framework.Common.Resource/obj/x64/Release/VIZ.Framework.Common.Resource.csproj.FileListAbsolute.txt

@@ -118,3 +118,16 @@ C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common.Resource\obj\x64\Release\VI
 C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common.Resource\obj\x64\Release\VIZ.Framework.Common.Resource.dll
 C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common.Resource\obj\x64\Release\VIZ.Framework.Common.Resource.pdb
 C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common.Resource\obj\x64\Release\VIZ.Fram.BB1B34A6.Up2Date
+C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common.Resource\bin\x64\Release\VIZ.FGOUT.Storage.dll
+C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common.Resource\bin\x64\Release\CsvHelper.dll
+C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common.Resource\bin\x64\Release\LiteDB.dll
+C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common.Resource\bin\x64\Release\Microsoft.Bcl.AsyncInterfaces.dll
+C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common.Resource\bin\x64\Release\System.Threading.Tasks.Extensions.dll
+C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common.Resource\bin\x64\Release\Microsoft.Bcl.HashCode.dll
+C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common.Resource\bin\x64\Release\VIZ.FGOUT.Storage.pdb
+C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common.Resource\bin\x64\Release\VIZ.FGOUT.Storage.dll.config
+C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common.Resource\bin\x64\Release\CsvHelper.xml
+C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common.Resource\bin\x64\Release\LiteDB.xml
+C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common.Resource\bin\x64\Release\Microsoft.Bcl.AsyncInterfaces.xml
+C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common.Resource\bin\x64\Release\System.Threading.Tasks.Extensions.xml
+C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common.Resource\bin\x64\Release\Microsoft.Bcl.HashCode.xml

VIZ.Framework/VIZ.Framework.Common.Resource/obj/x64/Release/VIZ.Framework.Common.Resource_MarkupCompile.cache

@@ -10,10 +10,10 @@ none
 false
 TRACE
 
-91711917753
+9-721875057
 
-3-1719726047
-19269851070
+3-630027162
+19468308608
 Path\ArrowPathResource.xaml;Style\Button\Button_MessageBox.xaml;Style\Button\Button_Normal.xaml;Style\Button\Button_WindowTop.xaml;Style\GridSplitter\GridSplitter_None.xaml;Style\ListBox\ListBox_None.xaml;Style\ScrollView\ScrollView_Default.xaml;Style\TextBox\TextBox_None.xaml;Themes\Generic.xaml;
 
 False

VIZ.Framework/VIZ.Framework.Common/bin/x64/Release/VIZ.Framework.Common.dll.config

@@ -6,6 +6,10 @@
         <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>
\ No newline at end of file

VIZ.Framework/VIZ.Framework.Common/obj/x64/Debug/GeneratedInternalTypeHelper.g.cs

-
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码由工具生成。
+//     运行时版本:4.0.30319.42000
+//
+//     对此文件的更改可能会导致不正确的行为，并且如果
+//     重新生成代码，这些更改将会丢失。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace XamlGeneratedNamespace {
+    
+    
+    /// <summary>
+    /// GeneratedInternalTypeHelper
+    /// </summary>
+    [System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
+    [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
+    public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper {
+        
+        /// <summary>
+        /// CreateInstance
+        /// </summary>
+        protected override object CreateInstance(System.Type type, System.Globalization.CultureInfo culture) {
+            return System.Activator.CreateInstance(type, ((System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic) 
+                            | (System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.CreateInstance)), null, null, culture);
+        }
+        
+        /// <summary>
+        /// GetPropertyValue
+        /// </summary>
+        protected override object GetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, System.Globalization.CultureInfo culture) {
+            return propertyInfo.GetValue(target, System.Reflection.BindingFlags.Default, null, null, culture);
+        }
+        
+        /// <summary>
+        /// SetPropertyValue
+        /// </summary>
+        protected override void SetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, object value, System.Globalization.CultureInfo culture) {
+            propertyInfo.SetValue(target, value, System.Reflection.BindingFlags.Default, null, null, culture);
+        }
+        
+        /// <summary>
+        /// CreateDelegate
+        /// </summary>
+        protected override System.Delegate CreateDelegate(System.Type delegateType, object target, string handler) {
+            return ((System.Delegate)(target.GetType().InvokeMember("_CreateDelegate", (System.Reflection.BindingFlags.InvokeMethod 
+                            | (System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)), null, target, new object[] {
+                        delegateType,
+                        handler}, null)));
+        }
+        
+        /// <summary>
+        /// AddEventHandler
+        /// </summary>
+        protected override void AddEventHandler(System.Reflection.EventInfo eventInfo, object target, System.Delegate handler) {
+            eventInfo.AddEventHandler(target, handler);
+        }
+    }
+}
 

VIZ.Framework/VIZ.Framework.Common/obj/x64/Debug/VIZ.Framework.Common_MarkupCompile.cache

@@ -10,11 +10,11 @@ none
 false
 DEBUG;TRACE
 
-15488264905
+15-721109437
 
-1212046750213
-150843184444
+121-1133520871
+150238613261
 MessageBox\MessageBoxEx.xaml;MessageBox\MessageBoxExWindow.xaml;Themes\Generic.xaml;VideoControl\Control\VideoControl.xaml;Widgets\ColorPickButton\ColorPickButton.xaml;Widgets\ColorPickButton\ColorPickWindow.xaml;Widgets\GPIOPinTestControl\GPIOPinTestControl.xaml;Widgets\HotkeyBox\HotkeyBox.xaml;Widgets\IconButton\IconButton.xaml;Widgets\LabelValue\LabelValue.xaml;Widgets\NavigationControl\NavigationControl.xaml;Widgets\ResizeImageControl\ResizeImageControl.xaml;Widgets\ShowMessageControl\ShowMessageControl.xaml;Widgets\VideoTimeBar\VideoTimeBar.xaml;Widgets\ViewLoader\ViewLoader.xaml;
 
-False
+True
 

VIZ.Framework/VIZ.Framework.Common/obj/x64/Release/GeneratedInternalTypeHelper.g.cs

-
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码由工具生成。
+//     运行时版本:4.0.30319.42000
+//
+//     对此文件的更改可能会导致不正确的行为，并且如果
+//     重新生成代码，这些更改将会丢失。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace XamlGeneratedNamespace {
+    
+    
+    /// <summary>
+    /// GeneratedInternalTypeHelper
+    /// </summary>
+    [System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
+    [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
+    public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper {
+        
+        /// <summary>
+        /// CreateInstance
+        /// </summary>
+        protected override object CreateInstance(System.Type type, System.Globalization.CultureInfo culture) {
+            return System.Activator.CreateInstance(type, ((System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic) 
+                            | (System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.CreateInstance)), null, null, culture);
+        }
+        
+        /// <summary>
+        /// GetPropertyValue
+        /// </summary>
+        protected override object GetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, System.Globalization.CultureInfo culture) {
+            return propertyInfo.GetValue(target, System.Reflection.BindingFlags.Default, null, null, culture);
+        }
+        
+        /// <summary>
+        /// SetPropertyValue
+        /// </summary>
+        protected override void SetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, object value, System.Globalization.CultureInfo culture) {
+            propertyInfo.SetValue(target, value, System.Reflection.BindingFlags.Default, null, null, culture);
+        }
+        
+        /// <summary>
+        /// CreateDelegate
+        /// </summary>
+        protected override System.Delegate CreateDelegate(System.Type delegateType, object target, string handler) {
+            return ((System.Delegate)(target.GetType().InvokeMember("_CreateDelegate", (System.Reflection.BindingFlags.InvokeMethod 
+                            | (System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)), null, target, new object[] {
+                        delegateType,
+                        handler}, null)));
+        }
+        
+        /// <summary>
+        /// AddEventHandler
+        /// </summary>
+        protected override void AddEventHandler(System.Reflection.EventInfo eventInfo, object target, System.Delegate handler) {
+            eventInfo.AddEventHandler(target, handler);
+        }
+    }
+}
 

VIZ.Framework/VIZ.Framework.Common/obj/x64/Release/VIZ.Framework.Common.csproj.CoreCompileInputs.cache

-b3d9ab6bd9d828906c905c88d597346e8821250eb12ca55b8d29c191d33bf901
+5405ad914a18fbc0e1fc37062523d185a196a41f7ee930ecff2e898d2857cf25

VIZ.Framework/VIZ.Framework.Common/obj/x64/Release/VIZ.Framework.Common.csproj.FileListAbsolute.txt

@@ -186,3 +186,18 @@ C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\obj\x64\Release\VIZ.Framewo
 C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\obj\x64\Release\VIZ.Framework.Common.dll
 C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\obj\x64\Release\VIZ.Framework.Common.pdb
 C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\obj\x64\Release\VIZ.Fram.A89CC29D.Up2Date
+C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\bin\x64\Release\LiteDB.dll
+C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\bin\x64\Release\VIZ.FGOUT.Domain.dll
+C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\bin\x64\Release\VIZ.FGOUT.Storage.dll
+C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\bin\x64\Release\CsvHelper.dll
+C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\bin\x64\Release\Microsoft.Bcl.AsyncInterfaces.dll
+C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\bin\x64\Release\System.Threading.Tasks.Extensions.dll
+C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\bin\x64\Release\Microsoft.Bcl.HashCode.dll
+C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\bin\x64\Release\VIZ.FGOUT.Domain.pdb
+C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\bin\x64\Release\VIZ.FGOUT.Storage.pdb
+C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\bin\x64\Release\VIZ.FGOUT.Storage.dll.config
+C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\bin\x64\Release\LiteDB.xml
+C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\bin\x64\Release\CsvHelper.xml
+C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\bin\x64\Release\Microsoft.Bcl.AsyncInterfaces.xml
+C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\bin\x64\Release\System.Threading.Tasks.Extensions.xml
+C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Common\bin\x64\Release\Microsoft.Bcl.HashCode.xml

VIZ.Framework/VIZ.Framework.Common/obj/x64/Release/VIZ.Framework.Common_MarkupCompile.cache

@@ -10,11 +10,11 @@ none
 false
 TRACE
 
-15488264905
+15-721109437
 
-1212046750213
-44-1038958293
+121-1133520871
+150-762123096
 MessageBox\MessageBoxEx.xaml;MessageBox\MessageBoxExWindow.xaml;Themes\Generic.xaml;VideoControl\Control\VideoControl.xaml;Widgets\ColorPickButton\ColorPickButton.xaml;Widgets\ColorPickButton\ColorPickWindow.xaml;Widgets\GPIOPinTestControl\GPIOPinTestControl.xaml;Widgets\HotkeyBox\HotkeyBox.xaml;Widgets\IconButton\IconButton.xaml;Widgets\LabelValue\LabelValue.xaml;Widgets\NavigationControl\NavigationControl.xaml;Widgets\ResizeImageControl\ResizeImageControl.xaml;Widgets\ShowMessageControl\ShowMessageControl.xaml;Widgets\VideoTimeBar\VideoTimeBar.xaml;Widgets\ViewLoader\ViewLoader.xaml;
 
-False
+True
 

VIZ.Framework/VIZ.Framework.Module/bin/x64/Release/VIZ.Framework.Common.Resource.dll.config

@@ -6,6 +6,10 @@
         <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>
\ No newline at end of file

VIZ.Framework/VIZ.Framework.Module/bin/x64/Release/VIZ.Framework.Common.dll.config

@@ -6,6 +6,10 @@
         <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>
\ No newline at end of file

VIZ.Framework/VIZ.Framework.Module/bin/x64/Release/VIZ.Framework.Module.dll.config

@@ -6,6 +6,10 @@
         <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>
\ No newline at end of file

VIZ.Framework/VIZ.Framework.Module/obj/x64/Debug/VIZ.Framework.Module_MarkupCompile.cache

@@ -10,11 +10,11 @@ none
 false
 DEBUG;TRACE
 
-11882902973
+1-731644535
 
-212023628146
-26-1598261527
+212002329545
+25439653939
 Themes\Generic.xaml;
 
-False
+True
 

VIZ.Framework/VIZ.Framework.Module/obj/x64/Release/VIZ.Framework.Module.csproj.CoreCompileInputs.cache

-b2dc62064811cf5222bb5697d6b451e0a954fb31a6e0d32daf4a423a34172503
+01e5db423dada27df8731a40109a6564e09a6c808a0a8a4b2d846a3020249a93

VIZ.Framework/VIZ.Framework.Module/obj/x64/Release/VIZ.Framework.Module.csproj.FileListAbsolute.txt

@@ -123,3 +123,16 @@ C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Module\obj\x64\Release\VIZ.Framewo
 C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Module\obj\x64\Release\VIZ.Framework.Module.dll
 C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Module\obj\x64\Release\VIZ.Framework.Module.pdb
 C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Module\obj\x64\Release\VIZ.Fram.3203B1C3.Up2Date
+C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Module\bin\x64\Release\VIZ.FGOUT.Storage.dll
+C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Module\bin\x64\Release\CsvHelper.dll
+C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Module\bin\x64\Release\LiteDB.dll
+C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Module\bin\x64\Release\Microsoft.Bcl.AsyncInterfaces.dll
+C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Module\bin\x64\Release\System.Threading.Tasks.Extensions.dll
+C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Module\bin\x64\Release\Microsoft.Bcl.HashCode.dll
+C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Module\bin\x64\Release\VIZ.FGOUT.Storage.pdb
+C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Module\bin\x64\Release\VIZ.FGOUT.Storage.dll.config
+C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Module\bin\x64\Release\CsvHelper.xml
+C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Module\bin\x64\Release\LiteDB.xml
+C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Module\bin\x64\Release\Microsoft.Bcl.AsyncInterfaces.xml
+C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Module\bin\x64\Release\System.Threading.Tasks.Extensions.xml
+C:\Projects\FGOUT\VIZ.Framework\VIZ.Framework.Module\bin\x64\Release\Microsoft.Bcl.HashCode.xml

VIZ.Framework/VIZ.Framework.Module/obj/x64/Release/VIZ.Framework.Module_MarkupCompile.cache

@@ -10,11 +10,11 @@ none
 false
 TRACE
 
-11882902973
+1-731644535
 
-212023628146
-25-1079249465
+212002329545
+25-1969161261
 Themes\Generic.xaml;
 
-False
+True