合并冲突
This commit is contained in:
@@ -21,6 +21,7 @@ using UIShare.GlobalVariable;
|
|||||||
using UIShare.PubEvent;
|
using UIShare.PubEvent;
|
||||||
using UIShare.ViewModelBase;
|
using UIShare.ViewModelBase;
|
||||||
|
|
||||||
|
|
||||||
namespace MonitorModule.ViewModels
|
namespace MonitorModule.ViewModels
|
||||||
{
|
{
|
||||||
public class MonitorViewModel : NavigateViewModelBase, IRegionMemberLifetime, IDisposable
|
public class MonitorViewModel : NavigateViewModelBase, IRegionMemberLifetime, IDisposable
|
||||||
@@ -152,6 +153,9 @@ namespace MonitorModule.ViewModels
|
|||||||
try { _dbFlushTask.Wait(TimeSpan.FromSeconds(1.5)); } catch { }
|
try { _dbFlushTask.Wait(TimeSpan.FromSeconds(1.5)); } catch { }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
_sampleTimer.Tick -= OnSampleTick;
|
||||||
|
|
||||||
|
// 3. 释放容器作用域
|
||||||
_scope?.Dispose();
|
_scope?.Dispose();
|
||||||
Channels.Clear();
|
Channels.Clear();
|
||||||
AvailableMethods.Clear();
|
AvailableMethods.Clear();
|
||||||
|
|||||||
Reference in New Issue
Block a user