diff --git a/src/Snap.Hutao/Snap.Hutao/Model/Entity/DailyNoteEntry.cs b/src/Snap.Hutao/Snap.Hutao/Model/Entity/DailyNoteEntry.cs index 0c7822e11..0ae56cf39 100644 --- a/src/Snap.Hutao/Snap.Hutao/Model/Entity/DailyNoteEntry.cs +++ b/src/Snap.Hutao/Snap.Hutao/Model/Entity/DailyNoteEntry.cs @@ -57,6 +57,9 @@ internal sealed class DailyNoteEntry : ObservableObject, IMappingFrom public DateTimeOffset RefreshTime { get; set; } + [NotMapped] + public string RefreshTimeFormatted { get => SH.ModelEntityDailyNoteRefreshTimeFormat.Format(RefreshTime); } + /// /// 树脂提醒阈值 /// diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.Designer.cs b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.Designer.cs index 2491d8827..cf082503f 100644 --- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.Designer.cs +++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.Designer.cs @@ -420,6 +420,15 @@ internal class SH { } } + /// + /// 查找类似 刷新于 {0:yyyy/MM/dd HH:mm:ss} 的本地化字符串。 + /// + internal static string ModelEntityDailyNoteRefreshTimeFormat { + get { + return ResourceManager.GetString("ModelEntityDailyNoteRefreshTimeFormat", resourceCulture); + } + } + /// /// 查找类似 第 {0} 期 的本地化字符串。 /// @@ -5640,6 +5649,15 @@ internal class SH { } } + /// + /// 查找类似 尚未解锁洞天 的本地化字符串。 + /// + internal static string WebDailyNoteHomeLocked { + get { + return ResourceManager.GetString("WebDailyNoteHomeLocked", resourceCulture); + } + } + /// /// 查找类似 今天 的本地化字符串。 /// diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx index 7d9526b58..52cfd5c16 100644 --- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx +++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx @@ -237,6 +237,9 @@ 网络异常 + + 刷新于 {0:yyyy/MM/dd HH:mm:ss} + 第 {0} 期 @@ -2033,6 +2036,9 @@ 预计 {0} {1:HH:mm} 达到存储上限 + + 尚未解锁洞天 + 今天 diff --git a/src/Snap.Hutao/Snap.Hutao/View/Card/DailyNoteCard.xaml b/src/Snap.Hutao/Snap.Hutao/View/Card/DailyNoteCard.xaml index 6f7fa4f7f..001788dba 100644 --- a/src/Snap.Hutao/Snap.Hutao/View/Card/DailyNoteCard.xaml +++ b/src/Snap.Hutao/Snap.Hutao/View/Card/DailyNoteCard.xaml @@ -30,22 +30,38 @@ Visibility="{Binding IsInitialized, Converter={StaticResource BoolToVisibilityConverter}}"> - + - - - - - - + + + + + + + + + @@ -65,7 +81,10 @@ - + @@ -108,7 +127,10 @@ - + diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/DailyNotePage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/DailyNotePage.xaml index 36b2c2553..c89716353 100644 --- a/src/Snap.Hutao/Snap.Hutao/View/Page/DailyNotePage.xaml +++ b/src/Snap.Hutao/Snap.Hutao/View/Page/DailyNotePage.xaml @@ -168,6 +168,7 @@ + @@ -453,6 +454,12 @@ + diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/GameRecord/DailyNote/DailyNote.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/GameRecord/DailyNote/DailyNote.cs index 9e2aed5f3..4c026e624 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/GameRecord/DailyNote/DailyNote.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/GameRecord/DailyNote/DailyNote.cs @@ -111,7 +111,7 @@ public string ResinDiscountFormatted [JsonIgnore] public string HomeCoinFormatted { - get => $"{CurrentHomeCoin}/{MaxHomeCoin}"; + get => MaxHomeCoin == 0 ? SH.WebDailyNoteHomeLocked : $"{CurrentHomeCoin}/{MaxHomeCoin}"; } ///