zishuo/Archive
1
0
Fork 0
mirror of https://github.com/bolucat/Archive.git synced 2026-04-23 00:17:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update On Mon Oct 7 20:33:43 CEST 2024

Browse Source
This commit is contained in:
github-action[bot]
2024-10-07 20:33:44 +02:00
parent d52a909dcb
commit fd37c3e1de
1173 changed files with 17994 additions and 11185 deletions
Download Patch File Download Diff File Expand all files Collapse all files
v2rayn/v2rayN/ServiceLib/ViewModels/RoutingSettingViewModel.cs
+12 -13
View File
@@ -1,7 +1,6 @@
using DynamicData.Binding;
using ReactiveUI;
using ReactiveUI.Fody.Helpers;
using Splat;
using System.Reactive;
namespace ServiceLib.ViewModels
@@ -67,8 +66,8 @@ namespace ServiceLib.ViewModels
public RoutingSettingViewModel(Func<EViewAction, object?, Task<bool>>? updateView)
{
_config = LazyConfig.Instance.Config;
_noticeHandler = Locator.Current.GetService<NoticeHandler>();
_config = AppHandler.Instance.Config;
_updateView = updateView;
SelectedSource = new();
@@ -165,7 +164,7 @@ namespace ServiceLib.ViewModels
{
_routingItems.Clear();
var routings = LazyConfig.Instance.RoutingItems();
var routings = AppHandler.Instance.RoutingItems();
foreach (var item in routings)
{
bool def = false;
@@ -200,12 +199,12 @@ namespace ServiceLib.ViewModels
if (ConfigHandler.SaveConfig(_config) == 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);
}
}
@@ -219,8 +218,8 @@ namespace ServiceLib.ViewModels
DirectIP = "geoip:private,geoip:cn";
BlockDomain = "geosite:category-ads-all";
//_noticeHandler?.Enqueue(ResUI.OperationSuccess);
_noticeHandler?.Enqueue(ResUI.OperationSuccess);
//NoticeHandler.Instance.Enqueue(ResUI.OperationSuccess);
NoticeHandler.Instance.Enqueue(ResUI.OperationSuccess);
}
public async Task RoutingAdvancedEditAsync(bool blNew)
@@ -232,7 +231,7 @@ namespace ServiceLib.ViewModels
}
else
{
item = LazyConfig.Instance.GetRoutingItem(SelectedSource?.id);
item = AppHandler.Instance.GetRoutingItem(SelectedSource?.id);
if (item is null)
{
return;
@@ -249,7 +248,7 @@ namespace ServiceLib.ViewModels
{
if (SelectedSource is null || SelectedSource.remarks.IsNullOrEmpty())
{
_noticeHandler?.Enqueue(ResUI.PleaseSelectRules);
NoticeHandler.Instance.Enqueue(ResUI.PleaseSelectRules);
return;
}
if (await _updateView?.Invoke(EViewAction.ShowYesNo, null) == false)
@@ -258,7 +257,7 @@ namespace ServiceLib.ViewModels
}
foreach (var it in SelectedSources ?? [SelectedSource])
{
var item = LazyConfig.Instance.GetRoutingItem(it?.id);
var item = AppHandler.Instance.GetRoutingItem(it?.id);
if (item != null)
{
ConfigHandler.RemoveRoutingItem(item);
@@ -271,10 +270,10 @@ namespace ServiceLib.ViewModels
public void RoutingAdvancedSetDefault()
{
var item = LazyConfig.Instance.GetRoutingItem(SelectedSource?.id);
var item = AppHandler.Instance.GetRoutingItem(SelectedSource?.id);
if (item is null)
{
_noticeHandler?.Enqueue(ResUI.PleaseSelectRules);
NoticeHandler.Instance.Enqueue(ResUI.PleaseSelectRules);
return;
}