mirror of
https://jihulab.com/DGP-Studio/Snap.Hutao.git
synced 2025-11-19 21:02:53 +08:00
Compare commits
3 Commits
feat/1595
...
feat/daily
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
df7f685a3c | ||
|
|
9d47082f47 | ||
|
|
cd4516d9a7 |
@@ -1994,6 +1994,9 @@
|
|||||||
<data name="ViewPageDailyNoteSettingRefreshHeader" xml:space="preserve">
|
<data name="ViewPageDailyNoteSettingRefreshHeader" xml:space="preserve">
|
||||||
<value>刷新</value>
|
<value>刷新</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="ViewPageDailyNoteSettingRefreshNotifyIconDisabledHint" xml:space="preserve">
|
||||||
|
<value>未启用通知区域图标,自动刷新将不会执行</value>
|
||||||
|
</data>
|
||||||
<data name="ViewPageDailyNoteSlientModeDescription" xml:space="preserve">
|
<data name="ViewPageDailyNoteSlientModeDescription" xml:space="preserve">
|
||||||
<value>在我游玩原神时不通知我</value>
|
<value>在我游玩原神时不通知我</value>
|
||||||
</data>
|
</data>
|
||||||
@@ -3257,4 +3260,4 @@
|
|||||||
<data name="WindowIdentifyMonitorHeader" xml:space="preserve">
|
<data name="WindowIdentifyMonitorHeader" xml:space="preserve">
|
||||||
<value>显示器编号</value>
|
<value>显示器编号</value>
|
||||||
</data>
|
</data>
|
||||||
</root>
|
</root>
|
||||||
@@ -507,6 +507,12 @@
|
|||||||
Text="{shcm:ResourceString Name=ViewPageDailyNoteSettingRefreshHeader}"/>
|
Text="{shcm:ResourceString Name=ViewPageDailyNoteSettingRefreshHeader}"/>
|
||||||
</cwcont:HeaderedContentControl.Header>
|
</cwcont:HeaderedContentControl.Header>
|
||||||
<StackPanel Spacing="{StaticResource SettingsCardSpacing}">
|
<StackPanel Spacing="{StaticResource SettingsCardSpacing}">
|
||||||
|
<InfoBar
|
||||||
|
Title="{shcm:ResourceString Name=ViewPageDailyNoteSettingRefreshNotifyIconDisabledHint}"
|
||||||
|
IsClosable="False"
|
||||||
|
IsOpen="True"
|
||||||
|
Severity="Warning"
|
||||||
|
Visibility="{Binding AppOptions.IsNotifyIconEnabled, Converter={StaticResource BoolToVisibilityRevertConverter}}"/>
|
||||||
<cwcont:SettingsCard
|
<cwcont:SettingsCard
|
||||||
Description="{shcm:ResourceString Name=ViewPageDailyNoteSettingAutoRefreshDescription}"
|
Description="{shcm:ResourceString Name=ViewPageDailyNoteSettingAutoRefreshDescription}"
|
||||||
Header="{shcm:ResourceString Name=ViewPageDailyNoteSettingAutoRefresh}"
|
Header="{shcm:ResourceString Name=ViewPageDailyNoteSettingAutoRefresh}"
|
||||||
|
|||||||
@@ -104,8 +104,10 @@
|
|||||||
</Border>
|
</Border>
|
||||||
</Border>
|
</Border>
|
||||||
|
|
||||||
<cwc:SwitchPresenter Grid.Row="1" Value="{Binding ElementName=ItemsPanelSelector, Path=Current}">
|
<cwc:SwitchPresenter
|
||||||
|
Grid.Row="1"
|
||||||
|
ContentTransitions="{ThemeResource EntranceThemeTransitions}"
|
||||||
|
Value="{Binding ElementName=ItemsPanelSelector, Path=Current}">
|
||||||
<cwc:Case Value="List">
|
<cwc:Case Value="List">
|
||||||
<Border Margin="16,0,16,16" cw:Effects.Shadow="{ThemeResource CompatCardShadow}">
|
<Border Margin="16,0,16,16" cw:Effects.Shadow="{ThemeResource CompatCardShadow}">
|
||||||
<Border Style="{ThemeResource AcrylicBorderCardStyle}">
|
<Border Style="{ThemeResource AcrylicBorderCardStyle}">
|
||||||
@@ -113,7 +115,7 @@
|
|||||||
DisplayMode="Inline"
|
DisplayMode="Inline"
|
||||||
IsPaneOpen="True"
|
IsPaneOpen="True"
|
||||||
OpenPaneLength="{StaticResource CompatSplitViewOpenPaneLength2}"
|
OpenPaneLength="{StaticResource CompatSplitViewOpenPaneLength2}"
|
||||||
PaneBackground="{StaticResource CardBackgroundFillColorSecondary}">
|
PaneBackground="{ThemeResource CardBackgroundFillColorSecondaryBrush}">
|
||||||
<SplitView.Pane>
|
<SplitView.Pane>
|
||||||
<ListView
|
<ListView
|
||||||
Grid.Row="1"
|
Grid.Row="1"
|
||||||
|
|||||||
@@ -218,7 +218,7 @@
|
|||||||
DisplayMode="Inline"
|
DisplayMode="Inline"
|
||||||
IsPaneOpen="True"
|
IsPaneOpen="True"
|
||||||
OpenPaneLength="{StaticResource CompatSplitViewOpenPaneLength}"
|
OpenPaneLength="{StaticResource CompatSplitViewOpenPaneLength}"
|
||||||
PaneBackground="{StaticResource CardBackgroundFillColorSecondary}">
|
PaneBackground="{ThemeResource CardBackgroundFillColorSecondaryBrush}">
|
||||||
<SplitView.Pane>
|
<SplitView.Pane>
|
||||||
<ListView
|
<ListView
|
||||||
Grid.Row="1"
|
Grid.Row="1"
|
||||||
|
|||||||
@@ -372,8 +372,13 @@ internal sealed partial class AchievementViewModel : Abstraction.ViewModel, INav
|
|||||||
|
|
||||||
private void UpdateAchievementsFinishPercent()
|
private void UpdateAchievementsFinishPercent()
|
||||||
{
|
{
|
||||||
|
// 保存成就状态时,需要保持当前选择的成就分类
|
||||||
|
AchievementGoalView? currentSelectedAchievementGoal = SelectedAchievementGoal;
|
||||||
|
|
||||||
// 仅 读取成就列表 与 保存成就状态 时需要刷新成就进度
|
// 仅 读取成就列表 与 保存成就状态 时需要刷新成就进度
|
||||||
AchievementFinishPercent.Update(this);
|
AchievementFinishPercent.Update(this);
|
||||||
|
|
||||||
|
SelectedAchievementGoal = currentSelectedAchievementGoal;
|
||||||
}
|
}
|
||||||
|
|
||||||
[Command("SaveAchievementCommand")]
|
[Command("SaveAchievementCommand")]
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ using Snap.Hutao.Control.Extension;
|
|||||||
using Snap.Hutao.Core;
|
using Snap.Hutao.Core;
|
||||||
using Snap.Hutao.Factory.ContentDialog;
|
using Snap.Hutao.Factory.ContentDialog;
|
||||||
using Snap.Hutao.Model.Entity;
|
using Snap.Hutao.Model.Entity;
|
||||||
|
using Snap.Hutao.Service;
|
||||||
using Snap.Hutao.Service.DailyNote;
|
using Snap.Hutao.Service.DailyNote;
|
||||||
using Snap.Hutao.Service.Metadata;
|
using Snap.Hutao.Service.Metadata;
|
||||||
using Snap.Hutao.Service.Notification;
|
using Snap.Hutao.Service.Notification;
|
||||||
@@ -32,12 +33,15 @@ internal sealed partial class DailyNoteViewModel : Abstraction.ViewModel
|
|||||||
private readonly IInfoBarService infoBarService;
|
private readonly IInfoBarService infoBarService;
|
||||||
private readonly ITaskContext taskContext;
|
private readonly ITaskContext taskContext;
|
||||||
private readonly IUserService userService;
|
private readonly IUserService userService;
|
||||||
|
private readonly AppOptions appOptions;
|
||||||
|
|
||||||
private ObservableCollection<UserAndUid>? userAndUids;
|
private ObservableCollection<UserAndUid>? userAndUids;
|
||||||
private ObservableCollection<DailyNoteEntry>? dailyNoteEntries;
|
private ObservableCollection<DailyNoteEntry>? dailyNoteEntries;
|
||||||
|
|
||||||
public DailyNoteOptions DailyNoteOptions { get => dailyNoteOptions; }
|
public DailyNoteOptions DailyNoteOptions { get => dailyNoteOptions; }
|
||||||
|
|
||||||
|
public AppOptions AppOptions { get => appOptions; }
|
||||||
|
|
||||||
public IWebViewerSource VerifyUrlSource { get; } = new DailyNoteWebViewerSource();
|
public IWebViewerSource VerifyUrlSource { get; } = new DailyNoteWebViewerSource();
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|||||||
Reference in New Issue
Block a user