Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improvements about recent issues #1186

Merged
merged 19 commits into from
Sep 22, 2024
Merged
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
🚀 Expose progressHandler for AssetEntity.getMediaUrl
AlexV525 committed Sep 15, 2024
commit 35debee6eb0247b18f15444825b07943e7df84bb
3 changes: 2 additions & 1 deletion ios/Classes/PMPlugin.m
Original file line number Diff line number Diff line change
@@ -478,7 +478,8 @@ - (void)handleMethodResultHandler:(ResultHandler *)handler manager:(PMManager *)
NSString *mimeType = [manager getMimeTypeAsyncWithAssetId:assetId];
[handler reply:mimeType];
} else if ([@"getMediaUrl" isEqualToString:call.method]) {
[manager getMediaUrl:call.arguments[@"id"] resultHandler:handler];
PMProgressHandler *progressHandler = [self getProgressHandlerFromDict:call.arguments];
[manager getMediaUrl:call.arguments[@"id"] resultHandler:handler progressHandler:progressHandler];
} else if ([@"fetchEntityProperties" isEqualToString:call.method]) {
NSString *assetId = call.arguments[@"id"];
PMAssetEntity *entity = [manager getAssetEntity:assetId withCache:NO];
2 changes: 1 addition & 1 deletion ios/Classes/core/PMManager.h
Original file line number Diff line number Diff line change
@@ -81,7 +81,7 @@ typedef void (^AssetResult)(PMAssetEntity *);

- (NSString*)getMimeTypeAsyncWithAssetId: (NSString *) assetId;

- (void)getMediaUrl:(NSString *)assetId resultHandler:(NSObject <PMResultHandler> *)handler;
- (void)getMediaUrl:(NSString *)assetId resultHandler:(NSObject <PMResultHandler> *)handler progressHandler:(NSObject <PMProgressHandlerProtocol> *)progressHandler;

- (NSArray<PMAssetPathEntity *> *)getSubPathWithId:(NSString *)id type:(int)type albumType:(int)albumType option:(NSObject<PMBaseFilter> *)option;

5 changes: 3 additions & 2 deletions ios/Classes/core/PMManager.m
Original file line number Diff line number Diff line change
@@ -1072,7 +1072,7 @@ - (NSString *)getMimeTypeAsyncWithAssetId:(NSString *)assetId {
return nil;
}

- (void)getMediaUrl:(NSString *)assetId resultHandler:(NSObject <PMResultHandler> *)handler {
- (void)getMediaUrl:(NSString *)assetId resultHandler:(NSObject <PMResultHandler> *)handler progressHandler:(NSObject <PMProgressHandlerProtocol> *)progressHandler {
PHAsset *asset = [PHAsset fetchAssetsWithLocalIdentifiers:@[assetId] options:nil].firstObject;
PHAssetResource *resource;
if (@available(iOS 9.1, *)) {
@@ -1089,9 +1089,10 @@ - (void)getMediaUrl:(NSString *)assetId resultHandler:(NSObject <PMResultHandler
return;
}
if (asset.isVideo) {
[self fetchFullSizeVideo:asset handler:handler progressHandler:nil withScheme:YES];
[self fetchFullSizeVideo:asset handler:handler progressHandler:progressHandler withScheme:YES];
} else {
[handler replyError:@"Only video type of assets can get a media url."];
[self notifyProgress:progressHandler progress:0 state:PMProgressStateFailed];
}
}

12 changes: 7 additions & 5 deletions lib/src/internal/plugin.dart
Original file line number Diff line number Diff line change
@@ -488,14 +488,16 @@ class PhotoManagerPlugin with BasePlugin, IosPlugin, AndroidPlugin, OhosPlugin {
return entity.title ?? '';
}

Future<String?> getMediaUrl(AssetEntity entity) async {
Future<String?> getMediaUrl(
AssetEntity entity, {
PMProgressHandler? progressHandler,
}) async {
if (PlatformUtils.isOhos) {
return entity.id;
}
return _channel.invokeMethod(
PMConstants.mGetMediaUrl,
<String, dynamic>{'id': entity.id, 'type': entity.typeInt},
);
final params = <String, dynamic>{'id': entity.id, 'type': entity.typeInt};
_injectParams(params, progressHandler);
return _channel.invokeMethod(PMConstants.mGetMediaUrl, params);
}

Future<List<AssetPathEntity>> getSubPathEntities(
9 changes: 7 additions & 2 deletions lib/src/types/entity.dart
Original file line number Diff line number Diff line change
@@ -714,8 +714,13 @@ class AssetEntity {
/// See also:
/// * https://developer.android.com/reference/android/content/ContentUris
/// * https://developer.apple.com/documentation/avfoundation/avurlasset
Future<String?> getMediaUrl() {
return plugin.getMediaUrl(this);
Future<String?> getMediaUrl({
PMProgressHandler? progressHandler,
}) {
return plugin.getMediaUrl(
this,
progressHandler: progressHandler,
);
}

bool get _platformMatched =>