fix https://git.snapgenshin.com/DGP-Studio/Feedback/issues/81

DGP-Studio · Dec 2, 2024 · b2bfed0 · b2bfed0
1 parent 51077a6
commit b2bfed0
Show file tree

Hide file tree

Showing 13 changed files with 57 additions and 21 deletions.
diff --git a/src/Snap.Hutao/Snap.Hutao/Core/Setting/SettingKeys.cs b/src/Snap.Hutao/Snap.Hutao/Core/Setting/SettingKeys.cs
@@ -77,7 +77,8 @@ internal static class SettingKeys
     public const string OverridePhysicalDriverType = "OverridePhysicalDriverType";
     public const string PhysicalDriverIsAlwaysSolidState = "PhysicalDriverIsAlwaysSolidState";
     public const string AlwaysIsFirstRunAfterUpdate = "AlwaysIsFirstRunAfterUpdate";
-    public const string AlphaBuildUseCNPatchEndpoint = "AlphaBuildUseCNPatchEndpoint";
+    public const string AlphaBuildUseCnPatchEndpoint = "AlphaBuildUseCNPatchEndpoint";
+    public const string AlphaBuildUseFjPatchEndpoint = "AlphaBuildUseFJPatchEndpoint";
     #endregion
 
     #region Obsolete

diff --git a/src/Snap.Hutao/Snap.Hutao/Service/Cultivation/CultivationService.cs b/src/Snap.Hutao/Snap.Hutao/Service/Cultivation/CultivationService.cs
@@ -6,7 +6,6 @@
 using Snap.Hutao.Model.Entity;
 using Snap.Hutao.Model.Entity.Primitive;
 using Snap.Hutao.Model.Intrinsic;
-using Snap.Hutao.Model.Metadata.Item;
 using Snap.Hutao.Service.Cultivation.Consumption;
 using Snap.Hutao.Service.Inventory;
 using Snap.Hutao.Service.Metadata.ContextAbstraction;

diff --git a/src/Snap.Hutao/Snap.Hutao/Service/Update/HutaoSelectedMirrorInformation.cs b/src/Snap.Hutao/Snap.Hutao/Service/Update/HutaoSelectedMirrorInformation.cs
@@ -1,4 +1,4 @@
-// Copyright (c) DGP Studio. All rights reserved.
+// Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
 using Snap.Hutao.Web.Hutao;

diff --git a/src/Snap.Hutao/Snap.Hutao/Service/Update/UpdateService.cs b/src/Snap.Hutao/Snap.Hutao/Service/Update/UpdateService.cs
@@ -1,4 +1,4 @@
-// Copyright (c) DGP Studio. All rights reserved.
+// Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
 using Snap.Hutao.Core;

diff --git a/src/Snap.Hutao/Snap.Hutao/Service/Update/UpdateStatus.cs b/src/Snap.Hutao/Snap.Hutao/Service/Update/UpdateStatus.cs
@@ -1,4 +1,4 @@
-// Copyright (c) DGP Studio. All rights reserved.
+// Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
 using CommunityToolkit.Common;

diff --git a/src/Snap.Hutao/Snap.Hutao/UI/Shell/NotifyIconController.cs b/src/Snap.Hutao/Snap.Hutao/UI/Shell/NotifyIconController.cs
@@ -1,4 +1,4 @@
-// Copyright (c) DGP Studio. All rights reserved.
+// Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
 using Microsoft.Win32;

diff --git a/src/Snap.Hutao/Snap.Hutao/UI/Shell/NotifyIconMessageWindow.cs b/src/Snap.Hutao/Snap.Hutao/UI/Shell/NotifyIconMessageWindow.cs
@@ -1,4 +1,4 @@
-// Copyright (c) DGP Studio. All rights reserved.
+// Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
 using Snap.Hutao.Core.Graphics;
@@ -76,7 +76,7 @@ public unsafe NotifyIconMessageWindow()
 
     public HWND HWND { get; }
 
-    public void Dispose()
+    public unsafe void Dispose()
     {
         if (isDisposed)
         {
@@ -88,13 +88,18 @@ public void Dispose()
         DestroyWindow(HWND);
         WindowTable.TryRemove(HWND, out _);
 
+        fixed (char* className = WindowClassName)
+        {
+            UnregisterClassW(className);
+        }
+
         GC.SuppressFinalize(this);
     }
 
     [UnmanagedCallersOnly(CallConvs = [typeof(CallConvStdcall)])]
     private static unsafe LRESULT OnWindowProcedure(HWND hwnd, uint uMsg, WPARAM wParam, LPARAM lParam)
     {
-        if (!WindowTable.TryGetValue(hwnd, out NotifyIconMessageWindow? window))
+        if (!WindowTable.TryGetValue(hwnd, out NotifyIconMessageWindow? window) || XamlApplicationLifetime.Exiting)
         {
             return DefWindowProcW(hwnd, uMsg, wParam, lParam);
         }

diff --git a/src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/Page/TestPage.xaml b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/Page/TestPage.xaml
@@ -123,8 +123,18 @@
                     <ToggleSwitch IsOn="{Binding AlwaysIsFirstRunAfterUpdate, Mode=TwoWay}"/>
                 </cwc:SettingsCard>
 
-                <cwc:SettingsCard Header="Alpha Build Use CN Patch Endpoint">
-                    <ToggleSwitch IsOn="{Binding AlphaBuildUseCNPatchEndpoint, Mode=TwoWay}"/>
+                <cwc:SettingsCard Header="Alpha Build Generic API Endpoint">
+                    <StackPanel Orientation="Horizontal">
+                        <ToggleSwitch
+                            IsOn="{Binding AlphaBuildUseCNPatchEndpoint, Mode=TwoWay}"
+                            OffContent="Oversea Endpoints"
+                            OnContent="Chinese Endpoints"/>
+                        <ToggleSwitch
+                            IsEnabled="{Binding AlphaBuildUseCNPatchEndpoint}"
+                            IsOn="{Binding AlphaBuildUseFJPatchEndpoint, Mode=TwoWay}"
+                            OffContent="No Secondary Endpoints"
+                            OnContent="Fujian Endpoints"/>
+                    </StackPanel>
                 </cwc:SettingsCard>
 
                 <TextBlock Style="{ThemeResource SettingsSectionHeaderTextBlockStyle}" Text="Gacha Service"/>

diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/TestViewModel.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/TestViewModel.cs
@@ -1,4 +1,4 @@
-// Copyright (c) DGP Studio. All rights reserved.
+// Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
 using Microsoft.CodeAnalysis.CSharp.Scripting;
@@ -151,15 +151,30 @@ public bool AlwaysIsFirstRunAfterUpdate
 
     public bool AlphaBuildUseCNPatchEndpoint
     {
-        get => LocalSetting.Get(SettingKeys.AlphaBuildUseCNPatchEndpoint, false);
+        get => LocalSetting.Get(SettingKeys.AlphaBuildUseCnPatchEndpoint, false);
         set
         {
             if (IsViewDisposed)
             {
                 return;
             }
 
-            LocalSetting.Set(SettingKeys.AlphaBuildUseCNPatchEndpoint, value);
+            LocalSetting.Set(SettingKeys.AlphaBuildUseCnPatchEndpoint, value);
+            OnPropertyChanged();
+        }
+    }
+
+    public bool AlphaBuildUseFJPatchEndpoint
+    {
+        get => LocalSetting.Get(SettingKeys.AlphaBuildUseFjPatchEndpoint, false);
+        set
+        {
+            if (IsViewDisposed)
+            {
+                return;
+            }
+
+            LocalSetting.Set(SettingKeys.AlphaBuildUseFjPatchEndpoint, value);
         }
     }
 

diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/TitleViewModel.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/TitleViewModel.cs
@@ -1,4 +1,4 @@
-// Copyright (c) DGP Studio. All rights reserved.
+// Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
 using Microsoft.UI.Xaml.Controls;
@@ -63,7 +63,7 @@ public static string Title
     protected override async ValueTask<bool> LoadOverrideAsync()
     {
         ShowUpdateLogWindowAfterUpdate();
-        NotifyIfDateFolderHasReparsePoint();
+        NotifyIfDataFolderHasReparsePoint();
         await DoCheckUpdateAsync().ConfigureAwait(false);
         await CheckProxyAndLoopbackAsync().ConfigureAwait(false);
         return true;
@@ -180,7 +180,7 @@ private async ValueTask<bool> DownloadPackageAsync(IProgress<UpdateStatus> progr
         return downloadSuccess;
     }
 
-    private void NotifyIfDateFolderHasReparsePoint()
+    private void NotifyIfDataFolderHasReparsePoint()
     {
         if (new DirectoryInfo(HutaoRuntime.DataFolder).Attributes.HasFlag(FileAttributes.ReparsePoint))
         {

diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Endpoint/Hutao/HutaoEndpointsFactory.cs b/src/Snap.Hutao/Snap.Hutao/Web/Endpoint/Hutao/HutaoEndpointsFactory.cs
@@ -19,8 +19,10 @@ public IHutaoEndpoints Create()
 #elif DEBUG && FORCE_USE_RELEASE_ENDPOINT
         return serviceProvider.GetRequiredKeyedService<IHutaoEndpoints>(HutaoEndpointsKind.Release);
 #else
-        return Core.Setting.LocalSetting.Get(Core.Setting.SettingKeys.AlphaBuildUseCNPatchEndpoint, false)
-            ? serviceProvider.GetRequiredKeyedService<IHutaoEndpoints>(HutaoEndpointsKind.AlphaCN)
+        return Core.Setting.LocalSetting.Get(Core.Setting.SettingKeys.AlphaBuildUseCnPatchEndpoint, false)
+            ? Core.Setting.LocalSetting.Get(Core.Setting.SettingKeys.AlphaBuildUseFjPatchEndpoint, false)
+                ? serviceProvider.GetRequiredKeyedService<IHutaoEndpoints>(HutaoEndpointsKind.AlphaFJ)
+                : serviceProvider.GetRequiredKeyedService<IHutaoEndpoints>(HutaoEndpointsKind.AlphaCN)
             : serviceProvider.GetRequiredKeyedService<IHutaoEndpoints>(HutaoEndpointsKind.AlphaOS);
 #endif
     }

diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/HutaoPackageMirrorType.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/HutaoPackageMirrorType.cs
@@ -1,4 +1,4 @@
-// Copyright (c) DGP Studio. All rights reserved.
+// Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
 namespace Snap.Hutao.Web.Hutao;

diff --git a/src/Snap.Hutao/Snap.Hutao/Win32/User32.cs b/src/Snap.Hutao/Snap.Hutao/Win32/User32.cs
@@ -1,4 +1,4 @@
-// Copyright (c) DGP Studio. All rights reserved.
+// Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
 using Snap.Hutao.Win32.Foundation;
@@ -322,6 +322,10 @@ public static unsafe BOOL SetPropW(HWND hWnd, string @string, [Optional] HANDLE
     [SupportedOSPlatform("windows5.0")]
     public static extern BOOL UnhookWindowsHookEx(HHOOK hhk);
 
+    [DllImport("USER32.dll", CallingConvention = CallingConvention.Winapi, ExactSpelling = true)]
+    [SupportedOSPlatform("windows5.0")]
+    public static extern BOOL UnregisterClassW(PCWSTR lpClassName, [Optional] HINSTANCE hInstance);
+
     [DllImport("USER32.dll", CallingConvention = CallingConvention.Winapi, ExactSpelling = true)]
     [SupportedOSPlatform("windows5.0")]
     public static extern BOOL UnregisterHotKey([Optional] HWND hWnd, int id);