diff options
| author | Joel Fischer <joeljfischer@gmail.com> | 2016-08-23 16:29:57 -0400 |
|---|---|---|
| committer | Joel Fischer <joeljfischer@gmail.com> | 2016-08-23 16:29:57 -0400 |
| commit | 78873ede34e5c27032f77030ac2cdc23de53c1af (patch) | |
| tree | 29e407d1d27b0c334bfbcb1224f5f890991a986e /SmartDeviceLink/SDLLifecycleConfiguration.m | |
| parent | 87f08bf0f8351f48486b87fa6d1021f7eb389968 (diff) | |
| download | sdl_ios-78873ede34e5c27032f77030ac2cdc23de53c1af.tar.gz | |
Make SDLManagerDelegate methods required again
* SDLManagerDelegate removed `managerDidBecomeReady`
* SDLManagerDelegate `hmiLevel:didChangeToLevel:` is now sent right after becoming ready with the current HMI level
* Fixed some container types not having generics
* Changed SDLLockScreenConfiguration `showInOptional` -> `showInOptionalState`
* SDLLifecycleConfiguration `port` is now a UInt16 instead of a string
* SDLLifecycleConfiguration ipAddress is now null_resettable
* SDLLifecycleManager now properly sends AppHMIType and TTSName in RegisterAppInterface
Diffstat (limited to 'SmartDeviceLink/SDLLifecycleConfiguration.m')
| -rw-r--r-- | SmartDeviceLink/SDLLifecycleConfiguration.m | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/SmartDeviceLink/SDLLifecycleConfiguration.m b/SmartDeviceLink/SDLLifecycleConfiguration.m index 7818973f1..480861051 100644 --- a/SmartDeviceLink/SDLLifecycleConfiguration.m +++ b/SmartDeviceLink/SDLLifecycleConfiguration.m @@ -13,7 +13,7 @@ #import "SDLLanguage.h" static NSString *const DefaultTCPIPAddress = @"192.168.0.1"; -static NSString *const DefaultTCPIPPort = @"12345"; +static UInt16 const DefaultTCPIPPort = 12345; NS_ASSUME_NONNULL_BEGIN @@ -21,6 +21,8 @@ NS_ASSUME_NONNULL_BEGIN @interface SDLLifecycleConfiguration () @property (assign, nonatomic, readwrite) BOOL tcpDebugMode; +@property (copy, nonatomic, readwrite, null_resettable) NSString *tcpDebugIPAddress; +@property (assign, nonatomic, readwrite) UInt16 tcpDebugPort; @end @@ -57,7 +59,7 @@ NS_ASSUME_NONNULL_BEGIN return [[self alloc] initDefaultConfigurationWithAppName:appName appId:appId]; } -+ (SDLLifecycleConfiguration *)debugConfigurationWithAppName:(NSString *)appName appId:(NSString *)appId ipAddress:(NSString *)ipAddress port:(NSString *)port { ++ (SDLLifecycleConfiguration *)debugConfigurationWithAppName:(NSString *)appName appId:(NSString *)appId ipAddress:(NSString *)ipAddress port:(UInt16)port { SDLLifecycleConfiguration *config = [[self alloc] initDefaultConfigurationWithAppName:appName appId:appId]; config.tcpDebugMode = YES; config.tcpDebugIPAddress = ipAddress; @@ -84,14 +86,6 @@ NS_ASSUME_NONNULL_BEGIN } } -- (void)setTcpDebugPort:(nullable NSString *)tcpDebugPort { - if (tcpDebugPort == nil) { - _tcpDebugPort = DefaultTCPIPPort; - } else { - _tcpDebugPort = tcpDebugPort; - } -} - - (void)setAppType:(nullable SDLAppHMIType *)appType { if (appType == nil) { _appType = [SDLAppHMIType DEFAULT]; |