Skip to content

Commit 073b588

Browse files
committed
⬆️ Avalonia 11.2.5
1 parent ed6df52 commit 073b588

File tree

3 files changed

+3
-47
lines changed

3 files changed

+3
-47
lines changed

ref/DirectoryPackages

src/BD.WTTS.Client.Avalonia/UI/Styling/Controls.axaml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,6 @@
4040
<Setter Property="FontFamily" Value="{Binding Source={x:Static ms:UISettings.FontName}, Path=Value, Mode=OneWay, Converter={StaticResource NameToFontFamilyConverter}}" />
4141
</Style>
4242

43-
<Style Selector="ui|FontIcon">
44-
<Setter Property="MinWidth" Value="16" />
45-
</Style>
46-
47-
<Style Selector="ui|SymbolIcon">
48-
<Setter Property="MinWidth" Value="16" />
49-
</Style>
50-
5143
<!--<Style Selector="TextBlock">
5244
<Setter Property="FontFamily" Value="{Binding Source={x:Static ms:UISettings.FontName}, Path=Value, Mode=OneWay, Converter={StaticResource NameToFontFamilyConverter}}" />
5345
</Style>-->

src/BD.WTTS.Client.Plugins.Accelerator/Services/Mvvm/GameAcceleratorService.cs

Lines changed: 2 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -629,45 +629,9 @@ public static async Task InstallAccelerator()
629629
};
630630
var install = Ioc.Get<IAcceleratorService>().XY_Install(GameAcceleratorSettings.WattAcceleratorDirPath.Value!);
631631

632-
td.Opened += (s, e) =>
632+
td.Opened += async (s, e) =>
633633
{
634-
DownloadCallbackAsync(td, install).Wait();
635-
//await foreach (var item in install)
636-
//{
637-
// if (item.HandleUI(out var content))
638-
// {
639-
// switch (content)
640-
// {
641-
// case < 100:
642-
// Dispatcher.UIThread.Post(() => { td.Content = $"正在下载 {item.Content}%"; });
643-
// td.SetProgressBarState(item.Content, TaskDialogProgressState.Normal);
644-
// break;
645-
// case 100:
646-
// td.SetProgressBarState(item.Content, TaskDialogProgressState.Indeterminate);
647-
// Dispatcher.UIThread.Post(() => { td.Content = $"下载完成,正在安装..."; });
648-
// break;
649-
// case (int)XunYouDownLoadCode.安装成功:
650-
// //处理成功
651-
// //Dispatcher.UIThread.Post(() => { td.Content = $"安装完成"; });
652-
// Dispatcher.UIThread.Post(() => { td.Hide(TaskDialogStandardResult.OK); });
653-
// td.Hide();
654-
// break;
655-
// case int n when n > 101 && n < (int)XunYouDownLoadCode.启动安装程序失败:
656-
// //处理失败
657-
// break;
658-
// // Code 和进度重叠 递进 1000 XunYouInstallOrStartCode.默认 XunYouInstallOrStartCode.已安装
659-
// case 1000:
660-
// Dispatcher.UIThread.Post(() => { td.Content = $"默认"; });
661-
// // XunYouInstallOrStartCode.默认
662-
// break;
663-
// case 1001:
664-
// Dispatcher.UIThread.Post(() => { td.Content = $"已安装"; });
665-
// // XunYouInstallOrStartCode.已安装
666-
// Dispatcher.UIThread.Post(() => { td.Hide(TaskDialogStandardResult.OK); });
667-
// break;
668-
// }
669-
// }
670-
//}
634+
await DownloadCallbackAsync(td, install);
671635
};
672636

673637
//_ = Task.Run(() => { XunYouSDK.InstallAsync(progress, Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), "WattAccelerator")); });

0 commit comments

Comments
 (0)