Max/2dust_v2rayN
1
0
Fork 0
mirror of https://github.com/2dust/v2rayN.git synced 2026-10-10 16:18:27 +03:00
Code Issues Packages Projects Releases Wiki Activity

Refactor CoreHandler

Browse Source
This commit is contained in:
2dust
2024-10-07 11:18:24 +08:00
parent 4ccc7aa92d
commit 7a839063d0
4 changed files with 17 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs
+4 -6
View File
@@ -13,7 +13,6 @@ namespace ServiceLib.ViewModels
{
#region private prop
private CoreHandler _coreHandler;
private bool _isAdministrator { get; set; }
#endregion private prop
@@ -342,8 +341,7 @@ namespace ServiceLib.ViewModels
{
ConfigHandler.InitBuiltinRouting(_config);
ConfigHandler.InitBuiltinDNS(_config);
_coreHandler = new CoreHandler(_config, UpdateHandler);
Locator.CurrentMutable.RegisterLazySingleton(() => _coreHandler, typeof(CoreHandler));
CoreHandler.Instance.Init(_config, UpdateHandler);
if (_config.guiItem.enableStatistics)
{
@@ -428,7 +426,7 @@ namespace ServiceLib.ViewModels
ProfileExHandler.Instance.SaveTo();
StatisticsHandler.Instance.SaveTo();
StatisticsHandler.Instance.Close();
_coreHandler.CoreStop();
CoreHandler.Instance.CoreStop();
Logging.SaveLog("MyAppExit End");
}
@@ -750,7 +748,7 @@ namespace ServiceLib.ViewModels
//}
var node = ConfigHandler.GetDefaultServer(_config);
_coreHandler.LoadCore(node);
CoreHandler.Instance.LoadCore(node);
});
}
@@ -760,7 +758,7 @@ namespace ServiceLib.ViewModels
ChangeSystemProxyStatusAsync(ESysProxyType.ForcedClear, false);
_coreHandler.CoreStop();
CoreHandler.Instance.CoreStop();
}
#endregion core job
v2rayN/ServiceLib/ViewModels/ProfilesViewModel.cs
+2 -5
View File
@@ -667,11 +667,8 @@ namespace ServiceLib.ViewModels
return;
}
//ClearTestResult();
var coreHandler = Locator.Current.GetService<CoreHandler>();
if (coreHandler != null)
{
_speedtestHandler = new SpeedtestService(_config, coreHandler, lstSelecteds, actionType, UpdateSpeedtestHandler);
}
_speedtestHandler = new SpeedtestService(_config, lstSelecteds, actionType, UpdateSpeedtestHandler);
}
public void ServerSpeedtestStop()