From 5ffdfcab777968a643328f913916edf0d4e4482c Mon Sep 17 00:00:00 2001 From: croire <1432593898@qq.com> Date: Tue, 11 Jan 2022 02:26:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DownKyi/Images/NormalIcon.cs | 8 +++--- DownKyi/Languages/Default.xaml | 15 +++++++++- DownKyi/ViewModels/ViewMySpaceViewModel.cs | 32 ++++++++++++---------- DownKyi/Views/ViewPublicFavorites.xaml | 2 +- 4 files changed, 37 insertions(+), 20 deletions(-) diff --git a/DownKyi/Images/NormalIcon.cs b/DownKyi/Images/NormalIcon.cs index e8fc100..d1388b3 100644 --- a/DownKyi/Images/NormalIcon.cs +++ b/DownKyi/Images/NormalIcon.cs @@ -196,7 +196,7 @@ Fill = "#FF000000" }; - BangumiFollow = new VectorImage + Subscription = new VectorImage { Height = 24, Width = 24, @@ -213,7 +213,7 @@ Fill = "#FF000000" }; - Toview = new VectorImage + ToView = new VectorImage { Height = 24, Width = 24, @@ -257,8 +257,8 @@ public VectorImage BindingPhone { get; private set; } public VectorImage FavoriteOutline { get; private set; } - public VectorImage BangumiFollow { get; private set; } - public VectorImage Toview { get; private set; } + public VectorImage Subscription { get; private set; } + public VectorImage ToView { get; private set; } public VectorImage History { get; private set; } } } diff --git a/DownKyi/Languages/Default.xaml b/DownKyi/Languages/Default.xaml index 8d11b77..d7e3447 100644 --- a/DownKyi/Languages/Default.xaml +++ b/DownKyi/Languages/Default.xaml @@ -37,6 +37,19 @@ 退出登录 请稍等，马上就好~ 等级 + 关注数 + 悄悄关注数 + 粉丝数 + 黑名单数 + 节操值 + 封禁状态 + 收藏夹 + 我的订阅 + 稍后再看 + 历史记录 + + 正常 + 封停 复制封面图片 @@ -219,7 +232,7 @@ 提取视频 - 收藏夹 + 收藏夹 个内容 diff --git a/DownKyi/ViewModels/ViewMySpaceViewModel.cs b/DownKyi/ViewModels/ViewMySpaceViewModel.cs index 6796ead..59c5022 100644 --- a/DownKyi/ViewModels/ViewMySpaceViewModel.cs +++ b/DownKyi/ViewModels/ViewMySpaceViewModel.cs @@ -385,21 +385,21 @@ namespace DownKyi.ViewModels CurrentExp = "--/--"; StatusList.Clear(); - StatusList.Add(new SpaceItem { Title = "关注数", Subtitle = "--" }); - StatusList.Add(new SpaceItem { Title = "悄悄关注数", Subtitle = "--" }); - StatusList.Add(new SpaceItem { Title = "粉丝数", Subtitle = "--" }); - StatusList.Add(new SpaceItem { Title = "黑名单数", Subtitle = "--" }); - StatusList.Add(new SpaceItem { Title = "节操值", Subtitle = "--" }); - StatusList.Add(new SpaceItem { Title = "封禁状态", Subtitle = "N/A" }); + StatusList.Add(new SpaceItem { Title = DictionaryResource.GetString("Following"), Subtitle = "--" }); + StatusList.Add(new SpaceItem { Title = DictionaryResource.GetString("Whisper"), Subtitle = "--" }); + StatusList.Add(new SpaceItem { Title = DictionaryResource.GetString("Follower"), Subtitle = "--" }); + StatusList.Add(new SpaceItem { Title = DictionaryResource.GetString("Black"), Subtitle = "--" }); + StatusList.Add(new SpaceItem { Title = DictionaryResource.GetString("Moral"), Subtitle = "--" }); + StatusList.Add(new SpaceItem { Title = DictionaryResource.GetString("Silence"), Subtitle = "N/A" }); PackageList.Clear(); - PackageList.Add(new SpaceItem { Image = NormalIcon.Instance().FavoriteOutline, Title = "收藏夹" }); - PackageList.Add(new SpaceItem { Image = NormalIcon.Instance().BangumiFollow, Title = "我的订阅" }); - PackageList.Add(new SpaceItem { Image = NormalIcon.Instance().Toview, Title = "稍后再看" }); - PackageList.Add(new SpaceItem { Image = NormalIcon.Instance().History, Title = "历史记录" }); + PackageList.Add(new SpaceItem { Image = NormalIcon.Instance().FavoriteOutline, Title = DictionaryResource.GetString("Favorites") }); + PackageList.Add(new SpaceItem { Image = NormalIcon.Instance().Subscription, Title = DictionaryResource.GetString("Subscription") }); + PackageList.Add(new SpaceItem { Image = NormalIcon.Instance().ToView, Title = DictionaryResource.GetString("ToView") }); + PackageList.Add(new SpaceItem { Image = NormalIcon.Instance().History, Title = DictionaryResource.GetString("History") }); NormalIcon.Instance().FavoriteOutline.Fill = DictionaryResource.GetColor("ColorPrimary"); - NormalIcon.Instance().BangumiFollow.Fill = DictionaryResource.GetColor("ColorPrimary"); - NormalIcon.Instance().Toview.Fill = DictionaryResource.GetColor("ColorPrimary"); + NormalIcon.Instance().Subscription.Fill = DictionaryResource.GetColor("ColorPrimary"); + NormalIcon.Instance().ToView.Fill = DictionaryResource.GetColor("ColorPrimary"); NormalIcon.Instance().History.Fill = DictionaryResource.GetColor("ColorPrimary"); SelectedPackage = -1; @@ -493,9 +493,13 @@ namespace DownKyi.ViewModels StatusList[4].Subtitle = myInfo.Moral.ToString(); // 封禁状态 if (myInfo.Silence == 0) - { StatusList[5].Subtitle = "正常"; } + { + StatusList[5].Subtitle = DictionaryResource.GetString("Normal"); + } else if (myInfo.Silence == 1) - { StatusList[5].Subtitle = "封停"; } + { + StatusList[5].Subtitle = DictionaryResource.GetString("Ban"); + } } else { diff --git a/DownKyi/Views/ViewPublicFavorites.xaml b/DownKyi/Views/ViewPublicFavorites.xaml index 83caaf9..3d4944b 100644 --- a/DownKyi/Views/ViewPublicFavorites.xaml +++ b/DownKyi/Views/ViewPublicFavorites.xaml @@ -40,7 +40,7 @@ VerticalAlignment="Center" FontSize="16" Foreground="{DynamicResource BrushTextDark}" - Text="{DynamicResource Favorites}" /> + Text="{DynamicResource PublicFavorites}" />