Skip to content

Commit

Permalink
Finish task and publish 1.5.414.0 version
Browse files Browse the repository at this point in the history
1.Finish task and publish 1.5.414.0 version
2.Update Windows App SDK version 1.3.230331000(1.3.0.0)
3.Update Mile.Xaml version 2.0.573-preview
4.Add app information dialog
5.Use Windows App Sdk 1.3 new Systembackdrop and AppWindow API(Beta)_
6.Update WebView2 core clear history data new API
  • Loading branch information
Gaoyifei1011 committed Apr 14, 2023
1 parent d087599 commit b01cf61
Show file tree
Hide file tree
Showing 45 changed files with 1,040 additions and 380 deletions.
58 changes: 58 additions & 0 deletions GetStoreApp/Extensions/Backdrop/DesktopAcrylicSystemBackdrop.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
using GetStoreApp.Services.Root;
using Microsoft.UI.Composition;
using Microsoft.UI.Composition.SystemBackdrops;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Media;
using System;

namespace GetStoreApp.Extensions.Backdrop
{
/// <summary>
/// 自定义扩展的亚克力背景色类
/// </summary>
public class DesktopAcrylicSystemBackdrop : SystemBackdrop
{
private DesktopAcrylicController _desktopAcrylicController;

public SystemBackdropConfiguration BackdropConfiguration { get; private set; }

/// <summary>
/// 在 Window.SystemBackdrop 上设置时触发该方法
/// </summary>
protected override void OnTargetConnected(ICompositionSupportsSystemBackdrop connectedTarget, XamlRoot xamlRoot)
{
base.OnTargetConnected(connectedTarget, xamlRoot);

if (_desktopAcrylicController != null)
{
throw new ApplicationException(ResourceService.GetLocalized("Resources/SystemBackdropControllerInitializeFailed"));
}

_desktopAcrylicController = new DesktopAcrylicController();
_desktopAcrylicController.AddSystemBackdropTarget(connectedTarget);

SetControllerConfiguration(connectedTarget, xamlRoot);
}

/// <summary>
/// 从 Window.SystemBackdrop 对象中清除此对象时调用。
/// </summary>
protected override void OnTargetDisconnected(ICompositionSupportsSystemBackdrop disconnectedTarget)
{
base.OnTargetDisconnected(disconnectedTarget);

_desktopAcrylicController.RemoveSystemBackdropTarget(disconnectedTarget);
_desktopAcrylicController = null;
}

/// <summary>
/// 设置应用于系统背景目标的系统策略
/// </summary>
private void SetControllerConfiguration(ICompositionSupportsSystemBackdrop connectedTarget, XamlRoot xamlRoot)
{
BackdropConfiguration = GetDefaultSystemBackdropConfiguration(connectedTarget, xamlRoot);
BackdropConfiguration.IsInputActive = true;
_desktopAcrylicController.SetSystemBackdropConfiguration(BackdropConfiguration);
}
}
}
60 changes: 60 additions & 0 deletions GetStoreApp/Extensions/Backdrop/MicaSystemBackdrop.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
using GetStoreApp.Services.Root;
using Microsoft.UI.Composition;
using Microsoft.UI.Composition.SystemBackdrops;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Media;
using System;

namespace GetStoreApp.Extensions.Backdrop
{
/// <summary>
/// 自定义扩展的云母背景色类
/// </summary>
public class MicaSystemBackdrop : SystemBackdrop
{
private MicaController _micaController;

public SystemBackdropConfiguration BackdropConfiguration { get; private set; }

public MicaKind Kind { get; set; } = MicaKind.Base;

/// <summary>
/// 在 Window.SystemBackdrop 上设置时触发该方法
/// </summary>
protected override void OnTargetConnected(ICompositionSupportsSystemBackdrop connectedTarget, XamlRoot xamlRoot)
{
base.OnTargetConnected(connectedTarget, xamlRoot);

if (_micaController != null)
{
throw new ApplicationException(ResourceService.GetLocalized("Resources/SystemBackdropControllerInitializeFailed"));
}

_micaController = new MicaController() { Kind = Kind };
_micaController.AddSystemBackdropTarget(connectedTarget);

SetControllerConfiguration(connectedTarget, xamlRoot);
}

/// <summary>
/// 从 Window.SystemBackdrop 对象中清除此对象时调用。
/// </summary>
protected override void OnTargetDisconnected(ICompositionSupportsSystemBackdrop disconnectedTarget)
{
base.OnTargetDisconnected(disconnectedTarget);

_micaController.RemoveSystemBackdropTarget(disconnectedTarget);
_micaController = null;
}

/// <summary>
/// 设置应用于系统背景目标的系统策略
/// </summary>
private void SetControllerConfiguration(ICompositionSupportsSystemBackdrop connectedTarget, XamlRoot xamlRoot)
{
BackdropConfiguration = GetDefaultSystemBackdropConfiguration(connectedTarget, xamlRoot);
BackdropConfiguration.IsInputActive = true;
_micaController.SetSystemBackdropConfiguration(BackdropConfiguration);
}
}
}
23 changes: 15 additions & 8 deletions GetStoreApp/GetStoreApp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<EnableMsixTooling>false</EnableMsixTooling>
<EnforceCodeStyleInBuild>True</EnforceCodeStyleInBuild>
<FileAlignment>512</FileAlignment>
<FileVersion>1.4.408.0</FileVersion>
<FileVersion>1.5.414.0</FileVersion>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<GenerateTestArtifacts>True</GenerateTestArtifacts>
<HttpActivityPropagationSupport>false</HttpActivityPropagationSupport>
Expand Down Expand Up @@ -43,7 +43,7 @@
<TargetFramework>net7.0-windows10.0.22621.0</TargetFramework>
<TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
<TrimMode>partial</TrimMode>
<Version>1.4.408.0</Version>
<Version>1.5.414.0</Version>
<UseWindowsForms>False</UseWindowsForms>
<UseWinUI>true</UseWinUI>
<UseWPF>False</UseWPF>
Expand Down Expand Up @@ -105,6 +105,7 @@
<None Update="Assets\GetStoreApp.ico">
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
</None>

<Content Update="Assets\GetStoreApp.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
Expand All @@ -116,7 +117,7 @@
</Content>
<None Update="Assets\Resources\LICENSE">
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
</None>
</None>
<Content Include="Fonts\Segoe Fluent Icons.ttf">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
Expand All @@ -137,9 +138,6 @@
<None Include="Assets\ControlIcon\Download.png">
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
</None>
<None Include="Assets\ControlIcon\History.png">
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
</None>
<None Include="Assets\ControlIcon\Home.png">
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
</None>
Expand Down Expand Up @@ -221,6 +219,7 @@

<None Remove="UI\Controls\Window\AppTitleBarControl.xaml" />

<None Remove="UI\Dialogs\About\AppInformationDialog.xaml" />
<None Remove="UI\Dialogs\About\ConsoleStartupArgsDialog.xaml" />

<None Remove="UI\Dialogs\Common\DPIChangedNotifyDialog.xaml" />
Expand All @@ -245,6 +244,8 @@

<None Remove="UI\Dialogs\ContentDialogs\Web\CoreWebView2FailedDialog.xaml" />

<None Remove="UI\Notifications\CopyAppInformationNotification.xaml" />

<None Remove="UI\Notifications\DownloadCreateNotification.xaml" />
<None Remove="UI\Notifications\ExceptionCopyNotification.xaml" />
<None Remove="UI\Notifications\FileInformationCopyNotification.xaml" />
Expand Down Expand Up @@ -284,7 +285,7 @@
<SubType>Designer</SubType>
</ApplicationDefinition>

<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.2.230313.1" />
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.3.230331000" />
<PackageReference Include="Mile.Aria2" Version="1.0.8" />

<Page Update="Styles\Button.xaml">
Expand Down Expand Up @@ -458,7 +459,10 @@
<Page Update="UI\Controls\Web\LoadFailedControl.xaml">
<Generator>MSBuild:Compile</Generator>
</Page>


<Page Update="UI\Dialogs\About\AppInformationDialog.xaml">
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Update="UI\Dialogs\About\CloudflareValidationDialog.xaml">
<Generator>MSBuild:Compile</Generator>
</Page>
Expand Down Expand Up @@ -515,6 +519,9 @@
<Generator>MSBuild:Compile</Generator>
</Page>

<Page Update="UI\Notifications\CopyAppInformationNotification.xaml">
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Update="UI\Notifications\DownloadCreateNotification.xaml">
<Generator>MSBuild:Compile</Generator>
</Page>
Expand Down
19 changes: 19 additions & 0 deletions GetStoreApp/Helpers/Root/InfoHelper.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
using GetStoreApp.Extensions.DataType.Struct;
using GetStoreApp.WindowsAPI.PInvoke.Version;
using System;
using System.Runtime.InteropServices;
using Windows.ApplicationModel;
using Windows.System.Profile;

Expand Down Expand Up @@ -68,5 +71,21 @@ public static SystemVersion GetSystemVersion()
{
return SystemVersion;
}

/// <summary>
/// 获取文件的信息
/// </summary>
public static VS_FIXEDFILEINFO GetFileInfo(string filePath)
{
uint dummy;
int versionSize = VersionLibrary.GetFileVersionInfoSize(filePath, out dummy);
byte[] versionData = new byte[versionSize];
VersionLibrary.GetFileVersionInfo(filePath, 0, versionSize, versionData);

IntPtr pFixedVersionInfo;
VersionLibrary.VerQueryValue(versionData, "\\", out pFixedVersionInfo, out dummy);

return (VS_FIXEDFILEINFO)Marshal.PtrToStructure(pFixedVersionInfo, typeof(VS_FIXEDFILEINFO));
}
}
}
Loading

0 comments on commit b01cf61

Please sign in to comment.