diff --git a/src/DownKyi.Core/Aria2cNet/Client/AriaClient.cs b/src/DownKyi.Core/Aria2cNet/Client/AriaClient.cs
index 77083a4..dd1b5fa 100644
--- a/src/DownKyi.Core/Aria2cNet/Client/AriaClient.cs
+++ b/src/DownKyi.Core/Aria2cNet/Client/AriaClient.cs
@@ -16,7 +16,10 @@ namespace DownKyi.Core.Aria2cNet.Client
public static class AriaClient
{
private static readonly string JSONRPC = "2.0";
- private static readonly string TOKEN = "downkyi";
+ private const string LOCAL_HOST = "http://localhost";
+ private const string TOKEN = "downkyi";
+ private static string host = LOCAL_HOST;
+ private static string token = TOKEN;
///
/// This method adds a new download.
@@ -41,7 +44,7 @@ namespace DownKyi.Core.Aria2cNet.Client
{
List
private void ExecuteVideoQualitySelectedCommand()
{
- // 杜比视界
- string dolby = string.Empty;
- try
- {
- var qualities = Constant.GetAudioQualities();
- dolby = qualities[3].Name;
- }
- catch (Exception e)
- {
- Core.Utils.Debugging.Console.PrintLine("ExecuteVideoQualitySelectedCommand()发生异常: {0}", e);
- LogManager.Error("ExecuteVideoQualitySelectedCommand", e);
- }
-
- if (VideoQuality != null && VideoQuality.Quality == 126 && PlayUrl != null && PlayUrl.Dash != null && PlayUrl.Dash.Dolby != null)
- {
- ListHelper.AddUnique(AudioQualityFormatList, dolby);
- AudioQualityFormat = dolby;
- }
- else
- {
- if (AudioQualityFormatList.Contains(dolby))
- {
- AudioQualityFormatList.Remove(dolby);
- AudioQualityFormat = AudioQualityFormatList[0];
- }
- }
+ //// 杜比视界
+ //string dolby = string.Empty;
+ //try
+ //{
+ // var qualities = Constant.GetAudioQualities();
+ // dolby = qualities[3].Name;
+ //}
+ //catch (Exception e)
+ //{
+ // Core.Utils.Debugging.Console.PrintLine("ExecuteVideoQualitySelectedCommand()发生异常: {0}", e);
+ // LogManager.Error("ExecuteVideoQualitySelectedCommand", e);
+ //}
+
+ //if (VideoQuality != null && VideoQuality.Quality == 126 && PlayUrl != null && PlayUrl.Dash != null && PlayUrl.Dash.Dolby != null)
+ //{
+ // ListHelper.AddUnique(AudioQualityFormatList, dolby);
+ // AudioQualityFormat = dolby;
+ //}
+ //else
+ //{
+ // if (AudioQualityFormatList.Contains(dolby))
+ // {
+ // AudioQualityFormatList.Remove(dolby);
+ // AudioQualityFormat = AudioQualityFormatList[0];
+ // }
+ //}
}
#endregion
diff --git a/src/DownKyi/ViewModels/Settings/ViewNetworkViewModel.cs b/src/DownKyi/ViewModels/Settings/ViewNetworkViewModel.cs
index a46ce58..98c40c3 100644
--- a/src/DownKyi/ViewModels/Settings/ViewNetworkViewModel.cs
+++ b/src/DownKyi/ViewModels/Settings/ViewNetworkViewModel.cs
@@ -41,6 +41,13 @@ namespace DownKyi.ViewModels.Settings
set => SetProperty(ref aria2c, value);
}
+ private bool customAria2c;
+ public bool CustomAria2c
+ {
+ get => customAria2c;
+ set => SetProperty(ref customAria2c, value);
+ }
+
private List maxCurrentDownloads;
public List MaxCurrentDownloads
{
@@ -90,6 +97,13 @@ namespace DownKyi.ViewModels.Settings
set => SetProperty(ref httpProxyPort, value);
}
+ private string ariaHost;
+ public string AriaHost
+ {
+ get => ariaHost;
+ set => SetProperty(ref ariaHost, value);
+ }
+
private int ariaListenPort;
public int AriaListenPort
{
@@ -97,6 +111,13 @@ namespace DownKyi.ViewModels.Settings
set => SetProperty(ref ariaListenPort, value);
}
+ private string ariaToken;
+ public string AriaToken
+ {
+ get => ariaToken;
+ set => SetProperty(ref ariaToken, value);
+ }
+
private List ariaLogLevels;
public List AriaLogLevels
{
@@ -259,6 +280,9 @@ namespace DownKyi.ViewModels.Settings
case Downloader.ARIA:
Aria2c = true;
break;
+ case Downloader.CUSTOM_ARIA:
+ CustomAria2c = true;
+ break;
}
// builtin同时下载数
@@ -277,9 +301,15 @@ namespace DownKyi.ViewModels.Settings
// builtin的http代理的端口
HttpProxyPort = SettingsManager.GetInstance().GetHttpProxyListenPort();
+ // Aria服务器host
+ AriaHost = SettingsManager.GetInstance().GetAriaHost();
+
// Aria服务器端口
AriaListenPort = SettingsManager.GetInstance().GetAriaListenPort();
+ // Aria服务器Token
+ AriaToken = SettingsManager.GetInstance().GetAriaToken();
+
// Aria的日志等级
AriaConfigLogLevel ariaLogLevel = SettingsManager.GetInstance().GetAriaLogLevel();
SelectedAriaLogLevel = ariaLogLevel.ToString("G");
@@ -349,6 +379,9 @@ namespace DownKyi.ViewModels.Settings
case "Aria2c":
downloader = Downloader.ARIA;
break;
+ case "CustomAria2c":
+ downloader = Downloader.CUSTOM_ARIA;
+ break;
default:
downloader = SettingsManager.GetInstance().GetDownloader();
break;
@@ -444,6 +477,21 @@ namespace DownKyi.ViewModels.Settings
PublishTip(isSucceed);
}
+ // Aria服务器host事件
+ private DelegateCommand ariaHostCommand;
+ public DelegateCommand AriaHostCommand => ariaHostCommand ?? (ariaHostCommand = new DelegateCommand(ExecuteAriaHostCommand));
+
+ ///
+ /// Aria服务器host事件
+ ///
+ ///
+ private void ExecuteAriaHostCommand(string parameter)
+ {
+ AriaHost = parameter;
+ bool isSucceed = SettingsManager.GetInstance().SetAriaHost(AriaHost);
+ PublishTip(isSucceed);
+ }
+
// Aria服务器端口事件
private DelegateCommand ariaListenPortCommand;
public DelegateCommand AriaListenPortCommand => ariaListenPortCommand ?? (ariaListenPortCommand = new DelegateCommand(ExecuteAriaListenPortCommand));
@@ -461,6 +509,21 @@ namespace DownKyi.ViewModels.Settings
PublishTip(isSucceed);
}
+ // Aria服务器token事件
+ private DelegateCommand ariaTokenCommand;
+ public DelegateCommand AriaTokenCommand => ariaTokenCommand ?? (ariaTokenCommand = new DelegateCommand(ExecuteAriaTokenCommand));
+
+ ///
+ /// Aria服务器token事件
+ ///
+ ///
+ private void ExecuteAriaTokenCommand(string parameter)
+ {
+ AriaToken = parameter;
+ bool isSucceed = SettingsManager.GetInstance().SetAriaToken(AriaToken);
+ PublishTip(isSucceed);
+ }
+
// Aria的日志等级事件
private DelegateCommand ariaLogLevelsCommand;
public DelegateCommand AriaLogLevelsCommand => ariaLogLevelsCommand ?? (ariaLogLevelsCommand = new DelegateCommand(ExecuteAriaLogLevelsCommand));
diff --git a/src/DownKyi/ViewModels/UserSpace/SeasonsSeries.cs b/src/DownKyi/ViewModels/UserSpace/SeasonsSeries.cs
new file mode 100644
index 0000000..0641112
--- /dev/null
+++ b/src/DownKyi/ViewModels/UserSpace/SeasonsSeries.cs
@@ -0,0 +1,47 @@
+using DownKyi.Images;
+using Prism.Mvvm;
+using System.Windows.Media;
+
+namespace DownKyi.ViewModels.UserSpace
+{
+ public class SeasonsSeries : BindableBase
+ {
+ public long Id { get; set; }
+
+ private ImageSource cover;
+ public ImageSource Cover
+ {
+ get => cover;
+ set => SetProperty(ref cover, value);
+ }
+
+ private VectorImage typeImage;
+ public VectorImage TypeImage
+ {
+ get => typeImage;
+ set => SetProperty(ref typeImage, value);
+ }
+
+ private string name;
+ public string Name
+ {
+ get => name;
+ set => SetProperty(ref name, value);
+ }
+
+ private int count;
+ public int Count
+ {
+ get => count;
+ set => SetProperty(ref count, value);
+ }
+
+ private string ctime;
+ public string Ctime
+ {
+ get => ctime;
+ set => SetProperty(ref ctime, value);
+ }
+
+ }
+}
diff --git a/src/DownKyi/ViewModels/UserSpace/ViewSeasonsSeriesViewModel.cs b/src/DownKyi/ViewModels/UserSpace/ViewSeasonsSeriesViewModel.cs
new file mode 100644
index 0000000..b8f783b
--- /dev/null
+++ b/src/DownKyi/ViewModels/UserSpace/ViewSeasonsSeriesViewModel.cs
@@ -0,0 +1,199 @@
+using DownKyi.Core.BiliApi.Users.Models;
+using DownKyi.Core.Storage;
+using DownKyi.Events;
+using DownKyi.Images;
+using Prism.Commands;
+using Prism.Events;
+using Prism.Regions;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Threading.Tasks;
+using System.Windows.Media.Imaging;
+
+namespace DownKyi.ViewModels.UserSpace
+{
+ public class ViewSeasonsSeriesViewModel : BaseViewModel
+ {
+ public const string Tag = "PageUserSpaceSeasonsSeries";
+
+ private long mid = -1;
+
+ #region 页面属性申明
+
+ private ObservableCollection seasonsSeries;
+ public ObservableCollection SeasonsSeries
+ {
+ get => seasonsSeries;
+ set => SetProperty(ref seasonsSeries, value);
+ }
+
+ private int selectedItem;
+ public int SelectedItem
+ {
+ get => selectedItem;
+ set => SetProperty(ref selectedItem, value);
+ }
+
+ #endregion
+
+ public ViewSeasonsSeriesViewModel(IEventAggregator eventAggregator) : base(eventAggregator)
+ {
+ #region 属性初始化
+
+ SeasonsSeries = new ObservableCollection();
+
+ #endregion
+ }
+
+ #region 命令申明
+
+ // 视频选择事件
+ private DelegateCommand