From 7b8cc1b4c311b0f8361c19accdd923634cc52fed Mon Sep 17 00:00:00 2001 From: DismissedLight <1686188646@qq.com> Date: Thu, 26 Oct 2023 22:58:40 +0800 Subject: [PATCH] impl #1021 --- .../Snap.Hutao/Resource/Icon/UI_Icon_Gift.png | Bin 0 -> 913 bytes .../Resource/Localization/SH.Designer.cs | 63 ++++++++++++++++++ .../Snap.Hutao/Resource/Localization/SH.resx | 21 ++++++ src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj | 2 + .../Snap.Hutao/View/Page/DailyNotePage.xaml | 38 ++++++++++- .../GameRecord/DailyNote/AttendanceReward.cs | 2 + .../DailyNote/AttendanceRewardStatus.cs | 12 ++++ 7 files changed, 137 insertions(+), 1 deletion(-) create mode 100644 src/Snap.Hutao/Snap.Hutao/Resource/Icon/UI_Icon_Gift.png diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Icon/UI_Icon_Gift.png b/src/Snap.Hutao/Snap.Hutao/Resource/Icon/UI_Icon_Gift.png new file mode 100644 index 0000000000000000000000000000000000000000..02db51fb7073ea4ca2ff478d7c092e29079cdb44 GIT binary patch literal 913 zcmV;C18)3@P)IX<}ocK}`snnB4ij?3=y0Wp3xq?YSPueef|e zJF{=ToqhXeW@iIspkA++vg%8vQk`-jkNr&H-3+bpL*PNle+L)AkKjVi{x^$VPPfW6 zw)??%qgFT@zYW$b<5PImQ%FDImHr4(i~EL<8~~3A&7ef!9qOR)XW$j^l#~yH7eN;M z8bTf+olx332VMh@fJ3Re=hBxKTH#CJUGO-#(YnqZS46}JSf%)3T;R6%zzYt+jAiL# zNh2ua<9q{7f+t#t8m0IFu7lI5`lH~Oq^&S1eW(y3oJV4Y+`L81XfrZ} zr{gGmd0t_Y1>U0g8z9O1L^I|?=7rEWKC5hZ796(nowU71x>B5 zY~=^QL2A6ImtrT#w+&pvd1l+Dyr0FMq}X-%zI_x6U$NR4@xQ@$6#MeDw6Bovd-+DG znK>=|h0>6XCvuPWV`SH0;WtSaCJp$3M@%6R4*%Lk;i4J5@XEC=SE9li;pd;ZV2}6~ z>V6~|dwwI)b+CmO;iq}wjN_UG)c;1JF%gch^$Wh*abz!1cVe71nnK#gFN62N?WyYn zE!q!C>RY$C!0~(&#rsSSscS-$xA7HxZ(nEh?q&cOmlB*Z8}DZ?5MR?M=Hf`S-gkS@k_T;$4fr@S@Qd zUNri`i$-5~(db#>e7a_@wbN^nNdEUlq+6#L8@y3ib=28?EoK?<3Fl=cpV>U7_I5d0 zXl0N493{`+TaBws2wf)>=I`oLYCiXwlXMTohh583<`JEd{QeAkUUbUGXUYB7HGLSh nMjb-X8Bl0Fx&1hgy##*&RU6N4({ + /// 查找类似 历练点获取详情 的本地化字符串。 + /// + internal static string ViewPageDailyNoteAttendanceStatusInfo { + get { + return ResourceManager.GetString("ViewPageDailyNoteAttendanceStatusInfo", resourceCulture); + } + } + /// /// 查找类似 在实时便笺刷新后推送到指定的 Webhook 的本地化字符串。 /// @@ -7116,6 +7125,60 @@ namespace Snap.Hutao.Resource.Localization { } } + /// + /// 查找类似 已完成 的本地化字符串。 + /// + internal static string WebDailyNoteAttendanceRewardStatusFinishedNonReward { + get { + return ResourceManager.GetString("WebDailyNoteAttendanceRewardStatusFinishedNonReward", resourceCulture); + } + } + + /// + /// 查找类似 禁止领取 的本地化字符串。 + /// + internal static string WebDailyNoteAttendanceRewardStatusForbid { + get { + return ResourceManager.GetString("WebDailyNoteAttendanceRewardStatusForbid", resourceCulture); + } + } + + /// + /// 查找类似 无效 的本地化字符串。 + /// + internal static string WebDailyNoteAttendanceRewardStatusInvalid { + get { + return ResourceManager.GetString("WebDailyNoteAttendanceRewardStatusInvalid", resourceCulture); + } + } + + /// + /// 查找类似 已领取 的本地化字符串。 + /// + internal static string WebDailyNoteAttendanceRewardStatusTakenAward { + get { + return ResourceManager.GetString("WebDailyNoteAttendanceRewardStatusTakenAward", resourceCulture); + } + } + + /// + /// 查找类似 尚未完成 的本地化字符串。 + /// + internal static string WebDailyNoteAttendanceRewardStatusUnfinished { + get { + return ResourceManager.GetString("WebDailyNoteAttendanceRewardStatusUnfinished", resourceCulture); + } + } + + /// + /// 查找类似 等待领取 的本地化字符串。 + /// + internal static string WebDailyNoteAttendanceRewardStatusWaitTaken { + get { + return ResourceManager.GetString("WebDailyNoteAttendanceRewardStatusWaitTaken", resourceCulture); + } + } + /// /// 查找类似 {0} 时 的本地化字符串。 /// diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx index a01f84c0..66afb624 100644 --- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx +++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx @@ -1673,6 +1673,9 @@ 添加 + + 历练点获取详情 + 在实时便笺刷新后推送到指定的 Webhook @@ -2525,6 +2528,24 @@ 已复制到剪贴板 + + 已完成 + + + 禁止领取 + + + 无效 + + + 已领取 + + + 尚未完成 + + + 等待领取 + {0} 时 diff --git a/src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj b/src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj index 8fc8ed96..77fc89c4 100644 --- a/src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj +++ b/src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj @@ -100,6 +100,7 @@ + @@ -227,6 +228,7 @@ + diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/DailyNotePage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/DailyNotePage.xaml index b9da657b..9ccec67a 100644 --- a/src/Snap.Hutao/Snap.Hutao/View/Page/DailyNotePage.xaml +++ b/src/Snap.Hutao/Snap.Hutao/View/Page/DailyNotePage.xaml @@ -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 @@ + + diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/GameRecord/DailyNote/AttendanceReward.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/GameRecord/DailyNote/AttendanceReward.cs index 375341a9..76543342 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/GameRecord/DailyNote/AttendanceReward.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/GameRecord/DailyNote/AttendanceReward.cs @@ -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; } } \ No newline at end of file diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/GameRecord/DailyNote/AttendanceRewardStatus.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/GameRecord/DailyNote/AttendanceRewardStatus.cs index 5dacf78b..0dff1c0c 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/GameRecord/DailyNote/AttendanceRewardStatus.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/GameRecord/DailyNote/AttendanceRewardStatus.cs @@ -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, }