From 15c31ee6b8d9d4bb61c5bb232cd74a9737cf6742 Mon Sep 17 00:00:00 2001 From: leiurayer <1432593898@qq.com> Date: Sat, 5 Nov 2022 21:48:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E7=BC=96=E8=AF=91=E8=AD=A6?= =?UTF-8?q?=E5=91=8A=EF=BC=8C=E7=BA=A0=E6=AD=A3=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/DownKyi/ViewModels/BaseViewModel.cs | 2 +- src/DownKyi/ViewModels/Settings/ViewAboutViewModel.cs | 2 +- src/DownKyi/ViewModels/Settings/ViewBasicViewModel.cs | 2 +- src/DownKyi/ViewModels/Settings/ViewDanmakuViewModel.cs | 2 +- src/DownKyi/ViewModels/Settings/ViewVideoViewModel.cs | 2 +- src/DownKyi/ViewModels/ViewChannelViewModel.cs | 4 +--- src/DownKyi/ViewModels/ViewDownloadManagerViewModel.cs | 2 +- src/DownKyi/ViewModels/ViewMyBangumiFollowViewModel.cs | 4 +--- src/DownKyi/ViewModels/ViewMyFavoritesViewModel.cs | 5 ++--- src/DownKyi/ViewModels/ViewMyHistoryViewModel.cs | 4 +--- src/DownKyi/ViewModels/ViewMyToViewVideoViewModel.cs | 4 +--- src/DownKyi/ViewModels/ViewPublicFavoritesViewModel.cs | 2 -- src/DownKyi/ViewModels/ViewPublicationViewModel.cs | 4 +--- src/DownKyi/ViewModels/ViewSeasonsSeriesViewModel.cs | 2 -- src/DownKyi/ViewModels/ViewSettingsViewModel.cs | 2 +- src/DownKyi/ViewModels/ViewToolboxViewModel.cs | 2 +- src/DownKyi/ViewModels/ViewVideoDetailViewModel.cs | 2 +- 17 files changed, 16 insertions(+), 31 deletions(-) diff --git a/src/DownKyi/ViewModels/BaseViewModel.cs b/src/DownKyi/ViewModels/BaseViewModel.cs index 89d5852..b8a3081 100644 --- a/src/DownKyi/ViewModels/BaseViewModel.cs +++ b/src/DownKyi/ViewModels/BaseViewModel.cs @@ -10,7 +10,7 @@ namespace DownKyi.ViewModels public class BaseViewModel : BindableBase, INavigationAware { protected readonly IEventAggregator eventAggregator; - protected readonly IDialogService dialogService; + protected IDialogService dialogService; protected string ParentView = string.Empty; public BaseViewModel(IEventAggregator eventAggregator) diff --git a/src/DownKyi/ViewModels/Settings/ViewAboutViewModel.cs b/src/DownKyi/ViewModels/Settings/ViewAboutViewModel.cs index 1d3fdb9..0cdf35b 100644 --- a/src/DownKyi/ViewModels/Settings/ViewAboutViewModel.cs +++ b/src/DownKyi/ViewModels/Settings/ViewAboutViewModel.cs @@ -60,7 +60,7 @@ namespace DownKyi.ViewModels.Settings } /// - /// 导航到VideoDetail页面时执行 + /// 导航到页面时执行 /// /// public override void OnNavigatedTo(NavigationContext navigationContext) diff --git a/src/DownKyi/ViewModels/Settings/ViewBasicViewModel.cs b/src/DownKyi/ViewModels/Settings/ViewBasicViewModel.cs index eee40ca..3f2ce2b 100644 --- a/src/DownKyi/ViewModels/Settings/ViewBasicViewModel.cs +++ b/src/DownKyi/ViewModels/Settings/ViewBasicViewModel.cs @@ -95,7 +95,7 @@ namespace DownKyi.ViewModels.Settings } /// - /// 导航到VideoDetail页面时执行 + /// 导航到页面时执行 /// /// public override void OnNavigatedTo(NavigationContext navigationContext) diff --git a/src/DownKyi/ViewModels/Settings/ViewDanmakuViewModel.cs b/src/DownKyi/ViewModels/Settings/ViewDanmakuViewModel.cs index cdc557b..659ead2 100644 --- a/src/DownKyi/ViewModels/Settings/ViewDanmakuViewModel.cs +++ b/src/DownKyi/ViewModels/Settings/ViewDanmakuViewModel.cs @@ -115,7 +115,7 @@ namespace DownKyi.ViewModels.Settings } /// - /// 导航到VideoDetail页面时执行 + /// 导航到页面时执行 /// /// public override void OnNavigatedTo(NavigationContext navigationContext) diff --git a/src/DownKyi/ViewModels/Settings/ViewVideoViewModel.cs b/src/DownKyi/ViewModels/Settings/ViewVideoViewModel.cs index 3007a94..7bb76fb 100644 --- a/src/DownKyi/ViewModels/Settings/ViewVideoViewModel.cs +++ b/src/DownKyi/ViewModels/Settings/ViewVideoViewModel.cs @@ -246,7 +246,7 @@ namespace DownKyi.ViewModels.Settings } /// - /// 导航到VideoDetail页面时执行 + /// 导航到页面时执行 /// /// public override void OnNavigatedTo(NavigationContext navigationContext) diff --git a/src/DownKyi/ViewModels/ViewChannelViewModel.cs b/src/DownKyi/ViewModels/ViewChannelViewModel.cs index 8c1d0f1..ff98f53 100644 --- a/src/DownKyi/ViewModels/ViewChannelViewModel.cs +++ b/src/DownKyi/ViewModels/ViewChannelViewModel.cs @@ -28,8 +28,6 @@ namespace DownKyi.ViewModels { public const string Tag = "PageChannel"; - private readonly IDialogService dialogService; - private CancellationTokenSource tokenSource; private long mid = -1; @@ -434,7 +432,7 @@ namespace DownKyi.ViewModels } /// - /// 导航到VideoDetail页面时执行 + /// 导航到页面时执行 /// /// public override void OnNavigatedTo(NavigationContext navigationContext) diff --git a/src/DownKyi/ViewModels/ViewDownloadManagerViewModel.cs b/src/DownKyi/ViewModels/ViewDownloadManagerViewModel.cs index 7e17995..ae3a7b3 100644 --- a/src/DownKyi/ViewModels/ViewDownloadManagerViewModel.cs +++ b/src/DownKyi/ViewModels/ViewDownloadManagerViewModel.cs @@ -109,7 +109,7 @@ namespace DownKyi.ViewModels #endregion /// - /// 导航到VideoDetail页面时执行 + /// 导航到页面时执行 /// /// public override void OnNavigatedTo(NavigationContext navigationContext) diff --git a/src/DownKyi/ViewModels/ViewMyBangumiFollowViewModel.cs b/src/DownKyi/ViewModels/ViewMyBangumiFollowViewModel.cs index 60365f1..1a16f8f 100644 --- a/src/DownKyi/ViewModels/ViewMyBangumiFollowViewModel.cs +++ b/src/DownKyi/ViewModels/ViewMyBangumiFollowViewModel.cs @@ -27,8 +27,6 @@ namespace DownKyi.ViewModels { public const string Tag = "PageMyBangumiFollow"; - private readonly IDialogService dialogService; - private CancellationTokenSource tokenSource; private long mid = -1; @@ -511,7 +509,7 @@ namespace DownKyi.ViewModels } /// - /// 导航到VideoDetail页面时执行 + /// 导航到页面时执行 /// /// public override void OnNavigatedTo(NavigationContext navigationContext) diff --git a/src/DownKyi/ViewModels/ViewMyFavoritesViewModel.cs b/src/DownKyi/ViewModels/ViewMyFavoritesViewModel.cs index 1787e99..b4799bb 100644 --- a/src/DownKyi/ViewModels/ViewMyFavoritesViewModel.cs +++ b/src/DownKyi/ViewModels/ViewMyFavoritesViewModel.cs @@ -26,7 +26,7 @@ namespace DownKyi.ViewModels { public const string Tag = "PageMyFavorites"; - private readonly IDialogService dialogService; + //private readonly IDialogService dialogService; private CancellationTokenSource tokenSource1; private CancellationTokenSource tokenSource2; @@ -87,7 +87,6 @@ namespace DownKyi.ViewModels set => SetProperty(ref mediaContentVisibility, value); } - private Visibility mediaLoadingVisibility; public Visibility MediaLoadingVisibility { @@ -477,7 +476,7 @@ namespace DownKyi.ViewModels } /// - /// 导航到VideoDetail页面时执行 + /// 导航到页面时执行 /// /// public override async void OnNavigatedTo(NavigationContext navigationContext) diff --git a/src/DownKyi/ViewModels/ViewMyHistoryViewModel.cs b/src/DownKyi/ViewModels/ViewMyHistoryViewModel.cs index 6f9906a..cbb8f7b 100644 --- a/src/DownKyi/ViewModels/ViewMyHistoryViewModel.cs +++ b/src/DownKyi/ViewModels/ViewMyHistoryViewModel.cs @@ -28,8 +28,6 @@ namespace DownKyi.ViewModels { public const string Tag = "PageMyHistory"; - private readonly IDialogService dialogService; - private CancellationTokenSource tokenSource; // 每页视频数量,暂时在此写死,以后在设置中增加选项 @@ -504,7 +502,7 @@ namespace DownKyi.ViewModels } /// - /// 导航到VideoDetail页面时执行 + /// 导航到页面时执行 /// /// public override void OnNavigatedTo(NavigationContext navigationContext) diff --git a/src/DownKyi/ViewModels/ViewMyToViewVideoViewModel.cs b/src/DownKyi/ViewModels/ViewMyToViewVideoViewModel.cs index 1635bb9..34d3f54 100644 --- a/src/DownKyi/ViewModels/ViewMyToViewVideoViewModel.cs +++ b/src/DownKyi/ViewModels/ViewMyToViewVideoViewModel.cs @@ -27,8 +27,6 @@ namespace DownKyi.ViewModels { public const string Tag = "PageMyToView"; - private readonly IDialogService dialogService; - private CancellationTokenSource tokenSource; #region 页面属性申明 @@ -400,7 +398,7 @@ namespace DownKyi.ViewModels } /// - /// 导航到VideoDetail页面时执行 + /// 导航到页面时执行 /// /// public override void OnNavigatedTo(NavigationContext navigationContext) diff --git a/src/DownKyi/ViewModels/ViewPublicFavoritesViewModel.cs b/src/DownKyi/ViewModels/ViewPublicFavoritesViewModel.cs index 98f2457..98e9e29 100644 --- a/src/DownKyi/ViewModels/ViewPublicFavoritesViewModel.cs +++ b/src/DownKyi/ViewModels/ViewPublicFavoritesViewModel.cs @@ -26,8 +26,6 @@ namespace DownKyi.ViewModels { public const string Tag = "PagePublicFavorites"; - private readonly IDialogService dialogService; - private CancellationTokenSource tokenSource; #region 页面属性申明 diff --git a/src/DownKyi/ViewModels/ViewPublicationViewModel.cs b/src/DownKyi/ViewModels/ViewPublicationViewModel.cs index 9b5f337..19b5c96 100644 --- a/src/DownKyi/ViewModels/ViewPublicationViewModel.cs +++ b/src/DownKyi/ViewModels/ViewPublicationViewModel.cs @@ -29,8 +29,6 @@ namespace DownKyi.ViewModels { public const string Tag = "PagePublication"; - private readonly IDialogService dialogService; - private CancellationTokenSource tokenSource; private long mid = -1; @@ -487,7 +485,7 @@ namespace DownKyi.ViewModels } /// - /// 导航到VideoDetail页面时执行 + /// 导航到页面时执行 /// /// public override void OnNavigatedTo(NavigationContext navigationContext) diff --git a/src/DownKyi/ViewModels/ViewSeasonsSeriesViewModel.cs b/src/DownKyi/ViewModels/ViewSeasonsSeriesViewModel.cs index 0c4377f..c559f3a 100644 --- a/src/DownKyi/ViewModels/ViewSeasonsSeriesViewModel.cs +++ b/src/DownKyi/ViewModels/ViewSeasonsSeriesViewModel.cs @@ -28,8 +28,6 @@ namespace DownKyi.ViewModels { public const string Tag = "PageSeasonsSeries"; - private readonly IDialogService dialogService; - private CancellationTokenSource tokenSource; private long mid = -1; diff --git a/src/DownKyi/ViewModels/ViewSettingsViewModel.cs b/src/DownKyi/ViewModels/ViewSettingsViewModel.cs index 0d30ee8..882aea5 100644 --- a/src/DownKyi/ViewModels/ViewSettingsViewModel.cs +++ b/src/DownKyi/ViewModels/ViewSettingsViewModel.cs @@ -121,7 +121,7 @@ namespace DownKyi.ViewModels #endregion /// - /// 导航到VideoDetail页面时执行 + /// 导航到页面时执行 /// /// public override void OnNavigatedTo(NavigationContext navigationContext) diff --git a/src/DownKyi/ViewModels/ViewToolboxViewModel.cs b/src/DownKyi/ViewModels/ViewToolboxViewModel.cs index e55da00..4e4ce6f 100644 --- a/src/DownKyi/ViewModels/ViewToolboxViewModel.cs +++ b/src/DownKyi/ViewModels/ViewToolboxViewModel.cs @@ -112,7 +112,7 @@ namespace DownKyi.ViewModels #endregion /// - /// 导航到VideoDetail页面时执行 + /// 导航到页面时执行 /// /// public override void OnNavigatedTo(NavigationContext navigationContext) diff --git a/src/DownKyi/ViewModels/ViewVideoDetailViewModel.cs b/src/DownKyi/ViewModels/ViewVideoDetailViewModel.cs index b5c170f..5d7551b 100644 --- a/src/DownKyi/ViewModels/ViewVideoDetailViewModel.cs +++ b/src/DownKyi/ViewModels/ViewVideoDetailViewModel.cs @@ -739,7 +739,7 @@ namespace DownKyi.ViewModels #endregion /// - /// 导航到VideoDetail页面时执行 + /// 导航到页面时执行 /// /// public override void OnNavigatedTo(NavigationContext navigationContext)