Merge branch 'v1.5.x' into v1.5.x-feature-view-follow

DownKyi.Core/BiliApi/Zone/VideoZone.cs

@@ -123,6 +123,7 @@ namespace DownKyi.Core.BiliApi.Zone
             //生活
             zones.Add(new ZoneAttr(160, "life", "生活")); // 主分区
             zones.Add(new ZoneAttr(138, "funny", "搞笑", 160)); //各种沙雕有趣的搞笑剪辑，挑战，表演，配音等视频
+            zones.Add(new ZoneAttr(250, "travel", "出行", 160)); //为达到观光游览、休闲娱乐为目的的远途旅行、中近途户外生活、本地探店
             zones.Add(new ZoneAttr(239, "home", "家居房产", 160)); //与买房、装修、居家生活相关的分享
             zones.Add(new ZoneAttr(161, "handmake", "手工", 160)); //手工制品的制作过程或成品展示、教程、测评类视频
             zones.Add(new ZoneAttr(162, "painting", "绘画", 160)); //绘画过程或绘画教程，以及绘画相关的所有视频

DownKyi.Core/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.1.2.0")]
-[assembly: AssemblyFileVersion("2.1.2.0")]
+[assembly: AssemblyVersion("2.1.3.0")]
+[assembly: AssemblyFileVersion("2.1.3.0")]

DownKyi.Core/Settings/Models/NetworkSettings.cs

@@ -9,6 +9,8 @@ namespace DownKyi.Core.Settings.Models
     {
         public AllowStatus IsLiftingOfRegion { get; set; } = AllowStatus.NONE;
 
+        public AllowStatus UseSSL { get; set; } = AllowStatus.NONE;
+
         public Downloader Downloader { get; set; } = Downloader.NOT_SET;
         public int MaxCurrentDownloads { get; set; } = -1;
 

DownKyi.Core/Settings/SettingsManager.Network.cs

@@ -7,6 +7,9 @@ namespace DownKyi.Core.Settings
         // 是否开启解除地区限制
         private readonly AllowStatus isLiftingOfRegion = AllowStatus.YES;
 
+        // 启用https
+        private readonly AllowStatus useSSL = AllowStatus.YES;
+
         // 下载器
         private readonly Downloader downloader = Downloader.ARIA;
 
@@ -71,6 +74,33 @@ namespace DownKyi.Core.Settings
             return SetSettings();
         }
 
+        /// <summary>
+        /// 获取是否启用https
+        /// </summary>
+        /// <returns></returns>
+        public AllowStatus UseSSL()
+        {
+            appSettings = GetSettings();
+            if (appSettings.Network.UseSSL == AllowStatus.NONE)
+            {
+                // 第一次获取，先设置默认值
+                UseSSL(useSSL);
+                return useSSL;
+            }
+            return appSettings.Network.UseSSL;
+        }
+
+        /// <summary>
+        /// 设置是否启用https
+        /// </summary>
+        /// <param name="useSSL"></param>
+        /// <returns></returns>
+        public bool UseSSL(AllowStatus useSSL)
+        {
+            appSettings.Network.UseSSL = useSSL;
+            return SetSettings();
+        }
+
         /// <summary>
         /// 获取下载器
         /// </summary>

DownKyi/Languages/Default.xaml

@@ -188,8 +188,9 @@
     <system:String x:Key="AutoDownloadAll">解析后自动下载已解析视频</system:String>
 
     <system:String x:Key="Network">网络</system:String>
+    <system:String x:Key="UseSSL">启用https（若下载器提示SSL错误，则关闭此项）</system:String>
     <system:String x:Key="SelectDownloader">选择下载器（重启生效）：</system:String>
-    <system:String x:Key="BuiltinDownloader">内建下载器</system:String>
+    <system:String x:Key="BuiltinDownloader">内建下载器（测试）</system:String>
     <system:String x:Key="Aria2cDownloader">Aria2下载器</system:String>
     <system:String x:Key="AriaServerPort">Aria服务器端口：</system:String>
     <system:String x:Key="AriaLogLevel">Aria日志等级：</system:String>

DownKyi/Models/AppInfo.cs

@@ -3,12 +3,12 @@
     public class AppInfo
     {
         public string Name { get; } = "哔哩下载姬";
-        public int VersionCode { get; } = 509;
+        public int VersionCode { get; } = 510;
 
 #if DEBUG
-        public string VersionName { get; } = "1.5.2 Debug";
+        public string VersionName { get; } = "1.5.3 Debug";
 #else
-        public string VersionName { get; } = "1.5.2";
+        public string VersionName { get; } = "1.5.3";
 #endif
 
     }

DownKyi/Properties/AssemblyInfo.cs

@@ -51,5 +51,5 @@ using System.Windows;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.5.2.0")]
-[assembly: AssemblyFileVersion("1.5.2.0")]
+[assembly: AssemblyVersion("1.5.3.0")]
+[assembly: AssemblyFileVersion("1.5.3.0")]

DownKyi/Services/Download/AriaDownloadService.cs

@@ -113,6 +113,31 @@ namespace DownKyi.Services.Download
                 downloading.Downloading.Gid = null;
             }
 
+            // 启用https
+            AllowStatus useSSL = SettingsManager.GetInstance().UseSSL();
+            if (useSSL == AllowStatus.YES)
+            {
+                for (int i = 0; i < urls.Count; i++)
+                {
+                    string url = urls[i];
+                    if (url.StartsWith("http://"))
+                    {
+                        urls[i] = url.Replace("http://", "https://");
+                    }
+                }
+            }
+            else
+            {
+                for (int i = 0; i < urls.Count; i++)
+                {
+                    string url = urls[i];
+                    if (url.StartsWith("https://"))
+                    {
+                        urls[i] = url.Replace("https://", "http://");
+                    }
+                }
+            }
+
             // 开始下载
             DownloadResult downloadStatus = DownloadByAria(downloading, urls, path, fileName);
             switch (downloadStatus)

DownKyi/Services/Download/BuiltinDownloadService.cs

@@ -108,6 +108,31 @@ namespace DownKyi.Services.Download
                 downloading.Downloading.Gid = null;
             }
 
+            // 启用https
+            AllowStatus useSSL = SettingsManager.GetInstance().UseSSL();
+            if (useSSL == AllowStatus.YES)
+            {
+                for (int i = 0; i < urls.Count; i++)
+                {
+                    string url = urls[i];
+                    if (url.StartsWith("http://"))
+                    {
+                        urls[i] = url.Replace("http://", "https://");
+                    }
+                }
+            }
+            else
+            {
+                for (int i = 0; i < urls.Count; i++)
+                {
+                    string url = urls[i];
+                    if (url.StartsWith("https://"))
+                    {
+                        urls[i] = url.Replace("https://", "http://");
+                    }
+                }
+            }
+
             // 开始下载
             var downloadStatus = DownloadByBuiltin(downloading, urls, path, fileName);
             if (downloadStatus)

DownKyi/Services/Download/DownloadService.cs

@@ -519,12 +519,15 @@ namespace DownKyi.Services.Download
                     // 如果需要下载封面
                     if (downloading.DownloadBase.NeedDownloadContent["downloadCover"])
                     {
-                        string fileName = $"{downloading.DownloadBase.FilePath}.{GetImageExtension(downloading.DownloadBase.PageCoverUrl)}";
-
                         // page的封面
-                        outputPageCover = DownloadCover(downloading, downloading.DownloadBase.PageCoverUrl, fileName);
+                        string pageCoverFileName = $"{downloading.DownloadBase.FilePath}.{GetImageExtension(downloading.DownloadBase.PageCoverUrl)}";
+                        outputPageCover = DownloadCover(downloading, downloading.DownloadBase.PageCoverUrl, pageCoverFileName);
+
+
+                        string coverFileName = $"{downloading.DownloadBase.FilePath}.Cover.{GetImageExtension(downloading.DownloadBase.CoverUrl)}";
                         // 封面
-                        outputCover = DownloadCover(downloading, downloading.DownloadBase.CoverUrl, $"{path}/Cover.{GetImageExtension(downloading.DownloadBase.CoverUrl)}");
+                        //outputCover = DownloadCover(downloading, downloading.DownloadBase.CoverUrl, $"{path}/Cover.{GetImageExtension(downloading.DownloadBase.CoverUrl)}");
+                        outputCover = DownloadCover(downloading, downloading.DownloadBase.CoverUrl, coverFileName);
                     }
 
                     // 暂停

DownKyi/Services/SearchService.cs

@@ -26,68 +26,72 @@ namespace DownKyi.Services
         /// <returns></returns>
         public bool BiliInput(string input, string parentViewName, IEventAggregator eventAggregator)
         {
+            // 移除剪贴板id
+            string justId = input.Replace(AppConstant.ClipboardId, "");
+
             // 视频
-            if (ParseEntrance.IsAvId(input))
+            if (ParseEntrance.IsAvId(justId))
             {
                 NavigateToView.NavigationView(eventAggregator, ViewVideoDetailViewModel.Tag, parentViewName, $"{ParseEntrance.VideoUrl}{input.ToLower()}");
             }
-            else if (ParseEntrance.IsAvUrl(input))
+            else if (ParseEntrance.IsAvUrl(justId))
             {
                 NavigateToView.NavigationView(eventAggregator, ViewVideoDetailViewModel.Tag, parentViewName, input);
             }
-            else if (ParseEntrance.IsBvId(input))
+            else if (ParseEntrance.IsBvId(justId))
             {
                 NavigateToView.NavigationView(eventAggregator, ViewVideoDetailViewModel.Tag, parentViewName, $"{ParseEntrance.VideoUrl}{input}");
             }
-            else if (ParseEntrance.IsBvUrl(input))
+            else if (ParseEntrance.IsBvUrl(justId))
             {
                 NavigateToView.NavigationView(eventAggregator, ViewVideoDetailViewModel.Tag, parentViewName, input);
             }
             // 番剧（电影、电视剧）
-            else if (ParseEntrance.IsBangumiSeasonId(input))
+            else if (ParseEntrance.IsBangumiSeasonId(justId))
             {
                 NavigateToView.NavigationView(eventAggregator, ViewVideoDetailViewModel.Tag, parentViewName, $"{ParseEntrance.BangumiUrl}{input.ToLower()}");
             }
-            else if (ParseEntrance.IsBangumiSeasonUrl(input))
+            else if (ParseEntrance.IsBangumiSeasonUrl(justId))
             {
                 NavigateToView.NavigationView(eventAggregator, ViewVideoDetailViewModel.Tag, parentViewName, input);
             }
-            else if (ParseEntrance.IsBangumiEpisodeId(input))
+            else if (ParseEntrance.IsBangumiEpisodeId(justId))
             {
                 NavigateToView.NavigationView(eventAggregator, ViewVideoDetailViewModel.Tag, parentViewName, $"{ParseEntrance.BangumiUrl}{input.ToLower()}");
             }
-            else if (ParseEntrance.IsBangumiEpisodeUrl(input))
+            else if (ParseEntrance.IsBangumiEpisodeUrl(justId))
             {
                 NavigateToView.NavigationView(eventAggregator, ViewVideoDetailViewModel.Tag, parentViewName, input);
             }
-            else if (ParseEntrance.IsBangumiMediaId(input))
+            else if (ParseEntrance.IsBangumiMediaId(justId))
             {
                 NavigateToView.NavigationView(eventAggregator, ViewVideoDetailViewModel.Tag, parentViewName, $"{ParseEntrance.BangumiMediaUrl}{input.ToLower()}");
             }
-            else if (ParseEntrance.IsBangumiMediaUrl(input))
+            else if (ParseEntrance.IsBangumiMediaUrl(justId))
             {
                 NavigateToView.NavigationView(eventAggregator, ViewVideoDetailViewModel.Tag, parentViewName, input);
             }
             // 课程
-            else if (ParseEntrance.IsCheeseSeasonUrl(input) || ParseEntrance.IsCheeseEpisodeUrl(input))
+            else if (ParseEntrance.IsCheeseSeasonUrl(justId)
+                || ParseEntrance.IsCheeseEpisodeUrl(justId))
             {
                 NavigateToView.NavigationView(eventAggregator, ViewVideoDetailViewModel.Tag, parentViewName, input);
             }
             // 用户（参数传入mid）
-            else if (ParseEntrance.IsUserId(input))
+            else if (ParseEntrance.IsUserId(justId))
             {
                 NavigateToView.NavigateToViewUserSpace(eventAggregator, ViewIndexViewModel.Tag, ParseEntrance.GetUserId(input));
             }
-            else if (ParseEntrance.IsUserUrl(input))
+            else if (ParseEntrance.IsUserUrl(justId))
             {
                 NavigateToView.NavigateToViewUserSpace(eventAggregator, ViewIndexViewModel.Tag, ParseEntrance.GetUserId(input));
             }
             // 收藏夹
-            else if (ParseEntrance.IsFavoritesId(input))
+            else if (ParseEntrance.IsFavoritesId(justId))
             {
                 NavigateToView.NavigationView(eventAggregator, ViewPublicFavoritesViewModel.Tag, parentViewName, ParseEntrance.GetFavoritesId(input));
             }
-            else if (ParseEntrance.IsFavoritesUrl(input))
+            else if (ParseEntrance.IsFavoritesUrl(justId))
             {
                 NavigateToView.NavigationView(eventAggregator, ViewPublicFavoritesViewModel.Tag, parentViewName, ParseEntrance.GetFavoritesId(input));
             }

DownKyi/ViewModels/DownloadManager/ViewDownloadFinishedViewModel.cs

@@ -140,7 +140,8 @@ namespace DownKyi.ViewModels.DownloadManager
             {
                 await Task.Run(() =>
                 {
-                    foreach (var item in DownloadedList)
+                    List<DownloadedItem> list = DownloadedList.ToList();
+                    foreach (var item in list)
                     {
                         if (item != null && item.DialogService == null)
                         {

DownKyi/ViewModels/DownloadManager/ViewDownloadingViewModel.cs

@@ -178,7 +178,8 @@ namespace DownKyi.ViewModels.DownloadManager
             {
                 await Task.Run(() =>
                 {
-                    foreach (var item in DownloadingList)
+                    List<DownloadingItem> list = DownloadingList.ToList();
+                    foreach (var item in list)
                     {
                         if (item != null && item.DialogService == null)
                         {

DownKyi/ViewModels/Settings/ViewNetworkViewModel.cs

@@ -20,6 +20,13 @@ namespace DownKyi.ViewModels.Settings
 
         #region 页面属性申明
 
+        private bool useSSL;
+        public bool UseSSL
+        {
+            get => useSSL;
+            set => SetProperty(ref useSSL, value);
+        }
+
         private bool builtin;
         public bool Builtin
         {
@@ -236,6 +243,10 @@ namespace DownKyi.ViewModels.Settings
 
             isOnNavigatedTo = true;
 
+            // 启用https
+            AllowStatus useSSL = SettingsManager.GetInstance().UseSSL();
+            UseSSL = useSSL == AllowStatus.YES;
+
             // 选择下载器
             var downloader = SettingsManager.GetInstance().GetDownloader();
             switch (downloader)
@@ -304,6 +315,21 @@ namespace DownKyi.ViewModels.Settings
 
         #region 命令申明
 
+        // 是否启用https事件
+        private DelegateCommand useSSLCommand;
+        public DelegateCommand UseSSLCommand => useSSLCommand ?? (useSSLCommand = new DelegateCommand(ExecuteUseSSLCommand));
+
+        /// <summary>
+        /// 是否启用https事件
+        /// </summary>
+        private void ExecuteUseSSLCommand()
+        {
+            AllowStatus useSSL = UseSSL ? AllowStatus.YES : AllowStatus.NO;
+
+            bool isSucceed = SettingsManager.GetInstance().UseSSL(useSSL);
+            PublishTip(isSucceed);
+        }
+
         // 下载器选择事件
         private DelegateCommand<string> selectDownloaderCommand;
         public DelegateCommand<string> SelectDownloaderCommand => selectDownloaderCommand ?? (selectDownloaderCommand = new DelegateCommand<string>(ExecuteSelectDownloaderCommand));

DownKyi/ViewModels/ViewChannelViewModel.cs

@@ -75,6 +75,13 @@ namespace DownKyi.ViewModels
             set => SetProperty(ref arrowBack, value);
         }
 
+        private VectorImage downloadManage;
+        public VectorImage DownloadManage
+        {
+            get => downloadManage;
+            set => SetProperty(ref downloadManage, value);
+        }
+
         private string title;
         public string Title
         {
@@ -127,6 +134,12 @@ namespace DownKyi.ViewModels
             ArrowBack = NavigationIcon.Instance().ArrowBack;
             ArrowBack.Fill = DictionaryResource.GetColor("ColorTextDark");
 
+            // 下载管理按钮
+            DownloadManage = ButtonIcon.Instance().DownloadManage;
+            DownloadManage.Height = 24;
+            DownloadManage.Width = 24;
+            DownloadManage.Fill = DictionaryResource.GetColor("ColorPrimary");
+
             Medias = new ObservableCollection<ChannelMedia>();
 
             #endregion
@@ -157,6 +170,24 @@ namespace DownKyi.ViewModels
             eventAggregator.GetEvent<NavigationEvent>().Publish(parameter);
         }
 
+        // 前往下载管理页面
+        private DelegateCommand downloadManagerCommand;
+        public DelegateCommand DownloadManagerCommand => downloadManagerCommand ?? (downloadManagerCommand = new DelegateCommand(ExecuteDownloadManagerCommand));
+
+        /// <summary>
+        /// 前往下载管理页面
+        /// </summary>
+        private void ExecuteDownloadManagerCommand()
+        {
+            NavigationParam parameter = new NavigationParam
+            {
+                ViewName = ViewDownloadManagerViewModel.Tag,
+                ParentViewName = Tag,
+                Parameter = null
+            };
+            eventAggregator.GetEvent<NavigationEvent>().Publish(parameter);
+        }
+
         // 全选按钮点击事件
         private DelegateCommand<object> selectAllCommand;
         public DelegateCommand<object> SelectAllCommand => selectAllCommand ?? (selectAllCommand = new DelegateCommand<object>(ExecuteSelectAllCommand));
@@ -411,8 +442,11 @@ namespace DownKyi.ViewModels
             base.OnNavigatedTo(navigationContext);
 
             ArrowBack.Fill = DictionaryResource.GetColor("ColorTextDark");
-            Medias.Clear();
-            IsSelectAll = false;
+
+            DownloadManage = ButtonIcon.Instance().DownloadManage;
+            DownloadManage.Height = 24;
+            DownloadManage.Width = 24;
+            DownloadManage.Fill = DictionaryResource.GetColor("ColorPrimary");
 
             // 根据传入参数不同执行不同任务
             var parameter = navigationContext.Parameters.GetValue<Dictionary<string, object>>("Parameter");
@@ -421,6 +455,9 @@ namespace DownKyi.ViewModels
                 return;
             }
 
+            Medias.Clear();
+            IsSelectAll = false;
+
             mid = (long)parameter["mid"];
             cid = (long)parameter["cid"];
             Title = (string)parameter["name"];

DownKyi/ViewModels/ViewMyBangumiFollowViewModel.cs

@@ -52,6 +52,13 @@ namespace DownKyi.ViewModels
             set => SetProperty(ref arrowBack, value);
         }
 
+        private VectorImage downloadManage;
+        public VectorImage DownloadManage
+        {
+            get => downloadManage;
+            set => SetProperty(ref downloadManage, value);
+        }
+
         private ObservableCollection<TabHeader> tabHeaders;
         public ObservableCollection<TabHeader> TabHeaders
         {
@@ -139,6 +146,12 @@ namespace DownKyi.ViewModels
             ArrowBack = NavigationIcon.Instance().ArrowBack;
             ArrowBack.Fill = DictionaryResource.GetColor("ColorTextDark");
 
+            // 下载管理按钮
+            DownloadManage = ButtonIcon.Instance().DownloadManage;
+            DownloadManage.Height = 24;
+            DownloadManage.Width = 24;
+            DownloadManage.Fill = DictionaryResource.GetColor("ColorPrimary");
+
             TabHeaders = new ObservableCollection<TabHeader>
             {
                 new TabHeader { Id = (int)Core.BiliApi.Users.Models.BangumiType.ANIME, Title = DictionaryResource.GetString("FollowAnime") },
@@ -178,6 +191,24 @@ namespace DownKyi.ViewModels
             eventAggregator.GetEvent<NavigationEvent>().Publish(parameter);
         }
 
+        // 前往下载管理页面
+        private DelegateCommand downloadManagerCommand;
+        public DelegateCommand DownloadManagerCommand => downloadManagerCommand ?? (downloadManagerCommand = new DelegateCommand(ExecuteDownloadManagerCommand));
+
+        /// <summary>
+        /// 前往下载管理页面
+        /// </summary>
+        private void ExecuteDownloadManagerCommand()
+        {
+            NavigationParam parameter = new NavigationParam
+            {
+                ViewName = ViewDownloadManagerViewModel.Tag,
+                ParentViewName = Tag,
+                Parameter = null
+            };
+            eventAggregator.GetEvent<NavigationEvent>().Publish(parameter);
+        }
+
         // 顶部tab点击事件
         private DelegateCommand<object> tabHeadersCommand;
         public DelegateCommand<object> TabHeadersCommand => tabHeadersCommand ?? (tabHeadersCommand = new DelegateCommand<object>(ExecuteTabHeadersCommand, CanExecuteTabHeadersCommand));
@@ -489,6 +520,11 @@ namespace DownKyi.ViewModels
 
             ArrowBack.Fill = DictionaryResource.GetColor("ColorTextDark");
 
+            DownloadManage = ButtonIcon.Instance().DownloadManage;
+            DownloadManage.Height = 24;
+            DownloadManage.Width = 24;
+            DownloadManage.Fill = DictionaryResource.GetColor("ColorPrimary");
+
             // 根据传入参数不同执行不同任务
             mid = navigationContext.Parameters.GetValue<long>("Parameter");
             if (mid == 0)

DownKyi/ViewModels/ViewMyFavoritesViewModel.cs

@@ -109,6 +109,13 @@ namespace DownKyi.ViewModels
             set => SetProperty(ref arrowBack, value);
         }
 
+        private VectorImage downloadManage;
+        public VectorImage DownloadManage
+        {
+            get => downloadManage;
+            set => SetProperty(ref downloadManage, value);
+        }
+
         private ObservableCollection<TabHeader> tabHeaders;
         public ObservableCollection<TabHeader> TabHeaders
         {
@@ -173,6 +180,12 @@ namespace DownKyi.ViewModels
             ArrowBack = NavigationIcon.Instance().ArrowBack;
             ArrowBack.Fill = DictionaryResource.GetColor("ColorTextDark");
 
+            // 下载管理按钮
+            DownloadManage = ButtonIcon.Instance().DownloadManage;
+            DownloadManage.Height = 24;
+            DownloadManage.Width = 24;
+            DownloadManage.Fill = DictionaryResource.GetColor("ColorPrimary");
+
             TabHeaders = new ObservableCollection<TabHeader>();
             Medias = new ObservableCollection<FavoritesMedia>();
 
@@ -207,6 +220,24 @@ namespace DownKyi.ViewModels
             eventAggregator.GetEvent<NavigationEvent>().Publish(parameter);
         }
 
+        // 前往下载管理页面
+        private DelegateCommand downloadManagerCommand;
+        public DelegateCommand DownloadManagerCommand => downloadManagerCommand ?? (downloadManagerCommand = new DelegateCommand(ExecuteDownloadManagerCommand));
+
+        /// <summary>
+        /// 前往下载管理页面
+        /// </summary>
+        private void ExecuteDownloadManagerCommand()
+        {
+            NavigationParam parameter = new NavigationParam
+            {
+                ViewName = ViewDownloadManagerViewModel.Tag,
+                ParentViewName = Tag,
+                Parameter = null
+            };
+            eventAggregator.GetEvent<NavigationEvent>().Publish(parameter);
+        }
+
         // 左侧tab点击事件
         private DelegateCommand<object> leftTabHeadersCommand;
         public DelegateCommand<object> LeftTabHeadersCommand => leftTabHeadersCommand ?? (leftTabHeadersCommand = new DelegateCommand<object>(ExecuteLeftTabHeadersCommand, CanExecuteLeftTabHeadersCommand));
@@ -428,6 +459,11 @@ namespace DownKyi.ViewModels
         {
             ArrowBack.Fill = DictionaryResource.GetColor("ColorTextDark");
 
+            DownloadManage = ButtonIcon.Instance().DownloadManage;
+            DownloadManage.Height = 24;
+            DownloadManage.Width = 24;
+            DownloadManage.Fill = DictionaryResource.GetColor("ColorPrimary");
+
             ContentVisibility = Visibility.Collapsed;
             LoadingVisibility = Visibility.Visible;
             NoDataVisibility = Visibility.Collapsed;

DownKyi/ViewModels/ViewMyHistoryViewModel.cs

@@ -51,6 +51,13 @@ namespace DownKyi.ViewModels
             set => SetProperty(ref arrowBack, value);
         }
 
+        private VectorImage downloadManage;
+        public VectorImage DownloadManage
+        {
+            get => downloadManage;
+            set => SetProperty(ref downloadManage, value);
+        }
+
         private Visibility contentVisibility;
         public Visibility ContentVisibility
         {
@@ -110,6 +117,12 @@ namespace DownKyi.ViewModels
             ArrowBack = NavigationIcon.Instance().ArrowBack;
             ArrowBack.Fill = DictionaryResource.GetColor("ColorTextDark");
 
+            // 下载管理按钮
+            DownloadManage = ButtonIcon.Instance().DownloadManage;
+            DownloadManage.Height = 24;
+            DownloadManage.Width = 24;
+            DownloadManage.Fill = DictionaryResource.GetColor("ColorPrimary");
+
             Medias = new ObservableCollection<HistoryMedia>();
 
             #endregion
@@ -143,6 +156,24 @@ namespace DownKyi.ViewModels
             eventAggregator.GetEvent<NavigationEvent>().Publish(parameter);
         }
 
+        // 前往下载管理页面
+        private DelegateCommand downloadManagerCommand;
+        public DelegateCommand DownloadManagerCommand => downloadManagerCommand ?? (downloadManagerCommand = new DelegateCommand(ExecuteDownloadManagerCommand));
+
+        /// <summary>
+        /// 前往下载管理页面
+        /// </summary>
+        private void ExecuteDownloadManagerCommand()
+        {
+            NavigationParam parameter = new NavigationParam
+            {
+                ViewName = ViewDownloadManagerViewModel.Tag,
+                ParentViewName = Tag,
+                Parameter = null
+            };
+            eventAggregator.GetEvent<NavigationEvent>().Publish(parameter);
+        }
+
         // 全选按钮点击事件
         private DelegateCommand<object> selectAllCommand;
         public DelegateCommand<object> SelectAllCommand => selectAllCommand ?? (selectAllCommand = new DelegateCommand<object>(ExecuteSelectAllCommand));
@@ -459,6 +490,11 @@ namespace DownKyi.ViewModels
         {
             ArrowBack.Fill = DictionaryResource.GetColor("ColorTextDark");
 
+            DownloadManage = ButtonIcon.Instance().DownloadManage;
+            DownloadManage.Height = 24;
+            DownloadManage.Width = 24;
+            DownloadManage.Fill = DictionaryResource.GetColor("ColorPrimary");
+
             ContentVisibility = Visibility.Collapsed;
             LoadingVisibility = Visibility.Collapsed;
             NoDataVisibility = Visibility.Collapsed;
@@ -477,6 +513,11 @@ namespace DownKyi.ViewModels
 
             ArrowBack.Fill = DictionaryResource.GetColor("ColorTextDark");
 
+            DownloadManage = ButtonIcon.Instance().DownloadManage;
+            DownloadManage.Height = 24;
+            DownloadManage.Width = 24;
+            DownloadManage.Fill = DictionaryResource.GetColor("ColorPrimary");
+
             // 根据传入参数不同执行不同任务
             long mid = navigationContext.Parameters.GetValue<long>("Parameter");
             if (mid == 0)

DownKyi/ViewModels/ViewMyToViewVideoViewModel.cs

@@ -47,6 +47,13 @@ namespace DownKyi.ViewModels
             set => SetProperty(ref arrowBack, value);
         }
 
+        private VectorImage downloadManage;
+        public VectorImage DownloadManage
+        {
+            get => downloadManage;
+            set => SetProperty(ref downloadManage, value);
+        }
+
         private Visibility contentVisibility;
         public Visibility ContentVisibility
         {
@@ -106,6 +113,12 @@ namespace DownKyi.ViewModels
             ArrowBack = NavigationIcon.Instance().ArrowBack;
             ArrowBack.Fill = DictionaryResource.GetColor("ColorTextDark");
 
+            // 下载管理按钮
+            DownloadManage = ButtonIcon.Instance().DownloadManage;
+            DownloadManage.Height = 24;
+            DownloadManage.Width = 24;
+            DownloadManage.Fill = DictionaryResource.GetColor("ColorPrimary");
+
             Medias = new ObservableCollection<ToViewMedia>();
 
             #endregion
@@ -139,6 +152,24 @@ namespace DownKyi.ViewModels
             eventAggregator.GetEvent<NavigationEvent>().Publish(parameter);
         }
 
+        // 前往下载管理页面
+        private DelegateCommand downloadManagerCommand;
+        public DelegateCommand DownloadManagerCommand => downloadManagerCommand ?? (downloadManagerCommand = new DelegateCommand(ExecuteDownloadManagerCommand));
+
+        /// <summary>
+        /// 前往下载管理页面
+        /// </summary>
+        private void ExecuteDownloadManagerCommand()
+        {
+            NavigationParam parameter = new NavigationParam
+            {
+                ViewName = ViewDownloadManagerViewModel.Tag,
+                ParentViewName = Tag,
+                Parameter = null
+            };
+            eventAggregator.GetEvent<NavigationEvent>().Publish(parameter);
+        }
+
         // 全选按钮点击事件
         private DelegateCommand<object> selectAllCommand;
         public DelegateCommand<object> SelectAllCommand => selectAllCommand ?? (selectAllCommand = new DelegateCommand<object>(ExecuteSelectAllCommand));
@@ -378,6 +409,11 @@ namespace DownKyi.ViewModels
 
             ArrowBack.Fill = DictionaryResource.GetColor("ColorTextDark");
 
+            DownloadManage = ButtonIcon.Instance().DownloadManage;
+            DownloadManage.Height = 24;
+            DownloadManage.Width = 24;
+            DownloadManage.Fill = DictionaryResource.GetColor("ColorPrimary");
+
             // 根据传入参数不同执行不同任务
             long mid = navigationContext.Parameters.GetValue<long>("Parameter");
             if (mid == 0)

DownKyi/ViewModels/ViewPublicFavoritesViewModel.cs

@@ -46,6 +46,13 @@ namespace DownKyi.ViewModels
             set => SetProperty(ref arrowBack, value);
         }
 
+        private VectorImage downloadManage;
+        public VectorImage DownloadManage
+        {
+            get => downloadManage;
+            set => SetProperty(ref downloadManage, value);
+        }
+
         private Favorites favorites;
         public Favorites Favorites
         {
@@ -132,6 +139,12 @@ namespace DownKyi.ViewModels
             ArrowBack = NavigationIcon.Instance().ArrowBack;
             ArrowBack.Fill = DictionaryResource.GetColor("ColorTextDark");
 
+            // 下载管理按钮
+            DownloadManage = ButtonIcon.Instance().DownloadManage;
+            DownloadManage.Height = 24;
+            DownloadManage.Width = 24;
+            DownloadManage.Fill = DictionaryResource.GetColor("ColorPrimary");
+
             FavoritesMedias = new ObservableCollection<FavoritesMedia>();
 
             #endregion
@@ -160,6 +173,24 @@ namespace DownKyi.ViewModels
             eventAggregator.GetEvent<NavigationEvent>().Publish(parameter);
         }
 
+        // 前往下载管理页面
+        private DelegateCommand downloadManagerCommand;
+        public DelegateCommand DownloadManagerCommand => downloadManagerCommand ?? (downloadManagerCommand = new DelegateCommand(ExecuteDownloadManagerCommand));
+
+        /// <summary>
+        /// 前往下载管理页面
+        /// </summary>
+        private void ExecuteDownloadManagerCommand()
+        {
+            NavigationParam parameter = new NavigationParam
+            {
+                ViewName = ViewDownloadManagerViewModel.Tag,
+                ParentViewName = Tag,
+                Parameter = null
+            };
+            eventAggregator.GetEvent<NavigationEvent>().Publish(parameter);
+        }
+
         // 复制封面事件
         private DelegateCommand copyCoverCommand;
         public DelegateCommand CopyCoverCommand => copyCoverCommand ?? (copyCoverCommand = new DelegateCommand(ExecuteCopyCoverCommand));
@@ -298,6 +329,11 @@ namespace DownKyi.ViewModels
 
             ArrowBack.Fill = DictionaryResource.GetColor("ColorTextDark");
 
+            DownloadManage = ButtonIcon.Instance().DownloadManage;
+            DownloadManage.Height = 24;
+            DownloadManage.Width = 24;
+            DownloadManage.Fill = DictionaryResource.GetColor("ColorPrimary");
+
             ContentVisibility = Visibility.Collapsed;
             LoadingVisibility = Visibility.Collapsed;
             NoDataVisibility = Visibility.Collapsed;

DownKyi/ViewModels/ViewPublicationViewModel.cs

@@ -75,6 +75,13 @@ namespace DownKyi.ViewModels
             set => SetProperty(ref arrowBack, value);
         }
 
+        private VectorImage downloadManage;
+        public VectorImage DownloadManage
+        {
+            get => downloadManage;
+            set => SetProperty(ref downloadManage, value);
+        }
+
         private ObservableCollection<TabHeader> tabHeaders;
         public ObservableCollection<TabHeader> TabHeaders
         {
@@ -134,6 +141,12 @@ namespace DownKyi.ViewModels
             ArrowBack = NavigationIcon.Instance().ArrowBack;
             ArrowBack.Fill = DictionaryResource.GetColor("ColorTextDark");
 
+            // 下载管理按钮
+            DownloadManage = ButtonIcon.Instance().DownloadManage;
+            DownloadManage.Height = 24;
+            DownloadManage.Width = 24;
+            DownloadManage.Fill = DictionaryResource.GetColor("ColorPrimary");
+
             TabHeaders = new ObservableCollection<TabHeader>();
             Medias = new ObservableCollection<PublicationMedia>();
 
@@ -165,6 +178,24 @@ namespace DownKyi.ViewModels
             eventAggregator.GetEvent<NavigationEvent>().Publish(parameter);
         }
 
+        // 前往下载管理页面
+        private DelegateCommand downloadManagerCommand;
+        public DelegateCommand DownloadManagerCommand => downloadManagerCommand ?? (downloadManagerCommand = new DelegateCommand(ExecuteDownloadManagerCommand));
+
+        /// <summary>
+        /// 前往下载管理页面
+        /// </summary>
+        private void ExecuteDownloadManagerCommand()
+        {
+            NavigationParam parameter = new NavigationParam
+            {
+                ViewName = ViewDownloadManagerViewModel.Tag,
+                ParentViewName = Tag,
+                Parameter = null
+            };
+            eventAggregator.GetEvent<NavigationEvent>().Publish(parameter);
+        }
+
         // 左侧tab点击事件
         private DelegateCommand<object> leftTabHeadersCommand;
         public DelegateCommand<object> LeftTabHeadersCommand => leftTabHeadersCommand ?? (leftTabHeadersCommand = new DelegateCommand<object>(ExecuteLeftTabHeadersCommand, CanExecuteLeftTabHeadersCommand));
@@ -444,6 +475,11 @@ namespace DownKyi.ViewModels
         {
             ArrowBack.Fill = DictionaryResource.GetColor("ColorTextDark");
 
+            DownloadManage = ButtonIcon.Instance().DownloadManage;
+            DownloadManage.Height = 24;
+            DownloadManage.Width = 24;
+            DownloadManage.Fill = DictionaryResource.GetColor("ColorPrimary");
+
             TabHeaders.Clear();
             Medias.Clear();
             SelectTabId = -1;

DownKyi/ViewModels/ViewVideoDetailViewModel.cs

@@ -113,9 +113,11 @@ namespace DownKyi.ViewModels
             Loading.StartAnimate();
             LoadingVisibility = Visibility.Collapsed;
 
+            // 返回按钮
             ArrowBack = NavigationIcon.Instance().ArrowBack;
             ArrowBack.Fill = DictionaryResource.GetColor("ColorTextDark");
 
+            // 下载管理按钮
             DownloadManage = ButtonIcon.Instance().DownloadManage;
             DownloadManage.Height = 24;
             DownloadManage.Width = 24;
@@ -753,10 +755,10 @@ namespace DownKyi.ViewModels
             {
                 string param = navigationContext.Parameters.GetValue<string>("Parameter");
                 // 移除剪贴板id
-                string intput = param.Replace(AppConstant.ClipboardId, "");
+                string input = param.Replace(AppConstant.ClipboardId, "");
 
                 // 检测是否从剪贴板传入
-                if (InputText == intput && param.EndsWith(AppConstant.ClipboardId))
+                if (InputText == input && param.EndsWith(AppConstant.ClipboardId))
                 {
                     return;
                 }
@@ -764,7 +766,7 @@ namespace DownKyi.ViewModels
                 // 正在执行任务时不开启新任务
                 if (LoadingVisibility != Visibility.Visible)
                 {
-                    InputText = intput;
+                    InputText = input;
                     PropertyChangeAsync(ExecuteInputCommand);
                 }
             }

DownKyi/Views/Settings/ViewNetwork.xaml

@@ -16,6 +16,18 @@
                     Text="{DynamicResource Network}" />
             </StackPanel>
 
+            <CheckBox
+                Name="nameUseSSL"
+                Margin="0,20,0,0"
+                HorizontalAlignment="Left"
+                VerticalAlignment="Top"
+                Command="{Binding UseSSLCommand}"
+                Content="{DynamicResource UseSSL}"
+                FontSize="12"
+                Foreground="{DynamicResource BrushTextDark}"
+                IsChecked="{Binding UseSSL, Mode=TwoWay}"
+                Style="{StaticResource CheckBoxStyle}" />
+
             <StackPanel Margin="0,20,0,0" Orientation="Vertical">
                 <TextBlock
                     FontSize="12"

DownKyi/Views/ViewChannel.xaml

@@ -124,8 +124,9 @@
 
         <Grid Grid.Row="0">
             <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="auto" />
                 <ColumnDefinition Width="*" />
-                <ColumnDefinition Width="10" />
+                <ColumnDefinition Width="100" />
             </Grid.ColumnDefinitions>
 
             <Button
@@ -177,6 +178,26 @@
                         Text="{Binding Title}" />
                 </StackPanel>
             </Button>
+
+            <Button
+                Grid.Column="2"
+                Width="24"
+                Height="24"
+                Margin="10,5"
+                HorizontalAlignment="Right"
+                VerticalAlignment="Center"
+                Command="{Binding DownloadManagerCommand}"
+                Style="{StaticResource ImageBtnStyle}"
+                ToolTip="{DynamicResource DownloadManager}">
+                <ContentControl>
+                    <Path
+                        Width="{Binding DownloadManage.Width}"
+                        Height="{Binding DownloadManage.Height}"
+                        Data="{Binding DownloadManage.Data}"
+                        Fill="{Binding DownloadManage.Fill}"
+                        Stretch="Uniform" />
+                </ContentControl>
+            </Button>
         </Grid>
 
         <TextBlock Grid.Row="1" Background="{DynamicResource BrushBorder}" />

DownKyi/Views/ViewMyBangumiFollow.xaml

@@ -226,6 +226,26 @@
                     </Style>
                 </ListBox.Style>
             </ListBox>
+
+            <Button
+                Grid.Column="2"
+                Width="24"
+                Height="24"
+                Margin="10,5"
+                HorizontalAlignment="Right"
+                VerticalAlignment="Center"
+                Command="{Binding DownloadManagerCommand}"
+                Style="{StaticResource ImageBtnStyle}"
+                ToolTip="{DynamicResource DownloadManager}">
+                <ContentControl>
+                    <Path
+                        Width="{Binding DownloadManage.Width}"
+                        Height="{Binding DownloadManage.Height}"
+                        Data="{Binding DownloadManage.Data}"
+                        Fill="{Binding DownloadManage.Fill}"
+                        Stretch="Uniform" />
+                </ContentControl>
+            </Button>
         </Grid>
 
         <TextBlock Grid.Row="1" Background="{DynamicResource BrushBorder}" />

DownKyi/Views/ViewMyFavorites.xaml

@@ -192,6 +192,26 @@
                         Text="{DynamicResource PublicFavorites}" />
                 </StackPanel>
             </Button>
+
+            <Button
+                Grid.Column="2"
+                Width="24"
+                Height="24"
+                Margin="10,5"
+                HorizontalAlignment="Right"
+                VerticalAlignment="Center"
+                Command="{Binding DownloadManagerCommand}"
+                Style="{StaticResource ImageBtnStyle}"
+                ToolTip="{DynamicResource DownloadManager}">
+                <ContentControl>
+                    <Path
+                        Width="{Binding DownloadManage.Width}"
+                        Height="{Binding DownloadManage.Height}"
+                        Data="{Binding DownloadManage.Data}"
+                        Fill="{Binding DownloadManage.Fill}"
+                        Stretch="Uniform" />
+                </ContentControl>
+            </Button>
         </Grid>
 
         <TextBlock Grid.Row="1" Background="{DynamicResource BrushBorder}" />

DownKyi/Views/ViewMyHistory.xaml

@@ -235,6 +235,26 @@
                         Text="{DynamicResource MyHistory}" />
                 </StackPanel>
             </Button>
+
+            <Button
+                Grid.Column="2"
+                Width="24"
+                Height="24"
+                Margin="10,5"
+                HorizontalAlignment="Right"
+                VerticalAlignment="Center"
+                Command="{Binding DownloadManagerCommand}"
+                Style="{StaticResource ImageBtnStyle}"
+                ToolTip="{DynamicResource DownloadManager}">
+                <ContentControl>
+                    <Path
+                        Width="{Binding DownloadManage.Width}"
+                        Height="{Binding DownloadManage.Height}"
+                        Data="{Binding DownloadManage.Data}"
+                        Fill="{Binding DownloadManage.Fill}"
+                        Stretch="Uniform" />
+                </ContentControl>
+            </Button>
         </Grid>
 
         <TextBlock Grid.Row="1" Background="{DynamicResource BrushBorder}" />

DownKyi/Views/ViewMyToViewVideo.xaml

@@ -159,6 +159,26 @@
                         Text="{DynamicResource MyToView}" />
                 </StackPanel>
             </Button>
+
+            <Button
+                Grid.Column="2"
+                Width="24"
+                Height="24"
+                Margin="10,5"
+                HorizontalAlignment="Right"
+                VerticalAlignment="Center"
+                Command="{Binding DownloadManagerCommand}"
+                Style="{StaticResource ImageBtnStyle}"
+                ToolTip="{DynamicResource DownloadManager}">
+                <ContentControl>
+                    <Path
+                        Width="{Binding DownloadManage.Width}"
+                        Height="{Binding DownloadManage.Height}"
+                        Data="{Binding DownloadManage.Data}"
+                        Fill="{Binding DownloadManage.Fill}"
+                        Stretch="Uniform" />
+                </ContentControl>
+            </Button>
         </Grid>
 
         <TextBlock Grid.Row="1" Background="{DynamicResource BrushBorder}" />

DownKyi/Views/ViewPublicFavorites.xaml

@@ -43,6 +43,26 @@
                         Text="{DynamicResource PublicFavorites}" />
                 </StackPanel>
             </Button>
+
+            <Button
+                Grid.Column="2"
+                Width="24"
+                Height="24"
+                Margin="10,5"
+                HorizontalAlignment="Right"
+                VerticalAlignment="Center"
+                Command="{Binding DownloadManagerCommand}"
+                Style="{StaticResource ImageBtnStyle}"
+                ToolTip="{DynamicResource DownloadManager}">
+                <ContentControl>
+                    <Path
+                        Width="{Binding DownloadManage.Width}"
+                        Height="{Binding DownloadManage.Height}"
+                        Data="{Binding DownloadManage.Data}"
+                        Fill="{Binding DownloadManage.Fill}"
+                        Stretch="Uniform" />
+                </ContentControl>
+            </Button>
         </Grid>
 
         <TextBlock Grid.Row="1" Background="{DynamicResource BrushBorder}" />

DownKyi/Views/ViewPublication.xaml

@@ -153,6 +153,26 @@
                         Text="{DynamicResource Publication}" />
                 </StackPanel>
             </Button>
+
+            <Button
+                Grid.Column="2"
+                Width="24"
+                Height="24"
+                Margin="10,5"
+                HorizontalAlignment="Right"
+                VerticalAlignment="Center"
+                Command="{Binding DownloadManagerCommand}"
+                Style="{StaticResource ImageBtnStyle}"
+                ToolTip="{DynamicResource DownloadManager}">
+                <ContentControl>
+                    <Path
+                        Width="{Binding DownloadManage.Width}"
+                        Height="{Binding DownloadManage.Height}"
+                        Data="{Binding DownloadManage.Data}"
+                        Fill="{Binding DownloadManage.Fill}"
+                        Stretch="Uniform" />
+                </ContentControl>
+            </Button>
         </Grid>
 
         <TextBlock Grid.Row="1" Background="{DynamicResource BrushBorder}" />