pjandro/v2rayN
1
0
Fork 0
mirror of https://github.com/2dust/v2rayN.git synced 2026-09-30 10:32:07 +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/DNSSettingViewModel.cs
+5 -6
View File
@@ -1,6 +1,5 @@
using ReactiveUI;
using ReactiveUI.Fody.Helpers;
using Splat;
using System.Reactive;
namespace ServiceLib.ViewModels
@@ -24,7 +23,7 @@ namespace ServiceLib.ViewModels
public DNSSettingViewModel(Func<EViewAction, object?, Task<bool>>? updateView)
{
_config = AppHandler.Instance.Config;
_noticeHandler = Locator.Current.GetService<NoticeHandler>();
_updateView = updateView;
var item = AppHandler.Instance.GetDNSItem(ECoreType.Xray);
@@ -68,7 +67,7 @@ namespace ServiceLib.ViewModels
{
if (normalDNS.Contains("{") || normalDNS.Contains("}"))
{
_noticeHandler?.Enqueue(ResUI.FillCorrectDNSText);
NoticeHandler.Instance.Enqueue(ResUI.FillCorrectDNSText);
return;
}
}
@@ -78,7 +77,7 @@ namespace ServiceLib.ViewModels
var obj2 = JsonUtils.Deserialize<Dns4Sbox>(normalDNS2);
if (obj2 == null)
{
_noticeHandler?.Enqueue(ResUI.FillCorrectDNSText);
NoticeHandler.Instance.Enqueue(ResUI.FillCorrectDNSText);
return;
}
}
@@ -87,7 +86,7 @@ namespace ServiceLib.ViewModels
var obj2 = JsonUtils.Deserialize<Dns4Sbox>(tunDNS2);
if (obj2 == null)
{
_noticeHandler?.Enqueue(ResUI.FillCorrectDNSText);
NoticeHandler.Instance.Enqueue(ResUI.FillCorrectDNSText);
return;
}
}
@@ -106,7 +105,7 @@ namespace ServiceLib.ViewModels
item2.tunDNS = JsonUtils.Serialize(JsonUtils.ParseJson(tunDNS2)); ;
ConfigHandler.SaveDNSItems(_config, item2);
_noticeHandler?.Enqueue(ResUI.OperationSuccess);
NoticeHandler.Instance.Enqueue(ResUI.OperationSuccess);
await _updateView?.Invoke(EViewAction.CloseWindow, null);
}
}