codereview
This commit is contained in:
parent
08142cb945
commit
98f5f45322
@ -93,22 +93,19 @@ NSString * const KeyActionTypeOpen = @"openPage";
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
- (void)setClientParameter:(nullable NSDictionary *)clientParametersMap requestParameters:(nullable NSDictionary *)requestParameters isBackgroudRequest:(BOOL)isBackgroudRequest completionHandler:(nonnull void (^)(NSDictionary * _Nullable extraParameters))completionHandler {
|
- (void)setClientParameter:(nullable NSDictionary *)clientParametersMap requestParameters:(nullable NSDictionary *)requestParameters showLoadingOverlay:(BOOL)showLoadingOverlay completionHandler:(nonnull void (^)(NSDictionary * _Nullable extraParameters))completionHandler {
|
||||||
|
|
||||||
//NSDictionary *clientParametersMap = [actionInformation dict:KeyClientParameters];
|
|
||||||
if (!clientParametersMap) {
|
if (!clientParametersMap) {
|
||||||
completionHandler(nil);
|
completionHandler(nil);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// BOOL isBackgroudRequest = [actionInformation boolForKey:@"background"];
|
if (showLoadingOverlay) {
|
||||||
|
|
||||||
if (!isBackgroudRequest) {
|
|
||||||
[[MVMCoreLoadingOverlayHandler sharedLoadingOverlay] startLoading];
|
[[MVMCoreLoadingOverlayHandler sharedLoadingOverlay] startLoading];
|
||||||
}
|
}
|
||||||
|
|
||||||
void (^stopLoadingOverlay)(void) = ^(void) {
|
void (^stopLoadingOverlay)(void) = ^(void) {
|
||||||
if (!isBackgroudRequest) {
|
if (showLoadingOverlay) {
|
||||||
[[MVMCoreLoadingOverlayHandler sharedLoadingOverlay] stopLoading:true];
|
[[MVMCoreLoadingOverlayHandler sharedLoadingOverlay] stopLoading:true];
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@ -164,22 +161,17 @@ NSString * const KeyActionTypeOpen = @"openPage";
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
__weak typeof(self) weakSelf = self;
|
MVMCoreRequestParameters *requestParameters = [[MVMCoreRequestParameters alloc] initWithActionMap:actionInformation];
|
||||||
void (^performAction)(NSDictionary*) = ^(NSDictionary* actionMap) {
|
|
||||||
MVMCoreRequestParameters *requestParameters = [[MVMCoreRequestParameters alloc] initWithActionMap:actionMap];
|
|
||||||
|
|
||||||
requestParameters.clientParamters = [actionInformation dict:KeyClientParameters];
|
requestParameters.clientParamters = [actionInformation dict:KeyClientParameters];
|
||||||
|
|
||||||
[weakSelf updateRequestParametersBeforeHandleOpenPageAction:requestParameters callBack:^(MVMCoreRequestParameters * _Nonnull requestParameters) {
|
[self updateRequestParametersBeforeHandleOpenPageAction:requestParameters callBack:^(MVMCoreRequestParameters * _Nonnull requestParameters) {
|
||||||
if ([delegateObject.actionDelegate respondsToSelector:@selector(handleOpenPageForRequestParameters:actionInformation:additionalData:)]) {
|
if ([delegateObject.actionDelegate respondsToSelector:@selector(handleOpenPageForRequestParameters:actionInformation:additionalData:)]) {
|
||||||
[delegateObject.actionDelegate handleOpenPageForRequestParameters:requestParameters actionInformation:actionInformation additionalData:additionalData];
|
[delegateObject.actionDelegate handleOpenPageForRequestParameters:requestParameters actionInformation:actionInformation additionalData:additionalData];
|
||||||
} else {
|
} else {
|
||||||
[MVMCoreActionHandler defaultHandleOpenPageForRequestParameters:requestParameters additionalData:additionalData delegateObject:delegateObject];
|
[MVMCoreActionHandler defaultHandleOpenPageForRequestParameters:requestParameters additionalData:additionalData delegateObject:delegateObject];
|
||||||
}
|
}
|
||||||
}];
|
}];
|
||||||
};
|
|
||||||
|
|
||||||
performAction(actionInformation);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
- (void)shareAction:(nullable NSDictionary *)actionInformation additionalData:(nullable NSDictionary *)additionalData delegateObject:(nullable DelegateObject *)delegateObject {
|
- (void)shareAction:(nullable NSDictionary *)actionInformation additionalData:(nullable NSDictionary *)additionalData delegateObject:(nullable DelegateObject *)delegateObject {
|
||||||
@ -365,7 +357,7 @@ NSString * const KeyActionTypeOpen = @"openPage";
|
|||||||
|
|
||||||
[self setClientParameter:[actionInformation dict:KeyClientParameters]
|
[self setClientParameter:[actionInformation dict:KeyClientParameters]
|
||||||
requestParameters:nil
|
requestParameters:nil
|
||||||
isBackgroudRequest:false
|
showLoadingOverlay:true
|
||||||
completionHandler:performAction];
|
completionHandler:performAction];
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -435,7 +427,7 @@ NSString * const KeyActionTypeOpen = @"openPage";
|
|||||||
if (requestParameters.clientParamters) {
|
if (requestParameters.clientParamters) {
|
||||||
[[MVMCoreActionHandler sharedActionHandler] setClientParameter:requestParameters.clientParamters
|
[[MVMCoreActionHandler sharedActionHandler] setClientParameter:requestParameters.clientParamters
|
||||||
requestParameters: requestParameters.parameters
|
requestParameters: requestParameters.parameters
|
||||||
isBackgroudRequest: NO
|
showLoadingOverlay: !requestParameters.backgroundRequest
|
||||||
completionHandler: ^(NSDictionary * _Nullable jsonDictionary) {
|
completionHandler: ^(NSDictionary * _Nullable jsonDictionary) {
|
||||||
[requestParameters addRequestParameters:jsonDictionary];
|
[requestParameters addRequestParameters:jsonDictionary];
|
||||||
performRequest(requestParameters);
|
performRequest(requestParameters);
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user