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
 
 
-2-725104376
+21870986562
 
-3947974750
-17-1462717611
+31364711570
+17-1683084370
 Themes\Generic.xaml;Widgets\FootballFieldPanel\FootballFieldPanel.xaml;
 
-True
+False
 

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

-
+C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Common\obj\x64\Debug\GeneratedInternalTypeHelper.g.cs
 
 FC:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Common\Themes\Generic.xaml;;
 FC:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Common\Widgets\FootballFieldPanel\FootballFieldPanel.xaml;;

VIZ.FGOUT/VIZ.FGOUT.Module.Resource/obj/x64/Debug/VIZ.FGOUT.Module.Resource.csproj.FileListAbsolute.txt

@@ -582,6 +582,13 @@ C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\Style\Button
 C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\Style\Button\Button_WindowTop.baml
 C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\Style\CheckBox\CheckBox_NdiView.baml
 C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\Style\CheckBox\CheckBox_Setting.baml
+C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\VIZ.FGOUT.Module.Resource_MarkupCompile.cache
+C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\VIZ.FGOUT.Module.Resource_MarkupCompile.lref
+C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\VIZ.FGOUT.Module.Resource.g.resources
+C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\VIZ.FGOUT.Module.Resource.csproj.CoreCompileInputs.cache
+C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\VIZ.FGOUT.Module.Resource.csproj.CopyComplete
+C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\VIZ.FGOUT.Module.Resource.dll
+C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\VIZ.FGOUT.Module.Resource.pdb
 C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\Style\CheckBox\CheckBox_WindowTop.baml
 C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\Style\ComboBox\ComboBox_Setting.baml
 C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\Style\HotkeyBox\HotkeyBox_Setting.baml
@@ -594,11 +601,4 @@ C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\Style\TextBl
 C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\Style\TextBox\TextBox_Setting.baml
 C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\Style\ToogleButton\ToogleButton_Setting.baml
 C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\Toolkit\NumericUpDown\NumericUpDown.baml
-C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\VIZ.FGOUT.Module.Resource_MarkupCompile.cache
-C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\VIZ.FGOUT.Module.Resource_MarkupCompile.lref
 C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\Themes\Generic.baml
-C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\VIZ.FGOUT.Module.Resource.g.resources
-C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\VIZ.FGOUT.Module.Resource.csproj.CoreCompileInputs.cache
-C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\VIZ.FGOUT.Module.Resource.csproj.CopyComplete
-C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\VIZ.FGOUT.Module.Resource.dll
-C:\Projects\FGOUT\VIZ.FGOUT\VIZ.FGOUT.Module.Resource\obj\x64\Debug\VIZ.FGOUT.Module.Resource.pdb

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

@@ -131,10 +131,10 @@ namespace VIZ.FGOUT.Module
         /// </summary>
         private void InitMessage()
         {
-            //Replay入点值
-            ApplicationDomain.MessageManager.Register<ReplayStartValueModel>(this, this.ReplayStartValueFromNDIViewModel);
-            //Replay出点值
-            ApplicationDomain.MessageManager.Register<ReplayEndValueModel>(this, this.ReplayEndValueFromNDIViewModel);
+            ////Replay入点值
+            //ApplicationDomain.MessageManager.Register<ReplayStartValueModel>(this, this.ReplayStartValueFromNDIViewModel);
+            ////Replay出点值
+            //ApplicationDomain.MessageManager.Register<ReplayEndValueModel>(this, this.ReplayEndValueFromNDIViewModel);
         }
 
         int _sliderStartInitValue;
@@ -795,10 +795,10 @@ namespace VIZ.FGOUT.Module
             managerAlgorithm.SendJson(replayPackage);
             manager.SendJson(replayPackage);
 
-            //_isReplayChecked = true;
-            //SliderStartValue = NDIViewModel.SliderStartValue;
-            //SliderEndValue = NDIViewModel.SliderEndValue;
-            //_isReplayChecked = false;
+            _isReplayChecked = true;
+            SliderStartValue = NDIViewModel.SliderStartValue;
+            SliderEndValue = NDIViewModel.SliderEndValue;
+            _isReplayChecked = false;
         }
 
         private void ReplayUnchecked()
@@ -1814,30 +1814,30 @@ namespace VIZ.FGOUT.Module
             {
                 if (context.hotkey.Equals(NDIMainViewHotkeys.Up))
                 {
-                    //SliderStartValue = NDIViewModel.SliderStartValue;
-                    SliderStartValue = _sliderStartInitValue;
+                    SliderStartValue = NDIViewModel.SliderStartValue;
+                    //SliderStartValue = _sliderStartInitValue;
                     _isDown = false;
                 }
                 else if (context.hotkey.Equals(NDIMainViewHotkeys.Down))
                 {
-                    //SliderEndValue = NDIViewModel.SliderEndValue;
-                    SliderEndValue = _sliderEndInitValue;
+                    SliderEndValue = NDIViewModel.SliderEndValue;
+                    //SliderEndValue = _sliderEndInitValue;
                     _isDown = true;
                 }
                 else if (context.hotkey.Equals(NDIMainViewHotkeys.Left))
                 {
                     if (_isDown)
-                        SliderEndValue--;
-                    else 
-                        SliderStartValue--;
+                        NDIViewModel.SliderEndValue = --SliderEndValue;
+                    else
+                        NDIViewModel.SliderStartValue = --SliderStartValue;
 
                 }
                 else if (context.hotkey.Equals(NDIMainViewHotkeys.Right))
                 {
-                    if(_isDown)
-                        SliderEndValue++;
+                    if (_isDown)
+                        NDIViewModel.SliderEndValue = ++SliderEndValue;
                     else
-                        SliderStartValue++;
+                        NDIViewModel.SliderStartValue = ++SliderStartValue;
                 }
             }
         }

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

@@ -161,14 +161,14 @@ namespace VIZ.FGOUT.Module
 
             //}
 
-            //滑块开始热键
+            //入点热键
             if (view.vm.IsSliderStartClicked)
             {
                 //SliderStartTimeStamp = e.Frame.TimeStamp;
                 StartTime = e.Frame.TimeStamp;
                 view.vm.IsSliderStartClicked = false;
             }
-            //滑块结束热键
+            //出点热键
             else if (view.vm.IsSliderEndClicked)
             {
                 //SliderEndTimeStamp = e.Frame.TimeStamp;
@@ -197,9 +197,9 @@ namespace VIZ.FGOUT.Module
                             //    break;
                             if (matExtend.TimeStamp == StartTime)
                             {
-                                //SliderStartValue = index;
-                                var replayStartValueModel = new ReplayStartValueModel() { ReplayStartValue = index};
-                                ApplicationDomain.MessageManager.Send(replayStartValueModel);
+                                SliderStartValue = index;
+                                //var replayStartValueModel = new ReplayStartValueModel() { ReplayStartValue = index};
+                                //ApplicationDomain.MessageManager.Send(replayStartValueModel);
                             }
                             else if (matExtend.TimeStamp == EndTime)
                                 break;
@@ -209,9 +209,9 @@ namespace VIZ.FGOUT.Module
                         //view.vm.SliderStartValue = index;
                         //view.vm.SliderEndValue = index;
 
-                        //SliderEndValue = index;
-                        var replayEndValueModel = new ReplayEndValueModel() { ReplayEndValue = index };
-                        ApplicationDomain.MessageManager.Send(replayEndValueModel);
+                        SliderEndValue = index;
+                        //var replayEndValueModel = new ReplayEndValueModel() { ReplayEndValue = index };
+                        //ApplicationDomain.MessageManager.Send(replayEndValueModel);
                     }
                     //}
                 }

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

@@ -363,8 +363,8 @@ namespace VIZ.FGOUT.Module
         public bool IsSliderEndClicked;
         //public long SliderStartTimeStamp;
         //public long SliderEndTimeStamp;
-        //public static int SliderStartValue;
-        //public static int SliderEndValue;
+        public static int SliderStartValue;
+        public static int SliderEndValue;
         public static long StartTime { get; set; }
         public static long EndTime { get; set; }