Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core into bugfix/category_collision
This commit is contained in:
commit
9edcb6224c
@ -42,6 +42,7 @@ extern NSString * const URLComponentKeepAlive;
|
|||||||
|
|
||||||
extern NSString * const NotificationResponseLoaded;
|
extern NSString * const NotificationResponseLoaded;
|
||||||
extern NSString * const MVMCoreNotificationGoingToServer;
|
extern NSString * const MVMCoreNotificationGoingToServer;
|
||||||
|
extern NSString * const MVMCoreNotificationViewControllerChanged;
|
||||||
|
|
||||||
#pragma mark - Image Cache
|
#pragma mark - Image Cache
|
||||||
extern NSTimeInterval const ImageTimeOut;
|
extern NSTimeInterval const ImageTimeOut;
|
||||||
|
|||||||
@ -29,6 +29,7 @@ NSString * const URLComponentKeepAlive = @"isAlive.jsp";
|
|||||||
|
|
||||||
NSString * const NotificationResponseLoaded = @"responseLoaded";
|
NSString * const NotificationResponseLoaded = @"responseLoaded";
|
||||||
NSString * const MVMCoreNotificationGoingToServer = @"MVMCoreGoServer";
|
NSString * const MVMCoreNotificationGoingToServer = @"MVMCoreGoServer";
|
||||||
|
NSString * const MVMCoreNotificationViewControllerChanged = @"MVMCoreNotificationViewControllerChanged";
|
||||||
|
|
||||||
#pragma mark - Image Cache
|
#pragma mark - Image Cache
|
||||||
NSTimeInterval const ImageTimeOut = 60;
|
NSTimeInterval const ImageTimeOut = 60;
|
||||||
|
|||||||
@ -7,6 +7,7 @@
|
|||||||
//
|
//
|
||||||
|
|
||||||
#import "MVMCoreDismissViewControllerOperation.h"
|
#import "MVMCoreDismissViewControllerOperation.h"
|
||||||
|
#import "MVMCoreConstants.h"
|
||||||
|
|
||||||
typedef NS_ENUM(NSInteger, DismissType) {
|
typedef NS_ENUM(NSInteger, DismissType) {
|
||||||
DismissTypeTop = 0,
|
DismissTypeTop = 0,
|
||||||
@ -77,6 +78,10 @@ typedef NS_ENUM(NSInteger, DismissType) {
|
|||||||
if (viewController.presentedViewController || viewController.presentingViewController) {
|
if (viewController.presentedViewController || viewController.presentingViewController) {
|
||||||
[viewController dismissViewControllerAnimated:self.animate completion:^{
|
[viewController dismissViewControllerAnimated:self.animate completion:^{
|
||||||
[self markAsFinished];
|
[self markAsFinished];
|
||||||
|
// Notify that page has changed
|
||||||
|
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
|
||||||
|
[[NSNotificationCenter defaultCenter] postNotificationName:MVMCoreNotificationViewControllerChanged object:nil];
|
||||||
|
});
|
||||||
}];
|
}];
|
||||||
} else {
|
} else {
|
||||||
[self markAsFinished];
|
[self markAsFinished];
|
||||||
|
|||||||
@ -242,6 +242,10 @@
|
|||||||
[self.delegate navigationController:navigationController displayedViewController:viewController];
|
[self.delegate navigationController:navigationController displayedViewController:viewController];
|
||||||
}
|
}
|
||||||
[self markAsFinished];
|
[self markAsFinished];
|
||||||
|
// Notify that page has changed
|
||||||
|
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
|
||||||
|
[[NSNotificationCenter defaultCenter] postNotificationName:MVMCoreNotificationViewControllerChanged object:nil];
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
- (nullable id <UIViewControllerAnimatedTransitioning>)navigationController:(UINavigationController *)navigationController animationControllerForOperation:(UINavigationControllerOperation)operation fromViewController:(UIViewController *)fromVC toViewController:(UIViewController *)toVC {
|
- (nullable id <UIViewControllerAnimatedTransitioning>)navigationController:(UINavigationController *)navigationController animationControllerForOperation:(UINavigationControllerOperation)operation fromViewController:(UIViewController *)fromVC toViewController:(UIViewController *)toVC {
|
||||||
|
|||||||
@ -10,6 +10,7 @@
|
|||||||
#import "MVMCoreAlertController.h"
|
#import "MVMCoreAlertController.h"
|
||||||
#import "MVMCorePresentAnimationOperation.h"
|
#import "MVMCorePresentAnimationOperation.h"
|
||||||
#import "MVMCoreDispatchUtility.h"
|
#import "MVMCoreDispatchUtility.h"
|
||||||
|
#import "MVMCoreConstants.h"
|
||||||
|
|
||||||
@interface MVMCorePresentViewControllerOperation ()
|
@interface MVMCorePresentViewControllerOperation ()
|
||||||
|
|
||||||
@ -74,6 +75,10 @@ static void * XXContext = &XXContext;
|
|||||||
animationOperation.delegate = self.delegate;
|
animationOperation.delegate = self.delegate;
|
||||||
[animationOperation setCompletionBlock:^{
|
[animationOperation setCompletionBlock:^{
|
||||||
[self markAsFinished];
|
[self markAsFinished];
|
||||||
|
// Notify that page has changed
|
||||||
|
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
|
||||||
|
[[NSNotificationCenter defaultCenter] postNotificationName:MVMCoreNotificationViewControllerChanged object:nil];
|
||||||
|
});
|
||||||
}];
|
}];
|
||||||
[[NSOperationQueue mainQueue] addOperation:animationOperation];
|
[[NSOperationQueue mainQueue] addOperation:animationOperation];
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user