diff --git a/Pixiview/Illust/IllustCollectionPage.cs b/Pixiview/Illust/IllustCollectionPage.cs index f6e70ec..38924a4 100644 --- a/Pixiview/Illust/IllustCollectionPage.cs +++ b/Pixiview/Illust/IllustCollectionPage.cs @@ -525,25 +525,32 @@ namespace Pixiview.Illust illustData = DoLoadIllustData(force); if (illustData == null) { - if (isTrying) + MainThread.BeginInvokeOnMainThread(async () => { - MainThread.BeginInvokeOnMainThread(() => + if (isTrying) { - DisplayAlert(ResourceHelper.Title, + _ = DisplayAlert(ResourceHelper.Title, ResourceHelper.FailedResponse + "\n" + lastError?.Substring(0, 40), ResourceHelper.Ok); - }); - isTrying = false; - } - else - { - isTrying = true; - AppShell.Current.PushToLogin(() => + isTrying = false; + } + else { - Task.Run(() => AppShell.Current.DoLoginInformation(true)); - StartLoad(true); - }); - } + //isTrying = true; + var result = await DisplayAlert( + ResourceHelper.Title, + ResourceHelper.ConfirmLogin, + ResourceHelper.Yes, ResourceHelper.No); + if (result) + { + AppShell.Current.PushToLogin(() => + { + Task.Run(() => AppShell.Current.DoLoginInformation(true)); + StartLoad(true); + }); + } + } + }); //App.DebugError("illusts.load", "failed to load illusts data."); IsLoading = false; IsBottomLoading = false; diff --git a/Pixiview/Resources/Languages/zh-CN.xml b/Pixiview/Resources/Languages/zh-CN.xml index 6241aba..535d187 100644 --- a/Pixiview/Resources/Languages/zh-CN.xml +++ b/Pixiview/Resources/Languages/zh-CN.xml @@ -58,4 +58,5 @@ 视频已导出到照片库。 无法获取返回结果。 要同步收藏吗? + 当前身份为游客,是否跳转到登录页面? \ No newline at end of file diff --git a/Pixiview/Resources/ResourceHelper.cs b/Pixiview/Resources/ResourceHelper.cs index cb26e8e..706da68 100644 --- a/Pixiview/Resources/ResourceHelper.cs +++ b/Pixiview/Resources/ResourceHelper.cs @@ -38,6 +38,7 @@ namespace Pixiview.Resources public static string ExportSuccess => GetResource(nameof(ExportSuccess)); public static string FailedResponse => GetResource(nameof(FailedResponse)); public static string ConfirmSyncFavorite => GetResource(nameof(ConfirmSyncFavorite)); + public static string ConfirmLogin => GetResource(nameof(ConfirmLogin)); static readonly Dictionary dict = new Dictionary();