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 Sun Aug 17 20:39:11 CEST 2025

Browse Source
This commit is contained in:
github-action[bot]
2025-08-17 20:39:12 +02:00
parent ef94c2e71c
commit 4b335cfee5
219 changed files with 7017 additions and 5933 deletions
Download Patch File Download Diff File Expand all files Collapse all files
v2rayn/v2rayN/ServiceLib/ViewModels/RoutingSettingViewModel.cs
+9 -14
View File
@@ -20,9 +20,6 @@ public class RoutingSettingViewModel : MyReactiveObject
[Reactive]
public string DomainStrategy { get; set; }
[Reactive]
public string DomainMatcher { get; set; }
[Reactive]
public string DomainStrategy4Singbox { get; set; }
@@ -38,7 +35,7 @@ public class RoutingSettingViewModel : MyReactiveObject
public RoutingSettingViewModel(Func<EViewAction, object?, Task<bool>>? updateView)
{
_config = AppHandler.Instance.Config;
_config = AppManager.Instance.Config;
_updateView = updateView;
var canEditRemove = this.WhenAnyValue(
@@ -75,7 +72,6 @@ public class RoutingSettingViewModel : MyReactiveObject
SelectedSource = new();
DomainStrategy = _config.RoutingBasicItem.DomainStrategy;
DomainMatcher = _config.RoutingBasicItem.DomainMatcher;
DomainStrategy4Singbox = _config.RoutingBasicItem.DomainStrategy4Singbox;
await ConfigHandler.InitBuiltinRouting(_config);
@@ -88,7 +84,7 @@ public class RoutingSettingViewModel : MyReactiveObject
{
_routingItems.Clear();
var routings = await AppHandler.Instance.RoutingItems();
var routings = await AppManager.Instance.RoutingItems();
foreach (var item in routings)
{
var it = new RoutingItemModel()
@@ -109,17 +105,16 @@ public class RoutingSettingViewModel : MyReactiveObject
private async Task SaveRoutingAsync()
{
_config.RoutingBasicItem.DomainStrategy = DomainStrategy;
_config.RoutingBasicItem.DomainMatcher = DomainMatcher;
_config.RoutingBasicItem.DomainStrategy4Singbox = DomainStrategy4Singbox;
if (await ConfigHandler.SaveConfig(_config) == 0)
{
NoticeHandler.Instance.Enqueue(ResUI.OperationSuccess);
NoticeManager.Instance.Enqueue(ResUI.OperationSuccess);
_updateView?.Invoke(EViewAction.CloseWindow, null);
}
else
{
NoticeHandler.Instance.Enqueue(ResUI.OperationFailed);
NoticeManager.Instance.Enqueue(ResUI.OperationFailed);
}
}
@@ -134,7 +129,7 @@ public class RoutingSettingViewModel : MyReactiveObject
}
else
{
item = await AppHandler.Instance.GetRoutingItem(SelectedSource?.Id);
item = await AppManager.Instance.GetRoutingItem(SelectedSource?.Id);
if (item is null)
{
return;
@@ -151,7 +146,7 @@ public class RoutingSettingViewModel : MyReactiveObject
{
if (SelectedSource is null || SelectedSource.Remarks.IsNullOrEmpty())
{
NoticeHandler.Instance.Enqueue(ResUI.PleaseSelectRules);
NoticeManager.Instance.Enqueue(ResUI.PleaseSelectRules);
return;
}
if (await _updateView?.Invoke(EViewAction.ShowYesNo, null) == false)
@@ -160,7 +155,7 @@ public class RoutingSettingViewModel : MyReactiveObject
}
foreach (var it in SelectedSources ?? [SelectedSource])
{
var item = await AppHandler.Instance.GetRoutingItem(it?.Id);
var item = await AppManager.Instance.GetRoutingItem(it?.Id);
if (item != null)
{
await ConfigHandler.RemoveRoutingItem(item);
@@ -173,10 +168,10 @@ public class RoutingSettingViewModel : MyReactiveObject
public async Task RoutingAdvancedSetDefault()
{
var item = await AppHandler.Instance.GetRoutingItem(SelectedSource?.Id);
var item = await AppManager.Instance.GetRoutingItem(SelectedSource?.Id);
if (item is null)
{
NoticeHandler.Instance.Enqueue(ResUI.PleaseSelectRules);
NoticeManager.Instance.Enqueue(ResUI.PleaseSelectRules);
return;
}