mirror of
https://github.com/2dust/v2rayN.git
synced 2026-10-09 06:59:53 +03:00
Optimize and improve the Subject
This commit is contained in:
@@ -223,7 +223,7 @@ public class CheckUpdateViewModel : MyReactiveObject
|
||||
{
|
||||
if (blReload)
|
||||
{
|
||||
AppEvents.ReloadRequested.OnNext(Unit.Default);
|
||||
AppEvents.ReloadRequested.Publish();
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
@@ -292,7 +292,7 @@ public class MainWindowViewModel : MyReactiveObject
|
||||
}
|
||||
if (_config.UiItem.EnableAutoAdjustMainLvColWidth)
|
||||
{
|
||||
AppEvents.AdjustMainLvColWidthRequested.OnNext(Unit.Default);
|
||||
AppEvents.AdjustMainLvColWidthRequested.Publish();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -303,7 +303,7 @@ public class MainWindowViewModel : MyReactiveObject
|
||||
{
|
||||
return;
|
||||
}
|
||||
AppEvents.DispatcherStatisticsRequested.OnNext(update);
|
||||
AppEvents.DispatcherStatisticsRequested.Publish(update);
|
||||
}
|
||||
|
||||
#endregion Actions
|
||||
@@ -312,14 +312,14 @@ public class MainWindowViewModel : MyReactiveObject
|
||||
|
||||
private async Task RefreshServers()
|
||||
{
|
||||
AppEvents.ProfilesRefreshRequested.OnNext(Unit.Default);
|
||||
AppEvents.ProfilesRefreshRequested.Publish();
|
||||
|
||||
await Task.Delay(200);
|
||||
}
|
||||
|
||||
private void RefreshSubscriptions()
|
||||
{
|
||||
AppEvents.SubscriptionsRefreshRequested.OnNext(Unit.Default);
|
||||
AppEvents.SubscriptionsRefreshRequested.Publish();
|
||||
}
|
||||
|
||||
#endregion Servers && Groups
|
||||
@@ -451,7 +451,7 @@ public class MainWindowViewModel : MyReactiveObject
|
||||
var ret = await _updateView?.Invoke(EViewAction.OptionSettingWindow, null);
|
||||
if (ret == true)
|
||||
{
|
||||
AppEvents.InboundDisplayRequested.OnNext(Unit.Default);
|
||||
AppEvents.InboundDisplayRequested.Publish();
|
||||
await Reload();
|
||||
}
|
||||
}
|
||||
@@ -462,7 +462,7 @@ public class MainWindowViewModel : MyReactiveObject
|
||||
if (ret == true)
|
||||
{
|
||||
await ConfigHandler.InitBuiltinRouting(_config);
|
||||
AppEvents.RoutingsMenuRefreshRequested.OnNext(Unit.Default);
|
||||
AppEvents.RoutingsMenuRefreshRequested.Publish();
|
||||
await Reload();
|
||||
}
|
||||
}
|
||||
@@ -530,12 +530,12 @@ public class MainWindowViewModel : MyReactiveObject
|
||||
await SysProxyHandler.UpdateSysProxy(_config, false);
|
||||
await Task.Delay(1000);
|
||||
});
|
||||
AppEvents.TestServerRequested.OnNext(Unit.Default);
|
||||
AppEvents.TestServerRequested.Publish();
|
||||
|
||||
var showClashUI = _config.IsRunningCore(ECoreType.sing_box);
|
||||
if (showClashUI)
|
||||
{
|
||||
AppEvents.ProxiesReloadRequested.OnNext(Unit.Default);
|
||||
AppEvents.ProxiesReloadRequested.Publish();
|
||||
}
|
||||
|
||||
RxApp.MainThreadScheduler.Schedule(() => ReloadResult(showClashUI));
|
||||
@@ -565,7 +565,7 @@ public class MainWindowViewModel : MyReactiveObject
|
||||
{
|
||||
if (_config.UiItem.AutoHideStartup)
|
||||
{
|
||||
AppEvents.ShowHideWindowRequested.OnNext(false);
|
||||
AppEvents.ShowHideWindowRequested.Publish(false);
|
||||
}
|
||||
await Task.CompletedTask;
|
||||
}
|
||||
@@ -578,7 +578,7 @@ public class MainWindowViewModel : MyReactiveObject
|
||||
{
|
||||
await ConfigHandler.ApplyRegionalPreset(_config, type);
|
||||
await ConfigHandler.InitRouting(_config);
|
||||
AppEvents.RoutingsMenuRefreshRequested.OnNext(Unit.Default);
|
||||
AppEvents.RoutingsMenuRefreshRequested.Publish();
|
||||
|
||||
await ConfigHandler.SaveConfig(_config);
|
||||
await new UpdateService().UpdateGeoFileAll(_config, UpdateTaskHandler);
|
||||
|
||||
@@ -275,7 +275,7 @@ public class ProfilesViewModel : MyReactiveObject
|
||||
|
||||
private void Reload()
|
||||
{
|
||||
AppEvents.ReloadRequested.OnNext(Unit.Default);
|
||||
AppEvents.ReloadRequested.Publish();
|
||||
}
|
||||
|
||||
public async Task SetSpeedTestResult(SpeedTestResult result)
|
||||
@@ -361,7 +361,7 @@ public class ProfilesViewModel : MyReactiveObject
|
||||
|
||||
public async Task RefreshServers()
|
||||
{
|
||||
AppEvents.ProfilesRefreshRequested.OnNext(Unit.Default);
|
||||
AppEvents.ProfilesRefreshRequested.Publish();
|
||||
|
||||
await Task.Delay(200);
|
||||
}
|
||||
|
||||
@@ -148,17 +148,17 @@ public class StatusBarViewModel : MyReactiveObject
|
||||
|
||||
NotifyLeftClickCmd = ReactiveCommand.CreateFromTask(async () =>
|
||||
{
|
||||
AppEvents.ShowHideWindowRequested.OnNext(null);
|
||||
AppEvents.ShowHideWindowRequested.Publish(null);
|
||||
await Task.CompletedTask;
|
||||
});
|
||||
ShowWindowCmd = ReactiveCommand.CreateFromTask(async () =>
|
||||
{
|
||||
AppEvents.ShowHideWindowRequested.OnNext(true);
|
||||
AppEvents.ShowHideWindowRequested.Publish(true);
|
||||
await Task.CompletedTask;
|
||||
});
|
||||
HideWindowCmd = ReactiveCommand.CreateFromTask(async () =>
|
||||
{
|
||||
AppEvents.ShowHideWindowRequested.OnNext(false);
|
||||
AppEvents.ShowHideWindowRequested.Publish(false);
|
||||
await Task.CompletedTask;
|
||||
});
|
||||
|
||||
@@ -274,19 +274,19 @@ public class StatusBarViewModel : MyReactiveObject
|
||||
|
||||
private async Task AddServerViaClipboard()
|
||||
{
|
||||
AppEvents.AddServerViaClipboardRequested.OnNext(Unit.Default);
|
||||
AppEvents.AddServerViaClipboardRequested.Publish();
|
||||
await Task.Delay(1000);
|
||||
}
|
||||
|
||||
private async Task AddServerViaScan()
|
||||
{
|
||||
AppEvents.AddServerViaScanRequested.OnNext(Unit.Default);
|
||||
AppEvents.AddServerViaScanRequested.Publish();
|
||||
await Task.Delay(1000);
|
||||
}
|
||||
|
||||
private async Task UpdateSubscriptionProcess(bool blProxy)
|
||||
{
|
||||
AppEvents.SubscriptionsUpdateRequested.OnNext(blProxy);
|
||||
AppEvents.SubscriptionsUpdateRequested.Publish(blProxy);
|
||||
await Task.Delay(1000);
|
||||
}
|
||||
|
||||
@@ -348,7 +348,7 @@ public class StatusBarViewModel : MyReactiveObject
|
||||
{
|
||||
return;
|
||||
}
|
||||
AppEvents.SetDefaultServerRequested.OnNext(SelectedServer.ID);
|
||||
AppEvents.SetDefaultServerRequested.Publish(SelectedServer.ID);
|
||||
}
|
||||
|
||||
public async Task TestServerAvailability()
|
||||
@@ -449,7 +449,7 @@ public class StatusBarViewModel : MyReactiveObject
|
||||
if (await ConfigHandler.SetDefaultRouting(_config, item) == 0)
|
||||
{
|
||||
NoticeManager.Instance.SendMessageEx(ResUI.TipChangeRouting);
|
||||
AppEvents.ReloadRequested.OnNext(Unit.Default);
|
||||
AppEvents.ReloadRequested.Publish();
|
||||
_updateView?.Invoke(EViewAction.DispatcherRefreshIcon, null);
|
||||
}
|
||||
}
|
||||
@@ -496,7 +496,7 @@ public class StatusBarViewModel : MyReactiveObject
|
||||
}
|
||||
}
|
||||
await ConfigHandler.SaveConfig(_config);
|
||||
AppEvents.ReloadRequested.OnNext(Unit.Default);
|
||||
AppEvents.ReloadRequested.Publish();
|
||||
}
|
||||
|
||||
private bool AllowEnableTun()
|
||||
|
||||
Reference in New Issue
Block a user