mirror of
https://github.com/Pixeval/Pixeval.git
synced 2025-04-04 22:23:34 +08:00
修复杂项问题 (#637)
* update readme * update supporter * update package * fix settingspage * remove usings
This commit is contained in:
Poker
GitHub
parent
f40f35ed2b
commit
a207443167
6
.github/README.en.md
vendored
6
.github/README.en.md
vendored
@ -8,13 +8,13 @@ Powerful, fast and beautiful Pixiv third-party desktop program based on .NET 8 a
|
||||
|
||||
[<img src="https://get.microsoft.com/images/en-us%20dark.svg" width="200"/>](https://apps.microsoft.com/detail/Pixeval/9p1rzl9z8454?launch=true&mode=mini)
|
||||
|
||||
|
||||
|
||||
|
||||
[](https://jq.qq.com/?_wv=1027&k=5hGmJbQ)
|
||||
[](https://jq.qq.com/?_wv=1027&k=5hGmJbQ)
|
||||
[](https://github.com/Pixeval/Pixeval/blob/main/LICENSE)
|
||||
[](https://github.com/Pixeval/Pixeval/issues/new/choose)
|
||||
[](https://dotnet.microsoft.com/download/dotnet/8.0)
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
10
.github/README.fr.md
vendored
10
.github/README.fr.md
vendored
@ -1,20 +1,20 @@
|
||||
<div align="center">
|
||||
|
||||
<img src="..s/src/Pixeval/Assets/Images/logo.svg" alt="logo" width="200">
|
||||
<img src="../src/Pixeval/Assets/Images/logo.svg" alt="logo" width="200">
|
||||
|
||||
# Pixeval
|
||||
|
||||
Un client desktop tierce de Pixiv, puissant, rapid et vivide, basé sur .NET 8 et WinUI 3
|
||||
|
||||
[<img src="https://get.microsoft.com/images/fr-fr%20dark.svg" width="200"/>](https://apps.microsoft.com/detail/Pixeval/9p1rzl9z8454?launch=true&mode=mini)
|
||||
[<img src="https://get.microsoft.com/images/fr%20dark.svg" width="200"/>](https://apps.microsoft.com/detail/Pixeval/9p1rzl9z8454?launch=true&mode=mini)
|
||||
|
||||
|
||||
|
||||
|
||||
[](https://jq.qq.com/?_wv=1027&k=5hGmJbQ)
|
||||
[](https://jq.qq.com/?_wv=1027&k=5hGmJbQ)
|
||||
[](https://github.com/Pixeval/Pixeval/blob/main/LICENSE)
|
||||
[](https://github.com/Pixeval/Pixeval/issues/new/choose)
|
||||
[](https://dotnet.microsoft.com/download/dotnet/8.0)
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
6
.github/README.md
vendored
6
.github/README.md
vendored
@ -8,13 +8,13 @@
|
||||
|
||||
[<img src="https://get.microsoft.com/images/zh-cn%20dark.svg" width="200"/>](https://apps.microsoft.com/detail/Pixeval/9p1rzl9z8454?launch=true&mode=mini)
|
||||
|
||||
|
||||
|
||||
|
||||
[](https://jq.qq.com/?_wv=1027&k=5hGmJbQ)
|
||||
[](https://jq.qq.com/?_wv=1027&k=5hGmJbQ)
|
||||
[](https://github.com/Pixeval/Pixeval/blob/main/LICENSE)
|
||||
[](https://github.com/Pixeval/Pixeval/issues/new/choose)
|
||||
[](https://dotnet.microsoft.com/download/dotnet/8.0)
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
8
.github/README.ru.md
vendored
8
.github/README.ru.md
vendored
@ -6,15 +6,15 @@
|
||||
|
||||
Мощное, быстрое и красивое стороннее настольное приложение Pixiv на базе .NET 8 и WinUI 3
|
||||
|
||||
[<img src="https://get.microsoft.com/images/ru-ru%20dark.svg" width="200"/>](https://apps.microsoft.com/detail/Pixeval/9p1rzl9z8454?launch=true&mode=mini)
|
||||
[<img src="https://get.microsoft.com/images/ru%20dark.svg" width="200"/>](https://apps.microsoft.com/detail/Pixeval/9p1rzl9z8454?launch=true&mode=mini)
|
||||
|
||||
|
||||
|
||||
|
||||
[](https://jq.qq.com/?_wv=1027&k=5hGmJbQ)
|
||||
[](https://jq.qq.com/?_wv=1027&k=5hGmJbQ)
|
||||
[](https://github.com/Pixeval/Pixeval/blob/main/LICENSE)
|
||||
[](https://github.com/Pixeval/Pixeval/issues/new/choose)
|
||||
[](https://dotnet.microsoft.com/download/dotnet/8.0)
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
@ -33,7 +33,7 @@
|
||||
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
|
||||
<PackageReference Include="CommunityToolkit.WinUI.Controls.Primitives" Version="8.1.240916" />
|
||||
<PackageReference Include="CommunityToolkit.WinUI.Extensions" Version="8.1.240916" />
|
||||
<PackageReference Include="WinUI3Utilities" Version="1.1.7.14" />
|
||||
<PackageReference Include="WinUI3Utilities" Version="1.1.7.16" />
|
||||
|
||||
<ProjectReference Include="..\Pixeval.Utilities\Pixeval.Utilities.csproj" />
|
||||
<ProjectReference Include="..\Pixeval.SourceGen\Pixeval.SourceGen.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="False" />
|
||||
|
||||
@ -128,9 +128,9 @@
|
||||
},
|
||||
"WinUI3Utilities": {
|
||||
"type": "Direct",
|
||||
"requested": "[1.1.7.14, )",
|
||||
"resolved": "1.1.7.14",
|
||||
"contentHash": "NFw6lPJV0j3n3bf1vIsw/uj9CVvcOmhB1llsTwIbDCRiEjza1EuAVdwNxq+Rf/oEM3fnyGSbB8gXoBmeFEeR/Q==",
|
||||
"requested": "[1.1.7.16, )",
|
||||
"resolved": "1.1.7.16",
|
||||
"contentHash": "kyu8WosE70yXcFHljE6aIPbQC9ol1khUJ4+NioypnAzu9KM/bg5ZR7AEkd/NM2/EJEwpMTNL2qHS8CHba/Y/mg==",
|
||||
"dependencies": {
|
||||
"Microsoft.Windows.SDK.BuildTools": "10.0.26100.1742",
|
||||
"Microsoft.WindowsAppSDK": "1.5.241107002"
|
||||
|
||||
@ -1,9 +1,7 @@
|
||||
// Copyright (c) Pixeval.
|
||||
// Licensed under the GPL v3 License.
|
||||
|
||||
using System;
|
||||
using System.Linq;
|
||||
using System.Runtime;
|
||||
using Microsoft.UI.Xaml.Controls;
|
||||
using Microsoft.UI.Xaml.Navigation;
|
||||
using Pixeval.Controls;
|
||||
|
||||
@ -1,8 +1,6 @@
|
||||
// Copyright (c) Pixeval.
|
||||
// Licensed under the GPL v3 License.
|
||||
|
||||
using System.Runtime;
|
||||
using System;
|
||||
using Microsoft.UI.Xaml.Controls;
|
||||
using Microsoft.UI.Xaml.Navigation;
|
||||
using Pixeval.Controls;
|
||||
|
||||
@ -1,8 +1,6 @@
|
||||
// Copyright (c) Pixeval.
|
||||
// Licensed under the GPL v3 License.
|
||||
|
||||
using System.Runtime;
|
||||
using System;
|
||||
using Microsoft.UI.Xaml.Controls;
|
||||
using Microsoft.UI.Xaml.Navigation;
|
||||
using Pixeval.Controls;
|
||||
|
||||
@ -10,7 +10,6 @@ using Microsoft.Extensions.DependencyInjection;
|
||||
using Pixeval.AppManagement;
|
||||
using Pixeval.Controls.Windowing;
|
||||
using Pixeval.CoreApi;
|
||||
using Pixeval.CoreApi.Global.Enum;
|
||||
using Pixeval.Logging;
|
||||
using Pixeval.Settings.Models;
|
||||
using Pixeval.Util.UI;
|
||||
|
||||
@ -170,15 +170,7 @@ public sealed partial class SettingsPage : IDisposable, INotifyPropertyChanged
|
||||
/// <summary>
|
||||
/// 每次离开页面都进行保存
|
||||
/// </summary>
|
||||
private void SettingsPage_OnUnloaded(object sender, RoutedEventArgs e)
|
||||
{
|
||||
foreach (var localGroup in ViewModel.LocalGroups)
|
||||
foreach (var settingsEntry in localGroup)
|
||||
settingsEntry.ValueSaving(AppInfo.LocalConfig);
|
||||
foreach (var extensionGroup in ViewModel.ExtensionGroups)
|
||||
foreach (var settingsEntry in extensionGroup)
|
||||
settingsEntry.ValueSaving(extensionGroup.Model.Values);
|
||||
}
|
||||
private void SettingsPage_OnUnloaded(object sender, RoutedEventArgs e) => ValueSaving();
|
||||
|
||||
public void Dispose()
|
||||
{
|
||||
@ -186,6 +178,7 @@ public sealed partial class SettingsPage : IDisposable, INotifyPropertyChanged
|
||||
return;
|
||||
_disposed = true;
|
||||
Bindings.StopTracking();
|
||||
ValueSaving();
|
||||
ViewModel.Dispose();
|
||||
ViewModel = null!;
|
||||
}
|
||||
@ -196,6 +189,18 @@ public sealed partial class SettingsPage : IDisposable, INotifyPropertyChanged
|
||||
Dispose();
|
||||
}
|
||||
|
||||
private void ValueSaving()
|
||||
{
|
||||
if (ViewModel == null!)
|
||||
return;
|
||||
foreach (var localGroup in ViewModel.LocalGroups)
|
||||
foreach (var settingsEntry in localGroup)
|
||||
settingsEntry.ValueSaving(AppInfo.LocalConfig);
|
||||
foreach (var extensionGroup in ViewModel.ExtensionGroups)
|
||||
foreach (var settingsEntry in extensionGroup)
|
||||
settingsEntry.ValueSaving(extensionGroup.Model.Values);
|
||||
}
|
||||
|
||||
public event PropertyChangedEventHandler? PropertyChanged;
|
||||
|
||||
private void OnPropertyChanged([CallerMemberName] string? propertyName = null)
|
||||
|
||||
@ -118,6 +118,7 @@ public record Supporter(string Nickname, string Name, Uri ProfilePicture, Uri Pr
|
||||
public partial class GitHubUserSerializeContext : JsonSerializerContext;
|
||||
|
||||
[JsonSerializable(typeof(Supporter[]))]
|
||||
[JsonSerializable(typeof(List<Supporter>))]
|
||||
public partial class SupporterSerializeContext : JsonSerializerContext;
|
||||
|
||||
public class GitHubUser
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<PropertyGroup>
|
||||
<OutputType>WinExe</OutputType>
|
||||
<TargetFramework>net9.0-windows10.0.22621.0</TargetFramework>
|
||||
@ -55,15 +55,15 @@
|
||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||
</PackageReference>
|
||||
<PackageReference Include="PininSharp" Version="1.2.0" />
|
||||
<PackageReference Include="Pixeval.Extensions.Common" Version="4.3.3.2" />
|
||||
<PackageReference Include="Pixeval.Extensions.Common" Version="4.3.4" />
|
||||
<!--<PackageReference Include="Pixeval.Bypass" Version="1.1.7" />-->
|
||||
<PackageReference Include="Pixeval.QRCoder" Version="1.4.5" />
|
||||
<PackageReference Include="QuestPDF" Version="2024.12.2" />
|
||||
<PackageReference Include="QuestPDF" Version="2024.12.3" />
|
||||
<PackageReference Include="ReverseMarkdown" Version="4.6.0" />
|
||||
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.6" />
|
||||
<PackageReference Include="SixLabors.ImageSharp.Drawing" Version="2.1.5" />
|
||||
<PackageReference Include="System.Linq.Async" Version="6.0.1" />
|
||||
<PackageReference Include="WinUI3Utilities" Version="1.1.7.14" />
|
||||
<PackageReference Include="WinUI3Utilities" Version="1.1.7.16" />
|
||||
<ProjectReference Include="..\Pixeval.Caching\Pixeval.Caching.csproj" />
|
||||
|
||||
<ProjectReference Include="..\Pixeval.Controls\Pixeval.Controls.csproj" />
|
||||
|
||||
@ -25,7 +25,6 @@ using WinUI3Utilities;
|
||||
using QRCoder;
|
||||
using Microsoft.UI.Xaml.Media.Imaging;
|
||||
using Pixeval.Utilities;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using Pixeval.Util.IO.Caching;
|
||||
|
||||
namespace Pixeval.Util.IO;
|
||||
|
||||
@ -266,7 +266,7 @@
|
||||
},
|
||||
"Pixeval.Extensions.Common": {
|
||||
"type": "Direct",
|
||||
"requested": "[4.3.3.2, )",
|
||||
"requested": "[4.3.4, )",
|
||||
"resolved": "4.3.4",
|
||||
"contentHash": "LrOURbnz6tyiG5Cks4xRNZE/VUOcjvIqVrAz/jsWb9mK4r+opEgAPJD/q10e/PJe5qyxI3dVWrCGVeYtDm87YQ==",
|
||||
"dependencies": {
|
||||
@ -284,9 +284,9 @@
|
||||
},
|
||||
"QuestPDF": {
|
||||
"type": "Direct",
|
||||
"requested": "[2024.12.2, )",
|
||||
"resolved": "2024.12.2",
|
||||
"contentHash": "tVKd0zv1tqCvwEWGhtm437hnN3zh+h1M0Catba6RALAyMr96tKo6/8QlHvpjfwbm9unKYxTW/F/O2WSwRW2EWg=="
|
||||
"requested": "[2024.12.3, )",
|
||||
"resolved": "2024.12.3",
|
||||
"contentHash": "gdIoEC9cTnySnDdbwcguUfSS2+444rGEeecQH5n0IKUA9Tm4473eRrFjPk5HoD5I2BxjuyDW+WCGnwKa+OIXsw=="
|
||||
},
|
||||
"ReverseMarkdown": {
|
||||
"type": "Direct",
|
||||
@ -324,9 +324,9 @@
|
||||
},
|
||||
"WinUI3Utilities": {
|
||||
"type": "Direct",
|
||||
"requested": "[1.1.7.14, )",
|
||||
"resolved": "1.1.7.14",
|
||||
"contentHash": "NFw6lPJV0j3n3bf1vIsw/uj9CVvcOmhB1llsTwIbDCRiEjza1EuAVdwNxq+Rf/oEM3fnyGSbB8gXoBmeFEeR/Q==",
|
||||
"requested": "[1.1.7.16, )",
|
||||
"resolved": "1.1.7.16",
|
||||
"contentHash": "kyu8WosE70yXcFHljE6aIPbQC9ol1khUJ4+NioypnAzu9KM/bg5ZR7AEkd/NM2/EJEwpMTNL2qHS8CHba/Y/mg==",
|
||||
"dependencies": {
|
||||
"Microsoft.Windows.SDK.BuildTools": "10.0.26100.1742",
|
||||
"Microsoft.WindowsAppSDK": "1.5.241107002"
|
||||
@ -779,7 +779,7 @@
|
||||
"Microsoft.WindowsAppSDK": "[1.6.250108002, )",
|
||||
"Microsoft.Xaml.Behaviors.WinUI.Managed": "[2.0.9, )",
|
||||
"Pixeval.Utilities": "[1.0.0, )",
|
||||
"WinUI3Utilities": "[1.1.7.14, )"
|
||||
"WinUI3Utilities": "[1.1.7.16, )"
|
||||
}
|
||||
},
|
||||
"pixeval.coreapi": {
|
||||
@ -815,9 +815,9 @@
|
||||
},
|
||||
"QuestPDF": {
|
||||
"type": "Direct",
|
||||
"requested": "[2024.12.2, )",
|
||||
"resolved": "2024.12.2",
|
||||
"contentHash": "tVKd0zv1tqCvwEWGhtm437hnN3zh+h1M0Catba6RALAyMr96tKo6/8QlHvpjfwbm9unKYxTW/F/O2WSwRW2EWg=="
|
||||
"requested": "[2024.12.3, )",
|
||||
"resolved": "2024.12.3",
|
||||
"contentHash": "gdIoEC9cTnySnDdbwcguUfSS2+444rGEeecQH5n0IKUA9Tm4473eRrFjPk5HoD5I2BxjuyDW+WCGnwKa+OIXsw=="
|
||||
},
|
||||
"Microsoft.Graphics.Win2D": {
|
||||
"type": "Transitive",
|
||||
@ -846,9 +846,9 @@
|
||||
},
|
||||
"QuestPDF": {
|
||||
"type": "Direct",
|
||||
"requested": "[2024.12.2, )",
|
||||
"resolved": "2024.12.2",
|
||||
"contentHash": "tVKd0zv1tqCvwEWGhtm437hnN3zh+h1M0Catba6RALAyMr96tKo6/8QlHvpjfwbm9unKYxTW/F/O2WSwRW2EWg=="
|
||||
"requested": "[2024.12.3, )",
|
||||
"resolved": "2024.12.3",
|
||||
"contentHash": "gdIoEC9cTnySnDdbwcguUfSS2+444rGEeecQH5n0IKUA9Tm4473eRrFjPk5HoD5I2BxjuyDW+WCGnwKa+OIXsw=="
|
||||
},
|
||||
"Microsoft.Graphics.Win2D": {
|
||||
"type": "Transitive",
|
||||
@ -877,9 +877,9 @@
|
||||
},
|
||||
"QuestPDF": {
|
||||
"type": "Direct",
|
||||
"requested": "[2024.12.2, )",
|
||||
"resolved": "2024.12.2",
|
||||
"contentHash": "tVKd0zv1tqCvwEWGhtm437hnN3zh+h1M0Catba6RALAyMr96tKo6/8QlHvpjfwbm9unKYxTW/F/O2WSwRW2EWg=="
|
||||
"requested": "[2024.12.3, )",
|
||||
"resolved": "2024.12.3",
|
||||
"contentHash": "gdIoEC9cTnySnDdbwcguUfSS2+444rGEeecQH5n0IKUA9Tm4473eRrFjPk5HoD5I2BxjuyDW+WCGnwKa+OIXsw=="
|
||||
},
|
||||
"Microsoft.Graphics.Win2D": {
|
||||
"type": "Transitive",
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user