Skip to content

Feature/resolve issue #35 #37

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.

Sign up for GitHub

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

Open
galaxycoder wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

Feature/resolve issue #35 #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d5d6c74
Merge pull request #1 from Eleme-IMF/develop
May 13, 2016
c62adcc
Merge pull request #2 from Eleme-IMF/develop
Jun 27, 2016
06a150f
解决 block 参数自动补全缺陷
galaxycoder Jun 27, 2016
7cdf199
提供便捷方法开启 API
galaxycoder Jun 27, 2016
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
29 changes: 25 additions & 4 deletions Pod/Classes/DRDBaseAPI.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,14 @@

NS_ASSUME_NONNULL_BEGIN

/**
* 请求完成回调 block 定义
*
* @param responseObject api 返回的数据结构
* @param error api 返回的错误信息
*/
typedef void(^DRDAPICompletionHandler)(id _Nullable responseObject, NSError * _Nullable error);

#pragma mark -
@protocol DRDMultipartFormData

Expand Down Expand Up @@ -70,11 +78,9 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic, copy, nullable) void (^apiRequestConstructingBodyBlock)(id<DRDMultipartFormData> _Nonnull formData);

/**
* api完成后的执行体
* responseObject: api 返回的数据结构
* error: api 返回的错误信息
* api 完成后的回调 block
*/
@property (nonatomic, copy, nullable) void (^apiCompletionHandler)(id _Nullable responseObject, NSError * _Nullable error);
@property (nonatomic, copy, nullable) DRDAPICompletionHandler apiCompletionHandler;

/**
* api 上传、下载等长时间执行的Progress进度
Expand Down Expand Up @@ -235,6 +241,14 @@ NS_ASSUME_NONNULL_BEGIN
*/
- (nonnull DRDSecurityPolicy *)apiSecurityPolicy;

/**
* ApiCompletionHandler
* 声明 setter 方法，方便 block 参数自动补全
*
* @param apiCompletionHandler 请求完成回调 block
*/
- (void)setApiCompletionHandler:(DRDAPICompletionHandler _Nullable)apiCompletionHandler;

#pragma mark - Process

/**
Expand All @@ -252,6 +266,13 @@ NS_ASSUME_NONNULL_BEGIN
*/
- (void)start;

/**
* 开启 API 请求，并配置请求完成回调
*
* @param completionHandler 请求完成回调 block
*/
- (void)startWithCompletionHandler:(DRDAPICompletionHandler _Nullable)completionHandler;

/**
* 取消API 请求
*/
Expand Down
5 changes: 5 additions & 0 deletions Pod/Classes/DRDBaseAPI.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,11 @@ - (void)start {
[[DRDAPIManager sharedDRDAPIManager] sendAPIRequest:((DRDBaseAPI *)self)];
}

- (void)startWithCompletionHandler:(DRDAPICompletionHandler)completionHandler {
self.apiCompletionHandler = completionHandler;
[self start];
}

- (void)cancel {
[[DRDAPIManager sharedDRDAPIManager] cancelAPIRequest:((DRDBaseAPI *)self)];
}
Expand Down