From ff86399befb269ab0b74740a6a8cd051d21e4e66 Mon Sep 17 00:00:00 2001 From: wanghongenpin Date: Mon, 26 May 2025 19:43:24 +0800 Subject: [PATCH] flutter-3.19.6 --- lib/network/http/http.dart | 20 +++++++++---------- lib/network/util/compress.dart | 17 ++++++++-------- lib/ui/toolbox/aes_page.dart | 4 ++-- linux/flutter/generated_plugin_registrant.cc | 4 ---- linux/flutter/generated_plugins.cmake | 1 - macos/Flutter/GeneratedPluginRegistrant.swift | 2 -- pubspec.yaml | 1 - .../flutter/generated_plugin_registrant.cc | 3 --- windows/flutter/generated_plugins.cmake | 1 - 9 files changed, 20 insertions(+), 33 deletions(-) diff --git a/lib/network/http/http.dart b/lib/network/http/http.dart index 2c0aca9..679a168 100644 --- a/lib/network/http/http.dart +++ b/lib/network/http/http.dart @@ -147,16 +147,16 @@ abstract class HttpMessage { return _bodyString!; } - List rawBody = body!; - if (headers.contentEncoding == 'zstd') { - rawBody = await zstdDecode(body!) ?? []; - if (charset == 'utf-8' || charset == 'utf8') { - _bodyString = utf8.decode(rawBody); - } else { - _bodyString = String.fromCharCodes(rawBody); - } - return _bodyString!; - } + // List rawBody = body!; + // if (headers.contentEncoding == 'zstd') { + // rawBody = await zstdDecode(body!) ?? []; + // if (charset == 'utf-8' || charset == 'utf8') { + // _bodyString = utf8.decode(rawBody); + // } else { + // _bodyString = String.fromCharCodes(rawBody); + // } + // return _bodyString!; + // } return getBodyString(); } diff --git a/lib/network/util/compress.dart b/lib/network/util/compress.dart index 0c44c5a..1c18499 100644 --- a/lib/network/util/compress.dart +++ b/lib/network/util/compress.dart @@ -1,9 +1,7 @@ import 'dart:io'; -import 'dart:typed_data'; import 'package:brotli/brotli.dart'; import 'package:proxypin/network/util/logger.dart'; -import 'package:zstandard/zstandard.dart'; ///GZIP 解压缩 List gzipDecode(List byteBuffer) { @@ -33,11 +31,12 @@ List brDecode(List byteBuffer) { ///zstd 解压缩 Future?> zstdDecode(List byteBuffer) async { - final zstandard = Zstandard(); - try { - return zstandard.decompress(Uint8List.fromList(byteBuffer)); - } catch (e) { - logger.e("zstdDecode error: $e"); - return byteBuffer; - } + // final zstandard = Zstandard(); + // try { + // return zstandard.decompress(Uint8List.fromList(byteBuffer)); + // } catch (e) { + // logger.e("zstdDecode error: $e"); + // return byteBuffer; + // } + return byteBuffer; } diff --git a/lib/ui/toolbox/aes_page.dart b/lib/ui/toolbox/aes_page.dart index 113d81e..0692dda 100644 --- a/lib/ui/toolbox/aes_page.dart +++ b/lib/ui/toolbox/aes_page.dart @@ -182,14 +182,14 @@ class _AesWidgetState extends State { children: [ FilledButton( style: ButtonStyle( - shape: WidgetStateProperty.all( + shape: MaterialStateProperty.all( RoundedRectangleBorder(borderRadius: BorderRadius.circular(8)))), onPressed: encryptText, child: Text(localizations.encrypt)), const SizedBox(width: 60), FilledButton( style: ButtonStyle( - shape: WidgetStateProperty.all( + shape: MaterialStateProperty.all( RoundedRectangleBorder(borderRadius: BorderRadius.circular(8)))), onPressed: decryptText, child: Text(localizations.decrypt)), diff --git a/linux/flutter/generated_plugin_registrant.cc b/linux/flutter/generated_plugin_registrant.cc index 6a2f742..b1f65f6 100644 --- a/linux/flutter/generated_plugin_registrant.cc +++ b/linux/flutter/generated_plugin_registrant.cc @@ -13,7 +13,6 @@ #include #include #include -#include void fl_register_plugins(FlPluginRegistry* registry) { g_autoptr(FlPluginRegistrar) desktop_multi_window_registrar = @@ -37,7 +36,4 @@ void fl_register_plugins(FlPluginRegistry* registry) { g_autoptr(FlPluginRegistrar) window_manager_registrar = fl_plugin_registry_get_registrar_for_plugin(registry, "WindowManagerPlugin"); window_manager_plugin_register_with_registrar(window_manager_registrar); - g_autoptr(FlPluginRegistrar) zstandard_linux_registrar = - fl_plugin_registry_get_registrar_for_plugin(registry, "ZstandardLinuxPlugin"); - zstandard_linux_plugin_register_with_registrar(zstandard_linux_registrar); } diff --git a/linux/flutter/generated_plugins.cmake b/linux/flutter/generated_plugins.cmake index ec5113d..740dc77 100644 --- a/linux/flutter/generated_plugins.cmake +++ b/linux/flutter/generated_plugins.cmake @@ -10,7 +10,6 @@ list(APPEND FLUTTER_PLUGIN_LIST screen_retriever_linux url_launcher_linux window_manager - zstandard_linux ) list(APPEND FLUTTER_FFI_PLUGIN_LIST diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift index 48d2f8e..1808fce 100644 --- a/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/macos/Flutter/GeneratedPluginRegistrant.swift @@ -16,7 +16,6 @@ import share_plus import shared_preferences_foundation import url_launcher_macos import window_manager -import zstandard_macos func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { FlutterMultiWindowPlugin.register(with: registry.registrar(forPlugin: "FlutterMultiWindowPlugin")) @@ -30,5 +29,4 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin")) UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin")) WindowManagerPlugin.register(with: registry.registrar(forPlugin: "WindowManagerPlugin")) - ZstandardMacosPlugin.register(with: registry.registrar(forPlugin: "ZstandardMacosPlugin")) } diff --git a/pubspec.yaml b/pubspec.yaml index bc74eba..92eab35 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -45,7 +45,6 @@ dependencies: flutter_qr_reader: ^1.0.5 brotli: ^0.6.0 - zstandard: ^1.3.27 win32audio: ^1.3.1 vclibs: ^0.1.3 diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc index 468012d..142d373 100644 --- a/windows/flutter/generated_plugin_registrant.cc +++ b/windows/flutter/generated_plugin_registrant.cc @@ -17,7 +17,6 @@ #include #include #include -#include void RegisterPlugins(flutter::PluginRegistry* registry) { DesktopMultiWindowPluginRegisterWithRegistrar( @@ -42,6 +41,4 @@ void RegisterPlugins(flutter::PluginRegistry* registry) { registry->GetRegistrarForPlugin("WindowManagerPlugin")); WindowsSingleInstancePluginRegisterWithRegistrar( registry->GetRegistrarForPlugin("WindowsSingleInstancePlugin")); - ZstandardWindowsPluginCApiRegisterWithRegistrar( - registry->GetRegistrarForPlugin("ZstandardWindowsPluginCApi")); } diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake index 6f8f739..3507ed5 100644 --- a/windows/flutter/generated_plugins.cmake +++ b/windows/flutter/generated_plugins.cmake @@ -14,7 +14,6 @@ list(APPEND FLUTTER_PLUGIN_LIST win32audio window_manager windows_single_instance - zstandard_windows ) list(APPEND FLUTTER_FFI_PLUGIN_LIST