Fun/Snap.Hutao
1
0
Fork 0
mirror of https://jihulab.com/DGP-Studio/Snap.Hutao.git synced 2025-11-19 21:02:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

impl #1021

Browse Source
This commit is contained in:
DismissedLight
2023-10-26 22:58:40 +08:00
parent 7c357d3a1c
commit 7b8cc1b4c3
7 changed files with 137 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/Snap.Hutao/Snap.Hutao/Resource/Icon/UI_Icon_Gift.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 913 B

63
src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.Designer.cs generated
View File

@@ -4560,6 +4560,15 @@ namespace Snap.Hutao.Resource.Localization {
}
}
/// <summary>
/// 查找类似 历练点获取详情 的本地化字符串。
/// </summary>
internal static string ViewPageDailyNoteAttendanceStatusInfo {
get {
return ResourceManager.GetString("ViewPageDailyNoteAttendanceStatusInfo", resourceCulture);
}
}
/// <summary>
/// 查找类似 在实时便笺刷新后推送到指定的 Webhook 的本地化字符串。
/// </summary>
@@ -7116,6 +7125,60 @@ namespace Snap.Hutao.Resource.Localization {
}
}
/// <summary>
/// 查找类似 已完成 的本地化字符串。
/// </summary>
internal static string WebDailyNoteAttendanceRewardStatusFinishedNonReward {
get {
return ResourceManager.GetString("WebDailyNoteAttendanceRewardStatusFinishedNonReward", resourceCulture);
}
}
/// <summary>
/// 查找类似 禁止领取 的本地化字符串。
/// </summary>
internal static string WebDailyNoteAttendanceRewardStatusForbid {
get {
return ResourceManager.GetString("WebDailyNoteAttendanceRewardStatusForbid", resourceCulture);
}
}
/// <summary>
/// 查找类似 无效 的本地化字符串。
/// </summary>
internal static string WebDailyNoteAttendanceRewardStatusInvalid {
get {
return ResourceManager.GetString("WebDailyNoteAttendanceRewardStatusInvalid", resourceCulture);
}
}
/// <summary>
/// 查找类似 已领取 的本地化字符串。
/// </summary>
internal static string WebDailyNoteAttendanceRewardStatusTakenAward {
get {
return ResourceManager.GetString("WebDailyNoteAttendanceRewardStatusTakenAward", resourceCulture);
}
}
/// <summary>
/// 查找类似 尚未完成 的本地化字符串。
/// </summary>
internal static string WebDailyNoteAttendanceRewardStatusUnfinished {
get {
return ResourceManager.GetString("WebDailyNoteAttendanceRewardStatusUnfinished", resourceCulture);
}
}
/// <summary>
/// 查找类似 等待领取 的本地化字符串。
/// </summary>
internal static string WebDailyNoteAttendanceRewardStatusWaitTaken {
get {
return ResourceManager.GetString("WebDailyNoteAttendanceRewardStatusWaitTaken", resourceCulture);
}
}
/// <summary>
/// 查找类似 {0} 时 的本地化字符串。
/// </summary>

21
src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx
View File

@@ -1673,6 +1673,9 @@
<data name="ViewPageDailyNoteAddEntryToolTip" xml:space="preserve">
<value>添加</value>
</data>
<data name="ViewPageDailyNoteAttendanceStatusInfo" xml:space="preserve">
<value>历练点获取详情</value>
</data>
<data name="ViewPageDailyNoteConfigWebhookDescription" xml:space="preserve">
<value>在实时便笺刷新后推送到指定的 Webhook</value>
</data>
@@ -2525,6 +2528,24 @@
<data name="WebBridgeShareCopyToClipboardSuccess" xml:space="preserve">
<value>已复制到剪贴板</value>
</data>
<data name="WebDailyNoteAttendanceRewardStatusFinishedNonReward" xml:space="preserve">
<value>已完成</value>
</data>
<data name="WebDailyNoteAttendanceRewardStatusForbid" xml:space="preserve">
<value>禁止领取</value>
</data>
<data name="WebDailyNoteAttendanceRewardStatusInvalid" xml:space="preserve">
<value>无效</value>
</data>
<data name="WebDailyNoteAttendanceRewardStatusTakenAward" xml:space="preserve">
<value>已领取</value>
</data>
<data name="WebDailyNoteAttendanceRewardStatusUnfinished" xml:space="preserve">
<value>尚未完成</value>
</data>
<data name="WebDailyNoteAttendanceRewardStatusWaitTaken" xml:space="preserve">
<value>等待领取</value>
</data>
<data name="WebDailyNoteExpeditionRemainHoursFormat" xml:space="preserve">
<value>{0} 时</value>
</data>

2
src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj
View File

@@ -100,6 +100,7 @@
<None Remove="Resource\Icon\UI_AchievementIcon_3_3.png" />
<None Remove="Resource\Icon\UI_GachaShowPanel_Bg_Weapon.png" />
<None Remove="Resource\Icon\UI_Icon_Fetter.png" />
<None Remove="Resource\Icon\UI_Icon_Gift.png" />
<None Remove="Resource\Icon\UI_Icon_Locked.png" />
<None Remove="Resource\Icon\UI_Icon_Tower_Star.png" />
<None Remove="Resource\Icon\UI_ItemIcon_201.png" />
@@ -227,6 +228,7 @@
<Content Include="Resource\Icon\UI_AchievementIcon_3_3.png" />
<Content Include="Resource\Icon\UI_GachaShowPanel_Bg_Weapon.png" />
<Content Include="Resource\Icon\UI_Icon_Fetter.png" />
<Content Include="Resource\Icon\UI_Icon_Gift.png" />
<Content Include="Resource\Icon\UI_Icon_Locked.png" />
<Content Include="Resource\Icon\UI_Icon_Tower_Star.png" />
<Content Include="Resource\Icon\UI_ItemIcon_201.png" />

38
src/Snap.Hutao/Snap.Hutao/View/Page/DailyNotePage.xaml
View File

@@ -15,6 +15,7 @@
xmlns:shci="using:Snap.Hutao.Control.Image"
xmlns:shcm="using:Snap.Hutao.Control.Markup"
xmlns:shvc="using:Snap.Hutao.View.Control"
xmlns:shvcp="using:Snap.Hutao.View.Card.Primitive"
xmlns:shvd="using:Snap.Hutao.ViewModel.DailyNote"
d:DataContext="{d:DesignInstance shvd:DailyNoteViewModel}"
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
@@ -369,9 +370,10 @@
<Grid.ColumnDefinitions>
<ColumnDefinition Width="auto"/>
<ColumnDefinition/>
<ColumnDefinition Width="auto"/>
</Grid.ColumnDefinitions>
<ProgressBar
Grid.ColumnSpan="2"
Grid.ColumnSpan="3"
Height="40"
MinHeight="48"
Background="{x:Null}"
@@ -401,6 +403,40 @@
TextTrimming="CharacterEllipsis"
TextWrapping="NoWrap"/>
</StackPanel>
<Button
Grid.Column="2"
Width="32"
Height="32"
Margin="0,0,8,0"
Padding="6"
ToolTipService.ToolTip="{shcm:ResourceString Name=ViewPageDailyNoteAttendanceStatusInfo}"
Visibility="{Binding DailyNote.DailyTask.AttendanceVisible, Mode=OneWay}">
<BitmapIcon ShowAsMonochrome="True" UriSource="ms-appx:///Resource/Icon/UI_Icon_Gift.png"/>
<Button.Flyout>
<Flyout Placement="BottomEdgeAlignedRight">
<Flyout.FlyoutPresenterStyle>
<Style BasedOn="{StaticResource DefaultFlyoutPresenterStyle}" TargetType="FlyoutPresenter">
<Setter Property="Padding" Value="6"/>
</Style>
</Flyout.FlyoutPresenterStyle>
<ItemsControl Margin="0,-3,0,0" ItemsSource="{Binding DailyNote.DailyTask.AttendanceRewards}">
<ItemsControl.ItemTemplate>
<DataTemplate>
<shvcp:CardProgressBar
MinWidth="120"
MinHeight="32"
Margin="0,3,0,0"
Description="{Binding Progress}"
Header="{Binding StatusFormatted}"
Maximum="2000"
ProgressForeground="{ThemeResource HyperlinkButtonForeground}"
Value="{Binding Progress}"/>
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>
</Flyout>
</Button.Flyout>
</Button>
</Grid>
<Grid Style="{ThemeResource GridCardStyle}">
<Grid.ColumnDefinitions>

2
src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/GameRecord/DailyNote/AttendanceReward.cs
View File

@@ -9,6 +9,8 @@ internal sealed class AttendanceReward
[JsonConverter(typeof(JsonStringEnumConverter))]
public AttendanceRewardStatus Status { get; set; }
public string StatusFormatted { get => Status.GetLocalizedDescription(); }
[JsonPropertyName("progress")]
public int Progress { get; set; }
}

12
src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/GameRecord/DailyNote/AttendanceRewardStatus.cs
View File

@@ -3,12 +3,24 @@
namespace Snap.Hutao.Web.Hoyolab.Takumi.GameRecord.DailyNote;
[Localization]
internal enum AttendanceRewardStatus
{
[LocalizationKey("WebDailyNoteAttendanceRewardStatusInvalid")]
AttendanceRewardStatusInvalid,
[LocalizationKey("WebDailyNoteAttendanceRewardStatusTakenAward")]
AttendanceRewardStatusTakenAward,
[LocalizationKey("WebDailyNoteAttendanceRewardStatusWaitTaken")]
AttendanceRewardStatusWaitTaken,
[LocalizationKey("WebDailyNoteAttendanceRewardStatusUnfinished")]
AttendanceRewardStatusUnfinished,
[LocalizationKey("WebDailyNoteAttendanceRewardStatusFinishedNonReward")]
AttendanceRewardStatusFinishedNonReward,
[LocalizationKey("WebDailyNoteAttendanceRewardStatusForbid")]
AttendanceRewardStatusForbid,
}