fix: infinite loop in signal search page

AuroraZiling · Jul 24, 2024 · c3f8172 · c3f8172
1 parent 8355c92
commit c3f8172
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/Hollow/Services/GachaService/GachaService.cs b/Hollow/Services/GachaService/GachaService.cs
@@ -36,14 +36,14 @@ public partial class GachaService(IConfigurationService configurationService, Ht
             gachaRecords = JsonSerializer.Deserialize<GachaRecords>(await File.ReadAllTextAsync(AppInfo.GachaRecordPath))!;
         }
 
-        var gachaRecordProfileDictionary =  gachaRecords.Profiles.ToDictionary(item => item.Uid, item => item);
+        var gachaRecordProfileDictionary = gachaRecords.Profiles.ToDictionary(item => item.Uid, item => item);
         foreach (var profile in gachaRecordProfileDictionary.Keys)
         {
             gachaRecordProfileDictionary[profile].List = gachaRecordProfileDictionary[profile].List.OrderByDescending(item => item.Id).ToList();
         }
 
         GachaRecordProfileDictionary = gachaRecordProfileDictionary;
-        return gachaRecordProfileDictionary;
+        return GachaRecordProfileDictionary;
     }
 
     private string GetLatestTime(string uid, string gachaType)

diff --git a/Hollow/ViewModels/Pages/SignalSearchViewModel.cs b/Hollow/ViewModels/Pages/SignalSearchViewModel.cs
@@ -28,9 +28,12 @@ public partial class SignalSearchViewModel : ViewModelBase, IViewModelBase
     public void Navigated()
     {
         if (_navigationService.CurrentViewName != nameof(SignalSearch)) return;
-
         GetGachaLogTitle = Lang.SignalSearch_ProhibitedCoverage_Loading;
-        _ = LoadGachaRecords();
+
+        if(GetGachaLogShortMessage == "")
+        {
+            _ = LoadGachaRecords();
+        }
     }
 
     [ObservableProperty] private string _getGachaLogTitle = Lang.SignalSearch_ProhibitedCoverage_Loading;
@@ -79,7 +82,6 @@ private async Task LoadGachaRecords(string? updatedUid = null)
         // Gacha Records
         GetGachaLogShortMessage = Lang.SignalSearch_LoadGachaRecords_GachaRecords;
         _gachaProfiles = await _gachaService.LoadGachaRecordProfileDictionary();
-
         if (_gachaProfiles is null || _gachaProfiles!.Count == 0)
         {
             GetGachaLogShortMessage = Lang.SignalSearch_LoadGachaRecords_GachaRecordsNotFound;
@@ -94,7 +96,8 @@ private async Task LoadGachaRecords(string? updatedUid = null)
         UidList = new ObservableCollection<string>(_analyzedGachaProfiles!.Keys);
         SelectedUid = UidList.FirstOrDefault(uid => uid == updatedUid) ?? UidList.First();
         SelectedAnalyzedGachaRecords = _analyzedGachaProfiles[SelectedUid];
-        await Task.Delay(100);
+
+        await Task.Delay(1000);
 
         RemoveCoverage();
     }

diff --git a/Hollow/Views/MainWindow.axaml b/Hollow/Views/MainWindow.axaml
@@ -12,16 +12,16 @@
     x:Class="Hollow.Views.MainWindow"
     x:DataType="vm:MainWindowViewModel"
     xmlns="https://github.com/avaloniaui"
+    xmlns:acrylic="clr-namespace:Hollow.Views.Controls.Acrylic"
     xmlns:asyncImageLoader="clr-namespace:AsyncImageLoader;assembly=AsyncImageLoader.Avalonia"
     xmlns:avalonia="clr-namespace:FluentIcons.Avalonia;assembly=FluentIcons.Avalonia"
+    xmlns:controls="clr-namespace:Hollow.Views.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:markupExtensions="clr-namespace:FluentIcons.Avalonia.MarkupExtensions;assembly=FluentIcons.Avalonia"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:pages="clr-namespace:Hollow.Views.Pages"
     xmlns:vm="using:Hollow.ViewModels"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:Hollow.Views.Controls"
-    xmlns:acrylic="clr-namespace:Hollow.Views.Controls.Acrylic">
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
     <VisualLayerManager>
         <VisualLayerManager.ChromeOverlayLayer>
@@ -32,6 +32,7 @@
                 IsHitTestVisible="False"
                 Stretch="UniformToFill"
                 asyncImageLoader:ImageLoader.Source="{Binding BackgroundUrl}" />
+            <Panel Background="{StaticResource CoverageBackground}" Opacity="{Binding CoverageOpacity}" />
             <acrylic:Acrylic
                 Blur="20"
                 HorizontalAlignment="Left"