add dailynote refresh time hint

YuanYuanOwO · Aug 24, 2023 · b3de8b1 · b3de8b1
1 parent 5a952d8
commit b3de8b1
Show file tree

Hide file tree

Showing 6 changed files with 69 additions and 13 deletions.
diff --git 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<DailyNoteE
     /// </summary>
     public DateTimeOffset RefreshTime { get; set; }
 
+    [NotMapped]
+    public string RefreshTimeFormatted { get => SH.ModelEntityDailyNoteRefreshTimeFormat.Format(RefreshTime); }
+
     /// <summary>
     /// 树脂提醒阈值
     /// </summary>

diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.Designer.cs b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.Designer.cs
diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx
@@ -237,6 +237,9 @@
   <data name="ModelBindingUserInitializationFailed" xml:space="preserve">
     <value>网络异常</value>
   </data>
+  <data name="ModelEntityDailyNoteRefreshTimeFormat" xml:space="preserve">
+    <value>刷新于 {0:yyyy/MM/dd HH:mm:ss}</value>
+  </data>
   <data name="ModelEntitySpiralAbyssScheduleFormat" xml:space="preserve">
     <value>第 {0} 期</value>
   </data>
@@ -2033,6 +2036,9 @@
   <data name="WebDailyNoteHomeCoinRecoveryFormat" xml:space="preserve">
     <value>预计 {0} {1:HH:mm} 达到存储上限</value>
   </data>
+  <data name="WebDailyNoteHomeLocked" xml:space="preserve">
+    <value>尚未解锁洞天</value>
+  </data>
   <data name="WebDailyNoteRecoveryTimeDay0" xml:space="preserve">
     <value>今天</value>
   </data>

diff --git 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}}">
             <FlipView.ItemTemplate>
                 <DataTemplate>
-                    <Grid Margin="12" ColumnSpacing="6">
+                    <Grid
+                        Margin="12"
+                        ColumnSpacing="6"
+                        RowSpacing="6">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition/>
                             <ColumnDefinition/>
                             <ColumnDefinition/>
                         </Grid.ColumnDefinitions>
 
-                        <Grid Grid.Column="0" RowSpacing="6">
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="auto"/>
-                                <RowDefinition/>
-                            </Grid.RowDefinitions>
-                            <TextBlock
-                                Grid.Row="0"
-                                HorizontalAlignment="Center"
-                                Text="{Binding Uid}"/>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="auto"/>
+                            <RowDefinition/>
+                        </Grid.RowDefinitions>
+                        <TextBlock
+                            Grid.Row="0"
+                            HorizontalAlignment="Center"
+                            Style="{StaticResource CaptionTextBlockStyle}"
+                            Text="{Binding Uid}"/>
+                        <TextBlock
+                            Grid.Row="0"
+                            Grid.Column="1"
+                            Grid.ColumnSpan="2"
+                            HorizontalAlignment="Center"
+                            Style="{StaticResource CaptionTextBlockStyle}"
+                            Text="{Binding RefreshTimeFormatted}"/>
+
+                        <Grid
+                            Grid.Row="1"
+                            Grid.Column="0"
+                            RowSpacing="6">
+
                             <Grid Grid.Row="1" Style="{StaticResource BorderGridStyle}">
                                 <StackPanel VerticalAlignment="Center">
                                     <shci:CachedImage shvh:FrameworkElementHelper.SquareLength="64" Source="{StaticResource UI_ItemIcon_210}"/>
@@ -65,7 +81,10 @@
                             </Grid>
                         </Grid>
 
-                        <Grid Grid.Column="1" RowSpacing="6">
+                        <Grid
+                            Grid.Row="1"
+                            Grid.Column="1"
+                            RowSpacing="6">
                             <Grid.RowDefinitions>
                                 <RowDefinition/>
                                 <RowDefinition/>
@@ -108,7 +127,10 @@
                             </Grid>
 
                         </Grid>
-                        <Grid Grid.Column="2" RowSpacing="6">
+                        <Grid
+                            Grid.Row="1"
+                            Grid.Column="2"
+                            RowSpacing="6">
                             <Grid.RowDefinitions>
                                 <RowDefinition/>
                                 <RowDefinition/>

diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/DailyNotePage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/DailyNotePage.xaml
@@ -168,6 +168,7 @@
                                     <RowDefinition Height="auto"/>
                                     <RowDefinition Height="auto"/>
                                     <RowDefinition Height="auto"/>
+                                    <RowDefinition Height="auto"/>
                                 </Grid.RowDefinitions>
 
                                 <Grid.Resources>
@@ -453,6 +454,12 @@
                                         </DataTemplate>
                                     </ItemsControl.ItemTemplate>
                                 </ItemsControl>
+                                <TextBlock
+                                    Grid.Row="4"
+                                    Margin="0,6,0,0"
+                                    Opacity="0.7"
+                                    Style="{StaticResource CaptionTextBlockStyle}"
+                                    Text="{Binding RefreshTimeFormatted}"/>
                             </Grid>
                         </DataTemplate>
                     </ItemsControl.ItemTemplate>

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
@@ -111,7 +111,7 @@ public string ResinDiscountFormatted
     [JsonIgnore]
     public string HomeCoinFormatted
     {
-        get => $"{CurrentHomeCoin}/{MaxHomeCoin}";
+        get => MaxHomeCoin == 0 ? SH.WebDailyNoteHomeLocked : $"{CurrentHomeCoin}/{MaxHomeCoin}";
     }
 
     /// <summary>