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

changes to the custom time and button map removal

Browse Source
This commit is contained in:
Pfeil, Scott Robert 2018-10-11 16:23:16 -04:00
parent 35da51bc74
commit 41a454440e
4 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -151,7 +151,7 @@
} }
NSTimeInterval timeOutInterval = 60; NSTimeInterval timeOutInterval = 60;
if (requestParameters.customTimeoutTime && requestParameters.customTimeoutTime.integerValue > 30.0) { if (requestParameters.customTimeoutTime) {
timeOutInterval = requestParameters.customTimeoutTime.floatValue; timeOutInterval = requestParameters.customTimeoutTime.floatValue;
} else if ([[MVMCoreObject sharedInstance].globalLoadDelegate respondsToSelector:@selector(timeOutIntervalForRequest:)]) { } else if ([[MVMCoreObject sharedInstance].globalLoadDelegate respondsToSelector:@selector(timeOutIntervalForRequest:)]) {
timeOutInterval = [[MVMCoreObject sharedInstance].globalLoadDelegate timeOutIntervalForRequest:requestParameters]; timeOutInterval = [[MVMCoreObject sharedInstance].globalLoadDelegate timeOutIntervalForRequest:requestParameters];

3
MVMCore/MVMCore/LoadHandling/MVMCoreLoadObject.h
View File

@ -23,9 +23,6 @@
// The data for hte page that was loaded // The data for hte page that was loaded
@property (nullable, strong, nonatomic) NSDictionary *pageJSON; @property (nullable, strong, nonatomic) NSDictionary *pageJSON;
// Contains the button map
@property (nullable, nonatomic, strong) NSDictionary *buttonMap;
// the modules that are needed // the modules that are needed
@property (nullable, strong, nonatomic) NSDictionary *modulesJSON; @property (nullable, strong, nonatomic) NSDictionary *modulesJSON;

6
MVMCore/MVMCore/LoadHandling/MVMCoreLoadObject.m
View File

@ -18,16 +18,10 @@
if (self = [self initWithRequestParameters:requestParameters dataForPage:dataForPage delegate:delegate]) { if (self = [self initWithRequestParameters:requestParameters dataForPage:dataForPage delegate:delegate]) {
self.pageJSON = pageJSON; self.pageJSON = pageJSON;
self.modulesJSON = modulesJSON; self.modulesJSON = modulesJSON;
//self.buttonMap = [pageJSON dictionaryForKey:@"ButtonMap"];
} }
return self; return self;
} }
- (NSDictionary *) buttonMap {
return [self.pageJSON dictionaryForKey:@"ButtonMap"];
}
- (nullable instancetype)initWithRequestParameters:(nullable MVMCoreRequestParameters *)requestParameters dataForPage:(nullable NSDictionary *)dataForPage delegate:(nullable NSObject<MVMCoreLoadDelegateProtocol,MVMCorePresentationDelegateProtocol,MVMCoreActionDelegateProtocol>*)delegate { - (nullable instancetype)initWithRequestParameters:(nullable MVMCoreRequestParameters *)requestParameters dataForPage:(nullable NSDictionary *)dataForPage delegate:(nullable NSObject<MVMCoreLoadDelegateProtocol,MVMCorePresentationDelegateProtocol,MVMCoreActionDelegateProtocol>*)delegate {
if (self = [self initWithDelegate:delegate]) { if (self = [self initWithDelegate:delegate]) {
self.requestParameters = requestParameters; self.requestParameters = requestParameters;

2
MVMCore/MVMCore/LoadHandling/MVMCoreRequestParameters.m
View File

@ -67,7 +67,7 @@
if (self = [self initWithPageType:[actionMap stringForKey:KeyPageType] additionalModules:[actionMap array:KeyModuleList] extraParameters:[actionMap dict:KeyExtraParameters]]) { if (self = [self initWithPageType:[actionMap stringForKey:KeyPageType] additionalModules:[actionMap array:KeyModuleList] extraParameters:[actionMap dict:KeyExtraParameters]]) {
self.contextRoot = [actionMap string:KeyContextRoot]; self.contextRoot = [actionMap string:KeyContextRoot];
self.actionMap = actionMap; self.actionMap = actionMap;
self.customTimeoutTime = @([actionMap integer:@"customTimeoutTime"]); self.customTimeoutTime = [actionMap objectForKey:@"customTimeoutTime" ofType:[NSNumber class]];
self.openSupportPanel = [actionMap boolForKey:KeyOpenSupport]; self.openSupportPanel = [actionMap boolForKey:KeyOpenSupport];
// Right now server is sending default.... can't uncomment this until they remove default // Right now server is sending default.... can't uncomment this until they remove default