合并冲突

MonitorModule/ViewModels/MonitorViewModel.cs

@@ -21,6 +21,7 @@ using UIShare.GlobalVariable;
 using UIShare.PubEvent;
 using UIShare.ViewModelBase;
 
+
 namespace MonitorModule.ViewModels
 {
     public class MonitorViewModel : NavigateViewModelBase, IRegionMemberLifetime, IDisposable
@@ -152,6 +153,9 @@ namespace MonitorModule.ViewModels
                 try { _dbFlushTask.Wait(TimeSpan.FromSeconds(1.5)); } catch { }
             }
 
+            _sampleTimer.Tick -= OnSampleTick;
+
+            // 3. 释放容器作用域
             _scope?.Dispose();
             Channels.Clear();
             AvailableMethods.Clear();