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

Refactor NoticeHandler

Browse Source
This commit is contained in:
2dust
2024-10-07 10:59:13 +08:00
parent d5c6a42a9a
commit 4ccc7aa92d
37 changed files with 115 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files
v2rayN/ServiceLib/ViewModels/AddServer2ViewModel.cs
+8 -10
View File
@@ -1,6 +1,5 @@
using ReactiveUI;
using ReactiveUI.Fody.Helpers;
using Splat;
using System.Reactive;
namespace ServiceLib.ViewModels
@@ -20,7 +19,6 @@ namespace ServiceLib.ViewModels
public AddServer2ViewModel(ProfileItem profileItem, Func<EViewAction, object?, Task<bool>>? updateView)
{
_noticeHandler = Locator.Current.GetService<NoticeHandler>();
_config = AppHandler.Instance.Config;
_updateView = updateView;
@@ -55,25 +53,25 @@ namespace ServiceLib.ViewModels
string remarks = SelectedSource.remarks;
if (Utils.IsNullOrEmpty(remarks))
{
_noticeHandler?.Enqueue(ResUI.PleaseFillRemarks);
NoticeHandler.Instance.Enqueue(ResUI.PleaseFillRemarks);
return;
}
if (Utils.IsNullOrEmpty(SelectedSource.address))
{
_noticeHandler?.Enqueue(ResUI.FillServerAddressCustom);
NoticeHandler.Instance.Enqueue(ResUI.FillServerAddressCustom);
return;
}
SelectedSource.coreType = CoreType.IsNullOrEmpty() ? null : (ECoreType)Enum.Parse(typeof(ECoreType), CoreType);
if (ConfigHandler.EditCustomServer(_config, SelectedSource) == 0)
{
_noticeHandler?.Enqueue(ResUI.OperationSuccess);
NoticeHandler.Instance.Enqueue(ResUI.OperationSuccess);
await _updateView?.Invoke(EViewAction.CloseWindow, null);
}
else
{
_noticeHandler?.Enqueue(ResUI.OperationFailed);
NoticeHandler.Instance.Enqueue(ResUI.OperationFailed);
}
}
@@ -89,7 +87,7 @@ namespace ServiceLib.ViewModels
item.address = fileName;
if (ConfigHandler.AddCustomServer(_config, item, false) == 0)
{
_noticeHandler?.Enqueue(ResUI.SuccessfullyImportedCustomServer);
NoticeHandler.Instance.Enqueue(ResUI.SuccessfullyImportedCustomServer);
if (Utils.IsNotEmpty(item.indexId))
{
SelectedSource = JsonUtils.DeepCopy(item);
@@ -98,7 +96,7 @@ namespace ServiceLib.ViewModels
}
else
{
_noticeHandler?.Enqueue(ResUI.FailedImportedCustomServer);
NoticeHandler.Instance.Enqueue(ResUI.FailedImportedCustomServer);
}
}
@@ -107,7 +105,7 @@ namespace ServiceLib.ViewModels
var address = SelectedSource.address;
if (Utils.IsNullOrEmpty(address))
{
_noticeHandler?.Enqueue(ResUI.FillServerAddressCustom);
NoticeHandler.Instance.Enqueue(ResUI.FillServerAddressCustom);
return;
}
@@ -118,7 +116,7 @@ namespace ServiceLib.ViewModels
}
else
{
_noticeHandler?.Enqueue(ResUI.FailedReadConfiguration);
NoticeHandler.Instance.Enqueue(ResUI.FailedReadConfiguration);
}
}
}