This commit is contained in:
DHR60
2026-07-16 09:36:51 +00:00
committed by GitHub
parent 5dd5b25869
commit b8889bad86
3 changed files with 13 additions and 10 deletions
@@ -263,6 +263,11 @@ public class MainWindowViewModel : MyReactiveObject
#endregion AppEvents #endregion AppEvents
ProfilesViewModel.RefreshServersRequested
.AsObservable()
.ObserveOn(RxSchedulers.MainThreadScheduler)
.Subscribe(async _ => await RefreshServers());
var vmReloadRequestedList = new List<IObservable<Unit>> var vmReloadRequestedList = new List<IObservable<Unit>>
{ {
ProfilesViewModel.ReloadRequested.AsObservable(), ProfilesViewModel.ReloadRequested.AsObservable(),
@@ -394,8 +399,8 @@ public class MainWindowViewModel : MyReactiveObject
private async Task RefreshServers() private async Task RefreshServers()
{ {
await ProfilesViewModel.RefreshServers(); await ProfilesViewModel.RefreshServersBiz();
await StatusBarViewModel.RefreshServers(); await StatusBarViewModel.RefreshServersBiz();
// await Task.Delay(200); // await Task.Delay(200);
} }
@@ -11,6 +11,7 @@ public class ProfilesViewModel : MyReactiveObject
public Interaction<Unit, Unit> AdjustMainLvColWidthInteraction { get; } = new(); public Interaction<Unit, Unit> AdjustMainLvColWidthInteraction { get; } = new();
public EventChannel<Unit> ReloadRequested { get; } = new(); public EventChannel<Unit> ReloadRequested { get; } = new();
public EventChannel<Unit> RefreshServersRequested { get; } = new();
#region private prop #region private prop
@@ -368,12 +369,14 @@ public class ProfilesViewModel : MyReactiveObject
public async Task RefreshServers() public async Task RefreshServers()
{ {
await RefreshServersBiz(); RefreshServersRequested.Publish();
// await Task.Delay(200); // await Task.Delay(200);
await Task.CompletedTask;
} }
private async Task RefreshServersBiz() public async Task RefreshServersBiz()
{ {
var lstModel = await GetProfileItemsEx(_config.SubIndexId, _serverFilter); var lstModel = await GetProfileItemsEx(_config.SubIndexId, _serverFilter);
_lstProfile = JsonUtils.Deserialize<List<ProfileItem>>(JsonUtils.Serialize(lstModel)) ?? []; _lstProfile = JsonUtils.Deserialize<List<ProfileItem>>(JsonUtils.Serialize(lstModel)) ?? [];
@@ -264,12 +264,7 @@ public class StatusBarViewModel : MyReactiveObject
await Task.Delay(1000); await Task.Delay(1000);
} }
public async Task RefreshServers() public async Task RefreshServersBiz()
{
await RefreshServersBiz();
}
private async Task RefreshServersBiz()
{ {
await RefreshServersMenu(); await RefreshServersMenu();