Merge branch 'feature-2511-opt-update-test' of http://120.24.213.56/ethan/appfra…

…me into feature-2511-opt-update-test

ios/build/ios/XCBuildData/PIFCache/workspace/WORKSPACE@v11_hash=(null)_subobjects=792b51562200ea170af268d1ed2a66d9-json

+{"guid":"dc4b70c03e8043e50e38f2068887b1d4","name":"Pods","path":"/Users/ethanlam/works/gitlab/flutter_pros/appframe.git/ios/Pods/Pods.xcodeproj/project.xcworkspace","projects":["PROJECT@v11_mod=1ac66dbb2b848fb24d56375428d6412e_hash=bfdfe7dc352907fc980b868725387e98plugins=1OJSG6M1FOV3XYQCBH7Z29RZ0FPR9XDE1"]}
\ No newline at end of file

macos/Flutter/GeneratedPluginRegistrant.swift

@@ -7,8 +7,7 @@ import Foundation
 
 
 import connectivity_plus
 import connectivity_plus
 import device_info_plus
 import device_info_plus
-import ffmpeg_kit_flutter_new_audio
-import ffmpeg_kit_flutter_new_video
+import ffmpeg_kit_flutter_new
 import file_picker
 import file_picker
 import flutter_image_compress_macos
 import flutter_image_compress_macos
 import flutter_localization
 import flutter_localization
@@ -30,7 +29,6 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   ConnectivityPlusPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlusPlugin"))
   ConnectivityPlusPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlusPlugin"))
   DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin"))
   DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin"))
   FFmpegKitFlutterPlugin.register(with: registry.registrar(forPlugin: "FFmpegKitFlutterPlugin"))
   FFmpegKitFlutterPlugin.register(with: registry.registrar(forPlugin: "FFmpegKitFlutterPlugin"))
-  FFmpegKitFlutterPlugin.register(with: registry.registrar(forPlugin: "FFmpegKitFlutterPlugin"))
   FilePickerPlugin.register(with: registry.registrar(forPlugin: "FilePickerPlugin"))
   FilePickerPlugin.register(with: registry.registrar(forPlugin: "FilePickerPlugin"))
   FlutterImageCompressMacosPlugin.register(with: registry.registrar(forPlugin: "FlutterImageCompressMacosPlugin"))
   FlutterImageCompressMacosPlugin.register(with: registry.registrar(forPlugin: "FlutterImageCompressMacosPlugin"))
   FlutterLocalizationPlugin.register(with: registry.registrar(forPlugin: "FlutterLocalizationPlugin"))
   FlutterLocalizationPlugin.register(with: registry.registrar(forPlugin: "FlutterLocalizationPlugin"))

pubspec.yaml

@@ -37,8 +37,7 @@ dependencies:
   flutter_bloc: ^9.1.1
   flutter_bloc: ^9.1.1
   flutter_localization: ^0.3.3
   flutter_localization: ^0.3.3
   flutter_image_compress: ^2.4.0
   flutter_image_compress: ^2.4.0
-  ffmpeg_kit_flutter_new_audio: ^1.1.0
-  ffmpeg_kit_flutter_new_video: ^1.1.0
+  ffmpeg_kit_flutter_new: ^4.1.0
   
   
   # 建议：如果项目中不需要 image_picker（被 wechat_assets_picker 替代），则保持注释或删除
   # 建议：如果项目中不需要 image_picker（被 wechat_assets_picker 替代），则保持注释或删除
   # image_picker: ^1.2.0 
   # image_picker: ^1.2.0