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

Merge branch 'develop' into feature/outside_world

Browse Source
This commit is contained in:
panxi 2019-01-04 09:51:34 -05:00
commit 1326966e7a
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
MVMCore/MVMCore/AlertHandling/MVMCoreTopAlertObject.h
View File

@ -38,8 +38,9 @@ extern NSUInteger const TopAlertDismissTime;
// The page type used for the top alert // The page type used for the top alert
@property (nullable, strong, nonatomic) NSString *pageType; @property (nullable, strong, nonatomic) NSString *pageType;
// image name or url used when iconView is an image // image name or url used imageviews
@property (nullable, strong, nonatomic) NSString *imageNameOrURL; @property (nullable, strong, nonatomic) NSString *imageNameOrURL;
@property (nullable, strong, nonatomic) NSString *aboveTextImageString;
// If 0, uses default 5 seconds. // If 0, uses default 5 seconds.
@property (nonatomic) NSInteger topAlertDismissTime; @property (nonatomic) NSInteger topAlertDismissTime;

1
MVMCore/MVMCore/AlertHandling/MVMCoreTopAlertObject.m
View File

@ -28,6 +28,7 @@ NSUInteger const TopAlertDismissTime = 5;
self.buttonMap = [responseInfo dict:KeyButtonMap]; self.buttonMap = [responseInfo dict:KeyButtonMap];
self.topMessage = [responseInfo string:KeyTopMessage]; self.topMessage = [responseInfo string:KeyTopMessage];
self.imageNameOrURL = [responseInfo string:@"topAlertImageUrl"]; self.imageNameOrURL = [responseInfo string:@"topAlertImageUrl"];
self.aboveTextImageString = [responseInfo string:@"topAlertImageURLAboveText"];
NSString *color = [responseInfo string:@"topAlertColor"]; NSString *color = [responseInfo string:@"topAlertColor"];
if (color) { if (color) {

5
MVMCore/MVMCore/LoadHandling/MVMCoreLoadHandler.m
View File

@ -333,6 +333,11 @@
} }
} }
MVMCoreLog(@"********************************* Cookie Sent *********************************");
[[[NSHTTPCookieStorage sharedHTTPCookieStorage] cookies] enumerateObjectsUsingBlock:^(NSHTTPCookie * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
MVMCoreLog(@"Cookie Name: %@, Cookie Value: %@",obj.name, obj.value);
}];
[[NSNotificationCenter defaultCenter] postNotificationName:MVMCoreNotificationGoingToServer object:nil]; [[NSNotificationCenter defaultCenter] postNotificationName:MVMCoreNotificationGoingToServer object:nil];
NSURLSessionTask *task = [session dataTaskWithRequest:request completionHandler:^(NSData * _Nullable data, NSURLResponse * _Nullable response, NSError * _Nullable error) { NSURLSessionTask *task = [session dataTaskWithRequest:request completionHandler:^(NSData * _Nullable data, NSURLResponse * _Nullable response, NSError * _Nullable error) {