diff options
| author | Joel Fischer <joeljfischer@gmail.com> | 2017-07-14 10:05:33 -0400 |
|---|---|---|
| committer | Joel Fischer <joeljfischer@gmail.com> | 2017-07-14 10:05:33 -0400 |
| commit | 072fdc512bbac1b3ea8c4591b7c2c82219cda360 (patch) | |
| tree | e00645709522e8911a3dc5b845ed84dc3610a24a | |
| parent | b3423dd83d245a7ba43348a0e36a55a8268224ce (diff) | |
| download | sdl_ios-feature/611_system_capabilities_query_rpc_5.0.0.tar.gz | |
GetSystemCapability formatting fixesfeature/611_system_capabilities_query_rpc_5.0.0
| -rw-r--r-- | SmartDeviceLink/SDLFunctionID.m | 140 | ||||
| -rw-r--r-- | SmartDeviceLink/SDLGetSystemCapabilityResponse.m | 5 | ||||
| -rw-r--r-- | SmartDeviceLink/SDLNavigationCapability.m | 15 |
3 files changed, 76 insertions, 84 deletions
diff --git a/SmartDeviceLink/SDLFunctionID.m b/SmartDeviceLink/SDLFunctionID.m index ae24c5352..58ff9c479 100644 --- a/SmartDeviceLink/SDLFunctionID.m +++ b/SmartDeviceLink/SDLFunctionID.m @@ -24,75 +24,79 @@ NS_ASSUME_NONNULL_BEGIN } - (instancetype)init { - if (self = [super init]) { - self.functionIds = @{ - @0: SDLNameReserved, - @1: SDLNameRegisterAppInterface, - @2: SDLNameUnregisterAppInterface, - @3: SDLNameSetGlobalProperties, - @4: SDLNameResetGlobalProperties, - @5: SDLNameAddCommand, - @6: SDLNameDeleteCommand, - @7: SDLNameAddSubMenu, - @8: SDLNameDeleteSubMenu, - @9: SDLNameCreateInteractionChoiceSet, - @10: SDLNamePerformInteraction, - @11: SDLNameDeleteInteractionChoiceSet, - @12: SDLNameAlert, - @13: SDLNameShow, - @14: SDLNameSpeak, - @15: SDLNameSetMediaClockTimer, - @16: SDLNamePerformAudioPassThru, - @17: SDLNameEndAudioPassThru, - @18: SDLNameSubscribeButton, - @19: SDLNameUnsubscribeButton, - @20: SDLNameSubscribeVehicleData, - @21: SDLNameUnsubscribeVehicleData, - @22: SDLNameGetVehicleData, - @23: SDLNameReadDID, - @24: SDLNameGetDTCs, - @25: SDLNameScrollableMessage, - @26: SDLNameSlider, - @27: SDLNameShowConstantTBT, - @28: SDLNameAlertManeuver, - @29: SDLNameUpdateTurnList, - @30: SDLNameChangeRegistration, - @31: SDLNameGenericResponse, - @32: SDLNamePutFile, - @33: SDLNameDeleteFile, - @34: SDLNameListFiles, - @35: SDLNameSetAppIcon, - @36: SDLNameSetDisplayLayout, - @37: SDLNameDiagnosticMessage, - @38: SDLNameSystemRequest, - @39: SDLNameSendLocation, - @40: SDLNameDialNumber, - @45: SDLNameGetWaypoints, - @46: SDLNameSubscribeWaypoints, - @47: SDLNameUnsubscribeWaypoints, - @48: SDLNameGetSystemCapability, - @32768: SDLNameOnHMIStatus, - @32769: SDLNameOnAppInterfaceUnregistered, - @32770: SDLNameOnButtonEvent, - @32771: SDLNameOnButtonPress, - @32772: SDLNameOnVehicleData, - @32773: SDLNameOnCommand, - @32774: SDLNameOnTBTClientState, - @32775: SDLNameOnDriverDistraction, - @32776: SDLNameOnPermissionsChange, - @32777: SDLNameOnAudioPassThru, - @32778: SDLNameOnLanguageChange, - @32779: SDLNameOnKeyboardInput, - @32780: SDLNameOnTouchEvent, - @32781: SDLNameOnSystemRequest, - @32782: SDLNameOnHashChange, - @32784: SDLNameOnWaypointChange, - @65536: SDLNameEncodedSyncPData, - @65537: SDLNameSyncPData, - @98304: SDLNameOnEncodedSyncPData, - @98305: SDLNameOnSyncPData - }; + self = [super init]; + if (!self) { + return nil; } + + self.functionIds = @{ + @0: SDLNameReserved, + @1: SDLNameRegisterAppInterface, + @2: SDLNameUnregisterAppInterface, + @3: SDLNameSetGlobalProperties, + @4: SDLNameResetGlobalProperties, + @5: SDLNameAddCommand, + @6: SDLNameDeleteCommand, + @7: SDLNameAddSubMenu, + @8: SDLNameDeleteSubMenu, + @9: SDLNameCreateInteractionChoiceSet, + @10: SDLNamePerformInteraction, + @11: SDLNameDeleteInteractionChoiceSet, + @12: SDLNameAlert, + @13: SDLNameShow, + @14: SDLNameSpeak, + @15: SDLNameSetMediaClockTimer, + @16: SDLNamePerformAudioPassThru, + @17: SDLNameEndAudioPassThru, + @18: SDLNameSubscribeButton, + @19: SDLNameUnsubscribeButton, + @20: SDLNameSubscribeVehicleData, + @21: SDLNameUnsubscribeVehicleData, + @22: SDLNameGetVehicleData, + @23: SDLNameReadDID, + @24: SDLNameGetDTCs, + @25: SDLNameScrollableMessage, + @26: SDLNameSlider, + @27: SDLNameShowConstantTBT, + @28: SDLNameAlertManeuver, + @29: SDLNameUpdateTurnList, + @30: SDLNameChangeRegistration, + @31: SDLNameGenericResponse, + @32: SDLNamePutFile, + @33: SDLNameDeleteFile, + @34: SDLNameListFiles, + @35: SDLNameSetAppIcon, + @36: SDLNameSetDisplayLayout, + @37: SDLNameDiagnosticMessage, + @38: SDLNameSystemRequest, + @39: SDLNameSendLocation, + @40: SDLNameDialNumber, + @45: SDLNameGetWaypoints, + @46: SDLNameSubscribeWaypoints, + @47: SDLNameUnsubscribeWaypoints, + @48: SDLNameGetSystemCapability, + @32768: SDLNameOnHMIStatus, + @32769: SDLNameOnAppInterfaceUnregistered, + @32770: SDLNameOnButtonEvent, + @32771: SDLNameOnButtonPress, + @32772: SDLNameOnVehicleData, + @32773: SDLNameOnCommand, + @32774: SDLNameOnTBTClientState, + @32775: SDLNameOnDriverDistraction, + @32776: SDLNameOnPermissionsChange, + @32777: SDLNameOnAudioPassThru, + @32778: SDLNameOnLanguageChange, + @32779: SDLNameOnKeyboardInput, + @32780: SDLNameOnTouchEvent, + @32781: SDLNameOnSystemRequest, + @32782: SDLNameOnHashChange, + @32784: SDLNameOnWaypointChange, + @65536: SDLNameEncodedSyncPData, + @65537: SDLNameSyncPData, + @98304: SDLNameOnEncodedSyncPData, + @98305: SDLNameOnSyncPData + }; + return self; } diff --git a/SmartDeviceLink/SDLGetSystemCapabilityResponse.m b/SmartDeviceLink/SDLGetSystemCapabilityResponse.m index 619b2f516..00c1cf7f4 100644 --- a/SmartDeviceLink/SDLGetSystemCapabilityResponse.m +++ b/SmartDeviceLink/SDLGetSystemCapabilityResponse.m @@ -18,8 +18,11 @@ NS_ASSUME_NONNULL_BEGIN @implementation SDLGetSystemCapabilityResponse - (instancetype)init { - if (self = [super initWithName:SDLNameGetSystemCapability]) { + self = [super initWithName:SDLNameGetSystemCapability]; + if (!self) { + return nil; } + return self; } diff --git a/SmartDeviceLink/SDLNavigationCapability.m b/SmartDeviceLink/SDLNavigationCapability.m index a1559b94d..c86f6f494 100644 --- a/SmartDeviceLink/SDLNavigationCapability.m +++ b/SmartDeviceLink/SDLNavigationCapability.m @@ -15,21 +15,6 @@ NS_ASSUME_NONNULL_BEGIN @implementation SDLNavigationCapability -- (instancetype)init { - self = [super init]; - if (!self) { - return nil; - } - - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (instancetype)initWithSendLocation:(BOOL)sendLocationEnabled waypoints:(BOOL)waypointsEnabled { self = [self init]; if (!self) { |