renun/downkyicore
1
0
Fork 0
mirror of https://github.com/yaobiao131/downkyicore.git synced 2025-08-10 00:52:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: 修复下载全部无效的bug

Browse Source
This commit is contained in:
姚彪
2023-12-20 18:56:27 +08:00
parent 07cdff54f3
commit 6747791faf
6 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
DownKyi/Services/AlertService.cs
View File

@@ -21,11 +21,11 @@ public class AlertService
/// <param name="message"></param>
/// <param name="buttonNumber"></param>
/// <returns></returns>
public async Task<ButtonResult> ShowInfo(string message, int buttonNumber = 2)
public Task<ButtonResult> ShowInfo(string message, int buttonNumber = 2)
{
VectorImage image = SystemIcon.Instance().Info;
string title = DictionaryResource.GetString("Info");
return await ShowMessage(image, title, message, buttonNumber);
return ShowMessage(image, title, message, buttonNumber);
}
/// <summary>
@@ -34,11 +34,11 @@ public class AlertService
/// <param name="message"></param>
/// <param name="buttonNumber"></param>
/// <returns></returns>
public async Task<ButtonResult> ShowWarning(string message, int buttonNumber = 1)
public Task<ButtonResult> ShowWarning(string message, int buttonNumber = 1)
{
VectorImage image = SystemIcon.Instance().Warning;
string title = DictionaryResource.GetString("Warning");
return await ShowMessage(image, title, message, buttonNumber);
return ShowMessage(image, title, message, buttonNumber);
}
/// <summary>
@@ -46,11 +46,11 @@ public class AlertService
/// </summary>
/// <param name="message"></param>
/// <returns></returns>
public async Task<ButtonResult> ShowError(string message)
public Task<ButtonResult> ShowError(string message)
{
VectorImage image = SystemIcon.Instance().Error;
string title = DictionaryResource.GetString("Error");
return await ShowMessage(image, title, message, 1);
return ShowMessage(image, title, message, 1);
}
public async Task<ButtonResult> ShowMessage(VectorImage image, string type, string message, int buttonNumber)

2
DownKyi/Services/VideoInfoService.cs
View File

@@ -233,7 +233,7 @@ public class VideoInfoService : IInfoService
public void GetVideoStream(VideoPage page)
{
var playUrl = VideoStream.GetVideoPlayUrl(page.Avid, page.Bvid, page.Cid);
Dispatcher.UIThread.InvokeAsync(() =>
Dispatcher.UIThread.Invoke(() =>
{
Utils.VideoPageInfo(playUrl, page);
});

6
DownKyi/Views/ViewPublication.axaml
View File

@@ -2,8 +2,6 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:custom="clr-namespace:DownKyi.CustomControl"
x:Class="DownKyi.Views.ViewPublication"
xmlns:prism="http://prismlibrary.com/"
prism:ViewModelLocator.AutoWireViewModel="True"
xmlns:vm="clr-namespace:DownKyi.ViewModels"
xmlns:vmp="clr-namespace:DownKyi.ViewModels.PageViewModels"
xmlns:i="using:Avalonia.Xaml.Interactivity"
@@ -272,8 +270,8 @@
<custom:CustomPager
Grid.Column="1"
HorizontalAlignment="Center"
VerticalAlignment="Center"
DataContext="{Binding Pager}" />
VerticalAlignment="Center"
DataContext="{Binding Pager}"/>
<Button
Grid.Column="2"

2
DownKyi/Views/ViewSeasonsSeries.axaml
View File

@@ -2,8 +2,6 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
x:Class="DownKyi.Views.ViewSeasonsSeries"
xmlns:custom="clr-namespace:DownKyi.CustomControl"
xmlns:prism="http://prismlibrary.com/"
prism:ViewModelLocator.AutoWireViewModel="True"
xmlns:i="using:Avalonia.Xaml.Interactivity"
xmlns:ia="clr-namespace:Avalonia.Xaml.Interactions.Core;assembly=Avalonia.Xaml.Interactions"
xmlns:vm="clr-namespace:DownKyi.ViewModels"

2
DownKyi/Views/ViewVideoDetail.axaml
View File

@@ -1,14 +1,12 @@
<UserControl xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
x:Class="DownKyi.Views.ViewVideoDetail"
xmlns:prism="http://prismlibrary.com/"
xmlns:vm="clr-namespace:DownKyi.ViewModels"
xmlns:vmp="clr-namespace:DownKyi.ViewModels.PageViewModels"
xmlns:i="using:Avalonia.Xaml.Interactivity"
xmlns:ia="clr-namespace:Avalonia.Xaml.Interactions.Core;assembly=Avalonia.Xaml.Interactions"
xmlns:custom="clr-namespace:DownKyi.CustomControl"
xmlns:iac="clr-namespace:DownKyi.CustomAction"
prism:ViewModelLocator.AutoWireViewModel="True"
x:DataType="vm:ViewVideoDetailViewModel">
<Grid RowDefinitions="50,10,*">

2
script/pupnet/DownKyi.pupnet.conf
View File

@@ -1,5 +1,5 @@
AppBaseName = DownKyi
AppFriendlyName = 哔哩哔哩下载姬
AppFriendlyName = 哔哩下载姬
AppId = cn.bzdrs.downkyi
AppVersionRelease = ${APP_VERSION}
AppShortSummary = 哔哩下载姬，哔哩哔哩网站视频下载工具，支持批量下载，支持8K、HDR、杜比视界，提供工具箱（音视频提取、去水印等）