diff --git a/lib/upload_image/upload_images_tool.dart b/lib/upload_image/upload_images_tool.dart index 1117c11..5a72c6d 100644 --- a/lib/upload_image/upload_images_tool.dart +++ b/lib/upload_image/upload_images_tool.dart @@ -1,13 +1,16 @@ import 'dart:io'; +import 'dart:math'; import 'package:flutter/cupertino.dart'; import 'package:flutter_common/upload_image/ossUtil.dart'; +import 'package:flutter_image_compress/flutter_image_compress.dart'; import 'package:get/get.dart'; import 'package:image_picker/image_picker.dart'; // import 'package:images_picker/images_picker.dart'; // import 'package:images_picker/images_picker.dart'; import 'package:permission_handler/permission_handler.dart'; +import 'package:wechat_assets_picker/wechat_assets_picker.dart'; class UploadImagesTool { static uploadImagesTool({ @@ -136,9 +139,7 @@ class UploadImagesTool { ) : CupertinoActionSheet( title: const Text('上传图片'), - message: (max == null || max == 0) - ? null - : Text('请选择上传方式\n相册最多${max ?? 9}张'), + message: (max == null || max == 0) ? null : Text('请选择上传方式\n相册最多${max ?? 9}张'), actions: isAddOtherWidget != null ? [ isAddOtherWidget, @@ -152,8 +153,7 @@ class UploadImagesTool { policy: policy ?? '', callback: callback ?? '', signature: signature ?? '', - chooseImages: (list) => - chooseImages?.call(list), + chooseImages: (list) => chooseImages?.call(list), ); Get.back(); }, @@ -169,8 +169,7 @@ class UploadImagesTool { policy: policy ?? '', callback: callback ?? '', signature: signature ?? '', - chooseImages: (list) => - chooseImages?.call(list), + chooseImages: (list) => chooseImages?.call(list), ); Get.back(); }, @@ -187,8 +186,7 @@ class UploadImagesTool { policy: policy ?? '', callback: callback ?? '', signature: signature ?? '', - chooseImages: (list) => - chooseImages?.call(list), + chooseImages: (list) => chooseImages?.call(list), ); Get.back(); }, @@ -205,8 +203,7 @@ class UploadImagesTool { callback: callback ?? '', signature: signature ?? '', isShowLoading: isShowLoading, - chooseImages: (list) => - chooseImages?.call(list), + chooseImages: (list) => chooseImages?.call(list), ); Get.back(); }, @@ -265,7 +262,11 @@ class UploadImagesTool { bool? isShowLoading, }) async { if (isVideo == true) { - XFile? video = await ImagePicker().pickVideo(source: ImageSource.gallery); + final List? result = await AssetPicker.pickAssets( + Get.context!, + pickerConfig: AssetPickerConfig(maxAssets: 1, requestType: RequestType.video), + ); + final File? video = await result?.first.file; String path = await saveNetworkImgGallery( video?.path ?? '', fileType: 'mp4', @@ -277,11 +278,32 @@ class UploadImagesTool { signature: signature ?? '', ); chooseImages?.call([path]); - print('video path ============ $path'); } else { - List? images = await ImagePicker().pickMultiImage(); + final List? result = await AssetPicker.pickAssets( + Get.context!, + pickerConfig: AssetPickerConfig(maxAssets: max ?? 50), + ); + /// 临时存储选中的图片 + final List selectedFiles = []; + if (result != null && result.isNotEmpty) { + for (int i = 0; i < result.length; i++) { + final File? file = await result[i].file; + if (file != null) { + /// 获取文件扩展名 + final String extension = file.absolute.path.split('.').last; + // 压缩并保存到临时文件 + final XFile? compressedFile = await FlutterImageCompress.compressAndGetFile( + file.absolute.path, '${file.parent.path}/${DateTime.now().millisecondsSinceEpoch}_compressed.$extension', + quality: 80, minWidth: 1920, minHeight: 1080); + if (compressedFile != null) { + selectedFiles.add(compressedFile); + } + } + } + } + /// 上传选中的图片 List list = []; - for (var element in images) { + for (var element in selectedFiles) { String path = await saveNetworkImgGallery( element.path, oSSAccessKeyId: oSSAccessKeyId ?? '', @@ -333,7 +355,7 @@ class UploadImagesTool { String? signature, String? ossDirectory, String? ossHost, - bool? isShowLoading, + bool? isShowLoading, }) async { String string = await UploadOss.upload( path, diff --git a/pubspec.yaml b/pubspec.yaml index e62aa18..aca7d00 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -42,6 +42,8 @@ dependencies: image_editor_plus: ^1.0.6 path_provider: ^2.1.5 cached_network_image: ^3.4.1 + wechat_assets_picker: ^10.1.0 + flutter_image_compress: ^2.4.0 dev_dependencies: flutter_test: