fix navigation crash

2025-11-19 21:02:53 +08:00 · 2024-03-07 20:36:47 +08:00
parent 1a64328270
commit 59c9845ad0
5 changed files with 125 additions and 67 deletions
--- a/src/Snap.Hutao/Snap.Hutao/ViewModel/GachaLog/GachaLogViewModel.cs
+++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/GachaLog/GachaLogViewModel.cs
@@ -104,10 +104,14 @@ internal sealed partial class GachaLogViewModel : Abstraction.ViewModel
                ArgumentNullException.ThrowIfNull(gachaLogService.ArchiveCollection);
                ObservableCollection<GachaArchive> archives = gachaLogService.ArchiveCollection;

-                await taskContext.SwitchToMainThreadAsync();
-                Archives = archives;
-                HutaoCloudViewModel.RetrieveCommand = RetrieveFromCloudCommand;
-                await SetSelectedArchiveAndUpdateStatisticsAsync(Archives.SelectedOrDefault(), true).ConfigureAwait(false);
+                using (await EnterCriticalExecutionAsync().ConfigureAwait(false))
+                {
+                    await taskContext.SwitchToMainThreadAsync();
+                    Archives = archives;
+                    HutaoCloudViewModel.RetrieveCommand = RetrieveFromCloudCommand;
+                    await SetSelectedArchiveAndUpdateStatisticsAsync(Archives.SelectedOrDefault(), true).ConfigureAwait(false);
+                }
+
                return true;
            }
        }
--- a/src/Snap.Hutao/Snap.Hutao/ViewModel/Wiki/WikiAvatarViewModel.cs
+++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/Wiki/WikiAvatarViewModel.cs
@@ -94,37 +94,47 @@ internal sealed partial class WikiAvatarViewModel : Abstraction.ViewModel
    {
        if (!await metadataService.InitializeAsync().ConfigureAwait(false))
        {
-            return false;
+            try
+            {
+                levelAvatarCurveMap = await metadataService.GetLevelToAvatarCurveMapAsync().ConfigureAwait(false);
+                promotes = await metadataService.GetAvatarPromoteListAsync().ConfigureAwait(false);
+
+                Dictionary<MaterialId, Material> idMaterialMap = await metadataService.GetIdToMaterialMapAsync().ConfigureAwait(false);
+                List<Avatar> avatars = await metadataService.GetAvatarListAsync().ConfigureAwait(false);
+                IOrderedEnumerable<Avatar> sorted = avatars
+                    .OrderByDescending(avatar => avatar.BeginTime)
+                    .ThenByDescending(avatar => avatar.Sort);
+                List<Avatar> list = [.. sorted];
+
+                await CombineComplexDataAsync(list, idMaterialMap).ConfigureAwait(false);
+
+                using (await EnterCriticalExecutionAsync().ConfigureAwait(false))
+                {
+                    await taskContext.SwitchToMainThreadAsync();
+                    Avatars = new(list, true);
+                    Selected = Avatars.View.ElementAtOrDefault(0);
+                }
+
+                FilterTokens = [];
+
+                availableTokens = FrozenDictionary.ToFrozenDictionary(
+                [
+                    .. avatars.Select(avatar => KeyValuePair.Create(avatar.Name, new SearchToken(SearchTokenKind.Avatar, avatar.Name, sideIconUri: AvatarSideIconConverter.IconNameToUri(avatar.SideIcon)))),
+                    .. IntrinsicFrozen.AssociationTypes.Select(assoc => KeyValuePair.Create(assoc, new SearchToken(SearchTokenKind.AssociationType, assoc, iconUri: AssociationTypeIconConverter.AssociationTypeNameToIconUri(assoc)))),
+                    .. IntrinsicFrozen.BodyTypes.Select(b => KeyValuePair.Create(b, new SearchToken(SearchTokenKind.BodyType, b))),
+                    .. IntrinsicFrozen.ElementNames.Select(e => KeyValuePair.Create(e, new SearchToken(SearchTokenKind.ElementName, e, iconUri: ElementNameIconConverter.ElementNameToIconUri(e)))),
+                    .. IntrinsicFrozen.ItemQualities.Select(i => KeyValuePair.Create(i, new SearchToken(SearchTokenKind.ItemQuality, i, quality: QualityColorConverter.QualityNameToColor(i)))),
+                    .. IntrinsicFrozen.WeaponTypes.Select(w => KeyValuePair.Create(w, new SearchToken(SearchTokenKind.WeaponType, w, iconUri: WeaponTypeIconConverter.WeaponTypeNameToIconUri(w)))),
+                ]);
+
+                return true;
+            }
+            catch (OperationCanceledException)
+            {
+            }
        }

-        levelAvatarCurveMap = await metadataService.GetLevelToAvatarCurveMapAsync().ConfigureAwait(false);
-        promotes = await metadataService.GetAvatarPromoteListAsync().ConfigureAwait(false);
-
-        Dictionary<MaterialId, Material> idMaterialMap = await metadataService.GetIdToMaterialMapAsync().ConfigureAwait(false);
-        List<Avatar> avatars = await metadataService.GetAvatarListAsync().ConfigureAwait(false);
-        IOrderedEnumerable<Avatar> sorted = avatars
-            .OrderByDescending(avatar => avatar.BeginTime)
-            .ThenByDescending(avatar => avatar.Sort);
-        List<Avatar> list = [.. sorted];
-
-        await CombineComplexDataAsync(list, idMaterialMap).ConfigureAwait(false);
-
-        await taskContext.SwitchToMainThreadAsync();
-        Avatars = new(list, true);
-        Selected = Avatars.View.ElementAtOrDefault(0);
-        FilterTokens = [];
-
-        availableTokens = FrozenDictionary.ToFrozenDictionary(
-        [
-            .. avatars.Select(avatar => KeyValuePair.Create(avatar.Name, new SearchToken(SearchTokenKind.Avatar, avatar.Name, sideIconUri: AvatarSideIconConverter.IconNameToUri(avatar.SideIcon)))),
-            .. IntrinsicFrozen.AssociationTypes.Select(assoc => KeyValuePair.Create(assoc, new SearchToken(SearchTokenKind.AssociationType, assoc, iconUri: AssociationTypeIconConverter.AssociationTypeNameToIconUri(assoc)))),
-            .. IntrinsicFrozen.BodyTypes.Select(b => KeyValuePair.Create(b, new SearchToken(SearchTokenKind.BodyType, b))),
-            .. IntrinsicFrozen.ElementNames.Select(e => KeyValuePair.Create(e, new SearchToken(SearchTokenKind.ElementName, e, iconUri: ElementNameIconConverter.ElementNameToIconUri(e)))),
-            .. IntrinsicFrozen.ItemQualities.Select(i => KeyValuePair.Create(i, new SearchToken(SearchTokenKind.ItemQuality, i, quality: QualityColorConverter.QualityNameToColor(i)))),
-            .. IntrinsicFrozen.WeaponTypes.Select(w => KeyValuePair.Create(w, new SearchToken(SearchTokenKind.WeaponType, w, iconUri: WeaponTypeIconConverter.WeaponTypeNameToIconUri(w)))),
-        ]);
-
-        return true;
+        return false;
    }

    private async ValueTask CombineComplexDataAsync(List<Avatar> avatars, Dictionary<MaterialId, Material> idMaterialMap)
--- a/src/Snap.Hutao/Snap.Hutao/ViewModel/Wiki/WikiMonsterViewModel.cs
+++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/Wiki/WikiMonsterViewModel.cs
@@ -53,21 +53,31 @@ internal sealed partial class WikiMonsterViewModel : Abstraction.ViewModel
    {
        if (await metadataService.InitializeAsync().ConfigureAwait(false))
        {
-            levelMonsterCurveMap = await metadataService.GetLevelToMonsterCurveMapAsync().ConfigureAwait(false);
-
-            List<Monster> monsters = await metadataService.GetMonsterListAsync().ConfigureAwait(false);
-            Dictionary<MaterialId, DisplayItem> idDisplayMap = await metadataService.GetIdToDisplayItemAndMaterialMapAsync().ConfigureAwait(false);
-            foreach (Monster monster in monsters)
+            try
+            {
+                levelMonsterCurveMap = await metadataService.GetLevelToMonsterCurveMapAsync().ConfigureAwait(false);
+
+                List<Monster> monsters = await metadataService.GetMonsterListAsync().ConfigureAwait(false);
+                Dictionary<MaterialId, DisplayItem> idDisplayMap = await metadataService.GetIdToDisplayItemAndMaterialMapAsync().ConfigureAwait(false);
+                foreach (Monster monster in monsters)
+                {
+                    monster.DropsView ??= monster.Drops?.SelectList(i => idDisplayMap.GetValueOrDefault(i, Material.Default));
+                }
+
+                List<Monster> ordered = monsters.SortBy(m => m.RelationshipId.Value);
+
+                using (await EnterCriticalExecutionAsync().ConfigureAwait(false))
+                {
+                    await taskContext.SwitchToMainThreadAsync();
+                    Monsters = new(ordered, true);
+                    Selected = Monsters.View.ElementAtOrDefault(0);
+                }
+
+                return true;
+            }
+            catch (OperationCanceledException)
            {
-                monster.DropsView ??= monster.Drops?.SelectList(i => idDisplayMap.GetValueOrDefault(i, Material.Default));
            }
-
-            List<Monster> ordered = monsters.SortBy(m => m.RelationshipId.Value);
-            await taskContext.SwitchToMainThreadAsync();
-
-            Monsters = new(ordered, true);
-            Selected = Monsters.View.ElementAtOrDefault(0);
-            return true;
        }

        return false;
--- a/src/Snap.Hutao/Snap.Hutao/ViewModel/Wiki/WikiWeaponViewModel.cs
+++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/Wiki/WikiWeaponViewModel.cs
@@ -92,32 +92,42 @@ internal sealed partial class WikiWeaponViewModel : Abstraction.ViewModel
    {
        if (await metadataService.InitializeAsync().ConfigureAwait(false))
        {
-            levelWeaponCurveMap = await metadataService.GetLevelToWeaponCurveMapAsync().ConfigureAwait(false);
-            promotes = await metadataService.GetWeaponPromoteListAsync().ConfigureAwait(false);
-            Dictionary<MaterialId, Material> idMaterialMap = await metadataService.GetIdToMaterialMapAsync().ConfigureAwait(false);
+            try
+            {
+                levelWeaponCurveMap = await metadataService.GetLevelToWeaponCurveMapAsync().ConfigureAwait(false);
+                promotes = await metadataService.GetWeaponPromoteListAsync().ConfigureAwait(false);
+                Dictionary<MaterialId, Material> idMaterialMap = await metadataService.GetIdToMaterialMapAsync().ConfigureAwait(false);

-            List<Weapon> weapons = await metadataService.GetWeaponListAsync().ConfigureAwait(false);
-            IEnumerable<Weapon> sorted = weapons
-                .OrderByDescending(weapon => weapon.RankLevel)
-                .ThenBy(weapon => weapon.WeaponType)
-                .ThenByDescending(weapon => weapon.Id.Value);
-            List<Weapon> list = [.. sorted];
+                List<Weapon> weapons = await metadataService.GetWeaponListAsync().ConfigureAwait(false);
+                IEnumerable<Weapon> sorted = weapons
+                    .OrderByDescending(weapon => weapon.RankLevel)
+                    .ThenBy(weapon => weapon.WeaponType)
+                    .ThenByDescending(weapon => weapon.Id.Value);
+                List<Weapon> list = [.. sorted];

-            await CombineComplexDataAsync(list, idMaterialMap).ConfigureAwait(false);
+                await CombineComplexDataAsync(list, idMaterialMap).ConfigureAwait(false);

-            await taskContext.SwitchToMainThreadAsync();
+                using (await EnterCriticalExecutionAsync().ConfigureAwait(false))
+                {
+                    await taskContext.SwitchToMainThreadAsync();

-            Weapons = new(list, true);
-            Selected = Weapons.View.ElementAtOrDefault(0);
-            FilterTokens = [];
+                    Weapons = new(list, true);
+                    Selected = Weapons.View.ElementAtOrDefault(0);
+                }

-            availableTokens = FrozenDictionary.ToFrozenDictionary(
-            [
-                .. weapons.Select(w => KeyValuePair.Create(w.Name, new SearchToken(SearchTokenKind.Weapon, w.Name, sideIconUri: EquipIconConverter.IconNameToUri(w.Icon)))),
-                .. IntrinsicFrozen.FightProperties.Select(f => KeyValuePair.Create(f, new SearchToken(SearchTokenKind.FightProperty, f))),
-                .. IntrinsicFrozen.ItemQualities.Select(i => KeyValuePair.Create(i, new SearchToken(SearchTokenKind.ItemQuality, i, quality: QualityColorConverter.QualityNameToColor(i)))),
-                .. IntrinsicFrozen.WeaponTypes.Select(w => KeyValuePair.Create(w, new SearchToken(SearchTokenKind.WeaponType, w, iconUri: WeaponTypeIconConverter.WeaponTypeNameToIconUri(w)))),
-            ]);
+                FilterTokens = [];
+
+                availableTokens = FrozenDictionary.ToFrozenDictionary(
+                [
+                    .. weapons.Select(w => KeyValuePair.Create(w.Name, new SearchToken(SearchTokenKind.Weapon, w.Name, sideIconUri: EquipIconConverter.IconNameToUri(w.Icon)))),
+                    .. IntrinsicFrozen.FightProperties.Select(f => KeyValuePair.Create(f, new SearchToken(SearchTokenKind.FightProperty, f))),
+                    .. IntrinsicFrozen.ItemQualities.Select(i => KeyValuePair.Create(i, new SearchToken(SearchTokenKind.ItemQuality, i, quality: QualityColorConverter.QualityNameToColor(i)))),
+                    .. IntrinsicFrozen.WeaponTypes.Select(w => KeyValuePair.Create(w, new SearchToken(SearchTokenKind.WeaponType, w, iconUri: WeaponTypeIconConverter.WeaponTypeNameToIconUri(w)))),
+                ]);
+            }
+            catch (OperationCanceledException)
+            {
+            }
        }
    }