Skip to content

Commit 5850c42

Browse files
committed
更新引用和依赖
1 parent aa6a402 commit 5850c42

File tree

3 files changed

+10
-98
lines changed

3 files changed

+10
-98
lines changed

src/Desktop/BiliCopilot.UI/Toolkits/AppToolkit.cs

+2-25
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,10 @@ namespace BiliCopilot.UI.Toolkits;
1010
/// <summary>
1111
/// 应用工具组.
1212
/// </summary>
13-
internal sealed partial class AppToolkit : IAppToolkit
13+
internal sealed partial class AppToolkit : SharedAppToolkit
1414
{
15-
/// <summary>
16-
/// 获取应用包版本.
17-
/// </summary>
18-
/// <returns>包版本.</returns>
19-
public string GetPackageVersion()
15+
public AppToolkit(ISettingsToolkit settings) : base(settings)
2016
{
21-
var appVersion = Package.Current.Id.Version;
22-
return $"{appVersion.Major}.{appVersion.Minor}.{appVersion.Build}.{appVersion.Revision}";
2317
}
2418

2519
/// <summary>
@@ -122,23 +116,6 @@ public static bool IsP2PUrl(string url)
122116
return P2PRegex().IsMatch(uri.Host);
123117
}
124118

125-
/// <summary>
126-
/// 重置控件主题.
127-
/// </summary>
128-
/// <param name="element">控件.</param>
129-
public void ResetControlTheme(FrameworkElement element)
130-
=> element.RequestedTheme = SettingsToolkit.ReadLocalSetting(SettingNames.AppTheme, ElementTheme.Default);
131-
132-
/// <summary>
133-
/// 获取当前主题.
134-
/// </summary>
135-
/// <returns><see cref="ApplicationTheme"/>.</returns>
136-
public ApplicationTheme GetCurrentTheme()
137-
{
138-
var localTheme = SettingsToolkit.ReadLocalSetting(SettingNames.AppTheme, ElementTheme.Default);
139-
return localTheme == ElementTheme.Default ? App.Current.RequestedTheme : localTheme == ElementTheme.Light ? ApplicationTheme.Light : ApplicationTheme.Dark;
140-
}
141-
142119
/// <summary>
143120
/// 获取WebDav服务器地址.
144121
/// </summary>

src/Desktop/BiliCopilot.UI/Toolkits/SettingsToolkit.cs

+2-67
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ namespace BiliCopilot.UI.Toolkits;
99
/// <summary>
1010
/// Settings toolkit.
1111
/// </summary>
12-
internal sealed class SettingsToolkit : ISettingsToolkit
12+
internal sealed class SettingsToolkit : SharedSettingsToolkit
1313
{
1414
/// <summary>
1515
/// Read local setting.
@@ -21,37 +21,6 @@ internal sealed class SettingsToolkit : ISettingsToolkit
2121
public static T ReadLocalSetting<T>(SettingNames settingName, T defaultValue)
2222
=> GlobalDependencies.Kernel.GetRequiredService<ISettingsToolkit>().ReadLocalSetting(settingName.ToString(), defaultValue);
2323

24-
/// <summary>
25-
/// Read local setting.
26-
/// </summary>
27-
/// <typeparam name="T">Type of read value.</typeparam>
28-
/// <param name="settingName">Setting name.</param>
29-
/// <param name="defaultValue">Default value provided when the setting does not exist.</param>
30-
/// <returns>Setting value obtained.</returns>
31-
public T ReadLocalSetting<T>(string settingName, T defaultValue)
32-
{
33-
var settingContainer = GetSettingContainer();
34-
35-
if (IsSettingKeyExist(settingName))
36-
{
37-
if (defaultValue is Enum)
38-
{
39-
var tempValue = settingContainer.Values[settingName].ToString();
40-
_ = Enum.TryParse(typeof(T), tempValue, out var result);
41-
return result == null ? defaultValue : (T)result!;
42-
}
43-
else
44-
{
45-
return (T)settingContainer.Values[settingName];
46-
}
47-
}
48-
else
49-
{
50-
WriteLocalSetting(settingName, defaultValue);
51-
return defaultValue;
52-
}
53-
}
54-
5524
/// <summary>
5625
/// Write local setting.
5726
/// </summary>
@@ -61,39 +30,13 @@ public T ReadLocalSetting<T>(string settingName, T defaultValue)
6130
public static void WriteLocalSetting<T>(SettingNames settingName, T value)
6231
=> GlobalDependencies.Kernel.GetRequiredService<ISettingsToolkit>().WriteLocalSetting(settingName.ToString(), value);
6332

64-
/// <summary>
65-
/// Write local setting.
66-
/// </summary>
67-
/// <typeparam name="T">Type of written value.</typeparam>
68-
/// <param name="settingName">Setting name.</param>
69-
/// <param name="value">Setting value.</param>
70-
public void WriteLocalSetting<T>(string settingName, T value)
71-
{
72-
var settingContainer = GetSettingContainer();
73-
settingContainer.Values[settingName] = value is Enum ? value.ToString() : value;
74-
}
75-
7633
/// <summary>
7734
/// Delete local setting.
7835
/// </summary>
7936
/// <param name="settingName">Setting name.</param>
8037
public static void DeleteLocalSetting(SettingNames settingName)
8138
=> GlobalDependencies.Kernel.GetRequiredService<ISettingsToolkit>().DeleteLocalSetting(settingName.ToString());
8239

83-
/// <summary>
84-
/// Delete local setting.
85-
/// </summary>
86-
/// <param name="settingName">Setting name.</param>
87-
public void DeleteLocalSetting(string settingName)
88-
{
89-
var settingContainer = GetSettingContainer();
90-
91-
if (IsSettingKeyExist(settingName))
92-
{
93-
_ = settingContainer.Values.Remove(settingName);
94-
}
95-
}
96-
9740
/// <summary>
9841
/// Whether the setting to be read has been created locally.
9942
/// </summary>
@@ -102,14 +45,6 @@ public void DeleteLocalSetting(string settingName)
10245
public static bool IsSettingKeyExist(SettingNames settingName)
10346
=> GlobalDependencies.Kernel.GetRequiredService<ISettingsToolkit>().IsSettingKeyExist(settingName.ToString());
10447

105-
/// <summary>
106-
/// Whether the setting to be read has been created locally.
107-
/// </summary>
108-
/// <param name="settingName">Setting name.</param>
109-
/// <returns><c>true</c> means the local setting exists, <c>false</c> means it does not exist.</returns>
110-
public bool IsSettingKeyExist(string settingName)
111-
=> GetSettingContainer().Values.ContainsKey(settingName);
112-
113-
private static ApplicationDataContainer GetSettingContainer()
48+
protected override ApplicationDataContainer GetSettingContainer()
11449
=> ApplicationData.Current.LocalSettings.CreateContainer("v1", ApplicationDataCreateDisposition.Always);
11550
}

src/Directory.Packages.props

+6-6
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.3.0" />
3333
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.4.0" />
3434
<PackageVersion Include="Microsoft.CodeAnalysis.Metrics" Version="3.3.4" />
35-
<PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.2903.40" />
36-
<PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.3.162" />
35+
<PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.3065.39" />
36+
<PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.3.183" />
3737
<PackageVersion Include="Microsoft.Windows.CsWinRT" Version="2.2.0" />
3838
<PackageVersion Include="NLog.Extensions.Logging" Version="5.3.15" />
3939
<PackageVersion Include="Richasy.AgentKernel.Connectors.Ali" Version="0.0.1-preview4" />
@@ -70,7 +70,7 @@
7070
<PackageVersion Include="Richasy.BiliKernel.Services.Moment" Version="0.0.1-preview3" />
7171
<PackageVersion Include="Richasy.BiliKernel.Services.Search" Version="0.0.1-preview3" />
7272
<PackageVersion Include="Richasy.BiliKernel.Services.User" Version="0.0.1-preview3" />
73-
<PackageVersion Include="Richasy.WinUIKernel.AI" Version="0.0.1-preview4" />
73+
<PackageVersion Include="Richasy.WinUIKernel.AI" Version="0.0.2-preview1" />
7474
<PackageVersion Include="RichasyKernel.Core" Version="0.0.1" />
7575
<PackageVersion Include="Roman-Numerals" Version="2.0.1" />
7676
<PackageVersion Include="Serilog" Version="4.2.0" />
@@ -80,12 +80,12 @@
8080
<PackageVersion Include="Microsoft.Bcl.TimeProvider" Version="9.0.0" />
8181
<PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0" />
8282
<PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1742" />
83-
<PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.6.250108002" />
83+
<PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.6.250205002" />
8484
<PackageVersion Include="Polly" Version="8.4.1" />
8585
<PackageVersion Include="QRCoder" Version="1.4.1" />
8686
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="9.0.0" />
8787
<PackageVersion Include="System.Linq.Async" Version="9.0.0" />
88-
<PackageVersion Include="System.Management" Version="9.0.1" />
88+
<PackageVersion Include="System.Management" Version="9.0.2" />
8989
<PackageVersion Include="System.Memory.Data" Version="9.0.0" />
9090
<PackageVersion Include="System.Numerics.Tensors" Version="9.0.0" />
9191
<PackageVersion Include="System.Private.Uri" Version="4.3.2" />
@@ -106,7 +106,7 @@
106106
<PackageVersion Include="Microsoft.Extensions.Http" Version="9.0.0" />
107107
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="9.0.0" />
108108
<PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.0" />
109-
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.1" />
109+
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.2" />
110110
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="9.0.0" />
111111
<PackageVersion Include="Microsoft.Extensions.Options.DataAnnotations" Version="9.0.0" />
112112
<PackageVersion Include="Microsoft.Extensions.TimeProvider.Testing" Version="9.0.0" />

0 commit comments

Comments
 (0)