diff --git a/ios/Podfile.lock b/ios/Podfile.lock index df9cdfc..35eebb1 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -65,8 +65,6 @@ PODS: - Flutter - "permission_handler (5.1.0+2)": - Flutter - - photo_manager (0.0.1): - - Flutter - shared_preferences (0.0.1): - Flutter - sqflite (0.0.2): @@ -75,8 +73,6 @@ PODS: - TXLiteAVSDK_Professional (9.5.11346) - url_launcher (0.0.1): - Flutter - - video_player (0.0.1): - - Flutter - webview_flutter (0.0.1): - Flutter @@ -100,11 +96,9 @@ DEPENDENCIES: - package_info (from `.symlinks/plugins/package_info/ios`) - path_provider (from `.symlinks/plugins/path_provider/ios`) - permission_handler (from `.symlinks/plugins/permission_handler/ios`) - - photo_manager (from `.symlinks/plugins/photo_manager/ios`) - shared_preferences (from `.symlinks/plugins/shared_preferences/ios`) - sqflite (from `.symlinks/plugins/sqflite/ios`) - url_launcher (from `.symlinks/plugins/url_launcher/ios`) - - video_player (from `.symlinks/plugins/video_player/ios`) - webview_flutter (from `.symlinks/plugins/webview_flutter/ios`) SPEC REPOS: @@ -154,16 +148,12 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/path_provider/ios" permission_handler: :path: ".symlinks/plugins/permission_handler/ios" - photo_manager: - :path: ".symlinks/plugins/photo_manager/ios" shared_preferences: :path: ".symlinks/plugins/shared_preferences/ios" sqflite: :path: ".symlinks/plugins/sqflite/ios" url_launcher: :path: ".symlinks/plugins/url_launcher/ios" - video_player: - :path: ".symlinks/plugins/video_player/ios" webview_flutter: :path: ".symlinks/plugins/webview_flutter/ios" @@ -191,12 +181,10 @@ SPEC CHECKSUMS: package_info: 873975fc26034f0b863a300ad47e7f1ac6c7ec62 path_provider: abfe2b5c733d04e238b0d8691db0cfd63a27a93c permission_handler: ccb20a9fad0ee9b1314a52b70b76b473c5f8dab0 - photo_manager: f7c619c2cc8c2adb8d85c63363babac477de9c67 shared_preferences: af6bfa751691cdc24be3045c43ec037377ada40d sqflite: 6d358c025f5b867b29ed92fc697fd34924e11904 TXLiteAVSDK_Professional: 645670c9d1bbabb88e8dff998fb097a22fe71208 url_launcher: 6fef411d543ceb26efce54b05a0a40bfd74cbbef - video_player: 9cc823b1d9da7e8427ee591e8438bfbcde500e6e webview_flutter: d2b4d6c66968ad042ad94cbb791f5b72b4678a96 PODFILE CHECKSUM: 7aa39c7b6cdbcee37d1fd9a834a0ffb3482eb5ae diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 8e5217c..5916bd0 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -48,6 +48,7 @@ 9E8D40C6871D3097AF196030 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; A9E5C779455BA6DB4938099D /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; B472C24F89C59DC84E9553C1 /* libPods-Runner.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Runner.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + F71731B5280B2314003F97C3 /* Runner.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; sourceTree = ""; }; F7CA8BAC2802882F00457217 /* libsqlite3.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.tbd; path = usr/lib/libsqlite3.tbd; sourceTree = SDKROOT; }; /* End PBXFileReference section */ @@ -116,6 +117,7 @@ 97C146F01CF9000F007C117D /* Runner */ = { isa = PBXGroup; children = ( + F71731B5280B2314003F97C3 /* Runner.entitlements */, 97C146FA1CF9000F007C117D /* Main.storyboard */, 97C146FD1CF9000F007C117D /* Assets.xcassets */, 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */, @@ -376,6 +378,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; + CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CURRENT_PROJECT_VERSION = 20220416; DEVELOPMENT_TEAM = 98R958M4DW; ENABLE_BITCODE = NO; @@ -516,6 +519,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; + CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CURRENT_PROJECT_VERSION = 20220416; DEVELOPMENT_TEAM = 98R958M4DW; ENABLE_BITCODE = NO; @@ -551,6 +555,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; + CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CURRENT_PROJECT_VERSION = 20220416; DEVELOPMENT_TEAM = 98R958M4DW; ENABLE_BITCODE = NO; diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist index b7e3d62..9f73cb7 100644 --- a/ios/Runner/Info.plist +++ b/ios/Runner/Info.plist @@ -26,6 +26,8 @@ LaunchScreen UIMainStoryboardFile Main + NSCameraUsageDescription + 使用相机进行人脸登录 UISupportedInterfaceOrientations UIInterfaceOrientationPortrait diff --git a/ios/Runner/Runner.entitlements b/ios/Runner/Runner.entitlements new file mode 100644 index 0000000..903def2 --- /dev/null +++ b/ios/Runner/Runner.entitlements @@ -0,0 +1,8 @@ + + + + + aps-environment + development + + diff --git a/lib/my_extended_image/common/image_picker/_image_picker_io.dart b/lib/my_extended_image/common/image_picker/_image_picker_io.dart deleted file mode 100644 index 9459b3e..0000000 --- a/lib/my_extended_image/common/image_picker/_image_picker_io.dart +++ /dev/null @@ -1,93 +0,0 @@ -// 此文件为插件 extended_image-0.9.0 的 Example 中的代码，路径为： -// r:\Flutter\FlutterProject9\extended_image\example\lib\common\image_picker\_image_picker_io.dart -import 'dart:async'; -import 'dart:io'; -import 'dart:typed_data'; -//import 'package:image_picker/image_picker.dart' as picker; -import 'package:flutter/cupertino.dart'; -//import 'package:flutter_candies_demo_library/flutter_candies_demo_library.dart'; -import 'package:wechat_assets_picker/wechat_assets_picker.dart'; - -Future pickImage(BuildContext context) async { - List assets = []; - final List result = await AssetPicker.pickAssets( - context, - maxAssets: 1, - pathThumbSize: 84, - gridCount: 3, - pageSize: 300, - selectedAssets: assets, - requestType: RequestType.image, - textDelegate: DefaultAssetsPickerTextDelegate(), - ); - if (result != null) { - assets = List.from(result); - return assets.first.originBytes; - } - return null; - // final File file = - - // await picker.ImagePicker.pickImage(source: picker.ImageSource.gallery); - // return file.readAsBytes(); -} - -class ImageSaver { - static Future save(String name, Uint8List fileData) async { - final AssetEntity imageEntity = - await PhotoManager.editor.saveImage(fileData); - final File file = await imageEntity.file; - return file.path; - } -} - -class PickerTextDelegate implements AssetsPickerTextDelegate { - factory PickerTextDelegate() => _instance; - - PickerTextDelegate._internal(); - - static final PickerTextDelegate _instance = PickerTextDelegate._internal(); - - @override - String confirm = 'OK'; - - @override - String cancel = 'Cancel'; - - @override - String edit = 'Edit'; - - @override - String emptyPlaceHolder = 'empty'; - - @override - String gifIndicator = 'GIF'; - - @override - String heicNotSupported = 'not support HEIC yet'; - - @override - String loadFailed = 'load failed'; - - @override - String original = 'Original'; - - @override - String preview = 'Preview'; - - @override - String select = 'Select'; - - @override - String unSupportedAssetType = 'not support yet'; - - @override - String durationIndicatorBuilder(Duration duration) { - const String separator = ':'; - final String minute = duration.inMinutes.toString().padLeft(2, '0'); - final String second = - ((duration - Duration(minutes: duration.inMinutes)).inSeconds) - .toString() - .padLeft(2, '0'); - return '$minute$separator$second'; - } -} diff --git a/pubspec.lock b/pubspec.lock index bd9e68a..81e725c 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -197,20 +197,6 @@ packages: url: "https://pub.flutter-io.cn" source: hosted version: "1.1.1" - extended_image: - dependency: transitive - description: - name: extended_image - url: "https://pub.flutter-io.cn" - source: hosted - version: "1.1.0" - extended_image_library: - dependency: "direct main" - description: - name: extended_image_library - url: "https://pub.flutter-io.cn" - source: hosted - version: "0.2.3" fake_async: dependency: transitive description: @@ -396,13 +382,6 @@ packages: url: "https://pub.flutter-io.cn" source: hosted version: "0.12.2" - http_client_helper: - dependency: transitive - description: - name: http_client_helper - url: "https://pub.flutter-io.cn" - source: hosted - version: "0.2.1" http_parser: dependency: transitive description: @@ -585,13 +564,6 @@ packages: url: "https://pub.flutter-io.cn" source: hosted version: "3.1.0" - photo_manager: - dependency: transitive - description: - name: photo_manager - url: "https://pub.flutter-io.cn" - source: hosted - version: "0.5.8" photo_view: dependency: "direct main" description: @@ -870,27 +842,6 @@ packages: url: "https://pub.flutter-io.cn" source: hosted version: "2.1.0-nullsafety.3" - video_player: - dependency: transitive - description: - name: video_player - url: "https://pub.flutter-io.cn" - source: hosted - version: "0.10.12+5" - video_player_platform_interface: - dependency: transitive - description: - name: video_player_platform_interface - url: "https://pub.flutter-io.cn" - source: hosted - version: "2.2.0" - video_player_web: - dependency: transitive - description: - name: video_player_web - url: "https://pub.flutter-io.cn" - source: hosted - version: "0.1.4+1" webview_flutter: dependency: transitive description: @@ -898,13 +849,6 @@ packages: url: "https://pub.flutter-io.cn" source: hosted version: "1.0.7" - wechat_assets_picker: - dependency: "direct main" - description: - name: wechat_assets_picker - url: "https://pub.flutter-io.cn" - source: hosted - version: "4.2.1" win32: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 0308899..f58d7df 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -103,7 +103,6 @@ dependencies: # 解决 wechat_assets_picker: ^3.0.0+1 直接依赖冲突报错，可以不用目录依赖方式-OK #path_provider: ^0.4.1 - extended_image_library: ^0.2.3 # wechat_assets_picker: ^3.0.0+1 # 直接依赖有冲突报错，所以采用目录依赖方式。 # 但是为了便于修改，还是直接采用目录依赖方式简单得多 @@ -113,7 +112,6 @@ dependencies: # path: ./lib/my_wechat_assets_picker-3.0.0+1/ # wechat_assets_picker: # path: ./lib/my_wechat_assets_picker-4.1.0+1/ - wechat_assets_picker: ^4.1.0+6 url_launcher: ^5.7.0 get_it: ^5.0.1