Merge pull request #1 from DearVa/main

* 修复了WebView2的生命周期和透明度问题，进行了跨平台的适配，同时强迫症犯了帮你重构了项目结构
AuroraZiling · Jul 21, 2024 · b50cd85 · b50cd85
2 parents c313545 + 22376de
commit b50cd85
Show file tree

Hide file tree

Showing 78 changed files with 684 additions and 627 deletions.
diff --git a/Hollow.Core/Hollow.Core.csproj → ...w.Abstractions/Hollow.Abstractions.csproj b/Hollow.Core/Hollow.Core.csproj → ...w.Abstractions/Hollow.Abstractions.csproj
diff --git a/....Core/Helpers/JsonIntToStringConverter.cs → ...sonConverters/JsonIntToStringConverter.cs b/....Core/Helpers/JsonIntToStringConverter.cs → ...sonConverters/JsonIntToStringConverter.cs
@@ -1,7 +1,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace Hollow.Core.Helpers;
+namespace Hollow.Abstractions.JsonConverters;
 
 public class JsonIntToStringConverter: JsonConverter<string>
 {

diff --git a/Hollow/Models/AppInfo.cs → Hollow.Abstractions/Models/AppInfo.cs b/Hollow/Models/AppInfo.cs → Hollow.Abstractions/Models/AppInfo.cs
@@ -1,7 +1,6 @@
-using System.IO;
-using System.Reflection;
+using System.Reflection;
 
-namespace Hollow.Models;
+namespace Hollow.Abstractions.Models;
 
 public class AppInfo
 {

diff --git a/Hollow/Models/Configs/AppConfig.cs → ....Abstractions/Models/Configs/AppConfig.cs b/Hollow/Models/Configs/AppConfig.cs → ....Abstractions/Models/Configs/AppConfig.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Hollow.Models.Configs;
+namespace Hollow.Abstractions.Models.Configs;
 
 public class AppConfig
 {

diff --git a/Hollow.Core/Gacha/Common/GachaItem.cs → ...s/HttpContrasts/Gacha/Common/GachaItem.cs b/Hollow.Core/Gacha/Common/GachaItem.cs → ...s/HttpContrasts/Gacha/Common/GachaItem.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Hollow.Core.Gacha.Common;
+namespace Hollow.Abstractions.Models.HttpContrasts.Gacha.Common;
 
 public class GachaItem
 {

diff --git a/Hollow.Core/Gacha/GachaPage.cs → ...s/Models/HttpContrasts/Gacha/GachaPage.cs b/Hollow.Core/Gacha/GachaPage.cs → ...s/Models/HttpContrasts/Gacha/GachaPage.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Hollow.Core.Gacha.Common;
+using Hollow.Abstractions.Models.HttpContrasts.Gacha.Common;
 
-namespace Hollow.Core.Gacha;
+namespace Hollow.Abstractions.Models.HttpContrasts.Gacha;
 
 public class GachaPage
 {

diff --git a/Hollow.Core/Gacha/Uigf/GachaRecords.cs → .../HttpContrasts/Gacha/Uigf/GachaRecords.cs b/Hollow.Core/Gacha/Uigf/GachaRecords.cs → .../HttpContrasts/Gacha/Uigf/GachaRecords.cs
@@ -1,8 +1,8 @@
 using System.Text.Json.Serialization;
-using Hollow.Core.Gacha.Common;
-using Hollow.Core.Helpers;
+using Hollow.Abstractions.JsonConverters;
+using Hollow.Abstractions.Models.HttpContrasts.Gacha.Common;
 
-namespace Hollow.Core.Gacha.Uigf;
+namespace Hollow.Abstractions.Models.HttpContrasts.Gacha.Uigf;
 
 public class GachaRecords
 {

diff --git a/...iHoYoLauncher/Models/Common/ImageModel.cs → ...rasts/MiHoYoLauncher/Common/ImageModel.cs b/...iHoYoLauncher/Models/Common/ImageModel.cs → ...rasts/MiHoYoLauncher/Common/ImageModel.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Hollow.Core.MiHoYoLauncher.Models.Common;
+namespace Hollow.Abstractions.Models.HttpContrasts.MiHoYoLauncher.Common;
 
 public class ImageModel
 {

diff --git a/...oYoLauncher/Models/ZzzAllGameBasicInfo.cs → ...sts/MiHoYoLauncher/ZzzAllGameBasicInfo.cs b/...oYoLauncher/Models/ZzzAllGameBasicInfo.cs → ...sts/MiHoYoLauncher/ZzzAllGameBasicInfo.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Hollow.Core.MiHoYoLauncher.Models.Common;
+using Hollow.Abstractions.Models.HttpContrasts.MiHoYoLauncher.Common;
 
-namespace Hollow.Core.MiHoYoLauncher.Models;
+namespace Hollow.Abstractions.Models.HttpContrasts.MiHoYoLauncher;
 
 public class ZzzAllGameBasicInfo
 {

diff --git a/.../MiHoYoLauncher/Models/ZzzAnnouncement.cs → ...ntrasts/MiHoYoLauncher/ZzzAnnouncement.cs b/.../MiHoYoLauncher/Models/ZzzAnnouncement.cs → ...ntrasts/MiHoYoLauncher/ZzzAnnouncement.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Hollow.Core.MiHoYoLauncher.Models;
+namespace Hollow.Abstractions.Models.HttpContrasts.MiHoYoLauncher;
 
 public class ZzzAnnouncement
 {

diff --git a/...Launcher/Models/ZzzAnnouncementContent.cs → .../MiHoYoLauncher/ZzzAnnouncementContent.cs b/...Launcher/Models/ZzzAnnouncementContent.cs → .../MiHoYoLauncher/ZzzAnnouncementContent.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Hollow.Core.MiHoYoLauncher.Models;
+namespace Hollow.Abstractions.Models.HttpContrasts.MiHoYoLauncher;
 
 public class ZzzAnnouncementContent
 {

diff --git a/...e/MiHoYoLauncher/Models/ZzzGameContent.cs → ...ontrasts/MiHoYoLauncher/ZzzGameContent.cs b/...e/MiHoYoLauncher/Models/ZzzGameContent.cs → ...ontrasts/MiHoYoLauncher/ZzzGameContent.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Hollow.Core.MiHoYoLauncher.Models.Common;
+using Hollow.Abstractions.Models.HttpContrasts.MiHoYoLauncher.Common;
 
-namespace Hollow.Core.MiHoYoLauncher.Models;
+namespace Hollow.Abstractions.Models.HttpContrasts.MiHoYoLauncher;
 
 
 public class ZzzGameContent

diff --git a/...Core/MiHoYoLauncher/Models/ZzzGameInfo.cs → ...tpContrasts/MiHoYoLauncher/ZzzGameInfo.cs b/...Core/MiHoYoLauncher/Models/ZzzGameInfo.cs → ...tpContrasts/MiHoYoLauncher/ZzzGameInfo.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Hollow.Core.MiHoYoLauncher.Models.Common;
+using Hollow.Abstractions.Models.HttpContrasts.MiHoYoLauncher.Common;
 
-namespace Hollow.Core.MiHoYoLauncher.Models;
+namespace Hollow.Abstractions.Models.HttpContrasts.MiHoYoLauncher;
 
 public class ZzzGameInfo
 {

diff --git a/Hollow/Models/Response.cs → ...ractions/Models/HttpContrasts/Response.cs b/Hollow/Models/Response.cs → ...ractions/Models/HttpContrasts/Response.cs
@@ -1,6 +1,6 @@
-namespace Hollow.Models;
+namespace Hollow.Abstractions.Models.HttpContrasts;
 
-public struct Response<T>(bool isSuccess, string message="")
+public struct Response<T>(bool isSuccess, string message = "")
 {
     public T Data { get; set; }
     public readonly bool IsSuccess = isSuccess;

diff --git a/Hollow.Core/MiHoYoLauncher/GameId.cs → ...tractions/Models/MiHoYoLauncher/GameId.cs b/Hollow.Core/MiHoYoLauncher/GameId.cs → ...tractions/Models/MiHoYoLauncher/GameId.cs
@@ -1,4 +1,4 @@
-namespace Hollow.Core.MiHoYoLauncher;
+namespace Hollow.Abstractions.Models.MiHoYoLauncher;
 
 public class GameId
 {

diff --git a/Hollow.Core/MiHoYoLauncher/LauncherId.cs → ...tions/Models/MiHoYoLauncher/LauncherId.cs b/Hollow.Core/MiHoYoLauncher/LauncherId.cs → ...tions/Models/MiHoYoLauncher/LauncherId.cs
@@ -1,4 +1,4 @@
-namespace Hollow.Core.MiHoYoLauncher;
+namespace Hollow.Abstractions.Models.MiHoYoLauncher;
 
 public class LauncherId
 {

diff --git a/Hollow/Assets/Icons/small_icon.ico → Hollow.Windows/Assets/Icons/small_icon.ico b/Hollow/Assets/Icons/small_icon.ico → Hollow.Windows/Assets/Icons/small_icon.ico
diff --git a/Hollow.Windows/Hollow.Windows.csproj b/Hollow.Windows/Hollow.Windows.csproj
@@ -0,0 +1,27 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <OutputType>WinExe</OutputType>
+        <TargetFramework>net8.0-windows</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+        <ApplicationManifest>app.manifest</ApplicationManifest>
+        <IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
+        <TieredPGO>true</TieredPGO>
+        <TieredCompilationQuickJitForLoops>true</TieredCompilationQuickJitForLoops>
+        <ApplicationIcon>Assets\Icons\small_icon.ico</ApplicationIcon>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.106">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+        <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2646-prerelease"/>
+    </ItemGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\Hollow\Hollow.csproj"/>
+    </ItemGroup>
+
+</Project>
diff --git a/Hollow.Windows/NativeMethods.txt b/Hollow.Windows/NativeMethods.txt
@@ -0,0 +1,9 @@
+GetModuleHandle
+RegisterClassEx
+CreateWindowEx
+PostQuitMessage
+WM_DESTROY
+DefWindowProc
+DestroyWindow
+GetWindowLong
+SetLayeredWindowAttributes
diff --git a/Hollow/Program.cs → Hollow.Windows/Program.cs b/Hollow/Program.cs → Hollow.Windows/Program.cs
@@ -1,33 +1,28 @@
 using Avalonia;
-using System;
-using System.IO;
-using Hollow.Models;
+using Hollow.Abstractions.Models;
+using Hollow.Views.Controls.WebView;
+using Hollow.Windows.Services;
+using Microsoft.Extensions.DependencyInjection;
 using Serilog;
 
-namespace Hollow;
+namespace Hollow.Windows;
 
-sealed class Program
+public static class Program
 {
     // Initialization code. Don't use any Avalonia, third-party APIs or any
     // SynchronizationContext-reliant code before AppMain is called: things aren't initialized
     // yet and stuff might break.
     [STAThread]
     public static void Main(string[] args)
     {
-        Log.Logger = new LoggerConfiguration()
-            .Enrich.WithProperty("Version", AppInfo.AppVersion)
-            .MinimumLevel.Debug()
-            .WriteTo.Console(outputTemplate: "{Timestamp:HH:mm:ss} [{Level}] {Message}{NewLine}{Exception}")
-            .WriteTo.File(Path.Combine(AppInfo.LogDir, "log_.txt"), outputTemplate: "{Timestamp:HH:mm:ss} [{Level}] {Message}{NewLine}{Exception}", rollingInterval: RollingInterval.Day, retainedFileCountLimit: null)
-            .CreateLogger();
-
-        Log.Information("Hollow is starting...");
-
         //TODO: Platform specific
         Environment.SetEnvironmentVariable("WEBVIEW2_USER_DATA_FOLDER", AppInfo.CachesDir);
-        
+
         try
         {
+            App.ConfigureServices(x =>
+                x.AddTransient<IWebViewAdapter, WebView2Adapter>()
+            );
             BuildAvaloniaApp().StartWithClassicDesktopLifetime(args);
         }
         catch (Exception e)