From 91185a593a10346fa61b340b0feaa20a9a179cf2 Mon Sep 17 00:00:00 2001 From: speakeloudest Date: Thu, 20 Nov 2025 19:22:45 -0800 Subject: [PATCH] =?UTF-8?q?Revert=20"feat:=20=E4=BF=AE=E6=94=B9win?= =?UTF-8?q?=E7=9A=84=E9=85=8D=E7=BD=AE"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit d99f588a5b9470edb5996ef261c013cfce5053ca. --- distributor.yaml | 4 ++-- lib/app/utils/kr_window_manager.dart | 2 +- windows/CMakeLists.txt | 4 ++-- windows/packaging/exe/inno_setup.sas | 6 +++--- windows/packaging/exe/make_config.yaml | 10 +++++----- windows/runner/Runner.rc | 12 ++++++------ windows/runner/main.cpp | 8 ++++---- windows/setup.iss | 10 +++++----- 8 files changed, 28 insertions(+), 28 deletions(-) diff --git a/distributor.yaml b/distributor.yaml index 8e49300..da7a2f2 100755 --- a/distributor.yaml +++ b/distributor.yaml @@ -1,5 +1,5 @@ -name: HiFastVPN -app_name: HiFastVPN +name: BearVPN +app_name: BearVPN version: 1.0.0 build_number: 1 targets: diff --git a/lib/app/utils/kr_window_manager.dart b/lib/app/utils/kr_window_manager.dart index f20e24c..ab97bfa 100755 --- a/lib/app/utils/kr_window_manager.dart +++ b/lib/app/utils/kr_window_manager.dart @@ -45,7 +45,7 @@ class KRWindowManager with WindowListener, TrayListener { // 确保在 Windows 下正确设置窗口属性 if (Platform.isWindows) { await windowManager.setTitleBarStyle(TitleBarStyle.normal); - await windowManager.setTitle('Hi快VPN'); + await windowManager.setTitle('BearVPN'); await windowManager.setSize(const Size(800, 668)); await windowManager.setMinimumSize(const Size(800, 668)); await windowManager.center(); diff --git a/windows/CMakeLists.txt b/windows/CMakeLists.txt index c0bb61d..1f2c994 100755 --- a/windows/CMakeLists.txt +++ b/windows/CMakeLists.txt @@ -1,6 +1,6 @@ # Project-level configuration. cmake_minimum_required(VERSION 3.14) -project(HiFastVPN LANGUAGES CXX) +project(BearVPN LANGUAGES CXX) # 设置 CMake 策略以兼容旧版本插件 # CMP0175: add_custom_command() 拒绝无效参数（用于兼容 flutter_inappwebview_windows 插件） @@ -22,7 +22,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /FS") # The name of the executable created for the application. Change this to change # the on-disk name of your application. -set(BINARY_NAME "HiFastVPN") +set(BINARY_NAME "BearVPN") # Explicitly opt in to modern CMake behaviors to avoid warnings with recent # versions of CMake. diff --git a/windows/packaging/exe/inno_setup.sas b/windows/packaging/exe/inno_setup.sas index 132fd38..7ab7532 100755 --- a/windows/packaging/exe/inno_setup.sas +++ b/windows/packaging/exe/inno_setup.sas @@ -68,8 +68,8 @@ function InitializeSetup(): Boolean; var ResultCode: Integer; begin - Exec('taskkill', '/F /IM HiFastVPN.exe', '', SW_HIDE, ewWaitUntilTerminated, ResultCode) - Exec('net', 'stop "HiFastVPNTunnelService"', '', SW_HIDE, ewWaitUntilTerminated, ResultCode) - Exec('sc.exe', 'delete "HiFastVPNTunnelService"', '', SW_HIDE, ewWaitUntilTerminated, ResultCode) + Exec('taskkill', '/F /IM BearVPN.exe', '', SW_HIDE, ewWaitUntilTerminated, ResultCode) + Exec('net', 'stop "BearVPNTunnelService"', '', SW_HIDE, ewWaitUntilTerminated, ResultCode) + Exec('sc.exe', 'delete "BearVPNTunnelService"', '', SW_HIDE, ewWaitUntilTerminated, ResultCode) Result := True; end; \ No newline at end of file diff --git a/windows/packaging/exe/make_config.yaml b/windows/packaging/exe/make_config.yaml index 599a1a7..c01890a 100755 --- a/windows/packaging/exe/make_config.yaml +++ b/windows/packaging/exe/make_config.yaml @@ -1,11 +1,11 @@ app_id: 6L903538-42B1-4596-G479-BJ779F21A65E -publisher: HiFastVPN +publisher: BearVPN publisher_url: https://github.com/hiddify/hiddify-next -display_name: Hi快VPN -executable_name: HiFastVPN.exe -output_base_file_name: HiFastVPN.exe +display_name: BearVPN +executable_name: BearVPN.exe +output_base_file_name: BearVPN.exe create_desktop_icon: true -install_dir_name: "{autopf64}\\HiFastVPN" +install_dir_name: "{autopf64}\\BearVPN" setup_icon_file: ..\..\windows\runner\resources\app_icon.ico locales: - ar diff --git a/windows/runner/Runner.rc b/windows/runner/Runner.rc index ac0bfe0..bb74506 100755 --- a/windows/runner/Runner.rc +++ b/windows/runner/Runner.rc @@ -89,13 +89,13 @@ BEGIN BEGIN BLOCK "040904e4" BEGIN - VALUE "CompanyName", "HiFastVPN" "\0" - VALUE "FileDescription", "HiFastVPN" "\0" + VALUE "CompanyName", "BearVPN" "\0" + VALUE "FileDescription", "BearVPN" "\0" VALUE "FileVersion", VERSION_AS_STRING "\0" - VALUE "InternalName", "HiFastVPN" "\0" - VALUE "LegalCopyright", "Copyright (C) 2024 HiFastVPN. All rights reserved." "\0" - VALUE "OriginalFilename", "HiFastVPN.exe" "\0" - VALUE "ProductName", "HiFastVPN" "\0" + VALUE "InternalName", "app.baer.com" "\0" + VALUE "LegalCopyright", "Copyright (C) 2024 BearVPN. All rights reserved." "\0" + VALUE "OriginalFilename", "BearVPN.exe" "\0" + VALUE "ProductName", "BearVPN" "\0" VALUE "ProductVersion", VERSION_AS_STRING "\0" END END diff --git a/windows/runner/main.cpp b/windows/runner/main.cpp index cb1b0d3..4c397ac 100755 --- a/windows/runner/main.cpp +++ b/windows/runner/main.cpp @@ -9,15 +9,15 @@ int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev, _In_ wchar_t *command_line, _In_ int show_command) { - HANDLE hMutexInstance = CreateMutex(NULL, TRUE, L"HiFastVPNMutex"); - HWND handle = FindWindowA(NULL, "HiFastVPN"); + HANDLE hMutexInstance = CreateMutex(NULL, TRUE, L"BearVPNMutex"); + HWND handle = FindWindowA(NULL, "BearVPN"); if (GetLastError() == ERROR_ALREADY_EXISTS) { flutter::DartProject project(L"data"); std::vector command_line_arguments = GetCommandLineArguments(); project.set_dart_entrypoint_arguments(std::move(command_line_arguments)); FlutterWindow window(project); - if (window.SendAppLinkToInstance(L"HiFastVPN")) { + if (window.SendAppLinkToInstance(L"BearVPN")) { return false; } @@ -47,7 +47,7 @@ int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev, FlutterWindow window(project); Win32Window::Point origin(10, 10); Win32Window::Size size(1280, 720); - if (!window.Create(L"HiFastVPN", origin, size)) { + if (!window.Create(L"BearVPN", origin, size)) { return EXIT_FAILURE; } window.SetQuitOnClose(true); diff --git a/windows/setup.iss b/windows/setup.iss index a559e7b..7b90890 100755 --- a/windows/setup.iss +++ b/windows/setup.iss @@ -1,7 +1,7 @@ -#define MyAppName "Hi快VPN" +#define MyAppName "Kaer VPN" #define MyAppVersion "1.0.0" -#define MyAppPublisher "HiFastVPN" -#define MyAppExeName "HiFastVPN.exe" +#define MyAppPublisher "Kaer" +#define MyAppExeName "kaer_vpn.exe" [Setup] AppId={{YOUR-APP-ID-HERE} @@ -11,7 +11,7 @@ AppPublisher={#MyAppPublisher} DefaultDirName={autopf}\{#MyAppName} DefaultGroupName={#MyAppName} OutputDir=installer -OutputBaseFilename=HiFastVPN_Setup +OutputBaseFilename=BearVPN_Setup Compression=lzma SolidCompression=yes WizardStyle=modern @@ -34,4 +34,4 @@ Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}" Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon [Run] -Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent \ No newline at end of file +Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent \ No newline at end of file