mbrucedogs/mvm_core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/chatbotremove' into 'develop'

Browse Source 
Cleaning

See merge request BPHV_MIPS/mvm_core!67
This commit is contained in:
Pan, Xinlei (Ryan) 2020-03-04 15:27:03 -05:00
commit cb4646ad89
5 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MVMCore/MVMCore/Constants/MVMCoreConstants.h
View File

@ -42,6 +42,7 @@ extern NSString * const URLComponentKeepAlive;
extern NSString * const NotificationResponseLoaded;
extern NSString * const MVMCoreNotificationGoingToServer;
extern NSString * const MVMCoreNotificationViewControllerChanged;
#pragma mark - Image Cache
extern NSTimeInterval const ImageTimeOut;

1
MVMCore/MVMCore/Constants/MVMCoreConstants.m
View File

@ -29,6 +29,7 @@ NSString * const URLComponentKeepAlive = @"isAlive.jsp";
NSString * const NotificationResponseLoaded = @"responseLoaded";
NSString * const MVMCoreNotificationGoingToServer = @"MVMCoreGoServer";
NSString * const MVMCoreNotificationViewControllerChanged = @"MVMCoreNotificationViewControllerChanged";
#pragma mark - Image Cache
NSTimeInterval const ImageTimeOut = 60;

5
MVMCore/MVMCore/PresentationHandling/MVMCoreDismissViewControllerOperation.m
View File

@ -7,6 +7,7 @@
//
#import "MVMCoreDismissViewControllerOperation.h"
#import "MVMCoreConstants.h"
typedef NS_ENUM(NSInteger, DismissType) {
DismissTypeTop = 0,
@ -77,6 +78,10 @@ typedef NS_ENUM(NSInteger, DismissType) {
if (viewController.presentedViewController || viewController.presentingViewController) {
[viewController dismissViewControllerAnimated:self.animate completion:^{
[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 {
[self markAsFinished];

4
MVMCore/MVMCore/PresentationHandling/MVMCoreNavigationOperation.m
View File

@ -242,6 +242,10 @@
[self.delegate navigationController:navigationController displayedViewController:viewController];
}
[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 {

5
MVMCore/MVMCore/PresentationHandling/MVMCorePresentViewControllerOperation.m
View File

@ -10,6 +10,7 @@
#import "MVMCoreAlertController.h"
#import "MVMCorePresentAnimationOperation.h"
#import "MVMCoreDispatchUtility.h"
#import "MVMCoreConstants.h"
@interface MVMCorePresentViewControllerOperation ()
@ -74,6 +75,10 @@ static void * XXContext = &XXContext;
animationOperation.delegate = self.delegate;
[animationOperation setCompletionBlock:^{
[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];
}