diff options
| author | NicoleYarroch <nicole@livio.io> | 2019-03-12 11:03:49 -0400 |
|---|---|---|
| committer | NicoleYarroch <nicole@livio.io> | 2019-03-12 11:03:49 -0400 |
| commit | 19dd8c1ce0b3d7476d6211c171a33d4de53636d1 (patch) | |
| tree | a03cbb764675c6d10f109659001168fe89a64dbd | |
| parent | 163df4a223c06f1cb9bcaf09981fcc1a618cdd31 (diff) | |
| parent | 9cc2c49fd044341897693b27e2acfe70c30d8952 (diff) | |
| download | sdl_ios-19dd8c1ce0b3d7476d6211c171a33d4de53636d1.tar.gz | |
Merge branch 'develop' into feature/issue_1166_cloud_app_transport
# Conflicts:
# SmartDeviceLink-iOS.podspec
# SmartDeviceLink-iOS.xcodeproj/project.pbxproj
# SmartDeviceLink.podspec
# SmartDeviceLink/SDLFunctionID.m
# SmartDeviceLink/SDLNames.h
# SmartDeviceLink/SDLNames.m
# SmartDeviceLink/SDLNotificationConstants.h
# SmartDeviceLink/SDLNotificationConstants.m
# SmartDeviceLink/SDLNotificationDispatcher.m
# SmartDeviceLink/SDLProxyListener.h
# SmartDeviceLink/SmartDeviceLink.h
# SmartDeviceLinkTests/DevAPISpecs/SDLNotificationDispatcherSpec.m
# SmartDeviceLinkTests/ProtocolSpecs/SDLFunctionIDSpec.m
# SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnVehicleDataSpec.m
# SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m
# SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeVehicleDataSpec.m
# SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeVehicleDataSpec.m
# SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetVehicleDataResponseSpec.m
# SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m
# SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m
569 files changed, 14910 insertions, 5354 deletions
diff --git a/SmartDeviceLink-iOS.podspec b/SmartDeviceLink-iOS.podspec index 7a92fcfb1..ba787dcf5 100644 --- a/SmartDeviceLink-iOS.podspec +++ b/SmartDeviceLink-iOS.podspec @@ -28,6 +28,12 @@ ss.public_header_files = [ 'SmartDeviceLink/SDLAlertManeuver.h', 'SmartDeviceLink/SDLAlertManeuverResponse.h', 'SmartDeviceLink/SDLAlertResponse.h', +'SmartDeviceLink/SDLAppServiceCapability.h', +'SmartDeviceLink/SDLAppServiceData.h', +'SmartDeviceLink/SDLAppServiceManifest.h', +'SmartDeviceLink/SDLAppServiceRecord.h', +'SmartDeviceLink/SDLAppServicesCapabilities.h', +'SmartDeviceLink/SDLAppServiceType.h', 'SmartDeviceLink/SDLButtonPressResponse.h', 'SmartDeviceLink/SDLAmbientLightStatus.h', 'SmartDeviceLink/SDLAppHMIType.h', @@ -93,6 +99,7 @@ ss.public_header_files = [ 'SmartDeviceLink/SDLDisplayMode.h', 'SmartDeviceLink/SDLDisplayType.h', 'SmartDeviceLink/SDLDistanceUnit.h', +'SmartDeviceLink/SDLDirection.h', 'SmartDeviceLink/SDLDriverDistractionState.h', 'SmartDeviceLink/SDLECallConfirmationStatus.h', 'SmartDeviceLink/SDLECallInfo.h', @@ -114,12 +121,17 @@ ss.public_header_files = [ 'SmartDeviceLink/SDLFuelCutoffStatus.h', 'SmartDeviceLink/SDLFuelRange.h', 'SmartDeviceLink/SDLFuelType.h', +'SmartDeviceLink/SDLFunctionID.h', 'SmartDeviceLink/SDLGenericResponse.h', 'SmartDeviceLink/SDLGetCloudAppProperties.h', 'SmartDeviceLink/SDLGetCloudAppPropertiesResponse.h', +'SmartDeviceLink/SDLGetAppServiceData.h', +'SmartDeviceLink/SDLGetAppServiceDataResponse.h', 'SmartDeviceLink/SDLGetDTCs.h', -'SmartDeviceLink/SDLGetInteriorVehicleData.h', 'SmartDeviceLink/SDLGetDTCsResponse.h', +'SmartDeviceLink/SDLGetFile.h', +'SmartDeviceLink/SDLGetFileResponse.h', +'SmartDeviceLink/SDLGetInteriorVehicleData.h', 'SmartDeviceLink/SDLGetInteriorVehicleDataResponse.h', 'SmartDeviceLink/SDLGetSystemCapability.h', 'SmartDeviceLink/SDLGetSystemCapabilityResponse.h', @@ -188,6 +200,9 @@ ss.public_header_files = [ 'SmartDeviceLink/SDLManager.h', 'SmartDeviceLink/SDLManagerDelegate.h', 'SmartDeviceLink/SDLMediaClockFormat.h', +'SmartDeviceLink/SDLMediaServiceData.h', +'SmartDeviceLink/SDLMediaServiceManifest.h', +'SmartDeviceLink/SDLMediaType.h', 'SmartDeviceLink/SDLMenuCell.h', 'SmartDeviceLink/SDLMenuParams.h', 'SmartDeviceLink/SDLMetadataTags.h', @@ -195,10 +210,16 @@ ss.public_header_files = [ 'SmartDeviceLink/SDLModuleData.h', 'SmartDeviceLink/SDLModuleType.h', 'SmartDeviceLink/SDLMyKey.h', +'SmartDeviceLink/SDLNavigationAction.h', 'SmartDeviceLink/SDLNavigationCapability.h', +'SmartDeviceLink/SDLNavigationInstruction.h', +'SmartDeviceLink/SDLNavigationJunction.h', +'SmartDeviceLink/SDLNavigationServiceData.h', +'SmartDeviceLink/SDLNavigationServiceManifest.h', 'SmartDeviceLink/SDLNotificationConstants.h', 'SmartDeviceLink/SDLOasisAddress.h', 'SmartDeviceLink/SDLOnAppInterfaceUnregistered.h', +'SmartDeviceLink/SDLOnAppServiceData.h', 'SmartDeviceLink/SDLOnAudioPassThru.h', 'SmartDeviceLink/SDLOnButtonEvent.h', 'SmartDeviceLink/SDLOnButtonPress.h', @@ -214,12 +235,15 @@ ss.public_header_files = [ 'SmartDeviceLink/SDLOnPermissionsChange.h', 'SmartDeviceLink/SDLOnRCStatus.h', 'SmartDeviceLink/SDLOnSyncPData.h', +'SmartDeviceLink/SDLOnSystemCapabilityUpdated.h', 'SmartDeviceLink/SDLOnSystemRequest.h', 'SmartDeviceLink/SDLOnTBTClientState.h', 'SmartDeviceLink/SDLOnTouchEvent.h', 'SmartDeviceLink/SDLOnVehicleData.h', 'SmartDeviceLink/SDLOnWayPointChange.h', 'SmartDeviceLink/SDLParameterPermissions.h', +'SmartDeviceLink/SDLPerformAppServiceInteraction.h', +'SmartDeviceLink/SDLPerformAppServiceInteractionResponse.h', 'SmartDeviceLink/SDLPerformAudioPassThru.h', 'SmartDeviceLink/SDLPerformAudioPassThruResponse.h', 'SmartDeviceLink/SDLPerformInteraction.h', @@ -237,6 +261,8 @@ ss.public_header_files = [ 'SmartDeviceLink/SDLPresetBankCapabilities.h', 'SmartDeviceLink/SDLPrimaryAudioSource.h', 'SmartDeviceLink/SDLPRNDL.h', +'SmartDeviceLink/SDLPublishAppService.h', +'SmartDeviceLink/SDLPublishAppServiceResponse.h', 'SmartDeviceLink/SDLPutFile.h', 'SmartDeviceLink/SDLPutFileResponse.h', 'SmartDeviceLink/SDLRadioBand.h', @@ -256,11 +282,13 @@ ss.public_header_files = [ 'SmartDeviceLink/SDLResetGlobalPropertiesResponse.h', 'SmartDeviceLink/SDLResult.h', 'SmartDeviceLink/SDLRGBColor.h', +'SmartDeviceLink/SDLRPCFunctionNames.h', 'SmartDeviceLink/SDLRPCMessage.h', 'SmartDeviceLink/SDLRPCMessageType.h', 'SmartDeviceLink/SDLRPCNotification.h', 'SmartDeviceLink/SDLRPCNotificationNotification.h', 'SmartDeviceLink/SDLRPCRequest.h', +'SmartDeviceLink/SDLRPCRequestNotification.h', 'SmartDeviceLink/SDLRPCResponse.h', 'SmartDeviceLink/SDLRPCResponseNotification.h', 'SmartDeviceLink/SDLRPCStruct.h', @@ -279,6 +307,7 @@ ss.public_header_files = [ 'SmartDeviceLink/SDLSendHapticDataResponse.h', 'SmartDeviceLink/SDLSendLocation.h', 'SmartDeviceLink/SDLSendLocationResponse.h', +'SmartDeviceLink/SDLServiceUpdateReason.h', 'SmartDeviceLink/SDLSetAppIcon.h', 'SmartDeviceLink/SDLSetAppIconResponse.h', 'SmartDeviceLink/SDLSetCloudAppProperties.h', @@ -328,6 +357,7 @@ ss.public_header_files = [ 'SmartDeviceLink/SDLSystemCapabilityManager.h', 'SmartDeviceLink/SDLSystemCapabilityType.h', 'SmartDeviceLink/SDLSystemContext.h', +'SmartDeviceLink/SDLSystemRequest.h', 'SmartDeviceLink/SDLTBTState.h', 'SmartDeviceLink/SDLTemperature.h', 'SmartDeviceLink/SDLTemperatureUnit.h', @@ -380,6 +410,10 @@ ss.public_header_files = [ 'SmartDeviceLink/SDLVrHelpItem.h', 'SmartDeviceLink/SDLWarningLightStatus.h', 'SmartDeviceLink/SDLWayPointType.h', +'SmartDeviceLink/SDLWeatherAlert.h', +'SmartDeviceLink/SDLWeatherData.h', +'SmartDeviceLink/SDLWeatherServiceData.h', +'SmartDeviceLink/SDLWeatherServiceManifest.h', 'SmartDeviceLink/SDLWiperStatus.h', 'SmartDeviceLink/SmartDeviceLink.h', ] diff --git a/SmartDeviceLink-iOS.xcodeproj/project.pbxproj b/SmartDeviceLink-iOS.xcodeproj/project.pbxproj index 5d78108f3..2452211ea 100644 --- a/SmartDeviceLink-iOS.xcodeproj/project.pbxproj +++ b/SmartDeviceLink-iOS.xcodeproj/project.pbxproj @@ -655,7 +655,7 @@ 5D61FCAA1A84238C00846EE7 /* SDLFileType.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D61FABD1A84238A00846EE7 /* SDLFileType.m */; }; 5D61FCAB1A84238C00846EE7 /* SDLFuelCutoffStatus.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D61FABE1A84238A00846EE7 /* SDLFuelCutoffStatus.h */; settings = {ATTRIBUTES = (Public, ); }; }; 5D61FCAC1A84238C00846EE7 /* SDLFuelCutoffStatus.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D61FABF1A84238A00846EE7 /* SDLFuelCutoffStatus.m */; }; - 5D61FCAD1A84238C00846EE7 /* SDLFunctionID.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D61FAC01A84238A00846EE7 /* SDLFunctionID.h */; }; + 5D61FCAD1A84238C00846EE7 /* SDLFunctionID.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D61FAC01A84238A00846EE7 /* SDLFunctionID.h */; settings = {ATTRIBUTES = (Public, ); }; }; 5D61FCAE1A84238C00846EE7 /* SDLFunctionID.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D61FAC11A84238A00846EE7 /* SDLFunctionID.m */; }; 5D61FCAF1A84238C00846EE7 /* SDLGenericResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D61FAC21A84238A00846EE7 /* SDLGenericResponse.h */; settings = {ATTRIBUTES = (Public, ); }; }; 5D61FCB01A84238C00846EE7 /* SDLGenericResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D61FAC31A84238A00846EE7 /* SDLGenericResponse.m */; }; @@ -727,7 +727,7 @@ 5D61FCF91A84238C00846EE7 /* SDLMenuParams.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D61FB0C1A84238A00846EE7 /* SDLMenuParams.m */; }; 5D61FCFA1A84238C00846EE7 /* SDLMyKey.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D61FB0D1A84238A00846EE7 /* SDLMyKey.h */; settings = {ATTRIBUTES = (Public, ); }; }; 5D61FCFB1A84238C00846EE7 /* SDLMyKey.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D61FB0E1A84238A00846EE7 /* SDLMyKey.m */; }; - 5D61FCFC1A84238C00846EE7 /* SDLNames.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D61FB0F1A84238A00846EE7 /* SDLNames.h */; }; + 5D61FCFC1A84238C00846EE7 /* SDLRPCParameterNames.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D61FB0F1A84238A00846EE7 /* SDLRPCParameterNames.h */; settings = {ATTRIBUTES = (Private, ); }; }; 5D61FCFD1A84238C00846EE7 /* SDLObjectWithPriority.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D61FB101A84238A00846EE7 /* SDLObjectWithPriority.h */; }; 5D61FCFE1A84238C00846EE7 /* SDLObjectWithPriority.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D61FB111A84238A00846EE7 /* SDLObjectWithPriority.m */; }; 5D61FCFF1A84238C00846EE7 /* SDLOnAppInterfaceUnregistered.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D61FB121A84238B00846EE7 /* SDLOnAppInterfaceUnregistered.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -1211,7 +1211,7 @@ 5DE372A11ACB2ED300849FAA /* SDLHMICapabilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 5DE3729F1ACB2ED300849FAA /* SDLHMICapabilities.h */; settings = {ATTRIBUTES = (Public, ); }; }; 5DE372A21ACB2ED300849FAA /* SDLHMICapabilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 5DE372A01ACB2ED300849FAA /* SDLHMICapabilities.m */; }; 5DE372A41ACB336600849FAA /* SDLHMICapabilitiesSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 5DE372A31ACB336600849FAA /* SDLHMICapabilitiesSpec.m */; }; - 5DE5ABB71B0E38C90067BB02 /* SDLSystemRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D61FBD21A84238B00846EE7 /* SDLSystemRequest.h */; }; + 5DE5ABB71B0E38C90067BB02 /* SDLSystemRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D61FBD21A84238B00846EE7 /* SDLSystemRequest.h */; settings = {ATTRIBUTES = (Public, ); }; }; 5DE5ABB81B0E38C90067BB02 /* SDLSystemRequestResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D61FBD41A84238B00846EE7 /* SDLSystemRequestResponse.h */; }; 5DEF695B1FD6F82D004B8C2F /* SDLStreamingAudioManagerType.h in Headers */ = {isa = PBXBuildFile; fileRef = 5DEF695A1FD6F82D004B8C2F /* SDLStreamingAudioManagerType.h */; settings = {ATTRIBUTES = (Public, ); }; }; 5DEF695D1FD6FA01004B8C2F /* testAudio.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 5DEF695C1FD6FA01004B8C2F /* testAudio.mp3 */; }; @@ -1224,15 +1224,54 @@ 5DFFB9151BD7C89700DB3F04 /* SDLConnectionManagerType.h in Headers */ = {isa = PBXBuildFile; fileRef = 5DFFB9141BD7C89700DB3F04 /* SDLConnectionManagerType.h */; }; 880245A420F79C3400ED195B /* SDLFileManagerConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = 880245A220F79C3400ED195B /* SDLFileManagerConfiguration.h */; settings = {ATTRIBUTES = (Public, ); }; }; 880245A520F79C3400ED195B /* SDLFileManagerConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = 880245A320F79C3400ED195B /* SDLFileManagerConfiguration.m */; }; + 880D267A220DDD1000B3F496 /* SDLWeatherServiceDataSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 880D2679220DDD1000B3F496 /* SDLWeatherServiceDataSpec.m */; }; + 880D267D220DE5DF00B3F496 /* SDLWeatherServiceManifest.h in Headers */ = {isa = PBXBuildFile; fileRef = 880D267B220DE5DF00B3F496 /* SDLWeatherServiceManifest.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 880D267E220DE5DF00B3F496 /* SDLWeatherServiceManifest.m in Sources */ = {isa = PBXBuildFile; fileRef = 880D267C220DE5DF00B3F496 /* SDLWeatherServiceManifest.m */; }; + 880D2680220E038800B3F496 /* SDLWeatherServiceManifestSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 880D267F220E038800B3F496 /* SDLWeatherServiceManifestSpec.m */; }; 880E35B42088F75A00181259 /* SDLSystemCapabilityManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 880E35B22088F75A00181259 /* SDLSystemCapabilityManager.m */; }; 880E35B52088F75A00181259 /* SDLSystemCapabilityManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 880E35B32088F75A00181259 /* SDLSystemCapabilityManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; 880E35B82088F78E00181259 /* SDLSystemCapabilityManagerSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 880E35B72088F78E00181259 /* SDLSystemCapabilityManagerSpec.m */; }; + 8815D0EF22330753000F24E6 /* SDLRPCRequestNotification.h in Headers */ = {isa = PBXBuildFile; fileRef = 88D6F17E22319FE000D4BFB3 /* SDLRPCRequestNotification.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 8815D0F022330765000F24E6 /* SDLRPCRequestNotificationSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 88C23E8522297BD500EA171F /* SDLRPCRequestNotificationSpec.m */; }; + 8815D0F122330781000F24E6 /* SDLRPCRequestNotification.m in Sources */ = {isa = PBXBuildFile; fileRef = 88D6F17D22319FE000D4BFB3 /* SDLRPCRequestNotification.m */; }; + 8816772922208B82001FACFF /* SDLNavigationInstructionSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 8816772822208B82001FACFF /* SDLNavigationInstructionSpec.m */; }; + 8816772C222097C3001FACFF /* SDLNavigationServiceData.h in Headers */ = {isa = PBXBuildFile; fileRef = 8816772A222097C3001FACFF /* SDLNavigationServiceData.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 8816772D222097C3001FACFF /* SDLNavigationServiceData.m in Sources */ = {isa = PBXBuildFile; fileRef = 8816772B222097C3001FACFF /* SDLNavigationServiceData.m */; }; 8818ADD82100FC18007D6F19 /* SDLTurnSignal.h in Headers */ = {isa = PBXBuildFile; fileRef = 8818ADD62100FC18007D6F19 /* SDLTurnSignal.h */; settings = {ATTRIBUTES = (Public, ); }; }; 8818ADD92100FC18007D6F19 /* SDLTurnSignal.m in Sources */ = {isa = PBXBuildFile; fileRef = 8818ADD72100FC18007D6F19 /* SDLTurnSignal.m */; }; 8818ADDD2100FE0C007D6F19 /* SDLTurnSignalSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 8818ADDC2100FE0C007D6F19 /* SDLTurnSignalSpec.m */; }; 8829568B207CF68800EF056C /* SmartDeviceLink.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5D61FA1C1A84237100846EE7 /* SmartDeviceLink.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; 88295693207CF68800EF056C /* SmartDeviceLink.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 5D61FA1C1A84237100846EE7 /* SmartDeviceLink.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 882C42CE2108CDB100A44B58 /* (null) in Sources */ = {isa = PBXBuildFile; }; + 882FAC4D2209D7EF0062385D /* SDLAppServiceDataSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 882FAC4C2209D7EF0062385D /* SDLAppServiceDataSpec.m */; }; + 8831FA392201E3D100B8FFB7 /* SDLAppServiceManifestSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 8831FA382201E3D100B8FFB7 /* SDLAppServiceManifestSpec.m */; }; + 8831FA3D220207DA00B8FFB7 /* SDLServiceUpdateReasonSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 8831FA3C220207DA00B8FFB7 /* SDLServiceUpdateReasonSpec.m */; }; + 8831FA3F2202227000B8FFB7 /* SDLAppServiceTypeSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 8831FA3E2202227000B8FFB7 /* SDLAppServiceTypeSpec.m */; }; + 8831FA4222022AB300B8FFB7 /* SDLAppServiceCapability.h in Headers */ = {isa = PBXBuildFile; fileRef = 8831FA4022022AB300B8FFB7 /* SDLAppServiceCapability.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 8831FA4322022AB300B8FFB7 /* SDLAppServiceCapability.m in Sources */ = {isa = PBXBuildFile; fileRef = 8831FA4122022AB300B8FFB7 /* SDLAppServiceCapability.m */; }; + 8831FA452202307500B8FFB7 /* SDLAppServiceCapabilitySpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 8831FA442202307500B8FFB7 /* SDLAppServiceCapabilitySpec.m */; }; + 8831FA48220235B000B8FFB7 /* SDLAppServicesCapabilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 8831FA46220235B000B8FFB7 /* SDLAppServicesCapabilities.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 8831FA49220235B000B8FFB7 /* SDLAppServicesCapabilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 8831FA47220235B000B8FFB7 /* SDLAppServicesCapabilities.m */; }; + 8831FA4B2202402B00B8FFB7 /* SDLAppServicesCapabilitiesSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 8831FA4A2202402B00B8FFB7 /* SDLAppServicesCapabilitiesSpec.m */; }; + 883C22C8222ED84D00939C4C /* SDLRPCFunctionNames.h in Headers */ = {isa = PBXBuildFile; fileRef = 883C22C6222ED84D00939C4C /* SDLRPCFunctionNames.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 883C22C9222ED84D00939C4C /* SDLRPCFunctionNames.m in Sources */ = {isa = PBXBuildFile; fileRef = 883C22C7222ED84D00939C4C /* SDLRPCFunctionNames.m */; }; + 883C22CB222EEF0900939C4C /* SDLRPCFunctionNamesSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 883C22CA222EEF0900939C4C /* SDLRPCFunctionNamesSpec.m */; }; + 884554AC222453A800BAFB6C /* SDLNavigationServiceManifest.h in Headers */ = {isa = PBXBuildFile; fileRef = 884554AA222453A800BAFB6C /* SDLNavigationServiceManifest.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 884554AD222453A800BAFB6C /* SDLNavigationServiceManifest.m in Sources */ = {isa = PBXBuildFile; fileRef = 884554AB222453A800BAFB6C /* SDLNavigationServiceManifest.m */; }; + 884554AF2224554300BAFB6C /* SDLNavigationServiceManifestSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 884554AE2224554300BAFB6C /* SDLNavigationServiceManifestSpec.m */; }; + 884AF94C220B3FCC00E22928 /* SDLGetSystemCapabilitySpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 884AF94B220B3FCC00E22928 /* SDLGetSystemCapabilitySpec.m */; }; + 884AF94F220B488900E22928 /* SDLOnSystemCapabilityUpdated.h in Headers */ = {isa = PBXBuildFile; fileRef = 884AF94D220B488900E22928 /* SDLOnSystemCapabilityUpdated.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 884AF950220B488900E22928 /* SDLOnSystemCapabilityUpdated.m in Sources */ = {isa = PBXBuildFile; fileRef = 884AF94E220B488900E22928 /* SDLOnSystemCapabilityUpdated.m */; }; + 884E701B21FB8D0F008D53BA /* SDLPublishAppService.h in Headers */ = {isa = PBXBuildFile; fileRef = 884E701921FB8D0F008D53BA /* SDLPublishAppService.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 884E701C21FB8D0F008D53BA /* SDLPublishAppService.m in Sources */ = {isa = PBXBuildFile; fileRef = 884E701A21FB8D0F008D53BA /* SDLPublishAppService.m */; }; + 884E701F21FB983F008D53BA /* SDLAppServiceManifest.h in Headers */ = {isa = PBXBuildFile; fileRef = 884E701D21FB983F008D53BA /* SDLAppServiceManifest.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 884E702021FB983F008D53BA /* SDLAppServiceManifest.m in Sources */ = {isa = PBXBuildFile; fileRef = 884E701E21FB983F008D53BA /* SDLAppServiceManifest.m */; }; + 884E702321FBA952008D53BA /* SDLAppServiceType.h in Headers */ = {isa = PBXBuildFile; fileRef = 884E702121FBA952008D53BA /* SDLAppServiceType.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 884E702421FBA952008D53BA /* SDLAppServiceType.m in Sources */ = {isa = PBXBuildFile; fileRef = 884E702221FBA952008D53BA /* SDLAppServiceType.m */; }; + 884E702721FBAC5B008D53BA /* SDLServiceUpdateReason.h in Headers */ = {isa = PBXBuildFile; fileRef = 884E702521FBAC5B008D53BA /* SDLServiceUpdateReason.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 884E702821FBAC5B008D53BA /* SDLServiceUpdateReason.m in Sources */ = {isa = PBXBuildFile; fileRef = 884E702621FBAC5B008D53BA /* SDLServiceUpdateReason.m */; }; + 884E702B21FBB151008D53BA /* SDLAppServiceRecord.h in Headers */ = {isa = PBXBuildFile; fileRef = 884E702921FBB151008D53BA /* SDLAppServiceRecord.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 884E702C21FBB151008D53BA /* SDLAppServiceRecord.m in Sources */ = {isa = PBXBuildFile; fileRef = 884E702A21FBB151008D53BA /* SDLAppServiceRecord.m */; }; 8850DB601F4475D30053A48D /* TestMultipleFilesConnectionManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 8850DB5F1F4475D30053A48D /* TestMultipleFilesConnectionManager.m */; }; 8854682F2225BDAE00994D8D /* SDLHybridAppPreference.h in Headers */ = {isa = PBXBuildFile; fileRef = 8854682D2225BDAE00994D8D /* SDLHybridAppPreference.h */; settings = {ATTRIBUTES = (Public, ); }; }; 885468302225BDAE00994D8D /* SDLHybridAppPreference.m in Sources */ = {isa = PBXBuildFile; fileRef = 8854682E2225BDAE00994D8D /* SDLHybridAppPreference.m */; }; @@ -1240,6 +1279,18 @@ 885468352225C1F800994D8D /* SDLCloudAppProperties.h in Headers */ = {isa = PBXBuildFile; fileRef = 885468332225C1F800994D8D /* SDLCloudAppProperties.h */; settings = {ATTRIBUTES = (Public, ); }; }; 885468362225C1F800994D8D /* SDLCloudAppProperties.m in Sources */ = {isa = PBXBuildFile; fileRef = 885468342225C1F800994D8D /* SDLCloudAppProperties.m */; }; 885468382225CBA400994D8D /* SDLCloudAppPropertiesSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 885468372225CBA400994D8D /* SDLCloudAppPropertiesSpec.m */; }; + 8855F9E0220C93B700A5C897 /* SDLWeatherDataSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 8855F9DF220C93B700A5C897 /* SDLWeatherDataSpec.m */; }; + 8855F9E3220CB04000A5C897 /* SDLOnAppServiceData.h in Headers */ = {isa = PBXBuildFile; fileRef = 8855F9E1220CB04000A5C897 /* SDLOnAppServiceData.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 8855F9E4220CB04000A5C897 /* SDLOnAppServiceData.m in Sources */ = {isa = PBXBuildFile; fileRef = 8855F9E2220CB04000A5C897 /* SDLOnAppServiceData.m */; }; + 8855F9E6220CB60700A5C897 /* SDLOnAppServiceDataSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 8855F9E5220CB60700A5C897 /* SDLOnAppServiceDataSpec.m */; }; + 8855F9E9220CBA9200A5C897 /* SDLGetFile.h in Headers */ = {isa = PBXBuildFile; fileRef = 8855F9E7220CBA9200A5C897 /* SDLGetFile.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 8855F9EA220CBA9200A5C897 /* SDLGetFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 8855F9E8220CBA9200A5C897 /* SDLGetFile.m */; }; + 8855F9EC220CBFB700A5C897 /* SDLGetFileSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 8855F9EB220CBFB700A5C897 /* SDLGetFileSpec.m */; }; + 88665B69220B771A00D9DA77 /* SDLPerformAppServiceInteractionResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 88665B67220B771A00D9DA77 /* SDLPerformAppServiceInteractionResponse.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 88665B6A220B771A00D9DA77 /* SDLPerformAppServiceInteractionResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 88665B68220B771A00D9DA77 /* SDLPerformAppServiceInteractionResponse.m */; }; + 88665B6C220B796A00D9DA77 /* SDLPerformAppServiceInteractionResponseSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 88665B6B220B796A00D9DA77 /* SDLPerformAppServiceInteractionResponseSpec.m */; }; + 88665B73220B80F400D9DA77 /* SDLWeatherAlert.h in Headers */ = {isa = PBXBuildFile; fileRef = 88665B71220B80F400D9DA77 /* SDLWeatherAlert.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 88665B74220B80F400D9DA77 /* SDLWeatherAlert.m in Sources */ = {isa = PBXBuildFile; fileRef = 88665B72220B80F400D9DA77 /* SDLWeatherAlert.m */; }; 8877F5EB1F34A3BE00DC128A /* SDLSendHapticDataSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 8877F5EA1F34A3BE00DC128A /* SDLSendHapticDataSpec.m */; }; 8877F5EE1F34A72200DC128A /* SDLSendHapticDataResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 8877F5EC1F34A72200DC128A /* SDLSendHapticDataResponse.h */; settings = {ATTRIBUTES = (Public, ); }; }; 8877F5EF1F34A72200DC128A /* SDLSendHapticDataResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 8877F5ED1F34A72200DC128A /* SDLSendHapticDataResponse.m */; }; @@ -1264,28 +1315,79 @@ 8881AFBE2225E9BB00EA870B /* SDLGetCloudAppPropertiesResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 8881AFBC2225E9BB00EA870B /* SDLGetCloudAppPropertiesResponse.h */; settings = {ATTRIBUTES = (Public, ); }; }; 8881AFBF2225E9BB00EA870B /* SDLGetCloudAppPropertiesResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 8881AFBD2225E9BB00EA870B /* SDLGetCloudAppPropertiesResponse.m */; }; 8881AFC12225EB9300EA870B /* SDLGetCloudAppPropertiesResponseSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 8881AFC02225EB9300EA870B /* SDLGetCloudAppPropertiesResponseSpec.m */; }; + 8880D24722205B1B00964F6A /* SDLNavigationInstruction.h in Headers */ = {isa = PBXBuildFile; fileRef = 8880D24522205B1B00964F6A /* SDLNavigationInstruction.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 8880D24822205B1B00964F6A /* SDLNavigationInstruction.m in Sources */ = {isa = PBXBuildFile; fileRef = 8880D24622205B1B00964F6A /* SDLNavigationInstruction.m */; }; 8886EB982111F4FA008294A5 /* SDLFileManagerConfigurationSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 8886EB972111F4FA008294A5 /* SDLFileManagerConfigurationSpec.m */; }; + 888F86FE221DEE200052FE4C /* SDLAsynchronousRPCOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 888F86FD221DEE1F0052FE4C /* SDLAsynchronousRPCOperation.m */; }; + 888F8700221DF4880052FE4C /* SDLAsynchronousRPCOperationSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 888F86FF221DF4880052FE4C /* SDLAsynchronousRPCOperationSpec.m */; }; 88A1CF1E21669AC7001ACC75 /* SDLLifecycleConfigurationUpdateSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 88A1CF1D21669AC7001ACC75 /* SDLLifecycleConfigurationUpdateSpec.m */; }; + 88A4A0FA22242AB400C6F01D /* SDLNavigationServiceDataSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 88A4A0F922242AB400C6F01D /* SDLNavigationServiceDataSpec.m */; }; + 88A5E7F4220B57F900495E8A /* SDLOnSystemCapabilityUpdatedSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 88A5E7F3220B57F900495E8A /* SDLOnSystemCapabilityUpdatedSpec.m */; }; + 88A5E7F7220B5BBC00495E8A /* SDLGetAppServiceData.h in Headers */ = {isa = PBXBuildFile; fileRef = 88A5E7F5220B5BBC00495E8A /* SDLGetAppServiceData.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 88A5E7F8220B5BBC00495E8A /* SDLGetAppServiceData.m in Sources */ = {isa = PBXBuildFile; fileRef = 88A5E7F6220B5BBC00495E8A /* SDLGetAppServiceData.m */; }; + 88A5E7FA220B60EC00495E8A /* SDLGetAppServiceDataSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 88A5E7F9220B60EC00495E8A /* SDLGetAppServiceDataSpec.m */; }; + 88A5E7FD220B642200495E8A /* SDLGetAppServiceDataResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 88A5E7FB220B642200495E8A /* SDLGetAppServiceDataResponse.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 88A5E7FE220B642200495E8A /* SDLGetAppServiceDataResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 88A5E7FC220B642200495E8A /* SDLGetAppServiceDataResponse.m */; }; 88A795D22106787400056542 /* SDLStaticIconName.h in Headers */ = {isa = PBXBuildFile; fileRef = 88A795D02106787400056542 /* SDLStaticIconName.h */; settings = {ATTRIBUTES = (Public, ); }; }; 88A795D32106787400056542 /* SDLStaticIconName.m in Sources */ = {isa = PBXBuildFile; fileRef = 88A795D12106787400056542 /* SDLStaticIconName.m */; }; 88A795D5210678E000056542 /* SDLStaticIconNameSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 88A795D4210678E000056542 /* SDLStaticIconNameSpec.m */; }; + 88A7A3C6220CCEA100A9E435 /* SDLGetFileResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 88A7A3C4220CCEA100A9E435 /* SDLGetFileResponse.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 88A7A3C7220CCEA100A9E435 /* SDLGetFileResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 88A7A3C5220CCEA100A9E435 /* SDLGetFileResponse.m */; }; + 88A81F6C2200FD4A00A691A9 /* SDLAppServiceRecordSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 88A81F6B2200FD4A00A691A9 /* SDLAppServiceRecordSpec.m */; }; + 88AAD4BC2211B76800F1E6D7 /* SDLMediaServiceManifest.h in Headers */ = {isa = PBXBuildFile; fileRef = 88AAD4BA2211B76800F1E6D7 /* SDLMediaServiceManifest.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 88AAD4BD2211B76800F1E6D7 /* SDLMediaServiceManifest.m in Sources */ = {isa = PBXBuildFile; fileRef = 88AAD4BB2211B76800F1E6D7 /* SDLMediaServiceManifest.m */; }; + 88AAD4C02211B7E200F1E6D7 /* SDLMediaServiceManifestSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 88AAD4BF2211B7E200F1E6D7 /* SDLMediaServiceManifestSpec.m */; }; + 88AF11D9220B66FD00A59985 /* SDLGetAppServiceDataResponseSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 88AF11D8220B66FD00A59985 /* SDLGetAppServiceDataResponseSpec.m */; }; + 88AF11DC220B6B3D00A59985 /* SDLPerformAppServiceInteraction.h in Headers */ = {isa = PBXBuildFile; fileRef = 88AF11DA220B6B3D00A59985 /* SDLPerformAppServiceInteraction.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 88AF11DD220B6B3D00A59985 /* SDLPerformAppServiceInteraction.m in Sources */ = {isa = PBXBuildFile; fileRef = 88AF11DB220B6B3D00A59985 /* SDLPerformAppServiceInteraction.m */; }; 88B3BF9820DA859800943565 /* SDLFuelType.h in Headers */ = {isa = PBXBuildFile; fileRef = 88B3BF9620DA859800943565 /* SDLFuelType.h */; settings = {ATTRIBUTES = (Public, ); }; }; 88B3BF9920DA859800943565 /* SDLFuelType.m in Sources */ = {isa = PBXBuildFile; fileRef = 88B3BF9720DA859800943565 /* SDLFuelType.m */; }; 88B3BF9C20DA8BBC00943565 /* SDLFuelRange.h in Headers */ = {isa = PBXBuildFile; fileRef = 88B3BF9A20DA8BBC00943565 /* SDLFuelRange.h */; settings = {ATTRIBUTES = (Public, ); }; }; 88B3BF9D20DA8BBC00943565 /* SDLFuelRange.m in Sources */ = {isa = PBXBuildFile; fileRef = 88B3BF9B20DA8BBC00943565 /* SDLFuelRange.m */; }; 88B3BFA020DA8FD000943565 /* SDLFuelTypeSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 88B3BF9F20DA8FD000943565 /* SDLFuelTypeSpec.m */; }; 88B3BFA220DA911E00943565 /* SDLFuelRangeSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 88B3BFA120DA911E00943565 /* SDLFuelRangeSpec.m */; }; + 88B58DBA222040FF0011B063 /* SDLDirection.h in Headers */ = {isa = PBXBuildFile; fileRef = 88B58DB8222040FF0011B063 /* SDLDirection.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 88B58DBB222040FF0011B063 /* SDLDirection.m in Sources */ = {isa = PBXBuildFile; fileRef = 88B58DB9222040FF0011B063 /* SDLDirection.m */; }; + 88B58DBD222042500011B063 /* SDLDirectionSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 88B58DBC222042500011B063 /* SDLDirectionSpec.m */; }; + 88B58DC0222045320011B063 /* SDLNavigationJunction.h in Headers */ = {isa = PBXBuildFile; fileRef = 88B58DBE222045320011B063 /* SDLNavigationJunction.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 88B58DC1222045320011B063 /* SDLNavigationJunction.m in Sources */ = {isa = PBXBuildFile; fileRef = 88B58DBF222045320011B063 /* SDLNavigationJunction.m */; }; + 88B58DC3222047F50011B063 /* SDLNavigationJunctionSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 88B58DC2222047F50011B063 /* SDLNavigationJunctionSpec.m */; }; + 88B58DC622204AF10011B063 /* SDLNavigationAction.h in Headers */ = {isa = PBXBuildFile; fileRef = 88B58DC422204AF10011B063 /* SDLNavigationAction.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 88B58DC722204AF10011B063 /* SDLNavigationAction.m in Sources */ = {isa = PBXBuildFile; fileRef = 88B58DC522204AF10011B063 /* SDLNavigationAction.m */; }; + 88B58DC922204C9E0011B063 /* SDLNavigationActionSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 88B58DC822204C9E0011B063 /* SDLNavigationActionSpec.m */; }; 88B848C31F45E1A600DED768 /* TestResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 88B848C21F45E1A600DED768 /* TestResponse.m */; }; 88B848C91F462E3600DED768 /* TestFileProgressResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 88B848C81F462E3600DED768 /* TestFileProgressResponse.m */; }; + 88C23E8822297C6000EA171F /* SDLRPCResponseNotificationSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 88C23E8722297C6000EA171F /* SDLRPCResponseNotificationSpec.m */; }; + 88C23E8A22297DE400EA171F /* SDLRPCNotificationNotificationSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 88C23E8922297DE400EA171F /* SDLRPCNotificationNotificationSpec.m */; }; + 88C282CA220CD17200D02F90 /* SDLGetFileResponseSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 88C282C9220CD17200D02F90 /* SDLGetFileResponseSpec.m */; }; + 88C37F632204EBF000901DC6 /* SDLAppServiceData.h in Headers */ = {isa = PBXBuildFile; fileRef = 88C37F612204EBF000901DC6 /* SDLAppServiceData.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 88C37F642204EBF000901DC6 /* SDLAppServiceData.m in Sources */ = {isa = PBXBuildFile; fileRef = 88C37F622204EBF000901DC6 /* SDLAppServiceData.m */; }; 88D2AAE41F682BB20078D5B2 /* SDLLogConstantsSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 88D2AAE31F682BB20078D5B2 /* SDLLogConstantsSpec.m */; }; + 88D5EB37220CD95000EC3782 /* SDLWeatherServiceData.h in Headers */ = {isa = PBXBuildFile; fileRef = 88D5EB35220CD95000EC3782 /* SDLWeatherServiceData.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 88D5EB38220CD95000EC3782 /* SDLWeatherServiceData.m in Sources */ = {isa = PBXBuildFile; fileRef = 88D5EB36220CD95000EC3782 /* SDLWeatherServiceData.m */; }; 88DF998D22035CC600477AC1 /* EAAccessory+OCMock.m in Sources */ = {isa = PBXBuildFile; fileRef = 88DF998C22035CC600477AC1 /* EAAccessory+OCMock.m */; }; 88DF998F22035D1700477AC1 /* SDLIAPSessionSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 88DF998E22035D1700477AC1 /* SDLIAPSessionSpec.m */; }; 88DF999122035D5A00477AC1 /* SDLIAPTransportSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 88DF999022035D5A00477AC1 /* SDLIAPTransportSpec.m */; }; + 88E6F1A7220E1588006156F9 /* SDLMediaType.h in Headers */ = {isa = PBXBuildFile; fileRef = 88E6F1A5220E1588006156F9 /* SDLMediaType.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 88E6F1A8220E1588006156F9 /* SDLMediaType.m in Sources */ = {isa = PBXBuildFile; fileRef = 88E6F1A6220E1588006156F9 /* SDLMediaType.m */; }; + 88E6F1AA220E1720006156F9 /* SDLMediaTypeSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 88E6F1A9220E1720006156F9 /* SDLMediaTypeSpec.m */; }; + 88E6F1AD220E19DF006156F9 /* SDLMediaServiceData.h in Headers */ = {isa = PBXBuildFile; fileRef = 88E6F1AB220E19DF006156F9 /* SDLMediaServiceData.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 88E6F1AE220E19DF006156F9 /* SDLMediaServiceData.m in Sources */ = {isa = PBXBuildFile; fileRef = 88E6F1AC220E19DF006156F9 /* SDLMediaServiceData.m */; }; + 88E6F1B0220E25B2006156F9 /* SDLMediaServiceDataSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 88E6F1AF220E25B2006156F9 /* SDLMediaServiceDataSpec.m */; }; + 88EEC5B8220A2144005AA2F9 /* SDLPublishAppServiceSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 88EEC5B7220A2144005AA2F9 /* SDLPublishAppServiceSpec.m */; }; + 88EEC5BB220A327B005AA2F9 /* SDLPublishAppServiceResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 88EEC5B9220A327B005AA2F9 /* SDLPublishAppServiceResponse.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 88EEC5BC220A327B005AA2F9 /* SDLPublishAppServiceResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 88EEC5BA220A327B005AA2F9 /* SDLPublishAppServiceResponse.m */; }; + 88EEC5BE220A3B8B005AA2F9 /* SDLPublishAppServiceResponseSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 88EEC5BD220A3B8B005AA2F9 /* SDLPublishAppServiceResponseSpec.m */; }; 88EED8381F33AE1700E6C42E /* SDLHapticRect.h in Headers */ = {isa = PBXBuildFile; fileRef = 88EED8361F33AE1700E6C42E /* SDLHapticRect.h */; settings = {ATTRIBUTES = (Public, ); }; }; 88EED8391F33AE1700E6C42E /* SDLHapticRect.m in Sources */ = {isa = PBXBuildFile; fileRef = 88EED8371F33AE1700E6C42E /* SDLHapticRect.m */; }; 88EED83B1F33BECB00E6C42E /* SDLHapticRectSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 88EED83A1F33BECB00E6C42E /* SDLHapticRectSpec.m */; }; 88EED83E1F33C5A400E6C42E /* SDLSendHapticData.h in Headers */ = {isa = PBXBuildFile; fileRef = 88EED83C1F33C5A400E6C42E /* SDLSendHapticData.h */; settings = {ATTRIBUTES = (Public, ); }; }; 88EED83F1F33C5A400E6C42E /* SDLSendHapticData.m in Sources */ = {isa = PBXBuildFile; fileRef = 88EED83D1F33C5A400E6C42E /* SDLSendHapticData.m */; }; + 88F50D5F220B720E00F34648 /* SDLPerformAppServiceInteractionSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 88F50D5E220B720E00F34648 /* SDLPerformAppServiceInteractionSpec.m */; }; + 88F65133220C6DC300CAF321 /* SDLWeatherAlertSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 88F65132220C6DC300CAF321 /* SDLWeatherAlertSpec.m */; }; + 88F65136220C74FD00CAF321 /* SDLWeatherData.h in Headers */ = {isa = PBXBuildFile; fileRef = 88F65134220C74FD00CAF321 /* SDLWeatherData.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 88F65137220C74FD00CAF321 /* SDLWeatherData.m in Sources */ = {isa = PBXBuildFile; fileRef = 88F65135220C74FD00CAF321 /* SDLWeatherData.m */; }; + 88F89103221DE29A00E056AD /* SDLAsynchronousRPCOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = 88F89101221DE29A00E056AD /* SDLAsynchronousRPCOperation.h */; }; 8B7B319A1F2F7B5700BDC38D /* SDLVideoStreamingCodec.h in Headers */ = {isa = PBXBuildFile; fileRef = 8B7B31981F2F7B5700BDC38D /* SDLVideoStreamingCodec.h */; settings = {ATTRIBUTES = (Public, ); }; }; 8B7B319B1F2F7B5700BDC38D /* SDLVideoStreamingCodec.m in Sources */ = {isa = PBXBuildFile; fileRef = 8B7B31991F2F7B5700BDC38D /* SDLVideoStreamingCodec.m */; }; 8B7B319E1F2F7CF700BDC38D /* SDLVideoStreamingProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 8B7B319C1F2F7CF700BDC38D /* SDLVideoStreamingProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -1306,7 +1408,7 @@ 8BBEA6091F324832003EEA26 /* SDLMetadataTypeSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 8BBEA6081F324832003EEA26 /* SDLMetadataTypeSpec.m */; }; 97E26DEC1E807AD70074A3C7 /* SDLMutableDataQueue.h in Headers */ = {isa = PBXBuildFile; fileRef = 97E26DEA1E807AD70074A3C7 /* SDLMutableDataQueue.h */; }; 97E26DED1E807AD70074A3C7 /* SDLMutableDataQueue.m in Sources */ = {isa = PBXBuildFile; fileRef = 97E26DEB1E807AD70074A3C7 /* SDLMutableDataQueue.m */; }; - DA0C46AD1DCD35080001F2A8 /* SDLNames.m in Sources */ = {isa = PBXBuildFile; fileRef = DA0C46AC1DCD35080001F2A8 /* SDLNames.m */; }; + DA0C46AD1DCD35080001F2A8 /* SDLRPCParameterNames.m in Sources */ = {isa = PBXBuildFile; fileRef = DA0C46AC1DCD35080001F2A8 /* SDLRPCParameterNames.m */; }; DA0C46AF1DCD41E30001F2A8 /* SDLMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = DA0C46AE1DCD41E30001F2A8 /* SDLMacros.h */; settings = {ATTRIBUTES = (Public, ); }; }; DA318C1F1DD0F06C00C035AC /* NSMutableDictionary+Store.h in Headers */ = {isa = PBXBuildFile; fileRef = DA318C1D1DD0F06C00C035AC /* NSMutableDictionary+Store.h */; }; DA318C201DD0F06C00C035AC /* NSMutableDictionary+Store.m in Sources */ = {isa = PBXBuildFile; fileRef = DA318C1E1DD0F06C00C035AC /* NSMutableDictionary+Store.m */; }; @@ -2251,7 +2353,7 @@ 5D61FB0C1A84238A00846EE7 /* SDLMenuParams.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLMenuParams.m; sourceTree = "<group>"; }; 5D61FB0D1A84238A00846EE7 /* SDLMyKey.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLMyKey.h; sourceTree = "<group>"; }; 5D61FB0E1A84238A00846EE7 /* SDLMyKey.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLMyKey.m; sourceTree = "<group>"; }; - 5D61FB0F1A84238A00846EE7 /* SDLNames.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLNames.h; sourceTree = "<group>"; }; + 5D61FB0F1A84238A00846EE7 /* SDLRPCParameterNames.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLRPCParameterNames.h; sourceTree = "<group>"; }; 5D61FB101A84238A00846EE7 /* SDLObjectWithPriority.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLObjectWithPriority.h; sourceTree = "<group>"; }; 5D61FB111A84238A00846EE7 /* SDLObjectWithPriority.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLObjectWithPriority.m; sourceTree = "<group>"; }; 5D61FB121A84238B00846EE7 /* SDLOnAppInterfaceUnregistered.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLOnAppInterfaceUnregistered.h; sourceTree = "<group>"; }; @@ -2679,8 +2781,8 @@ 5DB9965B1F268F97002D8795 /* SDLControlFramePayloadVideoStartService.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLControlFramePayloadVideoStartService.m; sourceTree = "<group>"; }; 5DB9965E1F28C6ED002D8795 /* SDLControlFramePayloadVideoStartServiceAck.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLControlFramePayloadVideoStartServiceAck.h; sourceTree = "<group>"; }; 5DB9965F1F28C6ED002D8795 /* SDLControlFramePayloadVideoStartServiceAck.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLControlFramePayloadVideoStartServiceAck.m; sourceTree = "<group>"; }; - 5DBAE0AA1D3588AC00CE00BF /* SDLNotificationDispatcherSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SDLNotificationDispatcherSpec.m; path = DevAPISpecs/SDLNotificationDispatcherSpec.m; sourceTree = "<group>"; }; - 5DBAE0AC1D368D1A00CE00BF /* SDLResponseDispatcherSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SDLResponseDispatcherSpec.m; path = DevAPISpecs/SDLResponseDispatcherSpec.m; sourceTree = "<group>"; }; + 5DBAE0AA1D3588AC00CE00BF /* SDLNotificationDispatcherSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLNotificationDispatcherSpec.m; sourceTree = "<group>"; }; + 5DBAE0AC1D368D1A00CE00BF /* SDLResponseDispatcherSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLResponseDispatcherSpec.m; sourceTree = "<group>"; }; 5DBEFA531F434B9E009EE295 /* SDLStreamingMediaConfigurationSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SDLStreamingMediaConfigurationSpec.m; path = DevAPISpecs/SDLStreamingMediaConfigurationSpec.m; sourceTree = "<group>"; }; 5DBEFA561F436132009EE295 /* SDLFakeSecurityManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDLFakeSecurityManager.h; path = DevAPISpecs/SDLFakeSecurityManager.h; sourceTree = "<group>"; }; 5DBEFA571F436132009EE295 /* SDLFakeSecurityManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SDLFakeSecurityManager.m; path = DevAPISpecs/SDLFakeSecurityManager.m; sourceTree = "<group>"; }; @@ -2751,13 +2853,49 @@ 5DFFB9141BD7C89700DB3F04 /* SDLConnectionManagerType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLConnectionManagerType.h; sourceTree = "<group>"; }; 880245A220F79C3400ED195B /* SDLFileManagerConfiguration.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDLFileManagerConfiguration.h; sourceTree = "<group>"; }; 880245A320F79C3400ED195B /* SDLFileManagerConfiguration.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLFileManagerConfiguration.m; sourceTree = "<group>"; }; + 880D2679220DDD1000B3F496 /* SDLWeatherServiceDataSpec.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLWeatherServiceDataSpec.m; sourceTree = "<group>"; }; + 880D267B220DE5DF00B3F496 /* SDLWeatherServiceManifest.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDLWeatherServiceManifest.h; sourceTree = "<group>"; }; + 880D267C220DE5DF00B3F496 /* SDLWeatherServiceManifest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLWeatherServiceManifest.m; sourceTree = "<group>"; }; + 880D267F220E038800B3F496 /* SDLWeatherServiceManifestSpec.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLWeatherServiceManifestSpec.m; sourceTree = "<group>"; }; 880E35B22088F75A00181259 /* SDLSystemCapabilityManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLSystemCapabilityManager.m; sourceTree = "<group>"; }; 880E35B32088F75A00181259 /* SDLSystemCapabilityManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLSystemCapabilityManager.h; sourceTree = "<group>"; }; 880E35B72088F78E00181259 /* SDLSystemCapabilityManagerSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLSystemCapabilityManagerSpec.m; sourceTree = "<group>"; }; + 8816772822208B82001FACFF /* SDLNavigationInstructionSpec.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLNavigationInstructionSpec.m; sourceTree = "<group>"; }; + 8816772A222097C3001FACFF /* SDLNavigationServiceData.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDLNavigationServiceData.h; sourceTree = "<group>"; }; + 8816772B222097C3001FACFF /* SDLNavigationServiceData.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLNavigationServiceData.m; sourceTree = "<group>"; }; 8818ADD62100FC18007D6F19 /* SDLTurnSignal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDLTurnSignal.h; sourceTree = "<group>"; }; 8818ADD72100FC18007D6F19 /* SDLTurnSignal.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLTurnSignal.m; sourceTree = "<group>"; }; 8818ADDC2100FE0C007D6F19 /* SDLTurnSignalSpec.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLTurnSignalSpec.m; sourceTree = "<group>"; }; 88295697207CF68800EF056C /* SDL Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; name = "SDL Example.app"; path = "SDL Example Swift.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + 882FAC4C2209D7EF0062385D /* SDLAppServiceDataSpec.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLAppServiceDataSpec.m; sourceTree = "<group>"; }; + 8831FA382201E3D100B8FFB7 /* SDLAppServiceManifestSpec.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLAppServiceManifestSpec.m; sourceTree = "<group>"; }; + 8831FA3C220207DA00B8FFB7 /* SDLServiceUpdateReasonSpec.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLServiceUpdateReasonSpec.m; sourceTree = "<group>"; }; + 8831FA3E2202227000B8FFB7 /* SDLAppServiceTypeSpec.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLAppServiceTypeSpec.m; sourceTree = "<group>"; }; + 8831FA4022022AB300B8FFB7 /* SDLAppServiceCapability.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDLAppServiceCapability.h; sourceTree = "<group>"; }; + 8831FA4122022AB300B8FFB7 /* SDLAppServiceCapability.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLAppServiceCapability.m; sourceTree = "<group>"; }; + 8831FA442202307500B8FFB7 /* SDLAppServiceCapabilitySpec.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLAppServiceCapabilitySpec.m; sourceTree = "<group>"; }; + 8831FA46220235B000B8FFB7 /* SDLAppServicesCapabilities.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDLAppServicesCapabilities.h; sourceTree = "<group>"; }; + 8831FA47220235B000B8FFB7 /* SDLAppServicesCapabilities.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLAppServicesCapabilities.m; sourceTree = "<group>"; }; + 8831FA4A2202402B00B8FFB7 /* SDLAppServicesCapabilitiesSpec.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLAppServicesCapabilitiesSpec.m; sourceTree = "<group>"; }; + 883C22C6222ED84D00939C4C /* SDLRPCFunctionNames.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDLRPCFunctionNames.h; sourceTree = "<group>"; }; + 883C22C7222ED84D00939C4C /* SDLRPCFunctionNames.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLRPCFunctionNames.m; sourceTree = "<group>"; }; + 883C22CA222EEF0900939C4C /* SDLRPCFunctionNamesSpec.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLRPCFunctionNamesSpec.m; sourceTree = "<group>"; }; + 884554AA222453A800BAFB6C /* SDLNavigationServiceManifest.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDLNavigationServiceManifest.h; sourceTree = "<group>"; }; + 884554AB222453A800BAFB6C /* SDLNavigationServiceManifest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLNavigationServiceManifest.m; sourceTree = "<group>"; }; + 884554AE2224554300BAFB6C /* SDLNavigationServiceManifestSpec.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLNavigationServiceManifestSpec.m; sourceTree = "<group>"; }; + 884AF94B220B3FCC00E22928 /* SDLGetSystemCapabilitySpec.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLGetSystemCapabilitySpec.m; sourceTree = "<group>"; }; + 884AF94D220B488900E22928 /* SDLOnSystemCapabilityUpdated.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDLOnSystemCapabilityUpdated.h; sourceTree = "<group>"; }; + 884AF94E220B488900E22928 /* SDLOnSystemCapabilityUpdated.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLOnSystemCapabilityUpdated.m; sourceTree = "<group>"; }; + 884E701921FB8D0F008D53BA /* SDLPublishAppService.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDLPublishAppService.h; sourceTree = "<group>"; }; + 884E701A21FB8D0F008D53BA /* SDLPublishAppService.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLPublishAppService.m; sourceTree = "<group>"; }; + 884E701D21FB983F008D53BA /* SDLAppServiceManifest.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDLAppServiceManifest.h; sourceTree = "<group>"; }; + 884E701E21FB983F008D53BA /* SDLAppServiceManifest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLAppServiceManifest.m; sourceTree = "<group>"; }; + 884E702121FBA952008D53BA /* SDLAppServiceType.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDLAppServiceType.h; sourceTree = "<group>"; }; + 884E702221FBA952008D53BA /* SDLAppServiceType.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLAppServiceType.m; sourceTree = "<group>"; }; + 884E702521FBAC5B008D53BA /* SDLServiceUpdateReason.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDLServiceUpdateReason.h; sourceTree = "<group>"; }; + 884E702621FBAC5B008D53BA /* SDLServiceUpdateReason.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLServiceUpdateReason.m; sourceTree = "<group>"; }; + 884E702921FBB151008D53BA /* SDLAppServiceRecord.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDLAppServiceRecord.h; sourceTree = "<group>"; }; + 884E702A21FBB151008D53BA /* SDLAppServiceRecord.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLAppServiceRecord.m; sourceTree = "<group>"; }; 8850DB5E1F4475D30053A48D /* TestMultipleFilesConnectionManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TestMultipleFilesConnectionManager.h; sourceTree = "<group>"; }; 8850DB5F1F4475D30053A48D /* TestMultipleFilesConnectionManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TestMultipleFilesConnectionManager.m; sourceTree = "<group>"; }; 8854682D2225BDAE00994D8D /* SDLHybridAppPreference.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDLHybridAppPreference.h; sourceTree = "<group>"; }; @@ -2766,6 +2904,18 @@ 885468332225C1F800994D8D /* SDLCloudAppProperties.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDLCloudAppProperties.h; sourceTree = "<group>"; }; 885468342225C1F800994D8D /* SDLCloudAppProperties.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLCloudAppProperties.m; sourceTree = "<group>"; }; 885468372225CBA400994D8D /* SDLCloudAppPropertiesSpec.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLCloudAppPropertiesSpec.m; sourceTree = "<group>"; }; + 8855F9DF220C93B700A5C897 /* SDLWeatherDataSpec.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLWeatherDataSpec.m; sourceTree = "<group>"; }; + 8855F9E1220CB04000A5C897 /* SDLOnAppServiceData.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDLOnAppServiceData.h; sourceTree = "<group>"; }; + 8855F9E2220CB04000A5C897 /* SDLOnAppServiceData.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLOnAppServiceData.m; sourceTree = "<group>"; }; + 8855F9E5220CB60700A5C897 /* SDLOnAppServiceDataSpec.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLOnAppServiceDataSpec.m; sourceTree = "<group>"; }; + 8855F9E7220CBA9200A5C897 /* SDLGetFile.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDLGetFile.h; sourceTree = "<group>"; }; + 8855F9E8220CBA9200A5C897 /* SDLGetFile.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLGetFile.m; sourceTree = "<group>"; }; + 8855F9EB220CBFB700A5C897 /* SDLGetFileSpec.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLGetFileSpec.m; sourceTree = "<group>"; }; + 88665B67220B771A00D9DA77 /* SDLPerformAppServiceInteractionResponse.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDLPerformAppServiceInteractionResponse.h; sourceTree = "<group>"; }; + 88665B68220B771A00D9DA77 /* SDLPerformAppServiceInteractionResponse.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLPerformAppServiceInteractionResponse.m; sourceTree = "<group>"; }; + 88665B6B220B796A00D9DA77 /* SDLPerformAppServiceInteractionResponseSpec.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLPerformAppServiceInteractionResponseSpec.m; sourceTree = "<group>"; }; + 88665B71220B80F400D9DA77 /* SDLWeatherAlert.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDLWeatherAlert.h; sourceTree = "<group>"; }; + 88665B72220B80F400D9DA77 /* SDLWeatherAlert.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLWeatherAlert.m; sourceTree = "<group>"; }; 8877F5EA1F34A3BE00DC128A /* SDLSendHapticDataSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLSendHapticDataSpec.m; sourceTree = "<group>"; }; 8877F5EC1F34A72200DC128A /* SDLSendHapticDataResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLSendHapticDataResponse.h; sourceTree = "<group>"; }; 8877F5ED1F34A72200DC128A /* SDLSendHapticDataResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLSendHapticDataResponse.m; sourceTree = "<group>"; }; @@ -2784,30 +2934,84 @@ 8881AFBC2225E9BB00EA870B /* SDLGetCloudAppPropertiesResponse.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDLGetCloudAppPropertiesResponse.h; sourceTree = "<group>"; }; 8881AFBD2225E9BB00EA870B /* SDLGetCloudAppPropertiesResponse.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLGetCloudAppPropertiesResponse.m; sourceTree = "<group>"; }; 8881AFC02225EB9300EA870B /* SDLGetCloudAppPropertiesResponseSpec.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLGetCloudAppPropertiesResponseSpec.m; sourceTree = "<group>"; }; + 8880D24522205B1B00964F6A /* SDLNavigationInstruction.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDLNavigationInstruction.h; sourceTree = "<group>"; }; + 8880D24622205B1B00964F6A /* SDLNavigationInstruction.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLNavigationInstruction.m; sourceTree = "<group>"; }; 8886EB972111F4FA008294A5 /* SDLFileManagerConfigurationSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLFileManagerConfigurationSpec.m; sourceTree = "<group>"; }; + 888F86FD221DEE1F0052FE4C /* SDLAsynchronousRPCOperation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLAsynchronousRPCOperation.m; sourceTree = "<group>"; }; + 888F86FF221DF4880052FE4C /* SDLAsynchronousRPCOperationSpec.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLAsynchronousRPCOperationSpec.m; sourceTree = "<group>"; }; 88A1CF1D21669AC7001ACC75 /* SDLLifecycleConfigurationUpdateSpec.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLLifecycleConfigurationUpdateSpec.m; sourceTree = "<group>"; }; + 88A4A0F922242AB400C6F01D /* SDLNavigationServiceDataSpec.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLNavigationServiceDataSpec.m; sourceTree = "<group>"; }; + 88A5E7F3220B57F900495E8A /* SDLOnSystemCapabilityUpdatedSpec.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLOnSystemCapabilityUpdatedSpec.m; sourceTree = "<group>"; }; + 88A5E7F5220B5BBC00495E8A /* SDLGetAppServiceData.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDLGetAppServiceData.h; sourceTree = "<group>"; }; + 88A5E7F6220B5BBC00495E8A /* SDLGetAppServiceData.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLGetAppServiceData.m; sourceTree = "<group>"; }; + 88A5E7F9220B60EC00495E8A /* SDLGetAppServiceDataSpec.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLGetAppServiceDataSpec.m; sourceTree = "<group>"; }; + 88A5E7FB220B642200495E8A /* SDLGetAppServiceDataResponse.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDLGetAppServiceDataResponse.h; sourceTree = "<group>"; }; + 88A5E7FC220B642200495E8A /* SDLGetAppServiceDataResponse.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLGetAppServiceDataResponse.m; sourceTree = "<group>"; }; 88A795D02106787400056542 /* SDLStaticIconName.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDLStaticIconName.h; sourceTree = "<group>"; }; 88A795D12106787400056542 /* SDLStaticIconName.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLStaticIconName.m; sourceTree = "<group>"; }; 88A795D4210678E000056542 /* SDLStaticIconNameSpec.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLStaticIconNameSpec.m; sourceTree = "<group>"; }; + 88A7A3C4220CCEA100A9E435 /* SDLGetFileResponse.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDLGetFileResponse.h; sourceTree = "<group>"; }; + 88A7A3C5220CCEA100A9E435 /* SDLGetFileResponse.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLGetFileResponse.m; sourceTree = "<group>"; }; + 88A81F6B2200FD4A00A691A9 /* SDLAppServiceRecordSpec.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLAppServiceRecordSpec.m; sourceTree = "<group>"; }; + 88AAD4BA2211B76800F1E6D7 /* SDLMediaServiceManifest.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDLMediaServiceManifest.h; sourceTree = "<group>"; }; + 88AAD4BB2211B76800F1E6D7 /* SDLMediaServiceManifest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLMediaServiceManifest.m; sourceTree = "<group>"; }; + 88AAD4BF2211B7E200F1E6D7 /* SDLMediaServiceManifestSpec.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLMediaServiceManifestSpec.m; sourceTree = "<group>"; }; + 88AF11D8220B66FD00A59985 /* SDLGetAppServiceDataResponseSpec.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLGetAppServiceDataResponseSpec.m; sourceTree = "<group>"; }; + 88AF11DA220B6B3D00A59985 /* SDLPerformAppServiceInteraction.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDLPerformAppServiceInteraction.h; sourceTree = "<group>"; }; + 88AF11DB220B6B3D00A59985 /* SDLPerformAppServiceInteraction.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLPerformAppServiceInteraction.m; sourceTree = "<group>"; }; 88B3BF9620DA859800943565 /* SDLFuelType.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDLFuelType.h; sourceTree = "<group>"; }; 88B3BF9720DA859800943565 /* SDLFuelType.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLFuelType.m; sourceTree = "<group>"; }; 88B3BF9A20DA8BBC00943565 /* SDLFuelRange.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDLFuelRange.h; sourceTree = "<group>"; }; 88B3BF9B20DA8BBC00943565 /* SDLFuelRange.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLFuelRange.m; sourceTree = "<group>"; }; 88B3BF9F20DA8FD000943565 /* SDLFuelTypeSpec.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLFuelTypeSpec.m; sourceTree = "<group>"; }; 88B3BFA120DA911E00943565 /* SDLFuelRangeSpec.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLFuelRangeSpec.m; sourceTree = "<group>"; }; + 88B58DB8222040FF0011B063 /* SDLDirection.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDLDirection.h; sourceTree = "<group>"; }; + 88B58DB9222040FF0011B063 /* SDLDirection.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLDirection.m; sourceTree = "<group>"; }; + 88B58DBC222042500011B063 /* SDLDirectionSpec.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLDirectionSpec.m; sourceTree = "<group>"; }; + 88B58DBE222045320011B063 /* SDLNavigationJunction.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDLNavigationJunction.h; sourceTree = "<group>"; }; + 88B58DBF222045320011B063 /* SDLNavigationJunction.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLNavigationJunction.m; sourceTree = "<group>"; }; + 88B58DC2222047F50011B063 /* SDLNavigationJunctionSpec.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLNavigationJunctionSpec.m; sourceTree = "<group>"; }; + 88B58DC422204AF10011B063 /* SDLNavigationAction.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDLNavigationAction.h; sourceTree = "<group>"; }; + 88B58DC522204AF10011B063 /* SDLNavigationAction.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLNavigationAction.m; sourceTree = "<group>"; }; + 88B58DC822204C9E0011B063 /* SDLNavigationActionSpec.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLNavigationActionSpec.m; sourceTree = "<group>"; }; 88B848C11F45E1A600DED768 /* TestResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TestResponse.h; sourceTree = "<group>"; }; 88B848C21F45E1A600DED768 /* TestResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TestResponse.m; sourceTree = "<group>"; }; 88B848C71F462E3600DED768 /* TestFileProgressResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TestFileProgressResponse.h; sourceTree = "<group>"; }; 88B848C81F462E3600DED768 /* TestFileProgressResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TestFileProgressResponse.m; sourceTree = "<group>"; }; + 88C23E8522297BD500EA171F /* SDLRPCRequestNotificationSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLRPCRequestNotificationSpec.m; sourceTree = "<group>"; }; + 88C23E8722297C6000EA171F /* SDLRPCResponseNotificationSpec.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLRPCResponseNotificationSpec.m; sourceTree = "<group>"; }; + 88C23E8922297DE400EA171F /* SDLRPCNotificationNotificationSpec.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLRPCNotificationNotificationSpec.m; sourceTree = "<group>"; }; + 88C282C9220CD17200D02F90 /* SDLGetFileResponseSpec.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLGetFileResponseSpec.m; sourceTree = "<group>"; }; + 88C37F612204EBF000901DC6 /* SDLAppServiceData.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDLAppServiceData.h; sourceTree = "<group>"; }; + 88C37F622204EBF000901DC6 /* SDLAppServiceData.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLAppServiceData.m; sourceTree = "<group>"; }; 88D2AAE31F682BB20078D5B2 /* SDLLogConstantsSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLLogConstantsSpec.m; sourceTree = "<group>"; }; + 88D5EB35220CD95000EC3782 /* SDLWeatherServiceData.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDLWeatherServiceData.h; sourceTree = "<group>"; }; + 88D5EB36220CD95000EC3782 /* SDLWeatherServiceData.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLWeatherServiceData.m; sourceTree = "<group>"; }; + 88D6F17D22319FE000D4BFB3 /* SDLRPCRequestNotification.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLRPCRequestNotification.m; sourceTree = "<group>"; }; + 88D6F17E22319FE000D4BFB3 /* SDLRPCRequestNotification.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDLRPCRequestNotification.h; sourceTree = "<group>"; }; 88DF998C22035CC600477AC1 /* EAAccessory+OCMock.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "EAAccessory+OCMock.m"; sourceTree = "<group>"; }; 88DF998E22035D1700477AC1 /* SDLIAPSessionSpec.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLIAPSessionSpec.m; sourceTree = "<group>"; }; 88DF999022035D5A00477AC1 /* SDLIAPTransportSpec.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLIAPTransportSpec.m; sourceTree = "<group>"; }; + 88E6F1A5220E1588006156F9 /* SDLMediaType.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDLMediaType.h; sourceTree = "<group>"; }; + 88E6F1A6220E1588006156F9 /* SDLMediaType.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLMediaType.m; sourceTree = "<group>"; }; + 88E6F1A9220E1720006156F9 /* SDLMediaTypeSpec.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLMediaTypeSpec.m; sourceTree = "<group>"; }; + 88E6F1AB220E19DF006156F9 /* SDLMediaServiceData.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDLMediaServiceData.h; sourceTree = "<group>"; }; + 88E6F1AC220E19DF006156F9 /* SDLMediaServiceData.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLMediaServiceData.m; sourceTree = "<group>"; }; + 88E6F1AF220E25B2006156F9 /* SDLMediaServiceDataSpec.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLMediaServiceDataSpec.m; sourceTree = "<group>"; }; + 88EEC5B7220A2144005AA2F9 /* SDLPublishAppServiceSpec.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLPublishAppServiceSpec.m; sourceTree = "<group>"; }; + 88EEC5B9220A327B005AA2F9 /* SDLPublishAppServiceResponse.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDLPublishAppServiceResponse.h; sourceTree = "<group>"; }; + 88EEC5BA220A327B005AA2F9 /* SDLPublishAppServiceResponse.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLPublishAppServiceResponse.m; sourceTree = "<group>"; }; + 88EEC5BD220A3B8B005AA2F9 /* SDLPublishAppServiceResponseSpec.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLPublishAppServiceResponseSpec.m; sourceTree = "<group>"; }; 88EED8361F33AE1700E6C42E /* SDLHapticRect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLHapticRect.h; sourceTree = "<group>"; }; 88EED8371F33AE1700E6C42E /* SDLHapticRect.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLHapticRect.m; sourceTree = "<group>"; }; 88EED83A1F33BECB00E6C42E /* SDLHapticRectSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLHapticRectSpec.m; sourceTree = "<group>"; }; 88EED83C1F33C5A400E6C42E /* SDLSendHapticData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLSendHapticData.h; sourceTree = "<group>"; }; 88EED83D1F33C5A400E6C42E /* SDLSendHapticData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLSendHapticData.m; sourceTree = "<group>"; }; + 88F50D5E220B720E00F34648 /* SDLPerformAppServiceInteractionSpec.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLPerformAppServiceInteractionSpec.m; sourceTree = "<group>"; }; + 88F65132220C6DC300CAF321 /* SDLWeatherAlertSpec.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLWeatherAlertSpec.m; sourceTree = "<group>"; }; + 88F65134220C74FD00CAF321 /* SDLWeatherData.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDLWeatherData.h; sourceTree = "<group>"; }; + 88F65135220C74FD00CAF321 /* SDLWeatherData.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLWeatherData.m; sourceTree = "<group>"; }; + 88F89101221DE29A00E056AD /* SDLAsynchronousRPCOperation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDLAsynchronousRPCOperation.h; sourceTree = "<group>"; }; 8B7B31981F2F7B5700BDC38D /* SDLVideoStreamingCodec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLVideoStreamingCodec.h; sourceTree = "<group>"; }; 8B7B31991F2F7B5700BDC38D /* SDLVideoStreamingCodec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLVideoStreamingCodec.m; sourceTree = "<group>"; }; 8B7B319C1F2F7CF700BDC38D /* SDLVideoStreamingProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLVideoStreamingProtocol.h; sourceTree = "<group>"; }; @@ -2828,7 +3032,7 @@ 8BBEA6081F324832003EEA26 /* SDLMetadataTypeSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLMetadataTypeSpec.m; sourceTree = "<group>"; }; 97E26DEA1E807AD70074A3C7 /* SDLMutableDataQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLMutableDataQueue.h; sourceTree = "<group>"; }; 97E26DEB1E807AD70074A3C7 /* SDLMutableDataQueue.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLMutableDataQueue.m; sourceTree = "<group>"; }; - DA0C46AC1DCD35080001F2A8 /* SDLNames.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLNames.m; sourceTree = "<group>"; }; + DA0C46AC1DCD35080001F2A8 /* SDLRPCParameterNames.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLRPCParameterNames.m; sourceTree = "<group>"; }; DA0C46AE1DCD41E30001F2A8 /* SDLMacros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLMacros.h; sourceTree = "<group>"; }; DA318C1D1DD0F06C00C035AC /* NSMutableDictionary+Store.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSMutableDictionary+Store.h"; sourceTree = "<group>"; }; DA318C1E1DD0F06C00C035AC /* NSMutableDictionary+Store.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSMutableDictionary+Store.m"; sourceTree = "<group>"; }; @@ -3001,6 +3205,7 @@ 162E81E21A9BDE8A00906325 /* SDLAmbientLightStatusSpec.m */, 162E81E31A9BDE8A00906325 /* SDLAppHMITypeSpec.m */, 162E81E41A9BDE8A00906325 /* SDLAppInterfaceUnregisteredReasonSpec.m */, + 8831FA3E2202227000B8FFB7 /* SDLAppServiceTypeSpec.m */, 2BF2F85120ED068200A26EF2 /* SDLAudioStreamingIndicatorSpec.m */, 162E81E51A9BDE8A00906325 /* SDLAudioStreamingStateSpec.m */, 162E81E61A9BDE8A00906325 /* SDLAudioTypeSpec.m */, @@ -3015,6 +3220,7 @@ DA9F7EB11DCC084300ACAE48 /* SDLDeliveryModeSpec.m */, 162E81EF1A9BDE8A00906325 /* SDLDeviceLevelStatusSpec.m */, 162E81F01A9BDE8A00906325 /* SDLDimensionSpec.m */, + 88B58DBC222042500011B063 /* SDLDirectionSpec.m */, 162E81F11A9BDE8A00906325 /* SDLDisplayTypeSpec.m */, 1EAA475D2035B177000FE74B /* SDLDisplayModeSpec.m */, 1EAA47612035B1AE000FE74B /* SDLDistanceUnitSpec.m */, @@ -3044,10 +3250,14 @@ 162E82041A9BDE8A00906325 /* SDLLockScreenStatusSpec.m */, 162E82051A9BDE8A00906325 /* SDLMaintenanceModeStatusSpec.m */, 1EB59CCD202DC97900343A61 /* SDLMassageCushionSpec.m */, + 1EB59CD1202DCA9B00343A61 /* SDLMassageModeSpec.m */, 1EB59CC9202DC8E300343A61 /* SDLMassageZoneSpec.m */, 162E82061A9BDE8A00906325 /* SDLMediaClockFormatSpec.m */, + 88E6F1A9220E1720006156F9 /* SDLMediaTypeSpec.m */, 8BBEA6081F324832003EEA26 /* SDLMetadataTypeSpec.m */, 1EB59CC7202DC86A00343A61 /* SDLModuleTypeSpec.m */, + 88B58DC822204C9E0011B063 /* SDLNavigationActionSpec.m */, + 88B58DC2222047F50011B063 /* SDLNavigationJunctionSpec.m */, 162E82071A9BDE8A00906325 /* SDLPermissionStatusSpec.m */, 162E82081A9BDE8A00906325 /* SDLPowerModeQualificationStatusSpec.m */, 162E82091A9BDE8A00906325 /* SDLPowerModeStatusSpec.m */, @@ -3059,6 +3269,7 @@ 162E820E1A9BDE8A00906325 /* SDLRequestTypeSpec.m */, 162E820F1A9BDE8A00906325 /* SDLResultSpec.m */, 162E82111A9BDE8A00906325 /* SDLSamplingRateSpec.m */, + 8831FA3C220207DA00B8FFB7 /* SDLServiceUpdateReasonSpec.m */, 162E82121A9BDE8A00906325 /* SDLSoftButtonTypeSpec.m */, 162E82131A9BDE8A00906325 /* SDLSpeechCapabilitiesSpec.m */, 1EB59CCF202DC9F200343A61 /* SDLSupportedSeatSpec.m */, @@ -3090,7 +3301,6 @@ 1EE8C43B1F347EAE00FDC2CF /* SDLTemperatureUnitSpec.m */, 1EE8C43D1F347F0500FDC2CF /* SDLVentilationModeSpec.m */, 5D64FE6C20DA9CE600792F9F /* SDLVideoStreamingStateSpec.m */, - 1EB59CD1202DCA9B00343A61 /* SDLMassageModeSpec.m */, ); path = EnumSpecs; sourceTree = "<group>"; @@ -3099,6 +3309,7 @@ isa = PBXGroup; children = ( 162E82291A9BDE8A00906325 /* SDLOnAppInterfaceUnregisteredSpec.m */, + 8855F9E5220CB60700A5C897 /* SDLOnAppServiceDataSpec.m */, 162E822A1A9BDE8A00906325 /* SDLOnAudioPassThruSpec.m */, 162E822B1A9BDE8A00906325 /* SDLOnButtonEventSpec.m */, 162E822C1A9BDE8A00906325 /* SDLOnButtonPressSpec.m */, @@ -3114,6 +3325,7 @@ 162E82351A9BDE8A00906325 /* SDLOnPermissionsChangeSpec.m */, 1EAA470D2032BF1D000FE74B /* SDLOnRCStatusSpec.m */, 162E82361A9BDE8A00906325 /* SDLOnSyncPDataSpec.m */, + 88A5E7F3220B57F900495E8A /* SDLOnSystemCapabilityUpdatedSpec.m */, 162E82371A9BDE8A00906325 /* SDLOnSystemRequestSpec.m */, 162E82381A9BDE8A00906325 /* SDLOnTBTClientStateSpec.m */, 162E82391A9BDE8A00906325 /* SDLOnTouchEventSpec.m */, @@ -3150,14 +3362,19 @@ 162E82491A9BDE8A00906325 /* SDLEncodedSyncPDataSpec.m */, 162E824A1A9BDE8A00906325 /* SDLEndAudioPassThruSpec.m */, 8881AFBA2225E7FA00EA870B /* SDLGetCloudAppPropertiesSpec.m */, + 88A5E7F9220B60EC00495E8A /* SDLGetAppServiceDataSpec.m */, + 8855F9EB220CBFB700A5C897 /* SDLGetFileSpec.m */, 162E824B1A9BDE8A00906325 /* SDLGetDTCsSpec.m */, 1EE8C4591F387BBB00FDC2CF /* SDLGetInteriorVehicleDataSpec.m */, + 884AF94B220B3FCC00E22928 /* SDLGetSystemCapabilitySpec.m */, 5D0A9F991F15636800CC80DD /* SDLGetSystemCapabilitiesSpec.m */, 162E824C1A9BDE8A00906325 /* SDLGetVehicleDataSpec.m */, DA9F7EA11DCC05E100ACAE48 /* SDLGetWaypointsSpec.m */, 162E824D1A9BDE8A00906325 /* SDLListFilesSpec.m */, 162E824E1A9BDE8A00906325 /* SDLPerformAudioPassThruSpec.m */, + 88F50D5E220B720E00F34648 /* SDLPerformAppServiceInteractionSpec.m */, 162E824F1A9BDE8A00906325 /* SDLPerformInteractionSpec.m */, + 88EEC5B7220A2144005AA2F9 /* SDLPublishAppServiceSpec.m */, 162E82501A9BDE8A00906325 /* SDLPutFileSpec.m */, 162E82511A9BDE8A00906325 /* SDLReadDIDSpec.m */, 162E82521A9BDE8A00906325 /* SDLRegisterAppInterfaceSpec.m */, @@ -3209,14 +3426,18 @@ 162E82721A9BDE8A00906325 /* SDLEndAudioPassThruResponseSpec.m */, 162E82731A9BDE8A00906325 /* SDLGenericResponseSpec.m */, 8881AFC02225EB9300EA870B /* SDLGetCloudAppPropertiesResponseSpec.m */, + 88AF11D8220B66FD00A59985 /* SDLGetAppServiceDataResponseSpec.m */, 162E82741A9BDE8A00906325 /* SDLGetDTCsResponseSpec.m */, + 88C282C9220CD17200D02F90 /* SDLGetFileResponseSpec.m */, 1EE8C45C1F387D1C00FDC2CF /* SDLGetInteriorVehicleDataResponseSpec.m */, 5D0A9F9B1F1565EB00CC80DD /* SDLGetSystemCapabilityResponseSpec.m */, 162E82751A9BDE8A00906325 /* SDLGetVehicleDataResponseSpec.m */, DA9F7EA71DCC060B00ACAE48 /* SDLGetWaypointsResponseSpec.m */, 162E82761A9BDE8A00906325 /* SDLListFilesResponseSpec.m */, + 88665B6B220B796A00D9DA77 /* SDLPerformAppServiceInteractionResponseSpec.m */, 162E82771A9BDE8A00906325 /* SDLPerformAudioPassThruResponseSpec.m */, 162E82781A9BDE8A00906325 /* SDLPerformInteractionResponseSpec.m */, + 88EEC5BD220A3B8B005AA2F9 /* SDLPublishAppServiceResponseSpec.m */, 162E82791A9BDE8A00906325 /* SDLPutFileResponseSpec.m */, 162E827A1A9BDE8A00906325 /* SDLReadDIDResponseSpec.m */, 162E827B1A9BDE8A00906325 /* SDLRegisterAppInterfaceResponseSpec.m */, @@ -3253,6 +3474,11 @@ children = ( 162E828F1A9BDE8A00906325 /* SDLAirbagStatusSpec.m */, DA96C0651D4D4F730022F520 /* SDLAppInfoSpec.m */, + 8831FA4A2202402B00B8FFB7 /* SDLAppServicesCapabilitiesSpec.m */, + 8831FA442202307500B8FFB7 /* SDLAppServiceCapabilitySpec.m */, + 882FAC4C2209D7EF0062385D /* SDLAppServiceDataSpec.m */, + 8831FA382201E3D100B8FFB7 /* SDLAppServiceManifestSpec.m */, + 88A81F6B2200FD4A00A691A9 /* SDLAppServiceRecordSpec.m */, 1EAA47772036BA74000FE74B /* SDLAudioControlCapabilitiesSpec.m */, 1EAA47732036B31E000FE74B /* SDLAudioControlDataSpec.m */, 162E82901A9BDE8A00906325 /* SDLAudioPassThruCapabilitiesSpec.m */, @@ -3292,11 +3518,16 @@ DA9F7EAE1DCC063400ACAE48 /* SDLLocationDetailsSpec.m */, 1EB59CD7202DCCD500343A61 /* SDLMassageCushionFirmnessSpec.m */, 1EB59CD3202DCAE900343A61 /* SDLMassageModeDataSpec.m */, + 88E6F1AF220E25B2006156F9 /* SDLMediaServiceDataSpec.m */, + 88AAD4BF2211B7E200F1E6D7 /* SDLMediaServiceManifestSpec.m */, 162E82A21A9BDE8A00906325 /* SDLMenuParamsSpec.m */, 1EE8C4451F3837D200FDC2CF /* SDLModuleDataSpec.m */, 8B9376DA1F33656C009605C4 /* SDLMetadataTagsSpec.m */, 162E82A31A9BDE8A00906325 /* SDLMyKeySpec.m */, 5D0A9F921F15560B00CC80DD /* SDLNavigationCapabilitySpec.m */, + 8816772822208B82001FACFF /* SDLNavigationInstructionSpec.m */, + 88A4A0F922242AB400C6F01D /* SDLNavigationServiceDataSpec.m */, + 884554AE2224554300BAFB6C /* SDLNavigationServiceManifestSpec.m */, DA9F7EB51DCC086A00ACAE48 /* SDLOasisAddressSpec.m */, 162E82A41A9BDE8A00906325 /* SDLParameterPermissionsSpec.m */, 162E82A51A9BDE8A00906325 /* SDLPermissionItemSpec.m */, @@ -3334,6 +3565,10 @@ 162E82B61A9BDE8A00906325 /* SDLVrHelpItemSpec.m */, 8B7B31AE1F2FBA0200BDC38D /* SDLVideoStreamingCapabilitySpec.m */, 8B7B31B01F2FBD9500BDC38D /* SDLVideoStreamingFormatSpec.m */, + 88F65132220C6DC300CAF321 /* SDLWeatherAlertSpec.m */, + 8855F9DF220C93B700A5C897 /* SDLWeatherDataSpec.m */, + 880D2679220DDD1000B3F496 /* SDLWeatherServiceDataSpec.m */, + 880D267F220E038800B3F496 /* SDLWeatherServiceManifestSpec.m */, ); path = StructSpecs; sourceTree = "<group>"; @@ -3429,6 +3664,8 @@ 5D07C0302044AD0C00D1ECDC /* SDLAsynchronousRPCRequestOperation.m */, 5D07C02B2044AC9000D1ECDC /* SDLSequentialRPCRequestOperation.h */, 5D07C02C2044AC9100D1ECDC /* SDLSequentialRPCRequestOperation.m */, + 88F89101221DE29A00E056AD /* SDLAsynchronousRPCOperation.h */, + 888F86FD221DEE1F0052FE4C /* SDLAsynchronousRPCOperation.m */, ); name = "Request Operations"; sourceTree = "<group>"; @@ -3502,6 +3739,7 @@ isa = PBXGroup; children = ( 5D1654551D3E754F00554D93 /* SDLLifecycleManagerSpec.m */, + 888F86FF221DF4880052FE4C /* SDLAsynchronousRPCOperationSpec.m */, 5D60DF23202B7A80001EDA01 /* SDLAsynchronousRPCRequestOperationSpec.m */, 5D60DF25202B7A97001EDA01 /* SDLSequentialRPCRequestOperationSpec.m */, 88A1CF1D21669AC7001ACC75 /* SDLLifecycleConfigurationUpdateSpec.m */, @@ -3870,8 +4108,12 @@ 5D61FAB71A84238A00846EE7 /* SDLEndAudioPassThru.m */, 8881AFB62225E5EE00EA870B /* SDLGetCloudAppProperties.h */, 8881AFB72225E5EE00EA870B /* SDLGetCloudAppProperties.m */, + 88A5E7F5220B5BBC00495E8A /* SDLGetAppServiceData.h */, + 88A5E7F6220B5BBC00495E8A /* SDLGetAppServiceData.m */, 5D61FAC41A84238A00846EE7 /* SDLGetDTCs.h */, 5D61FAC51A84238A00846EE7 /* SDLGetDTCs.m */, + 8855F9E7220CBA9200A5C897 /* SDLGetFile.h */, + 8855F9E8220CBA9200A5C897 /* SDLGetFile.m */, 1E5AD0861F20B9AA0029B8AF /* SDLGetInteriorVehicleData.h */, 1E5AD0871F20B9AA0029B8AF /* SDLGetInteriorVehicleData.m */, 5D00AC6D1F1511B9004000D9 /* SDLGetSystemCapability.h */, @@ -3882,10 +4124,14 @@ DA9F7E6E1DCBFFDB00ACAE48 /* SDLGetWayPoints.m */, 5D61FAFF1A84238A00846EE7 /* SDLListFiles.h */, 5D61FB001A84238A00846EE7 /* SDLListFiles.m */, + 88AF11DA220B6B3D00A59985 /* SDLPerformAppServiceInteraction.h */, + 88AF11DB220B6B3D00A59985 /* SDLPerformAppServiceInteraction.m */, 5D61FB381A84238B00846EE7 /* SDLPerformAudioPassThru.h */, 5D61FB391A84238B00846EE7 /* SDLPerformAudioPassThru.m */, 5D61FB3C1A84238B00846EE7 /* SDLPerformInteraction.h */, 5D61FB3D1A84238B00846EE7 /* SDLPerformInteraction.m */, + 884E701921FB8D0F008D53BA /* SDLPublishAppService.h */, + 884E701A21FB8D0F008D53BA /* SDLPublishAppService.m */, 5D61FB681A84238B00846EE7 /* SDLPutFile.h */, 5D61FB691A84238B00846EE7 /* SDLPutFile.m */, 5D61FB6C1A84238B00846EE7 /* SDLReadDID.h */, @@ -3981,8 +4227,12 @@ 5D61FAC31A84238A00846EE7 /* SDLGenericResponse.m */, 8881AFBC2225E9BB00EA870B /* SDLGetCloudAppPropertiesResponse.h */, 8881AFBD2225E9BB00EA870B /* SDLGetCloudAppPropertiesResponse.m */, + 88A5E7FB220B642200495E8A /* SDLGetAppServiceDataResponse.h */, + 88A5E7FC220B642200495E8A /* SDLGetAppServiceDataResponse.m */, 5D61FAC61A84238A00846EE7 /* SDLGetDTCsResponse.h */, 5D61FAC71A84238A00846EE7 /* SDLGetDTCsResponse.m */, + 88A7A3C4220CCEA100A9E435 /* SDLGetFileResponse.h */, + 88A7A3C5220CCEA100A9E435 /* SDLGetFileResponse.m */, 1E5AD08A1F20BC320029B8AF /* SDLGetInteriorVehicleDataResponse.h */, 1E5AD08B1F20BC320029B8AF /* SDLGetInteriorVehicleDataResponse.m */, 5D00AC711F151CFE004000D9 /* SDLGetSystemCapabilityResponse.h */, @@ -3993,10 +4243,14 @@ DA9F7E721DCC004C00ACAE48 /* SDLGetWayPointsResponse.m */, 5D61FB011A84238A00846EE7 /* SDLListFilesResponse.h */, 5D61FB021A84238A00846EE7 /* SDLListFilesResponse.m */, + 88665B67220B771A00D9DA77 /* SDLPerformAppServiceInteractionResponse.h */, + 88665B68220B771A00D9DA77 /* SDLPerformAppServiceInteractionResponse.m */, 5D61FB3A1A84238B00846EE7 /* SDLPerformAudioPassThruResponse.h */, 5D61FB3B1A84238B00846EE7 /* SDLPerformAudioPassThruResponse.m */, 5D61FB3E1A84238B00846EE7 /* SDLPerformInteractionResponse.h */, 5D61FB3F1A84238B00846EE7 /* SDLPerformInteractionResponse.m */, + 88EEC5B9220A327B005AA2F9 /* SDLPublishAppServiceResponse.h */, + 88EEC5BA220A327B005AA2F9 /* SDLPublishAppServiceResponse.m */, 5D61FB6A1A84238B00846EE7 /* SDLPutFileResponse.h */, 5D61FB6B1A84238B00846EE7 /* SDLPutFileResponse.m */, 5D61FB6E1A84238B00846EE7 /* SDLReadDIDResponse.h */, @@ -4062,6 +4316,16 @@ 5D61FA491A84238A00846EE7 /* SDLAirbagStatus.m */, 332A913C1CED87F80043824C /* SDLAppInfo.h */, 332A913D1CED87F80043824C /* SDLAppInfo.m */, + 8831FA46220235B000B8FFB7 /* SDLAppServicesCapabilities.h */, + 8831FA47220235B000B8FFB7 /* SDLAppServicesCapabilities.m */, + 8831FA4022022AB300B8FFB7 /* SDLAppServiceCapability.h */, + 8831FA4122022AB300B8FFB7 /* SDLAppServiceCapability.m */, + 88C37F612204EBF000901DC6 /* SDLAppServiceData.h */, + 88C37F622204EBF000901DC6 /* SDLAppServiceData.m */, + 884E701D21FB983F008D53BA /* SDLAppServiceManifest.h */, + 884E701E21FB983F008D53BA /* SDLAppServiceManifest.m */, + 884E702921FBB151008D53BA /* SDLAppServiceRecord.h */, + 884E702A21FBB151008D53BA /* SDLAppServiceRecord.m */, 1EAA471B203410BB000FE74B /* SDLAudioControlCapabilities.h */, 1EAA471C203410BB000FE74B /* SDLAudioControlCapabilities.m */, 1EAA47272034388D000FE74B /* SDLAudioControlData.h */, @@ -4140,16 +4404,26 @@ 1EB59CAE202D97AC00343A61 /* SDLMassageCushionFirmness.m */, 1EB59CA5202D946500343A61 /* SDLMassageModeData.h */, 1EB59CA6202D946500343A61 /* SDLMassageModeData.m */, + 88E6F1AB220E19DF006156F9 /* SDLMediaServiceData.h */, + 88E6F1AC220E19DF006156F9 /* SDLMediaServiceData.m */, + 88AAD4BA2211B76800F1E6D7 /* SDLMediaServiceManifest.h */, + 88AAD4BB2211B76800F1E6D7 /* SDLMediaServiceManifest.m */, 5D61FB0B1A84238A00846EE7 /* SDLMenuParams.h */, 5D61FB0C1A84238A00846EE7 /* SDLMenuParams.m */, - 1E5AD06E1F209C880029B8AF /* SDLModuleData.h */, - 1E5AD06F1F209C880029B8AF /* SDLModuleData.m */, 8B9376D51F3349FC009605C4 /* SDLMetadataTags.h */, 8B9376D61F3349FC009605C4 /* SDLMetadataTags.m */, + 1E5AD06E1F209C880029B8AF /* SDLModuleData.h */, + 1E5AD06F1F209C880029B8AF /* SDLModuleData.m */, 5D61FB0D1A84238A00846EE7 /* SDLMyKey.h */, 5D61FB0E1A84238A00846EE7 /* SDLMyKey.m */, 5D00AC751F15283E004000D9 /* SDLNavigationCapability.h */, 5D00AC761F15283E004000D9 /* SDLNavigationCapability.m */, + 8880D24522205B1B00964F6A /* SDLNavigationInstruction.h */, + 8880D24622205B1B00964F6A /* SDLNavigationInstruction.m */, + 8816772A222097C3001FACFF /* SDLNavigationServiceData.h */, + 8816772B222097C3001FACFF /* SDLNavigationServiceData.m */, + 884554AA222453A800BAFB6C /* SDLNavigationServiceManifest.h */, + 884554AB222453A800BAFB6C /* SDLNavigationServiceManifest.m */, DA9F7E651DCBFAD400ACAE48 /* SDLOasisAddress.h */, DA9F7E661DCBFAD400ACAE48 /* SDLOasisAddress.m */, 5D61FB361A84238B00846EE7 /* SDLParameterPermissions.h */, @@ -4224,6 +4498,14 @@ 8B7B31A11F2F7FEA00BDC38D /* SDLVideoStreamingFormat.m */, 8B7B31A41F2F875200BDC38D /* SDLVideoStreamingCapability.h */, 8B7B31A51F2F875200BDC38D /* SDLVideoStreamingCapability.m */, + 88665B71220B80F400D9DA77 /* SDLWeatherAlert.h */, + 88665B72220B80F400D9DA77 /* SDLWeatherAlert.m */, + 88F65134220C74FD00CAF321 /* SDLWeatherData.h */, + 88F65135220C74FD00CAF321 /* SDLWeatherData.m */, + 88D5EB35220CD95000EC3782 /* SDLWeatherServiceData.h */, + 88D5EB36220CD95000EC3782 /* SDLWeatherServiceData.m */, + 880D267B220DE5DF00B3F496 /* SDLWeatherServiceManifest.h */, + 880D267C220DE5DF00B3F496 /* SDLWeatherServiceManifest.m */, ); name = Structs; sourceTree = "<group>"; @@ -4237,6 +4519,8 @@ 5D61FA551A84238A00846EE7 /* SDLAppHMIType.m */, 5D61FA561A84238A00846EE7 /* SDLAppInterfaceUnregisteredReason.h */, 5D61FA571A84238A00846EE7 /* SDLAppInterfaceUnregisteredReason.m */, + 884E702121FBA952008D53BA /* SDLAppServiceType.h */, + 884E702221FBA952008D53BA /* SDLAppServiceType.m */, 2BF2F84D20ED004000A26EF2 /* SDLAudioStreamingIndicator.h */, 2BF2F84E20ED004000A26EF2 /* SDLAudioStreamingIndicator.m */, 5D61FA5A1A84238A00846EE7 /* SDLAudioStreamingState.h */, @@ -4267,6 +4551,8 @@ 5D61FA981A84238A00846EE7 /* SDLDeviceLevelStatus.m */, 5D61FAA11A84238A00846EE7 /* SDLDimension.h */, 5D61FAA21A84238A00846EE7 /* SDLDimension.m */, + 88B58DB8222040FF0011B063 /* SDLDirection.h */, + 88B58DB9222040FF0011B063 /* SDLDirection.m */, 1EAA474B20356B2D000FE74B /* SDLDisplayMode.h */, 1EAA474C20356B2D000FE74B /* SDLDisplayMode.m */, 1EAA474F20356CD2000FE74B /* SDLDistanceUnit.h */, @@ -4331,10 +4617,16 @@ 1EB59C9E202D925500343A61 /* SDLMassageZone.m */, 5D61FB091A84238A00846EE7 /* SDLMediaClockFormat.h */, 5D61FB0A1A84238A00846EE7 /* SDLMediaClockFormat.m */, + 88E6F1A5220E1588006156F9 /* SDLMediaType.h */, + 88E6F1A6220E1588006156F9 /* SDLMediaType.m */, 1E5AD0461F1F773E0029B8AF /* SDLModuleType.h */, 1E5AD0471F1F773E0029B8AF /* SDLModuleType.m */, 8BBEA6041F324165003EEA26 /* SDLMetadataType.h */, 8BBEA6051F324165003EEA26 /* SDLMetadataType.m */, + 88B58DC422204AF10011B063 /* SDLNavigationAction.h */, + 88B58DC522204AF10011B063 /* SDLNavigationAction.m */, + 88B58DBE222045320011B063 /* SDLNavigationJunction.h */, + 88B58DBF222045320011B063 /* SDLNavigationJunction.m */, 5D61FB421A84238B00846EE7 /* SDLPermissionStatus.h */, 5D61FB431A84238B00846EE7 /* SDLPermissionStatus.m */, 5D61FB461A84238B00846EE7 /* SDLPowerModeQualificationStatus.h */, @@ -4362,6 +4654,8 @@ 5D61FB8B1A84238B00846EE7 /* SDLSamplingRate.m */, 1EB59CB1202D9B5F00343A61 /* SDLSeatMemoryActionType.h */, 1EB59CB2202D9B5F00343A61 /* SDLSeatMemoryActionType.m */, + 884E702521FBAC5B008D53BA /* SDLServiceUpdateReason.h */, + 884E702621FBAC5B008D53BA /* SDLServiceUpdateReason.m */, 5D61FBB61A84238B00846EE7 /* SDLSoftButtonType.h */, 5D61FBB71A84238B00846EE7 /* SDLSoftButtonType.m */, 5D61FBBC1A84238B00846EE7 /* SDLSpeechCapabilities.h */, @@ -4454,14 +4748,16 @@ 97E26DEB1E807AD70074A3C7 /* SDLMutableDataQueue.m */, E9C32B831AB20B2900F283AF /* @categories */, 5D5934F91A851A8000687FB9 /* Prioritized Objects */, + 5D535DC31B72473800CF7760 /* SDLGlobals.h */, + 5D535DC41B72473800CF7760 /* SDLGlobals.m */, 5D61FAD21A84238A00846EE7 /* SDLHexUtility.h */, 5D61FAD31A84238A00846EE7 /* SDLHexUtility.m */, + 883C22C6222ED84D00939C4C /* SDLRPCFunctionNames.h */, + 883C22C7222ED84D00939C4C /* SDLRPCFunctionNames.m */, + 5D61FB0F1A84238A00846EE7 /* SDLRPCParameterNames.h */, + DA0C46AC1DCD35080001F2A8 /* SDLRPCParameterNames.m */, E9C32B8E1AB20BA200F283AF /* SDLTimer.h */, E9C32B8F1AB20BA200F283AF /* SDLTimer.m */, - 5D61FB0F1A84238A00846EE7 /* SDLNames.h */, - DA0C46AC1DCD35080001F2A8 /* SDLNames.m */, - 5D535DC31B72473800CF7760 /* SDLGlobals.h */, - 5D535DC41B72473800CF7760 /* SDLGlobals.m */, DA0C46AE1DCD41E30001F2A8 /* SDLMacros.h */, ); name = Utilities; @@ -4472,6 +4768,8 @@ children = ( 5D61FB121A84238B00846EE7 /* SDLOnAppInterfaceUnregistered.h */, 5D61FB131A84238B00846EE7 /* SDLOnAppInterfaceUnregistered.m */, + 8855F9E1220CB04000A5C897 /* SDLOnAppServiceData.h */, + 8855F9E2220CB04000A5C897 /* SDLOnAppServiceData.m */, 5D61FB141A84238B00846EE7 /* SDLOnAudioPassThru.h */, 5D61FB151A84238B00846EE7 /* SDLOnAudioPassThru.m */, 5D61FB161A84238B00846EE7 /* SDLOnButtonEvent.h */, @@ -4502,6 +4800,8 @@ 1EAA470A2032BAE5000FE74B /* SDLOnRCStatus.m */, 5D61FB2C1A84238B00846EE7 /* SDLOnSyncPData.h */, 5D61FB2D1A84238B00846EE7 /* SDLOnSyncPData.m */, + 884AF94D220B488900E22928 /* SDLOnSystemCapabilityUpdated.h */, + 884AF94E220B488900E22928 /* SDLOnSystemCapabilityUpdated.m */, 5D61FB2E1A84238B00846EE7 /* SDLOnSystemRequest.h */, 5D61FB2F1A84238B00846EE7 /* SDLOnSystemRequest.m */, 5D61FB301A84238B00846EE7 /* SDLOnTBTClientState.h */, @@ -4636,6 +4936,7 @@ 5D6035D1202CD46200A429C9 /* SDLSpecUtilities.m */, EEA41D43210BA89B0006CB6E /* TestTCPServer.h */, EEA41D44210BA8CF0006CB6E /* TestTCPServer.m */, + 883C22CA222EEF0900939C4C /* SDLRPCFunctionNamesSpec.m */, ); name = "Test Utilities"; sourceTree = "<group>"; @@ -5230,6 +5531,7 @@ 5DBAE0A71D355F0C00CE00BF /* Dispatchers */ = { isa = PBXGroup; children = ( + 88A70C392233087500574CA4 /* Requests */, 5D3E48781D6F86EC0000BFEF /* Notifications */, 5D3E48821D74813B0000BFEF /* Responses */, ); @@ -5254,8 +5556,8 @@ 5DBAE0A91D35888D00CE00BF /* Dispatchers */ = { isa = PBXGroup; children = ( - 5DBAE0AA1D3588AC00CE00BF /* SDLNotificationDispatcherSpec.m */, - 5DBAE0AC1D368D1A00CE00BF /* SDLResponseDispatcherSpec.m */, + 88C23E8422297BD500EA171F /* Notification Tests */, + 88FF4E792215FEAF00A71361 /* Notifications */, ); name = Dispatchers; sourceTree = "<group>"; @@ -5549,6 +5851,15 @@ name = Storyboards; sourceTree = "<group>"; }; + 88A70C392233087500574CA4 /* Requests */ = { + isa = PBXGroup; + children = ( + 88D6F17E22319FE000D4BFB3 /* SDLRPCRequestNotification.h */, + 88D6F17D22319FE000D4BFB3 /* SDLRPCRequestNotification.m */, + ); + name = Requests; + sourceTree = "<group>"; + }; 88B848C41F45E20900DED768 /* Helpers */ = { isa = PBXGroup; children = ( @@ -5562,6 +5873,17 @@ name = Helpers; sourceTree = "<group>"; }; + 88C23E8422297BD500EA171F /* Notification Tests */ = { + isa = PBXGroup; + children = ( + 88C23E8522297BD500EA171F /* SDLRPCRequestNotificationSpec.m */, + 88C23E8722297C6000EA171F /* SDLRPCResponseNotificationSpec.m */, + 88C23E8922297DE400EA171F /* SDLRPCNotificationNotificationSpec.m */, + ); + name = "Notification Tests"; + path = "DevAPISpecs/Notification Tests"; + sourceTree = "<group>"; + }; 88DF998A22035CA400477AC1 /* TCP */ = { isa = PBXGroup; children = ( @@ -5580,6 +5902,15 @@ path = iAP; sourceTree = "<group>"; }; + 88FF4E792215FEAF00A71361 /* Notifications */ = { + isa = PBXGroup; + children = ( + 5DBAE0AA1D3588AC00CE00BF /* SDLNotificationDispatcherSpec.m */, + 5DBAE0AC1D368D1A00CE00BF /* SDLResponseDispatcherSpec.m */, + ); + path = Notifications; + sourceTree = "<group>"; + }; DA1166D71D14601C00438CEA /* Touches */ = { isa = PBXGroup; children = ( @@ -5718,6 +6049,7 @@ files = ( 1EB59CBF202DA26000343A61 /* SDLSeatControlData.h in Headers */, 1EB59CB3202D9B5F00343A61 /* SDLSeatMemoryActionType.h in Headers */, + 88665B73220B80F400D9DA77 /* SDLWeatherAlert.h in Headers */, 1EB59CC3202DB40400343A61 /* SDLSeatControlCapabilities.h in Headers */, 1EB59CB7202D9C8100343A61 /* SDLSeatMemoryAction.h in Headers */, 1EB59CBB202DA1B400343A61 /* SDLSupportedSeat.h in Headers */, @@ -5733,6 +6065,7 @@ 1EAA4755203583BC000FE74B /* SDLHMISettingsControlData.h in Headers */, 1EAA4731203442C0000FE74B /* SDLLightName.h in Headers */, 1EAA472D20344108000FE74B /* SDLLightStatus.h in Headers */, + 8831FA4222022AB300B8FFB7 /* SDLAppServiceCapability.h in Headers */, 1EAA474D20356B2D000FE74B /* SDLDisplayMode.h in Headers */, 1EAA473D203554B5000FE74B /* SDLLightState.h in Headers */, 1EAA4749203567FA000FE74B /* SDLHMISettingsControlCapabilities.h in Headers */, @@ -5765,12 +6098,14 @@ 5DB92D321AC9C8BA00C15BB0 /* SDLRPCStruct.h in Headers */, 5D61FD151A84238C00846EE7 /* SDLOnLockScreenStatus.h in Headers */, 5D61FD291A84238C00846EE7 /* SDLPerformInteraction.h in Headers */, + 884E702321FBA952008D53BA /* SDLAppServiceType.h in Headers */, DAC572571D1067270004288B /* SDLTouchManager.h in Headers */, 5D61FE0D1A84238C00846EE7 /* SDLVrCapabilities.h in Headers */, EEB1932E205028B700A8940C /* SDLControlFramePayloadTransportEventUpdate.h in Headers */, EE798CA420561210008EDE8E /* SDLSecondaryTransportManager.h in Headers */, 5DBF06271E64A91D00A5CF03 /* SDLLogFileModule.h in Headers */, 5D61FC531A84238C00846EE7 /* SDLButtonEventMode.h in Headers */, + 88E6F1AD220E19DF006156F9 /* SDLMediaServiceData.h in Headers */, 1FF7DAB61F75B27300B46C30 /* SDLFocusableItemLocatorType.h in Headers */, 5D61FC781A84238C00846EE7 /* SDLDeleteFileResponse.h in Headers */, 5DA240001F325621009C0313 /* SDLStreamingMediaConfiguration.h in Headers */, @@ -5784,6 +6119,7 @@ 5D92937820B6FB6200FCC775 /* SDLPresentChoiceSetOperation.h in Headers */, 5D61FD831A84238C00846EE7 /* SDLSetDisplayLayout.h in Headers */, 5D61FCC91A84238C00846EE7 /* SDLIgnitionStableStatus.h in Headers */, + 884E701F21FB983F008D53BA /* SDLAppServiceManifest.h in Headers */, DA9F7E6B1DCBFB0700ACAE48 /* SDLDeliveryMode.h in Headers */, E9C32B941AB20BA200F283AF /* SDLStreamDelegate.h in Headers */, DA9F7E871DCC049900ACAE48 /* SDLSubscribeWayPoints.h in Headers */, @@ -5803,6 +6139,7 @@ 5D61FC391A84238C00846EE7 /* SDLAlertManeuver.h in Headers */, 5D61FC861A84238C00846EE7 /* SDLDeviceStatus.h in Headers */, DA0C46AF1DCD41E30001F2A8 /* SDLMacros.h in Headers */, + 884E702721FBAC5B008D53BA /* SDLServiceUpdateReason.h in Headers */, 5D61FCC71A84238C00846EE7 /* SDLIAPTransport.h in Headers */, 5D61FC6D1A84238C00846EE7 /* SDLCreateInteractionChoiceSetResponse.h in Headers */, 5D8204221BCEA89A00D0A41B /* SDLFileManager.h in Headers */, @@ -5838,6 +6175,7 @@ 5D61FD9F1A84238C00846EE7 /* SDLSoftButton.h in Headers */, 5DD67CBC1E661C84009CD394 /* SDLLogTargetOSLog.h in Headers */, 5D61FD551A84238C00846EE7 /* SDLPutFile.h in Headers */, + 88A7A3C6220CCEA100A9E435 /* SDLGetFileResponse.h in Headers */, 5D61FD091A84238C00846EE7 /* SDLOnDriverDistraction.h in Headers */, E9C32B9E1AB20C5900F283AF /* EAAccessoryManager+SDLProtocols.h in Headers */, 5DAD5F7F204DEDEB0025624C /* SDLScreenManager.h in Headers */, @@ -5857,10 +6195,12 @@ 5D61FCB71A84238C00846EE7 /* SDLGetVehicleDataResponse.h in Headers */, 5D61FDA91A84238C00846EE7 /* SDLSpeechCapabilities.h in Headers */, 5D92935320B2F76500FCC775 /* SDLTemplateColorScheme.h in Headers */, + 884E701B21FB8D0F008D53BA /* SDLPublishAppService.h in Headers */, 5DA23FFD1F312DBA009C0313 /* SDLVideoEncoderDelegate.h in Headers */, EE7B6124205BF97B00E0655B /* SDLControlFramePayloadRegisterSecondaryTransportNak.h in Headers */, 5D61FCE01A84238C00846EE7 /* SDLKeyboardEvent.h in Headers */, 5D3E48751D6F3B330000BFEF /* SDLAsynchronousOperation.h in Headers */, + 88AF11DC220B6B3D00A59985 /* SDLPerformAppServiceInteraction.h in Headers */, DA9F7E631DCBFAC800ACAE48 /* SDLDateTime.h in Headers */, 5D61FCEA1A84238C00846EE7 /* SDLLayoutMode.h in Headers */, DA318C1F1DD0F06C00C035AC /* NSMutableDictionary+Store.h in Headers */, @@ -5873,6 +6213,8 @@ 5D61FDC71A84238C00846EE7 /* SDLTextAlignment.h in Headers */, 5D61FD051A84238C00846EE7 /* SDLOnButtonPress.h in Headers */, 5D61FCC51A84238C00846EE7 /* SDLHMIZoneCapabilities.h in Headers */, + 884AF94F220B488900E22928 /* SDLOnSystemCapabilityUpdated.h in Headers */, + 880D267D220DE5DF00B3F496 /* SDLWeatherServiceManifest.h in Headers */, DAA41D551DF66B2000BC7337 /* SDLH264VideoEncoder.h in Headers */, 8B7B319A1F2F7B5700BDC38D /* SDLVideoStreamingCodec.h in Headers */, 5D61FCAF1A84238C00846EE7 /* SDLGenericResponse.h in Headers */, @@ -5888,6 +6230,7 @@ 5D61FDDA1A84238C00846EE7 /* SDLTransportDelegate.h in Headers */, 5D61FC411A84238C00846EE7 /* SDLAppHMIType.h in Headers */, 5D61FCEE1A84238C00846EE7 /* SDLListFilesResponse.h in Headers */, + 8831FA48220235B000B8FFB7 /* SDLAppServicesCapabilities.h in Headers */, 880245A420F79C3400ED195B /* SDLFileManagerConfiguration.h in Headers */, 5D61FC491A84238C00846EE7 /* SDLAudioType.h in Headers */, 5D61FC761A84238C00846EE7 /* SDLDeleteFile.h in Headers */, @@ -5903,6 +6246,7 @@ 5D61FC921A84238C00846EE7 /* SDLDisplayType.h in Headers */, 5D61FD0D1A84238C00846EE7 /* SDLOnHashChange.h in Headers */, 5D61FC6B1A84238C00846EE7 /* SDLCreateInteractionChoiceSet.h in Headers */, + 8855F9E3220CB04000A5C897 /* SDLOnAppServiceData.h in Headers */, 5D0A7386203F24060001595D /* SDLSoftButtonState.h in Headers */, 5D61FCE61A84238C00846EE7 /* SDLKeypressMode.h in Headers */, 5D61FD871A84238C00846EE7 /* SDLSetGlobalProperties.h in Headers */, @@ -5942,6 +6286,7 @@ 5D61FC2F1A84238C00846EE7 /* SDLAddCommandResponse.h in Headers */, 5D0C2A0020D9479B008B56CD /* SDLStreamingVideoLifecycleManager.h in Headers */, 5D61FD631A84238C00846EE7 /* SDLResetGlobalProperties.h in Headers */, + 88B58DC0222045320011B063 /* SDLNavigationJunction.h in Headers */, 5D61FDD71A84238C00846EE7 /* SDLTouchType.h in Headers */, 5D92935E20B33FF700FCC775 /* SDLChoiceSet.h in Headers */, 5D61FDD31A84238C00846EE7 /* SDLTouchEvent.h in Headers */, @@ -5957,6 +6302,7 @@ 5D6F7A2E1BC5650B0070BF37 /* SDLLifecycleConfiguration.h in Headers */, 5D61FCCD1A84238C00846EE7 /* SDLImage.h in Headers */, 5D61FD481A84238C00846EE7 /* SDLProtocolMessage.h in Headers */, + 88AAD4BC2211B76800F1E6D7 /* SDLMediaServiceManifest.h in Headers */, 5D1665CD1CF8CA8A00CC4CA1 /* SDLPermissionConstants.h in Headers */, 5D61FC8C1A84238C00846EE7 /* SDLDIDResult.h in Headers */, 5D61FD1F1A84238C00846EE7 /* SDLOnTouchEvent.h in Headers */, @@ -5967,6 +6313,7 @@ 5D61FD111A84238C00846EE7 /* SDLOnKeyboardInput.h in Headers */, 5D76E3211D39742300647CFA /* SDLViewControllerPresentable.h in Headers */, 5DFFB9151BD7C89700DB3F04 /* SDLConnectionManagerType.h in Headers */, + 88C37F632204EBF000901DC6 /* SDLAppServiceData.h in Headers */, 5D61FC941A84238C00846EE7 /* SDLDriverDistractionState.h in Headers */, 5D61FD571A84238C00846EE7 /* SDLPutFileResponse.h in Headers */, 5D61FD411A84238C00846EE7 /* SDLPRNDL.h in Headers */, @@ -5976,6 +6323,7 @@ DA9F7E671DCBFAD400ACAE48 /* SDLOasisAddress.h in Headers */, 5D61FD611A84238C00846EE7 /* SDLRequestType.h in Headers */, DA9F7E8B1DCC04B000ACAE48 /* SDLSubscribeWayPointsResponse.h in Headers */, + 8855F9E9220CBA9200A5C897 /* SDLGetFile.h in Headers */, 5D61FCEC1A84238C00846EE7 /* SDLListFiles.h in Headers */, 5D2F58081D0717D5001085CE /* SDLManagerDelegate.h in Headers */, 5D61FC881A84238C00846EE7 /* SDLDiagnosticMessage.h in Headers */, @@ -5995,10 +6343,13 @@ 88EED83E1F33C5A400E6C42E /* SDLSendHapticData.h in Headers */, 5D61FCD31A84238C00846EE7 /* SDLImageResolution.h in Headers */, 8B7B319E1F2F7CF700BDC38D /* SDLVideoStreamingProtocol.h in Headers */, + 88E6F1A7220E1588006156F9 /* SDLMediaType.h in Headers */, 5D61FD541A84238C00846EE7 /* SDLProxyListener.h in Headers */, + 88A5E7FD220B642200495E8A /* SDLGetAppServiceDataResponse.h in Headers */, 5D61FC5D1A84238C00846EE7 /* SDLChangeRegistrationResponse.h in Headers */, 5D61FDCD1A84238C00846EE7 /* SDLTimerMode.h in Headers */, E9C32B961AB20BA200F283AF /* SDLTimer.h in Headers */, + 88D5EB37220CD95000EC3782 /* SDLWeatherServiceData.h in Headers */, 1FF7DAB81F75B28E00B46C30 /* SDLFocusableItemHitTester.h in Headers */, 5D61FC3D1A84238C00846EE7 /* SDLAlertResponse.h in Headers */, 5D61FDAD1A84238C00846EE7 /* SDLSubscribeButton.h in Headers */, @@ -6006,6 +6357,7 @@ 5D61FCF41A84238C00846EE7 /* SDLMaintenanceModeStatus.h in Headers */, 5D61FC571A84238C00846EE7 /* SDLButtonPressMode.h in Headers */, 5D3E487B1D6F888E0000BFEF /* SDLRPCResponseNotification.h in Headers */, + 88665B69220B771A00D9DA77 /* SDLPerformAppServiceInteractionResponse.h in Headers */, 5D92934D20AF4BEF00FCC775 /* SDLRGBColor.h in Headers */, 5D61FC471A84238C00846EE7 /* SDLAudioStreamingState.h in Headers */, 5D61FE071A84238C00846EE7 /* SDLVehicleDataStatus.h in Headers */, @@ -6025,6 +6377,7 @@ 5D61FCA91A84238C00846EE7 /* SDLFileType.h in Headers */, 8877F5EE1F34A72200DC128A /* SDLSendHapticDataResponse.h in Headers */, DA8966F21E56973700413EAB /* SDLStreamingMediaManagerConstants.h in Headers */, + 883C22C8222ED84D00939C4C /* SDLRPCFunctionNames.h in Headers */, 5DD67CB81E661C4A009CD394 /* SDLLogTargetFile.h in Headers */, 5D61FD591A84238C00846EE7 /* SDLReadDID.h in Headers */, 5D82041A1BCD80BA00D0A41B /* SDLLockScreenConfiguration.h in Headers */, @@ -6058,6 +6411,7 @@ 5D61FCCF1A84238C00846EE7 /* SDLImageField.h in Headers */, 5D535DC51B72473800CF7760 /* SDLGlobals.h in Headers */, 5D79A03B1CE36F030035797B /* SDLUploadFileOperation.h in Headers */, + 8880D24722205B1B00964F6A /* SDLNavigationInstruction.h in Headers */, DA9F7E6F1DCBFFDB00ACAE48 /* SDLGetWayPoints.h in Headers */, 5D61FD231A84238C00846EE7 /* SDLParameterPermissions.h in Headers */, 5D61FCB91A84238C00846EE7 /* SDLGlobalProperty.h in Headers */, @@ -6067,13 +6421,17 @@ 5D61FDB51A84238C00846EE7 /* SDLSyncMsgVersion.h in Headers */, 1E5AD08C1F20BC320029B8AF /* SDLGetInteriorVehicleDataResponse.h in Headers */, 1E5AD0701F209C880029B8AF /* SDLModuleData.h in Headers */, + 8815D0EF22330753000F24E6 /* SDLRPCRequestNotification.h in Headers */, 1E5AD0981F20C0FB0029B8AF /* SDLOnInteriorVehicleData.h in Headers */, 1E5AD0641F207DD50029B8AF /* SDLTemperature.h in Headers */, 1E5AD0901F20BE820029B8AF /* SDLSetInteriorVehicleData.h in Headers */, + 88A5E7F7220B5BBC00495E8A /* SDLGetAppServiceData.h in Headers */, 1E5AD0441F1F5A1F0029B8AF /* SDLRadioControlCapabilities.h in Headers */, + 88F65136220C74FD00CAF321 /* SDLWeatherData.h in Headers */, 1E5AD0841F20B9290029B8AF /* SDLButtonPressResponse.h in Headers */, 1E5AD0681F2080B50029B8AF /* SDLRadioControlData.h in Headers */, 1E5AD0481F1F773E0029B8AF /* SDLModuleType.h in Headers */, + 88B58DC622204AF10011B063 /* SDLNavigationAction.h in Headers */, 1E5AD06C1F208BAB0029B8AF /* SDLClimateControlData.h in Headers */, 1E5AD0381F1F4E390029B8AF /* SDLClimateControlCapabilities.h in Headers */, 5D0C29FC20D93D8C008B56CD /* SDLVideoStreamingState.h in Headers */, @@ -6084,6 +6442,8 @@ 1E5AD04C1F1F79640029B8AF /* SDLDefrostZone.h in Headers */, 1E5AD0601F207AB10029B8AF /* SDLRadioState.h in Headers */, 1E5AD0801F20B73E0029B8AF /* SDLButtonPress.h in Headers */, + 884554AC222453A800BAFB6C /* SDLNavigationServiceManifest.h in Headers */, + 8816772C222097C3001FACFF /* SDLNavigationServiceData.h in Headers */, 1E5AD05C1F2064A80029B8AF /* SDLRDSData.h in Headers */, 1E5AD0341F1F3AA30029B8AF /* SDLRemoteControlCapabilities.h in Headers */, 5DA102A41D4122C700C15826 /* NSMutableDictionary+SafeRemove.h in Headers */, @@ -6101,12 +6461,14 @@ 5D61FD501A84238C00846EE7 /* SDLProxy.h in Headers */, 5D61FC3F1A84238C00846EE7 /* SDLAmbientLightStatus.h in Headers */, 5DE372A11ACB2ED300849FAA /* SDLHMICapabilities.h in Headers */, + 88B58DBA222040FF0011B063 /* SDLDirection.h in Headers */, E9C32B9C1AB20C5900F283AF /* EAAccessory+SDLProtocols.h in Headers */, 5D61FE0B1A84238C00846EE7 /* SDLVehicleType.h in Headers */, 5D07C0312044AD0C00D1ECDC /* SDLAsynchronousRPCRequestOperation.h in Headers */, 5D61FCC31A84238C00846EE7 /* SDLHMIPermissions.h in Headers */, 5D61FE131A84238C00846EE7 /* SDLWiperStatus.h in Headers */, 5D07C02D2044AC9100D1ECDC /* SDLSequentialRPCRequestOperation.h in Headers */, + 88EEC5BB220A327B005AA2F9 /* SDLPublishAppServiceResponse.h in Headers */, 5D16545A1D3E7A1600554D93 /* SDLLifecycleManager.h in Headers */, 5D61FCBD1A84238C00846EE7 /* SDLHeadLampStatus.h in Headers */, 5D61FDC31A84238C00846EE7 /* SDLTBTState.h in Headers */, @@ -6158,6 +6520,7 @@ 5DBF06351E64A9FE00A5CF03 /* SDLLogConstants.h in Headers */, DAC572671D10C5640004288B /* CGPoint_Util.h in Headers */, 5D61FDF91A84238C00846EE7 /* SDLV2ProtocolHeader.h in Headers */, + 884E702B21FBB151008D53BA /* SDLAppServiceRecord.h in Headers */, 5DBF06231E64A83F00A5CF03 /* SDLLogManager.h in Headers */, 5D82041E1BCD8E6100D0A41B /* SDLConfiguration.h in Headers */, 5D61FD4A1A84238C00846EE7 /* SDLProtocolMessageAssembler.h in Headers */, @@ -6170,7 +6533,7 @@ 5D339CEA207C066E000CC364 /* SDLMenuCell.h in Headers */, 5DBF06311E64A9C600A5CF03 /* SDLLogModel.h in Headers */, 5D7F87EB1CE3C1A1002DD7C4 /* SDLDeleteFileOperation.h in Headers */, - 5D61FCFC1A84238C00846EE7 /* SDLNames.h in Headers */, + 5D61FCFC1A84238C00846EE7 /* SDLRPCParameterNames.h in Headers */, DA9F7E8F1DCC04C000ACAE48 /* SDLUnsubscribeWayPointsResponse.h in Headers */, 5D61FCFD1A84238C00846EE7 /* SDLObjectWithPriority.h in Headers */, DAC5726C1D11B4840004288B /* SDLTouchManagerDelegate.h in Headers */, @@ -6180,6 +6543,7 @@ 5D61FCBF1A84238C00846EE7 /* SDLHexUtility.h in Headers */, 5D00AC6B1F141339004000D9 /* SDLSystemCapability.h in Headers */, 5DCD7AE01FCCA8D200A0FC7F /* SDLCarWindow.h in Headers */, + 88F89103221DE29A00E056AD /* SDLAsynchronousRPCOperation.h in Headers */, 5D61FD6F1A84238C00846EE7 /* SDLRPCPayload.h in Headers */, 5D339CF3207C0ACE000CC364 /* SDLMenuManager.h in Headers */, 5D61FCF01A84238C00846EE7 /* SDLLockScreenStatusManager.h in Headers */, @@ -6513,13 +6877,18 @@ 5D3E420B20EAAD6500D8C622 /* SDLTPMS.m in Sources */, 5DD67CB11E65DDB7009CD394 /* SDLLogTargetAppleSystemLog.m in Sources */, 5D92935420B2F76500FCC775 /* SDLTemplateColorScheme.m in Sources */, + 88D5EB38220CD95000EC3782 /* SDLWeatherServiceData.m in Sources */, 5D019277214994AC003500F6 /* NSMutableArray+Safe.m in Sources */, 5D61FD1C1A84238C00846EE7 /* SDLOnSystemRequest.m in Sources */, 5D61FC911A84238C00846EE7 /* SDLDisplayCapabilities.m in Sources */, + 88C37F642204EBF000901DC6 /* SDLAppServiceData.m in Sources */, + 88B58DC722204AF10011B063 /* SDLNavigationAction.m in Sources */, + 8831FA4322022AB300B8FFB7 /* SDLAppServiceCapability.m in Sources */, 1EB59CC4202DB40400343A61 /* SDLSeatControlCapabilities.m in Sources */, 5D61FD261A84238C00846EE7 /* SDLPerformAudioPassThru.m in Sources */, 1EAA471E203410BB000FE74B /* SDLAudioControlCapabilities.m in Sources */, 5D61FC971A84238C00846EE7 /* SDLECallConfirmationStatus.m in Sources */, + 8816772D222097C3001FACFF /* SDLNavigationServiceData.m in Sources */, 1E5AD04D1F1F79640029B8AF /* SDLDefrostZone.m in Sources */, 5D61FC4A1A84238C00846EE7 /* SDLAudioType.m in Sources */, 5D61FDE61A84238C00846EE7 /* SDLUnregisterAppInterfaceResponse.m in Sources */, @@ -6529,6 +6898,7 @@ 5D07C0322044AD0C00D1ECDC /* SDLAsynchronousRPCRequestOperation.m in Sources */, 8881AFBF2225E9BB00EA870B /* SDLGetCloudAppPropertiesResponse.m in Sources */, 1E5AD0691F2080B50029B8AF /* SDLRadioControlData.m in Sources */, + 888F86FE221DEE200052FE4C /* SDLAsynchronousRPCOperation.m in Sources */, 5D61FCC01A84238C00846EE7 /* SDLHexUtility.m in Sources */, 5DB9964F1F26886C002D8795 /* SDLControlFramePayloadEndService.m in Sources */, 5D61FD821A84238C00846EE7 /* SDLSetAppIconResponse.m in Sources */, @@ -6541,6 +6911,7 @@ 1EAA472E20344108000FE74B /* SDLLightStatus.m in Sources */, 1E5AD0351F1F3AA30029B8AF /* SDLRemoteControlCapabilities.m in Sources */, 5D61FC8F1A84238C00846EE7 /* SDLDimension.m in Sources */, + 884554AD222453A800BAFB6C /* SDLNavigationServiceManifest.m in Sources */, 5D61FC9B1A84238C00846EE7 /* SDLEmergencyEvent.m in Sources */, 5D61FDFE1A84238C00846EE7 /* SDLVehicleDataActiveStatus.m in Sources */, 1E5AD0411F1F58480029B8AF /* SDLVentilationMode.m in Sources */, @@ -6562,11 +6933,13 @@ 5D92937920B6FB6200FCC775 /* SDLPresentChoiceSetOperation.m in Sources */, 8B7B31A71F2F875200BDC38D /* SDLVideoStreamingCapability.m in Sources */, 5DA3F35B1BC448480026F2D0 /* SDLError.m in Sources */, + 884E702821FBAC5B008D53BA /* SDLServiceUpdateReason.m in Sources */, 5D61FD781A84238C00846EE7 /* SDLSamplingRate.m in Sources */, 1EAA472A2034388D000FE74B /* SDLAudioControlData.m in Sources */, 5D61FC681A84238C00846EE7 /* SDLComponentVolumeStatus.m in Sources */, 5D61FDB61A84238C00846EE7 /* SDLSyncMsgVersion.m in Sources */, 5D61FC501A84238C00846EE7 /* SDLBodyInformation.m in Sources */, + 88665B6A220B771A00D9DA77 /* SDLPerformAppServiceInteractionResponse.m in Sources */, 5D79A03C1CE36F030035797B /* SDLUploadFileOperation.m in Sources */, 5D61FD901A84238C00846EE7 /* SDLShow.m in Sources */, 5D8204271BCEA8A600D0A41B /* SDLPermissionManager.m in Sources */, @@ -6584,6 +6957,7 @@ 5D61FDE21A84238C00846EE7 /* SDLTurn.m in Sources */, 5D61FC5A1A84238C00846EE7 /* SDLCarModeStatus.m in Sources */, 5D82041B1BCD80BA00D0A41B /* SDLLockScreenConfiguration.m in Sources */, + 8815D0F122330781000F24E6 /* SDLRPCRequestNotification.m in Sources */, 5D3E48CC1D7722FE0000BFEF /* NSBundle+SDLBundle.m in Sources */, 5D61FCBC1A84238C00846EE7 /* SDLGPSData.m in Sources */, 5D61FD341A84238C00846EE7 /* SDLPowerModeQualificationStatus.m in Sources */, @@ -6591,6 +6965,7 @@ 5D61FD6E1A84238C00846EE7 /* SDLRPCNotification.m in Sources */, 5D8B17501AC9D266006A6E1C /* SDLDialNumber.m in Sources */, 5DBF06281E64A91D00A5CF03 /* SDLLogFileModule.m in Sources */, + 88AF11DD220B6B3D00A59985 /* SDLPerformAppServiceInteraction.m in Sources */, 5D6F7A361BC5B9B60070BF37 /* SDLLockScreenViewController.m in Sources */, 5D61FDE81A84238C00846EE7 /* SDLUnsubscribeButton.m in Sources */, 5D61FCF71A84238C00846EE7 /* SDLMediaClockFormat.m in Sources */, @@ -6625,6 +7000,7 @@ 5DD67CB91E661C4A009CD394 /* SDLLogTargetFile.m in Sources */, 5D61FCBE1A84238C00846EE7 /* SDLHeadLampStatus.m in Sources */, 5D61FD921A84238C00846EE7 /* SDLShowConstantTBT.m in Sources */, + 88E6F1A8220E1588006156F9 /* SDLMediaType.m in Sources */, 5D61FC4E1A84238C00846EE7 /* SDLBitsPerSample.m in Sources */, 5D00AC701F1511B9004000D9 /* SDLGetSystemCapability.m in Sources */, 5D61FDEA1A84238C00846EE7 /* SDLUnsubscribeButtonResponse.m in Sources */, @@ -6643,8 +7019,10 @@ 5D92937D20B70A3E00FCC775 /* SDLPresentKeyboardOperation.m in Sources */, 5DBF06241E64A83F00A5CF03 /* SDLLogManager.m in Sources */, 5D61FC401A84238C00846EE7 /* SDLAmbientLightStatus.m in Sources */, + 88EEC5BC220A327B005AA2F9 /* SDLPublishAppServiceResponse.m in Sources */, 5D61FC951A84238C00846EE7 /* SDLDriverDistractionState.m in Sources */, 5DB996611F28C6ED002D8795 /* SDLControlFramePayloadVideoStartServiceAck.m in Sources */, + 884E702021FB983F008D53BA /* SDLAppServiceManifest.m in Sources */, 5D61FD961A84238C00846EE7 /* SDLShowResponse.m in Sources */, 5D61FD981A84238C00846EE7 /* SDLSingleTireStatus.m in Sources */, 1EB59CA8202D946500343A61 /* SDLMassageModeData.m in Sources */, @@ -6656,6 +7034,10 @@ 8BBEA6071F324165003EEA26 /* SDLMetadataType.m in Sources */, 5D61FDBC1A84238C00846EE7 /* SDLSystemAction.m in Sources */, 5D61FC381A84238C00846EE7 /* SDLAlert.m in Sources */, + 88AAD4BD2211B76800F1E6D7 /* SDLMediaServiceManifest.m in Sources */, + 884E701C21FB8D0F008D53BA /* SDLPublishAppService.m in Sources */, + 8831FA49220235B000B8FFB7 /* SDLAppServicesCapabilities.m in Sources */, + 884E702421FBA952008D53BA /* SDLAppServiceType.m in Sources */, 5D61FD2C1A84238C00846EE7 /* SDLPerformInteractionResponse.m in Sources */, 5D00AC7C1F15287E004000D9 /* SDLPhoneCapability.m in Sources */, 5D61FDF21A84238C00846EE7 /* SDLUpdateTurnList.m in Sources */, @@ -6692,10 +7074,13 @@ 5DBF062E1E64A93A00A5CF03 /* SDLLogFilter.m in Sources */, 5D61FDFA1A84238C00846EE7 /* SDLV2ProtocolHeader.m in Sources */, 5D61FDD01A84238C00846EE7 /* SDLTireStatus.m in Sources */, + 883C22C9222ED84D00939C4C /* SDLRPCFunctionNames.m in Sources */, 5D92935F20B33FF700FCC775 /* SDLChoiceSet.m in Sources */, + 8855F9E4220CB04000A5C897 /* SDLOnAppServiceData.m in Sources */, 5D61FC321A84238C00846EE7 /* SDLAddSubMenu.m in Sources */, 5D61FDF61A84238C00846EE7 /* SDLV1ProtocolHeader.m in Sources */, EE798CA620561218008EDE8E /* SDLSecondaryTransportManager.m in Sources */, + 88B58DC1222045320011B063 /* SDLNavigationJunction.m in Sources */, 5D61FDAA1A84238C00846EE7 /* SDLSpeechCapabilities.m in Sources */, 1E5AD0951F20BEAD0029B8AF /* SDLSetInteriorVehicleDataResponse.m in Sources */, 5D61FDB41A84238C00846EE7 /* SDLSubscribeVehicleDataResponse.m in Sources */, @@ -6708,6 +7093,7 @@ 5D61FCAA1A84238C00846EE7 /* SDLFileType.m in Sources */, 1E5AD0651F207DD50029B8AF /* SDLTemperature.m in Sources */, DA9F7E901DCC04C000ACAE48 /* SDLUnsubscribeWayPointsResponse.m in Sources */, + 88F65137220C74FD00CAF321 /* SDLWeatherData.m in Sources */, 5DE372A21ACB2ED300849FAA /* SDLHMICapabilities.m in Sources */, 5D61FDD41A84238C00846EE7 /* SDLTouchEvent.m in Sources */, 5D61FD881A84238C00846EE7 /* SDLSetGlobalProperties.m in Sources */, @@ -6716,6 +7102,7 @@ 5D61FC3E1A84238C00846EE7 /* SDLAlertResponse.m in Sources */, 5D61FD8C1A84238C00846EE7 /* SDLSetMediaClockTimer.m in Sources */, 5D61FE121A84238C00846EE7 /* SDLWarningLightStatus.m in Sources */, + 8855F9EA220CBA9200A5C897 /* SDLGetFile.m in Sources */, 5D61FCB81A84238C00846EE7 /* SDLGetVehicleDataResponse.m in Sources */, 5D61FC661A84238C00846EE7 /* SDLCompassDirection.m in Sources */, 5D61FD841A84238C00846EE7 /* SDLSetDisplayLayout.m in Sources */, @@ -6727,6 +7114,7 @@ 5D61FDA61A84238C00846EE7 /* SDLSpeak.m in Sources */, 5D4631111F2135850092EFDC /* SDLControlFramePayloadConstants.m in Sources */, 5D339CF0207C08BA000CC364 /* SDLVoiceCommand.m in Sources */, + 88E6F1AE220E19DF006156F9 /* SDLMediaServiceData.m in Sources */, DA9F7E881DCC049900ACAE48 /* SDLSubscribeWayPoints.m in Sources */, 5D61FDDE1A84238C00846EE7 /* SDLTTSChunk.m in Sources */, 5D61FD9E1A84238C00846EE7 /* SDLSliderResponse.m in Sources */, @@ -6771,7 +7159,9 @@ 5D61FD141A84238C00846EE7 /* SDLOnLanguageChange.m in Sources */, 1E5AD0891F20B9AA0029B8AF /* SDLGetInteriorVehicleData.m in Sources */, 5D61FE041A84238C00846EE7 /* SDLVehicleDataResult.m in Sources */, + 88B58DBB222040FF0011B063 /* SDLDirection.m in Sources */, 5D61FD5C1A84238C00846EE7 /* SDLReadDIDResponse.m in Sources */, + 884AF950220B488900E22928 /* SDLOnSystemCapabilityUpdated.m in Sources */, 5D1BF6B0204742FB00D36881 /* SDLDisplayCapabilities+ShowManagerExtensions.m in Sources */, 1EB59CB4202D9B5F00343A61 /* SDLSeatMemoryActionType.m in Sources */, 5D61FD321A84238C00846EE7 /* SDLPolicyDataParser.m in Sources */, @@ -6800,18 +7190,21 @@ 5D92934E20AF4BEF00FCC775 /* SDLRGBColor.m in Sources */, 1E5AD06D1F208BAB0029B8AF /* SDLClimateControlData.m in Sources */, 5D61FE081A84238C00846EE7 /* SDLVehicleDataStatus.m in Sources */, + 880D267E220DE5DF00B3F496 /* SDLWeatherServiceManifest.m in Sources */, 5D9FC2A21FD8814A00ACA5C2 /* SDLAudioFile.m in Sources */, E9C32B9F1AB20C5900F283AF /* EAAccessoryManager+SDLProtocols.m in Sources */, 5D61FDA81A84238C00846EE7 /* SDLSpeakResponse.m in Sources */, 5DB92D331AC9C8BA00C15BB0 /* SDLRPCStruct.m in Sources */, 1EAA474220355FF3000FE74B /* SDLLightControlCapabilities.m in Sources */, 8B7B31A31F2F7FEA00BDC38D /* SDLVideoStreamingFormat.m in Sources */, - DA0C46AD1DCD35080001F2A8 /* SDLNames.m in Sources */, + DA0C46AD1DCD35080001F2A8 /* SDLRPCParameterNames.m in Sources */, 5DA3F3551BC448060026F2D0 /* NSMapTable+Subscripting.m in Sources */, 5D61FCD61A84238C00846EE7 /* SDLImageType.m in Sources */, 5D4D67AD1D2ED37A00468B4A /* SDLNotificationDispatcher.m in Sources */, + 88665B74220B80F400D9DA77 /* SDLWeatherAlert.m in Sources */, 88EED8391F33AE1700E6C42E /* SDLHapticRect.m in Sources */, DA9F7E9C1DCC052C00ACAE48 /* SDLLocationDetails.m in Sources */, + 8880D24822205B1B00964F6A /* SDLNavigationInstruction.m in Sources */, 5D61FD7A1A84238C00846EE7 /* SDLScreenParams.m in Sources */, 1EAA47122033FE80000FE74B /* SDLStationIDNumber.m in Sources */, 5D61FC831A84238C00846EE7 /* SDLDeviceInfo.m in Sources */, @@ -6822,12 +7215,14 @@ 5D61FD641A84238C00846EE7 /* SDLResetGlobalProperties.m in Sources */, 5DCD7AE11FCCA8D200A0FC7F /* SDLCarWindow.m in Sources */, 1E5AD0911F20BE820029B8AF /* SDLSetInteriorVehicleData.m in Sources */, + 884E702C21FBB151008D53BA /* SDLAppServiceRecord.m in Sources */, 5D60088B1BE3ED540094A505 /* SDLStateMachine.m in Sources */, 8877F5EF1F34A72200DC128A /* SDLSendHapticDataResponse.m in Sources */, 5D61FD181A84238C00846EE7 /* SDLOnPermissionsChange.m in Sources */, 8881AFAD2225D61900EA870B /* SDLSetCloudAppProperties.m in Sources */, 1EB59CAC202D96A200343A61 /* SDLMassageCushion.m in Sources */, 5D61FD3E1A84238C00846EE7 /* SDLPrimaryAudioSource.m in Sources */, + 88A7A3C7220CCEA100A9E435 /* SDLGetFileResponse.m in Sources */, 1E5AD0851F20B9290029B8AF /* SDLButtonPressResponse.m in Sources */, 5D82041F1BCD8E6100D0A41B /* SDLConfiguration.m in Sources */, 5D61FD381A84238C00846EE7 /* SDLPredefinedLayout.m in Sources */, @@ -6835,12 +7230,14 @@ 5D61FD0E1A84238C00846EE7 /* SDLOnHashChange.m in Sources */, 5D4D67B51D30161600468B4A /* SDLLockScreenManager.m in Sources */, 5D61FDE41A84238C00846EE7 /* SDLUnregisterAppInterface.m in Sources */, + 88A5E7FE220B642200495E8A /* SDLGetAppServiceDataResponse.m in Sources */, 5D61FC361A84238C00846EE7 /* SDLAirbagStatus.m in Sources */, 5D61FD7E1A84238C00846EE7 /* SDLScrollableMessageResponse.m in Sources */, 5D61FD3A1A84238C00846EE7 /* SDLPrerecordedSpeech.m in Sources */, 5D61FCA11A84238C00846EE7 /* SDLEncodedSyncPDataResponse.m in Sources */, 88B3BF9920DA859800943565 /* SDLFuelType.m in Sources */, 5DD67CC41E68AE82009CD394 /* SDLLogFileModuleMap.m in Sources */, + 88A5E7F8220B5BBC00495E8A /* SDLGetAppServiceData.m in Sources */, 5D61FD401A84238C00846EE7 /* SDLPrioritizedObjectCollection.m in Sources */, 5D61FDC61A84238C00846EE7 /* SDLTCPTransport.m in Sources */, 5D61FE0E1A84238C00846EE7 /* SDLVrCapabilities.m in Sources */, @@ -6903,9 +7300,11 @@ 5DA026901AD44EE700019F86 /* SDLDialNumberResponseSpec.m in Sources */, 162E83901A9BDE8B00906325 /* SDLTireStatusSpec.m in Sources */, 162E82E01A9BDE8B00906325 /* SDLHMILevelSpec.m in Sources */, + 88F65133220C6DC300CAF321 /* SDLWeatherAlertSpec.m in Sources */, 5DC09EDA1F2F7FEC00F4AB1D /* SDLControlFramePayloadNakSpec.m in Sources */, 1EB59CCE202DC97900343A61 /* SDLMassageCushionSpec.m in Sources */, 162E83041A9BDE8B00906325 /* SDLUpdateModeSpec.m in Sources */, + 8855F9E0220C93B700A5C897 /* SDLWeatherDataSpec.m in Sources */, 88DF998D22035CC600477AC1 /* EAAccessory+OCMock.m in Sources */, 162E83801A9BDE8B00906325 /* SDLHMIPermissionsSpec.m in Sources */, 1EAA476C2036A52F000FE74B /* SDLLightCapabilitiesSpec.m in Sources */, @@ -6919,6 +7318,7 @@ 5D6EB4CC1BF28DC600693731 /* NSMapTable+SubscriptingSpec.m in Sources */, 162E83051A9BDE8B00906325 /* SDLVehicleDataActiveStatusSpec.m in Sources */, 162E82E61A9BDE8B00906325 /* SDLInteractionModeSpec.m in Sources */, + 888F8700221DF4880052FE4C /* SDLAsynchronousRPCOperationSpec.m in Sources */, 162E83931A9BDE8B00906325 /* SDLTouchEventSpec.m in Sources */, 5DCF76FE1ACDDB5A00BB647B /* SDLSendLocationResponseSpec.m in Sources */, 162E837D1A9BDE8B00906325 /* SDLEmergencyEventSpec.m in Sources */, @@ -6958,24 +7358,30 @@ 162E83181A9BDE8B00906325 /* SDLOnKeyboardInputSpec.m in Sources */, 1EE8C4441F34A1B900FDC2CF /* SDLClimateControlDataSpec.m in Sources */, 162E83701A9BDE8B00906325 /* SDLUpdateTurnListResponseSpec.m in Sources */, + 88C23E8822297C6000EA171F /* SDLRPCResponseNotificationSpec.m in Sources */, 162E833B1A9BDE8B00906325 /* SDLSetGlobalPropertiesSpec.m in Sources */, + 884AF94C220B3FCC00E22928 /* SDLGetSystemCapabilitySpec.m in Sources */, 162E82F11A9BDE8B00906325 /* SDLPowerModeStatusSpec.m in Sources */, 162E83881A9BDE8B00906325 /* SDLPresetBankCapabilitiesSpec.m in Sources */, 162E837E1A9BDE8B00906325 /* SDLGPSDataSpec.m in Sources */, 5DAE06731BDEC6C000F9B498 /* SDLFileSpec.m in Sources */, 162E82E11A9BDE8B00906325 /* SDLHMIZoneCapabilitiesSpec.m in Sources */, + 88B58DBD222042500011B063 /* SDLDirectionSpec.m in Sources */, 162E83721A9BDE8B00906325 /* SDLAudioPassThruCapabilitiesSpec.m in Sources */, 162E83681A9BDE8B00906325 /* SDLSpeakResponseSpec.m in Sources */, 1EB59CD8202DCCD500343A61 /* SDLMassageCushionFirmnessSpec.m in Sources */, 162E83661A9BDE8B00906325 /* SDLShowResponseSpec.m in Sources */, 5D9F50831BEA5C6100FEF399 /* SDLFileManagerSpec.m in Sources */, + 88AAD4C02211B7E200F1E6D7 /* SDLMediaServiceManifestSpec.m in Sources */, 5DAB5F512098994C00A020C8 /* SDLMenuCellSpec.m in Sources */, 1EE8C4481F38430900FDC2CF /* SDLRadioControlCapabilitiesSpec.m in Sources */, + 8831FA452202307500B8FFB7 /* SDLAppServiceCapabilitySpec.m in Sources */, 162E83221A9BDE8B00906325 /* SDLAddCommandSpec.m in Sources */, 162E83121A9BDE8B00906325 /* SDLOnButtonPressSpec.m in Sources */, 5DAD5F8520507E1F0025624C /* SDLScreenManagerSpec.m in Sources */, 162E838D1A9BDE8B00906325 /* SDLStartTimeSpec.m in Sources */, 1EAA47642035B231000FE74B /* SDLHMISettingsControlCapabilitiesSpec.m in Sources */, + 88B58DC3222047F50011B063 /* SDLNavigationJunctionSpec.m in Sources */, 162E836E1A9BDE8B00906325 /* SDLUnsubscribeButtonResponseSpec.m in Sources */, 5DEF69611FD6FB75004B8C2F /* SDLAudioStreamManagerSpec.m in Sources */, 162E835B1A9BDE8B00906325 /* SDLPerformInteractionResponseSpec.m in Sources */, @@ -6983,7 +7389,9 @@ 162E832D1A9BDE8B00906325 /* SDLEncodedSyncPDataSpec.m in Sources */, 1EE8C44C1F385C7100FDC2CF /* SDLRDSDataSpec.m in Sources */, 5DB92D241AC47B2C00C15BB0 /* SDLHexUtilitySpec.m in Sources */, + 8815D0F022330765000F24E6 /* SDLRPCRequestNotificationSpec.m in Sources */, 162E83281A9BDE8B00906325 /* SDLDeleteCommandSpec.m in Sources */, + 88A81F6C2200FD4A00A691A9 /* SDLAppServiceRecordSpec.m in Sources */, 162E83531A9BDE8B00906325 /* SDLDiagnosticMessageResponseSpec.m in Sources */, 8881AFB52225E37800EA870B /* SDLSetCloudAppPropertiesResponseSpec.m in Sources */, 162E83671A9BDE8B00906325 /* SDLSliderResponseSpec.m in Sources */, @@ -7008,8 +7416,11 @@ 162E832A1A9BDE8B00906325 /* SDLDeleteInteractionChoiceSetSpec.m in Sources */, EE460E0A2066B6E40006EDD3 /* SDLControlFramePayloadRegisterSecondaryTransportNakSpec.m in Sources */, 8881AFBB2225E7FA00EA870B /* SDLGetCloudAppPropertiesSpec.m in Sources */, + 88C282CA220CD17200D02F90 /* SDLGetFileResponseSpec.m in Sources */, + 88AF11D9220B66FD00A59985 /* SDLGetAppServiceDataResponseSpec.m in Sources */, 162E839D1A9BDE8B00906325 /* SDLRPCResponseSpec.m in Sources */, EE460E082066B5F20006EDD3 /* SDLControlFramePayloadTransportEventUpdateSpec.m in Sources */, + 88E6F1AA220E1720006156F9 /* SDLMediaTypeSpec.m in Sources */, 1EE8C4521F38657D00FDC2CF /* SDLTemperatureSpec.m in Sources */, 5DB1BCDF1D243DD3002FFC37 /* SDLLockScreenConfigurationSpec.m in Sources */, 162E82E51A9BDE8B00906325 /* SDLImageTypeSpec.m in Sources */, @@ -7017,6 +7428,7 @@ 162E83421A9BDE8B00906325 /* SDLSubscribeVehicleDataSpec.m in Sources */, 162E83811A9BDE8B00906325 /* SDLImageFieldSpec.m in Sources */, 5D60DF24202B7A80001EDA01 /* SDLAsynchronousRPCRequestOperationSpec.m in Sources */, + 883C22CB222EEF0900939C4C /* SDLRPCFunctionNamesSpec.m in Sources */, 162E834F1A9BDE8B00906325 /* SDLDeleteCommandResponseSpec.m in Sources */, 88B848C91F462E3600DED768 /* TestFileProgressResponse.m in Sources */, 162E83231A9BDE8B00906325 /* SDLAddSubMenuSpec.m in Sources */, @@ -7027,6 +7439,7 @@ 162E83521A9BDE8B00906325 /* SDLDeleteSubMenuResponseSpec.m in Sources */, 162E82E91A9BDE8B00906325 /* SDLKeypressModeSpec.m in Sources */, 162E83211A9BDE8B00906325 /* SDLRPCPayloadSpec.m in Sources */, + 8831FA3F2202227000B8FFB7 /* SDLAppServiceTypeSpec.m in Sources */, 162E83851A9BDE8B00906325 /* SDLMyKeySpec.m in Sources */, 162E83941A9BDE8B00906325 /* SDLTTSChunkSpec.m in Sources */, 1EAA47702036AE89000FE74B /* SDLLightStatusSpec.m in Sources */, @@ -7038,9 +7451,12 @@ 162E83341A9BDE8B00906325 /* SDLPutFileSpec.m in Sources */, 162E837A1A9BDE8B00906325 /* SDLDIDResult.m in Sources */, 162E83171A9BDE8B00906325 /* SDLOnHMIStatusSpec.m in Sources */, + 8831FA392201E3D100B8FFB7 /* SDLAppServiceManifestSpec.m in Sources */, 5DE372A41ACB336600849FAA /* SDLHMICapabilitiesSpec.m in Sources */, 162E82F71A9BDE8B00906325 /* SDLResultSpec.m in Sources */, 1680B1141A9CD7AD00DBD79E /* SDLV1ProtocolHeaderSpec.m in Sources */, + 880D2680220E038800B3F496 /* SDLWeatherServiceManifestSpec.m in Sources */, + 88EEC5BE220A3B8B005AA2F9 /* SDLPublishAppServiceResponseSpec.m in Sources */, 1680B1161A9CD7AD00DBD79E /* SDLProtocolMessageSpec.m in Sources */, DA9F7EB21DCC084300ACAE48 /* SDLDeliveryModeSpec.m in Sources */, 162E83771A9BDE8B00906325 /* SDLClusterModeStatusSpec.m in Sources */, @@ -7094,6 +7510,7 @@ 5D4346471E6F0BDA00B639C6 /* SDLLogFileModuleSpec.m in Sources */, 88A1CF1E21669AC7001ACC75 /* SDLLifecycleConfigurationUpdateSpec.m in Sources */, 1EE8C4581F387ABD00FDC2CF /* SDLButtonPressResponseSpec.m in Sources */, + 884554AF2224554300BAFB6C /* SDLNavigationServiceManifestSpec.m in Sources */, 5DA23FF61F2FAA31009C0313 /* SDLControlFramePayloadRPCStartServiceSpec.m in Sources */, 162E83201A9BDE8B00906325 /* SDLOnVehicleDataSpec.m in Sources */, 1EAA47762036B847000FE74B /* SDLEqualizerSettingsSpec.m in Sources */, @@ -7136,6 +7553,8 @@ 1EE8C4461F3837D200FDC2CF /* SDLModuleDataSpec.m in Sources */, EEA41D45210BA8CF0006CB6E /* TestTCPServer.m in Sources */, 1E89B0DE2031636000A47992 /* SDLSeatControlDataSpec.m in Sources */, + 88A4A0FA22242AB400C6F01D /* SDLNavigationServiceDataSpec.m in Sources */, + 8831FA3D220207DA00B8FFB7 /* SDLServiceUpdateReasonSpec.m in Sources */, 162E831A1A9BDE8B00906325 /* SDLOnLockScreenStatusSpec.m in Sources */, 162E83431A9BDE8B00906325 /* SDLSyncPDataSpec.m in Sources */, 167ED9461A9BCE5D00797BE5 /* SwiftSpec.swift in Sources */, @@ -7143,6 +7562,7 @@ 162E834C1A9BDE8B00906325 /* SDLAlertResponseSpec.m in Sources */, 1680B11B1A9CD7AD00DBD79E /* SDLFunctionIDSpec.m in Sources */, 5DB1BCDA1D243D85002FFC37 /* SDLStateMachineSpec.m in Sources */, + 8831FA4B2202402B00B8FFB7 /* SDLAppServicesCapabilitiesSpec.m in Sources */, 5D4346731E6F617D00B639C6 /* TestLogTarget.m in Sources */, 1EE8C43C1F347EAE00FDC2CF /* SDLTemperatureUnitSpec.m in Sources */, 162E83131A9BDE8B00906325 /* SDLOnCommandSpec.m in Sources */, @@ -7157,6 +7577,7 @@ 162E83741A9BDE8B00906325 /* SDLBodyInformationSpec.m in Sources */, 1EAA477A2036BD46000FE74B /* SDLSISDataSpec.m in Sources */, 5D64FE6D20DA9CE600792F9F /* SDLVideoStreamingStateSpec.m in Sources */, + 88665B6C220B796A00D9DA77 /* SDLPerformAppServiceInteractionResponseSpec.m in Sources */, 162E83641A9BDE8B00906325 /* SDLSetMediaClockTimerResponseSpec.m in Sources */, 162E839C1A9BDE8B00906325 /* SDLRPCRequestSpec.m in Sources */, DA4353E31D2720A30099B8C4 /* SDLPinchGestureSpec.m in Sources */, @@ -7172,6 +7593,7 @@ 162E82D61A9BDE8A00906325 /* SDLComponentVolumeStatusSpec.m in Sources */, 162E835C1A9BDE8B00906325 /* SDLPutFileResponseSpec.m in Sources */, 1EE8C43E1F347F0500FDC2CF /* SDLVentilationModeSpec.m in Sources */, + 88B58DC922204C9E0011B063 /* SDLNavigationActionSpec.m in Sources */, 5DB202271F5F2D030061D189 /* SDLImageResolutionSpec.m in Sources */, DA9F7EAA1DCC061A00ACAE48 /* SDLSubscribeWaypointsResponseSpec.m in Sources */, 162E835F1A9BDE8B00906325 /* SDLResetGlobalPropertiesResponseSpec.m in Sources */, @@ -7181,6 +7603,7 @@ 162E83501A9BDE8B00906325 /* SDLDeleteFileResponseSpec.m in Sources */, 162E83601A9BDE8B00906325 /* SDLScrollableMessageResponseSpec.m in Sources */, 88B3BFA220DA911E00943565 /* SDLFuelRangeSpec.m in Sources */, + 88A5E7FA220B60EC00495E8A /* SDLGetAppServiceDataSpec.m in Sources */, 162E83791A9BDE8B00906325 /* SDLDeviceStatusSpec.m in Sources */, 162E83821A9BDE8B00906325 /* SDLImageSpec.m in Sources */, 162E834A1A9BDE8B00906325 /* SDLAddSubMenuResponseSpec.m in Sources */, @@ -7201,6 +7624,7 @@ EED5CA0A1F4D206800F04000 /* SDLRTPH264PacketizerSpec.m in Sources */, 1EB59CC8202DC86A00343A61 /* SDLModuleTypeSpec.m in Sources */, 162E83611A9BDE8B00906325 /* SDLSetAppIconResponseSpec.m in Sources */, + 88C23E8A22297DE400EA171F /* SDLRPCNotificationNotificationSpec.m in Sources */, 162E83471A9BDE8B00906325 /* SDLUnsubscribeVehicleDataSpec.m in Sources */, 162E839A1A9BDE8B00906325 /* SDLRPCMessageSpec.m in Sources */, 5D0A9F911F15550400CC80DD /* SDLSystemCapabilityTypeSpec.m in Sources */, @@ -7208,6 +7632,7 @@ 162E83311A9BDE8B00906325 /* SDLListFilesSpec.m in Sources */, EE5D1B33208EBCA900D17216 /* SDLTCPTransportSpec.m in Sources */, DA9F7EB01DCC063400ACAE48 /* SDLLocationDetailsSpec.m in Sources */, + 8816772922208B82001FACFF /* SDLNavigationInstructionSpec.m in Sources */, 5DC978261B7A38640012C2F1 /* SDLGlobalsSpec.m in Sources */, 162E82FF1A9BDE8B00906325 /* SDLTextAlignmentSpec.m in Sources */, 162E831F1A9BDE8B00906325 /* SDLOnTouchEventSpec.m in Sources */, @@ -7223,6 +7648,7 @@ 8B7B31AF1F2FBA0200BDC38D /* SDLVideoStreamingCapabilitySpec.m in Sources */, 162E839B1A9BDE8B00906325 /* SDLRPCNotificationSpec.m in Sources */, 162E83581A9BDE8B00906325 /* SDLGetVehicleDataResponseSpec.m in Sources */, + 88E6F1B0220E25B2006156F9 /* SDLMediaServiceDataSpec.m in Sources */, 1EB59CCA202DC8E300343A61 /* SDLMassageZoneSpec.m in Sources */, 8B7B31B11F2FBD9500BDC38D /* SDLVideoStreamingFormatSpec.m in Sources */, 162E831D1A9BDE8B00906325 /* SDLOnSystemRequestSpec.m in Sources */, @@ -7235,11 +7661,14 @@ 885468382225CBA400994D8D /* SDLCloudAppPropertiesSpec.m in Sources */, 88A795D5210678E000056542 /* SDLStaticIconNameSpec.m in Sources */, 1680B1131A9CD7AD00DBD79E /* SDLProtocolHeaderSpec.m in Sources */, + 8855F9EC220CBFB700A5C897 /* SDLGetFileSpec.m in Sources */, 162E82D01A9BDE8A00906325 /* SDLButtonEventModeSpec.m in Sources */, 5DF40B26208FA7DE00DD6FDA /* SDLMenuManagerSpec.m in Sources */, 5DE35E5620CB1C680034BE5A /* SDLPresentKeyboardOperationSpec.m in Sources */, 162E83781A9BDE8B00906325 /* SDLDeviceInfoSpec.m in Sources */, + 88F50D5F220B720E00F34648 /* SDLPerformAppServiceInteractionSpec.m in Sources */, 162E83391A9BDE8B00906325 /* SDLSetAppIconSpec.m in Sources */, + 882FAC4D2209D7EF0062385D /* SDLAppServiceDataSpec.m in Sources */, 162E83011A9BDE8B00906325 /* SDLTimerModeSpec.m in Sources */, 5D0A9F931F15560B00CC80DD /* SDLNavigationCapabilitySpec.m in Sources */, 5D64FE7120DA9E6700792F9F /* SDLStreamingAudioLifecycleManagerSpec.m in Sources */, @@ -7267,8 +7696,10 @@ 1EAA47782036BA74000FE74B /* SDLAudioControlCapabilitiesSpec.m in Sources */, 5DB1BCD51D243A8E002FFC37 /* SDLUploadFileOperationSpec.m in Sources */, 162E83401A9BDE8B00906325 /* SDLSpeakSpec.m in Sources */, + 88A5E7F4220B57F900495E8A /* SDLOnSystemCapabilityUpdatedSpec.m in Sources */, 5DCF76FC1ACDDB4200BB647B /* SDLSendLocationSpec.m in Sources */, 5DB1BCD81D243AA6002FFC37 /* SDLPermissionFilterSpec.m in Sources */, + 88EEC5B8220A2144005AA2F9 /* SDLPublishAppServiceSpec.m in Sources */, 162E83561A9BDE8B00906325 /* SDLGenericResponseSpec.m in Sources */, 162E82D51A9BDE8A00906325 /* SDLCompassDirectionSpec.m in Sources */, 162E83861A9BDE8B00906325 /* SDLParameterPermissionsSpec.m in Sources */, @@ -7297,7 +7728,9 @@ 5DB1BCD31D243A8E002FFC37 /* SDLDeleteFileOperationSpec.m in Sources */, 5D0A9F971F1559EC00CC80DD /* SDLSystemCapabilitySpec.m in Sources */, 162E82F41A9BDE8B00906325 /* SDLPrimaryAudioSource.m in Sources */, + 880D267A220DDD1000B3F496 /* SDLWeatherServiceDataSpec.m in Sources */, EED5CA041F4D1D5E00F04000 /* SDLRAWH264PacketizerSpec.m in Sources */, + 8855F9E6220CB60700A5C897 /* SDLOnAppServiceDataSpec.m in Sources */, 5DBAE0AB1D3588AC00CE00BF /* SDLNotificationDispatcherSpec.m in Sources */, 162E83461A9BDE8B00906325 /* SDLUnsubscribeButtonSpec.m in Sources */, 1EB59CD0202DC9F200343A61 /* SDLSupportedSeatSpec.m in Sources */, diff --git a/SmartDeviceLink.podspec b/SmartDeviceLink.podspec index 48a7ee29a..bcc25538b 100644 --- a/SmartDeviceLink.podspec +++ b/SmartDeviceLink.podspec @@ -28,6 +28,12 @@ sdefault.public_header_files = [ 'SmartDeviceLink/SDLAlertManeuver.h', 'SmartDeviceLink/SDLAlertManeuverResponse.h', 'SmartDeviceLink/SDLAlertResponse.h', +'SmartDeviceLink/SDLAppServiceCapability.h', +'SmartDeviceLink/SDLAppServiceData.h', +'SmartDeviceLink/SDLAppServiceManifest.h', +'SmartDeviceLink/SDLAppServiceRecord.h', +'SmartDeviceLink/SDLAppServicesCapabilities.h', +'SmartDeviceLink/SDLAppServiceType.h', 'SmartDeviceLink/SDLButtonPressResponse.h', 'SmartDeviceLink/SDLAmbientLightStatus.h', 'SmartDeviceLink/SDLAppHMIType.h', @@ -89,6 +95,7 @@ sdefault.public_header_files = [ 'SmartDeviceLink/SDLDialNumberResponse.h', 'SmartDeviceLink/SDLDIDResult.h', 'SmartDeviceLink/SDLDimension.h', +'SmartDeviceLink/SDLDirection.h', 'SmartDeviceLink/SDLDisplayCapabilities.h', 'SmartDeviceLink/SDLDisplayMode.h', 'SmartDeviceLink/SDLDisplayType.h', @@ -114,12 +121,17 @@ sdefault.public_header_files = [ 'SmartDeviceLink/SDLFuelCutoffStatus.h', 'SmartDeviceLink/SDLFuelRange.h', 'SmartDeviceLink/SDLFuelType.h', +'SmartDeviceLink/SDLFunctionID.h', 'SmartDeviceLink/SDLGenericResponse.h', +'SmartDeviceLink/SDLGetAppServiceData.h', +'SmartDeviceLink/SDLGetAppServiceDataResponse.h', 'SmartDeviceLink/SDLGetDTCs.h', 'SmartDeviceLink/SDLGetCloudAppProperties.h', 'SmartDeviceLink/SDLGetCloudAppPropertiesResponse.h', -'SmartDeviceLink/SDLGetInteriorVehicleData.h', 'SmartDeviceLink/SDLGetDTCsResponse.h', +'SmartDeviceLink/SDLGetFile.h', +'SmartDeviceLink/SDLGetFileResponse.h', +'SmartDeviceLink/SDLGetInteriorVehicleData.h', 'SmartDeviceLink/SDLGetInteriorVehicleDataResponse.h', 'SmartDeviceLink/SDLGetSystemCapability.h', 'SmartDeviceLink/SDLGetSystemCapabilityResponse.h', @@ -188,6 +200,9 @@ sdefault.public_header_files = [ 'SmartDeviceLink/SDLMassageMode.h', 'SmartDeviceLink/SDLMassageZone.h', 'SmartDeviceLink/SDLMediaClockFormat.h', +'SmartDeviceLink/SDLMediaServiceData.h', +'SmartDeviceLink/SDLMediaServiceManifest.h', +'SmartDeviceLink/SDLMediaType.h', 'SmartDeviceLink/SDLMenuCell.h', 'SmartDeviceLink/SDLMenuParams.h', 'SmartDeviceLink/SDLMetadataTags.h', @@ -195,10 +210,16 @@ sdefault.public_header_files = [ 'SmartDeviceLink/SDLModuleData.h', 'SmartDeviceLink/SDLModuleType.h', 'SmartDeviceLink/SDLMyKey.h', +'SmartDeviceLink/SDLNavigationAction.h', 'SmartDeviceLink/SDLNavigationCapability.h', +'SmartDeviceLink/SDLNavigationInstruction.h', +'SmartDeviceLink/SDLNavigationJunction.h', +'SmartDeviceLink/SDLNavigationServiceData.h', +'SmartDeviceLink/SDLNavigationServiceManifest.h', 'SmartDeviceLink/SDLNotificationConstants.h', 'SmartDeviceLink/SDLOasisAddress.h', 'SmartDeviceLink/SDLOnAppInterfaceUnregistered.h', +'SmartDeviceLink/SDLOnAppServiceData.h', 'SmartDeviceLink/SDLOnAudioPassThru.h', 'SmartDeviceLink/SDLOnButtonEvent.h', 'SmartDeviceLink/SDLOnButtonPress.h', @@ -214,12 +235,15 @@ sdefault.public_header_files = [ 'SmartDeviceLink/SDLOnPermissionsChange.h', 'SmartDeviceLink/SDLOnRCStatus.h', 'SmartDeviceLink/SDLOnSyncPData.h', +'SmartDeviceLink/SDLOnSystemCapabilityUpdated.h', 'SmartDeviceLink/SDLOnSystemRequest.h', 'SmartDeviceLink/SDLOnTBTClientState.h', 'SmartDeviceLink/SDLOnTouchEvent.h', 'SmartDeviceLink/SDLOnVehicleData.h', 'SmartDeviceLink/SDLOnWayPointChange.h', 'SmartDeviceLink/SDLParameterPermissions.h', +'SmartDeviceLink/SDLPerformAppServiceInteraction.h', +'SmartDeviceLink/SDLPerformAppServiceInteractionResponse.h', 'SmartDeviceLink/SDLPerformAudioPassThru.h', 'SmartDeviceLink/SDLPerformAudioPassThruResponse.h', 'SmartDeviceLink/SDLPerformInteraction.h', @@ -237,6 +261,8 @@ sdefault.public_header_files = [ 'SmartDeviceLink/SDLPresetBankCapabilities.h', 'SmartDeviceLink/SDLPrimaryAudioSource.h', 'SmartDeviceLink/SDLPRNDL.h', +'SmartDeviceLink/SDLPublishAppService.h', +'SmartDeviceLink/SDLPublishAppServiceResponse.h', 'SmartDeviceLink/SDLPutFile.h', 'SmartDeviceLink/SDLPutFileResponse.h', 'SmartDeviceLink/SDLRadioBand.h', @@ -256,11 +282,13 @@ sdefault.public_header_files = [ 'SmartDeviceLink/SDLResetGlobalPropertiesResponse.h', 'SmartDeviceLink/SDLResult.h', 'SmartDeviceLink/SDLRGBColor.h', +'SmartDeviceLink/SDLRPCFunctionNames.h', 'SmartDeviceLink/SDLRPCMessage.h', 'SmartDeviceLink/SDLRPCMessageType.h', 'SmartDeviceLink/SDLRPCNotification.h', 'SmartDeviceLink/SDLRPCNotificationNotification.h', 'SmartDeviceLink/SDLRPCRequest.h', +'SmartDeviceLink/SDLRPCRequestNotification.h', 'SmartDeviceLink/SDLRPCResponse.h', 'SmartDeviceLink/SDLRPCResponseNotification.h', 'SmartDeviceLink/SDLRPCStruct.h', @@ -279,6 +307,7 @@ sdefault.public_header_files = [ 'SmartDeviceLink/SDLSendHapticDataResponse.h', 'SmartDeviceLink/SDLSendLocation.h', 'SmartDeviceLink/SDLSendLocationResponse.h', +'SmartDeviceLink/SDLServiceUpdateReason.h', 'SmartDeviceLink/SDLSetAppIcon.h', 'SmartDeviceLink/SDLSetAppIconResponse.h', 'SmartDeviceLink/SDLSetCloudAppProperties.h', @@ -328,6 +357,7 @@ sdefault.public_header_files = [ 'SmartDeviceLink/SDLSystemCapabilityManager.h', 'SmartDeviceLink/SDLSystemCapabilityType.h', 'SmartDeviceLink/SDLSystemContext.h', +'SmartDeviceLink/SDLSystemRequest.h', 'SmartDeviceLink/SDLTBTState.h', 'SmartDeviceLink/SDLTemperature.h', 'SmartDeviceLink/SDLTemperatureUnit.h', @@ -380,6 +410,10 @@ sdefault.public_header_files = [ 'SmartDeviceLink/SDLVrHelpItem.h', 'SmartDeviceLink/SDLWarningLightStatus.h', 'SmartDeviceLink/SDLWayPointType.h', +'SmartDeviceLink/SDLWeatherAlert.h', +'SmartDeviceLink/SDLWeatherData.h', +'SmartDeviceLink/SDLWeatherServiceData.h', +'SmartDeviceLink/SDLWeatherServiceManifest.h', 'SmartDeviceLink/SDLWiperStatus.h', 'SmartDeviceLink/SmartDeviceLink.h', ] diff --git a/SmartDeviceLink/NSMutableDictionary+Store.h b/SmartDeviceLink/NSMutableDictionary+Store.h index baeb46ca8..3f09d9296 100644 --- a/SmartDeviceLink/NSMutableDictionary+Store.h +++ b/SmartDeviceLink/NSMutableDictionary+Store.h @@ -12,15 +12,15 @@ NS_ASSUME_NONNULL_BEGIN -typedef NSString* SDLName SDL_SWIFT_ENUM; +typedef NSString* SDLRPCParameterName SDL_SWIFT_ENUM; typedef NSString* SDLEnum SDL_SWIFT_ENUM; @interface NSDictionary (Store) -- (void)sdl_setObject:(NSObject *)object forName:(SDLName)name; -- (nullable id)sdl_objectForName:(SDLName)name; -- (nullable id)sdl_objectForName:(SDLName)name ofClass:(Class)classType; -- (NSArray *)sdl_objectsForName:(SDLName)name ofClass:(Class)classType; +- (void)sdl_setObject:(NSObject *)object forName:(SDLRPCParameterName)name; +- (nullable id)sdl_objectForName:(SDLRPCParameterName)name; +- (nullable id)sdl_objectForName:(SDLRPCParameterName)name ofClass:(Class)classType; +- (NSArray *)sdl_objectsForName:(SDLRPCParameterName)name ofClass:(Class)classType; @end diff --git a/SmartDeviceLink/NSMutableDictionary+Store.m b/SmartDeviceLink/NSMutableDictionary+Store.m index 777489b43..990db398d 100644 --- a/SmartDeviceLink/NSMutableDictionary+Store.m +++ b/SmartDeviceLink/NSMutableDictionary+Store.m @@ -12,7 +12,7 @@ NS_ASSUME_NONNULL_BEGIN @implementation NSMutableDictionary (Store) -- (void)sdl_setObject:(NSObject *)object forName:(SDLName)name { +- (void)sdl_setObject:(NSObject *)object forName:(SDLRPCParameterName)name { if (object != nil) { self[name] = object; } else { @@ -20,11 +20,11 @@ NS_ASSUME_NONNULL_BEGIN } } -- (nullable id)sdl_objectForName:(SDLName)name { +- (nullable id)sdl_objectForName:(SDLRPCParameterName)name { return self[name]; } -- (nullable id)sdl_objectForName:(SDLName)name ofClass:(Class)classType { +- (nullable id)sdl_objectForName:(SDLRPCParameterName)name ofClass:(Class)classType { NSObject *obj = [self sdl_objectForName:name]; if (obj == nil || [obj isKindOfClass:classType]) { return obj; @@ -33,7 +33,7 @@ NS_ASSUME_NONNULL_BEGIN } } -- (NSArray *)sdl_objectsForName:(SDLName)name ofClass:(Class)classType { +- (NSArray *)sdl_objectsForName:(SDLRPCParameterName)name ofClass:(Class)classType { NSArray *array = [self sdl_objectForName:name]; if ([array isEqual:[NSNull null]]) { return [NSMutableArray array]; diff --git a/SmartDeviceLink/NSNumber+NumberType.h b/SmartDeviceLink/NSNumber+NumberType.h index 935fba96d..56a584fc0 100644 --- a/SmartDeviceLink/NSNumber+NumberType.h +++ b/SmartDeviceLink/NSNumber+NumberType.h @@ -9,7 +9,7 @@ #import <Foundation/Foundation.h> /** - * A decleration that this NSNumber contains an NSInteger. + * A declaration that this NSNumber contains an NSInteger. */ @protocol SDLInt @end diff --git a/SmartDeviceLink/SDLAddCommand.m b/SmartDeviceLink/SDLAddCommand.m index b90fc2d58..f8c505a71 100644 --- a/SmartDeviceLink/SDLAddCommand.m +++ b/SmartDeviceLink/SDLAddCommand.m @@ -7,14 +7,15 @@ #import "NSMutableDictionary+Store.h" #import "SDLImage.h" #import "SDLMenuParams.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLAddCommand - (instancetype)init { - if (self = [super initWithName:SDLNameAddCommand]) { + if (self = [super initWithName:SDLRPCFunctionNameAddCommand]) { } return self; } @@ -102,35 +103,35 @@ NS_ASSUME_NONNULL_BEGIN #pragma mark - Getters / Setters - (void)setCmdID:(NSNumber<SDLInt> *)cmdID { - [parameters sdl_setObject:cmdID forName:SDLNameCommandId]; + [parameters sdl_setObject:cmdID forName:SDLRPCParameterNameCommandId]; } - (NSNumber<SDLInt> *)cmdID { - return [parameters sdl_objectForName:SDLNameCommandId]; + return [parameters sdl_objectForName:SDLRPCParameterNameCommandId]; } - (void)setMenuParams:(nullable SDLMenuParams *)menuParams { - [parameters sdl_setObject:menuParams forName:SDLNameMenuParams]; + [parameters sdl_setObject:menuParams forName:SDLRPCParameterNameMenuParams]; } - (nullable SDLMenuParams *)menuParams { - return [parameters sdl_objectForName:SDLNameMenuParams ofClass:SDLMenuParams.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameMenuParams ofClass:SDLMenuParams.class]; } - (void)setVrCommands:(nullable NSArray<NSString *> *)vrCommands { - [parameters sdl_setObject:vrCommands forName:SDLNameVRCommands]; + [parameters sdl_setObject:vrCommands forName:SDLRPCParameterNameVRCommands]; } - (nullable NSArray<NSString *> *)vrCommands { - return [parameters sdl_objectForName:SDLNameVRCommands]; + return [parameters sdl_objectForName:SDLRPCParameterNameVRCommands]; } - (void)setCmdIcon:(nullable SDLImage *)cmdIcon { - [parameters sdl_setObject:cmdIcon forName:SDLNameCommandIcon]; + [parameters sdl_setObject:cmdIcon forName:SDLRPCParameterNameCommandIcon]; } - (nullable SDLImage *)cmdIcon { - return [parameters sdl_objectForName:SDLNameCommandIcon ofClass:SDLImage.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameCommandIcon ofClass:SDLImage.class]; } -(id)copyWithZone:(nullable NSZone *)zone { diff --git a/SmartDeviceLink/SDLAddCommandResponse.m b/SmartDeviceLink/SDLAddCommandResponse.m index 877b189ec..2caf3c6e7 100644 --- a/SmartDeviceLink/SDLAddCommandResponse.m +++ b/SmartDeviceLink/SDLAddCommandResponse.m @@ -3,14 +3,15 @@ #import "SDLAddCommandResponse.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLAddCommandResponse - (instancetype)init { - if (self = [super initWithName:SDLNameAddCommand]) { + if (self = [super initWithName:SDLRPCFunctionNameAddCommand]) { } return self; } diff --git a/SmartDeviceLink/SDLAddSubMenu.m b/SmartDeviceLink/SDLAddSubMenu.m index 2792b657d..75794e782 100644 --- a/SmartDeviceLink/SDLAddSubMenu.m +++ b/SmartDeviceLink/SDLAddSubMenu.m @@ -4,14 +4,15 @@ #import "NSMutableDictionary+Store.h" #import "SDLImage.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLAddSubMenu - (instancetype)init { - if (self = [super initWithName:SDLNameAddSubMenu]) { + if (self = [super initWithName:SDLRPCFunctionNameAddSubMenu]) { } return self; } @@ -43,35 +44,35 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setMenuID:(NSNumber<SDLInt> *)menuID { - [parameters sdl_setObject:menuID forName:SDLNameMenuId]; + [parameters sdl_setObject:menuID forName:SDLRPCParameterNameMenuId]; } - (NSNumber<SDLInt> *)menuID { - return [parameters sdl_objectForName:SDLNameMenuId]; + return [parameters sdl_objectForName:SDLRPCParameterNameMenuId]; } - (void)setPosition:(nullable NSNumber<SDLInt> *)position { - [parameters sdl_setObject:position forName:SDLNamePosition]; + [parameters sdl_setObject:position forName:SDLRPCParameterNamePosition]; } - (nullable NSNumber<SDLInt> *)position { - return [parameters sdl_objectForName:SDLNamePosition]; + return [parameters sdl_objectForName:SDLRPCParameterNamePosition]; } - (void)setMenuName:(NSString *)menuName { - [parameters sdl_setObject:menuName forName:SDLNameMenuName]; + [parameters sdl_setObject:menuName forName:SDLRPCParameterNameMenuName]; } - (NSString *)menuName { - return [parameters sdl_objectForName:SDLNameMenuName]; + return [parameters sdl_objectForName:SDLRPCParameterNameMenuName]; } - (void)setMenuIcon:(nullable SDLImage *)menuIcon { - [parameters sdl_setObject:menuIcon forName:SDLNameMenuIcon]; + [parameters sdl_setObject:menuIcon forName:SDLRPCParameterNameMenuIcon]; } - (nullable SDLImage *)menuIcon { - return [parameters sdl_objectForName:SDLNameMenuIcon ofClass:[SDLImage class]]; + return [parameters sdl_objectForName:SDLRPCParameterNameMenuIcon ofClass:[SDLImage class]]; } @end diff --git a/SmartDeviceLink/SDLAddSubMenuResponse.m b/SmartDeviceLink/SDLAddSubMenuResponse.m index 41ab1d8ce..78376e491 100644 --- a/SmartDeviceLink/SDLAddSubMenuResponse.m +++ b/SmartDeviceLink/SDLAddSubMenuResponse.m @@ -3,14 +3,15 @@ #import "SDLAddSubMenuResponse.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLAddSubMenuResponse - (instancetype)init { - if (self = [super initWithName:SDLNameAddSubMenu]) { + if (self = [super initWithName:SDLRPCFunctionNameAddSubMenu]) { } return self; } diff --git a/SmartDeviceLink/SDLAirbagStatus.m b/SmartDeviceLink/SDLAirbagStatus.m index 453d08304..d7839ea02 100644 --- a/SmartDeviceLink/SDLAirbagStatus.m +++ b/SmartDeviceLink/SDLAirbagStatus.m @@ -3,73 +3,73 @@ #import "SDLAirbagStatus.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLAirbagStatus - (void)setDriverAirbagDeployed:(SDLVehicleDataEventStatus)driverAirbagDeployed { - [store sdl_setObject:driverAirbagDeployed forName:SDLNameDriverAirbagDeployed]; + [store sdl_setObject:driverAirbagDeployed forName:SDLRPCParameterNameDriverAirbagDeployed]; } - (SDLVehicleDataEventStatus)driverAirbagDeployed { - return [store sdl_objectForName:SDLNameDriverAirbagDeployed]; + return [store sdl_objectForName:SDLRPCParameterNameDriverAirbagDeployed]; } - (void)setDriverSideAirbagDeployed:(SDLVehicleDataEventStatus)driverSideAirbagDeployed { - [store sdl_setObject:driverSideAirbagDeployed forName:SDLNameDriverSideAirbagDeployed]; + [store sdl_setObject:driverSideAirbagDeployed forName:SDLRPCParameterNameDriverSideAirbagDeployed]; } - (SDLVehicleDataEventStatus)driverSideAirbagDeployed { - return [store sdl_objectForName:SDLNameDriverSideAirbagDeployed]; + return [store sdl_objectForName:SDLRPCParameterNameDriverSideAirbagDeployed]; } - (void)setDriverCurtainAirbagDeployed:(SDLVehicleDataEventStatus)driverCurtainAirbagDeployed { - [store sdl_setObject:driverCurtainAirbagDeployed forName:SDLNameDriverCurtainAirbagDeployed]; + [store sdl_setObject:driverCurtainAirbagDeployed forName:SDLRPCParameterNameDriverCurtainAirbagDeployed]; } - (SDLVehicleDataEventStatus)driverCurtainAirbagDeployed { - return [store sdl_objectForName:SDLNameDriverCurtainAirbagDeployed]; + return [store sdl_objectForName:SDLRPCParameterNameDriverCurtainAirbagDeployed]; } - (void)setPassengerAirbagDeployed:(SDLVehicleDataEventStatus)passengerAirbagDeployed { - [store sdl_setObject:passengerAirbagDeployed forName:SDLNamePassengerAirbagDeployed];} + [store sdl_setObject:passengerAirbagDeployed forName:SDLRPCParameterNamePassengerAirbagDeployed];} - (SDLVehicleDataEventStatus)passengerAirbagDeployed { - return [store sdl_objectForName:SDLNamePassengerAirbagDeployed]; + return [store sdl_objectForName:SDLRPCParameterNamePassengerAirbagDeployed]; } - (void)setPassengerCurtainAirbagDeployed:(SDLVehicleDataEventStatus)passengerCurtainAirbagDeployed { - [store sdl_setObject:passengerCurtainAirbagDeployed forName:SDLNamePassengerCurtainAirbagDeployed]; + [store sdl_setObject:passengerCurtainAirbagDeployed forName:SDLRPCParameterNamePassengerCurtainAirbagDeployed]; } - (SDLVehicleDataEventStatus)passengerCurtainAirbagDeployed { - return [store sdl_objectForName:SDLNamePassengerCurtainAirbagDeployed]; + return [store sdl_objectForName:SDLRPCParameterNamePassengerCurtainAirbagDeployed]; } - (void)setDriverKneeAirbagDeployed:(SDLVehicleDataEventStatus)driverKneeAirbagDeployed { - [store sdl_setObject:driverKneeAirbagDeployed forName:SDLNameDriverKneeAirbagDeployed]; + [store sdl_setObject:driverKneeAirbagDeployed forName:SDLRPCParameterNameDriverKneeAirbagDeployed]; } - (SDLVehicleDataEventStatus)driverKneeAirbagDeployed { - return [store sdl_objectForName:SDLNameDriverKneeAirbagDeployed]; + return [store sdl_objectForName:SDLRPCParameterNameDriverKneeAirbagDeployed]; } - (void)setPassengerSideAirbagDeployed:(SDLVehicleDataEventStatus)passengerSideAirbagDeployed { - [store sdl_setObject:passengerSideAirbagDeployed forName:SDLNamePassengerSideAirbagDeployed]; + [store sdl_setObject:passengerSideAirbagDeployed forName:SDLRPCParameterNamePassengerSideAirbagDeployed]; } - (SDLVehicleDataEventStatus)passengerSideAirbagDeployed { - return [store sdl_objectForName:SDLNamePassengerSideAirbagDeployed]; + return [store sdl_objectForName:SDLRPCParameterNamePassengerSideAirbagDeployed]; } - (void)setPassengerKneeAirbagDeployed:(SDLVehicleDataEventStatus)passengerKneeAirbagDeployed { - [store sdl_setObject:passengerKneeAirbagDeployed forName:SDLNamePassengerKneeAirbagDeployed]; + [store sdl_setObject:passengerKneeAirbagDeployed forName:SDLRPCParameterNamePassengerKneeAirbagDeployed]; } - (SDLVehicleDataEventStatus)passengerKneeAirbagDeployed { - return [store sdl_objectForName:SDLNamePassengerKneeAirbagDeployed]; + return [store sdl_objectForName:SDLRPCParameterNamePassengerKneeAirbagDeployed]; } @end diff --git a/SmartDeviceLink/SDLAlert.m b/SmartDeviceLink/SDLAlert.m index 0f7c78a10..363061694 100644 --- a/SmartDeviceLink/SDLAlert.m +++ b/SmartDeviceLink/SDLAlert.m @@ -3,7 +3,8 @@ #import "SDLAlert.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" #import "SDLSoftButton.h" #import "SDLTTSChunk.h" @@ -14,7 +15,7 @@ NS_ASSUME_NONNULL_BEGIN @implementation SDLAlert - (instancetype)init { - if (self = [super initWithName:SDLNameAlert]) { + if (self = [super initWithName:SDLRPCFunctionNameAlert]) { } return self; } @@ -74,67 +75,67 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setAlertText1:(nullable NSString *)alertText1 { - [parameters sdl_setObject:alertText1 forName:SDLNameAlertText1]; + [parameters sdl_setObject:alertText1 forName:SDLRPCParameterNameAlertText1]; } - (nullable NSString *)alertText1 { - return [parameters sdl_objectForName:SDLNameAlertText1]; + return [parameters sdl_objectForName:SDLRPCParameterNameAlertText1]; } - (void)setAlertText2:(nullable NSString *)alertText2 { - [parameters sdl_setObject:alertText2 forName:SDLNameAlertText2]; + [parameters sdl_setObject:alertText2 forName:SDLRPCParameterNameAlertText2]; } - (nullable NSString *)alertText2 { - return [parameters sdl_objectForName:SDLNameAlertText2]; + return [parameters sdl_objectForName:SDLRPCParameterNameAlertText2]; } - (void)setAlertText3:(nullable NSString *)alertText3 { - [parameters sdl_setObject:alertText3 forName:SDLNameAlertText3]; + [parameters sdl_setObject:alertText3 forName:SDLRPCParameterNameAlertText3]; } - (nullable NSString *)alertText3 { - return [parameters sdl_objectForName:SDLNameAlertText3]; + return [parameters sdl_objectForName:SDLRPCParameterNameAlertText3]; } - (void)setTtsChunks:(nullable NSArray<SDLTTSChunk *> *)ttsChunks { - [parameters sdl_setObject:ttsChunks forName:SDLNameTTSChunks]; + [parameters sdl_setObject:ttsChunks forName:SDLRPCParameterNameTTSChunks]; } - (nullable NSArray<SDLTTSChunk *> *)ttsChunks { - return [parameters sdl_objectsForName:SDLNameTTSChunks ofClass:SDLTTSChunk.class]; + return [parameters sdl_objectsForName:SDLRPCParameterNameTTSChunks ofClass:SDLTTSChunk.class]; } - (void)setDuration:(nullable NSNumber<SDLInt> *)duration { - [parameters sdl_setObject:duration forName:SDLNameDuration]; + [parameters sdl_setObject:duration forName:SDLRPCParameterNameDuration]; } - (nullable NSNumber<SDLInt> *)duration { - return [parameters sdl_objectForName:SDLNameDuration]; + return [parameters sdl_objectForName:SDLRPCParameterNameDuration]; } - (void)setPlayTone:(nullable NSNumber<SDLBool> *)playTone { - [parameters sdl_setObject:playTone forName:SDLNamePlayTone]; + [parameters sdl_setObject:playTone forName:SDLRPCParameterNamePlayTone]; } - (nullable NSNumber<SDLBool> *)playTone { - return [parameters sdl_objectForName:SDLNamePlayTone]; + return [parameters sdl_objectForName:SDLRPCParameterNamePlayTone]; } - (void)setProgressIndicator:(nullable NSNumber<SDLBool> *)progressIndicator { - [parameters sdl_setObject:progressIndicator forName:SDLNameProgressIndicator]; + [parameters sdl_setObject:progressIndicator forName:SDLRPCParameterNameProgressIndicator]; } - (nullable NSNumber<SDLBool> *)progressIndicator { - return [parameters sdl_objectForName:SDLNameProgressIndicator]; + return [parameters sdl_objectForName:SDLRPCParameterNameProgressIndicator]; } - (void)setSoftButtons:(nullable NSArray<SDLSoftButton *> *)softButtons { - [parameters sdl_setObject:softButtons forName:SDLNameSoftButtons]; + [parameters sdl_setObject:softButtons forName:SDLRPCParameterNameSoftButtons]; } - (nullable NSArray<SDLSoftButton *> *)softButtons { - return [parameters sdl_objectsForName:SDLNameSoftButtons ofClass:SDLSoftButton.class]; + return [parameters sdl_objectsForName:SDLRPCParameterNameSoftButtons ofClass:SDLSoftButton.class]; } @end diff --git a/SmartDeviceLink/SDLAlertManeuver.m b/SmartDeviceLink/SDLAlertManeuver.m index f56a53572..3d3ca63ff 100644 --- a/SmartDeviceLink/SDLAlertManeuver.m +++ b/SmartDeviceLink/SDLAlertManeuver.m @@ -5,7 +5,8 @@ #import "SDLAlertManeuver.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" #import "SDLSoftButton.h" #import "SDLTTSChunk.h" @@ -14,7 +15,7 @@ NS_ASSUME_NONNULL_BEGIN @implementation SDLAlertManeuver - (instancetype)init { - if (self = [super initWithName:SDLNameAlertManeuver]) { + if (self = [super initWithName:SDLRPCFunctionNameAlertManeuver]) { } return self; } @@ -38,19 +39,19 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setTtsChunks:(nullable NSArray<SDLTTSChunk *> *)ttsChunks { - [parameters sdl_setObject:ttsChunks forName:SDLNameTTSChunks]; + [parameters sdl_setObject:ttsChunks forName:SDLRPCParameterNameTTSChunks]; } - (nullable NSArray<SDLTTSChunk *> *)ttsChunks { - return [parameters sdl_objectsForName:SDLNameTTSChunks ofClass:SDLTTSChunk.class]; + return [parameters sdl_objectsForName:SDLRPCParameterNameTTSChunks ofClass:SDLTTSChunk.class]; } - (void)setSoftButtons:(nullable NSArray<SDLSoftButton *> *)softButtons { - [parameters sdl_setObject:softButtons forName:SDLNameSoftButtons]; + [parameters sdl_setObject:softButtons forName:SDLRPCParameterNameSoftButtons]; } - (nullable NSArray<SDLSoftButton *> *)softButtons { - return [parameters sdl_objectsForName:SDLNameSoftButtons ofClass:SDLSoftButton.class]; + return [parameters sdl_objectsForName:SDLRPCParameterNameSoftButtons ofClass:SDLSoftButton.class]; } @end diff --git a/SmartDeviceLink/SDLAlertManeuverResponse.m b/SmartDeviceLink/SDLAlertManeuverResponse.m index 99cc21cf5..150678cba 100644 --- a/SmartDeviceLink/SDLAlertManeuverResponse.m +++ b/SmartDeviceLink/SDLAlertManeuverResponse.m @@ -4,14 +4,15 @@ #import "SDLAlertManeuverResponse.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLAlertManeuverResponse - (instancetype)init { - if (self = [super initWithName:SDLNameAlertManeuver]) { + if (self = [super initWithName:SDLRPCFunctionNameAlertManeuver]) { } return self; } diff --git a/SmartDeviceLink/SDLAlertResponse.m b/SmartDeviceLink/SDLAlertResponse.m index e2da4bb91..67bdb20e3 100644 --- a/SmartDeviceLink/SDLAlertResponse.m +++ b/SmartDeviceLink/SDLAlertResponse.m @@ -4,23 +4,24 @@ #import "SDLAlertResponse.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLAlertResponse - (instancetype)init { - if (self = [super initWithName:SDLNameAlert]) { + if (self = [super initWithName:SDLRPCFunctionNameAlert]) { } return self; } - (void)setTryAgainTime:(nullable NSNumber<SDLInt> *)tryAgainTime { - [parameters sdl_setObject:tryAgainTime forName:SDLNameTryAgainTime];} + [parameters sdl_setObject:tryAgainTime forName:SDLRPCParameterNameTryAgainTime];} - (nullable NSNumber<SDLInt> *)tryAgainTime { - return [parameters sdl_objectForName:SDLNameTryAgainTime]; + return [parameters sdl_objectForName:SDLRPCParameterNameTryAgainTime]; } @end diff --git a/SmartDeviceLink/SDLAppInfo.m b/SmartDeviceLink/SDLAppInfo.m index a9102d40e..4f9694564 100644 --- a/SmartDeviceLink/SDLAppInfo.m +++ b/SmartDeviceLink/SDLAppInfo.m @@ -4,7 +4,7 @@ #import "SDLAppInfo.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" static NSString *const SDLBundleShortVersionStringKey = @"CFBundleShortVersionString"; static NSString *const SDLBundleAppNameKey = @"CFBundleName"; @@ -27,27 +27,27 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setAppDisplayName:(NSString *)appDisplayName { - [store sdl_setObject:appDisplayName forName:SDLNameAppDisplayName]; + [store sdl_setObject:appDisplayName forName:SDLRPCParameterNameAppDisplayName]; } - (NSString *)appDisplayName { - return [store sdl_objectForName:SDLNameAppDisplayName]; + return [store sdl_objectForName:SDLRPCParameterNameAppDisplayName]; } - (void)setAppBundleID:(NSString *)appBundleID { - [store sdl_setObject:appBundleID forName:SDLNameAppBundleId]; + [store sdl_setObject:appBundleID forName:SDLRPCParameterNameAppBundleId]; } - (NSString *)appBundleID { - return [store sdl_objectForName:SDLNameAppBundleId]; + return [store sdl_objectForName:SDLRPCParameterNameAppBundleId]; } - (void)setAppVersion:(NSString *)appVersion { - [store sdl_setObject:appVersion forName:SDLNameAppVersion]; + [store sdl_setObject:appVersion forName:SDLRPCParameterNameAppVersion]; } - (NSString *)appVersion { - return [store sdl_objectForName:SDLNameAppVersion]; + return [store sdl_objectForName:SDLRPCParameterNameAppVersion]; } @end diff --git a/SmartDeviceLink/SDLAppServiceCapability.h b/SmartDeviceLink/SDLAppServiceCapability.h new file mode 100644 index 000000000..a842dddd1 --- /dev/null +++ b/SmartDeviceLink/SDLAppServiceCapability.h @@ -0,0 +1,54 @@ +// +// SDLAppServiceCapability.h +// SmartDeviceLink +// +// Created by Nicole on 1/30/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import "SDLRPCRequest.h" +#import "SDLServiceUpdateReason.h" + +@class SDLAppServiceRecord; + +NS_ASSUME_NONNULL_BEGIN + +/* + * A currently available service. + */ +@interface SDLAppServiceCapability : SDLRPCStruct + +/** + * Convenience init for required parameters. + * + * @param updatedAppServiceRecord Service record for a specific app service provider + * @return A SDLAppServiceCapability object + */ +- (instancetype)initWithUpdatedAppServiceRecord:(SDLAppServiceRecord *)updatedAppServiceRecord NS_DESIGNATED_INITIALIZER; + +/** + * Convenience init for all parameters. + * + * @param updateReason Update reason for this service record + * @param updatedAppServiceRecord Service record for a specific app service provider + * @return A SDLAppServiceCapability object + */ +- (instancetype)initWithUpdateReason:(nullable SDLServiceUpdateReason)updateReason updatedAppServiceRecord:(SDLAppServiceRecord *)updatedAppServiceRecord; + +/** + * Only included in `OnSystemCapbilityUpdated`. Update reason for this service record. + * + * SDLServiceUpdateReason, Optional + */ +@property (nullable, strong, nonatomic) SDLServiceUpdateReason updateReason; + +/** + * Service record for a specific app service provider. + * + * SDLAppServiceRecord, Required + */ +@property (strong, nonatomic) SDLAppServiceRecord *updatedAppServiceRecord; + +@end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLAppServiceCapability.m b/SmartDeviceLink/SDLAppServiceCapability.m new file mode 100644 index 000000000..9361b1b09 --- /dev/null +++ b/SmartDeviceLink/SDLAppServiceCapability.m @@ -0,0 +1,60 @@ +// +// SDLAppServiceCapability.m +// SmartDeviceLink +// +// Created by Nicole on 1/30/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import "SDLAppServiceCapability.h" + +#import "NSMutableDictionary+Store.h" +#import "SDLAppServiceRecord.h" +#import "SDLRPCParameterNames.h" +#import "SDLServiceUpdateReason.h" + +NS_ASSUME_NONNULL_BEGIN + +@implementation SDLAppServiceCapability + +- (instancetype)initWithUpdatedAppServiceRecord:(SDLAppServiceRecord *)updatedAppServiceRecord { + self = [super init]; + if (!self) { + return self; + } + + self.updatedAppServiceRecord = updatedAppServiceRecord; + + return self; +} + +- (instancetype)initWithUpdateReason:(nullable SDLServiceUpdateReason)updateReason updatedAppServiceRecord:(SDLAppServiceRecord *)updatedAppServiceRecord { + self = [self initWithUpdatedAppServiceRecord:updatedAppServiceRecord]; + if (!self) { + return self; + } + + self.updateReason = updateReason; + + return self; +} + +- (void)setUpdateReason:(nullable SDLServiceUpdateReason)updateReason { + [store sdl_setObject:updateReason forName:SDLRPCParameterNameUpdateReason]; +} + +- (nullable SDLServiceUpdateReason)updateReason { + return [store sdl_objectForName:SDLRPCParameterNameUpdateReason]; +} + +- (void)setUpdatedAppServiceRecord:(SDLAppServiceRecord *)updatedAppServiceRecord { + [store sdl_setObject:updatedAppServiceRecord forName:SDLRPCParameterNameUpdatedAppServiceRecord]; +} + +- (SDLAppServiceRecord *)updatedAppServiceRecord { + return [store sdl_objectForName:SDLRPCParameterNameUpdatedAppServiceRecord ofClass:SDLAppServiceRecord.class]; +} + +@end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLAppServiceData.h b/SmartDeviceLink/SDLAppServiceData.h new file mode 100644 index 000000000..af2ec4ded --- /dev/null +++ b/SmartDeviceLink/SDLAppServiceData.h @@ -0,0 +1,119 @@ +// +// SDLAppServiceData.h +// SmartDeviceLink +// +// Created by Nicole on 2/1/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import "SDLRPCRequest.h" + +#import "SDLAppServiceType.h" + +@class SDLMediaServiceData; +@class SDLNavigationServiceData; +@class SDLWeatherServiceData; + + +NS_ASSUME_NONNULL_BEGIN + +/* + * Contains all the current data of the app service. The serviceType will link to which of the service data objects are included in this object. (eg if service type equals MEDIA, the mediaServiceData param should be included. + */ +@interface SDLAppServiceData : SDLRPCStruct + +/** + * Convenience init for required parameters. + * + * @param serviceType The type of service that is to be offered by this app. + * @param serviceId A unique ID tied to this specific service record. + * @return A SDLAppServiceData object + */ +- (instancetype)initWithServiceType:(NSString *)serviceType serviceId:(NSString *)serviceId NS_DESIGNATED_INITIALIZER; + +/** + * Convenience init for service type and service id. + * + * @param serviceType The type of service that is to be offered by this app. + * @param serviceId A unique ID tied to this specific service record. + * @return A SDLAppServiceData object + */ +- (instancetype)initWithAppServiceType:(SDLAppServiceType)serviceType serviceId:(NSString *)serviceId; + +/** + * Convenience init for media service data. + * + * @param mediaServiceData The media service data + * @param serviceId A unique ID tied to this specific service record. + * @return A SDLAppServiceData object + */ +- (instancetype)initWithMediaServiceData:(SDLMediaServiceData *)mediaServiceData serviceId:(NSString *)serviceId; + +/** + * Convenience init for weather service data. + * + * @param weatherServiceData The weather service data + * @param serviceId A unique ID tied to this specific service record. + * @return A SDLAppServiceData object + */ +- (instancetype)initWithWeatherServiceData:(SDLWeatherServiceData *)weatherServiceData serviceId:(NSString *)serviceId; + +/** + * Convenience init for navigation service data. + * + * @param navigationServiceData The navigation service data + * @param serviceId A unique ID tied to this specific service record. + * @return A SDLAppServiceData object + */ +- (instancetype)initWithNavigationServiceData:(SDLNavigationServiceData *)navigationServiceData serviceId:(NSString *)serviceId; + +/** + * Convenience init for all parameters. + * + * @param serviceType The type of service that is to be offered by this app. + * @param serviceId A unique ID tied to this specific service record. + * @param mediaServiceData The media service data + * @param weatherServiceData The weather service data + * @param navigationServiceData The navigation service data + * @return A SDLAppServiceData object + */ +- (instancetype)initWithServiceType:(NSString *)serviceType serviceId:(NSString *)serviceId mediaServiceData:(nullable SDLMediaServiceData *)mediaServiceData weatherServiceData:(nullable SDLWeatherServiceData *)weatherServiceData navigationServiceData:(nullable SDLNavigationServiceData *)navigationServiceData; + +/** + * The type of service that is to be offered by this app. See `AppServiceType` for known enum equivalent types. Parameter is a string to allow for new service types to be used by apps on older versions of SDL Core. + * + * String, See `SDLAppServiceType`, Required + */ +@property (strong, nonatomic) NSString *serviceType; + +/** + * A unique ID tied to this specific service record. The ID is supplied by the module that services publish themselves. + * + * String, Required + */ +@property (strong, nonatomic) NSString *serviceId; + +/** + * The media service data. + * + * SDLMediaServiceData, Optional + */ +@property (nullable, strong, nonatomic) SDLMediaServiceData *mediaServiceData; + +/** + * The weather service data. + * + * SDLWeatherServiceData, Optional + */ +@property (nullable, strong, nonatomic) SDLWeatherServiceData *weatherServiceData; + +/** + * The navigation service data. + * + * SDLNavigationServiceData, Optional + */ +@property (nullable, strong, nonatomic) SDLNavigationServiceData *navigationServiceData; + +@end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLAppServiceData.m b/SmartDeviceLink/SDLAppServiceData.m new file mode 100644 index 000000000..8453278ff --- /dev/null +++ b/SmartDeviceLink/SDLAppServiceData.m @@ -0,0 +1,126 @@ +// +// SDLAppServiceData.m +// SmartDeviceLink +// +// Created by Nicole on 2/1/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import "SDLAppServiceData.h" +#import "NSMutableDictionary+Store.h" +#import "SDLRPCParameterNames.h" + +#import "SDLAppServiceType.h" +#import "SDLMediaServiceData.h" +#import "SDLNavigationServiceData.h" +#import "SDLWeatherServiceData.h" + +NS_ASSUME_NONNULL_BEGIN + +@implementation SDLAppServiceData + +- (instancetype)initWithServiceType:(NSString *)serviceType serviceId:(NSString *)serviceId { + self = [super init]; + if (!self) { + return nil; + } + + self.serviceType = serviceType; + self.serviceId = serviceId; + + return self; +} + +- (instancetype)initWithAppServiceType:(SDLAppServiceType)serviceType serviceId:(NSString *)serviceId { + return [self initWithServiceType:serviceType serviceId:serviceId]; +} + +- (instancetype)initWithMediaServiceData:(SDLMediaServiceData *)mediaServiceData serviceId:(NSString *)serviceId { + self = [self initWithServiceType:SDLAppServiceTypeMedia serviceId:serviceId]; + if (!self) { + return nil; + } + + self.mediaServiceData = mediaServiceData; + + return self; +} + +- (instancetype)initWithWeatherServiceData:(SDLWeatherServiceData *)weatherServiceData serviceId:(NSString *)serviceId { + self = [self initWithServiceType:SDLAppServiceTypeWeather serviceId:serviceId]; + if (!self) { + return nil; + } + + self.weatherServiceData = weatherServiceData; + + return self; +} + +- (instancetype)initWithNavigationServiceData:(SDLNavigationServiceData *)navigationServiceData serviceId:(NSString *)serviceId { + self = [self initWithServiceType:SDLAppServiceTypeNavigation serviceId:serviceId]; + if (!self) { + return nil; + } + + self.navigationServiceData = navigationServiceData; + + return self; +} + +- (instancetype)initWithServiceType:(NSString *)serviceType serviceId:(NSString *)serviceId mediaServiceData:(nullable SDLMediaServiceData *)mediaServiceData weatherServiceData:(nullable SDLWeatherServiceData *)weatherServiceData navigationServiceData:(nullable SDLNavigationServiceData *)navigationServiceData { + self = [self initWithServiceType:serviceType serviceId:serviceId]; + if (!self) { + return nil; + } + + self.mediaServiceData = mediaServiceData; + self.weatherServiceData = weatherServiceData; + self.navigationServiceData = navigationServiceData; + + return self; +} + +- (void)setServiceType:(NSString *)serviceType { + [store sdl_setObject:serviceType forName:SDLRPCParameterNameServiceType]; +} + +- (NSString *)serviceType { + return [store sdl_objectForName:SDLRPCParameterNameServiceType]; +} + +- (void)setServiceId:(NSString *)serviceId { + [store sdl_setObject:serviceId forName:SDLRPCParameterNameServiceID]; +} + +- (NSString *)serviceId { + return [store sdl_objectForName:SDLRPCParameterNameServiceID]; +} + +- (void)setWeatherServiceData:(nullable SDLWeatherServiceData *)weatherServiceData { + [store sdl_setObject:weatherServiceData forName:SDLRPCParameterNameWeatherServiceData]; +} + +- (nullable SDLWeatherServiceData *)weatherServiceData { + return [store sdl_objectForName:SDLRPCParameterNameWeatherServiceData ofClass:SDLWeatherServiceData.class]; +} + +- (void)setMediaServiceData:(nullable SDLMediaServiceData *)mediaServiceData { + [store sdl_setObject:mediaServiceData forName:SDLRPCParameterNameMediaServiceData]; +} + +- (nullable SDLMediaServiceData *)mediaServiceData { + return [store sdl_objectForName:SDLRPCParameterNameMediaServiceData ofClass:SDLMediaServiceData.class]; +} + +- (void)setNavigationServiceData:(nullable SDLNavigationServiceData *)navigationServiceData { + [store sdl_setObject:navigationServiceData forName:SDLRPCParameterNameNavigationServiceData]; +} + +- (nullable SDLNavigationServiceData *)navigationServiceData { + return [store sdl_objectForName:SDLRPCParameterNameNavigationServiceData ofClass:SDLNavigationServiceData.class]; +} + +@end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLAppServiceManifest.h b/SmartDeviceLink/SDLAppServiceManifest.h new file mode 100644 index 000000000..dcdbd2138 --- /dev/null +++ b/SmartDeviceLink/SDLAppServiceManifest.h @@ -0,0 +1,164 @@ +// +// SDLAppServiceManifest.h +// SmartDeviceLink +// +// Created by Nicole on 1/25/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import "SDLRPCRequest.h" + +#import "SDLAppServiceType.h" + +@class SDLFunctionID; +@class SDLImage; +@class SDLMediaServiceManifest; +@class SDLNavigationServiceManifest; +@class SDLSyncMsgVersion; +@class SDLWeatherServiceManifest; + + +NS_ASSUME_NONNULL_BEGIN + +/** + * This manifest contains all the information necessary for the service to be published, activated, and allow consumers to interact with it + */ +@interface SDLAppServiceManifest : SDLRPCStruct + +/** + * Convenience init for required parameters only. + * + * @param serviceType The type of service that is to be offered by this app. + * @return A SDLAppServiceManifest object + */ +- (instancetype)initWithServiceType:(NSString *)serviceType NS_DESIGNATED_INITIALIZER; + +/** + * Convenience init for serviceType. + * + * @param serviceType The type of service that is to be offered by this app + * @return A SDLAppServiceManifest object + */ +- (instancetype)initWithAppServiceType:(SDLAppServiceType)serviceType; + +/** + * Convenience init for a media service manifest. + * + * @param serviceName Unique name of this service + * @param serviceIcon The file name of the icon to be associated with this service + * @param allowAppConsumers If true, app service consumers beyond the IVI system will be able to access this service. If false, only the IVI system will be able consume the service. If not provided, it is assumed to be false + * @param rpcSpecVersion This is the max RPC Spec version the app service understands + * @param handledRPCs This field contains the Function IDs for the RPCs that this service intends to handle correctly + * @param mediaServiceManifest A media service manifest + * @return A SDLAppServiceManifest object + */ +- (instancetype)initWithMediaServiceName:(nullable NSString *)serviceName serviceIcon:(nullable SDLImage *)serviceIcon allowAppConsumers:(BOOL)allowAppConsumers rpcSpecVersion:(nullable SDLSyncMsgVersion *)rpcSpecVersion handledRPCs:(nullable NSArray<NSNumber<SDLInt> *> *)handledRPCs mediaServiceManifest:(nullable SDLMediaServiceManifest *)mediaServiceManifest; + +/** + * Convenience init for a weather service manifest. + * + * @param serviceName Unique name of this service + * @param serviceIcon The file name of the icon to be associated with this service + * @param allowAppConsumers If true, app service consumers beyond the IVI system will be able to access this service. If false, only the IVI system will be able consume the service. If not provided, it is assumed to be false + * @param rpcSpecVersion This is the max RPC Spec version the app service understands + * @param handledRPCs This field contains the Function IDs for the RPCs that this service intends to handle correctly + * @param weatherServiceManifest A weather service manifest + * @return A SDLAppServiceManifest object + */ +- (instancetype)initWithWeatherServiceName:(nullable NSString *)serviceName serviceIcon:(nullable SDLImage *)serviceIcon allowAppConsumers:(BOOL)allowAppConsumers rpcSpecVersion:(nullable SDLSyncMsgVersion *)rpcSpecVersion handledRPCs:(nullable NSArray<NSNumber<SDLInt> *> *)handledRPCs weatherServiceManifest:(nullable SDLWeatherServiceManifest *)weatherServiceManifest; + +/** + * Convenience init for a navigation service manifest. + * + * @param serviceName Unique name of this service + * @param serviceIcon The file name of the icon to be associated with this service + * @param allowAppConsumers If true, app service consumers beyond the IVI system will be able to access this service. If false, only the IVI system will be able consume the service. If not provided, it is assumed to be false + * @param rpcSpecVersion This is the max RPC Spec version the app service understands + * @param handledRPCs This field contains the Function IDs for the RPCs that this service intends to handle correctly + * @param navigationServiceManifest A navigation service manifest + * @return A SDLAppServiceManifest object + */ +- (instancetype)initWithNavigationServiceName:(nullable NSString *)serviceName serviceIcon:(nullable SDLImage *)serviceIcon allowAppConsumers:(BOOL)allowAppConsumers rpcSpecVersion:(nullable SDLSyncMsgVersion *)rpcSpecVersion handledRPCs:(nullable NSArray<NSNumber<SDLInt> *> *)handledRPCs navigationServiceManifest:(nullable SDLNavigationServiceManifest *)navigationServiceManifest; + +/** + * Convenience init for all parameters. + * + * @param serviceName Unique name of this service + * @param serviceType The type of service that is to be offered by this app + * @param serviceIcon The file name of the icon to be associated with this service + * @param allowAppConsumers If true, app service consumers beyond the IVI system will be able to access this service. If false, only the IVI system will be able consume the service. If not provided, it is assumed to be false + * @param rpcSpecVersion This is the max RPC Spec version the app service understands + * @param handledRPCs This field contains the Function IDs for the RPCs that this service intends to handle correctly + * @param mediaServiceManifest A media service manifest + * @param weatherServiceManifest A weather service manifest + * @param navigationServiceManifest A navigation service manifest + * @return A SDLAppServiceManifest object + */ +- (instancetype)initWithServiceName:(nullable NSString *)serviceName serviceType:(NSString *)serviceType serviceIcon:(nullable SDLImage *)serviceIcon allowAppConsumers:(BOOL)allowAppConsumers rpcSpecVersion:(nullable SDLSyncMsgVersion *)rpcSpecVersion handledRPCs:(nullable NSArray<NSNumber<SDLInt> *> *)handledRPCs mediaServiceManifest:(nullable SDLMediaServiceManifest *)mediaServiceManifest weatherServiceManifest:(nullable SDLWeatherServiceManifest *)weatherServiceManifest navigationServiceManifest:(nullable SDLNavigationServiceManifest *)navigationServiceManifest; + +/** + * Unique name of this service. + * + * String, Optional + */ +@property (nullable, strong, nonatomic) NSString *serviceName; + +/** + * The type of service that is to be offered by this app. See AppServiceType for known enum equivalent types. Parameter is a string to allow for new service types to be used by apps on older versions of SDL Core. + * + * String, See `SDLAppServiceType`, Required + */ +@property (strong, nonatomic) NSString *serviceType; + +/** + * The file name of the icon to be associated with this service. Most likely the same as the appIcon. + * + * String, Optional + */ +@property (nullable, strong, nonatomic) SDLImage *serviceIcon; + +/** + * If true, app service consumers beyond the IVI system will be able to access this service. If false, only the IVI system will be able consume the service. If not provided, it is assumed to be false. + * + * Boolean, Optional, default = NO + */ +@property (nullable, strong, nonatomic) NSNumber<SDLBool> *allowAppConsumers; + +/** + * This is the max RPC Spec version the app service understands. This is important during the RPC passthrough functionality. If not included, it is assumed the max version of the module is acceptable. + * + * SyncMsgVersion, Optional + */ +@property (nullable, strong, nonatomic) SDLSyncMsgVersion *rpcSpecVersion; + +/** + * This field contains the Function IDs for the RPCs that this service intends to handle correctly. This means the service will provide meaningful responses. See FunctionID for enum equivalent values. This parameter is an integer to allow for new function IDs to be used by apps on older versions of SDL Core. + * + * Array of Integers, See `SDLFunctionID`, Optional + */ +@property (nullable, strong, nonatomic) NSArray<NSNumber<SDLInt> *> *handledRPCs; + +/** + * A media service manifest. + * + * SDLMediaServiceManifest, Optional + */ +@property (nullable, strong, nonatomic) SDLMediaServiceManifest *mediaServiceManifest; + +/** + * A weather service manifest. + * + * SDLWeatherServiceManifest, Optional + */ +@property (nullable, strong, nonatomic) SDLWeatherServiceManifest *weatherServiceManifest; + +/** + * A navigation service manifest. + * + * SDLNavigationServiceManifest, Optional + */ +@property (nullable, strong, nonatomic) SDLNavigationServiceManifest *navigationServiceManifest; + +@end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLAppServiceManifest.m b/SmartDeviceLink/SDLAppServiceManifest.m new file mode 100644 index 000000000..a92470c36 --- /dev/null +++ b/SmartDeviceLink/SDLAppServiceManifest.m @@ -0,0 +1,143 @@ +// +// SDLAppServiceManifest.m +// SmartDeviceLink +// +// Created by Nicole on 1/25/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import "SDLAppServiceManifest.h" +#import "NSMutableDictionary+Store.h" +#import "SDLRPCParameterNames.h" + +#import "SDLFunctionID.h" +#import "SDLImage.h" +#import "SDLMediaServiceManifest.h" +#import "SDLNavigationServiceManifest.h" +#import "SDLSyncMsgVersion.h" +#import "SDLWeatherServiceManifest.h" + +NS_ASSUME_NONNULL_BEGIN + +@implementation SDLAppServiceManifest + +- (instancetype)initWithServiceType:(NSString *)serviceType { + self = [super init]; + if (!self) { + return self; + } + + self.serviceType = serviceType; + + return self; +} + +- (instancetype)initWithAppServiceType:(SDLAppServiceType)serviceType { + return [self initWithServiceType:serviceType]; +} + +- (instancetype)initWithMediaServiceName:(nullable NSString *)serviceName serviceIcon:(nullable SDLImage *)serviceIcon allowAppConsumers:(BOOL)allowAppConsumers rpcSpecVersion:(nullable SDLSyncMsgVersion *)rpcSpecVersion handledRPCs:(nullable NSArray<NSNumber<SDLInt> *> *)handledRPCs mediaServiceManifest:(nullable SDLMediaServiceManifest *)mediaServiceManifest { + return [self initWithServiceName:serviceName serviceType:SDLAppServiceTypeMedia serviceIcon:serviceIcon allowAppConsumers:allowAppConsumers rpcSpecVersion:rpcSpecVersion handledRPCs:handledRPCs mediaServiceManifest:mediaServiceManifest weatherServiceManifest:nil navigationServiceManifest:nil]; +} + +- (instancetype)initWithWeatherServiceName:(nullable NSString *)serviceName serviceIcon:(nullable SDLImage *)serviceIcon allowAppConsumers:(BOOL)allowAppConsumers rpcSpecVersion:(nullable SDLSyncMsgVersion *)rpcSpecVersion handledRPCs:(nullable NSArray<NSNumber<SDLInt> *> *)handledRPCs weatherServiceManifest:(nullable SDLWeatherServiceManifest *)weatherServiceManifest { + return [self initWithServiceName:serviceName serviceType:SDLAppServiceTypeWeather serviceIcon:serviceIcon allowAppConsumers:allowAppConsumers rpcSpecVersion:rpcSpecVersion handledRPCs:handledRPCs mediaServiceManifest:nil weatherServiceManifest:weatherServiceManifest navigationServiceManifest:nil]; +} + +- (instancetype)initWithNavigationServiceName:(nullable NSString *)serviceName serviceIcon:(nullable SDLImage *)serviceIcon allowAppConsumers:(BOOL)allowAppConsumers rpcSpecVersion:(nullable SDLSyncMsgVersion *)rpcSpecVersion handledRPCs:(nullable NSArray<NSNumber<SDLInt> *> *)handledRPCs navigationServiceManifest:(nullable SDLNavigationServiceManifest *)navigationServiceManifest { + return [self initWithServiceName:serviceName serviceType:SDLAppServiceTypeNavigation serviceIcon:serviceIcon allowAppConsumers:allowAppConsumers rpcSpecVersion:rpcSpecVersion handledRPCs:handledRPCs mediaServiceManifest:nil weatherServiceManifest:nil navigationServiceManifest:navigationServiceManifest]; +} + +- (instancetype)initWithServiceName:(nullable NSString *)serviceName serviceType:(NSString *)serviceType serviceIcon:(nullable SDLImage *)serviceIcon allowAppConsumers:(BOOL)allowAppConsumers rpcSpecVersion:(nullable SDLSyncMsgVersion *)rpcSpecVersion handledRPCs:(nullable NSArray<NSNumber<SDLInt> *> *)handledRPCs mediaServiceManifest:(nullable SDLMediaServiceManifest *)mediaServiceManifest weatherServiceManifest:(nullable SDLWeatherServiceManifest *)weatherServiceManifest navigationServiceManifest:(nullable SDLNavigationServiceManifest *)navigationServiceManifest { + self = [self initWithServiceType:serviceType]; + if (!self) { + return self; + } + + self.serviceName = serviceName; + self.serviceIcon = serviceIcon; + self.allowAppConsumers = @(allowAppConsumers); + self.rpcSpecVersion = rpcSpecVersion; + self.handledRPCs = handledRPCs; + self.mediaServiceManifest = mediaServiceManifest; + self.weatherServiceManifest = weatherServiceManifest; + self.navigationServiceManifest = navigationServiceManifest; + + return self; +} + +- (void)setServiceName:(nullable NSString *)serviceName { + [store sdl_setObject:serviceName forName:SDLRPCParameterNameServiceName]; +} + +- (nullable NSString *)serviceName { + return [store sdl_objectForName:SDLRPCParameterNameServiceName]; +} + +- (void)setServiceType:(NSString *)serviceType { + [store sdl_setObject:serviceType forName:SDLRPCParameterNameServiceType]; +} + +- (NSString *)serviceType { + return [store sdl_objectForName:SDLRPCParameterNameServiceType]; +} + +- (void)setServiceIcon:(nullable SDLImage *)serviceIcon { + [store sdl_setObject:serviceIcon forName:SDLRPCParameterNameServiceIcon]; +} + +- (nullable SDLImage *)serviceIcon { + return [store sdl_objectForName:SDLRPCParameterNameServiceIcon ofClass:SDLImage.class]; +} + +- (void)setAllowAppConsumers:(nullable NSNumber<SDLBool> *)allowAppConsumers { + [store sdl_setObject:allowAppConsumers forName:SDLRPCParameterNameAllowAppConsumers]; +} + +- (nullable NSNumber<SDLBool> *)allowAppConsumers { + return [store sdl_objectForName:SDLRPCParameterNameAllowAppConsumers]; +} + +- (void)setRpcSpecVersion:(nullable SDLSyncMsgVersion *)rpcSpecVersion { + [store sdl_setObject:rpcSpecVersion forName:SDLRPCParameterNameRPCSpecVersion]; +} + +- (nullable SDLSyncMsgVersion *)rpcSpecVersion { + return [store sdl_objectForName:SDLRPCParameterNameRPCSpecVersion ofClass:SDLSyncMsgVersion.class]; +} + +- (void)setHandledRPCs:(nullable NSArray<NSNumber<SDLInt> *> *)handledRPCs { + [store sdl_setObject:handledRPCs forName:SDLRPCParameterNameHandledRPCs]; +} + +- (nullable NSArray<NSNumber<SDLInt> *> *)handledRPCs { + return [store sdl_objectForName:SDLRPCParameterNameHandledRPCs]; +} + +- (void)setWeatherServiceManifest:(nullable SDLWeatherServiceManifest *)weatherServiceManifest { + [store sdl_setObject:weatherServiceManifest forName:SDLRPCParameterNameWeatherServiceManifest]; +} + +- (nullable SDLWeatherServiceManifest *)weatherServiceManifest { + return [store sdl_objectForName:SDLRPCParameterNameWeatherServiceManifest ofClass:SDLWeatherServiceManifest.class]; +} + +- (void)setMediaServiceManifest:(nullable SDLMediaServiceManifest *)mediaServiceManifest { + [store sdl_setObject:mediaServiceManifest forName:SDLRPCParameterNameMediaServiceManifest]; +} + +- (nullable SDLMediaServiceManifest *)mediaServiceManifest { + return [store sdl_objectForName:SDLRPCParameterNameMediaServiceManifest ofClass:SDLMediaServiceManifest.class]; +} + +- (void)setNavigationServiceManifest:(nullable SDLNavigationServiceManifest *)navigationServiceManifest { + [store sdl_setObject:navigationServiceManifest forName:SDLRPCParameterNameNavigationServiceManifest]; +} + +- (nullable SDLNavigationServiceManifest *)navigationServiceManifest { + return [store sdl_objectForName:SDLRPCParameterNameNavigationServiceManifest ofClass:SDLNavigationServiceManifest.class]; +} + +@end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLAppServiceRecord.h b/SmartDeviceLink/SDLAppServiceRecord.h new file mode 100644 index 000000000..1d78d61ed --- /dev/null +++ b/SmartDeviceLink/SDLAppServiceRecord.h @@ -0,0 +1,62 @@ +// +// SDLAppServiceRecord.h +// SmartDeviceLink +// +// Created by Nicole on 1/25/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import "SDLRPCRequest.h" + +@class SDLAppServiceManifest; + + +NS_ASSUME_NONNULL_BEGIN + +/* + * This is the record of an app service publisher that the module has. It should contain the most up to date information including the service's active state. + */ +@interface SDLAppServiceRecord : SDLRPCStruct + +/** + * Convenience init for all parameters. + * + * @param serviceID A unique ID tied to this specific service record + * @param serviceManifest Manifest for the service that this record is for + * @param servicePublished If true, the service is published and available. If false, the service has likely just been unpublished, and should be considered unavailable + * @param serviceActive If true, the service is the active primary service of the supplied service type. + * @return A SDLAppServiceRecord object + */ +- (instancetype)initWithServiceID:(NSString *)serviceID serviceManifest:(SDLAppServiceManifest *)serviceManifest servicePublished:(BOOL)servicePublished serviceActive:(BOOL)serviceActive; + +/** + * A unique ID tied to this specific service record. The ID is supplied by the module that services publish themselves. + * + * String, Required + */ +@property (strong, nonatomic) NSString *serviceID; + +/** + * Manifest for the service that this record is for. + * + * SDLAppServiceManifest, Required + */ +@property (strong, nonatomic) SDLAppServiceManifest *serviceManifest; + +/** + * If true, the service is published and available. If false, the service has likely just been unpublished, and should be considered unavailable. + * + * Boolean, Required + */ +@property (strong, nonatomic) NSNumber<SDLBool> *servicePublished; + +/** + * If true, the service is the active primary service of the supplied service type. It will receive all potential RPCs that are passed through to that service type. If false, it is not the primary service of the supplied type. See servicePublished for its availability. + * + * Boolean, Required + */ +@property (strong, nonatomic) NSNumber<SDLBool> *serviceActive; + +@end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLAppServiceRecord.m b/SmartDeviceLink/SDLAppServiceRecord.m new file mode 100644 index 000000000..7f60afdc1 --- /dev/null +++ b/SmartDeviceLink/SDLAppServiceRecord.m @@ -0,0 +1,67 @@ +// +// SDLAppServiceRecord.m +// SmartDeviceLink +// +// Created by Nicole on 1/25/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import "SDLAppServiceRecord.h" + +#import "NSMutableDictionary+Store.h" +#import "SDLAppServiceManifest.h" +#import "SDLRPCParameterNames.h" + +NS_ASSUME_NONNULL_BEGIN + +@implementation SDLAppServiceRecord + +- (instancetype)initWithServiceID:(NSString *)serviceID serviceManifest:(SDLAppServiceManifest *)serviceManifest servicePublished:(BOOL)servicePublished serviceActive:(BOOL)serviceActive { + self = [self init]; + if (!self) { + return self; + } + + self.serviceID = serviceID; + self.serviceManifest = serviceManifest; + self.servicePublished = @(servicePublished); + self.serviceActive = @(serviceActive); + + return self; +} + +- (void)setServiceID:(NSString *)serviceID { + [store sdl_setObject:serviceID forName:SDLRPCParameterNameServiceID]; +} + +- (NSString *)serviceID { + return [store sdl_objectForName:SDLRPCParameterNameServiceID]; +} + +- (void)setServiceManifest:(SDLAppServiceManifest *)serviceManifest { + [store sdl_setObject:serviceManifest forName:SDLRPCParameterNameServiceManifest]; +} + +- (SDLAppServiceManifest *)serviceManifest { + return [store sdl_objectForName:SDLRPCParameterNameServiceManifest ofClass:SDLAppServiceManifest.class]; +} + +- (void)setServicePublished:(NSNumber<SDLBool> *)servicePublished { + [store sdl_setObject:servicePublished forName:SDLRPCParameterNameServicePublished]; +} + +- (NSNumber<SDLBool> *)servicePublished { + return [store sdl_objectForName:SDLRPCParameterNameServicePublished]; +} + +- (void)setServiceActive:(NSNumber<SDLBool> *)serviceActive { + [store sdl_setObject:serviceActive forName:SDLRPCParameterNameServiceActive]; +} + +- (NSNumber<SDLBool> *)serviceActive { + return [store sdl_objectForName:SDLRPCParameterNameServiceActive]; +} + +@end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLAppServiceType.h b/SmartDeviceLink/SDLAppServiceType.h new file mode 100644 index 000000000..920f5109b --- /dev/null +++ b/SmartDeviceLink/SDLAppServiceType.h @@ -0,0 +1,29 @@ +// +// SDLAppServiceType.h +// SmartDeviceLink +// +// Created by Nicole on 1/25/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import "SDLEnum.h" + +/** + * Enumeration listing possible app service types. + */ +typedef SDLEnum SDLAppServiceType SDL_SWIFT_ENUM; + +/** + * The app will have a service type of media. + */ +extern SDLAppServiceType const SDLAppServiceTypeMedia; + +/** + * The app will have a service type of weather. + */ +extern SDLAppServiceType const SDLAppServiceTypeWeather; + +/** + * The app will have a service type of navigation. + */ +extern SDLAppServiceType const SDLAppServiceTypeNavigation; diff --git a/SmartDeviceLink/SDLAppServiceType.m b/SmartDeviceLink/SDLAppServiceType.m new file mode 100644 index 000000000..730990333 --- /dev/null +++ b/SmartDeviceLink/SDLAppServiceType.m @@ -0,0 +1,13 @@ +// +// SDLAppServiceType.m +// SmartDeviceLink +// +// Created by Nicole on 1/25/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import "SDLAppServiceType.h" + +SDLAppServiceType const SDLAppServiceTypeMedia = @"MEDIA"; +SDLAppServiceType const SDLAppServiceTypeWeather = @"WEATHER"; +SDLAppServiceType const SDLAppServiceTypeNavigation = @"NAVIGATION"; diff --git a/SmartDeviceLink/SDLAppServicesCapabilities.h b/SmartDeviceLink/SDLAppServicesCapabilities.h new file mode 100644 index 000000000..707a10acb --- /dev/null +++ b/SmartDeviceLink/SDLAppServicesCapabilities.h @@ -0,0 +1,37 @@ +// +// SDLAppServicesCapabilities.h +// SmartDeviceLink +// +// Created by Nicole on 1/30/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import "SDLRPCRequest.h" + +@class SDLAppServiceCapability; + +NS_ASSUME_NONNULL_BEGIN + +/* + * Capabilities of app services including what service types are supported and the current state of services. + */ +@interface SDLAppServicesCapabilities : SDLRPCStruct + +/** + * Convenience init. + * + * @param appServices An array of currently available services. + * @return A SDLAppServicesCapabilities object + */ +- (instancetype)initWithAppServices:(nullable NSArray<SDLAppServiceCapability *> *)appServices; + +/** + * An array of currently available services. If this is an update to the capability the affected services will include an update reason in that item. + * + * Array of SDLAppServiceCapability, Optional + */ +@property (nullable, strong, nonatomic) NSArray<SDLAppServiceCapability *> *appServices; + +@end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLAppServicesCapabilities.m b/SmartDeviceLink/SDLAppServicesCapabilities.m new file mode 100644 index 000000000..8a747f208 --- /dev/null +++ b/SmartDeviceLink/SDLAppServicesCapabilities.m @@ -0,0 +1,40 @@ +// +// SDLAppServicesCapabilities.m +// SmartDeviceLink +// +// Created by Nicole on 1/30/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import "SDLAppServicesCapabilities.h" + +#import "SDLAppServiceCapability.h" +#import "NSMutableDictionary+Store.h" +#import "SDLRPCParameterNames.h" + +NS_ASSUME_NONNULL_BEGIN + +@implementation SDLAppServicesCapabilities + +- (instancetype)initWithAppServices:(nullable NSArray<SDLAppServiceCapability *> *)appServices { + self = [self init]; + if (!self) { + return self; + } + + self.appServices = appServices; + + return self; +} + +- (void)setAppServices:(nullable NSArray<SDLAppServiceCapability *> *)appServices { + [store sdl_setObject:appServices forName:SDLRPCParameterNameAppServices]; +} + +- (nullable NSArray<SDLAppServiceCapability *> *)appServices { + return [store sdl_objectsForName:SDLRPCParameterNameAppServices ofClass:SDLAppServiceCapability.class]; +} + +@end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLAsynchronousRPCOperation.h b/SmartDeviceLink/SDLAsynchronousRPCOperation.h new file mode 100644 index 000000000..8bb27deb4 --- /dev/null +++ b/SmartDeviceLink/SDLAsynchronousRPCOperation.h @@ -0,0 +1,39 @@ +// +// SDLAsynchronousRPCOperation.h +// SmartDeviceLink +// +// Created by Nicole on 2/20/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import <UIKit/UIKit.h> + +#import "SDLAsynchronousOperation.h" +#import "SDLLifecycleManager.h" + +@protocol SDLConnectionManagerType; + +NS_ASSUME_NONNULL_BEGIN + +/** + * Sends an RPC of type `Response` or `Notification`. Since these RPCs do not get a response from Core, the operation is considered finished as soon as the RPC is sent. RPCs of type `Request` can not be sent using this operation as `Request`s must get a response from Core before the operation is considered finished. To send `Requests` use the `SDLAsynchronousRPCRequestOperation` or the `SDLSequentialRPCRequestOperation` + */ +@interface SDLAsynchronousRPCOperation : SDLAsynchronousOperation + +/** + * An RPC of type `SDLRPCResponse` or `SDLRPCNotification`. + */ +@property (copy, nonatomic) __kindof SDLRPCMessage *rpc; + +/** + * Convenience init. + * + * @param connectionManager The connection manager used to send the RPC + * @param rpc An RPC of type `SDLRPCResponse` or `SDLRPCNotification` to be sent by the connection manager. + * @return A SDLAsynchronousRPCOperation object + */ +- (instancetype)initWithConnectionManager:(id<SDLConnectionManagerType>)connectionManager rpc:(__kindof SDLRPCMessage *)rpc; + +@end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLAsynchronousRPCOperation.m b/SmartDeviceLink/SDLAsynchronousRPCOperation.m new file mode 100644 index 000000000..4fe43a91e --- /dev/null +++ b/SmartDeviceLink/SDLAsynchronousRPCOperation.m @@ -0,0 +1,88 @@ +// +// SDLAsynchronousRPCOperation.m +// SmartDeviceLink +// +// Created by Nicole on 2/20/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import "SDLAsynchronousRPCOperation.h" + +#import "SDLConnectionManagerType.h" +#import "SDLError.h" +#import "SDLRPCMessage.h" + +NS_ASSUME_NONNULL_BEGIN + +@interface SDLAsynchronousRPCOperation () + +@property (weak, nonatomic) id<SDLConnectionManagerType> connectionManager; +@property (strong, nonatomic) NSUUID *operationId; + +@end + +@implementation SDLAsynchronousRPCOperation { + BOOL executing; + BOOL finished; +} + +- (instancetype)init { + self = [super init]; + if (!self) { return nil; } + + executing = NO; + finished = NO; + + _operationId = [NSUUID UUID]; + + return self; +} + +- (instancetype)initWithConnectionManager:(id<SDLConnectionManagerType>)connectionManager rpc:(__kindof SDLRPCMessage *)rpc { + self = [self init]; + + _rpc = rpc; + _connectionManager = connectionManager; + + return self; +} + +- (void)start { + [super start]; + [self sdl_sendRPC:self.rpc]; +} + +- (void)sdl_sendRPC:(__kindof SDLRPCMessage *)rpc { + if (self.isCancelled) { + [self sdl_abortOperation]; + return; + } + + [self.connectionManager sendConnectionRPC:rpc]; + [self finishOperation]; +} + +- (void)sdl_abortOperation { + [self finishOperation]; +} + +#pragma mark - Property Overrides +- (nullable NSString *)name { + return [NSString stringWithFormat:@"%@ - %@", self.class, self.operationId]; +} + +- (NSOperationQueuePriority)queuePriority { + return NSOperationQueuePriorityNormal; +} + +- (NSString *)description { + return [NSString stringWithFormat:@"%@", self.name]; +} + +- (NSString *)debugDescription { + return [NSString stringWithFormat:@"%@, request type=%@", self.name, self.rpc.class]; +} + +@end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLAsynchronousRPCRequestOperation.h b/SmartDeviceLink/SDLAsynchronousRPCRequestOperation.h index a24165dad..908d0d3e6 100644 --- a/SmartDeviceLink/SDLAsynchronousRPCRequestOperation.h +++ b/SmartDeviceLink/SDLAsynchronousRPCRequestOperation.h @@ -15,12 +15,35 @@ NS_ASSUME_NONNULL_BEGIN +/** + * Sends an array RPCs of type `Request` asynchronously. Requests must get a response from Core before the operation is considered finished. + */ @interface SDLAsynchronousRPCRequestOperation : SDLAsynchronousOperation -@property (copy, nonatomic) NSArray<SDLRPCRequest *> *requests; - +/** + * An array of RPCs of type `Request`. + */ +@property (strong, nonatomic) NSArray<SDLRPCRequest *> *requests; + +/** + * Convenience init for sending an array of requests asynchronously. + * + * @param connectionManager The connection manager used to send the RPCs + * @param requests The requests to be sent to Core + * @param progressHandler Called as each request gets a response from Core + * @param completionHandler Called when all requests have a response from Core + * @return A SDLAsynchronousRPCRequestOperation object + */ - (instancetype)initWithConnectionManager:(id<SDLConnectionManagerType>)connectionManager requests:(NSArray<SDLRPCRequest *> *)requests progressHandler:(nullable SDLMultipleAsyncRequestProgressHandler)progressHandler completionHandler:(nullable SDLMultipleRequestCompletionHandler)completionHandler; +/** + * Convenience init for sending one request asynchronously. + * + * @param connectionManager The connection manager used to send the RPCs + * @param request The request to be sent to Core + * @param responseHandler Called when the request has a response from Core + * @return A SDLAsynchronousRPCRequestOperation object + */ - (instancetype)initWithConnectionManager:(id<SDLConnectionManagerType>)connectionManager request:(SDLRPCRequest *)request responseHandler:(nullable SDLResponseHandler)responseHandler; @end diff --git a/SmartDeviceLink/SDLAudioControlCapabilities.m b/SmartDeviceLink/SDLAudioControlCapabilities.m index e0d64d4da..df845666d 100644 --- a/SmartDeviceLink/SDLAudioControlCapabilities.m +++ b/SmartDeviceLink/SDLAudioControlCapabilities.m @@ -2,7 +2,7 @@ // #import "SDLAudioControlCapabilities.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" #import "NSMutableDictionary+Store.h" NS_ASSUME_NONNULL_BEGIN @@ -35,51 +35,51 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setModuleName:(NSString *)moduleName { - [store sdl_setObject:moduleName forName:SDLNameModuleName]; + [store sdl_setObject:moduleName forName:SDLRPCParameterNameModuleName]; } - (NSString *)moduleName { - return [store sdl_objectForName:SDLNameModuleName]; + return [store sdl_objectForName:SDLRPCParameterNameModuleName]; } - (void)setSourceAvailable:(nullable NSNumber<SDLBool> *)sourceAvailable { - [store sdl_setObject:sourceAvailable forName:SDLNameSourceAvailable]; + [store sdl_setObject:sourceAvailable forName:SDLRPCParameterNameSourceAvailable]; } - (nullable NSNumber<SDLBool> *)sourceAvailable { - return [store sdl_objectForName:SDLNameSourceAvailable]; + return [store sdl_objectForName:SDLRPCParameterNameSourceAvailable]; } - (void)setKeepContextAvailable:(nullable NSNumber<SDLBool> *)keepContextAvailable { - [store sdl_setObject:keepContextAvailable forName:SDLNameKeepContextAvailable]; + [store sdl_setObject:keepContextAvailable forName:SDLRPCParameterNameKeepContextAvailable]; } - (nullable NSNumber<SDLBool> *)keepContextAvailable { - return [store sdl_objectForName:SDLNameKeepContextAvailable]; + return [store sdl_objectForName:SDLRPCParameterNameKeepContextAvailable]; } - (void)setVolumeAvailable:(nullable NSNumber<SDLBool> *)volumeAvailable { - [store sdl_setObject:volumeAvailable forName:SDLNameVolumeAvailable]; + [store sdl_setObject:volumeAvailable forName:SDLRPCParameterNameVolumeAvailable]; } - (nullable NSNumber<SDLBool> *)volumeAvailable { - return [store sdl_objectForName:SDLNameVolumeAvailable]; + return [store sdl_objectForName:SDLRPCParameterNameVolumeAvailable]; } - (void)setEqualizerAvailable:(nullable NSNumber<SDLBool> *)equalizerAvailable { - [store sdl_setObject:equalizerAvailable forName:SDLNameEqualizerAvailable]; + [store sdl_setObject:equalizerAvailable forName:SDLRPCParameterNameEqualizerAvailable]; } - (nullable NSNumber<SDLBool> *)equalizerAvailable { - return [store sdl_objectForName:SDLNameEqualizerAvailable]; + return [store sdl_objectForName:SDLRPCParameterNameEqualizerAvailable]; } - (void)setEqualizerMaxChannelId:(nullable NSNumber<SDLInt> *)equalizerMaxChannelId { - [store sdl_setObject:equalizerMaxChannelId forName:SDLNameEqualizerMaxChannelId]; + [store sdl_setObject:equalizerMaxChannelId forName:SDLRPCParameterNameEqualizerMaxChannelId]; } - (nullable NSNumber<SDLInt> *)equalizerMaxChannelId { - return [store sdl_objectForName:SDLNameEqualizerMaxChannelId]; + return [store sdl_objectForName:SDLRPCParameterNameEqualizerMaxChannelId]; } @end diff --git a/SmartDeviceLink/SDLAudioControlData.m b/SmartDeviceLink/SDLAudioControlData.m index 4a572f074..e6737a290 100644 --- a/SmartDeviceLink/SDLAudioControlData.m +++ b/SmartDeviceLink/SDLAudioControlData.m @@ -2,7 +2,7 @@ // #import "SDLAudioControlData.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" #import "NSMutableDictionary+Store.h" NS_ASSUME_NONNULL_BEGIN @@ -24,36 +24,36 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setSource:(nullable SDLPrimaryAudioSource)source { - [store sdl_setObject:source forName:SDLNameSource]; + [store sdl_setObject:source forName:SDLRPCParameterNameSource]; } - (nullable SDLPrimaryAudioSource)source { - return [store sdl_objectForName:SDLNameSource]; + return [store sdl_objectForName:SDLRPCParameterNameSource]; } - (void)setKeepContext:(nullable NSNumber<SDLBool> *)keepContext { - [store sdl_setObject:keepContext forName:SDLNameKeepContext]; + [store sdl_setObject:keepContext forName:SDLRPCParameterNameKeepContext]; } - (nullable NSNumber<SDLBool> *)keepContext { - return [store sdl_objectForName:SDLNameKeepContext]; + return [store sdl_objectForName:SDLRPCParameterNameKeepContext]; } - (void)setVolume:(nullable NSNumber<SDLInt> *)volume { - [store sdl_setObject:volume forName:SDLNameVolume]; + [store sdl_setObject:volume forName:SDLRPCParameterNameVolume]; } - (nullable NSNumber<SDLInt> *)volume { - return [store sdl_objectForName:SDLNameVolume]; + return [store sdl_objectForName:SDLRPCParameterNameVolume]; } - (void)setEqualizerSettings:(nullable NSArray<SDLEqualizerSettings *> *)equalizerSettings { - [store sdl_setObject:equalizerSettings forName:SDLNameEqualizerSettings]; + [store sdl_setObject:equalizerSettings forName:SDLRPCParameterNameEqualizerSettings]; } - (nullable NSArray<SDLEqualizerSettings *> *)equalizerSettings { - return [store sdl_objectForName:SDLNameEqualizerSettings]; + return [store sdl_objectForName:SDLRPCParameterNameEqualizerSettings]; } @end diff --git a/SmartDeviceLink/SDLAudioPassThruCapabilities.m b/SmartDeviceLink/SDLAudioPassThruCapabilities.m index 268170757..0a3232c27 100644 --- a/SmartDeviceLink/SDLAudioPassThruCapabilities.m +++ b/SmartDeviceLink/SDLAudioPassThruCapabilities.m @@ -5,34 +5,34 @@ #import "SDLAudioPassThruCapabilities.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLAudioPassThruCapabilities - (void)setSamplingRate:(SDLSamplingRate)samplingRate { - [store sdl_setObject:samplingRate forName:SDLNameSamplingRate]; + [store sdl_setObject:samplingRate forName:SDLRPCParameterNameSamplingRate]; } - (SDLSamplingRate)samplingRate { - return [store sdl_objectForName:SDLNameSamplingRate]; + return [store sdl_objectForName:SDLRPCParameterNameSamplingRate]; } - (void)setBitsPerSample:(SDLBitsPerSample)bitsPerSample { - [store sdl_setObject:bitsPerSample forName:SDLNameBitsPerSample]; + [store sdl_setObject:bitsPerSample forName:SDLRPCParameterNameBitsPerSample]; } - (SDLBitsPerSample)bitsPerSample { - return [store sdl_objectForName:SDLNameBitsPerSample]; + return [store sdl_objectForName:SDLRPCParameterNameBitsPerSample]; } - (void)setAudioType:(SDLAudioType)audioType { - [store sdl_setObject:audioType forName:SDLNameAudioType]; + [store sdl_setObject:audioType forName:SDLRPCParameterNameAudioType]; } - (SDLAudioType)audioType { - return [store sdl_objectForName:SDLNameAudioType]; + return [store sdl_objectForName:SDLRPCParameterNameAudioType]; } @end diff --git a/SmartDeviceLink/SDLBeltStatus.m b/SmartDeviceLink/SDLBeltStatus.m index d65a1fd74..be3afc858 100644 --- a/SmartDeviceLink/SDLBeltStatus.m +++ b/SmartDeviceLink/SDLBeltStatus.m @@ -4,7 +4,7 @@ #import "SDLBeltStatus.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" #import "SDLVehicleDataEventStatus.h" NS_ASSUME_NONNULL_BEGIN @@ -12,123 +12,123 @@ NS_ASSUME_NONNULL_BEGIN @implementation SDLBeltStatus - (void)setDriverBeltDeployed:(SDLVehicleDataEventStatus)driverBeltDeployed { - [store sdl_setObject:driverBeltDeployed forName:SDLNameDriverBeltDeployed]; + [store sdl_setObject:driverBeltDeployed forName:SDLRPCParameterNameDriverBeltDeployed]; } - (SDLVehicleDataEventStatus)driverBeltDeployed { - return [store sdl_objectForName:SDLNameDriverBeltDeployed]; + return [store sdl_objectForName:SDLRPCParameterNameDriverBeltDeployed]; } - (void)setPassengerBeltDeployed:(SDLVehicleDataEventStatus)passengerBeltDeployed { - [store sdl_setObject:passengerBeltDeployed forName:SDLNamePassengerBeltDeployed]; + [store sdl_setObject:passengerBeltDeployed forName:SDLRPCParameterNamePassengerBeltDeployed]; } - (SDLVehicleDataEventStatus)passengerBeltDeployed { - return [store sdl_objectForName:SDLNamePassengerBeltDeployed]; + return [store sdl_objectForName:SDLRPCParameterNamePassengerBeltDeployed]; } - (void)setPassengerBuckleBelted:(SDLVehicleDataEventStatus)passengerBuckleBelted { - [store sdl_setObject:passengerBuckleBelted forName:SDLNamePassengerBuckleBelted]; + [store sdl_setObject:passengerBuckleBelted forName:SDLRPCParameterNamePassengerBuckleBelted]; } - (SDLVehicleDataEventStatus)passengerBuckleBelted { - return [store sdl_objectForName:SDLNamePassengerBuckleBelted]; + return [store sdl_objectForName:SDLRPCParameterNamePassengerBuckleBelted]; } - (void)setDriverBuckleBelted:(SDLVehicleDataEventStatus)driverBuckleBelted { - [store sdl_setObject:driverBuckleBelted forName:SDLNameDriverBuckleBelted]; + [store sdl_setObject:driverBuckleBelted forName:SDLRPCParameterNameDriverBuckleBelted]; } - (SDLVehicleDataEventStatus)driverBuckleBelted { - return [store sdl_objectForName:SDLNameDriverBuckleBelted]; + return [store sdl_objectForName:SDLRPCParameterNameDriverBuckleBelted]; } - (void)setLeftRow2BuckleBelted:(SDLVehicleDataEventStatus)leftRow2BuckleBelted { - [store sdl_setObject:leftRow2BuckleBelted forName:SDLNameLeftRow2BuckleBelted]; + [store sdl_setObject:leftRow2BuckleBelted forName:SDLRPCParameterNameLeftRow2BuckleBelted]; } - (SDLVehicleDataEventStatus)leftRow2BuckleBelted { - return [store sdl_objectForName:SDLNameLeftRow2BuckleBelted]; + return [store sdl_objectForName:SDLRPCParameterNameLeftRow2BuckleBelted]; } - (void)setPassengerChildDetected:(SDLVehicleDataEventStatus)passengerChildDetected { - [store sdl_setObject:passengerChildDetected forName:SDLNamePassengerChildDetected]; + [store sdl_setObject:passengerChildDetected forName:SDLRPCParameterNamePassengerChildDetected]; } - (SDLVehicleDataEventStatus)passengerChildDetected { - return [store sdl_objectForName:SDLNamePassengerChildDetected]; + return [store sdl_objectForName:SDLRPCParameterNamePassengerChildDetected]; } - (void)setRightRow2BuckleBelted:(SDLVehicleDataEventStatus)rightRow2BuckleBelted { - [store sdl_setObject:rightRow2BuckleBelted forName:SDLNameRightRow2BuckleBelted]; + [store sdl_setObject:rightRow2BuckleBelted forName:SDLRPCParameterNameRightRow2BuckleBelted]; } - (SDLVehicleDataEventStatus)rightRow2BuckleBelted { - return [store sdl_objectForName:SDLNameRightRow2BuckleBelted]; + return [store sdl_objectForName:SDLRPCParameterNameRightRow2BuckleBelted]; } - (void)setMiddleRow2BuckleBelted:(SDLVehicleDataEventStatus)middleRow2BuckleBelted { - [store sdl_setObject:middleRow2BuckleBelted forName:SDLNameMiddleRow2BuckleBelted]; + [store sdl_setObject:middleRow2BuckleBelted forName:SDLRPCParameterNameMiddleRow2BuckleBelted]; } - (SDLVehicleDataEventStatus)middleRow2BuckleBelted { - return [store sdl_objectForName:SDLNameMiddleRow2BuckleBelted]; + return [store sdl_objectForName:SDLRPCParameterNameMiddleRow2BuckleBelted]; } - (void)setMiddleRow3BuckleBelted:(SDLVehicleDataEventStatus)middleRow3BuckleBelted { - [store sdl_setObject:middleRow3BuckleBelted forName:SDLNameMiddleRow3BuckleBelted]; + [store sdl_setObject:middleRow3BuckleBelted forName:SDLRPCParameterNameMiddleRow3BuckleBelted]; } - (SDLVehicleDataEventStatus)middleRow3BuckleBelted { - return [store sdl_objectForName:SDLNameMiddleRow3BuckleBelted]; + return [store sdl_objectForName:SDLRPCParameterNameMiddleRow3BuckleBelted]; } - (void)setLeftRow3BuckleBelted:(SDLVehicleDataEventStatus)leftRow3BuckleBelted { - [store sdl_setObject:leftRow3BuckleBelted forName:SDLNameLeftRow3BuckleBelted]; + [store sdl_setObject:leftRow3BuckleBelted forName:SDLRPCParameterNameLeftRow3BuckleBelted]; } - (SDLVehicleDataEventStatus)leftRow3BuckleBelted { - return [store sdl_objectForName:SDLNameLeftRow3BuckleBelted]; + return [store sdl_objectForName:SDLRPCParameterNameLeftRow3BuckleBelted]; } - (void)setRightRow3BuckleBelted:(SDLVehicleDataEventStatus)rightRow3BuckleBelted { - [store sdl_setObject:rightRow3BuckleBelted forName:SDLNameRightRow3BuckleBelted]; + [store sdl_setObject:rightRow3BuckleBelted forName:SDLRPCParameterNameRightRow3BuckleBelted]; } - (SDLVehicleDataEventStatus)rightRow3BuckleBelted { - return [store sdl_objectForName:SDLNameRightRow3BuckleBelted]; + return [store sdl_objectForName:SDLRPCParameterNameRightRow3BuckleBelted]; } - (void)setLeftRearInflatableBelted:(SDLVehicleDataEventStatus)leftRearInflatableBelted { - [store sdl_setObject:leftRearInflatableBelted forName:SDLNameLeftRearInflatableBelted]; + [store sdl_setObject:leftRearInflatableBelted forName:SDLRPCParameterNameLeftRearInflatableBelted]; } - (SDLVehicleDataEventStatus)leftRearInflatableBelted { - return [store sdl_objectForName:SDLNameLeftRearInflatableBelted]; + return [store sdl_objectForName:SDLRPCParameterNameLeftRearInflatableBelted]; } - (void)setRightRearInflatableBelted:(SDLVehicleDataEventStatus)rightRearInflatableBelted { - [store sdl_setObject:rightRearInflatableBelted forName:SDLNameRightRearInflatableBelted]; + [store sdl_setObject:rightRearInflatableBelted forName:SDLRPCParameterNameRightRearInflatableBelted]; } - (SDLVehicleDataEventStatus)rightRearInflatableBelted { - return [store sdl_objectForName:SDLNameRightRearInflatableBelted]; + return [store sdl_objectForName:SDLRPCParameterNameRightRearInflatableBelted]; } - (void)setMiddleRow1BeltDeployed:(SDLVehicleDataEventStatus)middleRow1BeltDeployed { - [store sdl_setObject:middleRow1BeltDeployed forName:SDLNameMiddleRow1BeltDeployed]; + [store sdl_setObject:middleRow1BeltDeployed forName:SDLRPCParameterNameMiddleRow1BeltDeployed]; } - (SDLVehicleDataEventStatus)middleRow1BeltDeployed { - return [store sdl_objectForName:SDLNameMiddleRow1BeltDeployed]; + return [store sdl_objectForName:SDLRPCParameterNameMiddleRow1BeltDeployed]; } - (void)setMiddleRow1BuckleBelted:(SDLVehicleDataEventStatus)middleRow1BuckleBelted { - [store sdl_setObject:middleRow1BuckleBelted forName:SDLNameMiddleRow1BuckleBelted]; + [store sdl_setObject:middleRow1BuckleBelted forName:SDLRPCParameterNameMiddleRow1BuckleBelted]; } - (SDLVehicleDataEventStatus)middleRow1BuckleBelted { - return [store sdl_objectForName:SDLNameMiddleRow1BuckleBelted]; + return [store sdl_objectForName:SDLRPCParameterNameMiddleRow1BuckleBelted]; } @end diff --git a/SmartDeviceLink/SDLBodyInformation.m b/SmartDeviceLink/SDLBodyInformation.m index 3ffbe97c0..bd276a32e 100644 --- a/SmartDeviceLink/SDLBodyInformation.m +++ b/SmartDeviceLink/SDLBodyInformation.m @@ -7,66 +7,66 @@ #import "NSMutableDictionary+Store.h" #import "SDLIgnitionStableStatus.h" #import "SDLIgnitionStatus.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLBodyInformation - (void)setParkBrakeActive:(NSNumber<SDLBool> *)parkBrakeActive { - [store sdl_setObject:parkBrakeActive forName:SDLNameParkBrakeActive]; + [store sdl_setObject:parkBrakeActive forName:SDLRPCParameterNameParkBrakeActive]; } - (NSNumber<SDLBool> *)parkBrakeActive { - return [store sdl_objectForName:SDLNameParkBrakeActive]; + return [store sdl_objectForName:SDLRPCParameterNameParkBrakeActive]; } - (void)setIgnitionStableStatus:(SDLIgnitionStableStatus)ignitionStableStatus { - [store sdl_setObject:ignitionStableStatus forName:SDLNameIgnitionStableStatus]; + [store sdl_setObject:ignitionStableStatus forName:SDLRPCParameterNameIgnitionStableStatus]; } - (SDLIgnitionStableStatus)ignitionStableStatus { - return [store sdl_objectForName:SDLNameIgnitionStableStatus]; + return [store sdl_objectForName:SDLRPCParameterNameIgnitionStableStatus]; } - (void)setIgnitionStatus:(SDLIgnitionStatus)ignitionStatus { - [store sdl_setObject:ignitionStatus forName:SDLNameIgnitionStatus]; + [store sdl_setObject:ignitionStatus forName:SDLRPCParameterNameIgnitionStatus]; } - (SDLIgnitionStatus)ignitionStatus { - return [store sdl_objectForName:SDLNameIgnitionStatus]; + return [store sdl_objectForName:SDLRPCParameterNameIgnitionStatus]; } - (void)setDriverDoorAjar:(nullable NSNumber<SDLBool> *)driverDoorAjar { - [store sdl_setObject:driverDoorAjar forName:SDLNameDriverDoorAjar]; + [store sdl_setObject:driverDoorAjar forName:SDLRPCParameterNameDriverDoorAjar]; } - (nullable NSNumber<SDLBool> *)driverDoorAjar { - return [store sdl_objectForName:SDLNameDriverDoorAjar]; + return [store sdl_objectForName:SDLRPCParameterNameDriverDoorAjar]; } - (void)setPassengerDoorAjar:(nullable NSNumber<SDLBool> *)passengerDoorAjar { - [store sdl_setObject:passengerDoorAjar forName:SDLNamePassengerDoorAjar]; + [store sdl_setObject:passengerDoorAjar forName:SDLRPCParameterNamePassengerDoorAjar]; } - (nullable NSNumber<SDLBool> *)passengerDoorAjar { - return [store sdl_objectForName:SDLNamePassengerDoorAjar]; + return [store sdl_objectForName:SDLRPCParameterNamePassengerDoorAjar]; } - (void)setRearLeftDoorAjar:(nullable NSNumber<SDLBool> *)rearLeftDoorAjar { - [store sdl_setObject:rearLeftDoorAjar forName:SDLNameRearLeftDoorAjar]; + [store sdl_setObject:rearLeftDoorAjar forName:SDLRPCParameterNameRearLeftDoorAjar]; } - (nullable NSNumber<SDLBool> *)rearLeftDoorAjar { - return [store sdl_objectForName:SDLNameRearLeftDoorAjar]; + return [store sdl_objectForName:SDLRPCParameterNameRearLeftDoorAjar]; } - (void)setRearRightDoorAjar:(nullable NSNumber<SDLBool> *)rearRightDoorAjar { - [store sdl_setObject:rearRightDoorAjar forName:SDLNameRearRightDoorAjar]; + [store sdl_setObject:rearRightDoorAjar forName:SDLRPCParameterNameRearRightDoorAjar]; } - (nullable NSNumber<SDLBool> *)rearRightDoorAjar { - return [store sdl_objectForName:SDLNameRearRightDoorAjar]; + return [store sdl_objectForName:SDLRPCParameterNameRearRightDoorAjar]; } @end diff --git a/SmartDeviceLink/SDLButtonCapabilities.m b/SmartDeviceLink/SDLButtonCapabilities.m index 42aeb7ae5..cf3e7d2e0 100644 --- a/SmartDeviceLink/SDLButtonCapabilities.m +++ b/SmartDeviceLink/SDLButtonCapabilities.m @@ -4,42 +4,42 @@ #import "SDLButtonCapabilities.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLButtonCapabilities - (void)setName:(SDLButtonName)name { - [store sdl_setObject:name forName:SDLNameName]; + [store sdl_setObject:name forName:SDLRPCParameterNameName]; } - (SDLButtonName)name { - return [store sdl_objectForName:SDLNameName]; + return [store sdl_objectForName:SDLRPCParameterNameName]; } - (void)setShortPressAvailable:(NSNumber<SDLBool> *)shortPressAvailable { - [store sdl_setObject:shortPressAvailable forName:SDLNameShortPressAvailable]; + [store sdl_setObject:shortPressAvailable forName:SDLRPCParameterNameShortPressAvailable]; } - (NSNumber<SDLBool> *)shortPressAvailable { - return [store sdl_objectForName:SDLNameShortPressAvailable]; + return [store sdl_objectForName:SDLRPCParameterNameShortPressAvailable]; } - (void)setLongPressAvailable:(NSNumber<SDLBool> *)longPressAvailable { - [store sdl_setObject:longPressAvailable forName:SDLNameLongPressAvailable]; + [store sdl_setObject:longPressAvailable forName:SDLRPCParameterNameLongPressAvailable]; } - (NSNumber<SDLBool> *)longPressAvailable { - return [store sdl_objectForName:SDLNameLongPressAvailable]; + return [store sdl_objectForName:SDLRPCParameterNameLongPressAvailable]; } - (void)setUpDownAvailable:(NSNumber<SDLBool> *)upDownAvailable { - [store sdl_setObject:upDownAvailable forName:SDLNameUpDownAvailable]; + [store sdl_setObject:upDownAvailable forName:SDLRPCParameterNameUpDownAvailable]; } - (NSNumber<SDLBool> *)upDownAvailable { - return [store sdl_objectForName:SDLNameUpDownAvailable]; + return [store sdl_objectForName:SDLRPCParameterNameUpDownAvailable]; } @end diff --git a/SmartDeviceLink/SDLButtonPress.m b/SmartDeviceLink/SDLButtonPress.m index 3555780fc..c0ff1a058 100644 --- a/SmartDeviceLink/SDLButtonPress.m +++ b/SmartDeviceLink/SDLButtonPress.m @@ -3,7 +3,8 @@ // #import "SDLButtonPress.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" #import "NSMutableDictionary+Store.h" NS_ASSUME_NONNULL_BEGIN @@ -11,7 +12,7 @@ NS_ASSUME_NONNULL_BEGIN @implementation SDLButtonPress - (instancetype)init { - if (self = [super initWithName:SDLNameButtonPress]) { + if (self = [super initWithName:SDLRPCFunctionNameButtonPress]) { } return self; } @@ -29,27 +30,27 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setModuleType:(SDLModuleType)moduleType { - [parameters sdl_setObject:moduleType forName:SDLNameModuleType]; + [parameters sdl_setObject:moduleType forName:SDLRPCParameterNameModuleType]; } - (SDLModuleType)moduleType { - return [parameters sdl_objectForName:SDLNameModuleType]; + return [parameters sdl_objectForName:SDLRPCParameterNameModuleType]; } - (void)setButtonName:(SDLButtonName)buttonName { - [parameters sdl_setObject:buttonName forName:SDLNameButtonName]; + [parameters sdl_setObject:buttonName forName:SDLRPCParameterNameButtonName]; } - (SDLButtonName)buttonName { - return [parameters sdl_objectForName:SDLNameButtonName]; + return [parameters sdl_objectForName:SDLRPCParameterNameButtonName]; } - (void)setButtonPressMode:(SDLButtonPressMode)buttonPressMode { - [parameters sdl_setObject:buttonPressMode forName:SDLNameButtonPressMode]; + [parameters sdl_setObject:buttonPressMode forName:SDLRPCParameterNameButtonPressMode]; } - (SDLButtonPressMode)buttonPressMode { - return [parameters sdl_objectForName:SDLNameButtonPressMode]; + return [parameters sdl_objectForName:SDLRPCParameterNameButtonPressMode]; } @end diff --git a/SmartDeviceLink/SDLButtonPressResponse.m b/SmartDeviceLink/SDLButtonPressResponse.m index 3e768a872..6b0beb802 100644 --- a/SmartDeviceLink/SDLButtonPressResponse.m +++ b/SmartDeviceLink/SDLButtonPressResponse.m @@ -3,14 +3,15 @@ // #import "SDLButtonPressResponse.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLButtonPressResponse - (instancetype)init { - if (self = [super initWithName:SDLNameButtonPress]) { + if (self = [super initWithName:SDLRPCFunctionNameButtonPress]) { } return self; } diff --git a/SmartDeviceLink/SDLChangeRegistration.m b/SmartDeviceLink/SDLChangeRegistration.m index 6d5c2bb4b..64a7024c5 100644 --- a/SmartDeviceLink/SDLChangeRegistration.m +++ b/SmartDeviceLink/SDLChangeRegistration.m @@ -5,7 +5,8 @@ #import "SDLChangeRegistration.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" #import "SDLTTSChunk.h" NS_ASSUME_NONNULL_BEGIN @@ -13,7 +14,7 @@ NS_ASSUME_NONNULL_BEGIN @implementation SDLChangeRegistration - (instancetype)init { - if (self = [super initWithName:SDLNameChangeRegistration]) { + if (self = [super initWithName:SDLRPCFunctionNameChangeRegistration]) { } return self; } @@ -44,51 +45,51 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setLanguage:(SDLLanguage)language { - [parameters sdl_setObject:language forName:SDLNameLanguage]; + [parameters sdl_setObject:language forName:SDLRPCParameterNameLanguage]; } - (SDLLanguage)language { - return [parameters sdl_objectForName:SDLNameLanguage]; + return [parameters sdl_objectForName:SDLRPCParameterNameLanguage]; } - (void)setHmiDisplayLanguage:(SDLLanguage )hmiDisplayLanguage { - [parameters sdl_setObject:hmiDisplayLanguage forName:SDLNameHMIDisplayLanguage]; + [parameters sdl_setObject:hmiDisplayLanguage forName:SDLRPCParameterNameHMIDisplayLanguage]; } - (SDLLanguage)hmiDisplayLanguage { - return [parameters sdl_objectForName:SDLNameHMIDisplayLanguage]; + return [parameters sdl_objectForName:SDLRPCParameterNameHMIDisplayLanguage]; } - (void)setAppName:(nullable NSString *)appName { - [parameters sdl_setObject:appName forName:SDLNameAppName]; + [parameters sdl_setObject:appName forName:SDLRPCParameterNameAppName]; } - (nullable NSString *)appName { - return [[parameters sdl_objectForName:SDLNameAppName] copy]; + return [[parameters sdl_objectForName:SDLRPCParameterNameAppName] copy]; } - (void)setTtsName:(nullable NSArray<SDLTTSChunk *> *)ttsName { - [parameters sdl_setObject:ttsName forName:SDLNameTTSName]; + [parameters sdl_setObject:ttsName forName:SDLRPCParameterNameTTSName]; } - (nullable NSArray<SDLTTSChunk *> *)ttsName { - return [parameters sdl_objectsForName:SDLNameTTSName ofClass:SDLTTSChunk.class]; + return [parameters sdl_objectsForName:SDLRPCParameterNameTTSName ofClass:SDLTTSChunk.class]; } - (void)setNgnMediaScreenAppName:(nullable NSString *)ngnMediaScreenAppName { - [parameters sdl_setObject:ngnMediaScreenAppName forName:SDLNameNGNMediaScreenAppName]; + [parameters sdl_setObject:ngnMediaScreenAppName forName:SDLRPCParameterNameNGNMediaScreenAppName]; } - (nullable NSString *)ngnMediaScreenAppName { - return [parameters sdl_objectForName:SDLNameNGNMediaScreenAppName]; + return [parameters sdl_objectForName:SDLRPCParameterNameNGNMediaScreenAppName]; } - (void)setVrSynonyms:(nullable NSArray<NSString *> *)vrSynonyms { - [parameters sdl_setObject:vrSynonyms forName:SDLNameVRSynonyms]; + [parameters sdl_setObject:vrSynonyms forName:SDLRPCParameterNameVRSynonyms]; } - (nullable NSArray<NSString *> *)vrSynonyms { - return [parameters sdl_objectForName:SDLNameVRSynonyms]; + return [parameters sdl_objectForName:SDLRPCParameterNameVRSynonyms]; } @end diff --git a/SmartDeviceLink/SDLChangeRegistrationResponse.m b/SmartDeviceLink/SDLChangeRegistrationResponse.m index 1e5e6cbae..0765ffb00 100644 --- a/SmartDeviceLink/SDLChangeRegistrationResponse.m +++ b/SmartDeviceLink/SDLChangeRegistrationResponse.m @@ -5,14 +5,15 @@ #import "SDLChangeRegistrationResponse.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLChangeRegistrationResponse - (instancetype)init { - if (self = [super initWithName:SDLNameChangeRegistration]) { + if (self = [super initWithName:SDLRPCFunctionNameChangeRegistration]) { } return self; } diff --git a/SmartDeviceLink/SDLChoice.m b/SmartDeviceLink/SDLChoice.m index 7545ec4f5..2417828d2 100644 --- a/SmartDeviceLink/SDLChoice.m +++ b/SmartDeviceLink/SDLChoice.m @@ -5,7 +5,7 @@ #import "NSMutableDictionary+Store.h" #import "SDLImage.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" NS_ASSUME_NONNULL_BEGIN @@ -39,59 +39,59 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setChoiceID:(NSNumber<SDLInt> *)choiceID { - [store sdl_setObject:choiceID forName:SDLNameChoiceId]; + [store sdl_setObject:choiceID forName:SDLRPCParameterNameChoiceId]; } - (NSNumber<SDLInt> *)choiceID { - return [store sdl_objectForName:SDLNameChoiceId]; + return [store sdl_objectForName:SDLRPCParameterNameChoiceId]; } - (void)setMenuName:(NSString *)menuName { - [store sdl_setObject:menuName forName:SDLNameMenuName]; + [store sdl_setObject:menuName forName:SDLRPCParameterNameMenuName]; } - (NSString *)menuName { - return [store sdl_objectForName:SDLNameMenuName]; + return [store sdl_objectForName:SDLRPCParameterNameMenuName]; } - (void)setVrCommands:(nullable NSArray<NSString *> *)vrCommands { - [store sdl_setObject:vrCommands forName:SDLNameVRCommands]; + [store sdl_setObject:vrCommands forName:SDLRPCParameterNameVRCommands]; } - (nullable NSArray<NSString *> *)vrCommands { - return [store sdl_objectForName:SDLNameVRCommands]; + return [store sdl_objectForName:SDLRPCParameterNameVRCommands]; } - (void)setImage:(nullable SDLImage *)image { - [store sdl_setObject:image forName:SDLNameImage]; + [store sdl_setObject:image forName:SDLRPCParameterNameImage]; } - (nullable SDLImage *)image { - return [store sdl_objectForName:SDLNameImage ofClass:SDLImage.class]; + return [store sdl_objectForName:SDLRPCParameterNameImage ofClass:SDLImage.class]; } - (void)setSecondaryText:(nullable NSString *)secondaryText { - [store sdl_setObject:secondaryText forName:SDLNameSecondaryText]; + [store sdl_setObject:secondaryText forName:SDLRPCParameterNameSecondaryText]; } - (nullable NSString *)secondaryText { - return [store sdl_objectForName:SDLNameSecondaryText]; + return [store sdl_objectForName:SDLRPCParameterNameSecondaryText]; } - (void)setTertiaryText:(nullable NSString *)tertiaryText { - [store sdl_setObject:tertiaryText forName:SDLNameTertiaryText]; + [store sdl_setObject:tertiaryText forName:SDLRPCParameterNameTertiaryText]; } - (nullable NSString *)tertiaryText { - return [store sdl_objectForName:SDLNameTertiaryText]; + return [store sdl_objectForName:SDLRPCParameterNameTertiaryText]; } - (void)setSecondaryImage:(nullable SDLImage *)secondaryImage { - [store sdl_setObject:secondaryImage forName:SDLNameSecondaryImage]; + [store sdl_setObject:secondaryImage forName:SDLRPCParameterNameSecondaryImage]; } - (nullable SDLImage *)secondaryImage { - return [store sdl_objectForName:SDLNameSecondaryImage ofClass:SDLImage.class]; + return [store sdl_objectForName:SDLRPCParameterNameSecondaryImage ofClass:SDLImage.class]; } @end diff --git a/SmartDeviceLink/SDLClimateControlCapabilities.m b/SmartDeviceLink/SDLClimateControlCapabilities.m index 429331ac1..25570ecbd 100644 --- a/SmartDeviceLink/SDLClimateControlCapabilities.m +++ b/SmartDeviceLink/SDLClimateControlCapabilities.m @@ -3,7 +3,7 @@ // #import "SDLClimateControlCapabilities.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" #import "NSMutableDictionary+Store.h" NS_ASSUME_NONNULL_BEGIN @@ -39,131 +39,131 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setModuleName:(NSString *)moduleName { - [store sdl_setObject:moduleName forName:SDLNameModuleName]; + [store sdl_setObject:moduleName forName:SDLRPCParameterNameModuleName]; } - (NSString *)moduleName { - return [store sdl_objectForName:SDLNameModuleName]; + return [store sdl_objectForName:SDLRPCParameterNameModuleName]; } - (void)setFanSpeedAvailable:(nullable NSNumber<SDLBool> *)fanSpeedAvailable { - [store sdl_setObject:fanSpeedAvailable forName:SDLNameFanSpeedAvailable]; + [store sdl_setObject:fanSpeedAvailable forName:SDLRPCParameterNameFanSpeedAvailable]; } - (nullable NSNumber<SDLBool> *)fanSpeedAvailable { - return [store sdl_objectForName:SDLNameFanSpeedAvailable]; + return [store sdl_objectForName:SDLRPCParameterNameFanSpeedAvailable]; } - (void)setDesiredTemperatureAvailable:(nullable NSNumber<SDLBool> *)desiredTemperatureAvailable { - [store sdl_setObject:desiredTemperatureAvailable forName:SDLNameDesiredTemperatureAvailable]; + [store sdl_setObject:desiredTemperatureAvailable forName:SDLRPCParameterNameDesiredTemperatureAvailable]; } - (nullable NSNumber<SDLBool> *)desiredTemperatureAvailable { - return [store sdl_objectForName:SDLNameDesiredTemperatureAvailable]; + return [store sdl_objectForName:SDLRPCParameterNameDesiredTemperatureAvailable]; } - (void)setAcEnableAvailable:(nullable NSNumber<SDLBool> *)acEnableAvailable { - [store sdl_setObject:acEnableAvailable forName:SDLNameACEnableAvailable]; + [store sdl_setObject:acEnableAvailable forName:SDLRPCParameterNameACEnableAvailable]; } - (nullable NSNumber<SDLBool> *)acEnableAvailable { - return [store sdl_objectForName:SDLNameACEnableAvailable]; + return [store sdl_objectForName:SDLRPCParameterNameACEnableAvailable]; } - (void)setAcMaxEnableAvailable:(nullable NSNumber<SDLBool> *)acMaxEnableAvailable { - [store sdl_setObject:acMaxEnableAvailable forName:SDLNameACMaxEnableAvailable]; + [store sdl_setObject:acMaxEnableAvailable forName:SDLRPCParameterNameACMaxEnableAvailable]; } - (nullable NSNumber<SDLBool> *)acMaxEnableAvailable { - return [store sdl_objectForName:SDLNameACMaxEnableAvailable]; + return [store sdl_objectForName:SDLRPCParameterNameACMaxEnableAvailable]; } - (void)setCirculateAirEnableAvailable:(nullable NSNumber<SDLBool> *)circulateAirEnableAvailable { - [store sdl_setObject:circulateAirEnableAvailable forName:SDLNameCirculateAirEnableAvailable]; + [store sdl_setObject:circulateAirEnableAvailable forName:SDLRPCParameterNameCirculateAirEnableAvailable]; } - (nullable NSNumber<SDLBool> *)circulateAirEnableAvailable { - return [store sdl_objectForName:SDLNameCirculateAirEnableAvailable]; + return [store sdl_objectForName:SDLRPCParameterNameCirculateAirEnableAvailable]; } - (void)setAutoModeEnableAvailable:(nullable NSNumber<SDLBool> *)autoModeEnableAvailable { - [store sdl_setObject:autoModeEnableAvailable forName:SDLNameAutoModeEnableAvailable]; + [store sdl_setObject:autoModeEnableAvailable forName:SDLRPCParameterNameAutoModeEnableAvailable]; } - (nullable NSNumber<SDLBool> *)autoModeEnableAvailable { - return [store sdl_objectForName:SDLNameAutoModeEnableAvailable]; + return [store sdl_objectForName:SDLRPCParameterNameAutoModeEnableAvailable]; } - (void)setDualModeEnableAvailable:(nullable NSNumber<SDLBool> *)dualModeEnableAvailable { - [store sdl_setObject:dualModeEnableAvailable forName:SDLNameDualModeEnableAvailable]; + [store sdl_setObject:dualModeEnableAvailable forName:SDLRPCParameterNameDualModeEnableAvailable]; } - (nullable NSNumber<SDLBool> *)dualModeEnableAvailable { - return [store sdl_objectForName:SDLNameDualModeEnableAvailable]; + return [store sdl_objectForName:SDLRPCParameterNameDualModeEnableAvailable]; } - (void)setDefrostZoneAvailable:(nullable NSNumber<SDLBool> *)defrostZoneAvailable { - [store sdl_setObject:defrostZoneAvailable forName:SDLNameDefrostZoneAvailable]; + [store sdl_setObject:defrostZoneAvailable forName:SDLRPCParameterNameDefrostZoneAvailable]; } - (nullable NSNumber<SDLBool> *)defrostZoneAvailable { - return [store sdl_objectForName:SDLNameDefrostZoneAvailable]; + return [store sdl_objectForName:SDLRPCParameterNameDefrostZoneAvailable]; } - (void)setDefrostZone:(nullable NSArray <SDLDefrostZone>*)defrostZone { - [store sdl_setObject:defrostZone forName:SDLNameDefrostZone]; + [store sdl_setObject:defrostZone forName:SDLRPCParameterNameDefrostZone]; } - (nullable NSArray<SDLDefrostZone> *)defrostZone { - return [store sdl_objectForName:SDLNameDefrostZone]; + return [store sdl_objectForName:SDLRPCParameterNameDefrostZone]; } - (void)setVentilationModeAvailable:(nullable NSNumber<SDLBool> *)ventilationModeAvailable { - [store sdl_setObject:ventilationModeAvailable forName:SDLNameVentilationModeAvailable]; + [store sdl_setObject:ventilationModeAvailable forName:SDLRPCParameterNameVentilationModeAvailable]; } - (nullable NSNumber<SDLBool> *)ventilationModeAvailable { - return [store sdl_objectForName:SDLNameVentilationModeAvailable]; + return [store sdl_objectForName:SDLRPCParameterNameVentilationModeAvailable]; } - (void)setVentilationMode:(nullable NSArray<SDLVentilationMode> *)ventilationMode { - [store sdl_setObject:ventilationMode forName:SDLNameVentilationMode]; + [store sdl_setObject:ventilationMode forName:SDLRPCParameterNameVentilationMode]; } - (nullable NSArray<SDLVentilationMode> *)ventilationMode { - return [store sdl_objectForName:SDLNameVentilationMode]; + return [store sdl_objectForName:SDLRPCParameterNameVentilationMode]; } - (void)setHeatedSteeringWheelAvailable:(nullable NSNumber<SDLBool> *)heatedSteeringWheelAvailable { - [store sdl_setObject:heatedSteeringWheelAvailable forName:SDLNameHeatedSteeringWheelAvailable]; + [store sdl_setObject:heatedSteeringWheelAvailable forName:SDLRPCParameterNameHeatedSteeringWheelAvailable]; } - (nullable NSNumber<SDLBool> *)heatedSteeringWheelAvailable { - return [store sdl_objectForName:SDLNameHeatedSteeringWheelAvailable]; + return [store sdl_objectForName:SDLRPCParameterNameHeatedSteeringWheelAvailable]; } - (void)setHeatedWindshieldAvailable:(nullable NSNumber<SDLBool> *)heatedWindshieldAvailable { - [store sdl_setObject:heatedWindshieldAvailable forName:SDLNameHeatedWindshieldAvailable]; + [store sdl_setObject:heatedWindshieldAvailable forName:SDLRPCParameterNameHeatedWindshieldAvailable]; } - (nullable NSNumber<SDLBool> *)heatedWindshieldAvailable { - return [store sdl_objectForName:SDLNameHeatedWindshieldAvailable]; + return [store sdl_objectForName:SDLRPCParameterNameHeatedWindshieldAvailable]; } - (void)setHeatedRearWindowAvailable:(nullable NSNumber<SDLBool> *)heatedRearWindowAvailable { - [store sdl_setObject:heatedRearWindowAvailable forName:SDLNameHeatedRearWindowAvailable]; + [store sdl_setObject:heatedRearWindowAvailable forName:SDLRPCParameterNameHeatedRearWindowAvailable]; } - (nullable NSNumber<SDLBool> *)heatedRearWindowAvailable { - return [store sdl_objectForName:SDLNameHeatedRearWindowAvailable]; + return [store sdl_objectForName:SDLRPCParameterNameHeatedRearWindowAvailable]; } - (void)setHeatedMirrorsAvailable:(nullable NSNumber<SDLBool> *)heatedMirrorsAvailable { - [store sdl_setObject:heatedMirrorsAvailable forName:SDLNameHeatedMirrorsAvailable]; + [store sdl_setObject:heatedMirrorsAvailable forName:SDLRPCParameterNameHeatedMirrorsAvailable]; } - (nullable NSNumber<SDLBool> *)heatedMirrorsAvailable { - return [store sdl_objectForName:SDLNameHeatedMirrorsAvailable]; + return [store sdl_objectForName:SDLRPCParameterNameHeatedMirrorsAvailable]; } @end diff --git a/SmartDeviceLink/SDLClimateControlData.m b/SmartDeviceLink/SDLClimateControlData.m index 0a57e40c9..f15e64e2d 100644 --- a/SmartDeviceLink/SDLClimateControlData.m +++ b/SmartDeviceLink/SDLClimateControlData.m @@ -3,7 +3,7 @@ // #import "SDLClimateControlData.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" #import "SDLTemperature.h" #import "NSMutableDictionary+Store.h" @@ -39,115 +39,115 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setFanSpeed:(nullable NSNumber<SDLInt> *)fanSpeed { - [store sdl_setObject:fanSpeed forName:SDLNameFanSpeed]; + [store sdl_setObject:fanSpeed forName:SDLRPCParameterNameFanSpeed]; } - (nullable NSNumber<SDLInt> *)fanSpeed { - return [store sdl_objectForName:SDLNameFanSpeed]; + return [store sdl_objectForName:SDLRPCParameterNameFanSpeed]; } - (void)setCurrentTemperature:(nullable SDLTemperature *)currentTemperature { - [store sdl_setObject:currentTemperature forName:SDLNameCurrentTemperature]; + [store sdl_setObject:currentTemperature forName:SDLRPCParameterNameCurrentTemperature]; } - (nullable SDLTemperature *)currentTemperature { - return [store sdl_objectForName:SDLNameCurrentTemperature ofClass:SDLTemperature.class]; + return [store sdl_objectForName:SDLRPCParameterNameCurrentTemperature ofClass:SDLTemperature.class]; } - (void)setDesiredTemperature:(nullable SDLTemperature *)desiredTemperature { - [store sdl_setObject:desiredTemperature forName:SDLNameDesiredTemperature]; + [store sdl_setObject:desiredTemperature forName:SDLRPCParameterNameDesiredTemperature]; } - (nullable SDLTemperature *)desiredTemperature { - return [store sdl_objectForName:SDLNameDesiredTemperature ofClass:SDLTemperature.class]; + return [store sdl_objectForName:SDLRPCParameterNameDesiredTemperature ofClass:SDLTemperature.class]; } - (void)setAcEnable:(nullable NSNumber<SDLBool> *)acEnable { - [store sdl_setObject:acEnable forName:SDLNameACEnable]; + [store sdl_setObject:acEnable forName:SDLRPCParameterNameACEnable]; } - (nullable NSNumber<SDLBool> *)acEnable { - return [store sdl_objectForName:SDLNameACEnable]; + return [store sdl_objectForName:SDLRPCParameterNameACEnable]; } - (void)setCirculateAirEnable:(nullable NSNumber<SDLBool> *)circulateAirEnable { - [store sdl_setObject:circulateAirEnable forName:SDLNameCirculateAirEnable]; + [store sdl_setObject:circulateAirEnable forName:SDLRPCParameterNameCirculateAirEnable]; } - (nullable NSNumber<SDLBool> *)circulateAirEnable { - return [store sdl_objectForName:SDLNameCirculateAirEnable]; + return [store sdl_objectForName:SDLRPCParameterNameCirculateAirEnable]; } - (void)setAutoModeEnable:(nullable NSNumber<SDLBool> *)autoModeEnable { - [store sdl_setObject:autoModeEnable forName:SDLNameAutoModeEnable]; + [store sdl_setObject:autoModeEnable forName:SDLRPCParameterNameAutoModeEnable]; } - (nullable NSNumber<SDLBool> *)autoModeEnable { - return [store sdl_objectForName:SDLNameAutoModeEnable]; + return [store sdl_objectForName:SDLRPCParameterNameAutoModeEnable]; } - (void)setDefrostZone:(nullable SDLDefrostZone)defrostZone { - [store sdl_setObject:defrostZone forName:SDLNameDefrostZone]; + [store sdl_setObject:defrostZone forName:SDLRPCParameterNameDefrostZone]; } - (nullable SDLDefrostZone)defrostZone { - return [store sdl_objectForName:SDLNameDefrostZone]; + return [store sdl_objectForName:SDLRPCParameterNameDefrostZone]; } - (void)setDualModeEnable:(nullable NSNumber<SDLBool> *)dualModeEnable { - [store sdl_setObject:dualModeEnable forName:SDLNameDualModeEnable]; + [store sdl_setObject:dualModeEnable forName:SDLRPCParameterNameDualModeEnable]; } - (nullable NSNumber<SDLBool> *)dualModeEnable { - return [store sdl_objectForName:SDLNameDualModeEnable]; + return [store sdl_objectForName:SDLRPCParameterNameDualModeEnable]; } - (void)setAcMaxEnable:(nullable NSNumber<SDLBool> *)acMaxEnable { - [store sdl_setObject:acMaxEnable forName:SDLNameACMaxEnable]; + [store sdl_setObject:acMaxEnable forName:SDLRPCParameterNameACMaxEnable]; } - (nullable NSNumber<SDLBool> *)acMaxEnable { - return [store sdl_objectForName:SDLNameACMaxEnable]; + return [store sdl_objectForName:SDLRPCParameterNameACMaxEnable]; } - (void)setVentilationMode:(nullable SDLVentilationMode)ventilationMode { - [store sdl_setObject:ventilationMode forName:SDLNameVentilationMode]; + [store sdl_setObject:ventilationMode forName:SDLRPCParameterNameVentilationMode]; } - (nullable SDLVentilationMode)ventilationMode { - return [store sdl_objectForName:SDLNameVentilationMode]; + return [store sdl_objectForName:SDLRPCParameterNameVentilationMode]; } - (void)setHeatedSteeringWheelEnable:(nullable NSNumber<SDLBool> *)heatedSteeringWheelEnable { - [store sdl_setObject:heatedSteeringWheelEnable forName:SDLNameHeatedSteeringWheelEnable]; + [store sdl_setObject:heatedSteeringWheelEnable forName:SDLRPCParameterNameHeatedSteeringWheelEnable]; } - (nullable NSNumber<SDLBool> *)heatedSteeringWheelEnable { - return [store sdl_objectForName:SDLNameHeatedSteeringWheelEnable]; + return [store sdl_objectForName:SDLRPCParameterNameHeatedSteeringWheelEnable]; } - (void)setHeatedWindshieldEnable:(nullable NSNumber<SDLBool> *)heatedWindshieldEnable { - [store sdl_setObject:heatedWindshieldEnable forName:SDLNameHeatedWindshieldEnable]; + [store sdl_setObject:heatedWindshieldEnable forName:SDLRPCParameterNameHeatedWindshieldEnable]; } - (nullable NSNumber<SDLBool> *)heatedWindshieldEnable { - return [store sdl_objectForName:SDLNameHeatedWindshieldEnable]; + return [store sdl_objectForName:SDLRPCParameterNameHeatedWindshieldEnable]; } - (void)setHeatedRearWindowEnable:(nullable NSNumber<SDLBool> *)heatedRearWindowEnable { - [store sdl_setObject:heatedRearWindowEnable forName:SDLNameHeatedRearWindowEnable]; + [store sdl_setObject:heatedRearWindowEnable forName:SDLRPCParameterNameHeatedRearWindowEnable]; } - (nullable NSNumber<SDLBool> *)heatedRearWindowEnable { - return [store sdl_objectForName:SDLNameHeatedRearWindowEnable]; + return [store sdl_objectForName:SDLRPCParameterNameHeatedRearWindowEnable]; } - (void)setHeatedMirrorsEnable:(nullable NSNumber<SDLBool> *)heatedMirrorsEnable { - [store sdl_setObject:heatedMirrorsEnable forName:SDLNameHeatedMirrorsEnable]; + [store sdl_setObject:heatedMirrorsEnable forName:SDLRPCParameterNameHeatedMirrorsEnable]; } - (nullable NSNumber<SDLBool> *)heatedMirrorsEnable { - return [store sdl_objectForName:SDLNameHeatedMirrorsEnable]; + return [store sdl_objectForName:SDLRPCParameterNameHeatedMirrorsEnable]; } @end diff --git a/SmartDeviceLink/SDLClusterModeStatus.m b/SmartDeviceLink/SDLClusterModeStatus.m index e182fa17f..57c15a4bc 100644 --- a/SmartDeviceLink/SDLClusterModeStatus.m +++ b/SmartDeviceLink/SDLClusterModeStatus.m @@ -4,42 +4,42 @@ #import "SDLClusterModeStatus.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLClusterModeStatus - (void)setPowerModeActive:(NSNumber<SDLBool> *)powerModeActive { - [store sdl_setObject:powerModeActive forName:SDLNamePowerModeActive]; + [store sdl_setObject:powerModeActive forName:SDLRPCParameterNamePowerModeActive]; } - (NSNumber<SDLBool> *)powerModeActive { - return [store sdl_objectForName:SDLNamePowerModeActive]; + return [store sdl_objectForName:SDLRPCParameterNamePowerModeActive]; } - (void)setPowerModeQualificationStatus:(SDLPowerModeQualificationStatus)powerModeQualificationStatus { - [store sdl_setObject:powerModeQualificationStatus forName:SDLNamePowerModeQualificationStatus]; + [store sdl_setObject:powerModeQualificationStatus forName:SDLRPCParameterNamePowerModeQualificationStatus]; } - (SDLPowerModeQualificationStatus)powerModeQualificationStatus { - return [store sdl_objectForName:SDLNamePowerModeQualificationStatus]; + return [store sdl_objectForName:SDLRPCParameterNamePowerModeQualificationStatus]; } - (void)setCarModeStatus:(SDLCarModeStatus)carModeStatus { - [store sdl_setObject:carModeStatus forName:SDLNameCarModeStatus]; + [store sdl_setObject:carModeStatus forName:SDLRPCParameterNameCarModeStatus]; } - (SDLCarModeStatus)carModeStatus { - return [store sdl_objectForName:SDLNameCarModeStatus]; + return [store sdl_objectForName:SDLRPCParameterNameCarModeStatus]; } - (void)setPowerModeStatus:(SDLPowerModeStatus)powerModeStatus { - [store sdl_setObject:powerModeStatus forName:SDLNamePowerModeStatus]; + [store sdl_setObject:powerModeStatus forName:SDLRPCParameterNamePowerModeStatus]; } - (SDLPowerModeStatus)powerModeStatus { - return [store sdl_objectForName:SDLNamePowerModeStatus]; + return [store sdl_objectForName:SDLRPCParameterNamePowerModeStatus]; } @end diff --git a/SmartDeviceLink/SDLConnectionManagerType.h b/SmartDeviceLink/SDLConnectionManagerType.h index f7052f67d..d0e7f7f84 100644 --- a/SmartDeviceLink/SDLConnectionManagerType.h +++ b/SmartDeviceLink/SDLConnectionManagerType.h @@ -10,6 +10,7 @@ #import <Foundation/Foundation.h> @class SDLRPCRequest; +@class SDLRPCMessage; @class SDLRegisterAppInterfaceResponse; @@ -26,15 +27,38 @@ NS_ASSUME_NONNULL_BEGIN - (void)sendConnectionManagerRequest:(__kindof SDLRPCRequest *)request withResponseHandler:(nullable SDLResponseHandler)handler; /** - Send an RPC without bypassing the block on RPC sends before managers complete setup. - - @param request The RPC request to be sent to the remote head unit. - @param handler A completion block called when the response is received. + * Sends an RPC of type `SDLRPCRequest` without bypassing the block on RPC sends before managers complete setup. + * + * @param request An RPC of type `SDLRPCRequest` be sent to Core. + * @param handler Called when the response is received by Core */ - (void)sendConnectionRequest:(__kindof SDLRPCRequest *)request withResponseHandler:(nullable SDLResponseHandler)handler; +/** + * Sends an RPC of type `SDLRPCResponse` or `SDLRPCNotification` without bypassing the block on RPC sends before managers complete setup. Unlike requests, responses and notifications sent to Core do not get a response from Core, so no handler is needed. + * + * Do not use to send an RPC of type `SDLRPCRequest`. Instead use `sendConnectionRequest:withResponseHandler:` to send a request. + * + * @param rpc An RPC of type `SDLRPCResponse` or `SDLRPCNotification` to be sent to Core. + */ +- (void)sendConnectionRPC:(__kindof SDLRPCMessage *)rpc; + +/** + * Sends an array of RPCs of type `Request` asynchronously. The requests are sent without bypassing the block on RPC sends before managers complete setup. + * + * @param requests An array of RPCs of type `Request` + * @param progressHandler The progress handler is called as each request gets a response from Core. + * @param completionHandler The completion handler is called when all requests have a response from Core. + */ - (void)sendRequests:(NSArray<SDLRPCRequest *> *)requests progressHandler:(nullable SDLMultipleAsyncRequestProgressHandler)progressHandler completionHandler:(nullable SDLMultipleRequestCompletionHandler)completionHandler; +/** + * Sends an array of RPCs of type `Request` sequentially. The requests are sent without bypassing the block on RPC sends before managers complete setup. + * + * @param requests An array of RPCs of type `Request` + * @param progressHandler The progress handler is called as each request gets a response from Core. + * @param completionHandler The completion handler is called when all requests have a response from Core. + */ - (void)sendSequentialRequests:(NSArray<SDLRPCRequest *> *)requests progressHandler:(nullable SDLMultipleSequentialRequestProgressHandler)progressHandler completionHandler:(nullable SDLMultipleRequestCompletionHandler)completionHandler; @end diff --git a/SmartDeviceLink/SDLCreateInteractionChoiceSet.m b/SmartDeviceLink/SDLCreateInteractionChoiceSet.m index 570054eec..b21e9f271 100644 --- a/SmartDeviceLink/SDLCreateInteractionChoiceSet.m +++ b/SmartDeviceLink/SDLCreateInteractionChoiceSet.m @@ -6,14 +6,15 @@ #import "NSMutableDictionary+Store.h" #import "SDLChoice.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLCreateInteractionChoiceSet - (instancetype)init { - if (self = [super initWithName:SDLNameCreateInteractionChoiceSet]) { + if (self = [super initWithName:SDLRPCFunctionNameCreateInteractionChoiceSet]) { } return self; } @@ -30,19 +31,19 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setInteractionChoiceSetID:(NSNumber<SDLInt> *)interactionChoiceSetID { - [parameters sdl_setObject:interactionChoiceSetID forName:SDLNameInteractionChoiceSetId]; + [parameters sdl_setObject:interactionChoiceSetID forName:SDLRPCParameterNameInteractionChoiceSetId]; } - (NSNumber<SDLInt> *)interactionChoiceSetID { - return [parameters sdl_objectForName:SDLNameInteractionChoiceSetId]; + return [parameters sdl_objectForName:SDLRPCParameterNameInteractionChoiceSetId]; } - (void)setChoiceSet:(NSArray<SDLChoice *> *)choiceSet { - [parameters sdl_setObject:choiceSet forName:SDLNameChoiceSet]; + [parameters sdl_setObject:choiceSet forName:SDLRPCParameterNameChoiceSet]; } - (NSArray<SDLChoice *> *)choiceSet { - return [parameters sdl_objectsForName:SDLNameChoiceSet ofClass:SDLChoice.class]; + return [parameters sdl_objectsForName:SDLRPCParameterNameChoiceSet ofClass:SDLChoice.class]; } @end diff --git a/SmartDeviceLink/SDLCreateInteractionChoiceSetResponse.m b/SmartDeviceLink/SDLCreateInteractionChoiceSetResponse.m index b9de5f3b1..bc5fee627 100644 --- a/SmartDeviceLink/SDLCreateInteractionChoiceSetResponse.m +++ b/SmartDeviceLink/SDLCreateInteractionChoiceSetResponse.m @@ -5,14 +5,15 @@ #import "SDLCreateInteractionChoiceSetResponse.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLCreateInteractionChoiceSetResponse - (instancetype)init { - if (self = [super initWithName:SDLNameCreateInteractionChoiceSet]) { + if (self = [super initWithName:SDLRPCFunctionNameCreateInteractionChoiceSet]) { } return self; } diff --git a/SmartDeviceLink/SDLDIDResult.m b/SmartDeviceLink/SDLDIDResult.m index 0d0e5d39f..62bf863b8 100644 --- a/SmartDeviceLink/SDLDIDResult.m +++ b/SmartDeviceLink/SDLDIDResult.m @@ -4,34 +4,34 @@ #import "SDLDIDResult.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLDIDResult - (void)setResultCode:(SDLVehicleDataResultCode)resultCode { - [store sdl_setObject:resultCode forName:SDLNameResultCode]; + [store sdl_setObject:resultCode forName:SDLRPCParameterNameResultCode]; } - (SDLVehicleDataResultCode)resultCode { - return [store sdl_objectForName:SDLNameResultCode]; + return [store sdl_objectForName:SDLRPCParameterNameResultCode]; } - (void)setDidLocation:(NSNumber<SDLInt> *)didLocation { - [store sdl_setObject:didLocation forName:SDLNameDIDLocation]; + [store sdl_setObject:didLocation forName:SDLRPCParameterNameDIDLocation]; } - (NSNumber<SDLInt> *)didLocation { - return [store sdl_objectForName:SDLNameDIDLocation]; + return [store sdl_objectForName:SDLRPCParameterNameDIDLocation]; } - (void)setData:(nullable NSString *)data { - [store sdl_setObject:data forName:SDLNameData]; + [store sdl_setObject:data forName:SDLRPCParameterNameData]; } - (nullable NSString *)data { - return [store sdl_objectForName:SDLNameData]; + return [store sdl_objectForName:SDLRPCParameterNameData]; } @end diff --git a/SmartDeviceLink/SDLDateTime.m b/SmartDeviceLink/SDLDateTime.m index 88c691c89..8f9316082 100644 --- a/SmartDeviceLink/SDLDateTime.m +++ b/SmartDeviceLink/SDLDateTime.m @@ -4,7 +4,7 @@ #import "SDLDateTime.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" @implementation SDLDateTime @@ -59,75 +59,75 @@ } - (void)setMillisecond:(NSNumber<SDLInt> *)millisecond { - [store sdl_setObject:millisecond forName:SDLNameMillisecond]; + [store sdl_setObject:millisecond forName:SDLRPCParameterNameMillisecond]; } - (NSNumber<SDLInt> *)millisecond { - return [store sdl_objectForName:SDLNameMillisecond]; + return [store sdl_objectForName:SDLRPCParameterNameMillisecond]; } - (void)setSecond:(NSNumber<SDLInt> *)second { - [store sdl_setObject:second forName:SDLNameSecond]; + [store sdl_setObject:second forName:SDLRPCParameterNameSecond]; } - (NSNumber<SDLInt> *)second { - return [store sdl_objectForName:SDLNameSecond]; + return [store sdl_objectForName:SDLRPCParameterNameSecond]; } - (void)setMinute:(NSNumber<SDLInt> *)minute { - [store sdl_setObject:minute forName:SDLNameMinute]; + [store sdl_setObject:minute forName:SDLRPCParameterNameMinute]; } - (NSNumber<SDLInt> *)minute { - return [store sdl_objectForName:SDLNameMinute]; + return [store sdl_objectForName:SDLRPCParameterNameMinute]; } - (void)setHour:(NSNumber<SDLInt> *)hour { - [store sdl_setObject:hour forName:SDLNameHour]; + [store sdl_setObject:hour forName:SDLRPCParameterNameHour]; } - (NSNumber<SDLInt> *)hour { - return [store sdl_objectForName:SDLNameHour]; + return [store sdl_objectForName:SDLRPCParameterNameHour]; } - (void)setDay:(NSNumber<SDLInt> *)day { - [store sdl_setObject:day forName:SDLNameDay]; + [store sdl_setObject:day forName:SDLRPCParameterNameDay]; } - (NSNumber<SDLInt> *)day { - return [store sdl_objectForName:SDLNameDay]; + return [store sdl_objectForName:SDLRPCParameterNameDay]; } - (void)setMonth:(NSNumber<SDLInt> *)month { - [store sdl_setObject:month forName:SDLNameMonth]; + [store sdl_setObject:month forName:SDLRPCParameterNameMonth]; } - (NSNumber<SDLInt> *)month { - return [store sdl_objectForName:SDLNameMonth]; + return [store sdl_objectForName:SDLRPCParameterNameMonth]; } - (void)setYear:(NSNumber<SDLInt> *)year { - [store sdl_setObject:year forName:SDLNameYear]; + [store sdl_setObject:year forName:SDLRPCParameterNameYear]; } - (NSNumber<SDLInt> *)year { - return [store sdl_objectForName:SDLNameYear]; + return [store sdl_objectForName:SDLRPCParameterNameYear]; } - (void)setTimezoneMinuteOffset:(NSNumber<SDLInt> *)timezoneMinuteOffset { - [store sdl_setObject:timezoneMinuteOffset forName:SDLNameTimezoneMinuteOffset]; + [store sdl_setObject:timezoneMinuteOffset forName:SDLRPCParameterNameTimezoneMinuteOffset]; } - (NSNumber<SDLInt> *)timezoneMinuteOffset { - return [store sdl_objectForName:SDLNameTimezoneMinuteOffset]; + return [store sdl_objectForName:SDLRPCParameterNameTimezoneMinuteOffset]; } - (void)setTimezoneHourOffset:(NSNumber<SDLInt> *)timezoneHourOffset { - [store sdl_setObject:timezoneHourOffset forName:SDLNameTimezoneHourOffset]; + [store sdl_setObject:timezoneHourOffset forName:SDLRPCParameterNameTimezoneHourOffset]; } - (NSNumber<SDLInt> *)timezoneHourOffset { - return [store sdl_objectForName:SDLNameTimezoneHourOffset]; + return [store sdl_objectForName:SDLRPCParameterNameTimezoneHourOffset]; } @end diff --git a/SmartDeviceLink/SDLDeleteCommand.m b/SmartDeviceLink/SDLDeleteCommand.m index d96276d56..2655213fa 100644 --- a/SmartDeviceLink/SDLDeleteCommand.m +++ b/SmartDeviceLink/SDLDeleteCommand.m @@ -5,14 +5,15 @@ #import "SDLDeleteCommand.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLDeleteCommand - (instancetype)init { - if (self = [super initWithName:SDLNameDeleteCommand]) { + if (self = [super initWithName:SDLRPCFunctionNameDeleteCommand]) { } return self; } @@ -29,11 +30,11 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setCmdID:(NSNumber<SDLInt> *)cmdID { - [parameters sdl_setObject:cmdID forName:SDLNameCommandId]; + [parameters sdl_setObject:cmdID forName:SDLRPCParameterNameCommandId]; } - (NSNumber<SDLInt> *)cmdID { - return [parameters sdl_objectForName:SDLNameCommandId]; + return [parameters sdl_objectForName:SDLRPCParameterNameCommandId]; } @end diff --git a/SmartDeviceLink/SDLDeleteCommandResponse.m b/SmartDeviceLink/SDLDeleteCommandResponse.m index f956c02ab..cdfb646fe 100644 --- a/SmartDeviceLink/SDLDeleteCommandResponse.m +++ b/SmartDeviceLink/SDLDeleteCommandResponse.m @@ -5,14 +5,15 @@ #import "SDLDeleteCommandResponse.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLDeleteCommandResponse - (instancetype)init { - if (self = [super initWithName:SDLNameDeleteCommand]) { + if (self = [super initWithName:SDLRPCFunctionNameDeleteCommand]) { } return self; } diff --git a/SmartDeviceLink/SDLDeleteFile.m b/SmartDeviceLink/SDLDeleteFile.m index b7a8929a2..6f2197c44 100644 --- a/SmartDeviceLink/SDLDeleteFile.m +++ b/SmartDeviceLink/SDLDeleteFile.m @@ -5,14 +5,15 @@ #import "SDLDeleteFile.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLDeleteFile - (instancetype)init { - if (self = [super initWithName:SDLNameDeleteFile]) { + if (self = [super initWithName:SDLRPCFunctionNameDeleteFile]) { } return self; } @@ -29,11 +30,11 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setSyncFileName:(NSString *)syncFileName { - [parameters sdl_setObject:syncFileName forName:SDLNameSyncFileName]; + [parameters sdl_setObject:syncFileName forName:SDLRPCParameterNameSyncFileName]; } - (NSString *)syncFileName { - return [parameters sdl_objectForName:SDLNameSyncFileName]; + return [parameters sdl_objectForName:SDLRPCParameterNameSyncFileName]; } @end diff --git a/SmartDeviceLink/SDLDeleteFileResponse.m b/SmartDeviceLink/SDLDeleteFileResponse.m index 42689fafe..d35bc9ed5 100644 --- a/SmartDeviceLink/SDLDeleteFileResponse.m +++ b/SmartDeviceLink/SDLDeleteFileResponse.m @@ -5,24 +5,25 @@ #import "SDLDeleteFileResponse.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLDeleteFileResponse - (instancetype)init { - if (self = [super initWithName:SDLNameDeleteFile]) { + if (self = [super initWithName:SDLRPCFunctionNameDeleteFile]) { } return self; } - (void)setSpaceAvailable:(nullable NSNumber<SDLInt> *)spaceAvailable { - [parameters sdl_setObject:spaceAvailable forName:SDLNameSpaceAvailable]; + [parameters sdl_setObject:spaceAvailable forName:SDLRPCParameterNameSpaceAvailable]; } - (nullable NSNumber<SDLInt> *)spaceAvailable { - return [parameters sdl_objectForName:SDLNameSpaceAvailable]; + return [parameters sdl_objectForName:SDLRPCParameterNameSpaceAvailable]; } @end diff --git a/SmartDeviceLink/SDLDeleteInteractionChoiceSet.m b/SmartDeviceLink/SDLDeleteInteractionChoiceSet.m index a1f2585e5..ad3027b64 100644 --- a/SmartDeviceLink/SDLDeleteInteractionChoiceSet.m +++ b/SmartDeviceLink/SDLDeleteInteractionChoiceSet.m @@ -5,14 +5,15 @@ #import "SDLDeleteInteractionChoiceSet.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLDeleteInteractionChoiceSet - (instancetype)init { - if (self = [super initWithName:SDLNameDeleteInteractionChoiceSet]) { + if (self = [super initWithName:SDLRPCFunctionNameDeleteInteractionChoiceSet]) { } return self; } @@ -29,11 +30,11 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setInteractionChoiceSetID:(NSNumber<SDLInt> *)interactionChoiceSetID { - [parameters sdl_setObject:interactionChoiceSetID forName:SDLNameInteractionChoiceSetId]; + [parameters sdl_setObject:interactionChoiceSetID forName:SDLRPCParameterNameInteractionChoiceSetId]; } - (NSNumber<SDLInt> *)interactionChoiceSetID { - return [parameters sdl_objectForName:SDLNameInteractionChoiceSetId]; + return [parameters sdl_objectForName:SDLRPCParameterNameInteractionChoiceSetId]; } @end diff --git a/SmartDeviceLink/SDLDeleteInteractionChoiceSetResponse.m b/SmartDeviceLink/SDLDeleteInteractionChoiceSetResponse.m index e6cc631fa..2a0047a79 100644 --- a/SmartDeviceLink/SDLDeleteInteractionChoiceSetResponse.m +++ b/SmartDeviceLink/SDLDeleteInteractionChoiceSetResponse.m @@ -5,14 +5,15 @@ #import "SDLDeleteInteractionChoiceSetResponse.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLDeleteInteractionChoiceSetResponse - (instancetype)init { - if (self = [super initWithName:SDLNameDeleteInteractionChoiceSet]) { + if (self = [super initWithName:SDLRPCFunctionNameDeleteInteractionChoiceSet]) { } return self; } diff --git a/SmartDeviceLink/SDLDeleteSubMenu.m b/SmartDeviceLink/SDLDeleteSubMenu.m index b03372c7d..feadfe3af 100644 --- a/SmartDeviceLink/SDLDeleteSubMenu.m +++ b/SmartDeviceLink/SDLDeleteSubMenu.m @@ -5,14 +5,15 @@ #import "SDLDeleteSubMenu.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLDeleteSubMenu - (instancetype)init { - if (self = [super initWithName:SDLNameDeleteSubMenu]) { + if (self = [super initWithName:SDLRPCFunctionNameDeleteSubMenu]) { } return self; } @@ -29,11 +30,11 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setMenuID:(NSNumber<SDLInt> *)menuID { - [parameters sdl_setObject:menuID forName:SDLNameMenuId]; + [parameters sdl_setObject:menuID forName:SDLRPCParameterNameMenuId]; } - (NSNumber<SDLInt> *)menuID { - return [parameters sdl_objectForName:SDLNameMenuId]; + return [parameters sdl_objectForName:SDLRPCParameterNameMenuId]; } @end diff --git a/SmartDeviceLink/SDLDeleteSubMenuResponse.m b/SmartDeviceLink/SDLDeleteSubMenuResponse.m index 5594763e9..1a9309a13 100644 --- a/SmartDeviceLink/SDLDeleteSubMenuResponse.m +++ b/SmartDeviceLink/SDLDeleteSubMenuResponse.m @@ -5,14 +5,15 @@ #import "SDLDeleteSubMenuResponse.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLDeleteSubMenuResponse - (instancetype)init { - if (self = [super initWithName:SDLNameDeleteSubMenu]) { + if (self = [super initWithName:SDLRPCFunctionNameDeleteSubMenu]) { } return self; } diff --git a/SmartDeviceLink/SDLDeviceInfo.m b/SmartDeviceLink/SDLDeviceInfo.m index 8b321bf8d..41328e487 100644 --- a/SmartDeviceLink/SDLDeviceInfo.m +++ b/SmartDeviceLink/SDLDeviceInfo.m @@ -8,7 +8,7 @@ #import <UIKit/UIKit.h> #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" NS_ASSUME_NONNULL_BEGIN @@ -30,51 +30,51 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setHardware:(nullable NSString *)hardware { - [store sdl_setObject:hardware forName:SDLNameHardware]; + [store sdl_setObject:hardware forName:SDLRPCParameterNameHardware]; } - (nullable NSString *)hardware { - return [store sdl_objectForName:SDLNameHardware]; + return [store sdl_objectForName:SDLRPCParameterNameHardware]; } - (void)setFirmwareRev:(nullable NSString *)firmwareRev { - [store sdl_setObject:firmwareRev forName:SDLNameFirmwareRevision]; + [store sdl_setObject:firmwareRev forName:SDLRPCParameterNameFirmwareRevision]; } - (nullable NSString *)firmwareRev { - return [store sdl_objectForName:SDLNameFirmwareRevision]; + return [store sdl_objectForName:SDLRPCParameterNameFirmwareRevision]; } - (void)setOs:(nullable NSString *)os { - [store sdl_setObject:os forName:SDLNameOS]; + [store sdl_setObject:os forName:SDLRPCParameterNameOS]; } - (nullable NSString *)os { - return [store sdl_objectForName:SDLNameOS]; + return [store sdl_objectForName:SDLRPCParameterNameOS]; } - (void)setOsVersion:(nullable NSString *)osVersion { - [store sdl_setObject:osVersion forName:SDLNameOSVersion]; + [store sdl_setObject:osVersion forName:SDLRPCParameterNameOSVersion]; } - (nullable NSString *)osVersion { - return [store sdl_objectForName:SDLNameOSVersion]; + return [store sdl_objectForName:SDLRPCParameterNameOSVersion]; } - (void)setCarrier:(nullable NSString *)carrier { - [store sdl_setObject:carrier forName:SDLNameCarrier]; + [store sdl_setObject:carrier forName:SDLRPCParameterNameCarrier]; } - (nullable NSString *)carrier { - return [store sdl_objectForName:SDLNameCarrier]; + return [store sdl_objectForName:SDLRPCParameterNameCarrier]; } - (void)setMaxNumberRFCOMMPorts:(nullable NSNumber<SDLInt> *)maxNumberRFCOMMPorts { - [store sdl_setObject:maxNumberRFCOMMPorts forName:SDLNameMaxNumberRFCOMMPorts]; + [store sdl_setObject:maxNumberRFCOMMPorts forName:SDLRPCParameterNameMaxNumberRFCOMMPorts]; } - (nullable NSNumber<SDLInt> *)maxNumberRFCOMMPorts { - return [store sdl_objectForName:SDLNameMaxNumberRFCOMMPorts]; + return [store sdl_objectForName:SDLRPCParameterNameMaxNumberRFCOMMPorts]; } @end diff --git a/SmartDeviceLink/SDLDeviceStatus.m b/SmartDeviceLink/SDLDeviceStatus.m index ca449c517..808dbf0a1 100644 --- a/SmartDeviceLink/SDLDeviceStatus.m +++ b/SmartDeviceLink/SDLDeviceStatus.m @@ -5,7 +5,7 @@ #import "NSMutableDictionary+Store.h" #import "SDLDeviceLevelStatus.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" #import "SDLPrimaryAudioSource.h" NS_ASSUME_NONNULL_BEGIN @@ -13,91 +13,91 @@ NS_ASSUME_NONNULL_BEGIN @implementation SDLDeviceStatus - (void)setVoiceRecOn:(NSNumber<SDLBool> *)voiceRecOn { - [store sdl_setObject:voiceRecOn forName:SDLNameVoiceRecognitionOn]; + [store sdl_setObject:voiceRecOn forName:SDLRPCParameterNameVoiceRecognitionOn]; } - (NSNumber<SDLBool> *)voiceRecOn { - return [store sdl_objectForName:SDLNameVoiceRecognitionOn]; + return [store sdl_objectForName:SDLRPCParameterNameVoiceRecognitionOn]; } - (void)setBtIconOn:(NSNumber<SDLBool> *)btIconOn { - [store sdl_setObject:btIconOn forName:SDLNameBluetoothIconOn]; + [store sdl_setObject:btIconOn forName:SDLRPCParameterNameBluetoothIconOn]; } - (NSNumber<SDLBool> *)btIconOn { - return [store sdl_objectForName:SDLNameBluetoothIconOn]; + return [store sdl_objectForName:SDLRPCParameterNameBluetoothIconOn]; } - (void)setCallActive:(NSNumber<SDLBool> *)callActive { - [store sdl_setObject:callActive forName:SDLNameCallActive]; + [store sdl_setObject:callActive forName:SDLRPCParameterNameCallActive]; } - (NSNumber<SDLBool> *)callActive { - return [store sdl_objectForName:SDLNameCallActive]; + return [store sdl_objectForName:SDLRPCParameterNameCallActive]; } - (void)setPhoneRoaming:(NSNumber<SDLBool> *)phoneRoaming { - [store sdl_setObject:phoneRoaming forName:SDLNamePhoneRoaming]; + [store sdl_setObject:phoneRoaming forName:SDLRPCParameterNamePhoneRoaming]; } - (NSNumber<SDLBool> *)phoneRoaming { - return [store sdl_objectForName:SDLNamePhoneRoaming]; + return [store sdl_objectForName:SDLRPCParameterNamePhoneRoaming]; } - (void)setTextMsgAvailable:(NSNumber<SDLBool> *)textMsgAvailable { - [store sdl_setObject:textMsgAvailable forName:SDLNameTextMessageAvailable]; + [store sdl_setObject:textMsgAvailable forName:SDLRPCParameterNameTextMessageAvailable]; } - (NSNumber<SDLBool> *)textMsgAvailable { - return [store sdl_objectForName:SDLNameTextMessageAvailable]; + return [store sdl_objectForName:SDLRPCParameterNameTextMessageAvailable]; } - (void)setBattLevelStatus:(SDLDeviceLevelStatus )battLevelStatus { - [store sdl_setObject:battLevelStatus forName:SDLNameBatteryLevelStatus]; + [store sdl_setObject:battLevelStatus forName:SDLRPCParameterNameBatteryLevelStatus]; } - (SDLDeviceLevelStatus)battLevelStatus { - return [store sdl_objectForName:SDLNameBatteryLevelStatus]; + return [store sdl_objectForName:SDLRPCParameterNameBatteryLevelStatus]; } - (void)setStereoAudioOutputMuted:(NSNumber<SDLBool> *)stereoAudioOutputMuted { - [store sdl_setObject:stereoAudioOutputMuted forName:SDLNameStereoAudioOutputMuted]; + [store sdl_setObject:stereoAudioOutputMuted forName:SDLRPCParameterNameStereoAudioOutputMuted]; } - (NSNumber<SDLBool> *)stereoAudioOutputMuted { - return [store sdl_objectForName:SDLNameStereoAudioOutputMuted]; + return [store sdl_objectForName:SDLRPCParameterNameStereoAudioOutputMuted]; } - (void)setMonoAudioOutputMuted:(NSNumber<SDLBool> *)monoAudioOutputMuted { - [store sdl_setObject:monoAudioOutputMuted forName:SDLNameMonoAudioOutputMuted]; + [store sdl_setObject:monoAudioOutputMuted forName:SDLRPCParameterNameMonoAudioOutputMuted]; } - (NSNumber<SDLBool> *)monoAudioOutputMuted { - return [store sdl_objectForName:SDLNameMonoAudioOutputMuted]; + return [store sdl_objectForName:SDLRPCParameterNameMonoAudioOutputMuted]; } - (void)setSignalLevelStatus:(SDLDeviceLevelStatus)signalLevelStatus { - [store sdl_setObject:signalLevelStatus forName:SDLNameSignalLevelStatus]; + [store sdl_setObject:signalLevelStatus forName:SDLRPCParameterNameSignalLevelStatus]; } - (SDLDeviceLevelStatus)signalLevelStatus { - return [store sdl_objectForName:SDLNameSignalLevelStatus]; + return [store sdl_objectForName:SDLRPCParameterNameSignalLevelStatus]; } - (void)setPrimaryAudioSource:(SDLPrimaryAudioSource)primaryAudioSource { - [store sdl_setObject:primaryAudioSource forName:SDLNamePrimaryAudioSource]; + [store sdl_setObject:primaryAudioSource forName:SDLRPCParameterNamePrimaryAudioSource]; } - (SDLPrimaryAudioSource)primaryAudioSource { - return [store sdl_objectForName:SDLNamePrimaryAudioSource]; + return [store sdl_objectForName:SDLRPCParameterNamePrimaryAudioSource]; } - (void)setECallEventActive:(NSNumber<SDLBool> *)eCallEventActive { - [store sdl_setObject:eCallEventActive forName:SDLNameECallEventActive]; + [store sdl_setObject:eCallEventActive forName:SDLRPCParameterNameECallEventActive]; } - (NSNumber<SDLBool> *)eCallEventActive { - return [store sdl_objectForName:SDLNameECallEventActive]; + return [store sdl_objectForName:SDLRPCParameterNameECallEventActive]; } @end diff --git a/SmartDeviceLink/SDLDiagnosticMessage.m b/SmartDeviceLink/SDLDiagnosticMessage.m index dff509a4d..33478dd9b 100644 --- a/SmartDeviceLink/SDLDiagnosticMessage.m +++ b/SmartDeviceLink/SDLDiagnosticMessage.m @@ -5,14 +5,15 @@ #import "SDLDiagnosticMessage.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLDiagnosticMessage - (instancetype)init { - if (self = [super initWithName:SDLNameDiagnosticMessage]) { + if (self = [super initWithName:SDLRPCFunctionNameDiagnosticMessage]) { } return self; } @@ -31,27 +32,27 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setTargetID:(NSNumber<SDLInt> *)targetID { - [parameters sdl_setObject:targetID forName:SDLNameTargetId]; + [parameters sdl_setObject:targetID forName:SDLRPCParameterNameTargetId]; } - (NSNumber<SDLInt> *)targetID { - return [parameters sdl_objectForName:SDLNameTargetId]; + return [parameters sdl_objectForName:SDLRPCParameterNameTargetId]; } - (void)setMessageLength:(NSNumber<SDLInt> *)messageLength { - [parameters sdl_setObject:messageLength forName:SDLNameMessageLength]; + [parameters sdl_setObject:messageLength forName:SDLRPCParameterNameMessageLength]; } - (NSNumber<SDLInt> *)messageLength { - return [parameters sdl_objectForName:SDLNameMessageLength]; + return [parameters sdl_objectForName:SDLRPCParameterNameMessageLength]; } - (void)setMessageData:(NSArray<NSNumber<SDLInt> *> *)messageData { - [parameters sdl_setObject:messageData forName:SDLNameMessageData]; + [parameters sdl_setObject:messageData forName:SDLRPCParameterNameMessageData]; } - (NSArray<NSNumber<SDLInt> *> *)messageData { - return [parameters sdl_objectForName:SDLNameMessageData]; + return [parameters sdl_objectForName:SDLRPCParameterNameMessageData]; } @end diff --git a/SmartDeviceLink/SDLDiagnosticMessageResponse.m b/SmartDeviceLink/SDLDiagnosticMessageResponse.m index fac88769c..832054356 100644 --- a/SmartDeviceLink/SDLDiagnosticMessageResponse.m +++ b/SmartDeviceLink/SDLDiagnosticMessageResponse.m @@ -4,24 +4,25 @@ #import "SDLDiagnosticMessageResponse.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLDiagnosticMessageResponse - (instancetype)init { - if (self = [super initWithName:SDLNameDiagnosticMessage]) { + if (self = [super initWithName:SDLRPCFunctionNameDiagnosticMessage]) { } return self; } - (void)setMessageDataResult:(NSArray<NSNumber<SDLInt> *> *)messageDataResult { - [parameters sdl_setObject:messageDataResult forName:SDLNameMessageDataResult]; + [parameters sdl_setObject:messageDataResult forName:SDLRPCParameterNameMessageDataResult]; } - (NSArray<NSNumber<SDLInt> *> *)messageDataResult { - return [parameters sdl_objectForName:SDLNameMessageDataResult]; + return [parameters sdl_objectForName:SDLRPCParameterNameMessageDataResult]; } @end diff --git a/SmartDeviceLink/SDLDialNumber.m b/SmartDeviceLink/SDLDialNumber.m index 7930892d1..644dd8bf8 100644 --- a/SmartDeviceLink/SDLDialNumber.m +++ b/SmartDeviceLink/SDLDialNumber.m @@ -5,12 +5,13 @@ #import "SDLDialNumber.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" @implementation SDLDialNumber - (instancetype)init { - if (self = [super initWithName:SDLNameDialNumber]) { + if (self = [super initWithName:SDLRPCFunctionNameDialNumber]) { } return self; } @@ -27,11 +28,11 @@ } - (void)setNumber:(NSString *)number { - [parameters sdl_setObject:number forName:SDLNameNumber]; + [parameters sdl_setObject:number forName:SDLRPCParameterNameNumber]; } - (NSString *)number { - return [parameters sdl_objectForName:SDLNameNumber]; + return [parameters sdl_objectForName:SDLRPCParameterNameNumber]; } @end diff --git a/SmartDeviceLink/SDLDialNumberResponse.m b/SmartDeviceLink/SDLDialNumberResponse.m index b791e2cd2..0b9e02c58 100644 --- a/SmartDeviceLink/SDLDialNumberResponse.m +++ b/SmartDeviceLink/SDLDialNumberResponse.m @@ -5,14 +5,15 @@ #import "SDLDialNumberResponse.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLDialNumberResponse - (instancetype)init { - if (self = [super initWithName:SDLNameDialNumber]) { + if (self = [super initWithName:SDLRPCFunctionNameDialNumber]) { } return self; } diff --git a/SmartDeviceLink/SDLDirection.h b/SmartDeviceLink/SDLDirection.h new file mode 100644 index 000000000..b35f4c644 --- /dev/null +++ b/SmartDeviceLink/SDLDirection.h @@ -0,0 +1,26 @@ +// +// SDLDirection.h +// SmartDeviceLink +// +// Created by Nicole on 2/22/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import "SDLEnum.h" + +/* + * A navigation direction. + */ +typedef SDLEnum SDLDirection SDL_SWIFT_ENUM; + +/* + * Direction left + */ +extern SDLDirection const SDLDirectionLeft; + +/* + * Direction right + */ +extern SDLDirection const SDLDirectionRight; + + diff --git a/SmartDeviceLink/SDLDirection.m b/SmartDeviceLink/SDLDirection.m new file mode 100644 index 000000000..1a11c772a --- /dev/null +++ b/SmartDeviceLink/SDLDirection.m @@ -0,0 +1,12 @@ +// +// SDLDirection.m +// SmartDeviceLink +// +// Created by Nicole on 2/22/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import "SDLDirection.h" + +SDLDirection const SDLDirectionLeft = @"LEFT"; +SDLDirection const SDLDirectionRight = @"RIGHT"; diff --git a/SmartDeviceLink/SDLDisplayCapabilities.m b/SmartDeviceLink/SDLDisplayCapabilities.m index c1615431c..d2da9c7d9 100644 --- a/SmartDeviceLink/SDLDisplayCapabilities.m +++ b/SmartDeviceLink/SDLDisplayCapabilities.m @@ -4,7 +4,7 @@ #import "SDLDisplayCapabilities.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" #import "SDLImageField.h" #import "SDLScreenParams.h" #import "SDLTextField.h" @@ -14,75 +14,75 @@ NS_ASSUME_NONNULL_BEGIN @implementation SDLDisplayCapabilities - (void)setDisplayType:(SDLDisplayType)displayType { - [store sdl_setObject:displayType forName:SDLNameDisplayType]; + [store sdl_setObject:displayType forName:SDLRPCParameterNameDisplayType]; } - (SDLDisplayType)displayType { - return [store sdl_objectForName:SDLNameDisplayType]; + return [store sdl_objectForName:SDLRPCParameterNameDisplayType]; } - (void)setDisplayName:(nullable NSString *)displayName { - [store sdl_setObject:displayName forName:SDLNameDisplayName]; + [store sdl_setObject:displayName forName:SDLRPCParameterNameDisplayName]; } - (nullable NSString *)displayName { - return [store sdl_objectForName:SDLNameDisplayName]; + return [store sdl_objectForName:SDLRPCParameterNameDisplayName]; } - (void)setTextFields:(NSArray<SDLTextField *> *)textFields { - [store sdl_setObject:textFields forName:SDLNameTextFields]; + [store sdl_setObject:textFields forName:SDLRPCParameterNameTextFields]; } - (NSArray<SDLTextField *> *)textFields { - return [store sdl_objectsForName:SDLNameTextFields ofClass:SDLTextField.class]; + return [store sdl_objectsForName:SDLRPCParameterNameTextFields ofClass:SDLTextField.class]; } - (void)setImageFields:(nullable NSArray<SDLImageField *> *)imageFields { - [store sdl_setObject:imageFields forName:SDLNameImageFields]; + [store sdl_setObject:imageFields forName:SDLRPCParameterNameImageFields]; } - (nullable NSArray<SDLImageField *> *)imageFields { - return [store sdl_objectsForName:SDLNameImageFields ofClass:SDLImageField.class]; + return [store sdl_objectsForName:SDLRPCParameterNameImageFields ofClass:SDLImageField.class]; } - (void)setMediaClockFormats:(NSArray<SDLMediaClockFormat> *)mediaClockFormats { - [store sdl_setObject:mediaClockFormats forName:SDLNameMediaClockFormats]; + [store sdl_setObject:mediaClockFormats forName:SDLRPCParameterNameMediaClockFormats]; } - (NSArray<SDLMediaClockFormat> *)mediaClockFormats { - return [store sdl_objectForName:SDLNameMediaClockFormats]; + return [store sdl_objectForName:SDLRPCParameterNameMediaClockFormats]; } - (void)setGraphicSupported:(NSNumber<SDLBool> *)graphicSupported { - [store sdl_setObject:graphicSupported forName:SDLNameGraphicSupported]; + [store sdl_setObject:graphicSupported forName:SDLRPCParameterNameGraphicSupported]; } - (NSNumber<SDLBool> *)graphicSupported { - return [store sdl_objectForName:SDLNameGraphicSupported]; + return [store sdl_objectForName:SDLRPCParameterNameGraphicSupported]; } - (void)setTemplatesAvailable:(nullable NSArray<NSString *> *)templatesAvailable { - [store sdl_setObject:templatesAvailable forName:SDLNameTemplatesAvailable]; + [store sdl_setObject:templatesAvailable forName:SDLRPCParameterNameTemplatesAvailable]; } - (nullable NSArray<NSString *> *)templatesAvailable { - return [store sdl_objectForName:SDLNameTemplatesAvailable]; + return [store sdl_objectForName:SDLRPCParameterNameTemplatesAvailable]; } - (void)setScreenParams:(nullable SDLScreenParams *)screenParams { - [store sdl_setObject:screenParams forName:SDLNameScreenParams]; + [store sdl_setObject:screenParams forName:SDLRPCParameterNameScreenParams]; } - (nullable SDLScreenParams *)screenParams { - return [store sdl_objectForName:SDLNameScreenParams ofClass:SDLScreenParams.class]; + return [store sdl_objectForName:SDLRPCParameterNameScreenParams ofClass:SDLScreenParams.class]; } - (void)setNumCustomPresetsAvailable:(nullable NSNumber<SDLInt> *)numCustomPresetsAvailable { - [store sdl_setObject:numCustomPresetsAvailable forName:SDLNameNumberCustomPresetsAvailable]; + [store sdl_setObject:numCustomPresetsAvailable forName:SDLRPCParameterNameNumberCustomPresetsAvailable]; } - (nullable NSNumber<SDLInt> *)numCustomPresetsAvailable { - return [store sdl_objectForName:SDLNameNumberCustomPresetsAvailable]; + return [store sdl_objectForName:SDLRPCParameterNameNumberCustomPresetsAvailable]; } @end diff --git a/SmartDeviceLink/SDLECallInfo.m b/SmartDeviceLink/SDLECallInfo.m index 656ee3329..56a2afe30 100644 --- a/SmartDeviceLink/SDLECallInfo.m +++ b/SmartDeviceLink/SDLECallInfo.m @@ -4,34 +4,34 @@ #import "SDLECallInfo.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLECallInfo - (void)setECallNotificationStatus:(SDLVehicleDataNotificationStatus)eCallNotificationStatus { - [store sdl_setObject:eCallNotificationStatus forName:SDLNameECallNotificationStatus]; + [store sdl_setObject:eCallNotificationStatus forName:SDLRPCParameterNameECallNotificationStatus]; } - (SDLVehicleDataNotificationStatus)eCallNotificationStatus { - return [store sdl_objectForName:SDLNameECallNotificationStatus]; + return [store sdl_objectForName:SDLRPCParameterNameECallNotificationStatus]; } - (void)setAuxECallNotificationStatus:(SDLVehicleDataNotificationStatus)auxECallNotificationStatus { - [store sdl_setObject:auxECallNotificationStatus forName:SDLNameAuxECallNotificationStatus]; + [store sdl_setObject:auxECallNotificationStatus forName:SDLRPCParameterNameAuxECallNotificationStatus]; } - (SDLVehicleDataNotificationStatus)auxECallNotificationStatus { - return [store sdl_objectForName:SDLNameAuxECallNotificationStatus]; + return [store sdl_objectForName:SDLRPCParameterNameAuxECallNotificationStatus]; } - (void)setECallConfirmationStatus:(SDLECallConfirmationStatus)eCallConfirmationStatus { - [store sdl_setObject:eCallConfirmationStatus forName:SDLNameECallConfirmationStatus]; + [store sdl_setObject:eCallConfirmationStatus forName:SDLRPCParameterNameECallConfirmationStatus]; } - (SDLECallConfirmationStatus)eCallConfirmationStatus { - return [store sdl_objectForName:SDLNameECallConfirmationStatus]; + return [store sdl_objectForName:SDLRPCParameterNameECallConfirmationStatus]; } @end diff --git a/SmartDeviceLink/SDLEmergencyEvent.m b/SmartDeviceLink/SDLEmergencyEvent.m index 1aa18743e..43e9d369d 100644 --- a/SmartDeviceLink/SDLEmergencyEvent.m +++ b/SmartDeviceLink/SDLEmergencyEvent.m @@ -4,50 +4,50 @@ #import "SDLEmergencyEvent.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLEmergencyEvent - (void)setEmergencyEventType:(SDLEmergencyEventType)emergencyEventType { - [store sdl_setObject:emergencyEventType forName:SDLNameEmergencyEventType]; + [store sdl_setObject:emergencyEventType forName:SDLRPCParameterNameEmergencyEventType]; } - (SDLEmergencyEventType)emergencyEventType { - return [store sdl_objectForName:SDLNameEmergencyEventType]; + return [store sdl_objectForName:SDLRPCParameterNameEmergencyEventType]; } - (void)setFuelCutoffStatus:(SDLFuelCutoffStatus)fuelCutoffStatus { - [store sdl_setObject:fuelCutoffStatus forName:SDLNameFuelCutoffStatus]; + [store sdl_setObject:fuelCutoffStatus forName:SDLRPCParameterNameFuelCutoffStatus]; } - (SDLFuelCutoffStatus)fuelCutoffStatus { - return [store sdl_objectForName:SDLNameFuelCutoffStatus]; + return [store sdl_objectForName:SDLRPCParameterNameFuelCutoffStatus]; } - (void)setRolloverEvent:(SDLVehicleDataEventStatus)rolloverEvent { - [store sdl_setObject:rolloverEvent forName:SDLNameRolloverEvent]; + [store sdl_setObject:rolloverEvent forName:SDLRPCParameterNameRolloverEvent]; } - (SDLVehicleDataEventStatus)rolloverEvent { - return [store sdl_objectForName:SDLNameRolloverEvent]; + return [store sdl_objectForName:SDLRPCParameterNameRolloverEvent]; } - (void)setMaximumChangeVelocity:(NSNumber<SDLInt> *)maximumChangeVelocity { - [store sdl_setObject:maximumChangeVelocity forName:SDLNameMaximumChangeVelocity]; + [store sdl_setObject:maximumChangeVelocity forName:SDLRPCParameterNameMaximumChangeVelocity]; } - (NSNumber<SDLInt> *)maximumChangeVelocity { - return [store sdl_objectForName:SDLNameMaximumChangeVelocity]; + return [store sdl_objectForName:SDLRPCParameterNameMaximumChangeVelocity]; } - (void)setMultipleEvents:(SDLVehicleDataEventStatus)multipleEvents { - [store sdl_setObject:multipleEvents forName:SDLNameMultipleEvents]; + [store sdl_setObject:multipleEvents forName:SDLRPCParameterNameMultipleEvents]; } - (SDLVehicleDataEventStatus)multipleEvents { - return [store sdl_objectForName:SDLNameMultipleEvents]; + return [store sdl_objectForName:SDLRPCParameterNameMultipleEvents]; } @end diff --git a/SmartDeviceLink/SDLEncodedSyncPData.m b/SmartDeviceLink/SDLEncodedSyncPData.m index 3f9838509..5b47a155b 100644 --- a/SmartDeviceLink/SDLEncodedSyncPData.m +++ b/SmartDeviceLink/SDLEncodedSyncPData.m @@ -5,24 +5,25 @@ #import "SDLEncodedSyncPData.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLEncodedSyncPData - (instancetype)init { - if (self = [super initWithName:SDLNameEncodedSyncPData]) { + if (self = [super initWithName:SDLRPCFunctionNameEncodedSyncPData]) { } return self; } - (void)setData:(NSArray<NSString *> *)data { - [parameters sdl_setObject:data forName:SDLNameData]; + [parameters sdl_setObject:data forName:SDLRPCParameterNameData]; } - (NSArray<NSString *> *)data { - return [parameters sdl_objectForName:SDLNameData]; + return [parameters sdl_objectForName:SDLRPCParameterNameData]; } @end diff --git a/SmartDeviceLink/SDLEncodedSyncPDataResponse.m b/SmartDeviceLink/SDLEncodedSyncPDataResponse.m index c8d4c673e..c71ce9f11 100644 --- a/SmartDeviceLink/SDLEncodedSyncPDataResponse.m +++ b/SmartDeviceLink/SDLEncodedSyncPDataResponse.m @@ -5,14 +5,15 @@ #import "SDLEncodedSyncPDataResponse.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLEncodedSyncPDataResponse - (instancetype)init { - if (self = [super initWithName:SDLNameEncodedSyncPData]) { + if (self = [super initWithName:SDLRPCFunctionNameEncodedSyncPData]) { } return self; } diff --git a/SmartDeviceLink/SDLEndAudioPassThru.m b/SmartDeviceLink/SDLEndAudioPassThru.m index 127702a06..93e7afb4a 100644 --- a/SmartDeviceLink/SDLEndAudioPassThru.m +++ b/SmartDeviceLink/SDLEndAudioPassThru.m @@ -5,14 +5,15 @@ #import "SDLEndAudioPassThru.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLEndAudioPassThru - (instancetype)init { - if (self = [super initWithName:SDLNameEndAudioPassThru]) { + if (self = [super initWithName:SDLRPCFunctionNameEndAudioPassThru]) { } return self; } diff --git a/SmartDeviceLink/SDLEndAudioPassThruResponse.m b/SmartDeviceLink/SDLEndAudioPassThruResponse.m index 3efaa3915..ff1b88da6 100644 --- a/SmartDeviceLink/SDLEndAudioPassThruResponse.m +++ b/SmartDeviceLink/SDLEndAudioPassThruResponse.m @@ -5,14 +5,15 @@ #import "SDLEndAudioPassThruResponse.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLEndAudioPassThruResponse - (instancetype)init { - if (self = [super initWithName:SDLNameEndAudioPassThru]) { + if (self = [super initWithName:SDLRPCFunctionNameEndAudioPassThru]) { } return self; } diff --git a/SmartDeviceLink/SDLEqualizerSettings.m b/SmartDeviceLink/SDLEqualizerSettings.m index 1106d454e..e1ce9d3da 100644 --- a/SmartDeviceLink/SDLEqualizerSettings.m +++ b/SmartDeviceLink/SDLEqualizerSettings.m @@ -2,7 +2,7 @@ // #import "SDLEqualizerSettings.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" #import "NSMutableDictionary+Store.h" NS_ASSUME_NONNULL_BEGIN @@ -22,27 +22,27 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setChannelId:(NSNumber<SDLInt> *)channelId { - [store sdl_setObject:channelId forName:SDLNameChannelId]; + [store sdl_setObject:channelId forName:SDLRPCParameterNameChannelId]; } - (NSNumber<SDLInt> *)channelId { - return [store sdl_objectForName:SDLNameChannelId]; + return [store sdl_objectForName:SDLRPCParameterNameChannelId]; } - (void)setChannelName:(nullable NSString *)channelName { - [store sdl_setObject:channelName forName:SDLNameChannelName]; + [store sdl_setObject:channelName forName:SDLRPCParameterNameChannelName]; } - (nullable NSString *)channelName { - return [store sdl_objectForName:SDLNameChannelName]; + return [store sdl_objectForName:SDLRPCParameterNameChannelName]; } - (void)setChannelSetting:(NSNumber<SDLInt> *)channelSetting { - [store sdl_setObject:channelSetting forName:SDLNameChannelSetting]; + [store sdl_setObject:channelSetting forName:SDLRPCParameterNameChannelSetting]; } - (NSNumber<SDLInt> *)channelSetting { - return [store sdl_objectForName:SDLNameChannelSetting]; + return [store sdl_objectForName:SDLRPCParameterNameChannelSetting]; } @end diff --git a/SmartDeviceLink/SDLFuelRange.m b/SmartDeviceLink/SDLFuelRange.m index 19ebeba4b..1ea1f14a0 100644 --- a/SmartDeviceLink/SDLFuelRange.m +++ b/SmartDeviceLink/SDLFuelRange.m @@ -9,26 +9,26 @@ #import "SDLFuelRange.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLFuelRange - (void)setType:(nullable SDLFuelType)type { - [store sdl_setObject:type forName:SDLNameType]; + [store sdl_setObject:type forName:SDLRPCParameterNameType]; } - (nullable SDLFuelType)type { - return [store sdl_objectForName:SDLNameType]; + return [store sdl_objectForName:SDLRPCParameterNameType]; } - (void)setRange:(nullable NSNumber<SDLFloat> *)range { - [store sdl_setObject:range forName:SDLNameRange]; + [store sdl_setObject:range forName:SDLRPCParameterNameRange]; } - (nullable NSNumber<SDLFloat> *)range { - return [store sdl_objectForName:SDLNameRange]; + return [store sdl_objectForName:SDLRPCParameterNameRange]; } diff --git a/SmartDeviceLink/SDLFunctionID.h b/SmartDeviceLink/SDLFunctionID.h index d82e38d2c..b9766714b 100644 --- a/SmartDeviceLink/SDLFunctionID.h +++ b/SmartDeviceLink/SDLFunctionID.h @@ -1,12 +1,9 @@ // SDLFunctionID.h // - #import <Foundation/Foundation.h> - -#import "NSMutableDictionary+Store.h" -#import "SDLNames.h" #import "NSNumber+NumberType.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @@ -14,8 +11,8 @@ NS_ASSUME_NONNULL_BEGIN + (instancetype)sharedInstance; -- (nullable SDLName)functionNameForId:(UInt32)functionID; -- (nullable NSNumber<SDLInt> *)functionIdForName:(SDLName)functionName; +- (nullable SDLRPCFunctionName)functionNameForId:(UInt32)functionID; +- (nullable NSNumber<SDLInt> *)functionIdForName:(SDLRPCFunctionName)functionName; @end diff --git a/SmartDeviceLink/SDLFunctionID.m b/SmartDeviceLink/SDLFunctionID.m index 4c5ff0e3a..805683a57 100644 --- a/SmartDeviceLink/SDLFunctionID.m +++ b/SmartDeviceLink/SDLFunctionID.m @@ -4,6 +4,9 @@ #import "SDLFunctionID.h" +#import "NSMutableDictionary+Store.h" +#import "SDLRPCFunctionNames.h" + NS_ASSUME_NONNULL_BEGIN @interface SDLFunctionID () @@ -30,88 +33,92 @@ NS_ASSUME_NONNULL_BEGIN } 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, - @41: SDLNameButtonPress, - @43: SDLNameGetInteriorVehicleData, - @44: SDLNameSetInteriorVehicleData, - @45: SDLNameGetWayPoints, - @46: SDLNameSubscribeWayPoints, - @47: SDLNameUnsubscribeWayPoints, - @48: SDLNameGetSystemCapability, - @49: SDLNameSendHapticData, - @50: SDLNameSetCloudAppProperties, - @51: SDLNameGetCloudAppProperties, - @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, - @32783: SDLNameOnInteriorVehicleData, - @32784: SDLNameOnWayPointChange, - @32785: SDLNameOnRCStatus, - @65536: SDLNameEncodedSyncPData, - @65537: SDLNameSyncPData, - @98304: SDLNameOnEncodedSyncPData, - @98305: SDLNameOnSyncPData + @0: SDLRPCFunctionNameReserved, + @1: SDLRPCFunctionNameRegisterAppInterface, + @2: SDLRPCFunctionNameUnregisterAppInterface, + @3: SDLRPCFunctionNameSetGlobalProperties, + @4: SDLRPCFunctionNameResetGlobalProperties, + @5: SDLRPCFunctionNameAddCommand, + @6: SDLRPCFunctionNameDeleteCommand, + @7: SDLRPCFunctionNameAddSubMenu, + @8: SDLRPCFunctionNameDeleteSubMenu, + @9: SDLRPCFunctionNameCreateInteractionChoiceSet, + @10: SDLRPCFunctionNamePerformInteraction, + @11: SDLRPCFunctionNameDeleteInteractionChoiceSet, + @12: SDLRPCFunctionNameAlert, + @13: SDLRPCFunctionNameShow, + @14: SDLRPCFunctionNameSpeak, + @15: SDLRPCFunctionNameSetMediaClockTimer, + @16: SDLRPCFunctionNamePerformAudioPassThru, + @17: SDLRPCFunctionNameEndAudioPassThru, + @18: SDLRPCFunctionNameSubscribeButton, + @19: SDLRPCFunctionNameUnsubscribeButton, + @20: SDLRPCFunctionNameSubscribeVehicleData, + @21: SDLRPCFunctionNameUnsubscribeVehicleData, + @22: SDLRPCFunctionNameGetVehicleData, + @23: SDLRPCFunctionNameReadDID, + @24: SDLRPCFunctionNameGetDTCs, + @25: SDLRPCFunctionNameScrollableMessage, + @26: SDLRPCFunctionNameSlider, + @27: SDLRPCFunctionNameShowConstantTBT, + @28: SDLRPCFunctionNameAlertManeuver, + @29: SDLRPCFunctionNameUpdateTurnList, + @30: SDLRPCFunctionNameChangeRegistration, + @31: SDLRPCFunctionNameGenericResponse, + @32: SDLRPCFunctionNamePutFile, + @33: SDLRPCFunctionNameDeleteFile, + @34: SDLRPCFunctionNameListFiles, + @35: SDLRPCFunctionNameSetAppIcon, + @36: SDLRPCFunctionNameSetDisplayLayout, + @37: SDLRPCFunctionNameDiagnosticMessage, + @38: SDLRPCFunctionNameSystemRequest, + @39: SDLRPCFunctionNameSendLocation, + @40: SDLRPCFunctionNameDialNumber, + @41: SDLRPCFunctionNameButtonPress, + @43: SDLRPCFunctionNameGetInteriorVehicleData, + @44: SDLRPCFunctionNameSetInteriorVehicleData, + @45: SDLRPCFunctionNameGetWayPoints, + @46: SDLRPCFunctionNameSubscribeWayPoints, + @47: SDLRPCFunctionNameUnsubscribeWayPoints, + @48: SDLRPCFunctionNameGetSystemCapability, + @49: SDLRPCFunctionNameSendHapticData, + @52: SDLRPCFunctionNamePublishAppService, + @53: SDLRPCFunctionNameGetAppServiceData, + @54: SDLRPCFunctionNameGetFile, + @55: SDLRPCFunctionNamePerformAppServiceInteraction, + @32768: SDLRPCFunctionNameOnHMIStatus, + @32769: SDLRPCFunctionNameOnAppInterfaceUnregistered, + @32770: SDLRPCFunctionNameOnButtonEvent, + @32771: SDLRPCFunctionNameOnButtonPress, + @32772: SDLRPCFunctionNameOnVehicleData, + @32773: SDLRPCFunctionNameOnCommand, + @32774: SDLRPCFunctionNameOnTBTClientState, + @32775: SDLRPCFunctionNameOnDriverDistraction, + @32776: SDLRPCFunctionNameOnPermissionsChange, + @32777: SDLRPCFunctionNameOnAudioPassThru, + @32778: SDLRPCFunctionNameOnLanguageChange, + @32779: SDLRPCFunctionNameOnKeyboardInput, + @32780: SDLRPCFunctionNameOnTouchEvent, + @32781: SDLRPCFunctionNameOnSystemRequest, + @32782: SDLRPCFunctionNameOnHashChange, + @32783: SDLRPCFunctionNameOnInteriorVehicleData, + @32784: SDLRPCFunctionNameOnWayPointChange, + @32785: SDLRPCFunctionNameOnRCStatus, + @32786: SDLRPCFunctionNameOnAppServiceData, + @32787: SDLRPCFunctionNameOnSystemCapabilityUpdated, + @65536: SDLRPCFunctionNameEncodedSyncPData, + @65537: SDLRPCFunctionNameSyncPData, + @98304: SDLRPCFunctionNameOnEncodedSyncPData, + @98305: SDLRPCFunctionNameOnSyncPData }; return self; } -- (nullable SDLName)functionNameForId:(UInt32)functionID { +- (nullable SDLRPCFunctionName)functionNameForId:(UInt32)functionID { return self.functionIds[@(functionID)]; } -- (nullable NSNumber<SDLInt> *)functionIdForName:(SDLName)functionName { +- (nullable NSNumber<SDLInt> *)functionIdForName:(SDLRPCFunctionName)functionName { return [[self.functionIds allKeysForObject:functionName] firstObject]; } diff --git a/SmartDeviceLink/SDLGPSData.m b/SmartDeviceLink/SDLGPSData.m index eda7edb31..3d542c071 100644 --- a/SmartDeviceLink/SDLGPSData.m +++ b/SmartDeviceLink/SDLGPSData.m @@ -4,154 +4,154 @@ #import "SDLGPSData.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLGPSData - (void)setLongitudeDegrees:(NSNumber<SDLFloat> *)longitudeDegrees { - [store sdl_setObject:longitudeDegrees forName:SDLNameLongitudeDegrees]; + [store sdl_setObject:longitudeDegrees forName:SDLRPCParameterNameLongitudeDegrees]; } - (NSNumber<SDLFloat> *)longitudeDegrees { - return [store sdl_objectForName:SDLNameLongitudeDegrees]; + return [store sdl_objectForName:SDLRPCParameterNameLongitudeDegrees]; } - (void)setLatitudeDegrees:(NSNumber<SDLFloat> *)latitudeDegrees { - [store sdl_setObject:latitudeDegrees forName:SDLNameLatitudeDegrees]; + [store sdl_setObject:latitudeDegrees forName:SDLRPCParameterNameLatitudeDegrees]; } - (NSNumber<SDLFloat> *)latitudeDegrees { - return [store sdl_objectForName:SDLNameLatitudeDegrees]; + return [store sdl_objectForName:SDLRPCParameterNameLatitudeDegrees]; } - (void)setUtcYear:(nullable NSNumber<SDLInt> *)utcYear { - [store sdl_setObject:utcYear forName:SDLNameUTCYear]; + [store sdl_setObject:utcYear forName:SDLRPCParameterNameUTCYear]; } - (nullable NSNumber<SDLInt> *)utcYear { - return [store sdl_objectForName:SDLNameUTCYear]; + return [store sdl_objectForName:SDLRPCParameterNameUTCYear]; } - (void)setUtcMonth:(nullable NSNumber<SDLInt> *)utcMonth { - [store sdl_setObject:utcMonth forName:SDLNameUTCMonth]; + [store sdl_setObject:utcMonth forName:SDLRPCParameterNameUTCMonth]; } - (nullable NSNumber<SDLInt> *)utcMonth { - return [store sdl_objectForName:SDLNameUTCMonth]; + return [store sdl_objectForName:SDLRPCParameterNameUTCMonth]; } - (void)setUtcDay:(nullable NSNumber<SDLInt> *)utcDay { - [store sdl_setObject:utcDay forName:SDLNameUTCDay]; + [store sdl_setObject:utcDay forName:SDLRPCParameterNameUTCDay]; } - (nullable NSNumber<SDLInt> *)utcDay { - return [store sdl_objectForName:SDLNameUTCDay]; + return [store sdl_objectForName:SDLRPCParameterNameUTCDay]; } - (void)setUtcHours:(nullable NSNumber<SDLInt> *)utcHours { - [store sdl_setObject:utcHours forName:SDLNameUTCHours]; + [store sdl_setObject:utcHours forName:SDLRPCParameterNameUTCHours]; } - (nullable NSNumber<SDLInt> *)utcHours { - return [store sdl_objectForName:SDLNameUTCHours]; + return [store sdl_objectForName:SDLRPCParameterNameUTCHours]; } - (void)setUtcMinutes:(nullable NSNumber<SDLInt> *)utcMinutes { - [store sdl_setObject:utcMinutes forName:SDLNameUTCMinutes]; + [store sdl_setObject:utcMinutes forName:SDLRPCParameterNameUTCMinutes]; } - (nullable NSNumber<SDLInt> *)utcMinutes { - return [store sdl_objectForName:SDLNameUTCMinutes]; + return [store sdl_objectForName:SDLRPCParameterNameUTCMinutes]; } - (void)setUtcSeconds:(nullable NSNumber<SDLInt> *)utcSeconds { - [store sdl_setObject:utcSeconds forName:SDLNameUTCSeconds]; + [store sdl_setObject:utcSeconds forName:SDLRPCParameterNameUTCSeconds]; } - (nullable NSNumber<SDLInt> *)utcSeconds { - return [store sdl_objectForName:SDLNameUTCSeconds]; + return [store sdl_objectForName:SDLRPCParameterNameUTCSeconds]; } - (void)setCompassDirection:(nullable SDLCompassDirection)compassDirection { - [store sdl_setObject:compassDirection forName:SDLNameCompassDirection]; + [store sdl_setObject:compassDirection forName:SDLRPCParameterNameCompassDirection]; } - (nullable SDLCompassDirection)compassDirection { - return [store sdl_objectForName:SDLNameCompassDirection]; + return [store sdl_objectForName:SDLRPCParameterNameCompassDirection]; } - (void)setPdop:(nullable NSNumber<SDLFloat> *)pdop { - [store sdl_setObject:pdop forName:SDLNamePDOP]; + [store sdl_setObject:pdop forName:SDLRPCParameterNamePDOP]; } - (nullable NSNumber<SDLFloat> *)pdop { - return [store sdl_objectForName:SDLNamePDOP]; + return [store sdl_objectForName:SDLRPCParameterNamePDOP]; } - (void)setHdop:(nullable NSNumber<SDLFloat> *)hdop { - [store sdl_setObject:hdop forName:SDLNameHDOP]; + [store sdl_setObject:hdop forName:SDLRPCParameterNameHDOP]; } - (nullable NSNumber<SDLFloat> *)hdop { - return [store sdl_objectForName:SDLNameHDOP]; + return [store sdl_objectForName:SDLRPCParameterNameHDOP]; } - (void)setVdop:(nullable NSNumber<SDLFloat> *)vdop { - [store sdl_setObject:vdop forName:SDLNameVDOP]; + [store sdl_setObject:vdop forName:SDLRPCParameterNameVDOP]; } - (nullable NSNumber<SDLFloat> *)vdop { - return [store sdl_objectForName:SDLNameVDOP]; + return [store sdl_objectForName:SDLRPCParameterNameVDOP]; } - (void)setActual:(nullable NSNumber<SDLBool> *)actual { - [store sdl_setObject:actual forName:SDLNameActual]; + [store sdl_setObject:actual forName:SDLRPCParameterNameActual]; } - (nullable NSNumber<SDLBool> *)actual { - return [store sdl_objectForName:SDLNameActual]; + return [store sdl_objectForName:SDLRPCParameterNameActual]; } - (void)setSatellites:(nullable NSNumber<SDLInt> *)satellites { - [store sdl_setObject:satellites forName:SDLNameSatellites]; + [store sdl_setObject:satellites forName:SDLRPCParameterNameSatellites]; } - (nullable NSNumber<SDLInt> *)satellites { - return [store sdl_objectForName:SDLNameSatellites]; + return [store sdl_objectForName:SDLRPCParameterNameSatellites]; } - (void)setDimension:(nullable SDLDimension)dimension { - [store sdl_setObject:dimension forName:SDLNameDimension]; + [store sdl_setObject:dimension forName:SDLRPCParameterNameDimension]; } - (nullable SDLDimension)dimension { - return [store sdl_objectForName:SDLNameDimension]; + return [store sdl_objectForName:SDLRPCParameterNameDimension]; } - (void)setAltitude:(nullable NSNumber<SDLFloat> *)altitude { - [store sdl_setObject:altitude forName:SDLNameAltitude]; + [store sdl_setObject:altitude forName:SDLRPCParameterNameAltitude]; } - (nullable NSNumber<SDLFloat> *)altitude { - return [store sdl_objectForName:SDLNameAltitude]; + return [store sdl_objectForName:SDLRPCParameterNameAltitude]; } - (void)setHeading:(nullable NSNumber<SDLFloat> *)heading { - [store sdl_setObject:heading forName:SDLNameHeading]; + [store sdl_setObject:heading forName:SDLRPCParameterNameHeading]; } - (nullable NSNumber<SDLFloat> *)heading { - return [store sdl_objectForName:SDLNameHeading]; + return [store sdl_objectForName:SDLRPCParameterNameHeading]; } - (void)setSpeed:(nullable NSNumber<SDLFloat> *)speed { - [store sdl_setObject:speed forName:SDLNameSpeed]; + [store sdl_setObject:speed forName:SDLRPCParameterNameSpeed]; } - (nullable NSNumber<SDLFloat> *)speed { - return [store sdl_objectForName:SDLNameSpeed]; + return [store sdl_objectForName:SDLRPCParameterNameSpeed]; } @end diff --git a/SmartDeviceLink/SDLGenericResponse.m b/SmartDeviceLink/SDLGenericResponse.m index 6c3849018..949c4c061 100644 --- a/SmartDeviceLink/SDLGenericResponse.m +++ b/SmartDeviceLink/SDLGenericResponse.m @@ -5,14 +5,15 @@ #import "SDLGenericResponse.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLGenericResponse - (instancetype)init { - if (self = [super initWithName:SDLNameGenericResponse]) { + if (self = [super initWithName:SDLRPCFunctionNameGenericResponse]) { } return self; } diff --git a/SmartDeviceLink/SDLGetAppServiceData.h b/SmartDeviceLink/SDLGetAppServiceData.h new file mode 100644 index 000000000..eaec788b9 --- /dev/null +++ b/SmartDeviceLink/SDLGetAppServiceData.h @@ -0,0 +1,62 @@ +// +// SDLGetAppServiceData.h +// SmartDeviceLink +// +// Created by Nicole on 2/6/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import "SDLRPCRequest.h" + +#import "SDLAppServiceType.h" + + +NS_ASSUME_NONNULL_BEGIN + +/** + * This request asks the module for current data related to the specific service. It also includes an option to subscribe to that service for future updates. + */ +@interface SDLGetAppServiceData : SDLRPCRequest + +/** + * Convenience init for required parameters. + * + * @param serviceType The app service type + * @return A SDLGetAppServiceData object + */ +- (instancetype)initWithServiceType:(NSString *)serviceType; + +/** + * Convenience init for service type. + * + * @param serviceType The app service type + * @return A SDLGetAppServiceData object + */ +- (instancetype)initWithAppServiceType:(SDLAppServiceType)serviceType; + +/** + * Convenience init for all parameters. + * + * @param serviceType The app service type + * @param subscribe Whether or not to subcribe to updates + * @return A SDLGetAppServiceData object + */ +- (instancetype)initWithServiceType:(NSString *)serviceType subscribe:(BOOL)subscribe; + +/** + * The type of service that is to be offered by this app. See `AppServiceType` for known enum equivalent types. Parameter is a string to allow for new service types to be used by apps on older versions of SDL Core. + * + * String, See `SDLAppServiceType`, Required + */ +@property (strong, nonatomic) NSString *serviceType; + +/** + * If true, the consumer is requesting to subscribe to all future updates from the service publisher. If false, the consumer doesn't wish to subscribe and should be unsubscribed if it was previously subscribed. + * + * Boolean, Optional + */ +@property (nullable, strong, nonatomic) NSNumber<SDLBool> *subscribe; + +@end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLGetAppServiceData.m b/SmartDeviceLink/SDLGetAppServiceData.m new file mode 100644 index 000000000..778741303 --- /dev/null +++ b/SmartDeviceLink/SDLGetAppServiceData.m @@ -0,0 +1,69 @@ +// +// SDLGetAppServiceData.m +// SmartDeviceLink +// +// Created by Nicole on 2/6/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import "SDLGetAppServiceData.h" + +#import "NSMutableDictionary+Store.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" + +NS_ASSUME_NONNULL_BEGIN + +@implementation SDLGetAppServiceData + +- (instancetype)init { + if (self = [super initWithName:SDLRPCFunctionNameGetAppServiceData]) { + } + return self; +} + +- (instancetype)initWithServiceType:(NSString *)serviceType { + self = [self init]; + if (!self) { + return nil; + } + + self.serviceType = serviceType; + + return self; +} + +- (instancetype)initWithAppServiceType:(SDLAppServiceType)serviceType { + return [self initWithServiceType:serviceType]; +} + +- (instancetype)initWithServiceType:(NSString *)serviceType subscribe:(BOOL)subscribe { + self = [self initWithServiceType:serviceType]; + if (!self) { + return nil; + } + + self.subscribe = @(subscribe); + + return self; +} + +- (void)setServiceType:(NSString *)serviceType { + [parameters sdl_setObject:serviceType forName:SDLRPCParameterNameServiceType]; +} + +- (NSString *)serviceType { + return [parameters sdl_objectForName:SDLRPCParameterNameServiceType]; +} + +- (void)setSubscribe:(nullable NSNumber<SDLBool> *)subscribe { + [parameters sdl_setObject:subscribe forName:SDLRPCParameterNameSubscribe]; +} + +- (nullable NSNumber<SDLBool> *)subscribe { + return [parameters sdl_objectForName:SDLRPCParameterNameSubscribe]; +} + +@end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLGetAppServiceDataResponse.h b/SmartDeviceLink/SDLGetAppServiceDataResponse.h new file mode 100644 index 000000000..cd05e4710 --- /dev/null +++ b/SmartDeviceLink/SDLGetAppServiceDataResponse.h @@ -0,0 +1,37 @@ +// +// SDLGetAppServiceDataResponse.h +// SmartDeviceLink +// +// Created by Nicole on 2/6/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import "SDLRPCResponse.h" + +@class SDLAppServiceData; + +NS_ASSUME_NONNULL_BEGIN + +/* + * This response includes the data that is requested from the specific service. + */ +@interface SDLGetAppServiceDataResponse : SDLRPCResponse + +/** + * Convenience init. + * + * @param serviceData Contains all the current data of the app service + * @return A SDLGetAppServiceDataResponse object + */ +- (instancetype)initWithAppServiceData:(SDLAppServiceData *)serviceData; + +/** + * Contains all the current data of the app service. + * + * SDLAppServiceData, Required + */ +@property (strong, nonatomic) SDLAppServiceData *serviceData; + +@end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLGetAppServiceDataResponse.m b/SmartDeviceLink/SDLGetAppServiceDataResponse.m new file mode 100644 index 000000000..b79ae6420 --- /dev/null +++ b/SmartDeviceLink/SDLGetAppServiceDataResponse.m @@ -0,0 +1,47 @@ +// +// SDLGetAppServiceDataResponse.m +// SmartDeviceLink +// +// Created by Nicole on 2/6/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import "SDLGetAppServiceDataResponse.h" + +#import "NSMutableDictionary+Store.h" +#import "SDLAppServiceData.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" + +NS_ASSUME_NONNULL_BEGIN + +@implementation SDLGetAppServiceDataResponse + +- (instancetype)init { + if (self = [super initWithName:SDLRPCFunctionNameGetAppServiceData]) { + } + return self; +} + +- (instancetype)initWithAppServiceData:(SDLAppServiceData *)serviceData { + self = [self init]; + if (!self) { + return nil; + } + + self.serviceData = serviceData; + + return self; +} + +- (void)setServiceData:(SDLAppServiceData *)serviceData { + [parameters sdl_setObject:serviceData forName:SDLRPCParameterNameServiceData]; +} + +- (SDLAppServiceData *)serviceData { + return [parameters sdl_objectForName:SDLRPCParameterNameServiceData ofClass:SDLAppServiceData.class]; +} + +@end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLGetDTCs.m b/SmartDeviceLink/SDLGetDTCs.m index 3bbd551ff..2d3e5896f 100644 --- a/SmartDeviceLink/SDLGetDTCs.m +++ b/SmartDeviceLink/SDLGetDTCs.m @@ -5,14 +5,15 @@ #import "SDLGetDTCs.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLGetDTCs - (instancetype)init { - if (self = [super initWithName:SDLNameGetDTCs]) { + if (self = [super initWithName:SDLRPCFunctionNameGetDTCs]) { } return self; } @@ -40,19 +41,19 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setEcuName:(NSNumber<SDLInt> *)ecuName { - [parameters sdl_setObject:ecuName forName:SDLNameECUName]; + [parameters sdl_setObject:ecuName forName:SDLRPCParameterNameECUName]; } - (NSNumber<SDLInt> *)ecuName { - return [parameters sdl_objectForName:SDLNameECUName]; + return [parameters sdl_objectForName:SDLRPCParameterNameECUName]; } - (void)setDtcMask:(nullable NSNumber<SDLInt> *)dtcMask { - [parameters sdl_setObject:dtcMask forName:SDLNameDTCMask]; + [parameters sdl_setObject:dtcMask forName:SDLRPCParameterNameDTCMask]; } - (nullable NSNumber<SDLInt> *)dtcMask { - return [parameters sdl_objectForName:SDLNameDTCMask]; + return [parameters sdl_objectForName:SDLRPCParameterNameDTCMask]; } @end diff --git a/SmartDeviceLink/SDLGetDTCsResponse.m b/SmartDeviceLink/SDLGetDTCsResponse.m index 898a36de6..0e9ee3d90 100644 --- a/SmartDeviceLink/SDLGetDTCsResponse.m +++ b/SmartDeviceLink/SDLGetDTCsResponse.m @@ -5,32 +5,33 @@ #import "SDLGetDTCsResponse.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLGetDTCsResponse - (instancetype)init { - if (self = [super initWithName:SDLNameGetDTCs]) { + if (self = [super initWithName:SDLRPCFunctionNameGetDTCs]) { } return self; } - (void)setEcuHeader:(NSNumber<SDLInt> *)ecuHeader { - [parameters sdl_setObject:ecuHeader forName:SDLNameECUHeader]; + [parameters sdl_setObject:ecuHeader forName:SDLRPCParameterNameECUHeader]; } - (NSNumber<SDLInt> *)ecuHeader { - return [parameters sdl_objectForName:SDLNameECUHeader]; + return [parameters sdl_objectForName:SDLRPCParameterNameECUHeader]; } - (void)setDtc:(NSArray<NSString *> *)dtc { - [parameters sdl_setObject:dtc forName:SDLNameDTC]; + [parameters sdl_setObject:dtc forName:SDLRPCParameterNameDTC]; } - (NSArray<NSString *> *)dtc { - return [parameters sdl_objectForName:SDLNameDTC]; + return [parameters sdl_objectForName:SDLRPCParameterNameDTC]; } @end diff --git a/SmartDeviceLink/SDLGetFile.h b/SmartDeviceLink/SDLGetFile.h new file mode 100644 index 000000000..3a63ab737 --- /dev/null +++ b/SmartDeviceLink/SDLGetFile.h @@ -0,0 +1,86 @@ +// +// SDLGetFile.h +// SmartDeviceLink +// +// Created by Nicole on 2/7/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import "SDLRPCRequest.h" +#import "SDLFileType.h" + +NS_ASSUME_NONNULL_BEGIN + +/** + * This request is sent to the module to retrieve a file. + */ +@interface SDLGetFile : SDLRPCRequest + +/** + * Convenience init for required parameters. + * + * @param fileName File name that should be retrieved. + * @return A SDLGetFile object + */ +- (instancetype)initWithFileName:(NSString *)fileName; + +/** + * Convenience init for sending a small file. + * + * @param fileName File name that should be retrieved. + * @param appServiceId ID of the service that should have uploaded the requested file + * @param fileType Selected file type + * @return A SDLGetFile object + */ +- (instancetype)initWithFileName:(NSString *)fileName appServiceId:(nullable NSString *)appServiceId fileType:(nullable SDLFileType)fileType; + +/** + * Convenience init for sending a large file in multiple data chunks. + * + * @param fileName File name that should be retrieved. + * @param appServiceId ID of the service that should have uploaded the requested file + * @param fileType Selected file type + * @param offset Offset in bytes for resuming partial data chunks + * @param length Length in bytes for resuming partial data chunks + * @return A SDLGetFile object + */ +- (instancetype)initWithFileName:(NSString *)fileName appServiceId:(nullable NSString *)appServiceId fileType:(nullable SDLFileType)fileType offset:(UInt32)offset length:(UInt32)length; + +/** + * File name that should be retrieved. + * + * String, Required, Max string length 255 chars + */ +@property (strong, nonatomic) NSString *fileName; + +/** + * ID of the service that should have uploaded the requested file. + * + * String, Optional + */ +@property (nullable, strong, nonatomic) NSString *appServiceId; + +/** + * Selected file type. + * + * SDLFileType, Optional + */ +@property (nullable, strong, nonatomic) SDLFileType fileType; + +/** + * Optional offset in bytes for resuming partial data chunks. + * + * Integer, Optional, minvalue="0" maxvalue="2000000000" + */ +@property (nullable, strong, nonatomic) NSNumber<SDLUInt> *offset; + +/** + * Optional length in bytes for resuming partial data chunks if offset is set to 0, then length is the total length of the file to be downloaded. + * + * Integer, Optional, minvalue="0" maxvalue="2000000000" + */ +@property (nullable, strong, nonatomic) NSNumber<SDLUInt> *length; + +@end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLGetFile.m b/SmartDeviceLink/SDLGetFile.m new file mode 100644 index 000000000..121e56ad7 --- /dev/null +++ b/SmartDeviceLink/SDLGetFile.m @@ -0,0 +1,103 @@ +// +// SDLGetFile.m +// SmartDeviceLink +// +// Created by Nicole on 2/7/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import "SDLGetFile.h" + +#import "NSMutableDictionary+Store.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" + + +NS_ASSUME_NONNULL_BEGIN + +@implementation SDLGetFile + +- (instancetype)init { + if (self = [super initWithName:SDLRPCFunctionNameGetFile]) { + } + return self; +} + +- (instancetype)initWithFileName:(NSString *)fileName { + self = [self init]; + if (!self) { + return nil; + } + + self.fileName = fileName; + + return self; +} + +- (instancetype)initWithFileName:(NSString *)fileName appServiceId:(nullable NSString *)appServiceId fileType:(nullable SDLFileType)fileType { + self = [self initWithFileName:fileName]; + if (!self) { + return nil; + } + + self.appServiceId = appServiceId; + self.fileType = fileType; + + return self; +} + +- (instancetype)initWithFileName:(NSString *)fileName appServiceId:(nullable NSString *)appServiceId fileType:(nullable SDLFileType)fileType offset:(UInt32)offset length:(UInt32)length { + self = [self initWithFileName:fileName appServiceId:appServiceId fileType:fileType]; + if (!self) { + return nil; + } + + self.offset = @(offset); + self.length = @(length); + + return self; +} + +- (void)setFileName:(NSString *)fileName { + [parameters sdl_setObject:fileName forName:SDLRPCParameterNameFilename]; +} + +- (NSString *)fileName { + return [parameters sdl_objectForName:SDLRPCParameterNameFilename]; +} + +- (void)setAppServiceId:(nullable NSString *)appServiceId { + [parameters sdl_setObject:appServiceId forName:SDLRPCParameterNameAppServiceId]; +} + +- (nullable NSString *)appServiceId { + return [parameters sdl_objectForName:SDLRPCParameterNameAppServiceId]; +} + +- (void)setFileType:(nullable SDLFileType)fileType { + [parameters sdl_setObject:fileType forName:SDLRPCParameterNameFileType]; +} + +- (nullable SDLFileType)fileType { + return [parameters sdl_objectForName:SDLRPCParameterNameFileType]; +} + +- (void)setOffset:(nullable NSNumber<SDLUInt> *)offset { + [parameters sdl_setObject:offset forName:SDLRPCParameterNameOffset]; +} + +- (nullable NSNumber<SDLUInt> *)offset { + return [parameters sdl_objectForName:SDLRPCParameterNameOffset]; +} + +- (void)setLength:(nullable NSNumber<SDLUInt> *)length { + [parameters sdl_setObject:length forName:SDLRPCParameterNameLength]; +} + +- (nullable NSNumber<SDLUInt> *)length { + return [parameters sdl_objectForName:SDLRPCParameterNameLength]; +} + +@end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLGetFileResponse.h b/SmartDeviceLink/SDLGetFileResponse.h new file mode 100644 index 000000000..96164d3bf --- /dev/null +++ b/SmartDeviceLink/SDLGetFileResponse.h @@ -0,0 +1,59 @@ +// +// SDLGetFileResponse.h +// SmartDeviceLink +// +// Created by Nicole on 2/7/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import "SDLRPCResponse.h" + +#import "SDLFileType.h" + + +NS_ASSUME_NONNULL_BEGIN + +@interface SDLGetFileResponse : SDLRPCResponse + +/** + * Convenience init for all parameters. + * + * @param offset Optional offset in bytes for resuming partial data chunks + * @param length Optional length in bytes for resuming partial data chunks if offset is set to 0, then length is the total length of the file to be downloaded + * @param fileType File type that is being sent in response + * @param crc Additional CRC32 checksum to protect data integrity up to 512 Mbits + * @return A SDLGetFileResponse object + */ +- (instancetype)initWithOffset:(UInt32)offset length:(UInt32)length fileType:(nullable SDLFileType)fileType crc:(UInt32)crc; + +/** + * Optional offset in bytes for resuming partial data chunks. + * + * Integer, Optional, minvalue="0" maxvalue="2000000000" + */ +@property (nullable, strong, nonatomic) NSNumber<SDLUInt> *offset; + +/** + * Optional length in bytes for resuming partial data chunks if offset is set to 0, then length is the total length of the file to be downloaded. + * + * Integer, Optional, minvalue="0" maxvalue="2000000000" + */ +@property (nullable, strong, nonatomic) NSNumber<SDLUInt> *length; + +/** + * File type that is being sent in response. + * + * SDLFileType, Optional + */ +@property (nullable, strong, nonatomic) SDLFileType fileType; + +/** + * Additional CRC32 checksum to protect data integrity up to 512 Mbits. + * + * Integer, Optional, minvalue="0" maxvalue="4294967295" + */ +@property (nullable, strong, nonatomic) NSNumber<SDLUInt> *crc; + +@end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLGetFileResponse.m b/SmartDeviceLink/SDLGetFileResponse.m new file mode 100644 index 000000000..2d7f0dd47 --- /dev/null +++ b/SmartDeviceLink/SDLGetFileResponse.m @@ -0,0 +1,73 @@ +// +// SDLGetFileResponse.m +// SmartDeviceLink +// +// Created by Nicole on 2/7/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import "SDLGetFileResponse.h" + +#import "NSMutableDictionary+Store.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" + +NS_ASSUME_NONNULL_BEGIN + +@implementation SDLGetFileResponse + +- (instancetype)init { + if (self = [super initWithName:SDLRPCFunctionNameGetFile]) { + } + return self; +} + +- (instancetype)initWithOffset:(UInt32)offset length:(UInt32)length fileType:(nullable SDLFileType)fileType crc:(UInt32)crc { + self = [self init]; + if (!self) { + return nil; + } + + self.offset = @(offset); + self.length = @(length); + self.fileType = fileType; + self.crc = @(crc); + + return self; +} + +- (void)setOffset:(nullable NSNumber<SDLUInt> *)offset { + [parameters sdl_setObject:offset forName:SDLRPCParameterNameOffset]; +} + +- (nullable NSNumber<SDLUInt> *)offset { + return [parameters sdl_objectForName:SDLRPCParameterNameOffset]; +} + +- (void)setLength:(nullable NSNumber<SDLUInt> *)length { + [parameters sdl_setObject:length forName:SDLRPCParameterNameLength]; +} + +- (nullable NSNumber<SDLUInt> *)length { + return [parameters sdl_objectForName:SDLRPCParameterNameLength]; +} + +- (void)setFileType:(nullable SDLFileType)fileType { + [parameters sdl_setObject:fileType forName:SDLRPCParameterNameFileType]; +} + +- (nullable SDLFileType)fileType { + return [parameters sdl_objectForName:SDLRPCParameterNameFileType]; +} + +- (void)setCrc:(nullable NSNumber<SDLUInt> *)crc { + [parameters sdl_setObject:crc forName:SDLRPCParameterNameCRC]; +} + +- (nullable NSNumber<SDLUInt> *)crc { + return [parameters sdl_objectForName:SDLRPCParameterNameCRC]; +} + +@end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLGetInteriorVehicleData.m b/SmartDeviceLink/SDLGetInteriorVehicleData.m index efdf2c3b4..4c94fdc44 100755 --- a/SmartDeviceLink/SDLGetInteriorVehicleData.m +++ b/SmartDeviceLink/SDLGetInteriorVehicleData.m @@ -3,7 +3,8 @@ // #import "SDLGetInteriorVehicleData.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" #import "NSMutableDictionary+Store.h" NS_ASSUME_NONNULL_BEGIN @@ -11,7 +12,7 @@ NS_ASSUME_NONNULL_BEGIN @implementation SDLGetInteriorVehicleData - (instancetype)init { - if (self = [super initWithName:SDLNameGetInteriorVehicleData]) { + if (self = [super initWithName:SDLRPCFunctionNameGetInteriorVehicleData]) { } return self; } @@ -52,19 +53,19 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setModuleType:(SDLModuleType)moduleType { - [parameters sdl_setObject:moduleType forName:SDLNameModuleType]; + [parameters sdl_setObject:moduleType forName:SDLRPCParameterNameModuleType]; } - (SDLModuleType)moduleType { - return [parameters sdl_objectForName:SDLNameModuleType]; + return [parameters sdl_objectForName:SDLRPCParameterNameModuleType]; } - (void)setSubscribe:(nullable NSNumber<SDLBool> *)subscribe { - [parameters sdl_setObject:subscribe forName:SDLNameSubscribe]; + [parameters sdl_setObject:subscribe forName:SDLRPCParameterNameSubscribe]; } - (nullable NSNumber<SDLBool> *)subscribe { - return [parameters sdl_objectForName:SDLNameSubscribe]; + return [parameters sdl_objectForName:SDLRPCParameterNameSubscribe]; } @end diff --git a/SmartDeviceLink/SDLGetInteriorVehicleDataResponse.m b/SmartDeviceLink/SDLGetInteriorVehicleDataResponse.m index 43491be57..66385d0dc 100644 --- a/SmartDeviceLink/SDLGetInteriorVehicleDataResponse.m +++ b/SmartDeviceLink/SDLGetInteriorVehicleDataResponse.m @@ -4,7 +4,8 @@ #import "SDLGetInteriorVehicleDataResponse.h" #import "SDLModuleData.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" #import "NSMutableDictionary+Store.h" NS_ASSUME_NONNULL_BEGIN @@ -13,25 +14,25 @@ NS_ASSUME_NONNULL_BEGIN @implementation SDLGetInteriorVehicleDataResponse - (instancetype)init { - if (self = [super initWithName:SDLNameGetInteriorVehicleData]) { + if (self = [super initWithName:SDLRPCFunctionNameGetInteriorVehicleData]) { } return self; } - (void)setModuleData:(SDLModuleData *)moduleData { - [parameters sdl_setObject:moduleData forName:SDLNameModuleData]; + [parameters sdl_setObject:moduleData forName:SDLRPCParameterNameModuleData]; } - (SDLModuleData *)moduleData { - return [parameters sdl_objectForName:SDLNameModuleData ofClass:SDLModuleData.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameModuleData ofClass:SDLModuleData.class]; } - (void)setIsSubscribed:(nullable NSNumber<SDLBool> *)isSubscribed { - [parameters sdl_setObject:isSubscribed forName:SDLNameIsSubscribed]; + [parameters sdl_setObject:isSubscribed forName:SDLRPCParameterNameIsSubscribed]; } - (nullable NSNumber<SDLBool> *)isSubscribed { - return [parameters sdl_objectForName:SDLNameIsSubscribed]; + return [parameters sdl_objectForName:SDLRPCParameterNameIsSubscribed]; } @end diff --git a/SmartDeviceLink/SDLGetSystemCapability.h b/SmartDeviceLink/SDLGetSystemCapability.h index 7d7490eeb..b81704e35 100644 --- a/SmartDeviceLink/SDLGetSystemCapability.h +++ b/SmartDeviceLink/SDLGetSystemCapability.h @@ -13,17 +13,42 @@ NS_ASSUME_NONNULL_BEGIN +/* + * Request for expanded information about a supported system/HMI capability + */ @interface SDLGetSystemCapability : SDLRPCRequest +/** + * Convenience init + * + * @param type The type of system capability + * @return A SDLSystemCapabilityType object + */ - (instancetype)initWithType:(SDLSystemCapabilityType)type; /** - They type of capability you'd like to receive in the response. + * Convenience init + * + * @param type The type of system capability + * @param subscribe Whether or not to subscribe to updates of the supplied service capability type + * @return A SDLSystemCapabilityType object + */ +- (instancetype)initWithType:(SDLSystemCapabilityType)type subscribe:(BOOL)subscribe; - Mandatory +/** + * The type of system capability to get more information on + * + * SDLSystemCapabilityType, Required */ @property (strong, nonatomic) SDLSystemCapabilityType systemCapabilityType; +/** + * Flag to subscribe to updates of the supplied service capability type. If true, the requester will be subscribed. If false, the requester will not be subscribed and be removed as a subscriber if it was previously subscribed. + * + * Boolean, Optional + */ +@property (nullable, strong, nonatomic) NSNumber<SDLBool> *subscribe; + @end NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLGetSystemCapability.m b/SmartDeviceLink/SDLGetSystemCapability.m index 5bc0e2b7f..04f049794 100644 --- a/SmartDeviceLink/SDLGetSystemCapability.m +++ b/SmartDeviceLink/SDLGetSystemCapability.m @@ -9,7 +9,8 @@ #import "SDLGetSystemCapability.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" #import "SDLSystemCapabilityType.h" NS_ASSUME_NONNULL_BEGIN @@ -17,7 +18,7 @@ NS_ASSUME_NONNULL_BEGIN @implementation SDLGetSystemCapability - (instancetype)init { - if (self = [super initWithName:SDLNameGetSystemCapability]) { + if (self = [super initWithName:SDLRPCFunctionNameGetSystemCapability]) { } return self; } @@ -33,12 +34,31 @@ NS_ASSUME_NONNULL_BEGIN return self; } +- (instancetype)initWithType:(SDLSystemCapabilityType)type subscribe:(BOOL)subscribe { + self = [self initWithType:type]; + if (!self) { + return nil; + } + + self.subscribe = @(subscribe); + + return self; +} + - (void)setSystemCapabilityType:(SDLSystemCapabilityType)type { - [parameters sdl_setObject:type forName:SDLNameSystemCapabilityType]; + [parameters sdl_setObject:type forName:SDLRPCParameterNameSystemCapabilityType]; } - (SDLSystemCapabilityType)systemCapabilityType { - return [parameters sdl_objectForName:SDLNameSystemCapabilityType]; + return [parameters sdl_objectForName:SDLRPCParameterNameSystemCapabilityType]; +} + +- (void)setSubscribe:(nullable NSNumber<SDLBool> *)subscribe { + [parameters sdl_setObject:subscribe forName:SDLRPCParameterNameSubscribe]; +} + +- (nullable NSNumber<SDLBool> *)subscribe { + return [parameters sdl_objectForName:SDLRPCParameterNameSubscribe]; } @end diff --git a/SmartDeviceLink/SDLGetSystemCapabilityResponse.m b/SmartDeviceLink/SDLGetSystemCapabilityResponse.m index 00c1cf7f4..cdbeaa6e5 100644 --- a/SmartDeviceLink/SDLGetSystemCapabilityResponse.m +++ b/SmartDeviceLink/SDLGetSystemCapabilityResponse.m @@ -9,7 +9,8 @@ #import "SDLGetSystemCapabilityResponse.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" #import "SDLSystemCapability.h" @@ -18,7 +19,7 @@ NS_ASSUME_NONNULL_BEGIN @implementation SDLGetSystemCapabilityResponse - (instancetype)init { - self = [super initWithName:SDLNameGetSystemCapability]; + self = [super initWithName:SDLRPCFunctionNameGetSystemCapability]; if (!self) { return nil; } @@ -27,11 +28,11 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setSystemCapability:(SDLSystemCapability *)systemCapability { - [parameters sdl_setObject:systemCapability forName:SDLNameSystemCapability]; + [parameters sdl_setObject:systemCapability forName:SDLRPCParameterNameSystemCapability]; } - (SDLSystemCapability *)systemCapability { - return [parameters sdl_objectForName:SDLNameSystemCapability ofClass:SDLSystemCapability.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameSystemCapability ofClass:SDLSystemCapability.class]; } @end diff --git a/SmartDeviceLink/SDLGetVehicleData.m b/SmartDeviceLink/SDLGetVehicleData.m index 88a65a42a..3520b9d0d 100644 --- a/SmartDeviceLink/SDLGetVehicleData.m +++ b/SmartDeviceLink/SDLGetVehicleData.m @@ -5,14 +5,15 @@ #import "SDLGetVehicleData.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLGetVehicleData - (instancetype)init { - if (self = [super initWithName:SDLNameGetVehicleData]) { + if (self = [super initWithName:SDLRPCFunctionNameGetVehicleData]) { } return self; } @@ -66,235 +67,235 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setGps:(nullable NSNumber<SDLBool> *)gps { - [parameters sdl_setObject:gps forName:SDLNameGPS]; + [parameters sdl_setObject:gps forName:SDLRPCParameterNameGPS]; } - (nullable NSNumber<SDLBool> *)gps { - return [parameters sdl_objectForName:SDLNameGPS]; + return [parameters sdl_objectForName:SDLRPCParameterNameGPS]; } - (void)setSpeed:(nullable NSNumber<SDLBool> *)speed { - [parameters sdl_setObject:speed forName:SDLNameSpeed]; + [parameters sdl_setObject:speed forName:SDLRPCParameterNameSpeed]; } - (nullable NSNumber<SDLBool> *)speed { - return [parameters sdl_objectForName:SDLNameSpeed]; + return [parameters sdl_objectForName:SDLRPCParameterNameSpeed]; } - (void)setRpm:(nullable NSNumber<SDLBool> *)rpm { - [parameters sdl_setObject:rpm forName:SDLNameRPM]; + [parameters sdl_setObject:rpm forName:SDLRPCParameterNameRPM]; } - (nullable NSNumber<SDLBool> *)rpm { - return [parameters sdl_objectForName:SDLNameRPM]; + return [parameters sdl_objectForName:SDLRPCParameterNameRPM]; } - (void)setFuelLevel:(nullable NSNumber<SDLBool> *)fuelLevel { - [parameters sdl_setObject:fuelLevel forName:SDLNameFuelLevel]; + [parameters sdl_setObject:fuelLevel forName:SDLRPCParameterNameFuelLevel]; } - (nullable NSNumber<SDLBool> *)fuelLevel { - return [parameters sdl_objectForName:SDLNameFuelLevel]; + return [parameters sdl_objectForName:SDLRPCParameterNameFuelLevel]; } - (void)setFuelLevel_State:(nullable NSNumber<SDLBool> *)fuelLevel_State { - [parameters sdl_setObject:fuelLevel_State forName:SDLNameFuelLevelState]; + [parameters sdl_setObject:fuelLevel_State forName:SDLRPCParameterNameFuelLevelState]; } - (nullable NSNumber<SDLBool> *)fuelLevel_State { - return [parameters sdl_objectForName:SDLNameFuelLevelState]; + return [parameters sdl_objectForName:SDLRPCParameterNameFuelLevelState]; } - (void)setFuelRange:(nullable NSNumber<SDLBool> *)fuelRange { - [parameters sdl_setObject:fuelRange forName:SDLNameFuelRange]; + [parameters sdl_setObject:fuelRange forName:SDLRPCParameterNameFuelRange]; } - (nullable NSNumber<SDLBool> *)fuelRange { - return [parameters sdl_objectForName:SDLNameFuelRange]; + return [parameters sdl_objectForName:SDLRPCParameterNameFuelRange]; } - (void)setInstantFuelConsumption:(nullable NSNumber<SDLBool> *)instantFuelConsumption { - [parameters sdl_setObject:instantFuelConsumption forName:SDLNameInstantFuelConsumption]; + [parameters sdl_setObject:instantFuelConsumption forName:SDLRPCParameterNameInstantFuelConsumption]; } - (nullable NSNumber<SDLBool> *)instantFuelConsumption { - return [parameters sdl_objectForName:SDLNameInstantFuelConsumption]; + return [parameters sdl_objectForName:SDLRPCParameterNameInstantFuelConsumption]; } - (void)setExternalTemperature:(nullable NSNumber<SDLBool> *)externalTemperature { - [parameters sdl_setObject:externalTemperature forName:SDLNameExternalTemperature]; + [parameters sdl_setObject:externalTemperature forName:SDLRPCParameterNameExternalTemperature]; } - (nullable NSNumber<SDLBool> *)externalTemperature { - return [parameters sdl_objectForName:SDLNameExternalTemperature]; + return [parameters sdl_objectForName:SDLRPCParameterNameExternalTemperature]; } - (void)setVin:(nullable NSNumber<SDLBool> *)vin { - [parameters sdl_setObject:vin forName:SDLNameVIN]; + [parameters sdl_setObject:vin forName:SDLRPCParameterNameVIN]; } - (nullable NSNumber<SDLBool> *)vin { - return [parameters sdl_objectForName:SDLNameVIN]; + return [parameters sdl_objectForName:SDLRPCParameterNameVIN]; } - (void)setPrndl:(nullable NSNumber<SDLBool> *)prndl { - [parameters sdl_setObject:prndl forName:SDLNamePRNDL]; + [parameters sdl_setObject:prndl forName:SDLRPCParameterNamePRNDL]; } - (nullable NSNumber<SDLBool> *)prndl { - return [parameters sdl_objectForName:SDLNamePRNDL]; + return [parameters sdl_objectForName:SDLRPCParameterNamePRNDL]; } - (void)setTirePressure:(nullable NSNumber<SDLBool> *)tirePressure { - [parameters sdl_setObject:tirePressure forName:SDLNameTirePressure]; + [parameters sdl_setObject:tirePressure forName:SDLRPCParameterNameTirePressure]; } - (nullable NSNumber<SDLBool> *)tirePressure { - return [parameters sdl_objectForName:SDLNameTirePressure]; + return [parameters sdl_objectForName:SDLRPCParameterNameTirePressure]; } - (void)setOdometer:(nullable NSNumber<SDLBool> *)odometer { - [parameters sdl_setObject:odometer forName:SDLNameOdometer]; + [parameters sdl_setObject:odometer forName:SDLRPCParameterNameOdometer]; } - (nullable NSNumber<SDLBool> *)odometer { - return [parameters sdl_objectForName:SDLNameOdometer]; + return [parameters sdl_objectForName:SDLRPCParameterNameOdometer]; } - (void)setBeltStatus:(nullable NSNumber<SDLBool> *)beltStatus { - [parameters sdl_setObject:beltStatus forName:SDLNameBeltStatus]; + [parameters sdl_setObject:beltStatus forName:SDLRPCParameterNameBeltStatus]; } - (nullable NSNumber<SDLBool> *)beltStatus { - return [parameters sdl_objectForName:SDLNameBeltStatus]; + return [parameters sdl_objectForName:SDLRPCParameterNameBeltStatus]; } - (void)setBodyInformation:(nullable NSNumber<SDLBool> *)bodyInformation { - [parameters sdl_setObject:bodyInformation forName:SDLNameBodyInformation]; + [parameters sdl_setObject:bodyInformation forName:SDLRPCParameterNameBodyInformation]; } - (nullable NSNumber<SDLBool> *)bodyInformation { - return [parameters sdl_objectForName:SDLNameBodyInformation]; + return [parameters sdl_objectForName:SDLRPCParameterNameBodyInformation]; } - (void)setDeviceStatus:(nullable NSNumber<SDLBool> *)deviceStatus { - [parameters sdl_setObject:deviceStatus forName:SDLNameDeviceStatus]; + [parameters sdl_setObject:deviceStatus forName:SDLRPCParameterNameDeviceStatus]; } - (nullable NSNumber<SDLBool> *)deviceStatus { - return [parameters sdl_objectForName:SDLNameDeviceStatus]; + return [parameters sdl_objectForName:SDLRPCParameterNameDeviceStatus]; } - (void)setDriverBraking:(nullable NSNumber<SDLBool> *)driverBraking { - [parameters sdl_setObject:driverBraking forName:SDLNameDriverBraking]; + [parameters sdl_setObject:driverBraking forName:SDLRPCParameterNameDriverBraking]; } - (nullable NSNumber<SDLBool> *)driverBraking { - return [parameters sdl_objectForName:SDLNameDriverBraking]; + return [parameters sdl_objectForName:SDLRPCParameterNameDriverBraking]; } - (void)setWiperStatus:(nullable NSNumber<SDLBool> *)wiperStatus { - [parameters sdl_setObject:wiperStatus forName:SDLNameWiperStatus]; + [parameters sdl_setObject:wiperStatus forName:SDLRPCParameterNameWiperStatus]; } - (nullable NSNumber<SDLBool> *)wiperStatus { - return [parameters sdl_objectForName:SDLNameWiperStatus]; + return [parameters sdl_objectForName:SDLRPCParameterNameWiperStatus]; } - (void)setHeadLampStatus:(nullable NSNumber<SDLBool> *)headLampStatus { - [parameters sdl_setObject:headLampStatus forName:SDLNameHeadLampStatus]; + [parameters sdl_setObject:headLampStatus forName:SDLRPCParameterNameHeadLampStatus]; } - (nullable NSNumber<SDLBool> *)headLampStatus { - return [parameters sdl_objectForName:SDLNameHeadLampStatus]; + return [parameters sdl_objectForName:SDLRPCParameterNameHeadLampStatus]; } - (void)setEngineOilLife:(nullable NSNumber<SDLBool> *)engineOilLife { - [parameters sdl_setObject:engineOilLife forName:SDLNameEngineOilLife]; + [parameters sdl_setObject:engineOilLife forName:SDLRPCParameterNameEngineOilLife]; } - (nullable NSNumber<SDLBool> *)engineOilLife { - return [parameters sdl_objectForName:SDLNameEngineOilLife]; + return [parameters sdl_objectForName:SDLRPCParameterNameEngineOilLife]; } - (void)setEngineTorque:(nullable NSNumber<SDLBool> *)engineTorque { - [parameters sdl_setObject:engineTorque forName:SDLNameEngineTorque]; + [parameters sdl_setObject:engineTorque forName:SDLRPCParameterNameEngineTorque]; } - (nullable NSNumber<SDLBool> *)engineTorque { - return [parameters sdl_objectForName:SDLNameEngineTorque]; + return [parameters sdl_objectForName:SDLRPCParameterNameEngineTorque]; } - (void)setAccPedalPosition:(nullable NSNumber<SDLBool> *)accPedalPosition { - [parameters sdl_setObject:accPedalPosition forName:SDLNameAccelerationPedalPosition]; + [parameters sdl_setObject:accPedalPosition forName:SDLRPCParameterNameAccelerationPedalPosition]; } - (nullable NSNumber<SDLBool> *)accPedalPosition { - return [parameters sdl_objectForName:SDLNameAccelerationPedalPosition]; + return [parameters sdl_objectForName:SDLRPCParameterNameAccelerationPedalPosition]; } - (void)setSteeringWheelAngle:(nullable NSNumber<SDLBool> *)steeringWheelAngle { - [parameters sdl_setObject:steeringWheelAngle forName:SDLNameSteeringWheelAngle]; + [parameters sdl_setObject:steeringWheelAngle forName:SDLRPCParameterNameSteeringWheelAngle]; } - (nullable NSNumber<SDLBool> *)steeringWheelAngle { - return [parameters sdl_objectForName:SDLNameSteeringWheelAngle]; + return [parameters sdl_objectForName:SDLRPCParameterNameSteeringWheelAngle]; } - (void)setECallInfo:(nullable NSNumber<SDLBool> *)eCallInfo { - [parameters sdl_setObject:eCallInfo forName:SDLNameECallInfo]; + [parameters sdl_setObject:eCallInfo forName:SDLRPCParameterNameECallInfo]; } - (nullable NSNumber<SDLBool> *)eCallInfo { - return [parameters sdl_objectForName:SDLNameECallInfo]; + return [parameters sdl_objectForName:SDLRPCParameterNameECallInfo]; } - (void)setAirbagStatus:(nullable NSNumber<SDLBool> *)airbagStatus { - [parameters sdl_setObject:airbagStatus forName:SDLNameAirbagStatus]; + [parameters sdl_setObject:airbagStatus forName:SDLRPCParameterNameAirbagStatus]; } - (nullable NSNumber<SDLBool> *)airbagStatus { - return [parameters sdl_objectForName:SDLNameAirbagStatus]; + return [parameters sdl_objectForName:SDLRPCParameterNameAirbagStatus]; } - (void)setEmergencyEvent:(nullable NSNumber<SDLBool> *)emergencyEvent { - [parameters sdl_setObject:emergencyEvent forName:SDLNameEmergencyEvent]; + [parameters sdl_setObject:emergencyEvent forName:SDLRPCParameterNameEmergencyEvent]; } - (nullable NSNumber<SDLBool> *)emergencyEvent { - return [parameters sdl_objectForName:SDLNameEmergencyEvent]; + return [parameters sdl_objectForName:SDLRPCParameterNameEmergencyEvent]; } - (void)setClusterModeStatus:(nullable NSNumber<SDLBool> *)clusterModeStatus { - [parameters sdl_setObject:clusterModeStatus forName:SDLNameClusterModeStatus]; + [parameters sdl_setObject:clusterModeStatus forName:SDLRPCParameterNameClusterModeStatus]; } - (nullable NSNumber<SDLBool> *)clusterModeStatus { - return [parameters sdl_objectForName:SDLNameClusterModeStatus]; + return [parameters sdl_objectForName:SDLRPCParameterNameClusterModeStatus]; } - (void)setMyKey:(nullable NSNumber<SDLBool> *)myKey { - [parameters sdl_setObject:myKey forName:SDLNameMyKey]; + [parameters sdl_setObject:myKey forName:SDLRPCParameterNameMyKey]; } - (nullable NSNumber<SDLBool> *)myKey { - return [parameters sdl_objectForName:SDLNameMyKey]; + return [parameters sdl_objectForName:SDLRPCParameterNameMyKey]; } - (void)setElectronicParkBrakeStatus:(nullable NSNumber<SDLBool> *)electronicParkBrakeStatus { - [parameters sdl_setObject:electronicParkBrakeStatus forName:SDLNameElectronicParkBrakeStatus]; + [parameters sdl_setObject:electronicParkBrakeStatus forName:SDLRPCParameterNameElectronicParkBrakeStatus]; } - (nullable NSNumber<SDLBool> *)electronicParkBrakeStatus { - return [parameters sdl_objectForName:SDLNameElectronicParkBrakeStatus]; + return [parameters sdl_objectForName:SDLRPCParameterNameElectronicParkBrakeStatus]; } - (void)setTurnSignal:(nullable NSNumber<SDLBool> *)turnSignal { - [parameters sdl_setObject:turnSignal forName:SDLNameTurnSignal]; + [parameters sdl_setObject:turnSignal forName:SDLRPCParameterNameTurnSignal]; } - (nullable NSNumber<SDLBool> *)turnSignal { - return [parameters sdl_objectForName:SDLNameTurnSignal]; + return [parameters sdl_objectForName:SDLRPCParameterNameTurnSignal]; } - (void)setCloudAppVehicleID:(nullable NSNumber<SDLBool> *)cloudAppVehicleID { diff --git a/SmartDeviceLink/SDLGetVehicleDataResponse.m b/SmartDeviceLink/SDLGetVehicleDataResponse.m index 60a7bdbff..340e66da5 100644 --- a/SmartDeviceLink/SDLGetVehicleDataResponse.m +++ b/SmartDeviceLink/SDLGetVehicleDataResponse.m @@ -16,7 +16,8 @@ #import "SDLGPSData.h" #import "SDLHeadLampStatus.h" #import "SDLMyKey.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" #import "SDLTireStatus.h" NS_ASSUME_NONNULL_BEGIN @@ -24,241 +25,241 @@ NS_ASSUME_NONNULL_BEGIN @implementation SDLGetVehicleDataResponse - (instancetype)init { - if (self = [super initWithName:SDLNameGetVehicleData]) { + if (self = [super initWithName:SDLRPCFunctionNameGetVehicleData]) { } return self; } - (void)setGps:(nullable SDLGPSData *)gps { - [parameters sdl_setObject:gps forName:SDLNameGPS]; + [parameters sdl_setObject:gps forName:SDLRPCParameterNameGPS]; } - (nullable SDLGPSData *)gps { - return [parameters sdl_objectForName:SDLNameGPS ofClass:SDLGPSData.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameGPS ofClass:SDLGPSData.class]; } - (void)setSpeed:(nullable NSNumber<SDLFloat> *)speed { - [parameters sdl_setObject:speed forName:SDLNameSpeed]; + [parameters sdl_setObject:speed forName:SDLRPCParameterNameSpeed]; } - (nullable NSNumber<SDLFloat> *)speed { - return [parameters sdl_objectForName:SDLNameSpeed]; + return [parameters sdl_objectForName:SDLRPCParameterNameSpeed]; } - (void)setRpm:(nullable NSNumber<SDLInt> *)rpm { - [parameters sdl_setObject:rpm forName:SDLNameRPM]; + [parameters sdl_setObject:rpm forName:SDLRPCParameterNameRPM]; } - (nullable NSNumber<SDLInt> *)rpm { - return [parameters sdl_objectForName:SDLNameRPM]; + return [parameters sdl_objectForName:SDLRPCParameterNameRPM]; } - (void)setFuelLevel:(nullable NSNumber<SDLFloat> *)fuelLevel { - [parameters sdl_setObject:fuelLevel forName:SDLNameFuelLevel]; + [parameters sdl_setObject:fuelLevel forName:SDLRPCParameterNameFuelLevel]; } - (nullable NSNumber<SDLFloat> *)fuelLevel { - return [parameters sdl_objectForName:SDLNameFuelLevel]; + return [parameters sdl_objectForName:SDLRPCParameterNameFuelLevel]; } - (void)setFuelLevel_State:(nullable SDLComponentVolumeStatus)fuelLevel_State { - [parameters sdl_setObject:fuelLevel_State forName:SDLNameFuelLevelState]; + [parameters sdl_setObject:fuelLevel_State forName:SDLRPCParameterNameFuelLevelState]; } - (nullable SDLComponentVolumeStatus)fuelLevel_State { - return [parameters sdl_objectForName:SDLNameFuelLevelState]; + return [parameters sdl_objectForName:SDLRPCParameterNameFuelLevelState]; } - (void)setInstantFuelConsumption:(nullable NSNumber<SDLFloat> *)instantFuelConsumption { - [parameters sdl_setObject:instantFuelConsumption forName:SDLNameInstantFuelConsumption]; + [parameters sdl_setObject:instantFuelConsumption forName:SDLRPCParameterNameInstantFuelConsumption]; } - (void)setFuelRange:(nullable NSArray<SDLFuelRange *> *)fuelRange { - [parameters sdl_setObject:fuelRange forName:SDLNameFuelRange]; + [parameters sdl_setObject:fuelRange forName:SDLRPCParameterNameFuelRange]; } - (nullable NSArray<SDLFuelRange *> *)fuelRange { - return [parameters sdl_objectsForName:SDLNameFuelRange ofClass:SDLFuelRange.class]; + return [parameters sdl_objectsForName:SDLRPCParameterNameFuelRange ofClass:SDLFuelRange.class]; } - (nullable NSNumber<SDLFloat> *)instantFuelConsumption { - return [parameters sdl_objectForName:SDLNameInstantFuelConsumption]; + return [parameters sdl_objectForName:SDLRPCParameterNameInstantFuelConsumption]; } - (void)setExternalTemperature:(nullable NSNumber<SDLFloat> *)externalTemperature { - [parameters sdl_setObject:externalTemperature forName:SDLNameExternalTemperature]; + [parameters sdl_setObject:externalTemperature forName:SDLRPCParameterNameExternalTemperature]; } - (nullable NSNumber<SDLFloat> *)externalTemperature { - return [parameters sdl_objectForName:SDLNameExternalTemperature]; + return [parameters sdl_objectForName:SDLRPCParameterNameExternalTemperature]; } - (void)setVin:(nullable NSString *)vin { - [parameters sdl_setObject:vin forName:SDLNameVIN]; + [parameters sdl_setObject:vin forName:SDLRPCParameterNameVIN]; } - (nullable NSString *)vin { - return [parameters sdl_objectForName:SDLNameVIN]; + return [parameters sdl_objectForName:SDLRPCParameterNameVIN]; } - (void)setPrndl:(nullable SDLPRNDL)prndl { - [parameters sdl_setObject:prndl forName:SDLNamePRNDL]; + [parameters sdl_setObject:prndl forName:SDLRPCParameterNamePRNDL]; } - (nullable SDLPRNDL)prndl { - return [parameters sdl_objectForName:SDLNamePRNDL]; + return [parameters sdl_objectForName:SDLRPCParameterNamePRNDL]; } - (void)setTirePressure:(nullable SDLTireStatus *)tirePressure { - [parameters sdl_setObject:tirePressure forName:SDLNameTirePressure]; + [parameters sdl_setObject:tirePressure forName:SDLRPCParameterNameTirePressure]; } - (nullable SDLTireStatus *)tirePressure { - return [parameters sdl_objectForName:SDLNameTirePressure ofClass:SDLTireStatus.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameTirePressure ofClass:SDLTireStatus.class]; } - (void)setOdometer:(nullable NSNumber<SDLInt> *)odometer { - [parameters sdl_setObject:odometer forName:SDLNameOdometer]; + [parameters sdl_setObject:odometer forName:SDLRPCParameterNameOdometer]; } - (nullable NSNumber<SDLInt> *)odometer { - return [parameters sdl_objectForName:SDLNameOdometer]; + return [parameters sdl_objectForName:SDLRPCParameterNameOdometer]; } - (void)setBeltStatus:(nullable SDLBeltStatus *)beltStatus { - [parameters sdl_setObject:beltStatus forName:SDLNameBeltStatus]; + [parameters sdl_setObject:beltStatus forName:SDLRPCParameterNameBeltStatus]; } - (nullable SDLBeltStatus *)beltStatus { - return [parameters sdl_objectForName:SDLNameBeltStatus ofClass:SDLBeltStatus.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameBeltStatus ofClass:SDLBeltStatus.class]; } - (void)setBodyInformation:(nullable SDLBodyInformation *)bodyInformation { - [parameters sdl_setObject:bodyInformation forName:SDLNameBodyInformation]; + [parameters sdl_setObject:bodyInformation forName:SDLRPCParameterNameBodyInformation]; } - (nullable SDLBodyInformation *)bodyInformation { - return [parameters sdl_objectForName:SDLNameBodyInformation ofClass:SDLBodyInformation.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameBodyInformation ofClass:SDLBodyInformation.class]; } - (void)setDeviceStatus:(nullable SDLDeviceStatus *)deviceStatus { - [parameters sdl_setObject:deviceStatus forName:SDLNameDeviceStatus]; + [parameters sdl_setObject:deviceStatus forName:SDLRPCParameterNameDeviceStatus]; } - (nullable SDLDeviceStatus *)deviceStatus { - return [parameters sdl_objectForName:SDLNameDeviceStatus ofClass:SDLDeviceStatus.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameDeviceStatus ofClass:SDLDeviceStatus.class]; } - (void)setDriverBraking:(nullable SDLVehicleDataEventStatus)driverBraking { - [parameters sdl_setObject:driverBraking forName:SDLNameDriverBraking]; + [parameters sdl_setObject:driverBraking forName:SDLRPCParameterNameDriverBraking]; } - (nullable SDLVehicleDataEventStatus)driverBraking { - return [parameters sdl_objectForName:SDLNameDriverBraking]; + return [parameters sdl_objectForName:SDLRPCParameterNameDriverBraking]; } - (void)setWiperStatus:(nullable SDLWiperStatus)wiperStatus { - [parameters sdl_setObject:wiperStatus forName:SDLNameWiperStatus]; + [parameters sdl_setObject:wiperStatus forName:SDLRPCParameterNameWiperStatus]; } - (nullable SDLWiperStatus)wiperStatus { - return [parameters sdl_objectForName:SDLNameWiperStatus]; + return [parameters sdl_objectForName:SDLRPCParameterNameWiperStatus]; } - (void)setHeadLampStatus:(nullable SDLHeadLampStatus *)headLampStatus { - [parameters sdl_setObject:headLampStatus forName:SDLNameHeadLampStatus]; + [parameters sdl_setObject:headLampStatus forName:SDLRPCParameterNameHeadLampStatus]; } - (nullable SDLHeadLampStatus *)headLampStatus { - return [parameters sdl_objectForName:SDLNameHeadLampStatus ofClass:SDLHeadLampStatus.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameHeadLampStatus ofClass:SDLHeadLampStatus.class]; } - (void)setEngineOilLife:(nullable NSNumber<SDLFloat> *)engineOilLife { - [parameters sdl_setObject:engineOilLife forName:SDLNameEngineOilLife]; + [parameters sdl_setObject:engineOilLife forName:SDLRPCParameterNameEngineOilLife]; } - (nullable NSNumber<SDLFloat> *)engineOilLife { - return [parameters sdl_objectForName:SDLNameEngineOilLife]; + return [parameters sdl_objectForName:SDLRPCParameterNameEngineOilLife]; } - (void)setEngineTorque:(nullable NSNumber<SDLFloat> *)engineTorque { - [parameters sdl_setObject:engineTorque forName:SDLNameEngineTorque]; + [parameters sdl_setObject:engineTorque forName:SDLRPCParameterNameEngineTorque]; } - (nullable NSNumber<SDLFloat> *)engineTorque { - return [parameters sdl_objectForName:SDLNameEngineTorque]; + return [parameters sdl_objectForName:SDLRPCParameterNameEngineTorque]; } - (void)setAccPedalPosition:(nullable NSNumber<SDLFloat> *)accPedalPosition { - [parameters sdl_setObject:accPedalPosition forName:SDLNameAccelerationPedalPosition]; + [parameters sdl_setObject:accPedalPosition forName:SDLRPCParameterNameAccelerationPedalPosition]; } - (nullable NSNumber<SDLFloat> *)accPedalPosition { - return [parameters sdl_objectForName:SDLNameAccelerationPedalPosition]; + return [parameters sdl_objectForName:SDLRPCParameterNameAccelerationPedalPosition]; } - (void)setSteeringWheelAngle:(nullable NSNumber<SDLFloat> *)steeringWheelAngle { - [parameters sdl_setObject:steeringWheelAngle forName:SDLNameSteeringWheelAngle]; + [parameters sdl_setObject:steeringWheelAngle forName:SDLRPCParameterNameSteeringWheelAngle]; } - (nullable NSNumber<SDLFloat> *)steeringWheelAngle { - return [parameters sdl_objectForName:SDLNameSteeringWheelAngle]; + return [parameters sdl_objectForName:SDLRPCParameterNameSteeringWheelAngle]; } - (void)setECallInfo:(nullable SDLECallInfo *)eCallInfo { - [parameters sdl_setObject:eCallInfo forName:SDLNameECallInfo]; + [parameters sdl_setObject:eCallInfo forName:SDLRPCParameterNameECallInfo]; } - (nullable SDLECallInfo *)eCallInfo { - return [parameters sdl_objectForName:SDLNameECallInfo ofClass:SDLECallInfo.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameECallInfo ofClass:SDLECallInfo.class]; } - (void)setAirbagStatus:(nullable SDLAirbagStatus *)airbagStatus { - [parameters sdl_setObject:airbagStatus forName:SDLNameAirbagStatus]; + [parameters sdl_setObject:airbagStatus forName:SDLRPCParameterNameAirbagStatus]; } - (nullable SDLAirbagStatus *)airbagStatus { - return [parameters sdl_objectForName:SDLNameAirbagStatus ofClass:SDLAirbagStatus.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameAirbagStatus ofClass:SDLAirbagStatus.class]; } - (void)setEmergencyEvent:(nullable SDLEmergencyEvent *)emergencyEvent { - [parameters sdl_setObject:emergencyEvent forName:SDLNameEmergencyEvent]; + [parameters sdl_setObject:emergencyEvent forName:SDLRPCParameterNameEmergencyEvent]; } - (nullable SDLEmergencyEvent *)emergencyEvent { - return [parameters sdl_objectForName:SDLNameEmergencyEvent ofClass:SDLEmergencyEvent.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameEmergencyEvent ofClass:SDLEmergencyEvent.class]; } - (void)setClusterModeStatus:(nullable SDLClusterModeStatus *)clusterModeStatus { - [parameters sdl_setObject:clusterModeStatus forName:SDLNameClusterModeStatus]; + [parameters sdl_setObject:clusterModeStatus forName:SDLRPCParameterNameClusterModeStatus]; } - (nullable SDLClusterModeStatus *)clusterModeStatus { - return [parameters sdl_objectForName:SDLNameClusterModeStatus ofClass:SDLClusterModeStatus.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameClusterModeStatus ofClass:SDLClusterModeStatus.class]; } - (void)setMyKey:(nullable SDLMyKey *)myKey { - [parameters sdl_setObject:myKey forName:SDLNameMyKey]; + [parameters sdl_setObject:myKey forName:SDLRPCParameterNameMyKey]; } - (nullable SDLMyKey *)myKey { - return [parameters sdl_objectForName:SDLNameMyKey ofClass:SDLMyKey.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameMyKey ofClass:SDLMyKey.class]; } - (void)setElectronicParkBrakeStatus:(nullable SDLElectronicParkBrakeStatus)electronicParkBrakeStatus { - [parameters sdl_setObject:electronicParkBrakeStatus forName:SDLNameElectronicParkBrakeStatus]; + [parameters sdl_setObject:electronicParkBrakeStatus forName:SDLRPCParameterNameElectronicParkBrakeStatus]; } - (nullable SDLElectronicParkBrakeStatus)electronicParkBrakeStatus { - return [parameters sdl_objectForName:SDLNameElectronicParkBrakeStatus]; + return [parameters sdl_objectForName:SDLRPCParameterNameElectronicParkBrakeStatus]; } - (void)setTurnSignal:(nullable SDLTurnSignal)turnSignal { - [parameters sdl_setObject:turnSignal forName:SDLNameTurnSignal]; + [parameters sdl_setObject:turnSignal forName:SDLRPCParameterNameTurnSignal]; } - (nullable SDLTurnSignal)turnSignal { - return [parameters sdl_objectForName:SDLNameTurnSignal]; + return [parameters sdl_objectForName:SDLRPCParameterNameTurnSignal]; } - (void)setCloudAppVehicleID:(nullable NSString *)cloudAppVehicleID { diff --git a/SmartDeviceLink/SDLGetWayPoints.m b/SmartDeviceLink/SDLGetWayPoints.m index 74eba337c..804c13d27 100644 --- a/SmartDeviceLink/SDLGetWayPoints.m +++ b/SmartDeviceLink/SDLGetWayPoints.m @@ -4,14 +4,15 @@ #import "SDLGetWayPoints.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLGetWayPoints - (instancetype)init { - if (self = [super initWithName:SDLNameGetWayPoints]) { + if (self = [super initWithName:SDLRPCFunctionNameGetWayPoints]) { } return self; } @@ -29,11 +30,11 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setWaypointType:(nullable SDLWayPointType)waypointType { - [parameters sdl_setObject:waypointType forName:SDLNameWayPointType]; + [parameters sdl_setObject:waypointType forName:SDLRPCParameterNameWayPointType]; } - (nullable SDLWayPointType)waypointType { - return [parameters sdl_objectForName:SDLNameWayPointType]; + return [parameters sdl_objectForName:SDLRPCParameterNameWayPointType]; } @end diff --git a/SmartDeviceLink/SDLGetWayPointsResponse.m b/SmartDeviceLink/SDLGetWayPointsResponse.m index b2f5e6291..36fd70dc5 100644 --- a/SmartDeviceLink/SDLGetWayPointsResponse.m +++ b/SmartDeviceLink/SDLGetWayPointsResponse.m @@ -5,24 +5,25 @@ #import "NSMutableDictionary+Store.h" #import "SDLLocationDetails.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLGetWayPointsResponse - (instancetype)init { - if (self = [super initWithName:SDLNameGetWayPoints]) { + if (self = [super initWithName:SDLRPCFunctionNameGetWayPoints]) { } return self; } - (void)setWaypoints:(nullable NSArray<SDLLocationDetails *> *)waypoints { - [parameters sdl_setObject:waypoints forName:SDLNameWayPoints]; + [parameters sdl_setObject:waypoints forName:SDLRPCParameterNameWayPoints]; } - (nullable NSArray<SDLLocationDetails *> *)waypoints { - return [parameters sdl_objectsForName:SDLNameWayPoints ofClass:SDLLocationDetails.class]; + return [parameters sdl_objectsForName:SDLRPCParameterNameWayPoints ofClass:SDLLocationDetails.class]; } @end diff --git a/SmartDeviceLink/SDLHMICapabilities.m b/SmartDeviceLink/SDLHMICapabilities.m index 01fd01949..1661fa32f 100644 --- a/SmartDeviceLink/SDLHMICapabilities.m +++ b/SmartDeviceLink/SDLHMICapabilities.m @@ -5,34 +5,34 @@ #import "SDLHMICapabilities.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLHMICapabilities - (void)setNavigation:(nullable NSNumber<SDLBool> *)navigation { - [store sdl_setObject:navigation forName:SDLNameNavigation]; + [store sdl_setObject:navigation forName:SDLRPCParameterNameNavigation]; } - (nullable NSNumber<SDLBool> *)navigation { - return [store sdl_objectForName:SDLNameNavigation]; + return [store sdl_objectForName:SDLRPCParameterNameNavigation]; } - (void)setPhoneCall:(nullable NSNumber<SDLBool> *)phoneCall { - [store sdl_setObject:phoneCall forName:SDLNamePhoneCall]; + [store sdl_setObject:phoneCall forName:SDLRPCParameterNamePhoneCall]; } - (nullable NSNumber<SDLBool> *)phoneCall { - return [store sdl_objectForName:SDLNamePhoneCall]; + return [store sdl_objectForName:SDLRPCParameterNamePhoneCall]; } - (void)setVideoStreaming:(nullable NSNumber<SDLBool> *)videoStreaming { - [store sdl_setObject:videoStreaming forName:SDLNameVideoStreaming]; + [store sdl_setObject:videoStreaming forName:SDLRPCParameterNameVideoStreaming]; } - (nullable NSNumber<SDLBool> *)videoStreaming { - return [store sdl_objectForName:SDLNameVideoStreaming]; + return [store sdl_objectForName:SDLRPCParameterNameVideoStreaming]; } @end diff --git a/SmartDeviceLink/SDLHMIPermissions.m b/SmartDeviceLink/SDLHMIPermissions.m index 96d947aa5..34c0ae289 100644 --- a/SmartDeviceLink/SDLHMIPermissions.m +++ b/SmartDeviceLink/SDLHMIPermissions.m @@ -5,26 +5,26 @@ #import "SDLHMIPermissions.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLHMIPermissions - (void)setAllowed:(NSArray<SDLHMILevel> *)allowed { - [store sdl_setObject:allowed forName:SDLNameAllowed]; + [store sdl_setObject:allowed forName:SDLRPCParameterNameAllowed]; } - (NSArray<SDLHMILevel> *)allowed { - return [store sdl_objectForName:SDLNameAllowed]; + return [store sdl_objectForName:SDLRPCParameterNameAllowed]; } - (void)setUserDisallowed:(NSArray<SDLHMILevel> *)userDisallowed { - [store sdl_setObject:userDisallowed forName:SDLNameUserDisallowed]; + [store sdl_setObject:userDisallowed forName:SDLRPCParameterNameUserDisallowed]; } - (NSArray<SDLHMILevel> *)userDisallowed { - return [store sdl_objectForName:SDLNameUserDisallowed]; + return [store sdl_objectForName:SDLRPCParameterNameUserDisallowed]; } @end diff --git a/SmartDeviceLink/SDLHMISettingsControlCapabilities.m b/SmartDeviceLink/SDLHMISettingsControlCapabilities.m index 505936732..12861d6f1 100644 --- a/SmartDeviceLink/SDLHMISettingsControlCapabilities.m +++ b/SmartDeviceLink/SDLHMISettingsControlCapabilities.m @@ -2,7 +2,7 @@ // #import "SDLHMISettingsControlCapabilities.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" #import "NSMutableDictionary+Store.h" NS_ASSUME_NONNULL_BEGIN @@ -33,36 +33,36 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setModuleName:(NSString *)moduleName { - [store sdl_setObject:moduleName forName:SDLNameModuleName]; + [store sdl_setObject:moduleName forName:SDLRPCParameterNameModuleName]; } - (NSString *)moduleName { - return [store sdl_objectForName:SDLNameModuleName]; + return [store sdl_objectForName:SDLRPCParameterNameModuleName]; } - (void)setDistanceUnitAvailable:(nullable NSNumber<SDLBool> *)distanceUnitAvailable { - [store sdl_setObject:distanceUnitAvailable forName:SDLNameDistanceUnitAvailable]; + [store sdl_setObject:distanceUnitAvailable forName:SDLRPCParameterNameDistanceUnitAvailable]; } - (nullable NSNumber<SDLBool> *)distanceUnitAvailable { - return [store sdl_objectForName:SDLNameDistanceUnitAvailable]; + return [store sdl_objectForName:SDLRPCParameterNameDistanceUnitAvailable]; } - (void)setTemperatureUnitAvailable:(nullable NSNumber<SDLBool> *)temperatureUnitAvailable { - [store sdl_setObject:temperatureUnitAvailable forName:SDLNameTemperatureUnitAvailable]; + [store sdl_setObject:temperatureUnitAvailable forName:SDLRPCParameterNameTemperatureUnitAvailable]; } - (nullable NSNumber<SDLBool> *)temperatureUnitAvailable { - return [store sdl_objectForName:SDLNameTemperatureUnitAvailable]; + return [store sdl_objectForName:SDLRPCParameterNameTemperatureUnitAvailable]; } - (void)setDisplayModeUnitAvailable:(nullable NSNumber<SDLBool> *)displayModeUnitAvailable { - [store sdl_setObject:displayModeUnitAvailable forName:SDLNameDisplayModeUnitAvailable]; + [store sdl_setObject:displayModeUnitAvailable forName:SDLRPCParameterNameDisplayModeUnitAvailable]; } - (nullable NSNumber<SDLBool> *)displayModeUnitAvailable { - return [store sdl_objectForName:SDLNameDisplayModeUnitAvailable]; + return [store sdl_objectForName:SDLRPCParameterNameDisplayModeUnitAvailable]; } @end diff --git a/SmartDeviceLink/SDLHMISettingsControlData.m b/SmartDeviceLink/SDLHMISettingsControlData.m index 4a17a9220..d8eb2c11c 100644 --- a/SmartDeviceLink/SDLHMISettingsControlData.m +++ b/SmartDeviceLink/SDLHMISettingsControlData.m @@ -2,7 +2,7 @@ // #import "SDLHMISettingsControlData.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" #import "NSMutableDictionary+Store.h" NS_ASSUME_NONNULL_BEGIN @@ -22,27 +22,27 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setDisplayMode:(nullable SDLDisplayMode)displayMode { - [store sdl_setObject:displayMode forName:SDLNameDisplayMode]; + [store sdl_setObject:displayMode forName:SDLRPCParameterNameDisplayMode]; } - (nullable SDLDisplayMode)displayMode { - return [store sdl_objectForName:SDLNameDisplayMode]; + return [store sdl_objectForName:SDLRPCParameterNameDisplayMode]; } - (void)setDistanceUnit:(nullable SDLDistanceUnit)distanceUnit { - [store sdl_setObject:distanceUnit forName:SDLNameDistanceUnit]; + [store sdl_setObject:distanceUnit forName:SDLRPCParameterNameDistanceUnit]; } - (nullable SDLDistanceUnit)distanceUnit { - return [store sdl_objectForName:SDLNameDistanceUnit]; + return [store sdl_objectForName:SDLRPCParameterNameDistanceUnit]; } - (void)setTemperatureUnit:(nullable SDLTemperatureUnit)temperatureUnit { - [store sdl_setObject:temperatureUnit forName:SDLNameTemperatureUnit]; + [store sdl_setObject:temperatureUnit forName:SDLRPCParameterNameTemperatureUnit]; } - (nullable SDLTemperatureUnit)temperatureUnit { - return [store sdl_objectForName:SDLNameTemperatureUnit]; + return [store sdl_objectForName:SDLRPCParameterNameTemperatureUnit]; } @end diff --git a/SmartDeviceLink/SDLHapticRect.m b/SmartDeviceLink/SDLHapticRect.m index 330756d4c..715b26e03 100644 --- a/SmartDeviceLink/SDLHapticRect.m +++ b/SmartDeviceLink/SDLHapticRect.m @@ -8,7 +8,7 @@ #import "NSMutableDictionary+Store.h" #import "SDLHapticRect.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" #import "SDLRectangle.h" NS_ASSUME_NONNULL_BEGIN @@ -28,19 +28,19 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setId:(NSNumber<SDLInt> *)id { - [store sdl_setObject:id forName:SDLNameId]; + [store sdl_setObject:id forName:SDLRPCParameterNameId]; } - (NSNumber<SDLInt> *)id { - return [store sdl_objectForName:SDLNameId]; + return [store sdl_objectForName:SDLRPCParameterNameId]; } - (void)setRect:(SDLRectangle *)rect { - [store sdl_setObject:rect forName:SDLNameRect]; + [store sdl_setObject:rect forName:SDLRPCParameterNameRect]; } - (SDLRectangle *)rect { - return [store sdl_objectForName:SDLNameRect ofClass:SDLRectangle.class]; + return [store sdl_objectForName:SDLRPCParameterNameRect ofClass:SDLRectangle.class]; } @end diff --git a/SmartDeviceLink/SDLHeadLampStatus.m b/SmartDeviceLink/SDLHeadLampStatus.m index e26d3ab5d..0d45654a1 100644 --- a/SmartDeviceLink/SDLHeadLampStatus.m +++ b/SmartDeviceLink/SDLHeadLampStatus.m @@ -5,34 +5,34 @@ #import "NSMutableDictionary+Store.h" #import "SDLAmbientLightStatus.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLHeadLampStatus - (void)setLowBeamsOn:(NSNumber<SDLBool> *)lowBeamsOn { - [store sdl_setObject:lowBeamsOn forName:SDLNameLowBeamsOn]; + [store sdl_setObject:lowBeamsOn forName:SDLRPCParameterNameLowBeamsOn]; } - (NSNumber<SDLBool> *)lowBeamsOn { - return [store sdl_objectForName:SDLNameLowBeamsOn]; + return [store sdl_objectForName:SDLRPCParameterNameLowBeamsOn]; } - (void)setHighBeamsOn:(NSNumber<SDLBool> *)highBeamsOn { - [store sdl_setObject:highBeamsOn forName:SDLNameHighBeamsOn]; + [store sdl_setObject:highBeamsOn forName:SDLRPCParameterNameHighBeamsOn]; } - (NSNumber<SDLBool> *)highBeamsOn { - return [store sdl_objectForName:SDLNameHighBeamsOn]; + return [store sdl_objectForName:SDLRPCParameterNameHighBeamsOn]; } - (void)setAmbientLightSensorStatus:(nullable SDLAmbientLightStatus)ambientLightSensorStatus { - [store sdl_setObject:ambientLightSensorStatus forName:SDLNameAmbientLightSensorStatus]; + [store sdl_setObject:ambientLightSensorStatus forName:SDLRPCParameterNameAmbientLightSensorStatus]; } - (nullable SDLAmbientLightStatus)ambientLightSensorStatus { - return [store sdl_objectForName:SDLNameAmbientLightSensorStatus]; + return [store sdl_objectForName:SDLRPCParameterNameAmbientLightSensorStatus]; } @end diff --git a/SmartDeviceLink/SDLImage.m b/SmartDeviceLink/SDLImage.m index fcf05819a..a799ae09e 100644 --- a/SmartDeviceLink/SDLImage.m +++ b/SmartDeviceLink/SDLImage.m @@ -4,7 +4,7 @@ #import "SDLImage.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" NS_ASSUME_NONNULL_BEGIN @@ -57,27 +57,27 @@ NS_ASSUME_NONNULL_BEGIN #pragma mark - Getters / Setters - (void)setValue:(NSString *)value { - [store sdl_setObject:value forName:SDLNameValue]; + [store sdl_setObject:value forName:SDLRPCParameterNameValue]; } - (NSString *)value { - return [store sdl_objectForName:SDLNameValue]; + return [store sdl_objectForName:SDLRPCParameterNameValue]; } - (void)setImageType:(SDLImageType)imageType { - [store sdl_setObject:imageType forName:SDLNameImageType]; + [store sdl_setObject:imageType forName:SDLRPCParameterNameImageType]; } - (SDLImageType)imageType { - return [store sdl_objectForName:SDLNameImageType]; + return [store sdl_objectForName:SDLRPCParameterNameImageType]; } - (void)setIsTemplate:(NSNumber<SDLBool> *)isTemplate { - [store sdl_setObject:isTemplate forName:SDLNameImageTemplate]; + [store sdl_setObject:isTemplate forName:SDLRPCParameterNameImageTemplate]; } - (NSNumber<SDLBool> *)isTemplate { - return [store sdl_objectForName:SDLNameImageTemplate]; + return [store sdl_objectForName:SDLRPCParameterNameImageTemplate]; } @end diff --git a/SmartDeviceLink/SDLImageField.m b/SmartDeviceLink/SDLImageField.m index d25b6e213..f4420c6fe 100644 --- a/SmartDeviceLink/SDLImageField.m +++ b/SmartDeviceLink/SDLImageField.m @@ -6,34 +6,34 @@ #import "NSMutableDictionary+Store.h" #import "SDLImageFieldName.h" #import "SDLImageResolution.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLImageField - (void)setName:(SDLImageFieldName)name { - [store sdl_setObject:name forName:SDLNameName]; + [store sdl_setObject:name forName:SDLRPCParameterNameName]; } - (SDLImageFieldName)name { - return [store sdl_objectForName:SDLNameName]; + return [store sdl_objectForName:SDLRPCParameterNameName]; } - (void)setImageTypeSupported:(NSArray<SDLFileType> *)imageTypeSupported { - [store sdl_setObject:imageTypeSupported forName:SDLNameImageTypeSupported]; + [store sdl_setObject:imageTypeSupported forName:SDLRPCParameterNameImageTypeSupported]; } - (NSArray<SDLFileType> *)imageTypeSupported { - return [store sdl_objectForName:SDLNameImageTypeSupported]; + return [store sdl_objectForName:SDLRPCParameterNameImageTypeSupported]; } - (void)setImageResolution:(nullable SDLImageResolution *)imageResolution { - [store sdl_setObject:imageResolution forName:SDLNameImageResolution]; + [store sdl_setObject:imageResolution forName:SDLRPCParameterNameImageResolution]; } - (nullable SDLImageResolution *)imageResolution { - return [store sdl_objectForName:SDLNameImageResolution ofClass:SDLImageResolution.class]; + return [store sdl_objectForName:SDLRPCParameterNameImageResolution ofClass:SDLImageResolution.class]; } @end diff --git a/SmartDeviceLink/SDLImageResolution.m b/SmartDeviceLink/SDLImageResolution.m index f2f9c4566..a8497acd4 100644 --- a/SmartDeviceLink/SDLImageResolution.m +++ b/SmartDeviceLink/SDLImageResolution.m @@ -5,7 +5,7 @@ #import "SDLImageResolution.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" NS_ASSUME_NONNULL_BEGIN @@ -22,19 +22,19 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setResolutionWidth:(NSNumber<SDLInt> *)resolutionWidth { - [store sdl_setObject:resolutionWidth forName:SDLNameResolutionWidth]; + [store sdl_setObject:resolutionWidth forName:SDLRPCParameterNameResolutionWidth]; } - (NSNumber<SDLInt> *)resolutionWidth { - return [store sdl_objectForName:SDLNameResolutionWidth]; + return [store sdl_objectForName:SDLRPCParameterNameResolutionWidth]; } - (void)setResolutionHeight:(NSNumber<SDLInt> *)resolutionHeight { - [store sdl_setObject:resolutionHeight forName:SDLNameResolutionHeight]; + [store sdl_setObject:resolutionHeight forName:SDLRPCParameterNameResolutionHeight]; } - (NSNumber<SDLInt> *)resolutionHeight { - return [store sdl_objectForName:SDLNameResolutionHeight]; + return [store sdl_objectForName:SDLRPCParameterNameResolutionHeight]; } @end diff --git a/SmartDeviceLink/SDLKeyboardProperties.m b/SmartDeviceLink/SDLKeyboardProperties.m index 3c79612f8..0c2183353 100644 --- a/SmartDeviceLink/SDLKeyboardProperties.m +++ b/SmartDeviceLink/SDLKeyboardProperties.m @@ -4,7 +4,7 @@ #import "SDLKeyboardProperties.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" NS_ASSUME_NONNULL_BEGIN @@ -26,43 +26,43 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setLanguage:(nullable SDLLanguage)language { - [store sdl_setObject:language forName:SDLNameLanguage]; + [store sdl_setObject:language forName:SDLRPCParameterNameLanguage]; } - (nullable SDLLanguage)language { - return [store sdl_objectForName:SDLNameLanguage]; + return [store sdl_objectForName:SDLRPCParameterNameLanguage]; } - (void)setKeyboardLayout:(nullable SDLKeyboardLayout)keyboardLayout { - [store sdl_setObject:keyboardLayout forName:SDLNameKeyboardLayout]; + [store sdl_setObject:keyboardLayout forName:SDLRPCParameterNameKeyboardLayout]; } - (nullable SDLKeyboardLayout)keyboardLayout { - return [store sdl_objectForName:SDLNameKeyboardLayout]; + return [store sdl_objectForName:SDLRPCParameterNameKeyboardLayout]; } - (void)setKeypressMode:(nullable SDLKeypressMode)keypressMode { - [store sdl_setObject:keypressMode forName:SDLNameKeypressMode]; + [store sdl_setObject:keypressMode forName:SDLRPCParameterNameKeypressMode]; } - (nullable SDLKeypressMode)keypressMode { - return [store sdl_objectForName:SDLNameKeypressMode]; + return [store sdl_objectForName:SDLRPCParameterNameKeypressMode]; } - (void)setLimitedCharacterList:(nullable NSArray<NSString *> *)limitedCharacterList { - [store sdl_setObject:limitedCharacterList forName:SDLNameLimitedCharacterList]; + [store sdl_setObject:limitedCharacterList forName:SDLRPCParameterNameLimitedCharacterList]; } - (nullable NSArray<NSString *> *)limitedCharacterList { - return [store sdl_objectForName:SDLNameLimitedCharacterList]; + return [store sdl_objectForName:SDLRPCParameterNameLimitedCharacterList]; } - (void)setAutoCompleteText:(nullable NSString *)autoCompleteText { - [store sdl_setObject:autoCompleteText forName:SDLNameAutoCompleteText]; + [store sdl_setObject:autoCompleteText forName:SDLRPCParameterNameAutoCompleteText]; } - (nullable NSString *)autoCompleteText { - return [store sdl_objectForName:SDLNameAutoCompleteText]; + return [store sdl_objectForName:SDLRPCParameterNameAutoCompleteText]; } @end diff --git a/SmartDeviceLink/SDLLifecycleManager.h b/SmartDeviceLink/SDLLifecycleManager.h index ad42a62dc..b3a58e35c 100644 --- a/SmartDeviceLink/SDLLifecycleManager.h +++ b/SmartDeviceLink/SDLLifecycleManager.h @@ -26,6 +26,7 @@ @class SDLPutFile; @class SDLRegisterAppInterfaceResponse; @class SDLResponseDispatcher; +@class SDLRPCMessage; @class SDLRPCNotification; @class SDLRPCRequest; @class SDLRPCResponse; @@ -118,11 +119,11 @@ typedef void (^SDLManagerReadyBlock)(BOOL success, NSError *_Nullable error); #pragma mark Send RPC Requests /** - * Send an RPC request and don't bother with the response or error. If you need the response or error, call sendRequest:withCompletionHandler: instead. + * Send an RPC of type `Response`, `Notification` or `Request`. Responses and notifications sent to Core do not a response back from Core. Each request sent to Core does get a response, so if you need the response and/or error, call sendRequest:withCompletionHandler: instead. * - * @param request The RPC request to send + * @param rpc An RPC of type `SDLRPCRequest`, `SDLRPCResponse`, or `SDLRPCNotification` to send */ -- (void)sendRequest:(SDLRPCRequest *)request; +- (void)sendRPC:(__kindof SDLRPCMessage *)rpc; /** * Send an RPC request and set a completion handler that will be called with the response when the response returns. @@ -130,7 +131,7 @@ typedef void (^SDLManagerReadyBlock)(BOOL success, NSError *_Nullable error); * @param request The RPC request to send * @param handler The handler that will be called when the response returns */ -- (void)sendRequest:(SDLRPCRequest *)request withResponseHandler:(nullable SDLResponseHandler)handler; +- (void)sendRequest:(__kindof SDLRPCMessage *)request withResponseHandler:(nullable SDLResponseHandler)handler; /** Send all of the requests given as quickly as possible, but in order. Call the completionHandler after all requests have either failed or given a response. diff --git a/SmartDeviceLink/SDLLifecycleManager.m b/SmartDeviceLink/SDLLifecycleManager.m index 55336b522..e40159038 100644 --- a/SmartDeviceLink/SDLLifecycleManager.m +++ b/SmartDeviceLink/SDLLifecycleManager.m @@ -43,6 +43,7 @@ #import "SDLRegisterAppInterface.h" #import "SDLRegisterAppInterfaceResponse.h" #import "SDLResponseDispatcher.h" +#import "SDLAsynchronousRPCOperation.h" #import "SDLResult.h" #import "SDLScreenManager.h" #import "SDLSecondaryTransportManager.h" @@ -539,11 +540,23 @@ SDLLifecycleState *const SDLLifecycleStateReady = @"Ready"; #pragma mark Sending Requests -- (void)sendRequest:(SDLRPCRequest *)request { - [self sendRequest:request withResponseHandler:nil]; +- (void)sendRPC:(__kindof SDLRPCMessage *)rpc { + if ([rpc isKindOfClass:SDLRPCRequest.class]) { + SDLRPCRequest *requestRPC = (SDLRPCRequest *)rpc; + [self sendRequest:requestRPC withResponseHandler:nil]; + } else if ([rpc isKindOfClass:SDLRPCResponse.class] || [rpc isKindOfClass:SDLRPCNotification.class]) { + [self sdl_sendRPC:rpc]; + } else { + NSAssert(false, @"The request should be of type `Request`, `Response` or `Notification"); + } +} + +- (void)sdl_sendRPC:(__kindof SDLRPCMessage *)rpc { + SDLAsynchronousRPCOperation *op = [[SDLAsynchronousRPCOperation alloc] initWithConnectionManager:self rpc:rpc]; + [self.rpcOperationQueue addOperation:op]; } -- (void)sendRequest:(__kindof SDLRPCRequest *)request withResponseHandler:(nullable SDLResponseHandler)handler { +- (void)sendRequest:(SDLRPCRequest *)request withResponseHandler:(nullable SDLResponseHandler)handler { SDLAsynchronousRPCRequestOperation *op = [[SDLAsynchronousRPCRequestOperation alloc] initWithConnectionManager:self request:request responseHandler:handler]; [self.rpcOperationQueue addOperation:op]; } @@ -568,9 +581,22 @@ SDLLifecycleState *const SDLLifecycleStateReady = @"Ready"; [self.rpcOperationQueue addOperation:op]; } +- (void)sendConnectionRPC:(__kindof SDLRPCMessage *)rpc { + NSAssert(([rpc isKindOfClass:SDLRPCResponse.class] || [rpc isKindOfClass:SDLRPCNotification.class]), @"Only RPCs of type `Response` or `Notfication` can be sent using this method. To send RPCs of type `Request` use sendConnectionRequest:withResponseHandler:."); + + if (![self.lifecycleStateMachine isCurrentState:SDLLifecycleStateReady]) { + SDLLogW(@"Manager not ready, message not sent (%@)", rpc); + return; + } + + dispatch_async(_lifecycleQueue, ^{ + [self sdl_sendRequest:rpc withResponseHandler:nil]; + }); +} + - (void)sendConnectionRequest:(__kindof SDLRPCRequest *)request withResponseHandler:(nullable SDLResponseHandler)handler { if (![self.lifecycleStateMachine isCurrentState:SDLLifecycleStateReady]) { - SDLLogW(@"Manager not ready, message not sent (%@)", request); + SDLLogW(@"Manager not ready, request not sent (%@)", request); if (handler) { dispatch_async(dispatch_get_main_queue(), ^{ handler(request, nil, [NSError sdl_lifecycle_notReadyError]); @@ -586,13 +612,13 @@ SDLLifecycleState *const SDLLifecycleStateReady = @"Ready"; } // Managers need to avoid state checking. Part of <SDLConnectionManagerType>. -- (void)sendConnectionManagerRequest:(__kindof SDLRPCRequest *)request withResponseHandler:(nullable SDLResponseHandler)handler { +- (void)sendConnectionManagerRequest:(__kindof SDLRPCMessage *)request withResponseHandler:(nullable SDLResponseHandler)handler { dispatch_async(_lifecycleQueue, ^{ [self sdl_sendRequest:request withResponseHandler:handler]; }); } -- (void)sdl_sendRequest:(SDLRPCRequest *)request withResponseHandler:(nullable SDLResponseHandler)handler { +- (void)sdl_sendRequest:(__kindof SDLRPCMessage *)request withResponseHandler:(nullable SDLResponseHandler)handler { // We will allow things to be sent in a "SDLLifecycleStateConnected" state in the private method, but block it in the public method sendRequest:withCompletionHandler: so that the lifecycle manager can complete its setup without being bothered by developer error NSParameterAssert(request != nil); @@ -608,12 +634,18 @@ SDLLifecycleState *const SDLLifecycleStateReady = @"Ready"; return; } - // Add a correlation ID to the request - NSNumber *corrID = [self sdl_getNextCorrelationId]; - request.correlationID = corrID; - - [self.responseDispatcher storeRequest:request handler:handler]; - [self.proxy sendRPC:request]; + if ([request isKindOfClass:SDLRPCRequest.class]) { + // Generate and add a correlation ID to the request. When a response for the request is returned from Core, it will have the same correlation ID + SDLRPCRequest *requestRPC = (SDLRPCRequest *)request; + NSNumber *corrID = [self sdl_getNextCorrelationId]; + requestRPC.correlationID = corrID; + [self.responseDispatcher storeRequest:requestRPC handler:handler]; + [self.proxy sendRPC:requestRPC]; + } else if ([request isKindOfClass:SDLRPCResponse.class] || [request isKindOfClass:SDLRPCNotification.class]) { + [self.proxy sendRPC:request]; + } else { + SDLLogE(@"Attempting to send an RPC with unknown type, %@. The request should be of type request, response or notification. Returning...", request.class); + } } diff --git a/SmartDeviceLink/SDLLightCapabilities.m b/SmartDeviceLink/SDLLightCapabilities.m index 3db0454ff..24ad0adb3 100644 --- a/SmartDeviceLink/SDLLightCapabilities.m +++ b/SmartDeviceLink/SDLLightCapabilities.m @@ -2,7 +2,7 @@ // #import "SDLLightCapabilities.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" #import "NSMutableDictionary+Store.h" NS_ASSUME_NONNULL_BEGIN @@ -33,35 +33,35 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setName:(SDLLightName)name { - [store sdl_setObject:name forName:SDLNameName]; + [store sdl_setObject:name forName:SDLRPCParameterNameName]; } - (SDLLightName)name { - return [store sdl_objectForName:SDLNameName]; + return [store sdl_objectForName:SDLRPCParameterNameName]; } - (void)setDensityAvailable:(nullable NSNumber<SDLBool> *)densityAvailable { - [store sdl_setObject:densityAvailable forName:SDLNameDensityAvailable]; + [store sdl_setObject:densityAvailable forName:SDLRPCParameterNameDensityAvailable]; } - (nullable NSNumber<SDLBool> *)densityAvailable { - return [store sdl_objectForName:SDLNameDensityAvailable]; + return [store sdl_objectForName:SDLRPCParameterNameDensityAvailable]; } - (void)setColorAvailable:(nullable NSNumber<SDLBool> *)colorAvailable { - [store sdl_setObject:colorAvailable forName:SDLNameRGBColorSpaceAvailable]; + [store sdl_setObject:colorAvailable forName:SDLRPCParameterNameRGBColorSpaceAvailable]; } - (nullable NSNumber<SDLBool> *)colorAvailable { - return [store sdl_objectForName:SDLNameRGBColorSpaceAvailable]; + return [store sdl_objectForName:SDLRPCParameterNameRGBColorSpaceAvailable]; } - (void)setStatusAvailable:(nullable NSNumber<SDLBool> *)statusAvailable { - [store sdl_setObject:statusAvailable forName:SDLNameStatusAvailable]; + [store sdl_setObject:statusAvailable forName:SDLRPCParameterNameStatusAvailable]; } - (nullable NSNumber<SDLBool> *)statusAvailable { - return [store sdl_objectForName:SDLNameStatusAvailable]; + return [store sdl_objectForName:SDLRPCParameterNameStatusAvailable]; } @end diff --git a/SmartDeviceLink/SDLLightControlCapabilities.m b/SmartDeviceLink/SDLLightControlCapabilities.m index 90494d2a6..645a53ebd 100644 --- a/SmartDeviceLink/SDLLightControlCapabilities.m +++ b/SmartDeviceLink/SDLLightControlCapabilities.m @@ -2,7 +2,7 @@ // #import "SDLLightControlCapabilities.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" #import "NSMutableDictionary+Store.h" #import "SDLLightCapabilities.h" @@ -23,20 +23,20 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setModuleName:(NSString *)moduleName { - [store sdl_setObject:moduleName forName:SDLNameModuleName]; + [store sdl_setObject:moduleName forName:SDLRPCParameterNameModuleName]; } - (NSString *)moduleName { - return [store sdl_objectForName:SDLNameModuleName]; + return [store sdl_objectForName:SDLRPCParameterNameModuleName]; } - (void)setSupportedLights:(NSArray<SDLLightCapabilities *> *)supportedLights { - [store sdl_setObject:supportedLights forName:SDLNameSupportedLights]; + [store sdl_setObject:supportedLights forName:SDLRPCParameterNameSupportedLights]; } - (NSArray<SDLLightCapabilities *> *)supportedLights { - return [store sdl_objectsForName:SDLNameSupportedLights ofClass:SDLLightCapabilities.class]; + return [store sdl_objectsForName:SDLRPCParameterNameSupportedLights ofClass:SDLLightCapabilities.class]; } diff --git a/SmartDeviceLink/SDLLightControlData.m b/SmartDeviceLink/SDLLightControlData.m index ca8bdba76..d10faa92d 100644 --- a/SmartDeviceLink/SDLLightControlData.m +++ b/SmartDeviceLink/SDLLightControlData.m @@ -2,7 +2,7 @@ // #import "SDLLightControlData.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" #import "NSMutableDictionary+Store.h" #import "SDLLightState.h" @@ -21,11 +21,11 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setLightState:(NSArray<SDLLightState *> *)lightState { - [store sdl_setObject:lightState forName:SDLNameLightState]; + [store sdl_setObject:lightState forName:SDLRPCParameterNameLightState]; } - (NSArray<SDLLightState *> *)lightState { - return [store sdl_objectsForName:SDLNameLightState ofClass:SDLLightState.class]; + return [store sdl_objectsForName:SDLRPCParameterNameLightState ofClass:SDLLightState.class]; } @end diff --git a/SmartDeviceLink/SDLLightState.m b/SmartDeviceLink/SDLLightState.m index 24e1909e6..405a4723b 100644 --- a/SmartDeviceLink/SDLLightState.m +++ b/SmartDeviceLink/SDLLightState.m @@ -2,7 +2,7 @@ // #import "SDLLightState.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" #import "NSMutableDictionary+Store.h" #import "SDLRGBColor.h" @@ -48,35 +48,35 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setId:(SDLLightName)id { - [store sdl_setObject:id forName:SDLNameId]; + [store sdl_setObject:id forName:SDLRPCParameterNameId]; } - (SDLLightName)id { - return [store sdl_objectForName:SDLNameId]; + return [store sdl_objectForName:SDLRPCParameterNameId]; } - (void)setStatus:(SDLLightStatus)status { - [store sdl_setObject:status forName:SDLNameStatus]; + [store sdl_setObject:status forName:SDLRPCParameterNameStatus]; } - (SDLLightStatus)status { - return [store sdl_objectForName:SDLNameStatus]; + return [store sdl_objectForName:SDLRPCParameterNameStatus]; } - (void)setDensity:(nullable NSNumber<SDLFloat> *)density { - [store sdl_setObject:density forName:SDLNameDensity]; + [store sdl_setObject:density forName:SDLRPCParameterNameDensity]; } - (nullable NSNumber<SDLFloat> *)density { - return [store sdl_objectForName:SDLNameDensity]; + return [store sdl_objectForName:SDLRPCParameterNameDensity]; } - (void)setColor:(nullable SDLRGBColor *)color { - [store sdl_setObject:color forName:SDLNameColor]; + [store sdl_setObject:color forName:SDLRPCParameterNameColor]; } - (nullable SDLRGBColor *)color { - return [store sdl_objectForName:SDLNameColor ofClass:[SDLRGBColor class]]; + return [store sdl_objectForName:SDLRPCParameterNameColor ofClass:[SDLRGBColor class]]; } @end diff --git a/SmartDeviceLink/SDLListFiles.m b/SmartDeviceLink/SDLListFiles.m index 9efc8f6cb..f9ee924ed 100644 --- a/SmartDeviceLink/SDLListFiles.m +++ b/SmartDeviceLink/SDLListFiles.m @@ -5,14 +5,15 @@ #import "SDLListFiles.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLListFiles - (instancetype)init { - if (self = [super initWithName:SDLNameListFiles]) { + if (self = [super initWithName:SDLRPCFunctionNameListFiles]) { } return self; } diff --git a/SmartDeviceLink/SDLListFilesResponse.m b/SmartDeviceLink/SDLListFilesResponse.m index 376e81702..10405df4e 100644 --- a/SmartDeviceLink/SDLListFilesResponse.m +++ b/SmartDeviceLink/SDLListFilesResponse.m @@ -5,32 +5,33 @@ #import "SDLListFilesResponse.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLListFilesResponse - (instancetype)init { - if (self = [super initWithName:SDLNameListFiles]) { + if (self = [super initWithName:SDLRPCFunctionNameListFiles]) { } return self; } - (void)setFilenames:(nullable NSArray<NSString *> *)filenames { - [parameters sdl_setObject:filenames forName:SDLNameFilenames]; + [parameters sdl_setObject:filenames forName:SDLRPCParameterNameFilenames]; } - (nullable NSArray<NSString *> *)filenames { - return [parameters sdl_objectForName:SDLNameFilenames]; + return [parameters sdl_objectForName:SDLRPCParameterNameFilenames]; } - (void)setSpaceAvailable:(nullable NSNumber<SDLInt> *)spaceAvailable { - [parameters sdl_setObject:spaceAvailable forName:SDLNameSpaceAvailable]; + [parameters sdl_setObject:spaceAvailable forName:SDLRPCParameterNameSpaceAvailable]; } - (nullable NSNumber<SDLInt> *)spaceAvailable { - return [parameters sdl_objectForName:SDLNameSpaceAvailable]; + return [parameters sdl_objectForName:SDLRPCParameterNameSpaceAvailable]; } @end diff --git a/SmartDeviceLink/SDLLocationCoordinate.h b/SmartDeviceLink/SDLLocationCoordinate.h index 1bdf90672..abc0beefe 100644 --- a/SmartDeviceLink/SDLLocationCoordinate.h +++ b/SmartDeviceLink/SDLLocationCoordinate.h @@ -6,21 +6,30 @@ NS_ASSUME_NONNULL_BEGIN /** - Describes a coordinate on earth + * Describes a coordinate on earth */ @interface SDLLocationCoordinate : SDLRPCStruct /** - * Latitude of the location + * Convenience init for location coordinates * - * Required, Double -90 - 90 + * @param latitudeDegrees Latitude of the location + * @param longitudeDegrees Latitude of the location + * @return A SDLLocationCoordinate object + */ +- (instancetype)initWithLatitudeDegrees:(float)latitudeDegrees longitudeDegrees:(float)longitudeDegrees; + +/** + * Latitude of the location + * + * Required, Double -90 - 90 */ @property (copy, nonatomic) NSNumber<SDLFloat> *latitudeDegrees; /** - * Longitude of the location + * Latitude of the location * - * Required, Double -180 - 180 + * Required, Double -180 - 180 */ @property (copy, nonatomic) NSNumber<SDLFloat> *longitudeDegrees; diff --git a/SmartDeviceLink/SDLLocationCoordinate.m b/SmartDeviceLink/SDLLocationCoordinate.m index 79b3d4d56..a5d1cdd3d 100644 --- a/SmartDeviceLink/SDLLocationCoordinate.m +++ b/SmartDeviceLink/SDLLocationCoordinate.m @@ -4,26 +4,38 @@ #import "SDLLocationCoordinate.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLLocationCoordinate +- (instancetype)initWithLatitudeDegrees:(float)latitudeDegrees longitudeDegrees:(float)longitudeDegrees { + self = [self init]; + if (!self) { + return nil; + } + + self.latitudeDegrees = @(latitudeDegrees); + self.longitudeDegrees = @(longitudeDegrees); + + return self; +} + - (void)setLongitudeDegrees:(NSNumber<SDLFloat> *)longitudeDegrees { - [store sdl_setObject:longitudeDegrees forName:SDLNameLongitudeDegrees]; + [store sdl_setObject:longitudeDegrees forName:SDLRPCParameterNameLongitudeDegrees]; } - (NSNumber<SDLFloat> *)longitudeDegrees { - return [store sdl_objectForName:SDLNameLongitudeDegrees]; + return [store sdl_objectForName:SDLRPCParameterNameLongitudeDegrees]; } - (void)setLatitudeDegrees:(NSNumber<SDLFloat> *)latitudeDegrees { - [store sdl_setObject:latitudeDegrees forName:SDLNameLatitudeDegrees]; + [store sdl_setObject:latitudeDegrees forName:SDLRPCParameterNameLatitudeDegrees]; } - (NSNumber<SDLFloat> *)latitudeDegrees { - return [store sdl_objectForName:SDLNameLatitudeDegrees]; + return [store sdl_objectForName:SDLRPCParameterNameLatitudeDegrees]; } @end diff --git a/SmartDeviceLink/SDLLocationDetails.h b/SmartDeviceLink/SDLLocationDetails.h index f60e8db76..4b41d3f4d 100644 --- a/SmartDeviceLink/SDLLocationDetails.h +++ b/SmartDeviceLink/SDLLocationDetails.h @@ -10,11 +10,33 @@ NS_ASSUME_NONNULL_BEGIN /** - Describes a location, including its coordinate, name, etc. Used in WayPoints. + * Describes a location, including its coordinate, name, etc. Used in WayPoints. */ @interface SDLLocationDetails : SDLRPCStruct /** + * Convenience init for location coordinate. + * + * @param coordinate Latitude/Longitude of the location + * @return A SDLLocationDetails object + */ +- (instancetype)initWithCoordinate:(SDLLocationCoordinate *)coordinate NS_DESIGNATED_INITIALIZER; + +/** + * Convenience init for all parameters. + * + * @param coordinate Latitude/Longitude of the location + * @param locationName Name of location + * @param addressLines Location address for display purposes only + * @param locationDescription Description intended location / establishment + * @param phoneNumber Phone number of location / establishment + * @param locationImage Image / icon of intended location + * @param searchAddress Address to be used by navigation engines for search + * @return A SDLLocationDetails object + */ +- (instancetype)initWithCoordinate:(SDLLocationCoordinate *)coordinate locationName:(nullable NSString *)locationName addressLines:(nullable NSArray<NSString *> *)addressLines locationDescription:(nullable NSString *)locationDescription phoneNumber:(nullable NSString*)phoneNumber locationImage:(nullable SDLImage *)locationImage searchAddress:(nullable SDLOasisAddress *)searchAddress; + +/** * Latitude/Longitude of the location * * @see SDLLocationCoordinate diff --git a/SmartDeviceLink/SDLLocationDetails.m b/SmartDeviceLink/SDLLocationDetails.m index ccf73cda4..7cc609851 100644 --- a/SmartDeviceLink/SDLLocationDetails.m +++ b/SmartDeviceLink/SDLLocationDetails.m @@ -6,67 +6,94 @@ #import "NSMutableDictionary+Store.h" #import "SDLImage.h" #import "SDLLocationCoordinate.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" #import "SDLOasisAddress.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLLocationDetails +- (instancetype)initWithCoordinate:(SDLLocationCoordinate *)coordinate { + self = [super init]; + if (!self) { + return nil; + } + + self.coordinate = coordinate; + + return self; +} + +- (instancetype)initWithCoordinate:(SDLLocationCoordinate *)coordinate locationName:(nullable NSString *)locationName addressLines:(nullable NSArray<NSString *> *)addressLines locationDescription:(nullable NSString *)locationDescription phoneNumber:(nullable NSString*)phoneNumber locationImage:(nullable SDLImage *)locationImage searchAddress:(nullable SDLOasisAddress *)searchAddress { + self = [self initWithCoordinate:coordinate]; + if (!self) { + return nil; + } + + self.locationName = locationName; + self.addressLines = addressLines; + self.locationDescription = locationDescription; + self.phoneNumber = phoneNumber; + self.locationImage = locationImage; + self.searchAddress = searchAddress; + + return self; +} + - (void)setCoordinate:(nullable SDLLocationCoordinate *)coordinate { - [store sdl_setObject:coordinate forName:SDLNameLocationCoordinate]; + [store sdl_setObject:coordinate forName:SDLRPCParameterNameLocationCoordinate]; } - (nullable SDLLocationCoordinate *)coordinate { - return [store sdl_objectForName:SDLNameLocationCoordinate ofClass:SDLLocationCoordinate.class]; + return [store sdl_objectForName:SDLRPCParameterNameLocationCoordinate ofClass:SDLLocationCoordinate.class]; } - (void)setLocationName:(nullable NSString *)locationName { - [store sdl_setObject:locationName forName:SDLNameLocationName]; + [store sdl_setObject:locationName forName:SDLRPCParameterNameLocationName]; } - (nullable NSString *)locationName { - return [store sdl_objectForName:SDLNameLocationName]; + return [store sdl_objectForName:SDLRPCParameterNameLocationName]; } - (void)setAddressLines:(nullable NSArray<NSString *> *)addressLines { - [store sdl_setObject:addressLines forName:SDLNameAddressLines]; + [store sdl_setObject:addressLines forName:SDLRPCParameterNameAddressLines]; } - (nullable NSArray<NSString *> *)addressLines { - return [store sdl_objectForName:SDLNameAddressLines]; + return [store sdl_objectForName:SDLRPCParameterNameAddressLines]; } - (void)setLocationDescription:(nullable NSString *)locationDescription { - [store sdl_setObject:locationDescription forName:SDLNameLocationDescription]; + [store sdl_setObject:locationDescription forName:SDLRPCParameterNameLocationDescription]; } - (nullable NSString *)locationDescription { - return [store sdl_objectForName:SDLNameLocationDescription]; + return [store sdl_objectForName:SDLRPCParameterNameLocationDescription]; } - (void)setPhoneNumber:(nullable NSString *)phoneNumber { - [store sdl_setObject:phoneNumber forName:SDLNamePhoneNumber]; + [store sdl_setObject:phoneNumber forName:SDLRPCParameterNamePhoneNumber]; } - (nullable NSString *)phoneNumber { - return [store sdl_objectForName:SDLNamePhoneNumber]; + return [store sdl_objectForName:SDLRPCParameterNamePhoneNumber]; } - (void)setLocationImage:(nullable SDLImage *)locationImage { - [store sdl_setObject:locationImage forName:SDLNameLocationImage]; + [store sdl_setObject:locationImage forName:SDLRPCParameterNameLocationImage]; } - (nullable SDLImage *)locationImage { - return [store sdl_objectForName:SDLNameLocationImage ofClass:SDLImage.class]; + return [store sdl_objectForName:SDLRPCParameterNameLocationImage ofClass:SDLImage.class]; } - (void)setSearchAddress:(nullable SDLOasisAddress *)searchAddress { - [store sdl_setObject:searchAddress forName:SDLNameSearchAddress]; + [store sdl_setObject:searchAddress forName:SDLRPCParameterNameSearchAddress]; } - (nullable SDLOasisAddress *)searchAddress { - return [store sdl_objectForName:SDLNameSearchAddress ofClass:SDLOasisAddress.class]; + return [store sdl_objectForName:SDLRPCParameterNameSearchAddress ofClass:SDLOasisAddress.class]; } @end diff --git a/SmartDeviceLink/SDLManager.h b/SmartDeviceLink/SDLManager.h index 6d47e86b6..09fa44322 100644 --- a/SmartDeviceLink/SDLManager.h +++ b/SmartDeviceLink/SDLManager.h @@ -15,6 +15,7 @@ @class SDLProxy; @class SDLPutFile; @class SDLRegisterAppInterfaceResponse; +@class SDLRPCMessage; @class SDLRPCNotification; @class SDLRPCRequest; @class SDLRPCResponse; @@ -138,6 +139,13 @@ typedef void (^SDLManagerReadyBlock)(BOOL success, NSError *_Nullable error); #pragma mark Manually Send RPC Requests /** + * Send an RPC of type `Response`, `Notification` or `Request`. Responses and notifications sent to Core do not a response back from Core. Each request sent to Core does get a response, so if you need the response and/or error, call `sendRequest:withResponseHandler:` instead. + * + * @param rpc An RPC of type `SDLRPCResponse`, `SDLRPCNotification` or `SDLRPCRequest` + */ +- (void)sendRPC:(__kindof SDLRPCMessage *)rpc; + +/** * Send an RPC request and don't bother with the response or error. If you need the response or error, call sendRequest:withCompletionHandler: instead. * * @param request The RPC request to send diff --git a/SmartDeviceLink/SDLManager.m b/SmartDeviceLink/SDLManager.m index 249def3ad..2350a2670 100644 --- a/SmartDeviceLink/SDLManager.m +++ b/SmartDeviceLink/SDLManager.m @@ -123,12 +123,16 @@ NS_ASSUME_NONNULL_BEGIN #pragma mark SDLConnectionManager Protocol +- (void)sendRPC:(__kindof SDLRPCMessage *)rpc { + [self.lifecycleManager sendRPC:rpc]; +} + - (void)sendRequest:(SDLRPCRequest *)request { [self sendRequest:request withResponseHandler:nil]; } - (void)sendRequest:(__kindof SDLRPCRequest *)request withResponseHandler:(nullable SDLResponseHandler)handler { - [self.lifecycleManager sendRequest:request withResponseHandler:handler]; + [self.lifecycleManager sendRequest:(__kindof SDLRPCMessage *)request withResponseHandler:handler]; } - (void)sendRequests:(NSArray<SDLRPCRequest *> *)requests progressHandler:(nullable SDLMultipleAsyncRequestProgressHandler)progressHandler completionHandler:(nullable SDLMultipleRequestCompletionHandler)completionHandler { diff --git a/SmartDeviceLink/SDLMassageCushionFirmness.m b/SmartDeviceLink/SDLMassageCushionFirmness.m index 480f13184..9cede76b7 100644 --- a/SmartDeviceLink/SDLMassageCushionFirmness.m +++ b/SmartDeviceLink/SDLMassageCushionFirmness.m @@ -1,7 +1,7 @@ // SDLMassageCushionFirmness.m // -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" #import "SDLMassageCushionFirmness.h" #import "NSMutableDictionary+Store.h" @@ -22,19 +22,19 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setCushion:(SDLMassageCushion)cushion { - [store sdl_setObject:cushion forName:SDLNameCushion]; + [store sdl_setObject:cushion forName:SDLRPCParameterNameCushion]; } - (SDLMassageCushion)cushion { - return [store sdl_objectForName:SDLNameCushion]; + return [store sdl_objectForName:SDLRPCParameterNameCushion]; } - (void)setFirmness:(NSNumber<SDLInt> *)firmness { - [store sdl_setObject:firmness forName:SDLNameFirmness]; + [store sdl_setObject:firmness forName:SDLRPCParameterNameFirmness]; } - (NSNumber<SDLInt> *)firmness { - return [store sdl_objectForName:SDLNameFirmness]; + return [store sdl_objectForName:SDLRPCParameterNameFirmness]; } @end diff --git a/SmartDeviceLink/SDLMassageModeData.m b/SmartDeviceLink/SDLMassageModeData.m index 83046f3f2..a50f39b4c 100644 --- a/SmartDeviceLink/SDLMassageModeData.m +++ b/SmartDeviceLink/SDLMassageModeData.m @@ -1,7 +1,7 @@ // SDLMassageModeData.m // -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" #import "SDLMassageModeData.h" #import "NSMutableDictionary+Store.h" @@ -22,19 +22,19 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setMassageMode:(SDLMassageMode)massageMode { - [store sdl_setObject:massageMode forName:SDLNameMassageMode]; + [store sdl_setObject:massageMode forName:SDLRPCParameterNameMassageMode]; } - (SDLMassageMode)massageMode { - return [store sdl_objectForName:SDLNameMassageMode]; + return [store sdl_objectForName:SDLRPCParameterNameMassageMode]; } - (void)setMassageZone:(SDLMassageZone)massageZone { - [store sdl_setObject:massageZone forName:SDLNameMassageZone]; + [store sdl_setObject:massageZone forName:SDLRPCParameterNameMassageZone]; } - (SDLMassageZone)massageZone { - return [store sdl_objectForName:SDLNameMassageZone]; + return [store sdl_objectForName:SDLRPCParameterNameMassageZone]; } @end diff --git a/SmartDeviceLink/SDLMediaServiceData.h b/SmartDeviceLink/SDLMediaServiceData.h new file mode 100644 index 000000000..ba61d05a3 --- /dev/null +++ b/SmartDeviceLink/SDLMediaServiceData.h @@ -0,0 +1,146 @@ +// +// SDLMediaServiceData.h +// SmartDeviceLink +// +// Created by Nicole on 2/8/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import "SDLRPCRequest.h" + +#import "SDLMediaType.h" + +NS_ASSUME_NONNULL_BEGIN + + +/** + * This data is related to what a media service should provide. + */ +@interface SDLMediaServiceData : SDLRPCStruct + +/** + * Convenience init + * + * @param mediaType The type of the currently playing or paused track + * @param mediaTitle The name of the current playing media + * @param mediaArtist The name of the current media artist + * @param mediaAlbum The name of the current media album + * @param playlistName The name of the playlist + * @param isExplicit Whether or not the content currently playing contains explicit content + * @param trackPlaybackProgress The current progress of the track + * @param trackPlaybackDuration The total duration of the track + * @param queuePlaybackProgress The current progress of the playback queue in seconds + * @param queuePlaybackDuration The total duration of the playback queue in seconds + * @param queueCurrentTrackNumber The current number (1 based) of the track in the playback queue + * @param queueTotalTrackCount The total number of tracks in the playback queue + * @return A SDLMediaServiceData object + */ +- (instancetype)initWithMediaType:(nullable SDLMediaType)mediaType mediaTitle:(nullable NSString *)mediaTitle mediaArtist:(nullable NSString *)mediaArtist mediaAlbum:(nullable NSString *)mediaAlbum playlistName:(nullable NSString *)playlistName isExplicit:(BOOL)isExplicit trackPlaybackProgress:(UInt32)trackPlaybackProgress trackPlaybackDuration:(UInt32)trackPlaybackDuration queuePlaybackProgress:(UInt32)queuePlaybackProgress queuePlaybackDuration:(UInt32)queuePlaybackDuration queueCurrentTrackNumber:(UInt32)queueCurrentTrackNumber queueTotalTrackCount:(UInt32)queueTotalTrackCount; + +/** + * The type of the currently playing or paused track. + * + * SDLMediaType, Optional + */ +@property (nullable, strong, nonatomic) SDLMediaType mediaType; + +/** + * Music: The name of the current track + * Podcast: The name of the current episode + * Audiobook: The name of the current chapter + * + * String, Optional + */ +@property (nullable, strong, nonatomic) NSString *mediaTitle; + +/** + * Music: The name of the current album artist + * Podcast: The provider of the podcast (hosts, network, company) + * Audiobook: The book author's name + * + * String, Optional + */ +@property (nullable, strong, nonatomic) NSString *mediaArtist; + +/** + * Music: The name of the current album + * Podcast: The name of the current podcast show + * Audiobook: The name of the current book + * + * String, Optional + */ +@property (nullable, strong, nonatomic) NSString *mediaAlbum; + +/** + * Music: The name of the playlist or radio station, if the user is playing from a playlist, otherwise, Null + * Podcast: The name of the playlist, if the user is playing from a playlist, otherwise, Null + * Audiobook: Likely not applicable, possibly a collection or "playlist" of books + * + * String, Optional + */ +@property (nullable, strong, nonatomic) NSString *playlistName; + +/** + * Whether or not the content currently playing (e.g. the track, episode, or book) contains explicit content. + * + * Boolean, Optional + */ +@property (nullable, strong, nonatomic) NSNumber<SDLBool> *isExplicit; + +/** + * Music: The current progress of the track in seconds + * Podcast: The current progress of the episode in seconds + * Audiobook: The current progress of the current segment (e.g. the chapter) in seconds + * + * Integer, Optional + */ +@property (nullable, strong, nonatomic) NSNumber<SDLInt> *trackPlaybackProgress; + +/** + * Music: The total duration of the track in seconds + * Podcast: The total duration of the episode in seconds + * Audiobook: The total duration of the current segment (e.g. the chapter) in seconds + * + * Integer, Optional + */ +@property (nullable, strong, nonatomic) NSNumber<SDLInt> *trackPlaybackDuration; + +/** + * Music: The current progress of the playback queue in seconds + * Podcast: The current progress of the playback queue in seconds + * Audiobook: The current progress of the playback queue (e.g. the book) in seconds + * + * Integer, Optional + */ +@property (nullable, strong, nonatomic) NSNumber<SDLInt> *queuePlaybackProgress; + +/** + * Music: The total duration of the playback queue in seconds + * Podcast: The total duration of the playback queue in seconds + * Audiobook: The total duration of the playback queue (e.g. the book) in seconds + * + * Integer, Optional + */ +@property (nullable, strong, nonatomic) NSNumber<SDLInt> *queuePlaybackDuration; + +/** + * Music: The current number (1 based) of the track in the playback queue + * Podcast: The current number (1 based) of the episode in the playback queue + * Audiobook: The current number (1 based) of the episode in the playback queue (e.g. the chapter number in the book) + * + * Integer, Optional + */ +@property (nullable, strong, nonatomic) NSNumber<SDLInt> *queueCurrentTrackNumber; + +/** + * Music: The total number of tracks in the playback queue + * Podcast: The total number of episodes in the playback queue + * Audiobook: The total number of sections in the playback queue (e.g. the number of chapters in the book) + * + * Integer, Optional + */ +@property (nullable, strong, nonatomic) NSNumber<SDLInt> *queueTotalTrackCount; + +@end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLMediaServiceData.m b/SmartDeviceLink/SDLMediaServiceData.m new file mode 100644 index 000000000..3194fc4ab --- /dev/null +++ b/SmartDeviceLink/SDLMediaServiceData.m @@ -0,0 +1,138 @@ +// +// SDLMediaServiceData.m +// SmartDeviceLink +// +// Created by Nicole on 2/8/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import "SDLMediaServiceData.h" + +#import "NSMutableDictionary+Store.h" +#import "SDLRPCParameterNames.h" + +NS_ASSUME_NONNULL_BEGIN + +@implementation SDLMediaServiceData + +- (instancetype)initWithMediaType:(nullable SDLMediaType)mediaType mediaTitle:(nullable NSString *)mediaTitle mediaArtist:(nullable NSString *)mediaArtist mediaAlbum:(nullable NSString *)mediaAlbum playlistName:(nullable NSString *)playlistName isExplicit:(BOOL)isExplicit trackPlaybackProgress:(UInt32)trackPlaybackProgress trackPlaybackDuration:(UInt32)trackPlaybackDuration queuePlaybackProgress:(UInt32)queuePlaybackProgress queuePlaybackDuration:(UInt32)queuePlaybackDuration queueCurrentTrackNumber:(UInt32)queueCurrentTrackNumber queueTotalTrackCount:(UInt32)queueTotalTrackCount { + self = [self init]; + if (!self) { + return nil; + } + + self.mediaType = mediaType; + self.mediaTitle = mediaTitle; + self.mediaArtist = mediaArtist; + self.mediaAlbum = mediaAlbum; + self.playlistName = playlistName; + self.isExplicit = @(isExplicit); + self.trackPlaybackProgress = @(trackPlaybackProgress); + self.trackPlaybackDuration = @(trackPlaybackDuration); + self.queuePlaybackProgress = @(queuePlaybackProgress); + self.queuePlaybackDuration = @(queuePlaybackDuration); + self.queueCurrentTrackNumber = @(queueCurrentTrackNumber); + self.queueTotalTrackCount = @(queueTotalTrackCount); + + return self; +} + +- (void)setMediaType:(nullable SDLMediaType)mediaType { + [store sdl_setObject:mediaType forName:SDLRPCParameterNameMediaType]; +} + +- (nullable SDLMediaType)mediaType { + return [store sdl_objectForName:SDLRPCParameterNameMediaType]; +} + +- (void)setMediaTitle:(nullable NSString *)mediaTitle { + [store sdl_setObject:mediaTitle forName:SDLRPCParameterNameMediaTitle]; +} + +- (nullable NSString *)mediaTitle { + return [store sdl_objectForName:SDLRPCParameterNameMediaTitle]; +} + +- (void)setMediaArtist:(nullable NSString *)mediaArtist { + [store sdl_setObject:mediaArtist forName:SDLRPCParameterNameMediaArtist]; +} + +- (nullable NSString *)mediaArtist { + return [store sdl_objectForName:SDLRPCParameterNameMediaArtist]; +} + +- (void)setMediaAlbum:(nullable NSString *)mediaAlbum { + [store sdl_setObject:mediaAlbum forName:SDLRPCParameterNameMediaAlbum]; +} + +- (nullable NSString *)mediaAlbum { + return [store sdl_objectForName:SDLRPCParameterNameMediaAlbum]; +} + +- (void)setPlaylistName:(nullable NSString *)playlistName { + [store sdl_setObject:playlistName forName:SDLRPCParameterNamePlaylistName]; +} + +- (nullable NSString *)playlistName { + return [store sdl_objectForName:SDLRPCParameterNamePlaylistName]; +} + +- (void)setIsExplicit:(nullable NSNumber<SDLBool> *)isExplicit { + [store sdl_setObject:isExplicit forName:SDLRPCParameterNameIsExplicit]; +} + +- (nullable NSNumber<SDLBool> *)isExplicit { + return [store sdl_objectForName:SDLRPCParameterNameIsExplicit]; +} + +- (void)setTrackPlaybackProgress:(nullable NSNumber<SDLInt> *)trackPlaybackProgress { + [store sdl_setObject:trackPlaybackProgress forName:SDLRPCParameterNameTrackPlaybackProgress]; +} + +- (nullable NSNumber<SDLInt> *)trackPlaybackProgress { + return [store sdl_objectForName:SDLRPCParameterNameTrackPlaybackProgress]; +} + +- (void)setTrackPlaybackDuration:(nullable NSNumber<SDLInt> *)trackPlaybackDuration { + [store sdl_setObject:trackPlaybackDuration forName:SDLRPCParameterNameTrackPlaybackDuration]; +} + +- (nullable NSNumber<SDLInt> *)trackPlaybackDuration { + return [store sdl_objectForName:SDLRPCParameterNameTrackPlaybackDuration]; +} + +- (void)setQueuePlaybackProgress:(nullable NSNumber<SDLInt> *)queuePlaybackProgress { + [store sdl_setObject:queuePlaybackProgress forName:SDLRPCParameterNameQueuePlaybackProgress]; +} + +- (nullable NSNumber<SDLInt> *)queuePlaybackProgress { + return [store sdl_objectForName:SDLRPCParameterNameQueuePlaybackProgress]; +} + +- (void)setQueuePlaybackDuration:(nullable NSNumber<SDLInt> *)queuePlaybackDuration { + [store sdl_setObject:queuePlaybackDuration forName:SDLRPCParameterNameQueuePlaybackDuration]; +} + +- (nullable NSNumber<SDLInt> *)queuePlaybackDuration { + return [store sdl_objectForName:SDLRPCParameterNameQueuePlaybackDuration]; +} + +- (void)setQueueCurrentTrackNumber:(nullable NSNumber<SDLInt> *)queueCurrentTrackNumber { + [store sdl_setObject:queueCurrentTrackNumber forName:SDLRPCParameterNameQueueCurrentTrackNumber]; +} + +- (nullable NSNumber<SDLInt> *)queueCurrentTrackNumber { + return [store sdl_objectForName:SDLRPCParameterNameQueueCurrentTrackNumber]; +} + +- (void)setQueueTotalTrackCount:(nullable NSNumber<SDLInt> *)queueTotalTrackCount { + [store sdl_setObject:queueTotalTrackCount forName:SDLRPCParameterNameQueueTotalTrackCount]; +} + +- (nullable NSNumber<SDLInt> *)queueTotalTrackCount { + return [store sdl_objectForName:SDLRPCParameterNameQueueTotalTrackCount]; +} + +@end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLMediaServiceManifest.h b/SmartDeviceLink/SDLMediaServiceManifest.h new file mode 100644 index 000000000..a3b931c98 --- /dev/null +++ b/SmartDeviceLink/SDLMediaServiceManifest.h @@ -0,0 +1,20 @@ +// +// SDLMediaServiceManifest.h +// SmartDeviceLink +// +// Created by Nicole on 2/11/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import "SDLRPCRequest.h" + +NS_ASSUME_NONNULL_BEGIN + +/** + * A media service manifest. + */ +@interface SDLMediaServiceManifest : SDLRPCStruct + +@end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLMediaServiceManifest.m b/SmartDeviceLink/SDLMediaServiceManifest.m new file mode 100644 index 000000000..734256320 --- /dev/null +++ b/SmartDeviceLink/SDLMediaServiceManifest.m @@ -0,0 +1,17 @@ +// +// SDLMediaServiceManifest.m +// SmartDeviceLink +// +// Created by Nicole on 2/11/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import "SDLMediaServiceManifest.h" + +NS_ASSUME_NONNULL_BEGIN + +@implementation SDLMediaServiceManifest + +@end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLMediaType.h b/SmartDeviceLink/SDLMediaType.h new file mode 100644 index 000000000..f7d1943c2 --- /dev/null +++ b/SmartDeviceLink/SDLMediaType.h @@ -0,0 +1,35 @@ +// +// SDLMediaType.h +// SmartDeviceLink +// +// Created by Nicole on 2/8/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import "SDLEnum.h" + +/** + * Enumeration listing possible media types. + */ +typedef SDLEnum SDLMediaType SDL_SWIFT_ENUM; + +/** + * The app will have a media type of music. + */ +extern SDLMediaType const SDLMediaTypeMusic; + +/** + * The app will have a media type of podcast. + */ +extern SDLMediaType const SDLMediaTypePodcast; + +/** + * The app will have a media type of audiobook. + */ +extern SDLMediaType const SDLMediaTypeAudiobook; + +/** + * The app will have a media type of other. + */ +extern SDLMediaType const SDLMediaTypeOther; + diff --git a/SmartDeviceLink/SDLMediaType.m b/SmartDeviceLink/SDLMediaType.m new file mode 100644 index 000000000..3a18a3dd2 --- /dev/null +++ b/SmartDeviceLink/SDLMediaType.m @@ -0,0 +1,14 @@ +// +// SDLMediaType.m +// SmartDeviceLink +// +// Created by Nicole on 2/8/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import "SDLMediaType.h" + +SDLMediaType const SDLMediaTypeMusic = @"MUSIC"; +SDLMediaType const SDLMediaTypePodcast = @"PODCAST"; +SDLMediaType const SDLMediaTypeAudiobook = @"AUDIOBOOK"; +SDLMediaType const SDLMediaTypeOther = @"OTHER"; diff --git a/SmartDeviceLink/SDLMenuParams.m b/SmartDeviceLink/SDLMenuParams.m index f921ef321..e7998d06d 100644 --- a/SmartDeviceLink/SDLMenuParams.m +++ b/SmartDeviceLink/SDLMenuParams.m @@ -5,7 +5,7 @@ #import "SDLMenuParams.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" NS_ASSUME_NONNULL_BEGIN @@ -35,27 +35,27 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setParentID:(nullable NSNumber<SDLInt> *)parentID { - [store sdl_setObject:parentID forName:SDLNameParentId]; + [store sdl_setObject:parentID forName:SDLRPCParameterNameParentId]; } - (nullable NSNumber<SDLInt> *)parentID { - return [store sdl_objectForName:SDLNameParentId]; + return [store sdl_objectForName:SDLRPCParameterNameParentId]; } - (void)setPosition:(nullable NSNumber<SDLInt> *)position { - [store sdl_setObject:position forName:SDLNamePosition]; + [store sdl_setObject:position forName:SDLRPCParameterNamePosition]; } - (nullable NSNumber<SDLInt> *)position { - return [store sdl_objectForName:SDLNamePosition]; + return [store sdl_objectForName:SDLRPCParameterNamePosition]; } - (void)setMenuName:(NSString *)menuName { - [store sdl_setObject:menuName forName:SDLNameMenuName]; + [store sdl_setObject:menuName forName:SDLRPCParameterNameMenuName]; } - (NSString *)menuName { - return [store sdl_objectForName:SDLNameMenuName]; + return [store sdl_objectForName:SDLRPCParameterNameMenuName]; } @end diff --git a/SmartDeviceLink/SDLMetadataTags.m b/SmartDeviceLink/SDLMetadataTags.m index 656f8871c..2b0f1f1b0 100644 --- a/SmartDeviceLink/SDLMetadataTags.m +++ b/SmartDeviceLink/SDLMetadataTags.m @@ -9,7 +9,7 @@ #import "SDLMetadataTags.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" NS_ASSUME_NONNULL_BEGIN @@ -42,35 +42,35 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setMainField1:(nullable NSArray<SDLMetadataType> *)mainField1 { - [store sdl_setObject:mainField1 forName:SDLNameMainField1]; + [store sdl_setObject:mainField1 forName:SDLRPCParameterNameMainField1]; } - (nullable NSArray<SDLMetadataType> *)mainField1 { - return [store sdl_objectForName:SDLNameMainField1]; + return [store sdl_objectForName:SDLRPCParameterNameMainField1]; } - (void)setMainField2:(nullable NSArray<SDLMetadataType> *)mainField2 { - [store sdl_setObject:mainField2 forName:SDLNameMainField2]; + [store sdl_setObject:mainField2 forName:SDLRPCParameterNameMainField2]; } - (nullable NSArray<SDLMetadataType> *)mainField2 { - return [store sdl_objectForName:SDLNameMainField2]; + return [store sdl_objectForName:SDLRPCParameterNameMainField2]; } - (void)setMainField3:(nullable NSArray<SDLMetadataType> *)mainField3 { - [store sdl_setObject:mainField3 forName:SDLNameMainField3]; + [store sdl_setObject:mainField3 forName:SDLRPCParameterNameMainField3]; } - (nullable NSArray<SDLMetadataType> *)mainField3 { - return [store sdl_objectForName:SDLNameMainField3]; + return [store sdl_objectForName:SDLRPCParameterNameMainField3]; } - (void)setMainField4:(nullable NSArray<SDLMetadataType> *)mainField4 { - [store sdl_setObject:mainField4 forName:SDLNameMainField4]; + [store sdl_setObject:mainField4 forName:SDLRPCParameterNameMainField4]; } - (nullable NSArray<SDLMetadataType> *)mainField4 { - return [store sdl_objectForName:SDLNameMainField4]; + return [store sdl_objectForName:SDLRPCParameterNameMainField4]; } @end diff --git a/SmartDeviceLink/SDLModuleData.m b/SmartDeviceLink/SDLModuleData.m index 947f8b5a0..12b5b3f60 100644 --- a/SmartDeviceLink/SDLModuleData.m +++ b/SmartDeviceLink/SDLModuleData.m @@ -3,7 +3,7 @@ // #import "SDLModuleData.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" #import "SDLClimateControlData.h" #import "SDLRadioControlData.h" #import "SDLSeatControlData.h" @@ -89,59 +89,59 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setModuleType:(SDLModuleType)moduleType { - [store sdl_setObject:moduleType forName:SDLNameModuleType]; + [store sdl_setObject:moduleType forName:SDLRPCParameterNameModuleType]; } - (SDLModuleType)moduleType { - return [store sdl_objectForName:SDLNameModuleType]; + return [store sdl_objectForName:SDLRPCParameterNameModuleType]; } - (void)setRadioControlData:(nullable SDLRadioControlData *)radioControlData { - [store sdl_setObject:radioControlData forName:SDLNameRadioControlData]; + [store sdl_setObject:radioControlData forName:SDLRPCParameterNameRadioControlData]; } - (nullable SDLRadioControlData *)radioControlData { - return [store sdl_objectForName:SDLNameRadioControlData ofClass:SDLRadioControlData.class]; + return [store sdl_objectForName:SDLRPCParameterNameRadioControlData ofClass:SDLRadioControlData.class]; } - (void)setClimateControlData:(nullable SDLClimateControlData *)climateControlData { - [store sdl_setObject:climateControlData forName:SDLNameClimateControlData]; + [store sdl_setObject:climateControlData forName:SDLRPCParameterNameClimateControlData]; } - (nullable SDLClimateControlData *)climateControlData { - return [store sdl_objectForName:SDLNameClimateControlData ofClass:SDLClimateControlData.class]; + return [store sdl_objectForName:SDLRPCParameterNameClimateControlData ofClass:SDLClimateControlData.class]; } - (void)setSeatControlData:(nullable SDLSeatControlData *)seatControlData { - [store sdl_setObject:seatControlData forName:SDLNameSeatControlData]; + [store sdl_setObject:seatControlData forName:SDLRPCParameterNameSeatControlData]; } - (nullable SDLSeatControlData *)seatControlData { - return [store sdl_objectForName:SDLNameSeatControlData ofClass:SDLSeatControlData.class]; + return [store sdl_objectForName:SDLRPCParameterNameSeatControlData ofClass:SDLSeatControlData.class]; } - (void)setAudioControlData:(nullable SDLAudioControlData *)audioControlData { - [store sdl_setObject:audioControlData forName:SDLNameAudioControlData]; + [store sdl_setObject:audioControlData forName:SDLRPCParameterNameAudioControlData]; } - (nullable SDLAudioControlData *)audioControlData { - return [store sdl_objectForName:SDLNameAudioControlData ofClass:SDLAudioControlData.class]; + return [store sdl_objectForName:SDLRPCParameterNameAudioControlData ofClass:SDLAudioControlData.class]; } - (void)setLightControlData:(nullable SDLLightControlData *)lightControlData { - [store sdl_setObject:lightControlData forName:SDLNameLightControlData]; + [store sdl_setObject:lightControlData forName:SDLRPCParameterNameLightControlData]; } - (nullable SDLLightControlData *)lightControlData { - return [store sdl_objectForName:SDLNameLightControlData ofClass:SDLLightControlData.class]; + return [store sdl_objectForName:SDLRPCParameterNameLightControlData ofClass:SDLLightControlData.class]; } - (void)setHmiSettingsControlData:(nullable SDLHMISettingsControlData *)hmiSettingsControlData { - [store sdl_setObject:hmiSettingsControlData forName:SDLNameHmiSettingsControlData]; + [store sdl_setObject:hmiSettingsControlData forName:SDLRPCParameterNameHmiSettingsControlData]; } - (nullable SDLHMISettingsControlData *)hmiSettingsControlData { - return [store sdl_objectForName:SDLNameHmiSettingsControlData ofClass:SDLHMISettingsControlData.class]; + return [store sdl_objectForName:SDLRPCParameterNameHmiSettingsControlData ofClass:SDLHMISettingsControlData.class]; } @end diff --git a/SmartDeviceLink/SDLMyKey.m b/SmartDeviceLink/SDLMyKey.m index fc7f730f7..8d2e807bd 100644 --- a/SmartDeviceLink/SDLMyKey.m +++ b/SmartDeviceLink/SDLMyKey.m @@ -4,7 +4,7 @@ #import "SDLMyKey.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" #import "SDLVehicleDataStatus.h" NS_ASSUME_NONNULL_BEGIN @@ -12,11 +12,11 @@ NS_ASSUME_NONNULL_BEGIN @implementation SDLMyKey - (void)setE911Override:(SDLVehicleDataStatus)e911Override { - [store sdl_setObject:e911Override forName:SDLNameE911Override]; + [store sdl_setObject:e911Override forName:SDLRPCParameterNameE911Override]; } - (SDLVehicleDataStatus)e911Override { - return [store sdl_objectForName:SDLNameE911Override]; + return [store sdl_objectForName:SDLRPCParameterNameE911Override]; } @end diff --git a/SmartDeviceLink/SDLNames.h b/SmartDeviceLink/SDLNames.h deleted file mode 100644 index 5d657fa3d..000000000 --- a/SmartDeviceLink/SDLNames.h +++ /dev/null @@ -1,659 +0,0 @@ -// SDLNames.h -// - -#import <Foundation/Foundation.h> -#import "SDLMacros.h" - -NS_ASSUME_NONNULL_BEGIN - -typedef NSString* SDLName SDL_SWIFT_ENUM; - -extern SDLName const SDLNameACEnable; -extern SDLName const SDLNameACEnableAvailable; -extern SDLName const SDLNameACMaxEnable; -extern SDLName const SDLNameACMaxEnableAvailable; -extern SDLName const SDLNameAccelerationPedalPosition; -extern SDLName const SDLNameAction; -extern SDLName const SDLNameActual; -extern SDLName const SDLNameAddCommand; -extern SDLName const SDLNameAddress; -extern SDLName const SDLNameAddressLines; -extern SDLName const SDLNameAddSubMenu; -extern SDLName const SDLNameAdministrativeArea; -extern SDLName const SDLNameAirbagStatus; -extern SDLName const SDLNameAlert; -extern SDLName const SDLNameAlertManeuver; -extern SDLName const SDLNameAlertText1; -extern SDLName const SDLNameAlertText2; -extern SDLName const SDLNameAlertText3; -extern SDLName const SDLNameAlignment; -extern SDLName const SDLNameAllocatedModules; -extern SDLName const SDLNameAllowed; -extern SDLName const SDLNameAltitude; -extern SDLName const SDLNameAltitudeMeters; -extern SDLName const SDLNameAmbientLightSensorStatus; -extern SDLName const SDLNameAmbientLightStatus; -extern SDLName const SDLNameAppBundleId; -extern SDLName const SDLNameAppHMIType; -extern SDLName const SDLNameAppId; -extern SDLName const SDLNameAppInfo; -extern SDLName const SDLNameAppName; -extern SDLName const SDLNameAppDisplayName; -extern SDLName const SDLNameAppVersion; -extern SDLName const SDLNameAudioControlCapabilities; -extern SDLName const SDLNameAudioControlData; -extern SDLName const SDLNameAudioPassThruCapabilities; -extern SDLName const SDLNameAudioPassThruDisplayText1; -extern SDLName const SDLNameAudioPassThruDisplayText2; -extern SDLName const SDLNameAudioStreamingIndicator; -extern SDLName const SDLNameAudioStreamingState; -extern SDLName const SDLNameAudioType; -extern SDLName const SDLNameAuthToken; -extern SDLName const SDLNameAutoCompleteText; -extern SDLName const SDLNameAutoModeEnable; -extern SDLName const SDLNameAutoModeEnableAvailable; -extern SDLName const SDLNameAuxECallNotificationStatus; -extern SDLName const SDLNameAvailableHDs; -extern SDLName const SDLNameAvailableHDsAvailable; -extern SDLName const SDLNameBackgroundColor; -extern SDLName const SDLNameBackTiltAngle; -extern SDLName const SDLNameBackTiltAngleAvailable; -extern SDLName const SDLNameBackVerticalPosition; -extern SDLName const SDLNameBackVerticalPositionAvailable; -extern SDLName const SDLNameBand; -extern SDLName const SDLNameBatteryLevelStatus; -extern SDLName const SDLNameBeltStatus; -extern SDLName const SDLNameBitsPerSample; -extern SDLName const SDLNameBodyInformation; -extern SDLName const SDLNameBlue; -extern SDLName const SDLNameBluetoothIconOn; -extern SDLName const SDLNameBulkData; -extern SDLName const SDLNameButtonCapabilities; -extern SDLName const SDLNameButtonEventMode; -extern SDLName const SDLNameButtonName; -extern SDLName const SDLNameButtonPress; -extern SDLName const SDLNameButtonPressMode; -extern SDLName const SDLNameColor; -extern SDLName const SDLNameCoolingEnabled; -extern SDLName const SDLNameCoolingEnabledAvailable; -extern SDLName const SDLNameCoolingLevel; -extern SDLName const SDLNameCoolingLevelAvailable; -extern SDLName const SDLNameCoordinate; -extern SDLName const SDLNameCallActive; -extern SDLName const SDLNameCarModeStatus; -extern SDLName const SDLNameCarrier; -extern SDLName const SDLNameChangeRegistration; -extern SDLName const SDLNameChannelId; -extern SDLName const SDLNameChannelName; -extern SDLName const SDLNameChannelSetting; -extern SDLName const SDLNameCharacterSet; -extern SDLName const SDLNameChoiceId; -extern SDLName const SDLNameChoiceSet; -extern SDLName const SDLNameCirculateAirEnable; -extern SDLName const SDLNameCirculateAirEnableAvailable; -extern SDLName const SDLNameClimateControlData; -extern SDLName const SDLNameClimateControlCapabilities; -extern SDLName const SDLNameClusterModes; -extern SDLName const SDLNameClusterModeStatus; -extern SDLName const SDLNameCommandIcon; -extern SDLName const SDLNameCommandId; -extern SDLName const SDLNameCompassDirection; -extern SDLName const SDLNameCorrelationId; -extern SDLName const SDLNameCountryCode; -extern SDLName const SDLNameCountryName; -extern SDLName const SDLNameCRC; -extern SDLName const SDLNameCreateInteractionChoiceSet; -extern SDLName const SDLNameClockText; -extern SDLName const SDLNameCloudAppVehicleID; -extern SDLName const SDLNameCloudTransportType; -extern SDLName const SDLNameCurrentTemperature; -extern SDLName const SDLNameCushion; -extern SDLName const SDLNameCustomButtonId; -extern SDLName const SDLNameCustomPresets; -extern SDLName const SDLNameData; -extern SDLName const SDLNameDataResult; -extern SDLName const SDLNameDataType; -extern SDLName const SDLNameDay; -extern SDLName const SDLNameDayColorScheme; -extern SDLName const SDLNameDefrostZone; -extern SDLName const SDLNameDefrostZoneAvailable; -extern SDLName const SDLNameDeleteCommand; -extern SDLName const SDLNameDeleteFile; -extern SDLName const SDLNameDeleteInteractionChoiceSet; -extern SDLName const SDLNameDeleteSubMenu; -extern SDLName const SDLNameDeliveryMode; -extern SDLName const SDLNameDensity; -extern SDLName const SDLNameDensityAvailable; -extern SDLName const SDLNameDesiredTemperature; -extern SDLName const SDLNameDesiredTemperatureAvailable; -extern SDLName const SDLNameDeviceInfo; -extern SDLName const SDLNameDeviceStatus; -extern SDLName const SDLNameDiagnosticMessage; -extern SDLName const SDLNameDialNumber; -extern SDLName const SDLNameDialNumberEnabled; -extern SDLName const SDLNameDIDLocation; -extern SDLName const SDLNameDIDResult; -extern SDLName const SDLNameDimension; -extern SDLName const SDLNameDisplayCapabilities; -extern SDLName const SDLNameDisplayMode; -extern SDLName const SDLNameDisplayModeUnitAvailable; -extern SDLName const SDLNameDisplayLayout; -extern SDLName const SDLNameDisplayName; -extern SDLName const SDLNameDisplayType; -extern SDLName const SDLNameDistanceUnit; -extern SDLName const SDLNameDistanceToEmpty; -extern SDLName const SDLNameDistanceToManeuver; -extern SDLName const SDLNameDistanceToManeuverScale; -extern SDLName const SDLNameDistanceUnitAvailable; -extern SDLName const SDLNameDoublePressAvailable; -extern SDLName const SDLNameDriverAirbagDeployed; -extern SDLName const SDLNameDriverBeltDeployed; -extern SDLName const SDLNameDriverBraking; -extern SDLName const SDLNameDriverBuckleBelted; -extern SDLName const SDLNameDriverCurtainAirbagDeployed; -extern SDLName const SDLNameDriverDistractionStatus; -extern SDLName const SDLNameDriverDoorAjar; -extern SDLName const SDLNameDriverKneeAirbagDeployed; -extern SDLName const SDLNameDriverSideAirbagDeployed; -extern SDLName const SDLNameDTC; -extern SDLName const SDLNameDTCMask; -extern SDLName const SDLNameDualModeEnable; -extern SDLName const SDLNameDualModeEnableAvailable; -extern SDLName const SDLNameDuration; -extern SDLName const SDLNameE911Override; -extern SDLName const SDLNameECallConfirmationStatus; -extern SDLName const SDLNameECallEventActive; -extern SDLName const SDLNameECallInfo; -extern SDLName const SDLNameECallNotificationStatus; -extern SDLName const SDLNameECUHeader; -extern SDLName const SDLNameECUName; -extern SDLName const SDLNameElectronicParkBrakeStatus; -extern SDLName const SDLNameEmergencyEvent; -extern SDLName const SDLNameEmergencyEventType; -extern SDLName const SDLNameEnabled; -extern SDLName const SDLNameEncodedSyncPData; -extern SDLName const SDLNameEndAudioPassThru; -extern SDLName const SDLNameEndpoint; -extern SDLName const SDLNameEndTime; -extern SDLName const SDLNameEngineOilLife; -extern SDLName const SDLNameEngineTorque; -extern SDLName const SDLNameEqualizerAvailable; -extern SDLName const SDLNameEqualizerMaxChannelId; -extern SDLName const SDLNameEqualizerSettings; -extern SDLName const SDLNameETA; -extern SDLName const SDLNameEvent; -extern SDLName const SDLNameExternalTemperature; -extern SDLName const SDLNameFanSpeed; -extern SDLName const SDLNameFanSpeedAvailable; -extern SDLName const SDLNameFCCFacilityId; -extern SDLName const SDLNameFilename; -extern SDLName const SDLNameFilenames; -extern SDLName const SDLNameFileType; -extern SDLName const SDLNameFirmness; -extern SDLName const SDLNameFirmwareRevision; -extern SDLName const SDLNameFreeModules; -extern SDLName const SDLNameFrequencyInteger; -extern SDLName const SDLNameFrequencyFraction; -extern SDLName const SDLNameFrontVerticalPosition; -extern SDLName const SDLNameFrontVerticalPositionAvailable; -extern SDLName const SDLNameFuelCutoffStatus; -extern SDLName const SDLNameFuelLevel; -extern SDLName const SDLNameFuelLevelState; -extern SDLName const SDLNameFuelMaintenanceMode; -extern SDLName const SDLNameFuelRange; -extern SDLName const SDLNameFullAppID; -extern SDLName const SDLNameGenericResponse; -extern SDLName const SDLNameGetCloudAppProperties; -extern SDLName const SDLNameGetDTCs; -extern SDLName const SDLNameGetInteriorVehicleData; -extern SDLName const SDLNameGetSystemCapability; -extern SDLName const SDLNameGetVehicleData; -extern SDLName const SDLNameGetWayPoints; -extern SDLName const SDLNameGetWayPointsEnabled; -extern SDLName const SDLNameGPS; -extern SDLName const SDLNameGraphic; -extern SDLName const SDLNameGraphicSupported; -extern SDLName const SDLNameGreen; -extern SDLName const SDLNameHapticRectData; -extern SDLName const SDLNameHapticSpatialDataSupported; -extern SDLName const SDLNameHardware; -extern SDLName const SDLNameHashId; -extern SDLName const SDLNameHDOP; -extern SDLName const SDLNameHDChannel; -extern SDLName const SDLNameHDChannelAvailable; -extern SDLName const SDLNameHDRadioEnable; -extern SDLName const SDLNameHDRadioEnableAvailable; -extern SDLName const SDLNameHeading; -extern SDLName const SDLNameHeadLampStatus; -extern SDLName const SDLNameHeadSupportHorizontalPosition; -extern SDLName const SDLNameHeadSupportHorizontalPositionAvailable; -extern SDLName const SDLNameHeadSupportVerticalPosition; -extern SDLName const SDLNameHeadSupportVerticalPositionAvailable; -extern SDLName const SDLNameHeatingLevel; -extern SDLName const SDLNameHeatingLevelAvailable; -extern SDLName const SDLNameHeatingEnabled; -extern SDLName const SDLNameHeatingEnabledAvailable; -extern SDLName const SDLNameHeatedSteeringWheelAvailable; -extern SDLName const SDLNameHeatedWindshieldAvailable; -extern SDLName const SDLNameHeatedRearWindowAvailable; -extern SDLName const SDLNameHeatedMirrorsAvailable; -extern SDLName const SDLNameHeatedSteeringWheelEnable; -extern SDLName const SDLNameHeatedWindshieldEnable; -extern SDLName const SDLNameHeatedRearWindowEnable; -extern SDLName const SDLNameHeatedMirrorsEnable; -extern SDLName const SDLNameHeight; -extern SDLName const SDLNameHelpPrompt; -extern SDLName const SDLNameHighBeamsOn; -extern SDLName const SDLNameHMICapabilities; -extern SDLName const SDLNameHMIDisplayLanguage; -extern SDLName const SDLNameHMIDisplayLanguageDesired; -extern SDLName const SDLNameHMILevel; -extern SDLName const SDLNameHMIPermissions; -extern SDLName const SDLNameHmiSettingsControlCapabilities; -extern SDLName const SDLNameHmiSettingsControlData; -extern SDLName const SDLNameHMIZoneCapabilities; -extern SDLName const SDLNameHorizontalPosition; -extern SDLName const SDLNameHorizontalPositionAvailable; -extern SDLName const SDLNameHour; -extern SDLName const SDLNameHours; -extern SDLName const SDLNameHybridAppPreference; -extern SDLName const SDLNameIconResumed; -extern SDLName const SDLNameId; -extern SDLName const SDLNameIgnitionStableStatus; -extern SDLName const SDLNameIgnitionStatus; -extern SDLName const SDLNameImage; -extern SDLName const SDLNameImageFields; -extern SDLName const SDLNameImageResolution; -extern SDLName const SDLNameImageSupported; -extern SDLName const SDLNameImageTemplate; -extern SDLName const SDLNameImageType; -extern SDLName const SDLNameImageTypeSupported; -extern SDLName const SDLNameInfo; -extern SDLName const SDLNameInitialPrompt; -extern SDLName const SDLNameInitialText; -extern SDLName const SDLNameInnerLeftRear; -extern SDLName const SDLNameInnerRightRear; -extern SDLName const SDLNameInstantFuelConsumption; -extern SDLName const SDLNameInteractionChoiceSetId; -extern SDLName const SDLNameInteractionChoiceSetIdList; -extern SDLName const SDLNameInteractionLayout; -extern SDLName const SDLNameInteractionMode; -extern SDLName const SDLNameIsHighlighted; -extern SDLName const SDLNameIsMediaApplication; -extern SDLName const SDLNameIsSubscribed; -extern SDLName const SDLNameKeepContext; -extern SDLName const SDLNameKeepContextAvailable; -extern SDLName const SDLNameKeyboardLayout; -extern SDLName const SDLNameKeyboardProperties; -extern SDLName const SDLNameKeypressMode; -extern SDLName const SDLNameLabel; -extern SDLName const SDLNameLanguage; -extern SDLName const SDLNameLanguageDesired; -extern SDLName const SDLNameLatitudeDegrees; -extern SDLName const SDLNameLeftFront; -extern SDLName const SDLNameLeftRear; -extern SDLName const SDLNameLeftRearInflatableBelted; -extern SDLName const SDLNameLeftRow2BuckleBelted; -extern SDLName const SDLNameLeftRow3BuckleBelted; -extern SDLName const SDLNameLength; -extern SDLName const SDLNameLightControlCapabilities; -extern SDLName const SDLNameLightControlData; -extern SDLName const SDLNameLightState; -extern SDLName const SDLNameLimitedCharacterList; -extern SDLName const SDLNameListFiles; -extern SDLName const SDLNameLocality; -extern SDLName const SDLNameLocationCoordinate; -extern SDLName const SDLNameLocationDescription; -extern SDLName const SDLNameLocationImage; -extern SDLName const SDLNameLocationName; -extern SDLName const SDLNameLocationTimeStamp; -extern SDLName const SDLNameLongitudeDegrees; -extern SDLName const SDLNameLongPress; -extern SDLName const SDLNameLongPressAvailable; -extern SDLName const SDLNameLowBeamsOn; -extern SDLName const SDLNameMainField1; -extern SDLName const SDLNameMainField2; -extern SDLName const SDLNameMainField3; -extern SDLName const SDLNameMainField4; -extern SDLName const SDLNameMainField1Type; -extern SDLName const SDLNameMainField2Type; -extern SDLName const SDLNameMainField3Type; -extern SDLName const SDLNameMainField4Type; -extern SDLName const SDLNameMajorVersion; -extern SDLName const SDLNameMake; -extern SDLName const SDLNameManeuverComplete; -extern SDLName const SDLNameManualTextEntry; -extern SDLName const SDLNameMassageCushionFirmness; -extern SDLName const SDLNameMassageCushionFirmnessAvailable; -extern SDLName const SDLNameMassageEnabled; -extern SDLName const SDLNameMassageEnabledAvailable; -extern SDLName const SDLNameMassageMode; -extern SDLName const SDLNameMassageModeAvailable; -extern SDLName const SDLNameMemoryAvailable; -extern SDLName const SDLNameMassageZone; -extern SDLName const SDLNameMaxBitrate; -extern SDLName const SDLNameMaxDuration; -extern SDLName const SDLNameMaximumChangeVelocity; -extern SDLName const SDLNameMaxNumberRFCOMMPorts; -extern SDLName const SDLNameMediaClock; -extern SDLName const SDLNameMediaClockFormats; -extern SDLName const SDLNameMediaTrack; -extern SDLName const SDLNameMemory; -extern SDLName const SDLNameMenuIcon; -extern SDLName const SDLNameMenuId; -extern SDLName const SDLNameMenuName; -extern SDLName const SDLNameMenuParams; -extern SDLName const SDLNameMenuTitle; -extern SDLName const SDLNameMessageData; -extern SDLName const SDLNameMessageDataResult; -extern SDLName const SDLNameMessageLength; -extern SDLName const SDLNameMetadataTags; -extern SDLName const SDLNameMiddleRow1BeltDeployed; -extern SDLName const SDLNameMiddleRow1BuckleBelted; -extern SDLName const SDLNameMiddleRow2BuckleBelted; -extern SDLName const SDLNameMiddleRow3BuckleBelted; -extern SDLName const SDLNameMillisecond; -extern SDLName const SDLNameMinorVersion; -extern SDLName const SDLNameMinute; -extern SDLName const SDLNameMinutes; -extern SDLName const SDLNameModel; -extern SDLName const SDLNameModuleData; -extern SDLName const SDLNameModuleName; -extern SDLName const SDLNameModuleType; -extern SDLName const SDLNameModelYear; -extern SDLName const SDLNameMonoAudioOutputMuted; -extern SDLName const SDLNameMonth; -extern SDLName const SDLNameMultipleEvents; -extern SDLName const SDLNameMultiTouchAvailable; -extern SDLName const SDLNameMuteAudio; -extern SDLName const SDLNameMyKey; -extern SDLName const SDLNameName; -extern SDLName const SDLNameNavigation; -extern SDLName const SDLNameNavigationCapability; -extern SDLName const SDLNameNavigationText; -extern SDLName const SDLNameNavigationText1; -extern SDLName const SDLNameNavigationText2; -extern SDLName const SDLNameNextTurnIcon; -extern SDLName const SDLNameNGNMediaScreenAppName; -extern SDLName const SDLNameNicknames; -extern SDLName const SDLNameNightColorScheme; -extern SDLName const SDLNameNotification; -extern SDLName const SDLNameNumber; -extern SDLName const SDLNameNumberCustomPresetsAvailable; -extern SDLName const SDLNameNumberTicks; -extern SDLName const SDLNameOdometer; -extern SDLName const SDLNameOffset; -extern SDLName const SDLNameOnAppInterfaceUnregistered; -extern SDLName const SDLNameOnAudioPassThru; -extern SDLName const SDLNameOnButtonEvent; -extern SDLName const SDLNameOnButtonPress; -extern SDLName const SDLNameOnCommand; -extern SDLName const SDLNameOnDriverDistraction; -extern SDLName const SDLNameOnEncodedSyncPData; -extern SDLName const SDLNameOnHashChange; -extern SDLName const SDLNameOnHMIStatus; -extern SDLName const SDLNameOnInteriorVehicleData; -extern SDLName const SDLNameOnKeyboardInput; -extern SDLName const SDLNameOnLanguageChange; -extern SDLName const SDLNameOnLockScreenStatus; -extern SDLName const SDLNameOnPermissionsChange; -extern SDLName const SDLNameOnRCStatus; -extern SDLName const SDLNameOnScreenPresetsAvailable; -extern SDLName const SDLNameOnSyncPData; -extern SDLName const SDLNameOnSystemRequest; -extern SDLName const SDLNameOnTBTClientState; -extern SDLName const SDLNameOnTouchEvent; -extern SDLName const SDLNameOnVehicleData; -extern SDLName const SDLNameOnWayPointChange; -extern SDLName const SDLNameOperationName; -extern SDLName const SDLNameOS; -extern SDLName const SDLNameOSVersion; -extern SDLName const SDLNameParameterPermissions; -extern SDLName const SDLNameParameters; -extern SDLName const SDLNameParentId; -extern SDLName const SDLNameParkBrakeActive; -extern SDLName const SDLNamePassengerAirbagDeployed; -extern SDLName const SDLNamePassengerBeltDeployed; -extern SDLName const SDLNamePassengerBuckleBelted; -extern SDLName const SDLNamePassengerChildDetected; -extern SDLName const SDLNamePassengerCurtainAirbagDeployed; -extern SDLName const SDLNamePassengerDoorAjar; -extern SDLName const SDLNamePassengerKneeAirbagDeployed; -extern SDLName const SDLNamePassengerSideAirbagDeployed; -extern SDLName const SDLNamePatchVersion; -extern SDLName const SDLNamePCMStreamCapabilities; -extern SDLName const SDLNamePDOP; -extern SDLName const SDLNamePerformAudioPassThru; -extern SDLName const SDLNamePerformInteraction; -extern SDLName const SDLNamePermissionItem; -extern SDLName const SDLNamePersistentFile; -extern SDLName const SDLNamePhoneCall; -extern SDLName const SDLNamePhoneCapability; -extern SDLName const SDLNamePhoneNumber; -extern SDLName const SDLNamePhoneRoaming; -extern SDLName const SDLNameProgramIdentification; -extern SDLName const SDLNamePlayTone; -extern SDLName const SDLNamePosition; -extern SDLName const SDLNamePostalCode; -extern SDLName const SDLNamePowerModeActive; -extern SDLName const SDLNamePowerModeQualificationStatus; -extern SDLName const SDLNamePowerModeStatus; -extern SDLName const SDLNamePreferredResolution; -extern SDLName const SDLNamePrerecordedSpeech; -extern SDLName const SDLNamePresetBankCapabilities; -extern SDLName const SDLNamePressAvailable; -extern SDLName const SDLNamePressure; -extern SDLName const SDLNamePressureTelltale; -extern SDLName const SDLNamePrimaryAudioSource; -extern SDLName const SDLNamePrimaryColor; -extern SDLName const SDLNamePRNDL; -extern SDLName const SDLNameProgressIndicator; -extern SDLName const SDLNameProperties; -extern SDLName const SDLNameProgramService; -extern SDLName const SDLNameProgramType; -extern SDLName const SDLNamePutFile; -extern SDLName const SDLNameRadioBandAvailable; -extern SDLName const SDLNameRadioControlCapabilities; -extern SDLName const SDLNameRadioControlData; -extern SDLName const SDLNameRadioEnable; -extern SDLName const SDLNameRadioEnableAvailable; -extern SDLName const SDLNameRadioFrequencyAvailable; -extern SDLName const SDLNameRange; -extern SDLName const SDLNameRDSData; -extern SDLName const SDLNameRDSDataAvailable; -extern SDLName const SDLNameReadDID; -extern SDLName const SDLNameRearLeftDoorAjar; -extern SDLName const SDLNameRearRightDoorAjar; -extern SDLName const SDLNameReason; -extern SDLName const SDLNameRect; -extern SDLName const SDLNameRed; -extern SDLName const SDLNameRegion; -extern SDLName const SDLNameRegisterAppInterface; -extern SDLName const SDLNameRemoteControlCapability; -extern SDLName const SDLNameRequest; -extern SDLName const SDLNameRequestSubType; -extern SDLName const SDLNameRequestType; -extern SDLName const SDLNameReserved; -extern SDLName const SDLNameResetGlobalProperties; -extern SDLName const SDLNameResolution; -extern SDLName const SDLNameResolutionHeight; -extern SDLName const SDLNameResolutionWidth; -extern SDLName const SDLNameResponse; -extern SDLName const SDLNameResult; -extern SDLName const SDLNameResultCode; -extern SDLName const SDLNameRightFront; -extern SDLName const SDLNameRightRear; -extern SDLName const SDLNameRightRearInflatableBelted; -extern SDLName const SDLNameRightRow2BuckleBelted; -extern SDLName const SDLNameRightRow3BuckleBelted; -extern SDLName const SDLNameRolloverEvent; -extern SDLName const SDLNameRows; -extern SDLName const SDLNameRPCName; -extern SDLName const SDLNameRPM; -extern SDLName const SDLNameRadioText; -extern SDLName const SDLNameSamplingRate; -extern SDLName const SDLNameSatellites; -extern SDLName const SDLNameScreenParams; -extern SDLName const SDLNameScrollableMessage; -extern SDLName const SDLNameScrollableMessageBody; -extern SDLName const SDLNameSDLVersion; -extern SDLName const SDLNameSearchAddress; -extern SDLName const SDLNameSeatControlData; -extern SDLName const SDLNameSeatControlCapabilities; -extern SDLName const SDLNameSecondaryColor; -extern SDLName const SDLNameSecondaryGraphic; -extern SDLName const SDLNameSecondaryImage; -extern SDLName const SDLNameSecondaryText; -extern SDLName const SDLNameSecond; -extern SDLName const SDLNameSeconds; -extern SDLName const SDLNameSendHapticData; -extern SDLName const SDLNameSendHapticDataResponse; -extern SDLName const SDLNameSendLocation; -extern SDLName const SDLNameSendLocationEnabled; -extern SDLName const SDLNameSetAppIcon; -extern SDLName const SDLNameSetCloudAppProperties; -extern SDLName const SDLNameSetDisplayLayout; -extern SDLName const SDLNameSetGlobalProperties; -extern SDLName const SDLNameSetInteriorVehicleData; -extern SDLName const SDLNameSetMediaClockTimer; -extern SDLName const SDLNameShortPress; -extern SDLName const SDLNameShortPressAvailable; -extern SDLName const SDLNameShow; -extern SDLName const SDLNameShowConstantTBT; -extern SDLName const SDLNameSignalLevelStatus; -extern SDLName const SDLNameSignalChangeThreshold; -extern SDLName const SDLNameSignalChangeThresholdAvailable; -extern SDLName const SDLNameSignalStrength; -extern SDLName const SDLNameSignalStrengthAvailable; -extern SDLName const SDLNameSiriusXMRadioAvailable; -extern SDLName const SDLNameSISData; -extern SDLName const SDLNameSISDataAvailable; -extern SDLName const SDLNameSlider; -extern SDLName const SDLNameSliderFooter; -extern SDLName const SDLNameSliderHeader; -extern SDLName const SDLNameSliderPosition; -extern SDLName const SDLNameSoftButtonCapabilities; -extern SDLName const SDLNameSoftButtonId; -extern SDLName const SDLNameSoftButtons; -extern SDLName const SDLNameSource; -extern SDLName const SDLNameSourceAvailable; -extern SDLName const SDLNameSpaceAvailable; -extern SDLName const SDLNameSpeak; -extern SDLName const SDLNameSpeechCapabilities; -extern SDLName const SDLNameSpeed; -extern SDLName const SDLNameRGBColorSpaceAvailable; -extern SDLName const SDLNameStartTime; -extern SDLName const SDLNameState; -extern SDLName const SDLNameStateAvailable; -extern SDLName const SDLNameStateOfCharge; -extern SDLName const SDLNameStationIDNumber; -extern SDLName const SDLNameStationLongName; -extern SDLName const SDLNameStationLocation; -extern SDLName const SDLNameStationMessage; -extern SDLName const SDLNameStationShortName; -extern SDLName const SDLNameStatus; -extern SDLName const SDLNameStatusAvailable; -extern SDLName const SDLNameStatusBar; -extern SDLName const SDLNameSteeringWheelAngle; -extern SDLName const SDLNameStereoAudioOutputMuted; -extern SDLName const SDLNameSubAdministrativeArea; -extern SDLName const SDLNameSubLocality; -extern SDLName const SDLNameSubscribe; -extern SDLName const SDLNameSubscribeButton; -extern SDLName const SDLNameSubscribeVehicleData; -extern SDLName const SDLNameSubscribeWayPoints; -extern SDLName const SDLNameSubThoroughfare; -extern SDLName const SDLNameSuccess; -extern SDLName const SDLNameSupportedDiagnosticModes; -extern SDLName const SDLNameSupportedFormats; -extern SDLName const SDLNameSupportedLights; -extern SDLName const SDLNameSyncFileName; -extern SDLName const SDLNameSyncMessageVersion; -extern SDLName const SDLNameSyncPData; -extern SDLName const SDLNameSystemAction; -extern SDLName const SDLNameSystemCapability; -extern SDLName const SDLNameSystemCapabilityType; -extern SDLName const SDLNameSystemContext; -extern SDLName const SDLNameSystemFile; -extern SDLName const SDLNameSystemRequest; -extern SDLName const SDLNameSystemSoftwareVersion; -extern SDLName const SDLNameTrafficAnnouncementIdentification; -extern SDLName const SDLNameTargetId; -extern SDLName const SDLNameTemperatureUnit; -extern SDLName const SDLNameTemperatureUnitAvailable; -extern SDLName const SDLNameTemplatesAvailable; -extern SDLName const SDLNameTertiaryText; -extern SDLName const SDLNameText; -extern SDLName const SDLNameTextFields; -extern SDLName const SDLNameTextMessageAvailable; -extern SDLName const SDLNameThoroughfare; -extern SDLName const SDLNameTimeout; -extern SDLName const SDLNameTimeoutCapitalized; -extern SDLName const SDLNameTimeoutPrompt; -extern SDLName const SDLNameTimeToDestination; -extern SDLName const SDLNameTimezoneHourOffset; -extern SDLName const SDLNameTimezoneMinuteOffset; -extern SDLName const SDLNameTirePressure; -extern SDLName const SDLNameTotalDistance; -extern SDLName const SDLNameTouchEventAvailable; -extern SDLName const SDLNameTPMS; -extern SDLName const SDLNameTrafficProgramIdentification; -extern SDLName const SDLNameTriggerSource; -extern SDLName const SDLNameTrim; -extern SDLName const SDLNameTryAgainTime; -extern SDLName const SDLNameTimestamp; -extern SDLName const SDLNameTTSChunks; -extern SDLName const SDLNameTTSName; -extern SDLName const SDLNameTurnIcon; -extern SDLName const SDLNameTurnList; -extern SDLName const SDLNameTurnSignal; -extern SDLName const SDLNameType; -extern SDLName const SDLNameUnit; -extern SDLName const SDLNameUnregisterAppInterface; -extern SDLName const SDLNameUnsubscribe; -extern SDLName const SDLNameUnsubscribeButton; -extern SDLName const SDLNameUnsubscribeVehicleData; -extern SDLName const SDLNameUnsubscribeWayPoints; -extern SDLName const SDLNameUpdateMode; -extern SDLName const SDLNameUpdateTurnList; -extern SDLName const SDLNameUpDownAvailable; -extern SDLName const SDLNameURL; -extern SDLName const SDLNameURLUppercase; -extern SDLName const SDLNameUserDisallowed; -extern SDLName const SDLNameUserSelected; -extern SDLName const SDLNameUTCDay; -extern SDLName const SDLNameUTCHours; -extern SDLName const SDLNameUTCMinutes; -extern SDLName const SDLNameUTCMonth; -extern SDLName const SDLNameUTCSeconds; -extern SDLName const SDLNameUTCYear; -extern SDLName const SDLNameValue; -extern SDLName const SDLNameVDOP; -extern SDLName const SDLNameVehicleType; -extern SDLName const SDLNameVerticalPosition; -extern SDLName const SDLNameVerticalPositionAvailable; -extern SDLName const SDLNameVideoCodec; -extern SDLName const SDLNameVideoProtocol; -extern SDLName const SDLNameVideoStreaming; -extern SDLName const SDLNameVideoStreamingCapability; -extern SDLName const SDLNameVideoStreamingState; -extern SDLName const SDLNameVentilationMode; -extern SDLName const SDLNameVentilationModeAvailable; -extern SDLName const SDLNameVIN; -extern SDLName const SDLNameVoiceRecognitionOn; -extern SDLName const SDLNameVolume; -extern SDLName const SDLNameVolumeAvailable; -extern SDLName const SDLNameVRCapabilities; -extern SDLName const SDLNameVRCommands; -extern SDLName const SDLNameVRHelp; -extern SDLName const SDLNameVRHelpTitle; -extern SDLName const SDLNameVRSynonyms; -extern SDLName const SDLNameWayPoints; -extern SDLName const SDLNameWayPointType; -extern SDLName const SDLNameWidth; -extern SDLName const SDLNameWiperStatus; -extern SDLName const SDLNameX; -extern SDLName const SDLNameY; -extern SDLName const SDLNameYear; - -NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLNames.m b/SmartDeviceLink/SDLNames.m deleted file mode 100644 index a8073897e..000000000 --- a/SmartDeviceLink/SDLNames.m +++ /dev/null @@ -1,654 +0,0 @@ -// SDLNames.h -// - -#import "NSMutableDictionary+Store.h" -#import "SDLNames.h" - -NS_ASSUME_NONNULL_BEGIN - -SDLName const SDLNameACEnable = @"acEnable"; -SDLName const SDLNameACEnableAvailable = @"acEnableAvailable"; -SDLName const SDLNameACMaxEnable = @"acMaxEnable"; -SDLName const SDLNameACMaxEnableAvailable = @"acMaxEnableAvailable"; -SDLName const SDLNameAccelerationPedalPosition = @"accPedalPosition"; -SDLName const SDLNameAction = @"action"; -SDLName const SDLNameActual = @"actual"; -SDLName const SDLNameAddCommand = @"AddCommand"; -SDLName const SDLNameAddress = @"address"; -SDLName const SDLNameAddressLines = @"addressLines"; -SDLName const SDLNameAdministrativeArea = @"administrativeArea"; -SDLName const SDLNameAddSubMenu = @"AddSubMenu"; -SDLName const SDLNameAirbagStatus = @"airbagStatus"; -SDLName const SDLNameAlert = @"Alert"; -SDLName const SDLNameAlertManeuver = @"AlertManeuver"; -SDLName const SDLNameAlertText1 = @"alertText1"; -SDLName const SDLNameAlertText2 = @"alertText2"; -SDLName const SDLNameAlertText3 = @"alertText3"; -SDLName const SDLNameAlignment = @"alignment"; -SDLName const SDLNameAllowed = @"allowed"; -SDLName const SDLNameAllocatedModules = @"allocatedModules"; -SDLName const SDLNameAltitude = @"altitude"; -SDLName const SDLNameAltitudeMeters = @"altitudeMeters"; -SDLName const SDLNameAmbientLightSensorStatus = @"ambientLightSensorStatus"; -SDLName const SDLNameAmbientLightStatus = @"ambientLightStatus"; -SDLName const SDLNameAppBundleId = @"appBundleID"; -SDLName const SDLNameAppHMIType = @"appHMIType"; -SDLName const SDLNameAppId = @"appID"; -SDLName const SDLNameAppInfo = @"appInfo"; -SDLName const SDLNameAppName = @"appName"; -SDLName const SDLNameAppDisplayName = @"appDisplayName"; -SDLName const SDLNameAppVersion = @"appVersion"; -SDLName const SDLNameAudioControlCapabilities = @"audioControlCapabilities"; -SDLName const SDLNameAudioControlData = @"audioControlData"; -SDLName const SDLNameAudioPassThruCapabilities = @"audioPassThruCapabilities"; -SDLName const SDLNameAudioPassThruDisplayText1 = @"audioPassThruDisplayText1"; -SDLName const SDLNameAudioPassThruDisplayText2 = @"audioPassThruDisplayText2"; -SDLName const SDLNameAudioStreamingIndicator = @"audioStreamingIndicator"; -SDLName const SDLNameAudioStreamingState = @"audioStreamingState"; -SDLName const SDLNameAudioType = @"audioType"; -SDLName const SDLNameAuthToken = @"authToken"; -SDLName const SDLNameAutoCompleteText = @"autoCompleteText"; -SDLName const SDLNameAutoModeEnable = @"autoModeEnable"; -SDLName const SDLNameAutoModeEnableAvailable = @"autoModeEnableAvailable"; -SDLName const SDLNameAuxECallNotificationStatus = @"auxECallNotificationStatus"; -SDLName const SDLNameAvailableHDs = @"availableHDs"; -SDLName const SDLNameAvailableHDsAvailable = @"availableHDsAvailable"; -SDLName const SDLNameBackgroundColor = @"backgroundColor"; -SDLName const SDLNameBackTiltAngle = @"backTiltAngle"; -SDLName const SDLNameBackTiltAngleAvailable = @"backTiltAngleAvailable"; -SDLName const SDLNameBackVerticalPosition = @"backVerticalPosition"; -SDLName const SDLNameBackVerticalPositionAvailable = @"backVerticalPositionAvailable"; -SDLName const SDLNameBand = @"band"; -SDLName const SDLNameBatteryLevelStatus = @"battLevelStatus"; -SDLName const SDLNameBeltStatus = @"beltStatus"; -SDLName const SDLNameBitsPerSample = @"bitsPerSample"; -SDLName const SDLNameBodyInformation = @"bodyInformation"; -SDLName const SDLNameBlue = @"blue"; -SDLName const SDLNameBluetoothIconOn = @"btIconOn"; -SDLName const SDLNameBulkData = @"bulkData"; -SDLName const SDLNameButtonCapabilities = @"buttonCapabilities"; -SDLName const SDLNameButtonEventMode = @"buttonEventMode"; -SDLName const SDLNameButtonName = @"buttonName"; -SDLName const SDLNameButtonPress = @"ButtonPress"; -SDLName const SDLNameButtonPressMode = @"buttonPressMode"; -SDLName const SDLNameCoolingEnabled = @"coolingEnabled"; -SDLName const SDLNameCoolingEnabledAvailable = @"coolingEnabledAvailable"; -SDLName const SDLNameCoolingLevel = @"coolingLevel"; -SDLName const SDLNameCoolingLevelAvailable = @"coolingLevelAvailable"; -SDLName const SDLNameCoordinate = @"c"; -SDLName const SDLNameCallActive = @"callActive"; -SDLName const SDLNameCarModeStatus = @"carModeStatus"; -SDLName const SDLNameCarrier = @"carrier"; -SDLName const SDLNameChangeRegistration = @"ChangeRegistration"; -SDLName const SDLNameChannelId = @"channelId"; -SDLName const SDLNameChannelName = @"channelName"; -SDLName const SDLNameChannelSetting = @"channelSetting"; -SDLName const SDLNameCharacterSet = @"characterSet"; -SDLName const SDLNameChoiceId = @"choiceID"; -SDLName const SDLNameChoiceSet = @"choiceSet"; -SDLName const SDLNameCirculateAirEnable = @"circulateAirEnable"; -SDLName const SDLNameCirculateAirEnableAvailable = @"circulateAirEnableAvailable"; -SDLName const SDLNameClimateControlData = @"climateControlData"; -SDLName const SDLNameClimateControlCapabilities = @"climateControlCapabilities"; -SDLName const SDLNameClusterModes = @"clusterModes"; -SDLName const SDLNameClusterModeStatus = @"clusterModeStatus"; -SDLName const SDLNameColor = @"color"; -SDLName const SDLNameCommandIcon = @"cmdIcon"; -SDLName const SDLNameCommandId = @"cmdID"; -SDLName const SDLNameCompassDirection = @"compassDirection"; -SDLName const SDLNameCorrelationId = @"correlationID"; -SDLName const SDLNameCountryCode = @"countryCode"; -SDLName const SDLNameCountryName = @"countryName"; -SDLName const SDLNameCRC = @"crc"; -SDLName const SDLNameCreateInteractionChoiceSet = @"CreateInteractionChoiceSet"; -SDLName const SDLNameClockText = @"CT"; -SDLName const SDLNameCloudAppVehicleID = @"cloudAppVehicleID"; -SDLName const SDLNameCloudTransportType = @"cloudTransportType"; -SDLName const SDLNameCurrentTemperature = @"currentTemperature"; -SDLName const SDLNameCushion = @"cushion"; -SDLName const SDLNameCustomButtonId = @"customButtonID"; -SDLName const SDLNameCustomPresets = @"customPresets"; -SDLName const SDLNameData = @"data"; -SDLName const SDLNameDataResult = @"dataResult"; -SDLName const SDLNameDataType = @"dataType"; -SDLName const SDLNameDay = @"day"; -SDLName const SDLNameDayColorScheme = @"dayColorScheme"; -SDLName const SDLNameDefrostZone = @"defrostZone"; -SDLName const SDLNameDefrostZoneAvailable = @"defrostZoneAvailable"; -SDLName const SDLNameDeleteCommand = @"DeleteCommand"; -SDLName const SDLNameDeleteFile = @"DeleteFile"; -SDLName const SDLNameDeleteInteractionChoiceSet = @"DeleteInteractionChoiceSet"; -SDLName const SDLNameDeleteSubMenu = @"DeleteSubMenu"; -SDLName const SDLNameDeliveryMode = @"deliveryMode"; -SDLName const SDLNameDensity = @"density"; -SDLName const SDLNameDensityAvailable = @"densityAvailable"; -SDLName const SDLNameDesiredTemperature = @"desiredTemperature"; -SDLName const SDLNameDesiredTemperatureAvailable = @"desiredTemperatureAvailable"; -SDLName const SDLNameDeviceInfo = @"deviceInfo"; -SDLName const SDLNameDeviceStatus = @"deviceStatus"; -SDLName const SDLNameDiagnosticMessage = @"DiagnosticMessage"; -SDLName const SDLNameDialNumberEnabled = @"dialNumberEnabled"; -SDLName const SDLNameDIDLocation = @"didLocation"; -SDLName const SDLNameDIDResult = @"didResult"; -SDLName const SDLNameDimension = @"dimension"; -SDLName const SDLNameDisplayCapabilities = @"displayCapabilities"; -SDLName const SDLNameDisplayLayout = @"displayLayout"; -SDLName const SDLNameDisplayMode = @"displayMode"; -SDLName const SDLNameDisplayModeUnitAvailable = @"displayModeUnitAvailable"; -SDLName const SDLNameDisplayType = @"displayType"; -SDLName const SDLNameDistanceToEmpty = @"distanceToEmpty"; -SDLName const SDLNameDistanceToManeuver = @"distanceToManeuver"; -SDLName const SDLNameDistanceToManeuverScale = @"distanceToManeuverScale"; -SDLName const SDLNameDistanceUnitAvailable = @"distanceUnitAvailable"; -SDLName const SDLNameDistanceUnit = @"distanceUnit"; -SDLName const SDLNameDoublePressAvailable = @"doublePressAvailable"; -SDLName const SDLNameDriverAirbagDeployed = @"driverAirbagDeployed"; -SDLName const SDLNameDriverBeltDeployed = @"driverBeltDeployed"; -SDLName const SDLNameDriverBraking = @"driverBraking"; -SDLName const SDLNameDriverBuckleBelted = @"driverBuckleBelted"; -SDLName const SDLNameDriverCurtainAirbagDeployed = @"driverCurtainAirbagDeployed"; -SDLName const SDLNameDriverDistractionStatus = @"driverDistractionStatus"; -SDLName const SDLNameDriverDoorAjar = @"driverDoorAjar"; -SDLName const SDLNameDriverKneeAirbagDeployed = @"driverKneeAirbagDeployed"; -SDLName const SDLNameDriverSideAirbagDeployed = @"driverSideAirbagDeployed"; -SDLName const SDLNameDTC = @"dtc"; -SDLName const SDLNameDTCMask = @"dtcMask"; -SDLName const SDLNameDualModeEnable = @"dualModeEnable"; -SDLName const SDLNameDualModeEnableAvailable = @"dualModeEnableAvailable"; -SDLName const SDLNameDuration = @"duration"; -SDLName const SDLNameE911Override = @"e911Override"; -SDLName const SDLNameECallConfirmationStatus = @"eCallConfirmationStatus"; -SDLName const SDLNameECallEventActive = @"eCallEventActive"; -SDLName const SDLNameECallInfo = @"eCallInfo"; -SDLName const SDLNameECallNotificationStatus = @"eCallNotificationStatus"; -SDLName const SDLNameECUHeader = @"ecuHeader"; -SDLName const SDLNameECUName = @"ecuName"; -SDLName const SDLNameElectronicParkBrakeStatus = @"electronicParkBrakeStatus"; -SDLName const SDLNameEmergencyEvent = @"emergencyEvent"; -SDLName const SDLNameEmergencyEventType = @"emergencyEventType"; -SDLName const SDLNameEnabled = @"enabled"; -SDLName const SDLNameEncodedSyncPData = @"EncodedSyncPData"; -SDLName const SDLNameEndAudioPassThru = @"EndAudioPassThru"; -SDLName const SDLNameEndpoint = @"endpoint"; -SDLName const SDLNameEndTime = @"endTime"; -SDLName const SDLNameEngineOilLife = @"engineOilLife"; -SDLName const SDLNameEngineTorque = @"engineTorque"; -SDLName const SDLNameEqualizerAvailable = @"equalizerAvailable"; -SDLName const SDLNameEqualizerMaxChannelId = @"equalizerMaxChannelId"; -SDLName const SDLNameEqualizerSettings = @"equalizerSettings";; -SDLName const SDLNameETA = @"eta"; -SDLName const SDLNameEvent = @"event"; -SDLName const SDLNameExternalTemperature = @"externalTemperature"; -SDLName const SDLNameFanSpeed = @"fanSpeed"; -SDLName const SDLNameFanSpeedAvailable = @"fanSpeedAvailable"; -SDLName const SDLNameFCCFacilityId = @"fccFacilityId"; -SDLName const SDLNameFilename = @"fileName"; -SDLName const SDLNameFilenames = @"filenames"; -SDLName const SDLNameFileType = @"fileType"; -SDLName const SDLNameFirmness = @"firmness"; -SDLName const SDLNameFirmwareRevision = @"firmwareRev"; -SDLName const SDLNameFreeModules = @"freeModules"; -SDLName const SDLNameFrequencyInteger = @"frequencyInteger"; -SDLName const SDLNameFrequencyFraction = @"frequencyFraction"; -SDLName const SDLNameFrontVerticalPosition = @"frontVerticalPosition"; -SDLName const SDLNameFrontVerticalPositionAvailable = @"frontVerticalPositionAvailable"; -SDLName const SDLNameFuelCutoffStatus = @"fuelCutoffStatus"; -SDLName const SDLNameFuelLevel = @"fuelLevel"; -SDLName const SDLNameFuelLevelState = @"fuelLevel_State"; -SDLName const SDLNameFuelMaintenanceMode = @"fuelMaintenanceMode"; -SDLName const SDLNameFuelRange = @"fuelRange"; -SDLName const SDLNameFullAppID = @"fullAppID"; -SDLName const SDLNameGenericResponse = @"GenericResponse"; -SDLName const SDLNameGetDTCs = @"GetDTCs"; -SDLName const SDLNameGetCloudAppProperties = @"GetCloudAppProperties"; -SDLName const SDLNameGetInteriorVehicleData = @"GetInteriorVehicleData"; -SDLName const SDLNameGetSystemCapability = @"GetSystemCapability"; -SDLName const SDLNameGetVehicleData = @"GetVehicleData"; -SDLName const SDLNameGetWayPoints = @"GetWayPoints"; -SDLName const SDLNameGetWayPointsEnabled = @"getWayPointsEnabled"; -SDLName const SDLNameGPS = @"gps"; -SDLName const SDLNameGraphic = @"graphic"; -SDLName const SDLNameGraphicSupported = @"graphicSupported"; -SDLName const SDLNameGreen = @"green"; -SDLName const SDLNameHapticRectData = @"hapticRectData"; -SDLName const SDLNameHapticSpatialDataSupported = @"hapticSpatialDataSupported"; -SDLName const SDLNameHardware = @"hardware"; -SDLName const SDLNameHashId = @"hashID"; -SDLName const SDLNameHDChannel = @"hdChannel"; -SDLName const SDLNameHDChannelAvailable = @"hdChannelAvailable"; -SDLName const SDLNameHDOP = @"hdop"; -SDLName const SDLNameHDRadioEnable = @"hdRadioEnable"; -SDLName const SDLNameHDRadioEnableAvailable = @"hdRadioEnableAvailable"; -SDLName const SDLNameHeading = @"heading"; -SDLName const SDLNameHeadLampStatus = @"headLampStatus"; -SDLName const SDLNameHeadSupportHorizontalPosition = @"headSupportHorizontalPosition"; -SDLName const SDLNameHeadSupportHorizontalPositionAvailable = @"headSupportHorizontalPositionAvailable"; -SDLName const SDLNameHeadSupportVerticalPosition = @"headSupportVerticalPosition"; -SDLName const SDLNameHeadSupportVerticalPositionAvailable = @"headSupportVerticalPositionAvailable"; -SDLName const SDLNameHeatingLevel = @"heatingLevel"; -SDLName const SDLNameHeatingLevelAvailable = @"heatingLevelAvailable"; -SDLName const SDLNameHeatingEnabled = @"heatingEnabled"; -SDLName const SDLNameHeatingEnabledAvailable = @"heatingEnabledAvailable"; -SDLName const SDLNameHeatedSteeringWheelAvailable = @"heatedSteeringWheelAvailable"; -SDLName const SDLNameHeatedWindshieldAvailable = @"heatedWindshieldAvailable"; -SDLName const SDLNameHeatedRearWindowAvailable = @"heatedRearWindowAvailable"; -SDLName const SDLNameHeatedMirrorsAvailable = @"heatedMirrorsAvailable"; -SDLName const SDLNameHeatedSteeringWheelEnable = @"heatedSteeringWheelEnable"; -SDLName const SDLNameHeatedWindshieldEnable = @"heatedWindshieldEnable"; -SDLName const SDLNameHeatedRearWindowEnable = @"heatedRearWindowEnable"; -SDLName const SDLNameHeatedMirrorsEnable = @"heatedMirrorsEnable"; -SDLName const SDLNameHeight = @"height"; -SDLName const SDLNameHelpPrompt = @"helpPrompt"; -SDLName const SDLNameHighBeamsOn = @"highBeamsOn"; -SDLName const SDLNameHMICapabilities = @"hmiCapabilities"; -SDLName const SDLNameHmiSettingsControlData = @"hmiSettingsControlData"; -SDLName const SDLNameHMIDisplayLanguage = @"hmiDisplayLanguage"; -SDLName const SDLNameHMIDisplayLanguageDesired = @"hmiDisplayLanguageDesired"; -SDLName const SDLNameHMILevel = @"hmiLevel"; -SDLName const SDLNameHMILevelLowercase = @"hmilevel"; -SDLName const SDLNameHMIPermissions = @"hmiPermissions"; -SDLName const SDLNameHmiSettingsControlCapabilities = @"hmiSettingsControlCapabilities"; -SDLName const SDLNameHMIZoneCapabilities = @"hmiZoneCapabilities"; -SDLName const SDLNameHorizontalPosition = @"horizontalPosition"; -SDLName const SDLNameHorizontalPositionAvailable = @"horizontalPositionAvailable"; -SDLName const SDLNameHour = @"hour"; -SDLName const SDLNameHours = @"hours"; -SDLName const SDLNameHybridAppPreference = @"hybridAppPreference"; -SDLName const SDLNameIconResumed = @"iconResumed"; -SDLName const SDLNameId = @"id"; -SDLName const SDLNameIgnitionStableStatus = @"ignitionStableStatus"; -SDLName const SDLNameIgnitionStatus = @"ignitionStatus"; -SDLName const SDLNameImage = @"image"; -SDLName const SDLNameImageFields = @"imageFields"; -SDLName const SDLNameImageResolution = @"imageResolution"; -SDLName const SDLNameImageSupported = @"imageSupported"; -SDLName const SDLNameImageTemplate = @"isTemplate"; -SDLName const SDLNameImageType = @"imageType"; -SDLName const SDLNameImageTypeSupported = @"imageTypeSupported"; -SDLName const SDLNameInfo = @"info"; -SDLName const SDLNameInitialPrompt = @"initialPrompt"; -SDLName const SDLNameInitialText = @"initialText"; -SDLName const SDLNameInnerLeftRear = @"innerLeftRear"; -SDLName const SDLNameInnerRightRear = @"innerRightRear"; -SDLName const SDLNameInstantFuelConsumption = @"instantFuelConsumption"; -SDLName const SDLNameInteractionChoiceSetId = @"interactionChoiceSetID"; -SDLName const SDLNameInteractionChoiceSetIdList = @"interactionChoiceSetIDList"; -SDLName const SDLNameInteractionLayout = @"interactionLayout"; -SDLName const SDLNameInteractionMode = @"interactionMode"; -SDLName const SDLNameIsHighlighted = @"isHighlighted"; -SDLName const SDLNameIsMediaApplication = @"isMediaApplication"; -SDLName const SDLNameIsSubscribed = @"isSubscribed"; -SDLName const SDLNameKeepContext = @"keepContext"; -SDLName const SDLNameKeepContextAvailable = @"keepContextAvailable"; -SDLName const SDLNameKeyboardLayout = @"keyboardLayout"; -SDLName const SDLNameKeyboardProperties = @"keyboardProperties"; -SDLName const SDLNameKeypressMode = @"keypressMode"; -SDLName const SDLNameLabel = @"label"; -SDLName const SDLNameLanguage = @"language"; -SDLName const SDLNameLanguageDesired = @"languageDesired"; -SDLName const SDLNameLatitudeDegrees = @"latitudeDegrees"; -SDLName const SDLNameLeftFront = @"leftFront"; -SDLName const SDLNameLeftRear = @"leftRear"; -SDLName const SDLNameLeftRearInflatableBelted = @"leftRearInflatableBelted"; -SDLName const SDLNameLeftRow2BuckleBelted = @"leftRow2BuckleBelted"; -SDLName const SDLNameLeftRow3BuckleBelted = @"leftRow3BuckleBelted"; -SDLName const SDLNameLength = @"length"; -SDLName const SDLNameLightControlCapabilities = @"lightControlCapabilities"; -SDLName const SDLNameLightControlData = @"lightControlData"; -SDLName const SDLNameLightState = @"lightState"; -SDLName const SDLNameLimitedCharacterList = @"limitedCharacterList"; -SDLName const SDLNameListFiles = @"ListFiles"; -SDLName const SDLNameLocality = @"locality"; -SDLName const SDLNameLocationCoordinate = @"coordinate"; -SDLName const SDLNameLocationDescription = @"locationDescription"; -SDLName const SDLNameLocationImage = @"locationImage"; -SDLName const SDLNameLocationName = @"locationName"; -SDLName const SDLNameLocationTimeStamp = @"timeStamp"; -SDLName const SDLNameLongitudeDegrees = @"longitudeDegrees"; -SDLName const SDLNameLongPress = @"longPress"; -SDLName const SDLNameLongPressAvailable = @"longPressAvailable"; -SDLName const SDLNameLowBeamsOn = @"lowBeamsOn"; -SDLName const SDLNameMainField1 = @"mainField1"; -SDLName const SDLNameMainField2 = @"mainField2"; -SDLName const SDLNameMainField3 = @"mainField3"; -SDLName const SDLNameMainField4 = @"mainField4"; -SDLName const SDLNameMajorVersion = @"majorVersion"; -SDLName const SDLNameMake = @"make"; -SDLName const SDLNameManeuverComplete = @"maneuverComplete"; -SDLName const SDLNameManualTextEntry = @"manualTextEntry"; -SDLName const SDLNameMassageCushionFirmness = @"massageCushionFirmness"; -SDLName const SDLNameMassageCushionFirmnessAvailable = @"massageCushionFirmnessAvailable"; -SDLName const SDLNameMassageEnabled = @"massageEnabled"; -SDLName const SDLNameMassageEnabledAvailable = @"massageEnabledAvailable"; -SDLName const SDLNameMassageMode = @"massageMode"; -SDLName const SDLNameMassageModeAvailable = @"massageModeAvailable"; -SDLName const SDLNameMassageZone = @"massageZone"; -SDLName const SDLNameMaxBitrate = @"maxBitrate"; -SDLName const SDLNameMaxDuration = @"maxDuration"; -SDLName const SDLNameMaximumChangeVelocity = @"maximumChangeVelocity"; -SDLName const SDLNameMaxNumberRFCOMMPorts = @"maxNumberRFCOMMPorts"; -SDLName const SDLNameMediaClock = @"mediaClock"; -SDLName const SDLNameMediaClockFormats = @"mediaClockFormats"; -SDLName const SDLNameMediaTrack = @"mediaTrack"; -SDLName const SDLNameMemory = @"memory"; -SDLName const SDLNameMemoryAvailable = @"memoryAvailable"; -SDLName const SDLNameMenuIcon = @"menuIcon"; -SDLName const SDLNameMenuId = @"menuID"; -SDLName const SDLNameMenuName = @"menuName"; -SDLName const SDLNameMenuParams = @"menuParams"; -SDLName const SDLNameMenuTitle = @"menuTitle"; -SDLName const SDLNameMessageData = @"messageData"; -SDLName const SDLNameMessageDataResult = @"messageDataResult"; -SDLName const SDLNameMessageLength = @"messageLength"; -SDLName const SDLNameMetadataTags = @"metadataTags"; -SDLName const SDLNameMiddleRow1BeltDeployed = @"middleRow1BeltDeployed"; -SDLName const SDLNameMiddleRow1BuckleBelted = @"middleRow1BuckleBelted"; -SDLName const SDLNameMiddleRow2BuckleBelted = @"middleRow2BuckleBelted"; -SDLName const SDLNameMiddleRow3BuckleBelted = @"middleRow3BuckleBelted"; -SDLName const SDLNameMillisecond = @"millisecond"; -SDLName const SDLNameMinorVersion = @"minorVersion"; -SDLName const SDLNameMinute = @"minute"; -SDLName const SDLNameMinutes = @"minutes"; -SDLName const SDLNameModel = @"model"; -SDLName const SDLNameModelYear = @"modelYear"; -SDLName const SDLNameMonoAudioOutputMuted = @"monoAudioOutputMuted"; -SDLName const SDLNameMonth = @"month"; -SDLName const SDLNameModuleData = @"moduleData"; -SDLName const SDLNameModuleName = @"moduleName"; -SDLName const SDLNameModuleType = @"moduleType"; -SDLName const SDLNameMultipleEvents = @"multipleEvents"; -SDLName const SDLNameMultiTouchAvailable = @"multiTouchAvailable"; -SDLName const SDLNameMuteAudio = @"muteAudio"; -SDLName const SDLNameMyKey = @"myKey"; -SDLName const SDLNameName = @"name"; -SDLName const SDLNameNavigation = @"navigation"; -SDLName const SDLNameNavigationCapability = @"navigationCapability"; -SDLName const SDLNameNavigationText = @"navigationText"; -SDLName const SDLNameNavigationText1 = @"navigationText1"; -SDLName const SDLNameNavigationText2 = @"navigationText2"; -SDLName const SDLNameNextTurnIcon = @"nextTurnIcon"; -SDLName const SDLNameNGNMediaScreenAppName = @"ngnMediaScreenAppName"; -SDLName const SDLNameNicknames = @"nicknames"; -SDLName const SDLNameNightColorScheme = @"nightColorScheme"; -SDLName const SDLNameNotification = @"notification"; -SDLName const SDLNameNumber = @"number"; -SDLName const SDLNameNumberCustomPresetsAvailable = @"numCustomPresetsAvailable"; -SDLName const SDLNameNumberTicks = @"numTicks"; -SDLName const SDLNameOdometer = @"odometer"; -SDLName const SDLNameOffset = @"offset"; -SDLName const SDLNameOnAppInterfaceUnregistered = @"OnAppInterfaceUnregistered"; -SDLName const SDLNameOnAudioPassThru = @"OnAudioPassThru"; -SDLName const SDLNameOnButtonEvent = @"OnButtonEvent"; -SDLName const SDLNameOnButtonPress = @"OnButtonPress"; -SDLName const SDLNameOnCommand = @"OnCommand"; -SDLName const SDLNameOnDriverDistraction = @"OnDriverDistraction"; -SDLName const SDLNameOnEncodedSyncPData = @"OnEncodedSyncPData"; -SDLName const SDLNameOnHashChange = @"OnHashChange"; -SDLName const SDLNameOnHMIStatus = @"OnHMIStatus"; -SDLName const SDLNameOnInteriorVehicleData = @"OnInteriorVehicleData"; -SDLName const SDLNameOnKeyboardInput = @"OnKeyboardInput"; -SDLName const SDLNameOnLanguageChange = @"OnLanguageChange"; -SDLName const SDLNameOnLockScreenStatus = @"OnLockScreenStatus"; -SDLName const SDLNameOnPermissionsChange = @"OnPermissionsChange"; -SDLName const SDLNameOnRCStatus = @"OnRCStatus"; -SDLName const SDLNameOnScreenPresetsAvailable = @"onScreenPresetsAvailable"; -SDLName const SDLNameOnSyncPData = @"OnSyncPData"; -SDLName const SDLNameOnSystemRequest = @"OnSystemRequest"; -SDLName const SDLNameOnTBTClientState = @"OnTBTClientState"; -SDLName const SDLNameOnTouchEvent = @"OnTouchEvent"; -SDLName const SDLNameOnVehicleData = @"OnVehicleData"; -SDLName const SDLNameOnWayPointChange = @"OnWayPointChange"; -SDLName const SDLNameOperationName = @"name"; -SDLName const SDLNameOS = @"os"; -SDLName const SDLNameOSVersion = @"osVersion"; -SDLName const SDLNameParameterPermissions = @"parameterPermissions"; -SDLName const SDLNameParameters = @"parameters"; -SDLName const SDLNameParentId = @"parentID"; -SDLName const SDLNameParkBrakeActive = @"parkBrakeActive"; -SDLName const SDLNamePassengerAirbagDeployed = @"passengerAirbagDeployed"; -SDLName const SDLNamePassengerBeltDeployed = @"passengerBeltDeployed"; -SDLName const SDLNamePassengerBuckleBelted = @"passengerBuckleBelted"; -SDLName const SDLNamePassengerChildDetected = @"passengerChildDetected"; -SDLName const SDLNamePassengerCurtainAirbagDeployed = @"passengerCurtainAirbagDeployed"; -SDLName const SDLNamePassengerDoorAjar = @"passengerDoorAjar"; -SDLName const SDLNamePassengerKneeAirbagDeployed = @"passengerKneeAirbagDeployed"; -SDLName const SDLNamePassengerSideAirbagDeployed = @"passengerSideAirbagDeployed"; -SDLName const SDLNamePatchVersion = @"patchVersion"; -SDLName const SDLNamePCMStreamCapabilities = @"pcmStreamCapabilities"; -SDLName const SDLNamePDOP = @"pdop"; -SDLName const SDLNamePerformAudioPassThru = @"PerformAudioPassThru"; -SDLName const SDLNamePerformInteraction = @"PerformInteraction"; -SDLName const SDLNamePermissionItem = @"permissionItem"; -SDLName const SDLNamePersistentFile = @"persistentFile"; -SDLName const SDLNamePhoneCall = @"phoneCall"; -SDLName const SDLNamePhoneCapability = @"phoneCapability"; -SDLName const SDLNamePhoneNumber = @"phoneNumber"; -SDLName const SDLNamePhoneRoaming = @"phoneRoaming"; -SDLName const SDLNamePrimaryColor = @"primaryColor"; -SDLName const SDLNameProgramIdentification = @"PI"; -SDLName const SDLNamePlayTone = @"playTone"; -SDLName const SDLNamePosition = @"position"; -SDLName const SDLNamePostalCode = @"postalCode"; -SDLName const SDLNamePowerModeActive = @"powerModeActive"; -SDLName const SDLNamePowerModeQualificationStatus = @"powerModeQualificationStatus"; -SDLName const SDLNamePowerModeStatus = @"powerModeStatus"; -SDLName const SDLNamePreferredResolution = @"preferredResolution"; -SDLName const SDLNamePrerecordedSpeech = @"prerecordedSpeech"; -SDLName const SDLNamePresetBankCapabilities = @"presetBankCapabilities"; -SDLName const SDLNamePressAvailable = @"pressAvailable"; -SDLName const SDLNamePressure = @"pressure"; -SDLName const SDLNamePressureTelltale = @"pressureTelltale"; -SDLName const SDLNamePrimaryAudioSource = @"primaryAudioSource"; -SDLName const SDLNamePRNDL = @"prndl"; -SDLName const SDLNameProgressIndicator = @"progressIndicator"; -SDLName const SDLNameProperties = @"properties"; -SDLName const SDLNameProgramService = @"PS"; -SDLName const SDLNameProgramType = @"PTY"; -SDLName const SDLNamePutFile = @"PutFile"; -SDLName const SDLNameRadioBandAvailable = @"radioBandAvailable"; -SDLName const SDLNameRadioControlCapabilities = @"radioControlCapabilities"; -SDLName const SDLNameRadioFrequencyAvailable = @"radioFrequencyAvailable"; -SDLName const SDLNameRadioControlData = @"radioControlData"; -SDLName const SDLNameRadioEnable = @"radioEnable"; -SDLName const SDLNameRadioEnableAvailable = @"radioEnableAvailable"; -SDLName const SDLNameRange = @"range"; -SDLName const SDLNameRDSData = @"rdsData"; -SDLName const SDLNameRDSDataAvailable = @"rdsDataAvailable"; -SDLName const SDLNameReadDID = @"ReadDID"; -SDLName const SDLNameRearLeftDoorAjar = @"rearLeftDoorAjar"; -SDLName const SDLNameRearRightDoorAjar = @"rearRightDoorAjar"; -SDLName const SDLNameReason = @"reason"; -SDLName const SDLNameRed = @"red"; -SDLName const SDLNameRect = @"rect"; -SDLName const SDLNameRegion = @"REG"; -SDLName const SDLNameRegisterAppInterface = @"RegisterAppInterface"; -SDLName const SDLNameRemoteControlCapability = @"remoteControlCapability"; -SDLName const SDLNameRequest = @"request"; -SDLName const SDLNameRequestSubType = @"requestSubType"; -SDLName const SDLNameRequestType = @"requestType"; -SDLName const SDLNameReserved = @"reserved"; -SDLName const SDLNameResetGlobalProperties = @"ResetGlobalProperties"; -SDLName const SDLNameSecondaryColor = @"secondaryColor"; -SDLName const SDLNameSetInteriorVehicleData = @"SetInteriorVehicleData"; -SDLName const SDLNameResolution = @"resolution"; -SDLName const SDLNameResolutionHeight = @"resolutionHeight"; -SDLName const SDLNameResolutionWidth = @"resolutionWidth"; -SDLName const SDLNameResponse = @"response"; -SDLName const SDLNameResult = @"result"; -SDLName const SDLNameResultCode = @"resultCode"; -SDLName const SDLNameRightFront = @"rightFront"; -SDLName const SDLNameRightRear = @"rightRear"; -SDLName const SDLNameRightRearInflatableBelted = @"rightRearInflatableBelted"; -SDLName const SDLNameRightRow2BuckleBelted = @"rightRow2BuckleBelted"; -SDLName const SDLNameRightRow3BuckleBelted = @"rightRow3BuckleBelted"; -SDLName const SDLNameRolloverEvent = @"rolloverEvent"; -SDLName const SDLNameRows = @"rows"; -SDLName const SDLNameRPCName = @"rpcName"; -SDLName const SDLNameRPM = @"rpm"; -SDLName const SDLNameRadioText = @"RT"; -SDLName const SDLNameSamplingRate = @"samplingRate"; -SDLName const SDLNameSatellites = @"satellites"; -SDLName const SDLNameScreenParams = @"screenParams"; -SDLName const SDLNameScrollableMessage = @"ScrollableMessage"; -SDLName const SDLNameScrollableMessageBody = @"scrollableMessageBody"; -SDLName const SDLNameSDLVersion = @"sdlVersion"; -SDLName const SDLNameSearchAddress = @"searchAddress"; -SDLName const SDLNameSeatControlData = @"seatControlData"; -SDLName const SDLNameSeatControlCapabilities = @"seatControlCapabilities"; -SDLName const SDLNameSecondaryGraphic = @"secondaryGraphic"; -SDLName const SDLNameSecondaryImage = @"secondaryImage"; -SDLName const SDLNameSecondaryText = @"secondaryText"; -SDLName const SDLNameSecond = @"second"; -SDLName const SDLNameSeconds = @"seconds"; -SDLName const SDLNameSendHapticData = @"SendHapticData"; -SDLName const SDLNameSendHapticDataResponse = @"SendHapticDataResponse"; -SDLName const SDLNameSendLocation = @"SendLocation"; -SDLName const SDLNameSendLocationEnabled = @"sendLocationEnabled"; -SDLName const SDLNameSetAppIcon = @"SetAppIcon"; -SDLName const SDLNameSetCloudAppProperties = @"SetCloudAppProperties"; -SDLName const SDLNameSetDisplayLayout = @"SetDisplayLayout"; -SDLName const SDLNameDisplayName = @"displayName"; -SDLName const SDLNameSetGlobalProperties = @"SetGlobalProperties"; -SDLName const SDLNameSetMediaClockTimer = @"SetMediaClockTimer"; -SDLName const SDLNameShortPress = @"shortPress"; -SDLName const SDLNameShortPressAvailable = @"shortPressAvailable"; -SDLName const SDLNameShow = @"Show"; -SDLName const SDLNameShowConstantTBT = @"ShowConstantTBT"; -SDLName const SDLNameSignalLevelStatus = @"signalLevelStatus"; -SDLName const SDLNameSignalChangeThreshold = @"signalChangeThreshold"; -SDLName const SDLNameSignalChangeThresholdAvailable = @"signalChangeThresholdAvailable"; -SDLName const SDLNameSignalStrength = @"signalStrength"; -SDLName const SDLNameSignalStrengthAvailable = @"signalStrengthAvailable"; -SDLName const SDLNameSiriusXMRadioAvailable = @"siriusxmRadioAvailable"; -SDLName const SDLNameSISData = @"sisData"; -SDLName const SDLNameSISDataAvailable = @"sisDataAvailable"; -SDLName const SDLNameSlider = @"Slider"; -SDLName const SDLNameSliderFooter = @"sliderFooter"; -SDLName const SDLNameSliderHeader = @"sliderHeader"; -SDLName const SDLNameSliderPosition = @"sliderPosition"; -SDLName const SDLNameSoftButtonCapabilities = @"softButtonCapabilities"; -SDLName const SDLNameSoftButtonId = @"softButtonID"; -SDLName const SDLNameSoftButtons = @"softButtons"; -SDLName const SDLNameSource = @"source"; -SDLName const SDLNameSourceAvailable = @"sourceAvailable"; -SDLName const SDLNameSpaceAvailable = @"spaceAvailable"; -SDLName const SDLNameSpeak = @"Speak"; -SDLName const SDLNameSpeechCapabilities = @"speechCapabilities"; -SDLName const SDLNameSpeed = @"speed"; -SDLName const SDLNameRGBColorSpaceAvailable = @"rgbColorSpaceAvailable"; -SDLName const SDLNameStartTime = @"startTime"; -SDLName const SDLNameState = @"state"; -SDLName const SDLNameStateAvailable = @"stateAvailable"; -SDLName const SDLNameStateOfCharge = @"stateOfCharge"; -SDLName const SDLNameStationIDNumber = @"stationIDNumber"; -SDLName const SDLNameStationLongName = @"stationLongName"; -SDLName const SDLNameStationLocation = @"stationLocation"; -SDLName const SDLNameStationMessage = @"stationMessage"; -SDLName const SDLNameStationShortName = @"stationShortName"; -SDLName const SDLNameStatus = @"status"; -SDLName const SDLNameStatusAvailable = @"statusAvailable"; -SDLName const SDLNameStatusBar = @"statusBar"; -SDLName const SDLNameSteeringWheelAngle = @"steeringWheelAngle"; -SDLName const SDLNameStereoAudioOutputMuted = @"stereoAudioOutputMuted"; -SDLName const SDLNameSubAdministrativeArea = @"subAdministrativeArea"; -SDLName const SDLNameSubLocality = @"subLocality"; -SDLName const SDLNameSubscribe = @"subscribe"; -SDLName const SDLNameSubscribeButton = @"SubscribeButton"; -SDLName const SDLNameSubscribeVehicleData = @"SubscribeVehicleData"; -SDLName const SDLNameSubscribeWayPoints = @"SubscribeWayPoints"; -SDLName const SDLNameSubThoroughfare = @"subThoroughfare"; -SDLName const SDLNameSuccess = @"success"; -SDLName const SDLNameSupportedDiagnosticModes = @"supportedDiagModes"; -SDLName const SDLNameSupportedFormats = @"supportedFormats"; -SDLName const SDLNameSupportedLights = @"supportedLights"; -SDLName const SDLNameSyncFileName = @"syncFileName"; -SDLName const SDLNameSyncMessageVersion = @"syncMsgVersion"; -SDLName const SDLNameSyncPData = @"SyncPData"; -SDLName const SDLNameSystemAction = @"systemAction"; -SDLName const SDLNameSystemCapability = @"systemCapability"; -SDLName const SDLNameSystemCapabilityType = @"systemCapabilityType"; -SDLName const SDLNameSystemContext = @"systemContext"; -SDLName const SDLNameSystemFile = @"systemFile"; -SDLName const SDLNameSystemRequest = @"SystemRequest"; -SDLName const SDLNameSystemSoftwareVersion = @"systemSoftwareVersion"; -SDLName const SDLNameDialNumber = @"DialNumber"; -SDLName const SDLNameTrafficAnnouncementIdentification = @"TA"; -SDLName const SDLNameTargetId = @"targetID"; -SDLName const SDLNameTemperatureUnit = @"temperatureUnit"; -SDLName const SDLNameTemperatureUnitAvailable = @"temperatureUnitAvailable"; -SDLName const SDLNameTemplatesAvailable = @"templatesAvailable"; -SDLName const SDLNameTertiaryText = @"tertiaryText"; -SDLName const SDLNameText = @"text"; -SDLName const SDLNameTextFields = @"textFields"; -SDLName const SDLNameTextMessageAvailable = @"textMsgAvailable"; -SDLName const SDLNameThoroughfare = @"thoroughfare"; -SDLName const SDLNameTimeout = @"timeout"; -SDLName const SDLNameTimeoutCapitalized = @"Timeout"; -SDLName const SDLNameTimeoutPrompt = @"timeoutPrompt"; -SDLName const SDLNameTimeToDestination = @"timeToDestination"; -SDLName const SDLNameTimezoneHourOffset = @"tz_hour"; -SDLName const SDLNameTimezoneMinuteOffset = @"tz_minute"; -SDLName const SDLNameTirePressure = @"tirePressure"; -SDLName const SDLNameTotalDistance = @"totalDistance"; -SDLName const SDLNameTouchEventAvailable = @"touchEventAvailable"; -SDLName const SDLNameTPMS = @"tpms"; -SDLName const SDLNameTrafficProgramIdentification = @"TP"; -SDLName const SDLNameTriggerSource = @"triggerSource"; -SDLName const SDLNameTrim = @"trim"; -SDLName const SDLNameTryAgainTime = @"tryAgainTime"; -SDLName const SDLNameTimestamp = @"ts"; -SDLName const SDLNameTTSChunks = @"ttsChunks"; -SDLName const SDLNameTTSName = @"ttsName"; -SDLName const SDLNameTurnIcon = @"turnIcon"; -SDLName const SDLNameTurnList = @"turnList"; -SDLName const SDLNameTurnSignal = @"turnSignal"; -SDLName const SDLNameType = @"type"; -SDLName const SDLNameUnit = @"unit"; -SDLName const SDLNameUnregisterAppInterface = @"UnregisterAppInterface"; -SDLName const SDLNameUnsubscribe = @"Unsubscribe"; -SDLName const SDLNameUnsubscribeButton = @"UnsubscribeButton"; -SDLName const SDLNameUnsubscribeVehicleData = @"UnsubscribeVehicleData"; -SDLName const SDLNameUnsubscribeWayPoints = @"UnsubscribeWayPoints"; -SDLName const SDLNameUpdateMode = @"updateMode"; -SDLName const SDLNameUpdateTurnList = @"UpdateTurnList"; -SDLName const SDLNameUpDownAvailable = @"upDownAvailable"; -SDLName const SDLNameURL = @"url"; -SDLName const SDLNameURLUppercase = @"URL"; -SDLName const SDLNameUserDisallowed = @"userDisallowed"; -SDLName const SDLNameUserSelected = @"userSelected"; -SDLName const SDLNameUTCDay = @"utcDay"; -SDLName const SDLNameUTCHours = @"utcHours"; -SDLName const SDLNameUTCMinutes = @"utcMinutes"; -SDLName const SDLNameUTCMonth = @"utcMonth"; -SDLName const SDLNameUTCSeconds = @"utcSeconds"; -SDLName const SDLNameUTCYear = @"utcYear"; -SDLName const SDLNameValue = @"value"; -SDLName const SDLNameVDOP = @"vdop"; -SDLName const SDLNameVehicleType = @"vehicleType"; -SDLName const SDLNameVerticalPosition = @"verticalPosition"; -SDLName const SDLNameVerticalPositionAvailable = @"verticalPositionAvailable"; -SDLName const SDLNameVideoCodec = @"codec"; -SDLName const SDLNameVideoProtocol = @"protocol"; -SDLName const SDLNameVideoStreaming = @"videoStreaming"; -SDLName const SDLNameVideoStreamingCapability = @"videoStreamingCapability"; -SDLName const SDLNameVideoStreamingState = @"videoStreamingState"; -SDLName const SDLNameVentilationMode = @"ventilationMode"; -SDLName const SDLNameVentilationModeAvailable = @"ventilationModeAvailable"; -SDLName const SDLNameVIN = @"vin"; -SDLName const SDLNameVoiceRecognitionOn = @"voiceRecOn"; -SDLName const SDLNameVolume = @"volume"; -SDLName const SDLNameVolumeAvailable = @"volumeAvailable"; -SDLName const SDLNameVRCapabilities = @"vrCapabilities"; -SDLName const SDLNameVRCommands = @"vrCommands"; -SDLName const SDLNameVRHelp = @"vrHelp"; -SDLName const SDLNameVRHelpTitle = @"vrHelpTitle"; -SDLName const SDLNameVRSynonyms = @"vrSynonyms"; -SDLName const SDLNameWayPoints = @"wayPoints"; -SDLName const SDLNameWayPointType = @"wayPointType"; -SDLName const SDLNameWidth = @"width"; -SDLName const SDLNameWiperStatus = @"wiperStatus"; -SDLName const SDLNameX = @"x"; -SDLName const SDLNameY = @"y"; -SDLName const SDLNameYear = @"year"; - -NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLNavigationAction.h b/SmartDeviceLink/SDLNavigationAction.h new file mode 100644 index 000000000..922ab404b --- /dev/null +++ b/SmartDeviceLink/SDLNavigationAction.h @@ -0,0 +1,49 @@ +// +// SDLNavigationAction.h +// SmartDeviceLink +// +// Created by Nicole on 2/22/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import "SDLEnum.h" + +/* + * A navigation action. + */ +typedef SDLEnum SDLNavigationAction SDL_SWIFT_ENUM; + +/* + * Using this action plus a supplied direction can give the type of turn. + */ +extern SDLNavigationAction const SDLNavigationActionTurn; + +/* + * A navigation action of exit. + */ +extern SDLNavigationAction const SDLNavigationActionExit; + +/* + * A navigation action of stay. + */ +extern SDLNavigationAction const SDLNavigationActionStay; + +/* + * A navigation action of merge. + */ +extern SDLNavigationAction const SDLNavigationActionMerge; + +/* + * A navigation action of ferry. + */ +extern SDLNavigationAction const SDLNavigationActionFerry; + +/* + * A navigation action of car shuttle train. + */ +extern SDLNavigationAction const SDLNavigationActionCarShuttleTrain; + +/* + * A navigation action of waypoint. + */ +extern SDLNavigationAction const SDLNavigationActionWaypoint; diff --git a/SmartDeviceLink/SDLNavigationAction.m b/SmartDeviceLink/SDLNavigationAction.m new file mode 100644 index 000000000..938acea68 --- /dev/null +++ b/SmartDeviceLink/SDLNavigationAction.m @@ -0,0 +1,17 @@ +// +// SDLNavigationAction.m +// SmartDeviceLink +// +// Created by Nicole on 2/22/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import "SDLNavigationAction.h" + +SDLNavigationAction const SDLNavigationActionTurn = @"TURN"; +SDLNavigationAction const SDLNavigationActionExit = @"EXIT"; +SDLNavigationAction const SDLNavigationActionStay = @"STAY"; +SDLNavigationAction const SDLNavigationActionMerge = @"MERGE"; +SDLNavigationAction const SDLNavigationActionFerry = @"FERRY"; +SDLNavigationAction const SDLNavigationActionCarShuttleTrain = @"CAR_SHUTTLE_TRAIN"; +SDLNavigationAction const SDLNavigationActionWaypoint = @"WAYPOINT"; diff --git a/SmartDeviceLink/SDLNavigationCapability.m b/SmartDeviceLink/SDLNavigationCapability.m index ffacc2d52..11ef43f6f 100644 --- a/SmartDeviceLink/SDLNavigationCapability.m +++ b/SmartDeviceLink/SDLNavigationCapability.m @@ -9,7 +9,7 @@ #import "SDLNavigationCapability.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" NS_ASSUME_NONNULL_BEGIN @@ -28,19 +28,19 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setSendLocationEnabled:(nullable NSNumber *)sendLocationEnabled { - [store sdl_setObject:sendLocationEnabled forName:SDLNameSendLocationEnabled]; + [store sdl_setObject:sendLocationEnabled forName:SDLRPCParameterNameSendLocationEnabled]; } - (nullable NSNumber *)sendLocationEnabled { - return [store sdl_objectForName:SDLNameSendLocationEnabled]; + return [store sdl_objectForName:SDLRPCParameterNameSendLocationEnabled]; } - (void)setGetWayPointsEnabled:(nullable NSNumber *)getWayPointsEnabled { - [store sdl_setObject:getWayPointsEnabled forName:SDLNameGetWayPointsEnabled]; + [store sdl_setObject:getWayPointsEnabled forName:SDLRPCParameterNameGetWayPointsEnabled]; } - (nullable NSNumber *)getWayPointsEnabled { - return [store sdl_objectForName:SDLNameGetWayPointsEnabled]; + return [store sdl_objectForName:SDLRPCParameterNameGetWayPointsEnabled]; } @end diff --git a/SmartDeviceLink/SDLNavigationInstruction.h b/SmartDeviceLink/SDLNavigationInstruction.h new file mode 100644 index 000000000..ee9241895 --- /dev/null +++ b/SmartDeviceLink/SDLNavigationInstruction.h @@ -0,0 +1,109 @@ +// +// SDLNavigationInstruction.h +// SmartDeviceLink +// +// Created by Nicole on 2/22/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import "SDLRPCMessage.h" + +#import "SDLDirection.h" +#import "SDLNavigationAction.h" +#import "SDLNavigationJunction.h" + +@class SDLDateTime; +@class SDLImage; +@class SDLLocationDetails; + + +NS_ASSUME_NONNULL_BEGIN + +/* + * A navigation instruction. + */ +@interface SDLNavigationInstruction : SDLRPCStruct + +/** + * Convenience init for required parameters + * + * @param locationDetails The location details + * @param action The navigation action + * @return A SDLNavigationInstruction object + */ +- (instancetype)initWithLocationDetails:(SDLLocationDetails *)locationDetails action:(SDLNavigationAction)action NS_DESIGNATED_INITIALIZER; + +/** + * Convenience init for all parameters. + * + * @param locationDetails The location details + * @param action The navigation action + * @param eta The estimated time of arrival + * @param bearing The angle at which this instruction takes place + * @param junctionType The navigation junction type + * @param drivingSide Used to infer which side of the road this instruction takes place + * @param details This is a string representation of this instruction, used to display instructions to the users + * @param image An image representation of this instruction + * @return A SDLNavigationInstruction object + */ +- (instancetype)initWithLocationDetails:(SDLLocationDetails *)locationDetails action:(SDLNavigationAction)action eta:(nullable SDLDateTime *)eta bearing:(UInt16)bearing junctionType:(nullable SDLNavigationJunction)junctionType drivingSide:(nullable SDLDirection)drivingSide details:(nullable NSString *)details image:(nullable SDLImage *)image; + +/** + * The location details. + * + * SDLLocationDetails, Required + */ +@property (strong, nonatomic) SDLLocationDetails *locationDetails; + +/** + * The navigation action. + * + * SDLNavigationAction, Required + */ +@property (strong, nonatomic) SDLNavigationAction action; + +/** + * The estimated time of arrival. + * + * SDLDateTime, Optional + */ +@property (nullable, strong, nonatomic) SDLDateTime *eta; + +/** + * The angle at which this instruction takes place. For example, 0 would mean straight, <=45 is bearing right, >= 135 is sharp right, between 45 and 135 is a regular right, and 180 is a U-Turn, etc. + * + * Integer, Optional, minValue="0" maxValue="359" + */ +@property (nullable, strong, nonatomic) NSNumber<SDLInt> *bearing; + +/** + * The navigation junction type. + * + * SDLNavigationJunction, Optional + */ +@property (nullable, strong, nonatomic) SDLNavigationJunction junctionType; + +/** + * Used to infer which side of the road this instruction takes place. For a U-Turn (Action=Turn, direction=180) this will determine which direction the turn should take place. + * + * SDLDirection, Optional + */ +@property (nullable, strong, nonatomic) SDLDirection drivingSide; + +/** + * This is a string representation of this instruction, used to display instructions to the users. This is not intended to be read aloud to the users, see the param prompt in `NavigationServiceData` for that. + * + * String, Optional + */ +@property (nullable, strong, nonatomic) NSString *details; + +/** + * An image representation of this instruction. + * + * SDLImage, Optional + */ +@property (nullable, strong, nonatomic) SDLImage *image; + +@end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLNavigationInstruction.m b/SmartDeviceLink/SDLNavigationInstruction.m new file mode 100644 index 000000000..791974c23 --- /dev/null +++ b/SmartDeviceLink/SDLNavigationInstruction.m @@ -0,0 +1,116 @@ +// +// SDLNavigationInstruction.m +// SmartDeviceLink +// +// Created by Nicole on 2/22/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import "SDLNavigationInstruction.h" + +#import "NSMutableDictionary+Store.h" +#import "SDLDateTime.h" +#import "SDLImage.h" +#import "SDLLocationDetails.h" +#import "SDLRPCParameterNames.h" + + +NS_ASSUME_NONNULL_BEGIN + +@implementation SDLNavigationInstruction + +- (instancetype)initWithLocationDetails:(SDLLocationDetails *)locationDetails action:(SDLNavigationAction)action { + self = [super init]; + if (!self) { + return nil; + } + + self.locationDetails = locationDetails; + self.action = action; + + return self; +} + +- (instancetype)initWithLocationDetails:(SDLLocationDetails *)locationDetails action:(SDLNavigationAction)action eta:(nullable SDLDateTime *)eta bearing:(UInt16)bearing junctionType:(nullable SDLNavigationJunction)junctionType drivingSide:(nullable SDLDirection)drivingSide details:(nullable NSString *)details image:(nullable SDLImage *)image { + self = [self initWithLocationDetails:locationDetails action:action]; + if (!self) { + return nil; + } + + self.eta = eta; + self.bearing = @(bearing); + self.junctionType = junctionType; + self.drivingSide = drivingSide; + self.details = details; + self.image = image; + + return self; +} + +- (void)setLocationDetails:(SDLLocationDetails *)locationDetails { + [store sdl_setObject:locationDetails forName:SDLRPCParameterNameLocationDetails]; +} + +- (SDLLocationDetails *)locationDetails { + return [store sdl_objectForName:SDLRPCParameterNameLocationDetails ofClass:SDLLocationDetails.class]; +} + +- (void)setAction:(SDLNavigationAction)action { + [store sdl_setObject:action forName:SDLRPCParameterNameAction]; +} + +- (SDLNavigationAction)action { + return [store sdl_objectForName:SDLRPCParameterNameAction]; +} + +- (void)setEta:(nullable SDLDateTime *)eta { + [store sdl_setObject:eta forName:SDLRPCParameterNameETA]; +} + +- (nullable SDLDateTime *)eta { + return [store sdl_objectForName:SDLRPCParameterNameETA ofClass:SDLDateTime.class]; +} + +- (void)setBearing:(nullable NSNumber<SDLInt> *)bearing { + [store sdl_setObject:bearing forName:SDLRPCParameterNameBearing]; +} + +- (nullable NSNumber<SDLInt> *)bearing { + return [store sdl_objectForName:SDLRPCParameterNameBearing]; +} + +- (void)setJunctionType:(nullable SDLNavigationJunction)junctionType { + [store sdl_setObject:junctionType forName:SDLRPCParameterNameJunctionType]; +} + +- (nullable SDLNavigationJunction)junctionType { + return [store sdl_objectForName:SDLRPCParameterNameJunctionType]; +} + +- (void)setDrivingSide:(nullable SDLDirection)drivingSide { + [store sdl_setObject:drivingSide forName:SDLRPCParameterNameDrivingSide]; +} + +- (nullable SDLDirection)drivingSide { + return [store sdl_objectForName:SDLRPCParameterNameDrivingSide]; +} + +- (void)setDetails:(nullable NSString *)details { + [store sdl_setObject:details forName:SDLRPCParameterNameDetails]; +} + +- (nullable NSString *)details { + return [store sdl_objectForName:SDLRPCParameterNameDetails]; +} + +- (void)setImage:(nullable SDLImage *)image { + [store sdl_setObject:image forName:SDLRPCParameterNameImage]; +} + +- (nullable SDLImage *)image { + return [store sdl_objectForName:SDLRPCParameterNameImage ofClass:SDLImage.class]; +} + +@end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLNavigationJunction.h b/SmartDeviceLink/SDLNavigationJunction.h new file mode 100644 index 000000000..b542eeff9 --- /dev/null +++ b/SmartDeviceLink/SDLNavigationJunction.h @@ -0,0 +1,54 @@ +// +// SDLNavigationJunction.h +// SmartDeviceLink +// +// Created by Nicole on 2/22/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import "SDLEnum.h" + +/* + * A navigation junction type. + */ +typedef SDLEnum SDLNavigationJunction SDL_SWIFT_ENUM; + +/* + * A junction that represents a standard intersection with a single road crossing another. + */ +extern SDLNavigationJunction const SDLNavigationJunctionRegular; + +/* + * A junction where the road splits off into two paths; a fork in the road. + */ +extern SDLNavigationJunction const SDLNavigationJunctionBifurcation; + +/* + * A junction that has multiple intersections and paths. + */ +extern SDLNavigationJunction const SDLNavigationJunctionMultiCarriageway; + +/* + * A junction where traffic moves in a single direction around a central, non-traversable point to reach one of the connecting roads. + */ +extern SDLNavigationJunction const SDLNavigationJunctionRoundabout; + +/* + * Similar to a roundabout, however the center of the roundabout is fully traversable. Also known as a mini-roundabout. + */ +extern SDLNavigationJunction const SDLNavigationJunctionTraversableRoundabout; + +/* + * A junction where lefts diverge to the right, then curve to the left, converting a left turn to a crossing maneuver. + */ +extern SDLNavigationJunction const SDLNavigationJunctionJughandle; + +/* + * Multiple way intersection that allows traffic to flow based on priority; most commonly right of way and first in, first out. + */ +extern SDLNavigationJunction const SDLNavigationJunctionAllWayYield; + +/* + * A junction designated for traffic turn arounds. + */ +extern SDLNavigationJunction const SDLNavigationJunctionTurnAround; diff --git a/SmartDeviceLink/SDLNavigationJunction.m b/SmartDeviceLink/SDLNavigationJunction.m new file mode 100644 index 000000000..3c5b81c15 --- /dev/null +++ b/SmartDeviceLink/SDLNavigationJunction.m @@ -0,0 +1,19 @@ +// +// SDLNavigationJunction.m +// SmartDeviceLink +// +// Created by Nicole on 2/22/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import "SDLNavigationJunction.h" + +SDLNavigationJunction const SDLNavigationJunctionRegular = @"REGULAR"; +SDLNavigationJunction const SDLNavigationJunctionBifurcation = @"BIFURCATION"; +SDLNavigationJunction const SDLNavigationJunctionMultiCarriageway = @"MULTI_CARRIAGEWAY"; +SDLNavigationJunction const SDLNavigationJunctionRoundabout = @"ROUNDABOUT"; +SDLNavigationJunction const SDLNavigationJunctionTraversableRoundabout = @"TRAVERSABLE_ROUNDABOUT"; +SDLNavigationJunction const SDLNavigationJunctionJughandle = @"JUGHANDLE"; +SDLNavigationJunction const SDLNavigationJunctionAllWayYield = @"ALL_WAY_YIELD"; +SDLNavigationJunction const SDLNavigationJunctionTurnAround = @"TURN_AROUND"; + diff --git a/SmartDeviceLink/SDLNavigationServiceData.h b/SmartDeviceLink/SDLNavigationServiceData.h new file mode 100644 index 000000000..2cef87dd7 --- /dev/null +++ b/SmartDeviceLink/SDLNavigationServiceData.h @@ -0,0 +1,111 @@ +// +// SDLNavigationServiceData.h +// SmartDeviceLink +// +// Created by Nicole on 2/22/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import "SDLRPCMessage.h" + +@class SDLDateTime; +@class SDLLocationDetails; +@class SDLNavigationInstruction; + +NS_ASSUME_NONNULL_BEGIN + +/* + * This data is related to what a navigation service would provide. + */ +@interface SDLNavigationServiceData : SDLRPCStruct + +/** + * Convenience init for required parameters. + * + * @param timestamp Timestamp of when the data was generated + * @return A SDLNavigationServiceData object + */ +- (instancetype)initWithTimestamp:(SDLDateTime *)timestamp NS_DESIGNATED_INITIALIZER; + +/** + * Convenience init for all parameters. + * + * @param timestamp Timestamp of when the data was generated + * @param origin The start location + * @param destination The final destination location + * @param destinationETA The estimated time of arrival at the final destination location + * @param instructions Array ordered with all remaining instructions + * @param nextInstructionETA The estimated time of arrival at the next destination + * @param nextInstructionDistance The distance to this instruction from current location + * @param nextInstructionDistanceScale Distance till next maneuver (starting from) from previous maneuver + * @param prompt This is a prompt message that should be conveyed to the user through either display or voice (TTS) + * @return A SDLNavigationServiceData object + */ +- (instancetype)initWithTimestamp:(SDLDateTime *)timestamp origin:(nullable SDLLocationDetails *)origin destination:(nullable SDLLocationDetails *)destination destinationETA:(nullable SDLDateTime *)destinationETA instructions:(nullable NSArray<SDLNavigationInstruction *> *)instructions nextInstructionETA:(nullable SDLDateTime *)nextInstructionETA nextInstructionDistance:(float)nextInstructionDistance nextInstructionDistanceScale:(float)nextInstructionDistanceScale prompt:(nullable NSString *)prompt; + +/** + * This is the timestamp of when the data was generated. This is to ensure any time or distance given in the data can accurately be adjusted if necessary. + * + * SDLDateTime, Required + */ +@property (strong, nonatomic) SDLDateTime *timestamp; + +/** + * The start location. + * + * SDLLocationDetails, Optional + */ +@property (nullable, strong, nonatomic) SDLLocationDetails *origin; + +/** + * The final destination location. + * + * SDLLocationDetails, Optional + */ +@property (nullable, strong, nonatomic) SDLLocationDetails *destination; + +/** + * The estimated time of arrival at the final destination location. + * + * SDLDateTime, Optional + */ +@property (nullable, strong, nonatomic) SDLDateTime *destinationETA; + +/** + * This array should be ordered with all remaining instructions. The start of this array should always contain the next instruction. + * + * Array of SDLNavigationInstruction, Optional + */ +@property (nullable, strong, nonatomic) NSArray<SDLNavigationInstruction *> *instructions; + +/** + * The estimated time of arrival at the next destination. + * + * SDLDateTime, Optional + */ +@property (nullable, strong, nonatomic) SDLDateTime *nextInstructionETA; + +/** + * The distance to this instruction from current location. This should only be updated ever .1 unit of distance. For more accuracy the consumer can use the GPS location of itself and the next instruction. + * + * Float, Optional + */ +@property (nullable, strong, nonatomic) NSNumber<SDLFloat> *nextInstructionDistance; + +/** + * Distance till next maneuver (starting from) from previous maneuver. + * + * Float, Optional + */ +@property (nullable, strong, nonatomic) NSNumber<SDLFloat> *nextInstructionDistanceScale; + +/** + * This is a prompt message that should be conveyed to the user through either display or voice (TTS). This param will change often as it should represent the following: approaching instruction, post instruction, alerts that affect the current navigation session, etc. + * + * String, Optional + */ +@property (nullable, strong, nonatomic) NSString *prompt; + +@end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLNavigationServiceData.m b/SmartDeviceLink/SDLNavigationServiceData.m new file mode 100644 index 000000000..1238e6b28 --- /dev/null +++ b/SmartDeviceLink/SDLNavigationServiceData.m @@ -0,0 +1,124 @@ +// +// SDLNavigationServiceData.m +// SmartDeviceLink +// +// Created by Nicole on 2/22/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import "SDLNavigationServiceData.h" + +#import "NSMutableDictionary+Store.h" +#import "SDLDateTime.h" +#import "SDLLocationDetails.h" +#import "SDLRPCParameterNames.h" +#import "SDLNavigationInstruction.h" + +NS_ASSUME_NONNULL_BEGIN + +@implementation SDLNavigationServiceData + +- (instancetype)initWithTimestamp:(SDLDateTime *)timestamp { + self = [super init]; + if (!self) { + return nil; + } + + self.timestamp = timestamp; + + return self; +} + +- (instancetype)initWithTimestamp:(SDLDateTime *)timestamp origin:(nullable SDLLocationDetails *)origin destination:(nullable SDLLocationDetails *)destination destinationETA:(nullable SDLDateTime *)destinationETA instructions:(nullable NSArray<SDLNavigationInstruction *> *)instructions nextInstructionETA:(nullable SDLDateTime *)nextInstructionETA nextInstructionDistance:(float)nextInstructionDistance nextInstructionDistanceScale:(float)nextInstructionDistanceScale prompt:(nullable NSString *)prompt { + self = [self initWithTimestamp:timestamp]; + if (!self) { + return nil; + } + + self.origin = origin; + self.destination = destination; + self.destinationETA = destinationETA; + self.instructions = instructions; + self.nextInstructionETA = nextInstructionETA; + self.nextInstructionDistance = @(nextInstructionDistance); + self.nextInstructionDistanceScale = @(nextInstructionDistanceScale); + self.prompt = prompt; + + return self; +} + +- (void)setTimestamp:(SDLDateTime *)timestamp { + [store sdl_setObject:timestamp forName:SDLRPCParameterNameTimeStamp]; +} + +- (SDLDateTime *)timestamp { + return [store sdl_objectForName:SDLRPCParameterNameTimeStamp ofClass:SDLDateTime.class]; +} + +- (void)setOrigin:(nullable SDLLocationDetails *)origin { + [store sdl_setObject:origin forName:SDLRPCParameterNameOrigin]; +} + +- (nullable SDLLocationDetails *)origin { + return [store sdl_objectForName:SDLRPCParameterNameOrigin ofClass:SDLLocationDetails.class]; +} + +- (void)setDestination:(nullable SDLLocationDetails *)destination { + [store sdl_setObject:destination forName:SDLRPCParameterNameDestination]; +} + +- (nullable SDLLocationDetails *)destination { + return [store sdl_objectForName:SDLRPCParameterNameDestination ofClass:SDLLocationDetails.class]; +} + +- (void)setDestinationETA:(nullable SDLDateTime *)destinationETA { + [store sdl_setObject:destinationETA forName:SDLRPCParameterNameDestinationETA]; +} + +- (nullable SDLDateTime *)destinationETA { + return [store sdl_objectForName:SDLRPCParameterNameDestinationETA ofClass:SDLDateTime.class]; +} + +- (void)setInstructions:(nullable NSArray<SDLNavigationInstruction *> *)instructions { + [store sdl_setObject:instructions forName:SDLRPCParameterNameInstructions]; +} + +- (nullable NSArray<SDLNavigationInstruction *> *)instructions { + return [store sdl_objectsForName:SDLRPCParameterNameInstructions ofClass:SDLNavigationInstruction.class]; +} + +- (void)setNextInstructionETA:(nullable SDLDateTime *)nextInstructionETA { + [store sdl_setObject:nextInstructionETA forName:SDLRPCParameterNameNextInstructionETA]; +} + +- (nullable SDLDateTime *)nextInstructionETA { + return [store sdl_objectForName:SDLRPCParameterNameNextInstructionETA ofClass:SDLDateTime.class]; +} + +- (void)setNextInstructionDistance:(nullable NSNumber<SDLFloat> *)nextInstructionDistance { + [store sdl_setObject:nextInstructionDistance forName:SDLRPCParameterNameNextInstructionDistance]; +} + +- (nullable NSNumber<SDLFloat> *)nextInstructionDistance { + return [store sdl_objectForName:SDLRPCParameterNameNextInstructionDistance]; +} + +- (void)setNextInstructionDistanceScale:(nullable NSNumber<SDLFloat> *)nextInstructionDistanceScale { + [store sdl_setObject:nextInstructionDistanceScale forName:SDLRPCParameterNameNextInstructionDistanceScale]; +} + +- (nullable NSNumber<SDLFloat> *)nextInstructionDistanceScale { + return [store sdl_objectForName:SDLRPCParameterNameNextInstructionDistanceScale]; +} + +- (void)setPrompt:(nullable NSString *)prompt { + [store sdl_setObject:prompt forName:SDLRPCParameterNamePrompt]; +} + +- (nullable NSString *)prompt { + return [store sdl_objectForName:SDLRPCParameterNamePrompt]; +} + +@end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLNavigationServiceManifest.h b/SmartDeviceLink/SDLNavigationServiceManifest.h new file mode 100644 index 000000000..5a9707558 --- /dev/null +++ b/SmartDeviceLink/SDLNavigationServiceManifest.h @@ -0,0 +1,35 @@ +// +// SDLNavigationServiceManifest.h +// SmartDeviceLink +// +// Created by Nicole on 2/25/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import "SDLRPCMessage.h" + +NS_ASSUME_NONNULL_BEGIN + +/* + * A navigation service manifest. + */ +@interface SDLNavigationServiceManifest : SDLRPCStruct + +/** + * Convenience init. + * + * @param acceptsWayPoints Informs the subscriber if this service can actually accept way points + * @return A SDLNavigationServiceManifest object + */ +- (instancetype)initWithAcceptsWayPoints:(BOOL)acceptsWayPoints; + +/** + * Informs the subscriber if this service can actually accept way points. + * + * Boolean, Optional + */ +@property (nullable, strong, nonatomic) NSNumber<SDLBool> *acceptsWayPoints; + +@end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLNavigationServiceManifest.m b/SmartDeviceLink/SDLNavigationServiceManifest.m new file mode 100644 index 000000000..9d9800c1c --- /dev/null +++ b/SmartDeviceLink/SDLNavigationServiceManifest.m @@ -0,0 +1,39 @@ +// +// SDLNavigationServiceManifest.m +// SmartDeviceLink +// +// Created by Nicole on 2/25/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import "SDLNavigationServiceManifest.h" + +#import "NSMutableDictionary+Store.h" +#import "SDLRPCParameterNames.h" + +NS_ASSUME_NONNULL_BEGIN + +@implementation SDLNavigationServiceManifest + +- (instancetype)initWithAcceptsWayPoints:(BOOL)acceptsWayPoints { + self = [self init]; + if (!self) { + return nil; + } + + self.acceptsWayPoints = @(acceptsWayPoints); + + return self; +} + +- (void)setAcceptsWayPoints:(nullable NSNumber<SDLBool> *)acceptsWayPoints { + [store sdl_setObject:acceptsWayPoints forName:SDLRPCParameterNameAcceptsWayPoints]; +} + +- (nullable NSNumber<SDLBool> *)acceptsWayPoints { + return [store sdl_objectForName:SDLRPCParameterNameAcceptsWayPoints]; +} + +@end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLNotificationConstants.h b/SmartDeviceLink/SDLNotificationConstants.h index 88ab06f9c..173128eb4 100644 --- a/SmartDeviceLink/SDLNotificationConstants.h +++ b/SmartDeviceLink/SDLNotificationConstants.h @@ -133,14 +133,18 @@ extern SDLNotificationName const SDLDidReceiveEncodedSyncPDataResponse; extern SDLNotificationName const SDLDidReceiveEndAudioPassThruResponse; extern SDLNotificationName const SDLDidReceiveGenericResponse; extern SDLNotificationName const SDLDidReceiveGetCloudAppPropertiesResponse; +extern SDLNotificationName const SDLDidReceiveGetAppServiceDataResponse; extern SDLNotificationName const SDLDidReceiveGetDTCsResponse; +extern SDLNotificationName const SDLDidReceiveGetFileResponse; extern SDLNotificationName const SDLDidReceiveGetInteriorVehicleDataResponse; extern SDLNotificationName const SDLDidReceiveGetSystemCapabilitiesResponse; extern SDLNotificationName const SDLDidReceiveGetVehicleDataResponse; extern SDLNotificationName const SDLDidReceiveGetWaypointsResponse; extern SDLNotificationName const SDLDidReceiveListFilesResponse; +extern SDLNotificationName const SDLDidReceivePerformAppServiceInteractionResponse; extern SDLNotificationName const SDLDidReceivePerformAudioPassThruResponse; extern SDLNotificationName const SDLDidReceivePerformInteractionResponse; +extern SDLNotificationName const SDLDidReceivePublishAppServiceResponse; extern SDLNotificationName const SDLDidReceivePutFileResponse; extern SDLNotificationName const SDLDidReceiveReadDIDResponse; extern SDLNotificationName const SDLDidReceiveRegisterAppInterfaceResponse; @@ -170,6 +174,63 @@ extern SDLNotificationName const SDLDidReceiveUnsubscribeWaypointsResponse; extern SDLNotificationName const SDLDidReceiveSetCloudAppPropertiesRequest; extern SDLNotificationName const SDLDidReceiveGetCloudAppPropertiesRequest; +/** + * NSNotification names associated with specific RPC requests. + */ +#pragma mark - RPC requests +extern SDLNotificationName const SDLDidReceiveAddCommandRequest; +extern SDLNotificationName const SDLDidReceiveAddSubMenuRequest; +extern SDLNotificationName const SDLDidReceiveAlertRequest; +extern SDLNotificationName const SDLDidReceiveAlertManeuverRequest; +extern SDLNotificationName const SDLDidReceiveButtonPressRequest; +extern SDLNotificationName const SDLDidReceiveChangeRegistrationRequest; +extern SDLNotificationName const SDLDidReceiveCreateInteractionChoiceSetRequest; +extern SDLNotificationName const SDLDidReceiveDeleteCommandRequest; +extern SDLNotificationName const SDLDidReceiveDeleteFileRequest; +extern SDLNotificationName const SDLDidReceiveDeleteInteractionChoiceSetRequest; +extern SDLNotificationName const SDLDidReceiveDeleteSubMenuRequest; +extern SDLNotificationName const SDLDidReceiveDiagnosticMessageRequest; +extern SDLNotificationName const SDLDidReceiveDialNumberRequest; +extern SDLNotificationName const SDLDidReceiveEncodedSyncPDataRequest; +extern SDLNotificationName const SDLDidReceiveEndAudioPassThruRequest; +extern SDLNotificationName const SDLDidReceiveGetAppServiceDataRequest; +extern SDLNotificationName const SDLDidReceiveGetDTCsRequest; +extern SDLNotificationName const SDLDidReceiveGetFileRequest; +extern SDLNotificationName const SDLDidReceiveGetInteriorVehicleDataRequest; +extern SDLNotificationName const SDLDidReceiveGetSystemCapabilityRequest; +extern SDLNotificationName const SDLDidReceiveGetVehicleDataRequest; +extern SDLNotificationName const SDLDidReceiveGetWayPointsRequest; +extern SDLNotificationName const SDLDidReceiveListFilesRequest; +extern SDLNotificationName const SDLDidReceivePerformAppServiceInteractionRequest; +extern SDLNotificationName const SDLDidReceivePerformAudioPassThruRequest; +extern SDLNotificationName const SDLDidReceivePerformInteractionRequest; +extern SDLNotificationName const SDLDidReceivePublishAppServiceRequest; +extern SDLNotificationName const SDLDidReceivePutFileRequest; +extern SDLNotificationName const SDLDidReceiveReadDIDRequest; +extern SDLNotificationName const SDLDidReceiveRegisterAppInterfaceRequest; +extern SDLNotificationName const SDLDidReceiveResetGlobalPropertiesRequest; +extern SDLNotificationName const SDLDidReceiveScrollableMessageRequest; +extern SDLNotificationName const SDLDidReceiveSendHapticDataRequest; +extern SDLNotificationName const SDLDidReceiveSendLocationRequest; +extern SDLNotificationName const SDLDidReceiveSetAppIconRequest; +extern SDLNotificationName const SDLDidReceiveSetDisplayLayoutRequest; +extern SDLNotificationName const SDLDidReceiveSetGlobalPropertiesRequest; +extern SDLNotificationName const SDLDidReceiveSetInteriorVehicleDataRequest; +extern SDLNotificationName const SDLDidReceiveSetMediaClockTimerRequest; +extern SDLNotificationName const SDLDidReceiveShowRequest; +extern SDLNotificationName const SDLDidReceiveShowConstantTBTRequest; +extern SDLNotificationName const SDLDidReceiveSliderRequest; +extern SDLNotificationName const SDLDidReceiveSpeakRequest; +extern SDLNotificationName const SDLDidReceiveSubscribeButtonRequest; +extern SDLNotificationName const SDLDidReceiveSubscribeVehicleDataRequest; +extern SDLNotificationName const SDLDidReceiveSubscribeWayPointsRequest; +extern SDLNotificationName const SDLDidReceiveSyncPDataRequest; +extern SDLNotificationName const SDLDidReceiveSystemRequestRequest; +extern SDLNotificationName const SDLDidReceiveUnregisterAppInterfaceRequest; +extern SDLNotificationName const SDLDidReceiveUnsubscribeButtonRequest; +extern SDLNotificationName const SDLDidReceiveUnsubscribeVehicleDataRequest; +extern SDLNotificationName const SDLDidReceiveUnsubscribeWayPointsRequest; +extern SDLNotificationName const SDLDidReceiveUpdateTurnListRequest; /** * NSNotification names associated with specific RPC notifications. @@ -177,8 +238,9 @@ extern SDLNotificationName const SDLDidReceiveGetCloudAppPropertiesRequest; #pragma mark - RPC Notifications extern SDLNotificationName const SDLDidChangeDriverDistractionStateNotification; extern SDLNotificationName const SDLDidChangeHMIStatusNotification; -extern SDLNotificationName const SDLDidReceiveAudioPassThruNotification; +extern SDLNotificationName const SDLDidReceiveAppServiceDataNotification; extern SDLNotificationName const SDLDidReceiveAppUnregisteredNotification; +extern SDLNotificationName const SDLDidReceiveAudioPassThruNotification; extern SDLNotificationName const SDLDidReceiveButtonEventNotification; extern SDLNotificationName const SDLDidReceiveButtonPressNotification; extern SDLNotificationName const SDLDidReceiveCommandNotification; @@ -191,6 +253,7 @@ extern SDLNotificationName const SDLDidReceiveNewHashNotification; extern SDLNotificationName const SDLDidReceiveVehicleIconNotification; extern SDLNotificationName const SDLDidChangePermissionsNotification; extern SDLNotificationName const SDLDidReceiveRemoteControlStatusNotification; +extern SDLNotificationName const SDLDidReceiveSystemCapabilityUpdatedNotification; extern SDLNotificationName const SDLDidReceiveSystemRequestNotification; extern SDLNotificationName const SDLDidChangeTurnByTurnStateNotification; extern SDLNotificationName const SDLDidReceiveTouchEventNotification; @@ -202,7 +265,7 @@ extern SDLNotificationName const SDLDidReceiveWaypointNotification; /** All of the possible SDL RPC Response notification names - @return The names + @return All response notification names */ + (NSArray<SDLNotificationName> *)allResponseNames; diff --git a/SmartDeviceLink/SDLNotificationConstants.m b/SmartDeviceLink/SDLNotificationConstants.m index 43b4dfdf6..51e9849be 100644 --- a/SmartDeviceLink/SDLNotificationConstants.m +++ b/SmartDeviceLink/SDLNotificationConstants.m @@ -41,14 +41,18 @@ SDLNotificationName const SDLDidReceiveEncodedSyncPDataResponse = @"com.sdl.resp SDLNotificationName const SDLDidReceiveEndAudioPassThruResponse = @"com.sdl.response.endAudioPassThru"; SDLNotificationName const SDLDidReceiveGenericResponse = @"com.sdl.response.generic"; SDLNotificationName const SDLDidReceiveGetCloudAppPropertiesResponse = @"com.sdl.response.getCloudAppProperties"; +SDLNotificationName const SDLDidReceiveGetAppServiceDataResponse = @"com.sdl.response.getAppServiceData"; SDLNotificationName const SDLDidReceiveGetDTCsResponse = @"com.sdl.response.getDTCs"; +SDLNotificationName const SDLDidReceiveGetFileResponse = @"com.sdl.response.getFile"; SDLNotificationName const SDLDidReceiveGetInteriorVehicleDataResponse = @"com.sdl.response.getInteriorVehicleData"; SDLNotificationName const SDLDidReceiveGetSystemCapabilitiesResponse = @"com.sdl.response.getSystemCapabilities"; SDLNotificationName const SDLDidReceiveGetVehicleDataResponse = @"com.sdl.response.getVehicleData"; SDLNotificationName const SDLDidReceiveGetWaypointsResponse = @"com.sdl.response.getWaypoints"; SDLNotificationName const SDLDidReceiveListFilesResponse = @"com.sdl.response.listFiles"; +SDLNotificationName const SDLDidReceivePerformAppServiceInteractionResponse = @"com.sdl.response.performAppServiceInteraction"; SDLNotificationName const SDLDidReceivePerformAudioPassThruResponse = @"com.sdl.response.performAudioPassThru"; SDLNotificationName const SDLDidReceivePerformInteractionResponse = @"com.sdl.response.performInteraction"; +SDLNotificationName const SDLDidReceivePublishAppServiceResponse = @"com.sdl.response.publishAppService"; SDLNotificationName const SDLDidReceivePutFileResponse = @"com.sdl.response.putFile"; SDLNotificationName const SDLDidReceiveReadDIDResponse = @"com.sdl.response.readDID"; SDLNotificationName const SDLDidReceiveRegisterAppInterfaceResponse = @"com.sdl.response.registerAppInterface"; @@ -78,12 +82,67 @@ SDLNotificationName const SDLDidReceiveUnsubscribeWaypointsResponse = @"com.sdl. SDLNotificationName const SDLDidReceiveSetCloudAppPropertiesRequest = @"com.sdl.request.setCloudAppProperties"; SDLNotificationName const SDLDidReceiveGetCloudAppPropertiesRequest = @"com.sdl.request.getCloudAppProperties"; +#pragma mark - RPC Requests +SDLNotificationName const SDLDidReceiveAddCommandRequest = @"com.sdl.request.addCommand"; +SDLNotificationName const SDLDidReceiveAddSubMenuRequest = @"com.sdl.request.addSubMenu"; +SDLNotificationName const SDLDidReceiveAlertRequest = @"com.sdl.request.alert"; +SDLNotificationName const SDLDidReceiveAlertManeuverRequest = @"com.sdl.request.alertManeuver"; +SDLNotificationName const SDLDidReceiveButtonPressRequest = @"com.sdl.request.buttonPress"; +SDLNotificationName const SDLDidReceiveChangeRegistrationRequest = @"com.sdl.request.changeRegistration"; +SDLNotificationName const SDLDidReceiveCreateInteractionChoiceSetRequest = @"com.sdl.request.createInteractionChoiceSet"; +SDLNotificationName const SDLDidReceiveDeleteCommandRequest = @"com.sdl.request.deleteCommand"; +SDLNotificationName const SDLDidReceiveDeleteFileRequest = @"com.sdl.request.deleteFile"; +SDLNotificationName const SDLDidReceiveDeleteInteractionChoiceSetRequest = @"com.sdl.request.deleteInteractionChoiceSet"; +SDLNotificationName const SDLDidReceiveDeleteSubMenuRequest = @"com.sdl.request.deleteSubMenu"; +SDLNotificationName const SDLDidReceiveDiagnosticMessageRequest = @"com.sdl.request.diagnosticMessage"; +SDLNotificationName const SDLDidReceiveDialNumberRequest = @"com.sdl.request.dialNumber"; +SDLNotificationName const SDLDidReceiveEncodedSyncPDataRequest = @"com.sdl.request.encodedSyncPData"; +SDLNotificationName const SDLDidReceiveEndAudioPassThruRequest = @"com.sdl.request.endAudioPassThru"; +SDLNotificationName const SDLDidReceiveGetAppServiceDataRequest = @"com.sdl.request.getAppServiceData"; +SDLNotificationName const SDLDidReceiveGetDTCsRequest = @"com.sdl.request.getDTCs"; +SDLNotificationName const SDLDidReceiveGetFileRequest = @"com.sdl.request.getFile"; +SDLNotificationName const SDLDidReceiveGetInteriorVehicleDataRequest = @"com.sdl.request.getInteriorVehicleData"; +SDLNotificationName const SDLDidReceiveGetSystemCapabilityRequest = @"com.sdl.request.getSystemCapability"; +SDLNotificationName const SDLDidReceiveGetVehicleDataRequest = @"com.sdl.request.getVehicleData"; +SDLNotificationName const SDLDidReceiveGetWayPointsRequest = @"com.sdl.request.getWayPoints"; +SDLNotificationName const SDLDidReceiveListFilesRequest = @"com.sdl.request.listFiles"; +SDLNotificationName const SDLDidReceivePerformAppServiceInteractionRequest = @"com.sdl.request.performAppServiceInteraction"; +SDLNotificationName const SDLDidReceivePerformAudioPassThruRequest = @"com.sdl.request.performAudioPassThru"; +SDLNotificationName const SDLDidReceivePerformInteractionRequest = @"com.sdl.request.performInteraction"; +SDLNotificationName const SDLDidReceivePublishAppServiceRequest = @"com.sdl.request.publishAppService"; +SDLNotificationName const SDLDidReceivePutFileRequest = @"com.sdl.request.putFile"; +SDLNotificationName const SDLDidReceiveReadDIDRequest = @"com.sdl.request.readDID"; +SDLNotificationName const SDLDidReceiveRegisterAppInterfaceRequest = @"com.sdl.request.registerAppInterface"; +SDLNotificationName const SDLDidReceiveResetGlobalPropertiesRequest = @"com.sdl.request.resetGlobalProperties"; +SDLNotificationName const SDLDidReceiveScrollableMessageRequest = @"com.sdl.request.scrollableMessage"; +SDLNotificationName const SDLDidReceiveSendHapticDataRequest = @"com.sdl.request.sendHapticData"; +SDLNotificationName const SDLDidReceiveSendLocationRequest = @"com.sdl.request.sendLocation"; +SDLNotificationName const SDLDidReceiveSetAppIconRequest = @"com.sdl.request.setAppIcon"; +SDLNotificationName const SDLDidReceiveSetDisplayLayoutRequest = @"com.sdl.request.setDisplayLayout"; +SDLNotificationName const SDLDidReceiveSetGlobalPropertiesRequest = @"com.sdl.request.setGlobalProperties"; +SDLNotificationName const SDLDidReceiveSetInteriorVehicleDataRequest = @"com.sdl.request.setInteriorVehicleData"; +SDLNotificationName const SDLDidReceiveSetMediaClockTimerRequest = @"com.sdl.request.setMediaClockTimer"; +SDLNotificationName const SDLDidReceiveShowRequest = @"com.sdl.request.show"; +SDLNotificationName const SDLDidReceiveShowConstantTBTRequest = @"com.sdl.request.showConstantTBT"; +SDLNotificationName const SDLDidReceiveSliderRequest = @"com.sdl.request.slider"; +SDLNotificationName const SDLDidReceiveSpeakRequest = @"com.sdl.request.speak"; +SDLNotificationName const SDLDidReceiveSubscribeButtonRequest = @"com.sdl.request.subscribeButton"; +SDLNotificationName const SDLDidReceiveSubscribeVehicleDataRequest = @"com.sdl.request.subscribeVehicleData"; +SDLNotificationName const SDLDidReceiveSubscribeWayPointsRequest = @"com.sdl.request.subscribeWayPoints"; +SDLNotificationName const SDLDidReceiveSyncPDataRequest = @"com.sdl.request.syncPData"; +SDLNotificationName const SDLDidReceiveSystemRequestRequest = @"com.sdl.request.systemRequest"; +SDLNotificationName const SDLDidReceiveUnregisterAppInterfaceRequest = @"com.sdl.request.unregisterAppInterface"; +SDLNotificationName const SDLDidReceiveUnsubscribeButtonRequest = @"com.sdl.request.unsubscribeButton"; +SDLNotificationName const SDLDidReceiveUnsubscribeVehicleDataRequest = @"com.sdl.request.unsubscribeVehicleData"; +SDLNotificationName const SDLDidReceiveUnsubscribeWayPointsRequest = @"com.sdl.request.unsubscribeWayPoints"; +SDLNotificationName const SDLDidReceiveUpdateTurnListRequest = @"com.sdl.request.updateTurnList"; #pragma mark - RPC Notifications SDLNotificationName const SDLDidChangeDriverDistractionStateNotification = @"com.sdl.notification.changeDriverDistractionStateNotification"; SDLNotificationName const SDLDidChangeHMIStatusNotification = @"com.sdl.notification.changeHMIStatus"; -SDLNotificationName const SDLDidReceiveAudioPassThruNotification = @"com.sdl.notification.audioPassThru"; +SDLNotificationName const SDLDidReceiveAppServiceDataNotification = @"com.sdl.notification.appServiceData"; SDLNotificationName const SDLDidReceiveAppUnregisteredNotification = @"com.sdl.notification.appUnregistered"; +SDLNotificationName const SDLDidReceiveAudioPassThruNotification = @"com.sdl.notification.audioPassThru"; SDLNotificationName const SDLDidReceiveButtonEventNotification = @"com.sdl.notification.buttonEvent"; SDLNotificationName const SDLDidReceiveButtonPressNotification = @"com.sdl.notification.buttonPress"; SDLNotificationName const SDLDidReceiveCommandNotification = @"com.sdl.notification.command"; @@ -94,8 +153,9 @@ SDLNotificationName const SDLDidChangeLanguageNotification = @"com.sdl.notificat SDLNotificationName const SDLDidChangeLockScreenStatusNotification = @"com.sdl.notification.lockScreenStatus"; SDLNotificationName const SDLDidReceiveNewHashNotification = @"com.sdl.notification.newHash"; SDLNotificationName const SDLDidChangePermissionsNotification = @"com.sdl.notification.changePermission"; -SDLNotificationName const SDLDidReceiveSystemRequestNotification = @"com.sdl.notification.receiveSystemRequest"; SDLNotificationName const SDLDidReceiveRemoteControlStatusNotification = @"com.sdl.notification.rcStatus"; +SDLNotificationName const SDLDidReceiveSystemCapabilityUpdatedNotification = @"com.sdl.notification.systemCapabilityUpdated"; +SDLNotificationName const SDLDidReceiveSystemRequestNotification = @"com.sdl.notification.receiveSystemRequest"; SDLNotificationName const SDLDidChangeTurnByTurnStateNotification = @"com.sdl.notification.changeTurnByTurnState"; SDLNotificationName const SDLDidReceiveTouchEventNotification = @"com.sdl.notification.touchEvent"; SDLNotificationName const SDLDidReceiveVehicleDataNotification = @"com.sdl.notification.vehicleData"; @@ -122,14 +182,18 @@ SDLNotificationName const SDLDidReceiveWaypointNotification = @"com.sdl.notifica SDLDidReceiveEndAudioPassThruResponse, SDLDidReceiveGenericResponse, SDLDidReceiveGetCloudAppPropertiesResponse, + SDLDidReceiveGetAppServiceDataResponse, SDLDidReceiveGetDTCsResponse, + SDLDidReceiveGetFileResponse, SDLDidReceiveGetInteriorVehicleDataResponse, SDLDidReceiveGetSystemCapabilitiesResponse, SDLDidReceiveGetVehicleDataResponse, SDLDidReceiveGetWaypointsResponse, SDLDidReceiveListFilesResponse, + SDLDidReceivePerformAppServiceInteractionResponse, SDLDidReceivePerformAudioPassThruResponse, SDLDidReceivePerformInteractionResponse, + SDLDidReceivePublishAppServiceResponse, SDLDidReceivePutFileResponse, SDLDidReceiveReadDIDResponse, SDLDidReceiveRegisterAppInterfaceResponse, diff --git a/SmartDeviceLink/SDLNotificationDispatcher.h b/SmartDeviceLink/SDLNotificationDispatcher.h index ba5089a25..f820ddc91 100644 --- a/SmartDeviceLink/SDLNotificationDispatcher.h +++ b/SmartDeviceLink/SDLNotificationDispatcher.h @@ -10,6 +10,7 @@ #import "SDLProxyListener.h" +@class SDLRPCRequest; @class SDLRPCResponse; @class SDLRPCNotification; @@ -22,13 +23,35 @@ NS_ASSUME_NONNULL_BEGIN @interface SDLNotificationDispatcher : NSObject <SDLProxyListener> /** - * Post a notification with a specified name and object. + * Posts a notification with a specified name and object. * - * @param name The name of the notification to be dispatched. - * @param info The object to be send along in the `userInfo` dictionary. + * @param name The name of the notification to be dispatched. + * @param info The notification object to be sent in the `userInfo` dictionary. */ - (void)postNotificationName:(NSString *)name infoObject:(nullable id)info; + +/** + * Posts a request from Core with a specified name and request object + * + * @param name The name of the request to be dispatched + * @param request The request object to be sent in the `userInfo` dictionary + */ +- (void)postRPCRequestNotification:(NSString *)name request:(__kindof SDLRPCRequest *)request; + +/** + * Posts a response from Core with a specified name and response object + * + * @param name The name of the response to be dispatched + * @param response The response object to be sent in the `userInfo` dictionary + */ - (void)postRPCResponseNotification:(NSString *)name response:(__kindof SDLRPCResponse *)response; + +/** + * Posts a notification from Core with a specified name and notification object + * + * @param name The name of the notification to be dispatched + * @param rpcNotification The notification object to be sent in the `userInfo` dictionary + */ - (void)postRPCNotificationNotification:(NSString *)name notification:(__kindof SDLRPCNotification *)rpcNotification; @end diff --git a/SmartDeviceLink/SDLNotificationDispatcher.m b/SmartDeviceLink/SDLNotificationDispatcher.m index 9fd139d3d..553a243cc 100644 --- a/SmartDeviceLink/SDLNotificationDispatcher.m +++ b/SmartDeviceLink/SDLNotificationDispatcher.m @@ -12,6 +12,7 @@ #import "SDLNotificationConstants.h" #import "SDLRPCNotification.h" #import "SDLRPCNotificationNotification.h" +#import "SDLRPCRequestNotification.h" #import "SDLRPCResponseNotification.h" NS_ASSUME_NONNULL_BEGIN @@ -35,6 +36,13 @@ NS_ASSUME_NONNULL_BEGIN [[NSNotificationCenter defaultCenter] postNotificationName:name object:self userInfo:userInfo]; } +- (void)postRPCRequestNotification:(NSString *)name request:(__kindof SDLRPCRequest *)request { + SDLRPCRequestNotification *notification = [[SDLRPCRequestNotification alloc] initWithName:name object:self rpcRequest:request]; + + // Runs on `com.sdl.rpcProcessingQueue` + [[NSNotificationCenter defaultCenter] postNotification:notification]; +} + - (void)postRPCResponseNotification:(NSString *)name response:(__kindof SDLRPCResponse *)response { SDLRPCResponseNotification *notification = [[SDLRPCResponseNotification alloc] initWithName:name object:self rpcResponse:response]; @@ -89,6 +97,8 @@ NS_ASSUME_NONNULL_BEGIN [self postNotificationName:SDLDidReceiveError infoObject:error]; } +# pragma mark - Responses + - (void)onReceivedLockScreenIcon:(UIImage *)icon { [self postNotificationName:SDLDidReceiveLockScreenIcon infoObject:icon]; } @@ -161,10 +171,18 @@ NS_ASSUME_NONNULL_BEGIN [self postRPCResponseNotification:SDLDidReceiveGetCloudAppPropertiesResponse response:response]; } +- (void)onGetAppServiceDataResponse:(SDLGetAppServiceDataResponse *)response { + [self postRPCResponseNotification:SDLDidReceiveGetAppServiceDataResponse response:response]; +} + - (void)onGetDTCsResponse:(SDLGetDTCsResponse *)response { [self postRPCResponseNotification:SDLDidReceiveGetDTCsResponse response:response]; } +- (void)onGetFileResponse:(SDLGetFileResponse *)response { + [self postRPCResponseNotification:SDLDidReceiveGetFileResponse response:response]; +} + - (void)onGetInteriorVehicleDataResponse:(SDLGetInteriorVehicleDataResponse *)response { [self postRPCResponseNotification:SDLDidReceiveGetInteriorVehicleDataResponse response:response]; } @@ -177,7 +195,7 @@ NS_ASSUME_NONNULL_BEGIN [self postRPCResponseNotification:SDLDidReceiveGetVehicleDataResponse response:response]; } -- (void)onGetWayPointsResponse:(SDLGetWaypointsResponse *)response { +- (void)onGetWayPointsResponse:(SDLGetWayPointsResponse *)response { [self postRPCResponseNotification:SDLDidReceiveGetWaypointsResponse response:response]; } @@ -185,6 +203,10 @@ NS_ASSUME_NONNULL_BEGIN [self postRPCResponseNotification:SDLDidReceiveListFilesResponse response:response]; } +- (void)onPerformAppServiceInteractionResponse:(SDLPerformAppServiceInteractionResponse *)response { + [self postRPCResponseNotification:SDLDidReceivePerformAppServiceInteractionResponse response:response]; +} + - (void)onPerformAudioPassThruResponse:(SDLPerformAudioPassThruResponse *)response { [self postRPCResponseNotification:SDLDidReceivePerformAudioPassThruResponse response:response]; } @@ -193,6 +215,10 @@ NS_ASSUME_NONNULL_BEGIN [self postRPCResponseNotification:SDLDidReceivePerformInteractionResponse response:response]; } +- (void)onPublishAppServiceResponse:(SDLPublishAppServiceResponse *)response { + [self postRPCResponseNotification:SDLDidReceivePublishAppServiceResponse response:response]; +} + - (void)onPutFileResponse:(SDLPutFileResponse *)response { [self postRPCResponseNotification:SDLDidReceivePutFileResponse response:response]; } @@ -297,10 +323,230 @@ NS_ASSUME_NONNULL_BEGIN [self postRPCResponseNotification:SDLDidReceiveUnsubscribeWaypointsResponse response:response]; } +# pragma mark - Requests + +- (void)onAddCommand:(SDLAddCommand *)request { + [self postRPCRequestNotification:SDLDidReceiveAddCommandRequest request:request]; +} + +- (void)onAddSubMenu:(SDLAddSubMenu *)request { + [self postRPCRequestNotification:SDLDidReceiveAddSubMenuRequest request:request]; +} + +- (void)onAlert:(SDLAlert *)request { + [self postRPCRequestNotification:SDLDidReceiveAlertRequest request:request]; +} + +- (void)onAlertManeuver:(SDLAlertManeuver *)request { + [self postRPCRequestNotification:SDLDidReceiveAlertManeuverRequest request:request]; +} + +- (void)onButtonPress:(SDLButtonPress *)request { + [self postRPCRequestNotification:SDLDidReceiveButtonPressRequest request:request]; +} + +- (void)onChangeRegistration:(SDLChangeRegistration *)request { + [self postRPCRequestNotification:SDLDidReceiveChangeRegistrationRequest request:request]; +} + +- (void)onCreateInteractionChoiceSet:(SDLCreateInteractionChoiceSet *)request { + [self postRPCRequestNotification:SDLDidReceiveCreateInteractionChoiceSetRequest request:request]; +} + +- (void)onDeleteCommand:(SDLDeleteCommand *)request { + [self postRPCRequestNotification:SDLDidReceiveDeleteCommandRequest request:request]; +} + +- (void)onDeleteFile:(SDLDeleteFile *)request { + [self postRPCRequestNotification:SDLDidReceiveDeleteFileRequest request:request]; +} + +- (void)onDeleteInteractionChoiceSet:(SDLDeleteInteractionChoiceSet *)request { + [self postRPCRequestNotification:SDLDidReceiveDeleteInteractionChoiceSetRequest request:request]; +} + +- (void)onDeleteSubMenu:(SDLDeleteSubMenu *)request { + [self postRPCRequestNotification:SDLDidReceiveDeleteSubMenuRequest request:request]; +} + +- (void)onDiagnosticMessage:(SDLDiagnosticMessage *)request { + [self postRPCRequestNotification:SDLDidReceiveDiagnosticMessageRequest request:request]; +} + +- (void)onDialNumber:(SDLDialNumber *)request { + [self postRPCRequestNotification:SDLDidReceiveDialNumberRequest request:request]; +} + +- (void)onEncodedSyncPData:(SDLEncodedSyncPData *)request { + [self postRPCRequestNotification:SDLDidReceiveEncodedSyncPDataRequest request:request]; +} + +- (void)onEndAudioPassThru:(SDLEndAudioPassThru *)request { + [self postRPCRequestNotification:SDLDidReceiveEndAudioPassThruRequest request:request]; +} + +- (void)onGetAppServiceData:(SDLGetAppServiceData *)request { + [self postRPCRequestNotification:SDLDidReceiveGetAppServiceDataRequest request:request]; +} + +- (void)onGetDTCs:(SDLGetDTCs *)request { + [self postRPCRequestNotification:SDLDidReceiveGetDTCsRequest request:request]; +} + +- (void)onGetFile:(SDLGetFile *)request { + [self postRPCRequestNotification:SDLDidReceiveGetFileRequest request:request]; +} + +- (void)onGetInteriorVehicleData:(SDLGetInteriorVehicleData *)request { + [self postRPCRequestNotification:SDLDidReceiveGetInteriorVehicleDataRequest request:request]; +} + +- (void)onGetSystemCapability:(SDLGetSystemCapability *)request { + [self postRPCRequestNotification:SDLDidReceiveGetSystemCapabilityRequest request:request]; +} + +- (void)onGetVehicleData:(SDLGetVehicleData *)request { + [self postRPCRequestNotification:SDLDidReceiveGetVehicleDataRequest request:request]; +} + +- (void)onGetWayPoints:(SDLGetWayPoints *)request { + [self postRPCRequestNotification:SDLDidReceiveGetWayPointsRequest request:request]; +} + +- (void)onListFiles:(SDLListFiles *)request { + [self postRPCRequestNotification:SDLDidReceiveListFilesRequest request:request]; +} + +- (void)onPerformAppServiceInteraction:(SDLPerformAppServiceInteraction *)request { + [self postRPCRequestNotification:SDLDidReceivePerformAppServiceInteractionRequest request:request]; +} + +- (void)onPerformAudioPassThru:(SDLPerformAudioPassThru *)request { + [self postRPCRequestNotification:SDLDidReceivePerformAudioPassThruRequest request:request]; +} + +- (void)onPerformInteraction:(SDLPerformInteraction *)request { + [self postRPCRequestNotification:SDLDidReceivePerformInteractionRequest request:request]; +} + +- (void)onPublishAppService:(SDLPublishAppService *)request { + [self postRPCRequestNotification:SDLDidReceivePublishAppServiceRequest request:request]; +} + +- (void)onPutFile:(SDLPutFile *)request { + [self postRPCRequestNotification:SDLDidReceivePutFileRequest request:request]; +} + +- (void)onReadDID:(SDLReadDID *)request { + [self postRPCRequestNotification:SDLDidReceiveReadDIDRequest request:request]; +} + +- (void)onRegisterAppInterface:(SDLRegisterAppInterface *)request { + [self postRPCRequestNotification:SDLDidReceiveRegisterAppInterfaceRequest request:request]; +} + +- (void)onResetGlobalProperties:(SDLResetGlobalProperties *)request { + [self postRPCRequestNotification:SDLDidReceiveResetGlobalPropertiesRequest request:request]; +} + +- (void)onScrollableMessage:(SDLScrollableMessage *)request { + [self postRPCRequestNotification:SDLDidReceiveScrollableMessageRequest request:request]; +} + +- (void)onSendHapticData:(SDLSendHapticData *)request { + [self postRPCRequestNotification:SDLDidReceiveSendHapticDataRequest request:request]; +} + +- (void)onSendLocation:(SDLSendLocation *)request { + [self postRPCRequestNotification:SDLDidReceiveSendLocationRequest request:request]; +} + +- (void)onSetAppIcon:(SDLSetAppIcon *)request { + [self postRPCRequestNotification:SDLDidReceiveSetAppIconRequest request:request]; +} + +- (void)onSetDisplayLayout:(SDLSetDisplayLayout *)request { + [self postRPCRequestNotification:SDLDidReceiveSetDisplayLayoutRequest request:request]; +} + +- (void)onSetGlobalProperties:(SDLSetGlobalProperties *)request { + [self postRPCRequestNotification:SDLDidReceiveSetGlobalPropertiesRequest request:request]; +} + +- (void)onSetInteriorVehicleData:(SDLSetInteriorVehicleData *)request { + [self postRPCRequestNotification:SDLDidReceiveSetInteriorVehicleDataRequest request:request]; +} + +- (void)onSetMediaClockTimer:(SDLSetMediaClockTimer *)request { + [self postRPCRequestNotification:SDLDidReceiveSetMediaClockTimerRequest request:request]; +} + +- (void)onShow:(SDLShow *)request { + [self postRPCRequestNotification:SDLDidReceiveShowRequest request:request]; +} + +- (void)onShowConstantTBT:(SDLShowConstantTBT *)request { + [self postRPCRequestNotification:SDLDidReceiveShowConstantTBTRequest request:request]; +} + +- (void)onSlider:(SDLSlider *)request { + [self postRPCRequestNotification:SDLDidReceiveSliderRequest request:request]; +} + +- (void)onSpeak:(SDLSpeak *)request { + [self postRPCRequestNotification:SDLDidReceiveSpeakRequest request:request]; +} + +- (void)onSubscribeButton:(SDLSubscribeButton *)request { + [self postRPCRequestNotification:SDLDidReceiveSubscribeButtonRequest request:request]; +} + +- (void)onSubscribeVehicleData:(SDLSubscribeVehicleData *)request { + [self postRPCRequestNotification:SDLDidReceiveSubscribeVehicleDataRequest request:request]; +} + +- (void)onSubscribeWayPoints:(SDLSubscribeWayPoints *)request { + [self postRPCRequestNotification:SDLDidReceiveSubscribeWayPointsRequest request:request]; +} + +- (void)onSyncPData:(SDLSyncPData *)request { + [self postRPCRequestNotification:SDLDidReceiveSyncPDataRequest request:request]; +} + +-(void)onSystemRequest:(SDLSystemRequest *)request { + [self postRPCRequestNotification:SDLDidReceiveSystemRequestRequest request:request]; +} + +- (void)onUnregisterAppInterface:(SDLUnregisterAppInterface *)request { + [self postRPCRequestNotification:SDLDidReceiveUnregisterAppInterfaceRequest request:request]; +} + +- (void)onUnsubscribeButton:(SDLUnsubscribeButton *)request { + [self postRPCRequestNotification:SDLDidReceiveUnsubscribeButtonRequest request:request]; +} + +- (void)onUnsubscribeVehicleData:(SDLUnsubscribeVehicleData *)request { + [self postRPCRequestNotification:SDLDidReceiveUnsubscribeVehicleDataRequest request:request]; +} + +- (void)onUnsubscribeWayPoints:(SDLUnsubscribeWayPoints *)request { + [self postRPCRequestNotification:SDLDidReceiveUnsubscribeWayPointsRequest request:request]; +} + +- (void)onUpdateTurnList:(SDLUpdateTurnList *)request { + [self postRPCRequestNotification:SDLDidReceiveUpdateTurnListRequest request:request]; +} + +# pragma mark - Notifications + - (void)onOnAppInterfaceUnregistered:(SDLOnAppInterfaceUnregistered *)notification { [self postRPCNotificationNotification:SDLDidReceiveAppUnregisteredNotification notification:notification]; } +- (void)onOnAppServiceData:(SDLOnAppServiceData *)notification { + [self postRPCNotificationNotification:SDLDidReceiveAppServiceDataNotification notification:notification]; +} + - (void)onOnAudioPassThru:(SDLOnAudioPassThru *)notification { [self postRPCNotificationNotification:SDLDidReceiveAudioPassThruNotification notification:notification]; } @@ -353,6 +599,10 @@ NS_ASSUME_NONNULL_BEGIN [self postRPCNotificationNotification:SDLDidReceiveSystemRequestNotification notification:notification]; } +- (void)onOnSystemCapabilityUpdated:(SDLOnSystemCapabilityUpdated *)notification { + [self postRPCNotificationNotification:SDLDidReceiveSystemCapabilityUpdatedNotification notification:notification]; +} + - (void)onOnSystemRequest:(SDLOnSystemRequest *)notification { [self postRPCNotificationNotification:SDLDidReceiveSystemRequestNotification notification:notification]; } diff --git a/SmartDeviceLink/SDLOasisAddress.m b/SmartDeviceLink/SDLOasisAddress.m index 97bfbe8cf..d1c7661be 100644 --- a/SmartDeviceLink/SDLOasisAddress.m +++ b/SmartDeviceLink/SDLOasisAddress.m @@ -4,7 +4,7 @@ #import "SDLOasisAddress.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" NS_ASSUME_NONNULL_BEGIN @@ -34,75 +34,75 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setCountryName:(nullable NSString *)countryName { - [store sdl_setObject:countryName forName:SDLNameCountryName]; + [store sdl_setObject:countryName forName:SDLRPCParameterNameCountryName]; } - (nullable NSString *)countryName { - return [store sdl_objectForName:SDLNameCountryName]; + return [store sdl_objectForName:SDLRPCParameterNameCountryName]; } - (void)setCountryCode:(nullable NSString *)countryCode { - [store sdl_setObject:countryCode forName:SDLNameCountryCode]; + [store sdl_setObject:countryCode forName:SDLRPCParameterNameCountryCode]; } - (nullable NSString *)countryCode { - return [store sdl_objectForName:SDLNameCountryCode]; + return [store sdl_objectForName:SDLRPCParameterNameCountryCode]; } - (void)setPostalCode:(nullable NSString *)postalCode { - [store sdl_setObject:postalCode forName:SDLNamePostalCode]; + [store sdl_setObject:postalCode forName:SDLRPCParameterNamePostalCode]; } - (nullable NSString *)postalCode { - return [store sdl_objectForName:SDLNamePostalCode]; + return [store sdl_objectForName:SDLRPCParameterNamePostalCode]; } - (void)setAdministrativeArea:(nullable NSString *)administrativeArea { - [store sdl_setObject:administrativeArea forName:SDLNameAdministrativeArea]; + [store sdl_setObject:administrativeArea forName:SDLRPCParameterNameAdministrativeArea]; } - (nullable NSString *)administrativeArea { - return [store sdl_objectForName:SDLNameAdministrativeArea]; + return [store sdl_objectForName:SDLRPCParameterNameAdministrativeArea]; } - (void)setSubAdministrativeArea:(nullable NSString *)subAdministrativeArea { - [store sdl_setObject:subAdministrativeArea forName:SDLNameSubAdministrativeArea]; + [store sdl_setObject:subAdministrativeArea forName:SDLRPCParameterNameSubAdministrativeArea]; } - (nullable NSString *)subAdministrativeArea { - return [store sdl_objectForName:SDLNameSubAdministrativeArea]; + return [store sdl_objectForName:SDLRPCParameterNameSubAdministrativeArea]; } - (void)setLocality:(nullable NSString *)locality { - [store sdl_setObject:locality forName:SDLNameLocality]; + [store sdl_setObject:locality forName:SDLRPCParameterNameLocality]; } - (nullable NSString *)locality { - return [store sdl_objectForName:SDLNameLocality]; + return [store sdl_objectForName:SDLRPCParameterNameLocality]; } - (void)setSubLocality:(nullable NSString *)subLocality { - [store sdl_setObject:subLocality forName:SDLNameSubLocality]; + [store sdl_setObject:subLocality forName:SDLRPCParameterNameSubLocality]; } - (nullable NSString *)subLocality { - return [store sdl_objectForName:SDLNameSubLocality]; + return [store sdl_objectForName:SDLRPCParameterNameSubLocality]; } - (void)setThoroughfare:(nullable NSString *)thoroughfare { - [store sdl_setObject:thoroughfare forName:SDLNameThoroughfare]; + [store sdl_setObject:thoroughfare forName:SDLRPCParameterNameThoroughfare]; } - (nullable NSString *)thoroughfare { - return [store sdl_objectForName:SDLNameThoroughfare]; + return [store sdl_objectForName:SDLRPCParameterNameThoroughfare]; } - (void)setSubThoroughfare:(nullable NSString *)subThoroughfare { - [store sdl_setObject:subThoroughfare forName:SDLNameSubThoroughfare]; + [store sdl_setObject:subThoroughfare forName:SDLRPCParameterNameSubThoroughfare]; } - (nullable NSString *)subThoroughfare { - return [store sdl_objectForName:SDLNameSubThoroughfare]; + return [store sdl_objectForName:SDLRPCParameterNameSubThoroughfare]; } @end diff --git a/SmartDeviceLink/SDLOnAppInterfaceUnregistered.m b/SmartDeviceLink/SDLOnAppInterfaceUnregistered.m index a38ac0738..e832dc58f 100644 --- a/SmartDeviceLink/SDLOnAppInterfaceUnregistered.m +++ b/SmartDeviceLink/SDLOnAppInterfaceUnregistered.m @@ -4,24 +4,25 @@ #import "SDLOnAppInterfaceUnregistered.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLOnAppInterfaceUnregistered - (instancetype)init { - if (self = [super initWithName:SDLNameOnAppInterfaceUnregistered]) { + if (self = [super initWithName:SDLRPCFunctionNameOnAppInterfaceUnregistered]) { } return self; } - (void)setReason:(SDLAppInterfaceUnregisteredReason)reason { - [parameters sdl_setObject:reason forName:SDLNameReason]; + [parameters sdl_setObject:reason forName:SDLRPCParameterNameReason]; } - (SDLAppInterfaceUnregisteredReason)reason { - return [parameters sdl_objectForName:SDLNameReason]; + return [parameters sdl_objectForName:SDLRPCParameterNameReason]; } @end diff --git a/SmartDeviceLink/SDLOnAppServiceData.h b/SmartDeviceLink/SDLOnAppServiceData.h new file mode 100644 index 000000000..f3a4ff16c --- /dev/null +++ b/SmartDeviceLink/SDLOnAppServiceData.h @@ -0,0 +1,38 @@ +// +// SDLOnAppServiceData.h +// SmartDeviceLink +// +// Created by Nicole on 2/7/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import "SDLRPCNotification.h" + +@class SDLAppServiceData; + + +NS_ASSUME_NONNULL_BEGIN + +/** + * This notification includes the data that is updated from the specific service. + */ +@interface SDLOnAppServiceData : SDLRPCNotification + +/** + * Convenience init for all parameters. + * + * @param serviceData The updated app service data + * @return A SDLOnAppServiceData object + */ +- (instancetype)initWithServiceData:(SDLAppServiceData *)serviceData; + +/** + * The updated app service data. + * + * SDLAppServiceData, Required + */ +@property (strong, nonatomic) SDLAppServiceData *serviceData; + +@end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLOnAppServiceData.m b/SmartDeviceLink/SDLOnAppServiceData.m new file mode 100644 index 000000000..bd427d20b --- /dev/null +++ b/SmartDeviceLink/SDLOnAppServiceData.m @@ -0,0 +1,47 @@ +// +// SDLOnAppServiceData.m +// SmartDeviceLink +// +// Created by Nicole on 2/7/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import "SDLOnAppServiceData.h" +#import "NSMutableDictionary+Store.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" + +#import "SDLAppServiceData.h" + +NS_ASSUME_NONNULL_BEGIN + +@implementation SDLOnAppServiceData + +- (instancetype)init { + if (self = [super initWithName:SDLRPCFunctionNameOnAppServiceData]) { + } + return self; +} + +- (instancetype)initWithServiceData:(SDLAppServiceData *)serviceData { + self = [self init]; + if (!self) { + return nil; + } + + self.serviceData = serviceData; + + return self; +} + +- (void)setServiceData:(SDLAppServiceData *)serviceData { + [parameters sdl_setObject:serviceData forName:SDLRPCParameterNameServiceData]; +} + +- (SDLAppServiceData *)serviceData { + return [parameters sdl_objectForName:SDLRPCParameterNameServiceData ofClass:SDLAppServiceData.class]; +} + +@end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLOnAudioPassThru.m b/SmartDeviceLink/SDLOnAudioPassThru.m index 2ab8fefc4..3775b5040 100644 --- a/SmartDeviceLink/SDLOnAudioPassThru.m +++ b/SmartDeviceLink/SDLOnAudioPassThru.m @@ -5,14 +5,15 @@ #import "SDLOnAudioPassThru.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLOnAudioPassThru - (instancetype)init { - if (self = [super initWithName:SDLNameOnAudioPassThru]) { + if (self = [super initWithName:SDLRPCFunctionNameOnAudioPassThru]) { } return self; } diff --git a/SmartDeviceLink/SDLOnButtonEvent.m b/SmartDeviceLink/SDLOnButtonEvent.m index 4d65422a8..7aa316f4d 100644 --- a/SmartDeviceLink/SDLOnButtonEvent.m +++ b/SmartDeviceLink/SDLOnButtonEvent.m @@ -4,42 +4,43 @@ #import "SDLOnButtonEvent.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLOnButtonEvent - (instancetype)init { - if (self = [super initWithName:SDLNameOnButtonEvent]) { + if (self = [super initWithName:SDLRPCFunctionNameOnButtonEvent]) { } return self; } - (void)setButtonName:(SDLButtonName)buttonName { - [parameters sdl_setObject:buttonName forName:SDLNameButtonName]; + [parameters sdl_setObject:buttonName forName:SDLRPCParameterNameButtonName]; } - (SDLButtonName)buttonName { - NSObject *obj = [parameters sdl_objectForName:SDLNameButtonName]; + NSObject *obj = [parameters sdl_objectForName:SDLRPCParameterNameButtonName]; return (SDLButtonName)obj; } - (void)setButtonEventMode:(SDLButtonEventMode)buttonEventMode { - [parameters sdl_setObject:buttonEventMode forName:SDLNameButtonEventMode]; + [parameters sdl_setObject:buttonEventMode forName:SDLRPCParameterNameButtonEventMode]; } - (SDLButtonEventMode)buttonEventMode { - NSObject *obj = [parameters sdl_objectForName:SDLNameButtonEventMode]; + NSObject *obj = [parameters sdl_objectForName:SDLRPCParameterNameButtonEventMode]; return (SDLButtonEventMode)obj; } - (void)setCustomButtonID:(nullable NSNumber<SDLInt> *)customButtonID { - [parameters sdl_setObject:customButtonID forName:SDLNameCustomButtonId]; + [parameters sdl_setObject:customButtonID forName:SDLRPCParameterNameCustomButtonId]; } - (nullable NSNumber<SDLInt> *)customButtonID { - return [parameters sdl_objectForName:SDLNameCustomButtonId]; + return [parameters sdl_objectForName:SDLRPCParameterNameCustomButtonId]; } @end diff --git a/SmartDeviceLink/SDLOnButtonPress.m b/SmartDeviceLink/SDLOnButtonPress.m index addeccfd8..a05a246fd 100644 --- a/SmartDeviceLink/SDLOnButtonPress.m +++ b/SmartDeviceLink/SDLOnButtonPress.m @@ -4,42 +4,43 @@ #import "SDLOnButtonPress.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLOnButtonPress - (instancetype)init { - if (self = [super initWithName:SDLNameOnButtonPress]) { + if (self = [super initWithName:SDLRPCFunctionNameOnButtonPress]) { } return self; } - (void)setButtonName:(SDLButtonName)buttonName { - [parameters sdl_setObject:buttonName forName:SDLNameButtonName]; + [parameters sdl_setObject:buttonName forName:SDLRPCParameterNameButtonName]; } - (SDLButtonName)buttonName { - NSObject *obj = [parameters sdl_objectForName:SDLNameButtonName]; + NSObject *obj = [parameters sdl_objectForName:SDLRPCParameterNameButtonName]; return (SDLButtonName)obj; } - (void)setButtonPressMode:(SDLButtonPressMode)buttonPressMode { - [parameters sdl_setObject:buttonPressMode forName:SDLNameButtonPressMode]; + [parameters sdl_setObject:buttonPressMode forName:SDLRPCParameterNameButtonPressMode]; } - (SDLButtonPressMode)buttonPressMode { - NSObject *obj = [parameters sdl_objectForName:SDLNameButtonPressMode]; + NSObject *obj = [parameters sdl_objectForName:SDLRPCParameterNameButtonPressMode]; return (SDLButtonPressMode)obj; } - (void)setCustomButtonID:(nullable NSNumber<SDLInt> *)customButtonID { - [parameters sdl_setObject:customButtonID forName:SDLNameCustomButtonId]; + [parameters sdl_setObject:customButtonID forName:SDLRPCParameterNameCustomButtonId]; } - (nullable NSNumber<SDLInt> *)customButtonID { - return [parameters sdl_objectForName:SDLNameCustomButtonId]; + return [parameters sdl_objectForName:SDLRPCParameterNameCustomButtonId]; } @end diff --git a/SmartDeviceLink/SDLOnCommand.m b/SmartDeviceLink/SDLOnCommand.m index f1d547852..879850566 100644 --- a/SmartDeviceLink/SDLOnCommand.m +++ b/SmartDeviceLink/SDLOnCommand.m @@ -4,32 +4,33 @@ #import "SDLOnCommand.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLOnCommand - (instancetype)init { - if (self = [super initWithName:SDLNameOnCommand]) { + if (self = [super initWithName:SDLRPCFunctionNameOnCommand]) { } return self; } - (void)setCmdID:(NSNumber<SDLInt> *)cmdID { - [parameters sdl_setObject:cmdID forName:SDLNameCommandId]; + [parameters sdl_setObject:cmdID forName:SDLRPCParameterNameCommandId]; } - (NSNumber<SDLInt> *)cmdID { - return [parameters sdl_objectForName:SDLNameCommandId]; + return [parameters sdl_objectForName:SDLRPCParameterNameCommandId]; } - (void)setTriggerSource:(SDLTriggerSource)triggerSource { - [parameters sdl_setObject:triggerSource forName:SDLNameTriggerSource]; + [parameters sdl_setObject:triggerSource forName:SDLRPCParameterNameTriggerSource]; } - (SDLTriggerSource)triggerSource { - NSObject *obj = [parameters sdl_objectForName:SDLNameTriggerSource]; + NSObject *obj = [parameters sdl_objectForName:SDLRPCParameterNameTriggerSource]; return (SDLTriggerSource)obj; } diff --git a/SmartDeviceLink/SDLOnDriverDistraction.m b/SmartDeviceLink/SDLOnDriverDistraction.m index cba06de2e..744d8521d 100644 --- a/SmartDeviceLink/SDLOnDriverDistraction.m +++ b/SmartDeviceLink/SDLOnDriverDistraction.m @@ -4,7 +4,8 @@ #import "SDLOnDriverDistraction.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" #import "SDLDriverDistractionState.h" NS_ASSUME_NONNULL_BEGIN @@ -12,17 +13,17 @@ NS_ASSUME_NONNULL_BEGIN @implementation SDLOnDriverDistraction - (instancetype)init { - if (self = [super initWithName:SDLNameOnDriverDistraction]) { + if (self = [super initWithName:SDLRPCFunctionNameOnDriverDistraction]) { } return self; } - (void)setState:(SDLDriverDistractionState)state { - [parameters sdl_setObject:state forName:SDLNameState]; + [parameters sdl_setObject:state forName:SDLRPCParameterNameState]; } - (SDLDriverDistractionState)state { - NSObject *obj = [parameters sdl_objectForName:SDLNameState]; + NSObject *obj = [parameters sdl_objectForName:SDLRPCParameterNameState]; return (SDLDriverDistractionState)obj; } diff --git a/SmartDeviceLink/SDLOnEncodedSyncPData.m b/SmartDeviceLink/SDLOnEncodedSyncPData.m index d9796b4cb..794047a6a 100644 --- a/SmartDeviceLink/SDLOnEncodedSyncPData.m +++ b/SmartDeviceLink/SDLOnEncodedSyncPData.m @@ -4,40 +4,41 @@ #import "SDLOnEncodedSyncPData.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLOnEncodedSyncPData - (instancetype)init { - if (self = [super initWithName:SDLNameOnEncodedSyncPData]) { + if (self = [super initWithName:SDLRPCFunctionNameOnEncodedSyncPData]) { } return self; } - (void)setData:(NSArray<NSString *> *)data { - [parameters sdl_setObject:data forName:SDLNameData]; + [parameters sdl_setObject:data forName:SDLRPCParameterNameData]; } - (NSArray<NSString *> *)data { - return [parameters sdl_objectForName:SDLNameData]; + return [parameters sdl_objectForName:SDLRPCParameterNameData]; } - (void)setURL:(nullable NSString *)URL { - [parameters sdl_setObject:URL forName:SDLNameURLUppercase]; + [parameters sdl_setObject:URL forName:SDLRPCParameterNameURLUppercase]; } - (nullable NSString *)URL { - return [parameters sdl_objectForName:SDLNameURLUppercase]; + return [parameters sdl_objectForName:SDLRPCParameterNameURLUppercase]; } - (void)setTimeout:(nullable NSNumber<SDLInt> *)Timeout { - [parameters sdl_setObject:Timeout forName:SDLNameTimeoutCapitalized]; + [parameters sdl_setObject:Timeout forName:SDLRPCParameterNameTimeoutCapitalized]; } - (nullable NSNumber<SDLInt> *)Timeout { - return [parameters sdl_objectForName:SDLNameTimeoutCapitalized]; + return [parameters sdl_objectForName:SDLRPCParameterNameTimeoutCapitalized]; } @end diff --git a/SmartDeviceLink/SDLOnHMIStatus.m b/SmartDeviceLink/SDLOnHMIStatus.m index b345856f4..212d29304 100644 --- a/SmartDeviceLink/SDLOnHMIStatus.m +++ b/SmartDeviceLink/SDLOnHMIStatus.m @@ -6,7 +6,8 @@ #import "NSMutableDictionary+Store.h" #import "SDLAudioStreamingState.h" #import "SDLHMILevel.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" #import "SDLSystemContext.h" NS_ASSUME_NONNULL_BEGIN @@ -14,43 +15,43 @@ NS_ASSUME_NONNULL_BEGIN @implementation SDLOnHMIStatus - (instancetype)init { - if (self = [super initWithName:SDLNameOnHMIStatus]) { + if (self = [super initWithName:SDLRPCFunctionNameOnHMIStatus]) { } return self; } - (void)setHmiLevel:(SDLHMILevel)hmiLevel { - [parameters sdl_setObject:hmiLevel forName:SDLNameHMILevel]; + [parameters sdl_setObject:hmiLevel forName:SDLRPCParameterNameHMILevel]; } - (SDLHMILevel)hmiLevel { - NSObject *obj = [parameters sdl_objectForName:SDLNameHMILevel]; + NSObject *obj = [parameters sdl_objectForName:SDLRPCParameterNameHMILevel]; return (SDLHMILevel)obj; } - (void)setAudioStreamingState:(SDLAudioStreamingState)audioStreamingState { - [parameters sdl_setObject:audioStreamingState forName:SDLNameAudioStreamingState]; + [parameters sdl_setObject:audioStreamingState forName:SDLRPCParameterNameAudioStreamingState]; } - (SDLAudioStreamingState)audioStreamingState { - NSObject *obj = [parameters sdl_objectForName:SDLNameAudioStreamingState]; + NSObject *obj = [parameters sdl_objectForName:SDLRPCParameterNameAudioStreamingState]; return (SDLAudioStreamingState)obj; } - (void)setVideoStreamingState:(nullable SDLVideoStreamingState)videoStreamingState { - [parameters sdl_setObject:videoStreamingState forName:SDLNameVideoStreamingState]; + [parameters sdl_setObject:videoStreamingState forName:SDLRPCParameterNameVideoStreamingState]; } - (nullable SDLVideoStreamingState)videoStreamingState { - return [parameters sdl_objectForName:SDLNameVideoStreamingState]; + return [parameters sdl_objectForName:SDLRPCParameterNameVideoStreamingState]; } - (void)setSystemContext:(SDLSystemContext)systemContext { - [parameters sdl_setObject:systemContext forName:SDLNameSystemContext]; + [parameters sdl_setObject:systemContext forName:SDLRPCParameterNameSystemContext]; } - (SDLSystemContext)systemContext { - NSObject *obj = [parameters sdl_objectForName:SDLNameSystemContext]; + NSObject *obj = [parameters sdl_objectForName:SDLRPCParameterNameSystemContext]; return (SDLSystemContext)obj; } diff --git a/SmartDeviceLink/SDLOnHashChange.m b/SmartDeviceLink/SDLOnHashChange.m index f3fb70731..49cb824e4 100644 --- a/SmartDeviceLink/SDLOnHashChange.m +++ b/SmartDeviceLink/SDLOnHashChange.m @@ -5,24 +5,25 @@ #import "SDLOnHashChange.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLOnHashChange - (instancetype)init { - if (self = [super initWithName:SDLNameOnHashChange]) { + if (self = [super initWithName:SDLRPCFunctionNameOnHashChange]) { } return self; } - (void)setHashID:(NSString *)hashID { - [parameters sdl_setObject:hashID forName:SDLNameHashId]; + [parameters sdl_setObject:hashID forName:SDLRPCParameterNameHashId]; } - (NSString *)hashID { - return [parameters sdl_objectForName:SDLNameHashId]; + return [parameters sdl_objectForName:SDLRPCParameterNameHashId]; } @end diff --git a/SmartDeviceLink/SDLOnInteriorVehicleData.m b/SmartDeviceLink/SDLOnInteriorVehicleData.m index bb065608c..3fde97e35 100644 --- a/SmartDeviceLink/SDLOnInteriorVehicleData.m +++ b/SmartDeviceLink/SDLOnInteriorVehicleData.m @@ -3,7 +3,8 @@ // #import "SDLOnInteriorVehicleData.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" #import "SDLModuleData.h" #import "NSMutableDictionary+Store.h" @@ -12,17 +13,17 @@ NS_ASSUME_NONNULL_BEGIN @implementation SDLOnInteriorVehicleData - (instancetype)init { - if (self = [super initWithName:SDLNameOnInteriorVehicleData]) { + if (self = [super initWithName:SDLRPCFunctionNameOnInteriorVehicleData]) { } return self; } - (void)setModuleData:(SDLModuleData *)moduleData { - [parameters sdl_setObject:moduleData forName:SDLNameModuleData]; + [parameters sdl_setObject:moduleData forName:SDLRPCParameterNameModuleData]; } - (SDLModuleData *)moduleData { - return [parameters sdl_objectForName:SDLNameModuleData ofClass:SDLModuleData.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameModuleData ofClass:SDLModuleData.class]; } @end diff --git a/SmartDeviceLink/SDLOnKeyboardInput.m b/SmartDeviceLink/SDLOnKeyboardInput.m index a6bd02295..a10cae0c1 100644 --- a/SmartDeviceLink/SDLOnKeyboardInput.m +++ b/SmartDeviceLink/SDLOnKeyboardInput.m @@ -4,33 +4,34 @@ #import "SDLOnKeyboardInput.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLOnKeyboardInput - (instancetype)init { - if (self = [super initWithName:SDLNameOnKeyboardInput]) { + if (self = [super initWithName:SDLRPCFunctionNameOnKeyboardInput]) { } return self; } - (void)setEvent:(SDLKeyboardEvent)event { - [parameters sdl_setObject:event forName:SDLNameEvent]; + [parameters sdl_setObject:event forName:SDLRPCParameterNameEvent]; } - (SDLKeyboardEvent)event { - NSObject *obj = [parameters sdl_objectForName:SDLNameEvent]; + NSObject *obj = [parameters sdl_objectForName:SDLRPCParameterNameEvent]; return (SDLKeyboardEvent)obj; } - (void)setData:(nullable NSString *)data { - [parameters sdl_setObject:data forName:SDLNameData]; + [parameters sdl_setObject:data forName:SDLRPCParameterNameData]; } - (nullable NSString *)data { - return [parameters sdl_objectForName:SDLNameData]; + return [parameters sdl_objectForName:SDLRPCParameterNameData]; } @end diff --git a/SmartDeviceLink/SDLOnLanguageChange.m b/SmartDeviceLink/SDLOnLanguageChange.m index 419875f73..a2e65df55 100644 --- a/SmartDeviceLink/SDLOnLanguageChange.m +++ b/SmartDeviceLink/SDLOnLanguageChange.m @@ -5,33 +5,34 @@ #import "NSMutableDictionary+Store.h" #import "SDLLanguage.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLOnLanguageChange - (instancetype)init { - if (self = [super initWithName:SDLNameOnLanguageChange]) { + if (self = [super initWithName:SDLRPCFunctionNameOnLanguageChange]) { } return self; } - (void)setLanguage:(SDLLanguage)language { - [parameters sdl_setObject:language forName:SDLNameLanguage]; + [parameters sdl_setObject:language forName:SDLRPCParameterNameLanguage]; } - (SDLLanguage)language { - NSObject *obj = [parameters sdl_objectForName:SDLNameLanguage]; + NSObject *obj = [parameters sdl_objectForName:SDLRPCParameterNameLanguage]; return (SDLLanguage)obj; } - (void)setHmiDisplayLanguage:(SDLLanguage)hmiDisplayLanguage { - [parameters sdl_setObject:hmiDisplayLanguage forName:SDLNameHMIDisplayLanguage]; + [parameters sdl_setObject:hmiDisplayLanguage forName:SDLRPCParameterNameHMIDisplayLanguage]; } - (SDLLanguage)hmiDisplayLanguage { - NSObject *obj = [parameters sdl_objectForName:SDLNameHMIDisplayLanguage]; + NSObject *obj = [parameters sdl_objectForName:SDLRPCParameterNameHMIDisplayLanguage]; return (SDLLanguage)obj; } diff --git a/SmartDeviceLink/SDLOnLockScreenStatus.m b/SmartDeviceLink/SDLOnLockScreenStatus.m index d2007956e..4c567d34a 100644 --- a/SmartDeviceLink/SDLOnLockScreenStatus.m +++ b/SmartDeviceLink/SDLOnLockScreenStatus.m @@ -8,48 +8,49 @@ #import "NSMutableDictionary+Store.h" #import "SDLHMILevel.h" #import "SDLLockScreenStatus.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLOnLockScreenStatus - (instancetype)init { - if (self = [super initWithName:SDLNameOnLockScreenStatus]) { + if (self = [super initWithName:SDLRPCFunctionNameOnLockScreenStatus]) { } return self; } - (void)setLockScreenStatus:(SDLLockScreenStatus)lockScreenStatus { - [parameters sdl_setObject:lockScreenStatus forName:SDLNameOnLockScreenStatus]; + [parameters sdl_setObject:lockScreenStatus forName:SDLRPCParameterNameOnLockScreenStatus]; } - (SDLLockScreenStatus)lockScreenStatus { - return [parameters sdl_objectForName:SDLNameOnLockScreenStatus]; + return [parameters sdl_objectForName:SDLRPCParameterNameOnLockScreenStatus]; } - (void)setHmiLevel:(SDLHMILevel)hmiLevel { - [parameters sdl_setObject:hmiLevel forName:SDLNameHMILevel]; + [parameters sdl_setObject:hmiLevel forName:SDLRPCParameterNameHMILevel]; } - (SDLHMILevel)hmiLevel { - return [parameters sdl_objectForName:SDLNameHMILevel]; + return [parameters sdl_objectForName:SDLRPCParameterNameHMILevel]; } - (void)setUserSelected:(NSNumber<SDLBool> *)userSelected { - [parameters sdl_setObject:userSelected forName:SDLNameUserSelected]; + [parameters sdl_setObject:userSelected forName:SDLRPCParameterNameUserSelected]; } - (NSNumber<SDLBool> *)userSelected { - return [parameters sdl_objectForName:SDLNameUserSelected]; + return [parameters sdl_objectForName:SDLRPCParameterNameUserSelected]; } - (void)setDriverDistractionStatus:(NSNumber<SDLBool> *)driverDistractionStatus { - [parameters sdl_setObject:driverDistractionStatus forName:SDLNameDriverDistractionStatus]; + [parameters sdl_setObject:driverDistractionStatus forName:SDLRPCParameterNameDriverDistractionStatus]; } - (NSNumber<SDLBool> *)driverDistractionStatus { - return [parameters sdl_objectForName:SDLNameDriverDistractionStatus]; + return [parameters sdl_objectForName:SDLRPCParameterNameDriverDistractionStatus]; } @end diff --git a/SmartDeviceLink/SDLOnPermissionsChange.m b/SmartDeviceLink/SDLOnPermissionsChange.m index da908698a..6da23be6f 100644 --- a/SmartDeviceLink/SDLOnPermissionsChange.m +++ b/SmartDeviceLink/SDLOnPermissionsChange.m @@ -4,7 +4,8 @@ #import "SDLOnPermissionsChange.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" #import "SDLPermissionItem.h" NS_ASSUME_NONNULL_BEGIN @@ -12,17 +13,17 @@ NS_ASSUME_NONNULL_BEGIN @implementation SDLOnPermissionsChange - (instancetype)init { - if (self = [super initWithName:SDLNameOnPermissionsChange]) { + if (self = [super initWithName:SDLRPCFunctionNameOnPermissionsChange]) { } return self; } - (void)setPermissionItem:(NSArray<SDLPermissionItem *> *)permissionItem { - [parameters sdl_setObject:permissionItem forName:SDLNamePermissionItem]; + [parameters sdl_setObject:permissionItem forName:SDLRPCParameterNamePermissionItem]; } - (NSArray<SDLPermissionItem *> *)permissionItem { - return [parameters sdl_objectsForName:SDLNamePermissionItem ofClass:SDLPermissionItem.class]; + return [parameters sdl_objectsForName:SDLRPCParameterNamePermissionItem ofClass:SDLPermissionItem.class]; } @end diff --git a/SmartDeviceLink/SDLOnRCStatus.m b/SmartDeviceLink/SDLOnRCStatus.m index eeae2506e..69050f352 100644 --- a/SmartDeviceLink/SDLOnRCStatus.m +++ b/SmartDeviceLink/SDLOnRCStatus.m @@ -5,41 +5,42 @@ #import "NSMutableDictionary+Store.h" #import "SDLModuleData.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLOnRCStatus - (instancetype)init { - if (self = [super initWithName:SDLNameOnRCStatus]) { + if (self = [super initWithName:SDLRPCFunctionNameOnRCStatus]) { } return self; } - (nullable NSNumber<SDLBool> *)allowed { - return [parameters sdl_objectForName:SDLNameAllowed]; + return [parameters sdl_objectForName:SDLRPCParameterNameAllowed]; } - (void)setAllowed:(nullable NSNumber<SDLBool> *)allowed { - [parameters sdl_setObject:allowed forName:SDLNameAllowed]; + [parameters sdl_setObject:allowed forName:SDLRPCParameterNameAllowed]; } - (void)setAllocatedModules:(NSArray<SDLModuleData *> *)allocatedModules { - [parameters sdl_setObject:allocatedModules forName:SDLNameAllocatedModules]; + [parameters sdl_setObject:allocatedModules forName:SDLRPCParameterNameAllocatedModules]; } - (NSArray<SDLModuleData *> *)allocatedModules { - return [parameters sdl_objectsForName:SDLNameAllocatedModules ofClass:SDLModuleData.class]; + return [parameters sdl_objectsForName:SDLRPCParameterNameAllocatedModules ofClass:SDLModuleData.class]; } - (void)setFreeModules:(NSArray<SDLModuleData *> *)freeModules { - [parameters sdl_setObject:freeModules forName:SDLNameFreeModules]; + [parameters sdl_setObject:freeModules forName:SDLRPCParameterNameFreeModules]; } - (NSArray<SDLModuleData *> *)freeModules { - return [parameters sdl_objectsForName:SDLNameFreeModules ofClass:SDLModuleData.class]; + return [parameters sdl_objectsForName:SDLRPCParameterNameFreeModules ofClass:SDLModuleData.class]; } @end diff --git a/SmartDeviceLink/SDLOnSyncPData.m b/SmartDeviceLink/SDLOnSyncPData.m index 13446ab88..aa1f843bb 100644 --- a/SmartDeviceLink/SDLOnSyncPData.m +++ b/SmartDeviceLink/SDLOnSyncPData.m @@ -5,32 +5,34 @@ #import "SDLOnSyncPData.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" + NS_ASSUME_NONNULL_BEGIN @implementation SDLOnSyncPData - (instancetype)init { - if (self = [super initWithName:SDLNameOnSyncPData]) { + if (self = [super initWithName:SDLRPCFunctionNameOnSyncPData]) { } return self; } - (void)setURL:(nullable NSString *)URL { - [parameters sdl_setObject:URL forName:SDLNameURLUppercase]; + [parameters sdl_setObject:URL forName:SDLRPCParameterNameURLUppercase]; } - (nullable NSString *)URL { - return [parameters sdl_objectForName:SDLNameURLUppercase]; + return [parameters sdl_objectForName:SDLRPCParameterNameURLUppercase]; } - (void)setTimeout:(nullable NSNumber<SDLInt> *)Timeout { - [parameters sdl_setObject:Timeout forName:SDLNameTimeoutCapitalized]; + [parameters sdl_setObject:Timeout forName:SDLRPCParameterNameTimeoutCapitalized]; } - (nullable NSNumber<SDLInt> *)Timeout { - return [parameters sdl_objectForName:SDLNameTimeoutCapitalized]; + return [parameters sdl_objectForName:SDLRPCParameterNameTimeoutCapitalized]; } @end diff --git a/SmartDeviceLink/SDLOnSystemCapabilityUpdated.h b/SmartDeviceLink/SDLOnSystemCapabilityUpdated.h new file mode 100644 index 000000000..35a720901 --- /dev/null +++ b/SmartDeviceLink/SDLOnSystemCapabilityUpdated.h @@ -0,0 +1,37 @@ +// +// SDLOnSystemCapabilityUpdated.h +// SmartDeviceLink +// +// Created by Nicole on 2/6/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import "SDLRPCNotification.h" + +@class SDLSystemCapability; + +NS_ASSUME_NONNULL_BEGIN + +/** + * A notification to inform the connected device that a specific system capability has changed. + */ +@interface SDLOnSystemCapabilityUpdated : SDLRPCNotification + +/** + * Convenience init for required parameters + * + * @param systemCapability The system capability that has been updated + * @return A SDLOnSystemCapabilityUpdated object + */ +- (instancetype)initWithSystemCapability:(SDLSystemCapability *)systemCapability; + +/** + * The system capability that has been updated. + * + * SDLSystemCapability, Required + */ +@property (strong, nonatomic) SDLSystemCapability *systemCapability; + +@end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLOnSystemCapabilityUpdated.m b/SmartDeviceLink/SDLOnSystemCapabilityUpdated.m new file mode 100644 index 000000000..05167d62e --- /dev/null +++ b/SmartDeviceLink/SDLOnSystemCapabilityUpdated.m @@ -0,0 +1,47 @@ +// +// SDLOnSystemCapabilityUpdated.m +// SmartDeviceLink +// +// Created by Nicole on 2/6/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import "SDLOnSystemCapabilityUpdated.h" + +#import "NSMutableDictionary+Store.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" +#import "SDLSystemCapability.h" + +NS_ASSUME_NONNULL_BEGIN + +@implementation SDLOnSystemCapabilityUpdated + +- (instancetype)init { + if (self = [super initWithName:SDLRPCFunctionNameOnSystemCapabilityUpdated]) { + } + return self; +} + +- (instancetype)initWithSystemCapability:(SDLSystemCapability *)systemCapability { + self = [self init]; + if (!self) { + return nil; + } + + self.systemCapability = systemCapability; + + return self; +} + +- (void)setSystemCapability:(SDLSystemCapability *)systemCapability { + [parameters sdl_setObject:systemCapability forName:SDLRPCParameterNameSystemCapability]; +} + +- (SDLSystemCapability *)systemCapability { + return [parameters sdl_objectForName:SDLRPCParameterNameSystemCapability ofClass:SDLSystemCapability.class]; +} + +@end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLOnSystemRequest.m b/SmartDeviceLink/SDLOnSystemRequest.m index aecd16ab3..d0af59d8e 100644 --- a/SmartDeviceLink/SDLOnSystemRequest.m +++ b/SmartDeviceLink/SDLOnSystemRequest.m @@ -4,72 +4,73 @@ #import "SDLOnSystemRequest.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLOnSystemRequest - (instancetype)init { - if (self = [super initWithName:SDLNameOnSystemRequest]) { + if (self = [super initWithName:SDLRPCFunctionNameOnSystemRequest]) { } return self; } - (void)setRequestType:(SDLRequestType)requestType { - [parameters sdl_setObject:requestType forName:SDLNameRequestType]; + [parameters sdl_setObject:requestType forName:SDLRPCParameterNameRequestType]; } - (SDLRequestType)requestType { - return [parameters sdl_objectForName:SDLNameRequestType]; + return [parameters sdl_objectForName:SDLRPCParameterNameRequestType]; } - (void)setRequestSubType:(nullable NSString *)requestSubType { - [parameters sdl_setObject:requestSubType forName:SDLNameRequestSubType]; + [parameters sdl_setObject:requestSubType forName:SDLRPCParameterNameRequestSubType]; } - (nullable NSString *)requestSubType { - return [parameters sdl_objectForName:SDLNameRequestSubType]; + return [parameters sdl_objectForName:SDLRPCParameterNameRequestSubType]; } - (void)setUrl:(nullable NSString *)url { - [parameters sdl_setObject:url forName:SDLNameURL]; + [parameters sdl_setObject:url forName:SDLRPCParameterNameURL]; } - (nullable NSString *)url { - return [parameters sdl_objectForName:SDLNameURL]; + return [parameters sdl_objectForName:SDLRPCParameterNameURL]; } - (void)setTimeout:(nullable NSNumber<SDLInt> *)timeout { - [parameters sdl_setObject:timeout forName:SDLNameTimeout]; + [parameters sdl_setObject:timeout forName:SDLRPCParameterNameTimeout]; } - (nullable NSNumber<SDLInt> *)timeout { - return [parameters sdl_objectForName:SDLNameTimeout]; + return [parameters sdl_objectForName:SDLRPCParameterNameTimeout]; } - (void)setFileType:(nullable SDLFileType)fileType { - [parameters sdl_setObject:fileType forName:SDLNameFileType]; + [parameters sdl_setObject:fileType forName:SDLRPCParameterNameFileType]; } - (nullable SDLFileType)fileType { - return [parameters sdl_objectForName:SDLNameFileType]; + return [parameters sdl_objectForName:SDLRPCParameterNameFileType]; } - (void)setOffset:(nullable NSNumber<SDLInt> *)offset { - [parameters sdl_setObject:offset forName:SDLNameOffset]; + [parameters sdl_setObject:offset forName:SDLRPCParameterNameOffset]; } - (nullable NSNumber<SDLInt> *)offset { - return [parameters sdl_objectForName:SDLNameOffset]; + return [parameters sdl_objectForName:SDLRPCParameterNameOffset]; } - (void)setLength:(nullable NSNumber<SDLInt> *)length { - [parameters sdl_setObject:length forName:SDLNameLength]; + [parameters sdl_setObject:length forName:SDLRPCParameterNameLength]; } - (nullable NSNumber<SDLInt> *)length { - return [parameters sdl_objectForName:SDLNameLength]; + return [parameters sdl_objectForName:SDLRPCParameterNameLength]; } @end diff --git a/SmartDeviceLink/SDLOnTBTClientState.m b/SmartDeviceLink/SDLOnTBTClientState.m index 41bc28f0d..443d86cf6 100644 --- a/SmartDeviceLink/SDLOnTBTClientState.m +++ b/SmartDeviceLink/SDLOnTBTClientState.m @@ -4,24 +4,25 @@ #import "SDLOnTBTClientState.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLOnTBTClientState - (instancetype)init { - if (self = [super initWithName:SDLNameOnTBTClientState]) { + if (self = [super initWithName:SDLRPCFunctionNameOnTBTClientState]) { } return self; } - (void)setState:(SDLTBTState)state { - [parameters sdl_setObject:state forName:SDLNameState]; + [parameters sdl_setObject:state forName:SDLRPCParameterNameState]; } - (SDLTBTState)state { - NSObject *obj = [parameters sdl_objectForName:SDLNameState]; + NSObject *obj = [parameters sdl_objectForName:SDLRPCParameterNameState]; return (SDLTBTState)obj; } diff --git a/SmartDeviceLink/SDLOnTouchEvent.m b/SmartDeviceLink/SDLOnTouchEvent.m index 08cb844c1..1abe8e284 100644 --- a/SmartDeviceLink/SDLOnTouchEvent.m +++ b/SmartDeviceLink/SDLOnTouchEvent.m @@ -4,7 +4,8 @@ #import "SDLOnTouchEvent.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" #import "SDLTouchEvent.h" NS_ASSUME_NONNULL_BEGIN @@ -12,26 +13,26 @@ NS_ASSUME_NONNULL_BEGIN @implementation SDLOnTouchEvent - (instancetype)init { - if (self = [super initWithName:SDLNameOnTouchEvent]) { + if (self = [super initWithName:SDLRPCFunctionNameOnTouchEvent]) { } return self; } - (void)setType:(SDLTouchType)type { - [parameters sdl_setObject:type forName:SDLNameType]; + [parameters sdl_setObject:type forName:SDLRPCParameterNameType]; } - (SDLTouchType)type { - NSObject *obj = [parameters sdl_objectForName:SDLNameType]; + NSObject *obj = [parameters sdl_objectForName:SDLRPCParameterNameType]; return (SDLTouchType)obj; } - (void)setEvent:(NSArray<SDLTouchEvent *> *)event { - [parameters sdl_setObject:event forName:SDLNameEvent]; + [parameters sdl_setObject:event forName:SDLRPCParameterNameEvent]; } - (NSArray<SDLTouchEvent *> *)event { - return [parameters sdl_objectsForName:SDLNameEvent ofClass:SDLTouchEvent.class]; + return [parameters sdl_objectsForName:SDLRPCParameterNameEvent ofClass:SDLTouchEvent.class]; } @end diff --git a/SmartDeviceLink/SDLOnVehicleData.m b/SmartDeviceLink/SDLOnVehicleData.m index 6cebb5460..c1f86f02d 100644 --- a/SmartDeviceLink/SDLOnVehicleData.m +++ b/SmartDeviceLink/SDLOnVehicleData.m @@ -15,7 +15,8 @@ #import "SDLGPSData.h" #import "SDLHeadLampStatus.h" #import "SDLMyKey.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" #import "SDLTireStatus.h" NS_ASSUME_NONNULL_BEGIN @@ -23,242 +24,242 @@ NS_ASSUME_NONNULL_BEGIN @implementation SDLOnVehicleData - (instancetype)init { - if (self = [super initWithName:SDLNameOnVehicleData]) { + if (self = [super initWithName:SDLRPCFunctionNameOnVehicleData]) { } return self; } - (void)setGps:(nullable SDLGPSData *)gps { - [parameters sdl_setObject:gps forName:SDLNameGPS]; + [parameters sdl_setObject:gps forName:SDLRPCParameterNameGPS]; } - (nullable SDLGPSData *)gps { - return [parameters sdl_objectForName:SDLNameGPS ofClass:SDLGPSData.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameGPS ofClass:SDLGPSData.class]; } - (void)setSpeed:(nullable NSNumber<SDLFloat> *)speed { - [parameters sdl_setObject:speed forName:SDLNameSpeed]; + [parameters sdl_setObject:speed forName:SDLRPCParameterNameSpeed]; } - (nullable NSNumber<SDLFloat> *)speed { - return [parameters sdl_objectForName:SDLNameSpeed]; + return [parameters sdl_objectForName:SDLRPCParameterNameSpeed]; } - (void)setRpm:(nullable NSNumber<SDLInt> *)rpm { - [parameters sdl_setObject:rpm forName:SDLNameRPM]; + [parameters sdl_setObject:rpm forName:SDLRPCParameterNameRPM]; } - (nullable NSNumber<SDLInt> *)rpm { - return [parameters sdl_objectForName:SDLNameRPM]; + return [parameters sdl_objectForName:SDLRPCParameterNameRPM]; } - (void)setFuelLevel:(nullable NSNumber<SDLFloat> *)fuelLevel { - [parameters sdl_setObject:fuelLevel forName:SDLNameFuelLevel]; + [parameters sdl_setObject:fuelLevel forName:SDLRPCParameterNameFuelLevel]; } - (nullable NSNumber<SDLFloat> *)fuelLevel { - return [parameters sdl_objectForName:SDLNameFuelLevel]; + return [parameters sdl_objectForName:SDLRPCParameterNameFuelLevel]; } - (void)setFuelLevel_State:(nullable SDLComponentVolumeStatus)fuelLevel_State { - [parameters sdl_setObject:fuelLevel_State forName:SDLNameFuelLevelState]; + [parameters sdl_setObject:fuelLevel_State forName:SDLRPCParameterNameFuelLevelState]; } - (nullable SDLComponentVolumeStatus)fuelLevel_State { - return [parameters sdl_objectForName:SDLNameFuelLevelState]; + return [parameters sdl_objectForName:SDLRPCParameterNameFuelLevelState]; } - (void)setFuelRange:(nullable NSArray<SDLFuelRange *> *)fuelRange { - [parameters sdl_setObject:fuelRange forName:SDLNameFuelRange]; + [parameters sdl_setObject:fuelRange forName:SDLRPCParameterNameFuelRange]; } - (nullable NSArray<SDLFuelRange *> *)fuelRange { - return [parameters sdl_objectsForName:SDLNameFuelRange ofClass:SDLFuelRange.class]; + return [parameters sdl_objectsForName:SDLRPCParameterNameFuelRange ofClass:SDLFuelRange.class]; } - (void)setInstantFuelConsumption:(nullable NSNumber<SDLFloat> *)instantFuelConsumption { - [parameters sdl_setObject:instantFuelConsumption forName:SDLNameInstantFuelConsumption]; + [parameters sdl_setObject:instantFuelConsumption forName:SDLRPCParameterNameInstantFuelConsumption]; } - (nullable NSNumber<SDLFloat> *)instantFuelConsumption { - return [parameters sdl_objectForName:SDLNameInstantFuelConsumption]; + return [parameters sdl_objectForName:SDLRPCParameterNameInstantFuelConsumption]; } - (void)setExternalTemperature:(nullable NSNumber<SDLFloat> *)externalTemperature { - [parameters sdl_setObject:externalTemperature forName:SDLNameExternalTemperature]; + [parameters sdl_setObject:externalTemperature forName:SDLRPCParameterNameExternalTemperature]; } - (nullable NSNumber<SDLFloat> *)externalTemperature { - return [parameters sdl_objectForName:SDLNameExternalTemperature]; + return [parameters sdl_objectForName:SDLRPCParameterNameExternalTemperature]; } - (void)setVin:(nullable NSString *)vin { - [parameters sdl_setObject:vin forName:SDLNameVIN]; + [parameters sdl_setObject:vin forName:SDLRPCParameterNameVIN]; } - (nullable NSString *)vin { - return [parameters sdl_objectForName:SDLNameVIN]; + return [parameters sdl_objectForName:SDLRPCParameterNameVIN]; } - (void)setPrndl:(nullable SDLPRNDL)prndl { - [parameters sdl_setObject:prndl forName:SDLNamePRNDL]; + [parameters sdl_setObject:prndl forName:SDLRPCParameterNamePRNDL]; } - (nullable SDLPRNDL)prndl { - NSObject *obj = [parameters sdl_objectForName:SDLNamePRNDL]; + NSObject *obj = [parameters sdl_objectForName:SDLRPCParameterNamePRNDL]; return (SDLPRNDL)obj; } - (void)setTirePressure:(nullable SDLTireStatus *)tirePressure { - [parameters sdl_setObject:tirePressure forName:SDLNameTirePressure]; + [parameters sdl_setObject:tirePressure forName:SDLRPCParameterNameTirePressure]; } - (nullable SDLTireStatus *)tirePressure { - return [parameters sdl_objectForName:SDLNameTirePressure ofClass:SDLTireStatus.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameTirePressure ofClass:SDLTireStatus.class]; } - (void)setOdometer:(nullable NSNumber<SDLInt> *)odometer { - [parameters sdl_setObject:odometer forName:SDLNameOdometer]; + [parameters sdl_setObject:odometer forName:SDLRPCParameterNameOdometer]; } - (nullable NSNumber<SDLInt> *)odometer { - return [parameters sdl_objectForName:SDLNameOdometer]; + return [parameters sdl_objectForName:SDLRPCParameterNameOdometer]; } - (void)setBeltStatus:(nullable SDLBeltStatus *)beltStatus { - [parameters sdl_setObject:beltStatus forName:SDLNameBeltStatus]; + [parameters sdl_setObject:beltStatus forName:SDLRPCParameterNameBeltStatus]; } - (nullable SDLBeltStatus *)beltStatus { - return [parameters sdl_objectForName:SDLNameBeltStatus ofClass:SDLBeltStatus.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameBeltStatus ofClass:SDLBeltStatus.class]; } - (void)setBodyInformation:(nullable SDLBodyInformation *)bodyInformation { - [parameters sdl_setObject:bodyInformation forName:SDLNameBodyInformation]; + [parameters sdl_setObject:bodyInformation forName:SDLRPCParameterNameBodyInformation]; } - (nullable SDLBodyInformation *)bodyInformation { - return [parameters sdl_objectForName:SDLNameBodyInformation ofClass:SDLBodyInformation.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameBodyInformation ofClass:SDLBodyInformation.class]; } - (void)setDeviceStatus:(nullable SDLDeviceStatus *)deviceStatus { - [parameters sdl_setObject:deviceStatus forName:SDLNameDeviceStatus]; + [parameters sdl_setObject:deviceStatus forName:SDLRPCParameterNameDeviceStatus]; } - (nullable SDLDeviceStatus *)deviceStatus { - return [parameters sdl_objectForName:SDLNameDeviceStatus ofClass:SDLDeviceStatus.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameDeviceStatus ofClass:SDLDeviceStatus.class]; } - (void)setDriverBraking:(nullable SDLVehicleDataEventStatus)driverBraking { - [parameters sdl_setObject:driverBraking forName:SDLNameDriverBraking]; + [parameters sdl_setObject:driverBraking forName:SDLRPCParameterNameDriverBraking]; } - (nullable SDLVehicleDataEventStatus)driverBraking { - return [parameters sdl_objectForName:SDLNameDriverBraking]; + return [parameters sdl_objectForName:SDLRPCParameterNameDriverBraking]; } - (void)setWiperStatus:(nullable SDLWiperStatus)wiperStatus { - [parameters sdl_setObject:wiperStatus forName:SDLNameWiperStatus]; + [parameters sdl_setObject:wiperStatus forName:SDLRPCParameterNameWiperStatus]; } - (nullable SDLWiperStatus)wiperStatus { - return [parameters sdl_objectForName:SDLNameWiperStatus]; + return [parameters sdl_objectForName:SDLRPCParameterNameWiperStatus]; } - (void)setHeadLampStatus:(nullable SDLHeadLampStatus *)headLampStatus { - [parameters sdl_setObject:headLampStatus forName:SDLNameHeadLampStatus]; + [parameters sdl_setObject:headLampStatus forName:SDLRPCParameterNameHeadLampStatus]; } - (nullable SDLHeadLampStatus *)headLampStatus { - return [parameters sdl_objectForName:SDLNameHeadLampStatus ofClass:SDLHeadLampStatus.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameHeadLampStatus ofClass:SDLHeadLampStatus.class]; } - (void)setEngineOilLife:(nullable NSNumber<SDLFloat> *)engineOilLife { - [parameters sdl_setObject:engineOilLife forName:SDLNameEngineOilLife]; + [parameters sdl_setObject:engineOilLife forName:SDLRPCParameterNameEngineOilLife]; } - (nullable NSNumber<SDLFloat> *)engineOilLife { - return [parameters sdl_objectForName:SDLNameEngineOilLife]; + return [parameters sdl_objectForName:SDLRPCParameterNameEngineOilLife]; } - (void)setEngineTorque:(nullable NSNumber<SDLFloat> *)engineTorque { - [parameters sdl_setObject:engineTorque forName:SDLNameEngineTorque]; + [parameters sdl_setObject:engineTorque forName:SDLRPCParameterNameEngineTorque]; } - (nullable NSNumber<SDLFloat> *)engineTorque { - return [parameters sdl_objectForName:SDLNameEngineTorque]; + return [parameters sdl_objectForName:SDLRPCParameterNameEngineTorque]; } - (void)setAccPedalPosition:(nullable NSNumber<SDLFloat> *)accPedalPosition { - [parameters sdl_setObject:accPedalPosition forName:SDLNameAccelerationPedalPosition]; + [parameters sdl_setObject:accPedalPosition forName:SDLRPCParameterNameAccelerationPedalPosition]; } - (nullable NSNumber<SDLFloat> *)accPedalPosition { - return [parameters sdl_objectForName:SDLNameAccelerationPedalPosition]; + return [parameters sdl_objectForName:SDLRPCParameterNameAccelerationPedalPosition]; } - (void)setSteeringWheelAngle:(nullable NSNumber<SDLFloat> *)steeringWheelAngle { - [parameters sdl_setObject:steeringWheelAngle forName:SDLNameSteeringWheelAngle]; + [parameters sdl_setObject:steeringWheelAngle forName:SDLRPCParameterNameSteeringWheelAngle]; } - (nullable NSNumber<SDLFloat> *)steeringWheelAngle { - return [parameters sdl_objectForName:SDLNameSteeringWheelAngle]; + return [parameters sdl_objectForName:SDLRPCParameterNameSteeringWheelAngle]; } - (void)setECallInfo:(nullable SDLECallInfo *)eCallInfo { - [parameters sdl_setObject:eCallInfo forName:SDLNameECallInfo]; + [parameters sdl_setObject:eCallInfo forName:SDLRPCParameterNameECallInfo]; } - (nullable SDLECallInfo *)eCallInfo { - return [parameters sdl_objectForName:SDLNameECallInfo ofClass:SDLECallInfo.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameECallInfo ofClass:SDLECallInfo.class]; } - (void)setAirbagStatus:(nullable SDLAirbagStatus *)airbagStatus { - [parameters sdl_setObject:airbagStatus forName:SDLNameAirbagStatus]; + [parameters sdl_setObject:airbagStatus forName:SDLRPCParameterNameAirbagStatus]; } - (nullable SDLAirbagStatus *)airbagStatus { - return [parameters sdl_objectForName:SDLNameAirbagStatus ofClass:SDLAirbagStatus.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameAirbagStatus ofClass:SDLAirbagStatus.class]; } - (void)setEmergencyEvent:(nullable SDLEmergencyEvent *)emergencyEvent { - [parameters sdl_setObject:emergencyEvent forName:SDLNameEmergencyEvent]; + [parameters sdl_setObject:emergencyEvent forName:SDLRPCParameterNameEmergencyEvent]; } - (nullable SDLEmergencyEvent *)emergencyEvent { - return [parameters sdl_objectForName:SDLNameEmergencyEvent ofClass:SDLEmergencyEvent.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameEmergencyEvent ofClass:SDLEmergencyEvent.class]; } - (void)setClusterModeStatus:(nullable SDLClusterModeStatus *)clusterModeStatus { - [parameters sdl_setObject:clusterModeStatus forName:SDLNameClusterModeStatus]; + [parameters sdl_setObject:clusterModeStatus forName:SDLRPCParameterNameClusterModeStatus]; } - (nullable SDLClusterModeStatus *)clusterModeStatus { - return [parameters sdl_objectForName:SDLNameClusterModeStatus ofClass:SDLClusterModeStatus.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameClusterModeStatus ofClass:SDLClusterModeStatus.class]; } - (void)setMyKey:(nullable SDLMyKey *)myKey { - [parameters sdl_setObject:myKey forName:SDLNameMyKey]; + [parameters sdl_setObject:myKey forName:SDLRPCParameterNameMyKey]; } - (nullable SDLMyKey *)myKey { - return [parameters sdl_objectForName:SDLNameMyKey ofClass:SDLMyKey.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameMyKey ofClass:SDLMyKey.class]; } - (void)setElectronicParkBrakeStatus:(nullable SDLElectronicParkBrakeStatus)electronicParkBrakeStatus { - [parameters sdl_setObject:electronicParkBrakeStatus forName:SDLNameElectronicParkBrakeStatus]; + [parameters sdl_setObject:electronicParkBrakeStatus forName:SDLRPCParameterNameElectronicParkBrakeStatus]; } - (nullable SDLElectronicParkBrakeStatus)electronicParkBrakeStatus { - return [parameters sdl_objectForName:SDLNameElectronicParkBrakeStatus]; + return [parameters sdl_objectForName:SDLRPCParameterNameElectronicParkBrakeStatus]; } - (void)setTurnSignal:(nullable SDLTurnSignal)turnSignal { - [parameters sdl_setObject:turnSignal forName:SDLNameTurnSignal]; + [parameters sdl_setObject:turnSignal forName:SDLRPCParameterNameTurnSignal]; } - (nullable SDLTurnSignal)turnSignal { - return [parameters sdl_objectForName:SDLNameTurnSignal]; + return [parameters sdl_objectForName:SDLRPCParameterNameTurnSignal]; } - (void)setCloudAppVehicleID:(nullable NSString *)cloudAppVehicleID { diff --git a/SmartDeviceLink/SDLOnWayPointChange.m b/SmartDeviceLink/SDLOnWayPointChange.m index 70c7c4242..5e2c93d42 100644 --- a/SmartDeviceLink/SDLOnWayPointChange.m +++ b/SmartDeviceLink/SDLOnWayPointChange.m @@ -5,24 +5,25 @@ #import "NSMutableDictionary+Store.h" #import "SDLLocationDetails.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLOnWayPointChange - (instancetype)init { - if (self = [super initWithName:SDLNameOnWayPointChange]) { + if (self = [super initWithName:SDLRPCFunctionNameOnWayPointChange]) { } return self; } - (void)setWaypoints:(NSArray<SDLLocationDetails *> *)waypoints { - [parameters sdl_setObject:waypoints forName:SDLNameWayPoints]; + [parameters sdl_setObject:waypoints forName:SDLRPCParameterNameWayPoints]; } - (NSArray<SDLLocationDetails *> *)waypoints { - return [parameters sdl_objectsForName:SDLNameWayPoints ofClass:SDLLocationDetails.class]; + return [parameters sdl_objectsForName:SDLRPCParameterNameWayPoints ofClass:SDLLocationDetails.class]; } @end diff --git a/SmartDeviceLink/SDLParameterPermissions.m b/SmartDeviceLink/SDLParameterPermissions.m index bcc2f7047..aab3f77e7 100644 --- a/SmartDeviceLink/SDLParameterPermissions.m +++ b/SmartDeviceLink/SDLParameterPermissions.m @@ -5,26 +5,26 @@ #import "SDLParameterPermissions.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLParameterPermissions - (void)setAllowed:(NSArray<NSString *> *)allowed { - [store sdl_setObject:allowed forName:SDLNameAllowed]; + [store sdl_setObject:allowed forName:SDLRPCParameterNameAllowed]; } - (NSArray<NSString *> *)allowed { - return [store sdl_objectForName:SDLNameAllowed]; + return [store sdl_objectForName:SDLRPCParameterNameAllowed]; } - (void)setUserDisallowed:(NSArray<NSString *> *)userDisallowed { - [store sdl_setObject:userDisallowed forName:SDLNameUserDisallowed]; + [store sdl_setObject:userDisallowed forName:SDLRPCParameterNameUserDisallowed]; } - (NSArray<NSString *> *)userDisallowed { - return [store sdl_objectForName:SDLNameUserDisallowed]; + return [store sdl_objectForName:SDLRPCParameterNameUserDisallowed]; } @end diff --git a/SmartDeviceLink/SDLPerformAppServiceInteraction.h b/SmartDeviceLink/SDLPerformAppServiceInteraction.h new file mode 100644 index 000000000..6d69c8323 --- /dev/null +++ b/SmartDeviceLink/SDLPerformAppServiceInteraction.h @@ -0,0 +1,79 @@ +// +// SDLPerformAppServiceInteraction.h +// SmartDeviceLink +// +// Created by Nicole on 2/6/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import "SDLRPCRequest.h" + +NS_ASSUME_NONNULL_BEGIN + +/** + * App service providers will likely have different actions exposed to the module and app service consumers. It will be difficult to standardize these actions by RPC versions and can easily become stale. Therefore, we introduce a best-effort attempt to take actions on a service. + * + * The `PerformAppServiceInteraction` request will be sent to the service that has the matching `appServiceId`. The `serviceUri` should be the fully qualified URI with all parameters that are necessary for the given action. The URI prefix and actions list will be contained in the app service provider's manifest. SDL takes no steps to validate an app service provider's action sheet JSON object. In the future, plug in libraries could be added to handle these sheets on a provider by provider basis. + * + * An app service consumer can also request for this service to become the active service of its respective type. If the app service consumer currently has an HMI state of HMI_FULL this request can be performed without user interaction. If the app is currently not in that state, the HMI should present the user with a choice to allow this app service provider to become the active service of its specified type. If the app service provider is not allowed to become active, the request will not be sent to it and an unsuccessful response will be sent to the requester. + * + * SDL should make no guarantees that: + * 1. App service providers offer URI prefix and URI Schema + * 2. App service providers will correctly respond to the requests + * 3. The requested app service provider will become the active service of that type + * 4. The `serviceUri` will be a correctly formatted URI from the app service consumer + */ +@interface SDLPerformAppServiceInteraction : SDLRPCRequest + +/** + * Convenience init for required parameters. + * + * @param serviceUri The service URI + * @param serviceID The app service ID + * @param originApp The origin app + * @return A SDLPerformAppServiceInteraction object + */ +- (instancetype)initWithServiceUri:(NSString *)serviceUri serviceID:(NSString *)serviceID originApp:(NSString *)originApp; + +/** + * Convenience init for all parameters. + * + * @param serviceUri The service URI + * @param serviceID The app service ID + * @param originApp The origin app + * @param requestServiceActive Whether or not the service is active + * @return A SDLPerformAppServiceInteraction object + */ +- (instancetype)initWithServiceUri:(NSString *)serviceUri serviceID:(NSString *)serviceID originApp:(NSString *)originApp requestServiceActive:(BOOL)requestServiceActive; + +/** + * Fully qualified URI based on the URI prefix and URI scheme the app service provided. SDL makes no gurantee that this URI is correct. + * + * String, Required + */ +@property (strong, nonatomic) NSString *serviceUri; + +/** + * The service ID that the app consumer wishes to send this URI. + * + * String, Required + */ +@property (strong, nonatomic) NSString *serviceID; + +/** + * This string is the appID of the app requesting the app service provider take the specific action. + * + * String, Required + */ +@property (strong, nonatomic) NSString *originApp; + +/** + * This flag signals the requesting consumer would like this service to become the active primary service of the destination's type. + * + * Boolean, Optional + */ +@property (nullable, strong, nonatomic) NSNumber<SDLBool> *requestServiceActive; + +@end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLPerformAppServiceInteraction.m b/SmartDeviceLink/SDLPerformAppServiceInteraction.m new file mode 100644 index 000000000..ccbd0293e --- /dev/null +++ b/SmartDeviceLink/SDLPerformAppServiceInteraction.m @@ -0,0 +1,83 @@ +// +// SDLPerformAppServiceInteraction.m +// SmartDeviceLink +// +// Created by Nicole on 2/6/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import "SDLPerformAppServiceInteraction.h" + +#import "NSMutableDictionary+Store.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" + + +NS_ASSUME_NONNULL_BEGIN + +@implementation SDLPerformAppServiceInteraction + +- (instancetype)init { + if (self = [super initWithName:SDLRPCFunctionNamePerformAppServiceInteraction]) { + } + return self; +} + +- (instancetype)initWithServiceUri:(NSString *)serviceUri serviceID:(NSString *)serviceID originApp:(NSString *)originApp { + self = [self init]; + if (!self) { + return nil; + } + + self.serviceUri = serviceUri; + self.serviceID = serviceID; + self.originApp = originApp; + + return self; +} + +- (instancetype)initWithServiceUri:(NSString *)serviceUri serviceID:(NSString *)serviceID originApp:(NSString *)originApp requestServiceActive:(BOOL)requestServiceActive { + self = [self initWithServiceUri:serviceUri serviceID:serviceID originApp:originApp]; + if (!self) { + return nil; + } + + self.requestServiceActive = @(requestServiceActive); + + return self; +} + +- (void)setServiceUri:(NSString *)serviceUri { + [parameters sdl_setObject:serviceUri forName:SDLRPCParameterNameServiceUri]; +} + +- (NSString *)serviceUri { + return [parameters sdl_objectForName:SDLRPCParameterNameServiceUri]; +} + +- (void)setServiceID:(NSString *)serviceID { + [parameters sdl_setObject:serviceID forName:SDLRPCParameterNameServiceID]; +} + +- (NSString *)serviceID { + return [parameters sdl_objectForName:SDLRPCParameterNameServiceID]; +} + +- (void)setOriginApp:(NSString *)originApp { + [parameters sdl_setObject:originApp forName:SDLRPCParameterNameOriginApp]; +} + +- (NSString *)originApp { + return [parameters sdl_objectForName:SDLRPCParameterNameOriginApp]; +} + +- (void)setRequestServiceActive:(nullable NSNumber<SDLBool> *)requestServiceActive { + [parameters sdl_setObject:requestServiceActive forName:SDLRPCParameterNameRequestServiceActive]; +} + +- (nullable NSNumber<SDLBool> *)requestServiceActive { + return [parameters sdl_objectForName:SDLRPCParameterNameRequestServiceActive]; +} +@end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLPerformAppServiceInteractionResponse.h b/SmartDeviceLink/SDLPerformAppServiceInteractionResponse.h new file mode 100644 index 000000000..8fbadebf2 --- /dev/null +++ b/SmartDeviceLink/SDLPerformAppServiceInteractionResponse.h @@ -0,0 +1,36 @@ +// +// SDLPerformAppServiceInteractionResponse.h +// SmartDeviceLink +// +// Created by Nicole on 2/6/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import "SDLRPCResponse.h" + + +NS_ASSUME_NONNULL_BEGIN + +/* + * Response to the request to request an app service. + */ +@interface SDLPerformAppServiceInteractionResponse : SDLRPCResponse + +/** + * Convenience init for all parameters. + * + * @param serviceSpecificResult The service can provide specific result strings to the consumer through this param. These results should be described in the URI schema set in the Service Manifest + * @return A SDLPerformAppServiceInteractionResponse object + */ +- (instancetype)initWithServiceSpecificResult:(NSString *)serviceSpecificResult; + +/** + * The service can provide specific result strings to the consumer through this param. These results should be described in the URI schema set in the Service Manifest. + * + * String, Optional + */ +@property (nullable, strong, nonatomic) NSString *serviceSpecificResult; + +@end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLPerformAppServiceInteractionResponse.m b/SmartDeviceLink/SDLPerformAppServiceInteractionResponse.m new file mode 100644 index 000000000..77c95a240 --- /dev/null +++ b/SmartDeviceLink/SDLPerformAppServiceInteractionResponse.m @@ -0,0 +1,46 @@ +// +// SDLPerformAppServiceInteractionResponse.m +// SmartDeviceLink +// +// Created by Nicole on 2/6/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import "SDLPerformAppServiceInteractionResponse.h" + +#import "NSMutableDictionary+Store.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" + +NS_ASSUME_NONNULL_BEGIN + +@implementation SDLPerformAppServiceInteractionResponse + +- (instancetype)init { + if (self = [super initWithName:SDLRPCFunctionNamePerformAppServiceInteraction]) { + } + return self; +} + +- (instancetype)initWithServiceSpecificResult:(NSString *)serviceSpecificResult { + self = [self init]; + if (!self) { + return nil; + } + + self.serviceSpecificResult = serviceSpecificResult; + + return self; +} + +- (void)setServiceSpecificResult:(nullable NSString *)serviceSpecificResult { + [parameters sdl_setObject:serviceSpecificResult forName:SDLRPCParameterNameServiceSpecificResult]; +} + +- (nullable NSString *)serviceSpecificResult { + return [parameters sdl_objectForName:SDLRPCParameterNameServiceSpecificResult]; +} + +@end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLPerformAudioPassThru.m b/SmartDeviceLink/SDLPerformAudioPassThru.m index f2bbbdf10..5a90481db 100644 --- a/SmartDeviceLink/SDLPerformAudioPassThru.m +++ b/SmartDeviceLink/SDLPerformAudioPassThru.m @@ -5,7 +5,8 @@ #import "SDLPerformAudioPassThru.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" #import "SDLTTSChunk.h" NS_ASSUME_NONNULL_BEGIN @@ -13,7 +14,7 @@ NS_ASSUME_NONNULL_BEGIN @implementation SDLPerformAudioPassThru - (instancetype)init { - if (self = [super initWithName:SDLNamePerformAudioPassThru]) { + if (self = [super initWithName:SDLRPCFunctionNamePerformAudioPassThru]) { } return self; } @@ -57,68 +58,68 @@ NS_ASSUME_NONNULL_BEGIN - (void)setInitialPrompt:(nullable NSArray<SDLTTSChunk *> *)initialPrompt { - [parameters sdl_setObject:initialPrompt forName:SDLNameInitialPrompt]; + [parameters sdl_setObject:initialPrompt forName:SDLRPCParameterNameInitialPrompt]; } - (nullable NSArray<SDLTTSChunk *> *)initialPrompt { - return [parameters sdl_objectsForName:SDLNameInitialPrompt ofClass:SDLTTSChunk.class]; + return [parameters sdl_objectsForName:SDLRPCParameterNameInitialPrompt ofClass:SDLTTSChunk.class]; } - (void)setAudioPassThruDisplayText1:(nullable NSString *)audioPassThruDisplayText1 { - [parameters sdl_setObject:audioPassThruDisplayText1 forName:SDLNameAudioPassThruDisplayText1]; + [parameters sdl_setObject:audioPassThruDisplayText1 forName:SDLRPCParameterNameAudioPassThruDisplayText1]; } - (nullable NSString *)audioPassThruDisplayText1 { - return [parameters sdl_objectForName:SDLNameAudioPassThruDisplayText1]; + return [parameters sdl_objectForName:SDLRPCParameterNameAudioPassThruDisplayText1]; } - (void)setAudioPassThruDisplayText2:(nullable NSString *)audioPassThruDisplayText2 { - [parameters sdl_setObject:audioPassThruDisplayText2 forName:SDLNameAudioPassThruDisplayText2]; + [parameters sdl_setObject:audioPassThruDisplayText2 forName:SDLRPCParameterNameAudioPassThruDisplayText2]; } - (nullable NSString *)audioPassThruDisplayText2 { - return [parameters sdl_objectForName:SDLNameAudioPassThruDisplayText2]; + return [parameters sdl_objectForName:SDLRPCParameterNameAudioPassThruDisplayText2]; } - (void)setSamplingRate:(SDLSamplingRate)samplingRate { - [parameters sdl_setObject:samplingRate forName:SDLNameSamplingRate]; + [parameters sdl_setObject:samplingRate forName:SDLRPCParameterNameSamplingRate]; } - (SDLSamplingRate)samplingRate { - NSObject *obj = [parameters sdl_objectForName:SDLNameSamplingRate]; + NSObject *obj = [parameters sdl_objectForName:SDLRPCParameterNameSamplingRate]; return (SDLSamplingRate )obj; } - (void)setMaxDuration:(NSNumber<SDLInt> *)maxDuration { - [parameters sdl_setObject:maxDuration forName:SDLNameMaxDuration]; + [parameters sdl_setObject:maxDuration forName:SDLRPCParameterNameMaxDuration]; } - (NSNumber<SDLInt> *)maxDuration { - return [parameters sdl_objectForName:SDLNameMaxDuration]; + return [parameters sdl_objectForName:SDLRPCParameterNameMaxDuration]; } - (void)setBitsPerSample:(SDLBitsPerSample)bitsPerSample { - [parameters sdl_setObject:bitsPerSample forName:SDLNameBitsPerSample]; + [parameters sdl_setObject:bitsPerSample forName:SDLRPCParameterNameBitsPerSample]; } - (SDLBitsPerSample)bitsPerSample { - return [parameters sdl_objectForName:SDLNameBitsPerSample]; + return [parameters sdl_objectForName:SDLRPCParameterNameBitsPerSample]; } - (void)setAudioType:(SDLAudioType)audioType { - [parameters sdl_setObject:audioType forName:SDLNameAudioType]; + [parameters sdl_setObject:audioType forName:SDLRPCParameterNameAudioType]; } - (SDLAudioType)audioType { - return [parameters sdl_objectForName:SDLNameAudioType]; + return [parameters sdl_objectForName:SDLRPCParameterNameAudioType]; } - (void)setMuteAudio:(nullable NSNumber<SDLBool> *)muteAudio { - [parameters sdl_setObject:muteAudio forName:SDLNameMuteAudio]; + [parameters sdl_setObject:muteAudio forName:SDLRPCParameterNameMuteAudio]; } - (nullable NSNumber<SDLBool> *)muteAudio { - return [parameters sdl_objectForName:SDLNameMuteAudio]; + return [parameters sdl_objectForName:SDLRPCParameterNameMuteAudio]; } @end diff --git a/SmartDeviceLink/SDLPerformAudioPassThruResponse.m b/SmartDeviceLink/SDLPerformAudioPassThruResponse.m index 31a5c5a57..66d2f72e1 100644 --- a/SmartDeviceLink/SDLPerformAudioPassThruResponse.m +++ b/SmartDeviceLink/SDLPerformAudioPassThruResponse.m @@ -5,14 +5,15 @@ #import "SDLPerformAudioPassThruResponse.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLPerformAudioPassThruResponse - (instancetype)init { - if (self = [super initWithName:SDLNamePerformAudioPassThru]) { + if (self = [super initWithName:SDLRPCFunctionNamePerformAudioPassThru]) { } return self; } diff --git a/SmartDeviceLink/SDLPerformInteraction.m b/SmartDeviceLink/SDLPerformInteraction.m index c4faeda37..4754ebaec 100644 --- a/SmartDeviceLink/SDLPerformInteraction.m +++ b/SmartDeviceLink/SDLPerformInteraction.m @@ -5,7 +5,8 @@ #import "SDLPerformInteraction.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" #import "SDLTTSChunk.h" #import "SDLVrHelpItem.h" @@ -14,7 +15,7 @@ NS_ASSUME_NONNULL_BEGIN @implementation SDLPerformInteraction - (instancetype)init { - if (self = [super initWithName:SDLNamePerformInteraction]) { + if (self = [super initWithName:SDLRPCFunctionNamePerformInteraction]) { } return self; } @@ -91,75 +92,75 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setInitialText:(NSString *)initialText { - [parameters sdl_setObject:initialText forName:SDLNameInitialText]; + [parameters sdl_setObject:initialText forName:SDLRPCParameterNameInitialText]; } - (NSString *)initialText { - return [parameters sdl_objectForName:SDLNameInitialText]; + return [parameters sdl_objectForName:SDLRPCParameterNameInitialText]; } - (void)setInitialPrompt:(nullable NSArray<SDLTTSChunk *> *)initialPrompt { - [parameters sdl_setObject:initialPrompt forName:SDLNameInitialPrompt]; + [parameters sdl_setObject:initialPrompt forName:SDLRPCParameterNameInitialPrompt]; } - (nullable NSArray<SDLTTSChunk *> *)initialPrompt { - return [parameters sdl_objectsForName:SDLNameInitialPrompt ofClass:SDLTTSChunk.class]; + return [parameters sdl_objectsForName:SDLRPCParameterNameInitialPrompt ofClass:SDLTTSChunk.class]; } - (void)setInteractionMode:(SDLInteractionMode)interactionMode { - [parameters sdl_setObject:interactionMode forName:SDLNameInteractionMode]; + [parameters sdl_setObject:interactionMode forName:SDLRPCParameterNameInteractionMode]; } - (SDLInteractionMode)interactionMode { - return [parameters sdl_objectForName:SDLNameInteractionMode]; + return [parameters sdl_objectForName:SDLRPCParameterNameInteractionMode]; } - (void)setInteractionChoiceSetIDList:(NSArray<NSNumber<SDLInt> *> *)interactionChoiceSetIDList { - [parameters sdl_setObject:interactionChoiceSetIDList forName:SDLNameInteractionChoiceSetIdList]; + [parameters sdl_setObject:interactionChoiceSetIDList forName:SDLRPCParameterNameInteractionChoiceSetIdList]; } - (NSArray<NSNumber<SDLInt> *> *)interactionChoiceSetIDList { - return [parameters sdl_objectForName:SDLNameInteractionChoiceSetIdList]; + return [parameters sdl_objectForName:SDLRPCParameterNameInteractionChoiceSetIdList]; } - (void)setHelpPrompt:(nullable NSArray<SDLTTSChunk *> *)helpPrompt { - [parameters sdl_setObject:helpPrompt forName:SDLNameHelpPrompt]; + [parameters sdl_setObject:helpPrompt forName:SDLRPCParameterNameHelpPrompt]; } - (nullable NSArray<SDLTTSChunk *> *)helpPrompt { - return [parameters sdl_objectsForName:SDLNameHelpPrompt ofClass:SDLTTSChunk.class]; + return [parameters sdl_objectsForName:SDLRPCParameterNameHelpPrompt ofClass:SDLTTSChunk.class]; } - (void)setTimeoutPrompt:(nullable NSArray<SDLTTSChunk *> *)timeoutPrompt { - [parameters sdl_setObject:timeoutPrompt forName:SDLNameTimeoutPrompt]; + [parameters sdl_setObject:timeoutPrompt forName:SDLRPCParameterNameTimeoutPrompt]; } - (nullable NSArray<SDLTTSChunk *> *)timeoutPrompt { - return [parameters sdl_objectsForName:SDLNameTimeoutPrompt ofClass:SDLTTSChunk.class]; + return [parameters sdl_objectsForName:SDLRPCParameterNameTimeoutPrompt ofClass:SDLTTSChunk.class]; } - (void)setTimeout:(nullable NSNumber<SDLInt> *)timeout { - [parameters sdl_setObject:timeout forName:SDLNameTimeout]; + [parameters sdl_setObject:timeout forName:SDLRPCParameterNameTimeout]; } - (nullable NSNumber<SDLInt> *)timeout { - return [parameters sdl_objectForName:SDLNameTimeout]; + return [parameters sdl_objectForName:SDLRPCParameterNameTimeout]; } - (void)setVrHelp:(nullable NSArray<SDLVRHelpItem *> *)vrHelp { - [parameters sdl_setObject:vrHelp forName:SDLNameVRHelp]; + [parameters sdl_setObject:vrHelp forName:SDLRPCParameterNameVRHelp]; } - (nullable NSArray<SDLVRHelpItem *> *)vrHelp { - return [parameters sdl_objectsForName:SDLNameVRHelp ofClass:SDLVRHelpItem.class]; + return [parameters sdl_objectsForName:SDLRPCParameterNameVRHelp ofClass:SDLVRHelpItem.class]; } - (void)setInteractionLayout:(nullable SDLLayoutMode)interactionLayout { - [parameters sdl_setObject:interactionLayout forName:SDLNameInteractionLayout]; + [parameters sdl_setObject:interactionLayout forName:SDLRPCParameterNameInteractionLayout]; } - (nullable SDLLayoutMode)interactionLayout { - return [parameters sdl_objectForName:SDLNameInteractionLayout]; + return [parameters sdl_objectForName:SDLRPCParameterNameInteractionLayout]; } @end diff --git a/SmartDeviceLink/SDLPerformInteractionResponse.m b/SmartDeviceLink/SDLPerformInteractionResponse.m index 085c844d5..71479be9a 100644 --- a/SmartDeviceLink/SDLPerformInteractionResponse.m +++ b/SmartDeviceLink/SDLPerformInteractionResponse.m @@ -5,40 +5,41 @@ #import "SDLPerformInteractionResponse.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLPerformInteractionResponse - (instancetype)init { - if (self = [super initWithName:SDLNamePerformInteraction]) { + if (self = [super initWithName:SDLRPCFunctionNamePerformInteraction]) { } return self; } - (void)setChoiceID:(nullable NSNumber<SDLInt> *)choiceID { - [parameters sdl_setObject:choiceID forName:SDLNameChoiceId]; + [parameters sdl_setObject:choiceID forName:SDLRPCParameterNameChoiceId]; } - (nullable NSNumber<SDLInt> *)choiceID { - return [parameters sdl_objectForName:SDLNameChoiceId]; + return [parameters sdl_objectForName:SDLRPCParameterNameChoiceId]; } - (void)setManualTextEntry:(nullable NSString *)manualTextEntry { - [parameters sdl_setObject:manualTextEntry forName:SDLNameManualTextEntry]; + [parameters sdl_setObject:manualTextEntry forName:SDLRPCParameterNameManualTextEntry]; } - (nullable NSString *)manualTextEntry { - return [parameters sdl_objectForName:SDLNameManualTextEntry]; + return [parameters sdl_objectForName:SDLRPCParameterNameManualTextEntry]; } - (void)setTriggerSource:(nullable SDLTriggerSource)triggerSource { - [parameters sdl_setObject:triggerSource forName:SDLNameTriggerSource]; + [parameters sdl_setObject:triggerSource forName:SDLRPCParameterNameTriggerSource]; } - (nullable SDLTriggerSource)triggerSource { - return [parameters sdl_objectForName:SDLNameTriggerSource]; + return [parameters sdl_objectForName:SDLRPCParameterNameTriggerSource]; } @end diff --git a/SmartDeviceLink/SDLPermissionItem.m b/SmartDeviceLink/SDLPermissionItem.m index 01cdf127b..5e9b950d0 100644 --- a/SmartDeviceLink/SDLPermissionItem.m +++ b/SmartDeviceLink/SDLPermissionItem.m @@ -5,7 +5,7 @@ #import "NSMutableDictionary+Store.h" #import "SDLHMIPermissions.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" #import "SDLParameterPermissions.h" NS_ASSUME_NONNULL_BEGIN @@ -13,27 +13,27 @@ NS_ASSUME_NONNULL_BEGIN @implementation SDLPermissionItem - (void)setRpcName:(NSString *)rpcName { - [store sdl_setObject:rpcName forName:SDLNameRPCName]; + [store sdl_setObject:rpcName forName:SDLRPCParameterNameRPCName]; } - (NSString *)rpcName { - return [store sdl_objectForName:SDLNameRPCName]; + return [store sdl_objectForName:SDLRPCParameterNameRPCName]; } - (void)setHmiPermissions:(SDLHMIPermissions *)hmiPermissions { - [store sdl_setObject:hmiPermissions forName:SDLNameHMIPermissions]; + [store sdl_setObject:hmiPermissions forName:SDLRPCParameterNameHMIPermissions]; } - (SDLHMIPermissions *)hmiPermissions { - return [store sdl_objectForName:SDLNameHMIPermissions ofClass:SDLHMIPermissions.class]; + return [store sdl_objectForName:SDLRPCParameterNameHMIPermissions ofClass:SDLHMIPermissions.class]; } - (void)setParameterPermissions:(SDLParameterPermissions *)parameterPermissions { - [store sdl_setObject:parameterPermissions forName:SDLNameParameterPermissions]; + [store sdl_setObject:parameterPermissions forName:SDLRPCParameterNameParameterPermissions]; } - (SDLParameterPermissions *)parameterPermissions { - return [store sdl_objectForName:SDLNameParameterPermissions ofClass:SDLParameterPermissions.class]; + return [store sdl_objectForName:SDLRPCParameterNameParameterPermissions ofClass:SDLParameterPermissions.class]; } @end diff --git a/SmartDeviceLink/SDLPhoneCapability.m b/SmartDeviceLink/SDLPhoneCapability.m index 5089f8ad3..f1f88dcdb 100644 --- a/SmartDeviceLink/SDLPhoneCapability.m +++ b/SmartDeviceLink/SDLPhoneCapability.m @@ -9,7 +9,7 @@ #import "SDLPhoneCapability.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" NS_ASSUME_NONNULL_BEGIN @@ -27,11 +27,11 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setDialNumberEnabled:(nullable NSNumber *)dialNumberEnabled { - [store sdl_setObject:dialNumberEnabled forName:SDLNameDialNumberEnabled]; + [store sdl_setObject:dialNumberEnabled forName:SDLRPCParameterNameDialNumberEnabled]; } - (nullable NSNumber *)dialNumberEnabled { - return [store sdl_objectForName:SDLNameDialNumberEnabled]; + return [store sdl_objectForName:SDLRPCParameterNameDialNumberEnabled]; } @end diff --git a/SmartDeviceLink/SDLPresetBankCapabilities.m b/SmartDeviceLink/SDLPresetBankCapabilities.m index 2fe43d7a7..f767c3c30 100644 --- a/SmartDeviceLink/SDLPresetBankCapabilities.m +++ b/SmartDeviceLink/SDLPresetBankCapabilities.m @@ -5,18 +5,18 @@ #import "SDLPresetBankCapabilities.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLPresetBankCapabilities - (void)setOnScreenPresetsAvailable:(NSNumber<SDLBool> *)onScreenPresetsAvailable { - [store sdl_setObject:onScreenPresetsAvailable forName:SDLNameOnScreenPresetsAvailable]; + [store sdl_setObject:onScreenPresetsAvailable forName:SDLRPCParameterNameOnScreenPresetsAvailable]; } - (NSNumber<SDLBool> *)onScreenPresetsAvailable { - return [store sdl_objectForName:SDLNameOnScreenPresetsAvailable]; + return [store sdl_objectForName:SDLRPCParameterNameOnScreenPresetsAvailable]; } @end diff --git a/SmartDeviceLink/SDLProtocolMessage.m b/SmartDeviceLink/SDLProtocolMessage.m index 66680e40e..81fc23e82 100644 --- a/SmartDeviceLink/SDLProtocolMessage.m +++ b/SmartDeviceLink/SDLProtocolMessage.m @@ -6,7 +6,7 @@ #import "NSMutableDictionary+Store.h" #import "SDLFunctionID.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" #import "SDLProtocolHeader.h" #import "SDLRPCPayload.h" #import "SDLV1ProtocolMessage.h" @@ -60,7 +60,7 @@ NS_ASSUME_NONNULL_BEGIN if (self.header.version >= 2) { SDLRPCPayload *rpcPayload = [SDLRPCPayload rpcPayloadWithData:self.payload]; if (rpcPayload) { - SDLName functionName = [[SDLFunctionID sharedInstance] functionNameForId:rpcPayload.functionID]; + SDLRPCParameterName functionName = [[SDLFunctionID sharedInstance] functionNameForId:rpcPayload.functionID]; UInt8 rpcType = rpcPayload.rpcType; NSArray<NSString *> *rpcTypeNames = @[@"Request", @"Response", @"Notification"]; diff --git a/SmartDeviceLink/SDLProxy.m b/SmartDeviceLink/SDLProxy.m index a21057ebf..e78853887 100644 --- a/SmartDeviceLink/SDLProxy.m +++ b/SmartDeviceLink/SDLProxy.m @@ -41,6 +41,9 @@ #import "SDLVehicleType.h" #import "SDLVersion.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" + NS_ASSUME_NONNULL_BEGIN typedef NSString SDLVehicleMake; @@ -385,7 +388,7 @@ static float DefaultConnectionTimeout = 45.0; NSString *messageType = [message messageType]; // If it's a response, append response - if ([messageType isEqualToString:SDLNameResponse]) { + if ([messageType isEqualToString:SDLRPCParameterNameResponse]) { BOOL notGenericResponseMessage = ![functionName isEqualToString:@"GenericResponse"]; if (notGenericResponseMessage) { functionName = [NSString stringWithFormat:@"%@Response", functionName]; @@ -400,7 +403,7 @@ static float DefaultConnectionTimeout = 45.0; SDLLogV(@"Message received: %@", newMessage); // Intercept and handle several messages ourselves - if ([functionName isEqualToString:SDLNameOnAppInterfaceUnregistered] || [functionName isEqualToString:SDLNameUnregisterAppInterface]) { + if ([functionName isEqualToString:SDLRPCFunctionNameOnAppInterfaceUnregistered] || [functionName isEqualToString:SDLRPCFunctionNameUnregisterAppInterface]) { [self handleRPCUnregistered:dict]; } @@ -610,7 +613,7 @@ static float DefaultConnectionTimeout = 45.0; #pragma mark Handle Post-Invoke of Delegate Methods - (void)handleAfterHMIStatus:(SDLRPCMessage *)message { - SDLHMILevel hmiLevel = (SDLHMILevel)[message getParameters:SDLNameHMILevel]; + SDLHMILevel hmiLevel = (SDLHMILevel)[message getParameters:SDLRPCParameterNameHMILevel]; _lsm.hmiLevel = hmiLevel; SEL callbackSelector = NSSelectorFromString(@"onOnLockScreenNotification:"); @@ -618,7 +621,7 @@ static float DefaultConnectionTimeout = 45.0; } - (void)handleAfterDriverDistraction:(SDLRPCMessage *)message { - NSString *stateString = (NSString *)[message getParameters:SDLNameState]; + NSString *stateString = (NSString *)[message getParameters:SDLRPCParameterNameState]; BOOL state = [stateString isEqualToString:@"DD_ON"] ? YES : NO; _lsm.driverDistracted = state; diff --git a/SmartDeviceLink/SDLProxyListener.h b/SmartDeviceLink/SDLProxyListener.h index 81d4fa461..21a73c8b1 100644 --- a/SmartDeviceLink/SDLProxyListener.h +++ b/SmartDeviceLink/SDLProxyListener.h @@ -3,31 +3,57 @@ #import <UIKit/UIKit.h> +@class SDLAddCommand; @class SDLAddCommandResponse; +@class SDLAddSubMenu; @class SDLAddSubMenuResponse; +@class SDLAlert; +@class SDLAlertManeuver; @class SDLAlertManeuverResponse; @class SDLAlertResponse; +@class SDLButtonPress; @class SDLButtonPressResponse; +@class SDLChangeRegistration; @class SDLChangeRegistrationResponse; +@class SDLCreateInteractionChoiceSet; @class SDLCreateInteractionChoiceSetResponse; +@class SDLDeleteCommand; @class SDLDeleteCommandResponse; +@class SDLDeleteFile; @class SDLDeleteFileResponse; +@class SDLDeleteInteractionChoiceSet; @class SDLDeleteInteractionChoiceSetResponse; +@class SDLDeleteSubMenu; @class SDLDeleteSubMenuResponse; +@class SDLDiagnosticMessage; @class SDLDiagnosticMessageResponse; +@class SDLDialNumber; @class SDLDialNumberResponse; +@class SDLEncodedSyncPData; @class SDLEncodedSyncPDataResponse; +@class SDLEndAudioPassThru; @class SDLEndAudioPassThruResponse; @class SDLGenericResponse; @class SDLGetCloudAppProperties; @class SDLGetCloudAppPropertiesResponse; +@class SDLGetAppServiceData; +@class SDLGetAppServiceDataResponse; +@class SDLGetDTCs; @class SDLGetDTCsResponse; +@class SDLGetFile; +@class SDLGetFileResponse; +@class SDLGetInteriorVehicleData; @class SDLGetInteriorVehicleDataResponse; +@class SDLGetSystemCapability; @class SDLGetSystemCapabilityResponse; +@class SDLGetVehicleData; @class SDLGetVehicleDataResponse; -@class SDLGetWaypointsResponse; +@class SDLGetWayPoints; +@class SDLGetWayPointsResponse; +@class SDLListFiles; @class SDLListFilesResponse; @class SDLOnAppInterfaceUnregistered; +@class SDLOnAppServiceData; @class SDLOnAudioPassThru; @class SDLOnButtonEvent; @class SDLOnButtonPress; @@ -43,41 +69,73 @@ @class SDLOnPermissionsChange; @class SDLOnRCStatus; @class SDLOnSyncPData; +@class SDLOnSystemCapabilityUpdated; @class SDLOnSystemRequest; -@class SDLOnVehicleData; @class SDLOnTBTClientState; @class SDLOnTouchEvent; @class SDLOnVehicleData; @class SDLOnWayPointChange; +@class SDLPerformAppServiceInteraction; +@class SDLPerformAppServiceInteractionResponse; +@class SDLPerformAudioPassThru; @class SDLPerformAudioPassThruResponse; +@class SDLPerformInteraction; @class SDLPerformInteractionResponse; +@class SDLPublishAppService; +@class SDLPublishAppServiceResponse; +@class SDLPutFile; @class SDLPutFileResponse; +@class SDLReadDID; @class SDLReadDIDResponse; +@class SDLRegisterAppInterface; @class SDLRegisterAppInterfaceResponse; +@class SDLResetGlobalProperties; @class SDLResetGlobalPropertiesResponse; +@class SDLScrollableMessage; @class SDLScrollableMessageResponse; +@class SDLSendHapticData; @class SDLSendHapticDataResponse; +@class SDLSendLocation; @class SDLSendLocationResponse; +@class SDLSetAppIcon; @class SDLSetAppIconResponse; @class SDLSetCloudAppProperties; @class SDLSetCloudAppPropertiesResponse; +@class SDLSetDisplayLayout; @class SDLSetDisplayLayoutResponse; +@class SDLSetGlobalProperties; @class SDLSetGlobalPropertiesResponse; +@class SDLSetInteriorVehicleData; @class SDLSetInteriorVehicleDataResponse; +@class SDLSetMediaClockTimer; @class SDLSetMediaClockTimerResponse; +@class SDLShow; +@class SDLShowConstantTBT; @class SDLShowConstantTBTResponse; @class SDLShowResponse; +@class SDLSlider; @class SDLSliderResponse; +@class SDLSpeak; @class SDLSpeakResponse; +@class SDLSubscribeButton; @class SDLSubscribeButtonResponse; +@class SDLSubscribeVehicleData; @class SDLSubscribeVehicleDataResponse; +@class SDLSubscribeWayPoints; @class SDLSubscribeWayPointsResponse; +@class SDLSyncPData; @class SDLSyncPDataResponse; -@class SDLUpdateTurnListResponse; +@class SDLSystemRequest; +@class SDLUnregisterAppInterface; @class SDLUnregisterAppInterfaceResponse; +@class SDLUnsubscribeButton; @class SDLUnsubscribeButtonResponse; +@class SDLUnsubscribeVehicleData; @class SDLUnsubscribeVehicleDataResponse; +@class SDLUnsubscribeWayPoints; @class SDLUnsubscribeWayPointsResponse; +@class SDLUpdateTurnList; +@class SDLUpdateTurnListResponse; NS_ASSUME_NONNULL_BEGIN @@ -109,6 +167,7 @@ NS_ASSUME_NONNULL_BEGIN @optional +#pragma mark - Responses /** * Called when a `SetCloudAppProperties` request is received from Core * @@ -229,18 +288,18 @@ NS_ASSUME_NONNULL_BEGIN - (void)onEndAudioPassThruResponse:(SDLEndAudioPassThruResponse *)response; /** - * Called when an Error message is received from Core + * Called when a Generic Response is received from Core * - * @param e An exception message + * @param response A SDLGenericResponse object */ -- (void)onError:(NSException *)e; +- (void)onGenericResponse:(SDLGenericResponse *)response; /** - * Called when a Generic Response is received from Core + * Called when a Get App Service Data Response is received from Core * - * @param response A SDLGenericResponse object + * @param response A SDLGetAppServiceDataResponse object */ -- (void)onGenericResponse:(SDLGenericResponse *)response; +- (void)onGetAppServiceDataResponse:(SDLGetAppServiceDataResponse *)response; /** * Called when a GetCloudAppPropertiesResponse Response is received from Core @@ -257,6 +316,13 @@ NS_ASSUME_NONNULL_BEGIN - (void)onGetDTCsResponse:(SDLGetDTCsResponse *)response; /** + * Called when a Get File Response is received from Core + * + * @param response A SDLGetFileResponse object + */ +- (void)onGetFileResponse:(SDLGetFileResponse *)response; + +/** * Called when a Get Interior Vehicle Data Response is received from Core * * @param response A SDLGetInteriorVehicleDataResponse object @@ -282,7 +348,7 @@ NS_ASSUME_NONNULL_BEGIN * * @param response A SDLGetWaypointsResponse object */ -- (void)onGetWayPointsResponse:(SDLGetWaypointsResponse *)response; +- (void)onGetWayPointsResponse:(SDLGetWayPointsResponse *)response; /** * Called when a List Files Response is received from Core @@ -299,137 +365,11 @@ NS_ASSUME_NONNULL_BEGIN - (void)onReceivedLockScreenIcon:(UIImage *)icon; /** - * Called when an On App Interface Unregistered notification is received from Core - * - * @param notification A SDLOnAppInterfaceUnregistered object - */ -- (void)onOnAppInterfaceUnregistered:(SDLOnAppInterfaceUnregistered *)notification; - -/** - * Called when an On Audio Pass Thru notification is received from Core - * - * @param notification A SDLOnAudioPassThru object - */ -- (void)onOnAudioPassThru:(SDLOnAudioPassThru *)notification; - -/** - * Called when an On Button Event notification is received from Core - * - * @param notification A SDLOnButtonEvent object - */ -- (void)onOnButtonEvent:(SDLOnButtonEvent *)notification; - -/** - * Called when an On Button Press notification is received from Core - * - * @param notification A SDLOnButtonPress object - */ -- (void)onOnButtonPress:(SDLOnButtonPress *)notification; - -/** - * Called when an On Command notification is received from Core - * - * @param notification A SDLOnCommand object - */ -- (void)onOnCommand:(SDLOnCommand *)notification; - -/** - * Called when an On Encoded Sync P Data notification is received from Core - * - * @param notification A SDLOnEncodedSyncPData object - */ -- (void)onOnEncodedSyncPData:(SDLOnEncodedSyncPData *)notification; - -/** - * Called when an On Hash Change notification is received from Core - * - * @param notification A SDLOnHashChange object - */ -- (void)onOnHashChange:(SDLOnHashChange *)notification; - -/** - * Called when an On Interior Vehicle Data notification is received from Core - * - * @param notification A SDLOnInteriorVehicleData object - */ -- (void)onOnInteriorVehicleData:(SDLOnInteriorVehicleData *)notification; - -/** - * Called when an On Keyboard Input notification is received from Core - * - * @param notification A SDLOnKeyboardInput object - */ -- (void)onOnKeyboardInput:(SDLOnKeyboardInput *)notification; - -/** - * Called when an On Language Change notification is received from Core - * - * @param notification A SDLOnLanguageChange object - */ -- (void)onOnLanguageChange:(SDLOnLanguageChange *)notification; - -/** - * Called when an On Lock Screen notification is received from Core - * - * @param notification A SDLOnLockScreenStatus object - */ -- (void)onOnLockScreenNotification:(SDLOnLockScreenStatus *)notification; - -/** - * Called when an On Permissions Change notification is received from Core - * - * @param notification A SDLOnPermissionsChange object - */ -- (void)onOnPermissionsChange:(SDLOnPermissionsChange *)notification; - -/** - * Called when an On RC Change notification is received from Core - * - * @param notification A SDLOnRCStatus object - */ -- (void)onOnRCStatus:(SDLOnRCStatus *)notification; - -/** - * Called when an On Sync P notification is received from Core - * - * @param notification A SDLOnSyncPData object - */ -- (void)onOnSyncPData:(SDLOnSyncPData *)notification; - -/** - * Called when an On System Request notification is received from Core - * - * @param notification A SDLOnSystemRequest object - */ -- (void)onOnSystemRequest:(SDLOnSystemRequest *)notification; - -/** - * Called when an On TBT Client State notification is received from Core - * - * @param notification A SDLOnTBTClientState object - */ -- (void)onOnTBTClientState:(SDLOnTBTClientState *)notification; - -/** - * Called when an On Touch Event notification is received from Core - * - * @param notification A SDLOnTouchEvent object - */ -- (void)onOnTouchEvent:(SDLOnTouchEvent *)notification; - -/** - * Called when an On Vehicle Data notification is received from Core + * Called when a Perform App Service Interaction Response is received from Core * - * @param notification A SDLOnVehicleData object - */ -- (void)onOnVehicleData:(SDLOnVehicleData *)notification; - -/** - * Called when an On Way Point Change notification is received from Core - * - * @param notification A SDLOnWayPointChange object + * @param response A SDLPerformAppServiceInteractionResponse object */ -- (void)onOnWayPointChange:(SDLOnWayPointChange *)notification; +- (void)onPerformAppServiceInteractionResponse:(SDLPerformAppServiceInteractionResponse *)response; /** * Called when a Perform Audio Pass Thru Response is received from Core @@ -446,6 +386,13 @@ NS_ASSUME_NONNULL_BEGIN - (void)onPerformInteractionResponse:(SDLPerformInteractionResponse *)response; /** + * Called when a Publish App Service Response is received from Core + * + * @param response A SDLPublishAppService object + */ +- (void)onPublishAppServiceResponse:(SDLPublishAppServiceResponse *)response; + +/** * Called when a Put File Response is received from Core * * @param response A SDLPutFileResponse object @@ -627,6 +574,537 @@ NS_ASSUME_NONNULL_BEGIN */ - (void)onUnsubscribeWayPointsResponse:(SDLUnsubscribeWayPointsResponse *)response; +#pragma mark - Requests +/** + * Called when a `AddCommand` request is received from Core + * + * @param request A SDLAddCommand object + */ +- (void)onAddCommand:(SDLAddCommand *)request; + +/** + * Called when a `AddSubMenu` request is received from Core + * + * @param request A SDLAddSubMenu object + */ +- (void)onAddSubMenu:(SDLAddSubMenu *)request; + +/** + * Called when a `Alert` request is received from Core + * + * @param request A SDLAlert object + */ +- (void)onAlert:(SDLAlert *)request; + +/** + * Called when a `AlertManeuver` request is received from Core + * + * @param request A SDLAlertManeuver object + */ +- (void)onAlertManeuver:(SDLAlertManeuver *)request; + +/** + * Called when a `ButtonPress` request is received from Core + * + * @param request A SDLButtonPress object + */ +- (void)onButtonPress:(SDLButtonPress *)request; + +/** + * Called when a `ChangeRegistration` request is received from Core + * + * @param request A SDLChangeRegistration object + */ +- (void)onChangeRegistration:(SDLChangeRegistration *)request; + +/** + * Called when a `CreateInteractionChoiceSet` request is received from Core + * + * @param request A SDLCreateInteractionChoiceSet object + */ +- (void)onCreateInteractionChoiceSet:(SDLCreateInteractionChoiceSet *)request; + +/** + * Called when a `DeleteCommand` request is received from Core + * + * @param request A SDLDeleteCommand object + */ +- (void)onDeleteCommand:(SDLDeleteCommand *)request; + +/** + * Called when a `DeleteFile` request is received from Core + * + * @param request A SDLDeleteFile object + */ +- (void)onDeleteFile:(SDLDeleteFile *)request; + +/** + * Called when a `DeleteInteractionChoiceSet` request is received from Core + * + * @param request A SDLDeleteInteractionChoiceSet object + */ +- (void)onDeleteInteractionChoiceSet:(SDLDeleteInteractionChoiceSet *)request; + +/** + * Called when a `DeleteSubMenu` request is received from Core + * + * @param request A SDLDeleteSubMenu object + */ +- (void)onDeleteSubMenu:(SDLDeleteSubMenu *)request; + +/** + * Called when a `DiagnosticMessage` request is received from Core + * + * @param request A SDLDiagnosticMessage object + */ +- (void)onDiagnosticMessage:(SDLDiagnosticMessage *)request; + +/** + * Called when a `DialNumber` request is received from Core + * + * @param request A SDLDialNumber object + */ +- (void)onDialNumber:(SDLDialNumber *)request; + +/** + * Called when a `EncodedSyncPData` request is received from Core + * + * @param request A SDLEncodedSyncPData object + */ +- (void)onEncodedSyncPData:(SDLEncodedSyncPData *)request; + +/** + * Called when a `EndAudioPassThru` request is received from Core + * + * @param request A SDLEndAudioPassThru object + */ +- (void)onEndAudioPassThru:(SDLEndAudioPassThru *)request; + +/** + * Called when a `GetAppServiceData` request is received from Core + * + * @param request A SDLGetAppServiceData object + */ +- (void)onGetAppServiceData:(SDLGetAppServiceData *)request; + +/** + * Called when a `GetDTCs` request is received from Core + * + * @param request A SDLGetDTCs object + */ +- (void)onGetDTCs:(SDLGetDTCs *)request; + +/** + * Called when a `GetFile` request is received from Core + * + * @param request A SDLGetFile object + */ +- (void)onGetFile:(SDLGetFile *)request; + +/** + * Called when a `GetInteriorVehicleData` request is received from Core + * + * @param request A SDLGetInteriorVehicleData object + */ +- (void)onGetInteriorVehicleData:(SDLGetInteriorVehicleData *)request; + +/** + * Called when a `GetSystemCapability` request is received from Core + * + * @param request A SDLGetSystemCapability object + */ +- (void)onGetSystemCapability:(SDLGetSystemCapability *)request; + +/** + * Called when a `GetVehicleData` request is received from Core + * + * @param request A SDLGetVehicleData object + */ +- (void)onGetVehicleData:(SDLGetVehicleData *)request; + +/** + * Called when a `GetWayPoints` request is received from Core + * + * @param request A SDLGetWayPoints object + */ +- (void)onGetWayPoints:(SDLGetWayPoints *)request; + +/** + * Called when a `ListFiles` request is received from Core + * + * @param request A SDLListFiles object + */ +- (void)onListFiles:(SDLListFiles *)request; + +/** + * Called when a `PerformAppServiceInteraction` request is received from Core + * + * @param request A SDLPerformAppServiceInteraction object + */ +- (void)onPerformAppServiceInteraction:(SDLPerformAppServiceInteraction *)request; + +/** + * Called when a `PerformAudioPassThru` request is received from Core + * + * @param request A SDLPerformAudioPassThru object + */ +- (void)onPerformAudioPassThru:(SDLPerformAudioPassThru *)request; + +/** + * Called when a `PerformInteraction` request is received from Core + * + * @param request A SDLPerformInteraction object + */ +- (void)onPerformInteraction:(SDLPerformInteraction *)request; + +/** + * Called when a `PublishAppService` request is received from Core + * + * @param request A SDLPublishAppService object + */ +- (void)onPublishAppService:(SDLPublishAppService *)request; + +/** + * Called when a `PutFile` request is received from Core + * + * @param request A SDLPutFile object + */ +- (void)onPutFile:(SDLPutFile *)request; + +/** + * Called when a `ReadDID` request is received from Core + * + * @param request A SDLReadDID object + */ +- (void)onReadDID:(SDLReadDID *)request; + +/** + * Called when a `RegisterAppInterface` request is received from Core + * + * @param request A SDLRegisterAppInterface object + */ +- (void)onRegisterAppInterface:(SDLRegisterAppInterface *)request; + +/** + * Called when a `ResetGlobalProperties` request is received from Core + * + * @param request A SDLResetGlobalProperties object + */ +- (void)onResetGlobalProperties:(SDLResetGlobalProperties *)request; + +/** + * Called when a `ScrollableMessage` request is received from Core + * + * @param request A SDLScrollableMessage object + */ +- (void)onScrollableMessage:(SDLScrollableMessage *)request; + +/** + * Called when a `SendHapticData` request is received from Core + * + * @param request A SDLSendHapticData object + */ +- (void)onSendHapticData:(SDLSendHapticData *)request; + +/** + * Called when a `SendLocation` request is received from Core + * + * @param request A SDLSendLocation object + */ +- (void)onSendLocation:(SDLSendLocation *)request; + +/** + * Called when a `SetAppIcon` request is received from Core + * + * @param request A SDLSetAppIcon object + */ +- (void)onSetAppIcon:(SDLSetAppIcon *)request; + +/** + * Called when a `SetDisplayLayout` request is received from Core + * + * @param request A SDLSetDisplayLayout object + */ +- (void)onSetDisplayLayout:(SDLSetDisplayLayout *)request; + +/** + * Called when a `SetGlobalProperties` request is received from Core + * + * @param request A SDLSetGlobalProperties object + */ +- (void)onSetGlobalProperties:(SDLSetGlobalProperties *)request; + +/** + * Called when a `SetInteriorVehicleData` request is received from Core + * + * @param request A SDLSetInteriorVehicleData object + */ +- (void)onSetInteriorVehicleData:(SDLSetInteriorVehicleData *)request; + +/** + * Called when a `SetMediaClockTimer` request is received from Core + * + * @param request A SDLSetMediaClockTimer object + */ +- (void)onSetMediaClockTimer:(SDLSetMediaClockTimer *)request; + +/** + * Called when a `Show` request is received from Core + * + * @param request A SDLShow object + */ +- (void)onShow:(SDLShow *)request; + +/** + * Called when a `ShowConstantTBT` request is received from Core + * + * @param request A SDLShowConstantTBT object + */ +- (void)onShowConstantTBT:(SDLShowConstantTBT *)request; + +/** + * Called when a `Slider` request is received from Core + * + * @param request A SDLSlider object + */ +- (void)onSlider:(SDLSlider *)request; + +/** + * Called when a `Speak` request is received from Core + * + * @param request A SDLSpeak object + */ +- (void)onSpeak:(SDLSpeak *)request; + +/** + * Called when a `SubscribeButton` request is received from Core + * + * @param request A SDLSubscribeButton object + */ +- (void)onSubscribeButton:(SDLSubscribeButton *)request; + +/** + * Called when a `SubscribeVehicleData` request is received from Core + * + * @param request A SDLSubscribeVehicleData object + */ +- (void)onSubscribeVehicleData:(SDLSubscribeVehicleData *)request; + +/** + * Called when a `SubscribeWayPoints` request is received from Core + * + * @param request A SDLSubscribeWayPoints object + */ +- (void)onSubscribeWayPoints:(SDLSubscribeWayPoints *)request; + +/** + * Called when a `SyncPData` request is received from Core + * + * @param request A SDLSyncPData object + */ +- (void)onSyncPData:(SDLSyncPData *)request; + +/** + * Called when a `SystemRequest` request is received from Core + * + * @param request A SDLSystemRequest object + */ +- (void)onSystemRequest:(SDLSystemRequest *)request; + +/** + * Called when a `UnregisterAppInterface` request is received from Core + * + * @param request A SDLUnregisterAppInterface object + */ +- (void)onUnregisterAppInterface:(SDLUnregisterAppInterface *)request; + +/** + * Called when a `UnsubscribeButton` request is received from Core + * + * @param request A SDLUnsubscribeButton object + */ +- (void)onUnsubscribeButton:(SDLUnsubscribeButton *)request; + +/** + * Called when a `UnsubscribeVehicleData` request is received from Core + * + * @param request A SDLUnsubscribeVehicleData object + */ +- (void)onUnsubscribeVehicleData:(SDLUnsubscribeVehicleData *)request; + +/** + * Called when a `UnsubscribeWayPoints` request is received from Core + * + * @param request A SDLUnsubscribeWayPoints object + */ +- (void)onUnsubscribeWayPoints:(SDLUnsubscribeWayPoints *)request; + +/** + * Called when a `UpdateTurnList` request is received from Core + * + * @param request A SDLUpdateTurnList object + */ +- (void)onUpdateTurnList:(SDLUpdateTurnList *)request; + + +#pragma mark - Notifications + +/** + * Called when an On App Interface Unregistered notification is received from Core + * + * @param notification A SDLOnAppInterfaceUnregistered object + */ +- (void)onOnAppInterfaceUnregistered:(SDLOnAppInterfaceUnregistered *)notification; + +/** + * Called when an On App Service Data notification is received from Core + * + * @param notification A SDLOnAppServiceData object + */ +- (void)onOnAppServiceData:(SDLOnAppServiceData *)notification; + +/** + * Called when an On Audio Pass Thru notification is received from Core + * + * @param notification A SDLOnAudioPassThru object + */ +- (void)onOnAudioPassThru:(SDLOnAudioPassThru *)notification; + +/** + * Called when an On Button Event notification is received from Core + * + * @param notification A SDLOnButtonEvent object + */ +- (void)onOnButtonEvent:(SDLOnButtonEvent *)notification; + +/** + * Called when an On Button Press notification is received from Core + * + * @param notification A SDLOnButtonPress object + */ +- (void)onOnButtonPress:(SDLOnButtonPress *)notification; + +/** + * Called when an On Command notification is received from Core + * + * @param notification A SDLOnCommand object + */ +- (void)onOnCommand:(SDLOnCommand *)notification; + +/** + * Called when an On Encoded Sync P Data notification is received from Core + * + * @param notification A SDLOnEncodedSyncPData object + */ +- (void)onOnEncodedSyncPData:(SDLOnEncodedSyncPData *)notification; + +/** + * Called when an On Hash Change notification is received from Core + * + * @param notification A SDLOnHashChange object + */ +- (void)onOnHashChange:(SDLOnHashChange *)notification; + +/** + * Called when an On Interior Vehicle Data notification is received from Core + * + * @param notification A SDLOnInteriorVehicleData object + */ +- (void)onOnInteriorVehicleData:(SDLOnInteriorVehicleData *)notification; + +/** + * Called when an On Keyboard Input notification is received from Core + * + * @param notification A SDLOnKeyboardInput object + */ +- (void)onOnKeyboardInput:(SDLOnKeyboardInput *)notification; + +/** + * Called when an On Language Change notification is received from Core + * + * @param notification A SDLOnLanguageChange object + */ +- (void)onOnLanguageChange:(SDLOnLanguageChange *)notification; + +/** + * Called when an On Lock Screen notification is received from Core + * + * @param notification A SDLOnLockScreenStatus object + */ +- (void)onOnLockScreenNotification:(SDLOnLockScreenStatus *)notification; + +/** + * Called when an On Permissions Change notification is received from Core + * + * @param notification A SDLOnPermissionsChange object + */ +- (void)onOnPermissionsChange:(SDLOnPermissionsChange *)notification; + +/** + * Called when an On RC Change notification is received from Core + * + * @param notification A SDLOnRCStatus object + */ +- (void)onOnRCStatus:(SDLOnRCStatus *)notification; + +/** + * Called when an On Sync P notification is received from Core + * + * @param notification A SDLOnSyncPData object + */ +- (void)onOnSyncPData:(SDLOnSyncPData *)notification; + +/** + * Called when an `OnSystemCapabilityUpdated` notification is received from Core + * + * @param notification A SDLOnSystemCapabilityUpdated object + */ +- (void)onOnSystemCapabilityUpdated:(SDLOnSystemCapabilityUpdated *)notification; + +/** + * Called when an On System Request notification is received from Core + * + * @param notification A SDLOnSystemRequest object + */ +- (void)onOnSystemRequest:(SDLOnSystemRequest *)notification; + +/** + * Called when an On TBT Client State notification is received from Core + * + * @param notification A SDLOnTBTClientState object + */ +- (void)onOnTBTClientState:(SDLOnTBTClientState *)notification; + +/** + * Called when an On Touch Event notification is received from Core + * + * @param notification A SDLOnTouchEvent object + */ +- (void)onOnTouchEvent:(SDLOnTouchEvent *)notification; + +/** + * Called when an On Vehicle Data notification is received from Core + * + * @param notification A SDLOnVehicleData object + */ +- (void)onOnVehicleData:(SDLOnVehicleData *)notification; + +/** + * Called when an On Way Point Change notification is received from Core + * + * @param notification A SDLOnWayPointChange object + */ +- (void)onOnWayPointChange:(SDLOnWayPointChange *)notification; + +#pragma mark - Other + +/** + * Called when an Error message is received from Core + * + * @param e An exception message + */ +- (void)onError:(NSException *)e; + @end NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLPublishAppService.h b/SmartDeviceLink/SDLPublishAppService.h new file mode 100644 index 000000000..e9effe25d --- /dev/null +++ b/SmartDeviceLink/SDLPublishAppService.h @@ -0,0 +1,38 @@ +// +// SDLPublishAppService.h +// SmartDeviceLink +// +// Created by Nicole on 1/25/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import "SDLRPCRequest.h" + +@class SDLAppServiceManifest; + + +NS_ASSUME_NONNULL_BEGIN + +/** + * Registers a service offered by this app on the module. + */ +@interface SDLPublishAppService : SDLRPCRequest + +/** + * Convenience init. + * + * @param appServiceManifest The app service manifest + * @return A SDLPublishAppService object + */ +- (instancetype)initWithAppServiceManifest:(SDLAppServiceManifest *)appServiceManifest; + +/** + * The manifest of the service that wishes to be published. + * + * SDLAppServiceManifest, Required + */ +@property (strong, nonatomic) SDLAppServiceManifest *appServiceManifest; + +@end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLPublishAppService.m b/SmartDeviceLink/SDLPublishAppService.m new file mode 100644 index 000000000..da660e2fa --- /dev/null +++ b/SmartDeviceLink/SDLPublishAppService.m @@ -0,0 +1,48 @@ +// +// SDLPublishAppService.m +// SmartDeviceLink +// +// Created by Nicole on 1/25/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import "SDLPublishAppService.h" + +#import "NSMutableDictionary+Store.h" +#import "SDLAppServiceManifest.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" + + +NS_ASSUME_NONNULL_BEGIN + +@implementation SDLPublishAppService + +- (instancetype)init { + if (self = [super initWithName:SDLRPCFunctionNamePublishAppService]) { + } + return self; +} + +- (instancetype)initWithAppServiceManifest:(SDLAppServiceManifest *)appServiceManifest { + self = [self init]; + if (!self) { + return nil; + } + + self.appServiceManifest = appServiceManifest; + + return self; +} + +- (void)setAppServiceManifest:(SDLAppServiceManifest *)appServiceManifest { + [parameters sdl_setObject:appServiceManifest forName:SDLRPCParameterNameAppServiceManifest]; +} + +- (SDLAppServiceManifest *)appServiceManifest { + return [parameters sdl_objectForName:SDLRPCParameterNameAppServiceManifest ofClass:SDLAppServiceManifest.class]; +} + +@end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLPublishAppServiceResponse.h b/SmartDeviceLink/SDLPublishAppServiceResponse.h new file mode 100644 index 000000000..bf58d6a10 --- /dev/null +++ b/SmartDeviceLink/SDLPublishAppServiceResponse.h @@ -0,0 +1,38 @@ +// +// SDLPublishAppServiceResponse.h +// SmartDeviceLink +// +// Created by Nicole on 2/5/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import "SDLRPCResponse.h" + +@class SDLAppServiceRecord; + +NS_ASSUME_NONNULL_BEGIN + +/* + * Response to the request to register a service offered by this app on the module. + */ +@interface SDLPublishAppServiceResponse : SDLRPCResponse + +/** + * Convenience init. + * + * @param appServiceRecord If the request was successful, this object will be the current status of the service record for the published service. This will include the Core supplied service ID. + * @return A SDLPublishAppServiceResponse object + */ +- (instancetype)initWithAppServiceRecord:(SDLAppServiceRecord *)appServiceRecord; + +/** + * If the request was successful, this object will be the current status of the service record for the published service. This will include the Core supplied service ID. + * + * SDLAppServiceRecord, Optional + */ +@property (nullable, strong, nonatomic) SDLAppServiceRecord *appServiceRecord; + + +@end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLPublishAppServiceResponse.m b/SmartDeviceLink/SDLPublishAppServiceResponse.m new file mode 100644 index 000000000..59ae3a143 --- /dev/null +++ b/SmartDeviceLink/SDLPublishAppServiceResponse.m @@ -0,0 +1,47 @@ +// +// SDLPublishAppServiceResponse.m +// SmartDeviceLink +// +// Created by Nicole on 2/5/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import "SDLPublishAppServiceResponse.h" + +#import "NSMutableDictionary+Store.h" +#import "SDLAppServiceRecord.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" + +NS_ASSUME_NONNULL_BEGIN + +@implementation SDLPublishAppServiceResponse + +- (instancetype)init { + if (self = [super initWithName:SDLRPCFunctionNamePublishAppService]) { + } + return self; +} + +- (instancetype)initWithAppServiceRecord:(SDLAppServiceRecord *)appServiceRecord { + self = [self init]; + if (!self) { + return nil; + } + + self.appServiceRecord = appServiceRecord; + + return self; +} + +- (void)setAppServiceRecord:(nullable SDLAppServiceRecord *)appServiceRecord { + [parameters sdl_setObject:appServiceRecord forName:SDLRPCParameterNameAppServiceRecord]; +} + +- (nullable SDLAppServiceRecord *)appServiceRecord { + return [parameters sdl_objectForName:SDLRPCParameterNameAppServiceRecord ofClass:SDLAppServiceRecord.class]; +} + +@end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLPutFile.m b/SmartDeviceLink/SDLPutFile.m index f058b5ec2..d8662c40c 100644 --- a/SmartDeviceLink/SDLPutFile.m +++ b/SmartDeviceLink/SDLPutFile.m @@ -4,7 +4,8 @@ #import "SDLPutFile.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" #import <zlib.h> @@ -13,7 +14,7 @@ NS_ASSUME_NONNULL_BEGIN @implementation SDLPutFile - (instancetype)init { - if (self = [super initWithName:SDLNamePutFile]) { + if (self = [super initWithName:SDLRPCFunctionNamePutFile]) { } return self; } @@ -83,59 +84,59 @@ NS_ASSUME_NONNULL_BEGIN #pragma mark - Getters and Setters - (void)setSyncFileName:(NSString *)syncFileName { - [parameters sdl_setObject:syncFileName forName:SDLNameSyncFileName]; + [parameters sdl_setObject:syncFileName forName:SDLRPCParameterNameSyncFileName]; } - (NSString *)syncFileName { - return [parameters sdl_objectForName:SDLNameSyncFileName]; + return [parameters sdl_objectForName:SDLRPCParameterNameSyncFileName]; } - (void)setFileType:(SDLFileType)fileType { - [parameters sdl_setObject:fileType forName:SDLNameFileType]; + [parameters sdl_setObject:fileType forName:SDLRPCParameterNameFileType]; } - (SDLFileType)fileType { - return [parameters sdl_objectForName:SDLNameFileType]; + return [parameters sdl_objectForName:SDLRPCParameterNameFileType]; } - (void)setPersistentFile:(nullable NSNumber<SDLBool> *)persistentFile { - [parameters sdl_setObject:persistentFile forName:SDLNamePersistentFile]; + [parameters sdl_setObject:persistentFile forName:SDLRPCParameterNamePersistentFile]; } - (nullable NSNumber<SDLBool> *)persistentFile { - return [parameters sdl_objectForName:SDLNamePersistentFile]; + return [parameters sdl_objectForName:SDLRPCParameterNamePersistentFile]; } - (void)setSystemFile:(nullable NSNumber<SDLBool> *)systemFile { - [parameters sdl_setObject:systemFile forName:SDLNameSystemFile]; + [parameters sdl_setObject:systemFile forName:SDLRPCParameterNameSystemFile]; } - (nullable NSNumber<SDLBool> *)systemFile { - return [parameters sdl_objectForName:SDLNameSystemFile]; + return [parameters sdl_objectForName:SDLRPCParameterNameSystemFile]; } - (void)setOffset:(nullable NSNumber<SDLUInt> *)offset { - [parameters sdl_setObject:offset forName:SDLNameOffset]; + [parameters sdl_setObject:offset forName:SDLRPCParameterNameOffset]; } - (nullable NSNumber<SDLUInt> *)offset { - return [parameters sdl_objectForName:SDLNameOffset]; + return [parameters sdl_objectForName:SDLRPCParameterNameOffset]; } - (void)setLength:(nullable NSNumber<SDLUInt> *)length { - [parameters sdl_setObject:length forName:SDLNameLength]; + [parameters sdl_setObject:length forName:SDLRPCParameterNameLength]; } - (nullable NSNumber<SDLUInt> *)length { - return [parameters sdl_objectForName:SDLNameLength]; + return [parameters sdl_objectForName:SDLRPCParameterNameLength]; } - (void)setCrc:(nullable NSNumber<SDLUInt> *)crc { - [parameters sdl_setObject:crc forName:SDLNameCRC]; + [parameters sdl_setObject:crc forName:SDLRPCParameterNameCRC]; } - (nullable NSNumber<SDLUInt> *)crc { - return [parameters sdl_objectForName:SDLNameCRC]; + return [parameters sdl_objectForName:SDLRPCParameterNameCRC]; } #pragma mark - Helpers diff --git a/SmartDeviceLink/SDLPutFileResponse.m b/SmartDeviceLink/SDLPutFileResponse.m index 93d0caa5e..cdf6add9a 100644 --- a/SmartDeviceLink/SDLPutFileResponse.m +++ b/SmartDeviceLink/SDLPutFileResponse.m @@ -5,24 +5,25 @@ #import "SDLPutFileResponse.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLPutFileResponse - (instancetype)init { - if (self = [super initWithName:SDLNamePutFile]) { + if (self = [super initWithName:SDLRPCFunctionNamePutFile]) { } return self; } - (void)setSpaceAvailable:(nullable NSNumber<SDLInt> *)spaceAvailable { - [parameters sdl_setObject:spaceAvailable forName:SDLNameSpaceAvailable]; + [parameters sdl_setObject:spaceAvailable forName:SDLRPCParameterNameSpaceAvailable]; } - (nullable NSNumber<SDLInt> *)spaceAvailable { - return [parameters sdl_objectForName:SDLNameSpaceAvailable]; + return [parameters sdl_objectForName:SDLRPCParameterNameSpaceAvailable]; } @end diff --git a/SmartDeviceLink/SDLRDSData.m b/SmartDeviceLink/SDLRDSData.m index 9a8f5586f..98d42015a 100755 --- a/SmartDeviceLink/SDLRDSData.m +++ b/SmartDeviceLink/SDLRDSData.m @@ -3,7 +3,7 @@ // #import "SDLRDSData.h" -#include "SDLNames.h" +#include "SDLRPCParameterNames.h" #import "NSMutableDictionary+Store.h" NS_ASSUME_NONNULL_BEGIN @@ -27,67 +27,67 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setProgramService:(nullable NSString *)programService { - [store sdl_setObject:programService forName:SDLNameProgramService]; + [store sdl_setObject:programService forName:SDLRPCParameterNameProgramService]; } - (nullable NSString *)programService { - return [store sdl_objectForName:SDLNameProgramService]; + return [store sdl_objectForName:SDLRPCParameterNameProgramService]; } - (void)setRadioText:(nullable NSString *)radioText { - [store sdl_setObject:radioText forName:SDLNameRadioText]; + [store sdl_setObject:radioText forName:SDLRPCParameterNameRadioText]; } - (nullable NSString *)radioText { - return [store sdl_objectForName:SDLNameRadioText]; + return [store sdl_objectForName:SDLRPCParameterNameRadioText]; } - (void)setClockText:(nullable NSString *)clockText { - [store sdl_setObject:clockText forName:SDLNameClockText]; + [store sdl_setObject:clockText forName:SDLRPCParameterNameClockText]; } - (nullable NSString *)clockText { - return [store sdl_objectForName:SDLNameClockText]; + return [store sdl_objectForName:SDLRPCParameterNameClockText]; } - (void)setProgramIdentification:(nullable NSString *)programIdentification { - [store sdl_setObject:programIdentification forName:SDLNameProgramIdentification]; + [store sdl_setObject:programIdentification forName:SDLRPCParameterNameProgramIdentification]; } - (nullable NSString *)programIdentification { - return [store sdl_objectForName:SDLNameProgramIdentification]; + return [store sdl_objectForName:SDLRPCParameterNameProgramIdentification]; } - (void)setProgramType:(nullable NSNumber<SDLInt> *)programType { - [store sdl_setObject:programType forName:SDLNameProgramType]; + [store sdl_setObject:programType forName:SDLRPCParameterNameProgramType]; } - (nullable NSNumber<SDLInt> *)programType { - return [store sdl_objectForName:SDLNameProgramType]; + return [store sdl_objectForName:SDLRPCParameterNameProgramType]; } - (void)setTrafficProgramIdentification:(nullable NSNumber<SDLBool> *)trafficProgramIdentification { - [store sdl_setObject:trafficProgramIdentification forName:SDLNameTrafficProgramIdentification]; + [store sdl_setObject:trafficProgramIdentification forName:SDLRPCParameterNameTrafficProgramIdentification]; } - (nullable NSNumber<SDLBool> *)trafficProgramIdentification { - return [store sdl_objectForName:SDLNameTrafficProgramIdentification]; + return [store sdl_objectForName:SDLRPCParameterNameTrafficProgramIdentification]; } - (void)setTrafficAnnouncementIdentification:(nullable NSNumber<SDLBool> *)trafficAnnouncementIdentification { - [store sdl_setObject:trafficAnnouncementIdentification forName:SDLNameTrafficAnnouncementIdentification]; + [store sdl_setObject:trafficAnnouncementIdentification forName:SDLRPCParameterNameTrafficAnnouncementIdentification]; } - (nullable NSNumber<SDLBool> *)trafficAnnouncementIdentification { - return [store sdl_objectForName:SDLNameTrafficAnnouncementIdentification]; + return [store sdl_objectForName:SDLRPCParameterNameTrafficAnnouncementIdentification]; } - (void)setRegion:(nullable NSString *)region { - [store sdl_setObject:region forName:SDLNameRegion]; + [store sdl_setObject:region forName:SDLRPCParameterNameRegion]; } - (nullable NSString *)region { - return [store sdl_objectForName:SDLNameRegion]; + return [store sdl_objectForName:SDLRPCParameterNameRegion]; } @end diff --git a/SmartDeviceLink/SDLRGBColor.m b/SmartDeviceLink/SDLRGBColor.m index 9ed7b30e9..071908d4a 100644 --- a/SmartDeviceLink/SDLRGBColor.m +++ b/SmartDeviceLink/SDLRGBColor.m @@ -9,7 +9,7 @@ #import "SDLRGBColor.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" NS_ASSUME_NONNULL_BEGIN @@ -41,27 +41,27 @@ NS_ASSUME_NONNULL_BEGIN #pragma mark - Setters - (void)setRed:(NSNumber<SDLInt> *)red { - [store sdl_setObject:red forName:SDLNameRed]; + [store sdl_setObject:red forName:SDLRPCParameterNameRed]; } - (NSNumber<SDLInt> *)red { - return [store sdl_objectForName:SDLNameRed]; + return [store sdl_objectForName:SDLRPCParameterNameRed]; } - (void)setGreen:(NSNumber<SDLInt> *)green { - [store sdl_setObject:green forName:SDLNameGreen]; + [store sdl_setObject:green forName:SDLRPCParameterNameGreen]; } - (NSNumber<SDLInt> *)green { - return [store sdl_objectForName:SDLNameGreen]; + return [store sdl_objectForName:SDLRPCParameterNameGreen]; } - (void)setBlue:(NSNumber<SDLInt> *)blue { - [store sdl_setObject:blue forName:SDLNameBlue]; + [store sdl_setObject:blue forName:SDLRPCParameterNameBlue]; } - (NSNumber<SDLInt> *)blue { - return [store sdl_objectForName:SDLNameBlue]; + return [store sdl_objectForName:SDLRPCParameterNameBlue]; } @end diff --git a/SmartDeviceLink/SDLRPCFunctionNames.h b/SmartDeviceLink/SDLRPCFunctionNames.h new file mode 100644 index 000000000..9fdeda330 --- /dev/null +++ b/SmartDeviceLink/SDLRPCFunctionNames.h @@ -0,0 +1,95 @@ +// +// SDLRPCFunctionNames.h +// SmartDeviceLink +// +// Created by Nicole on 3/5/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import "SDLEnum.h" + +/* + * All RPC request / response / notification names + */ +typedef SDLEnum SDLRPCFunctionName SDL_SWIFT_ENUM; + +extern SDLRPCFunctionName const SDLRPCFunctionNameAddCommand; +extern SDLRPCFunctionName const SDLRPCFunctionNameAddSubMenu; +extern SDLRPCFunctionName const SDLRPCFunctionNameAlert; +extern SDLRPCFunctionName const SDLRPCFunctionNameAlertManeuver; +extern SDLRPCFunctionName const SDLRPCFunctionNameButtonPress; +extern SDLRPCFunctionName const SDLRPCFunctionNameChangeRegistration; +extern SDLRPCFunctionName const SDLRPCFunctionNameCreateInteractionChoiceSet; +extern SDLRPCFunctionName const SDLRPCFunctionNameDeleteCommand; +extern SDLRPCFunctionName const SDLRPCFunctionNameDeleteFile; +extern SDLRPCFunctionName const SDLRPCFunctionNameDeleteInteractionChoiceSet; +extern SDLRPCFunctionName const SDLRPCFunctionNameDeleteSubMenu; +extern SDLRPCFunctionName const SDLRPCFunctionNameDiagnosticMessage; +extern SDLRPCFunctionName const SDLRPCFunctionNameDialNumber; +extern SDLRPCFunctionName const SDLRPCFunctionNameEncodedSyncPData; +extern SDLRPCFunctionName const SDLRPCFunctionNameEndAudioPassThru; +extern SDLRPCFunctionName const SDLRPCFunctionNameGenericResponse; +extern SDLRPCFunctionName const SDLRPCFunctionNameGetAppServiceData; +extern SDLRPCFunctionName const SDLRPCFunctionNameGetDTCs; +extern SDLRPCFunctionName const SDLRPCFunctionNameGetFile; +extern SDLRPCFunctionName const SDLRPCFunctionNameGetInteriorVehicleData; +extern SDLRPCFunctionName const SDLRPCFunctionNameGetSystemCapability; +extern SDLRPCFunctionName const SDLRPCFunctionNameGetVehicleData; +extern SDLRPCFunctionName const SDLRPCFunctionNameGetWayPoints; +extern SDLRPCFunctionName const SDLRPCFunctionNameListFiles; +extern SDLRPCFunctionName const SDLRPCFunctionNameOnAppInterfaceUnregistered; +extern SDLRPCFunctionName const SDLRPCFunctionNameOnAppServiceData; +extern SDLRPCFunctionName const SDLRPCFunctionNameOnAudioPassThru; +extern SDLRPCFunctionName const SDLRPCFunctionNameOnButtonEvent; +extern SDLRPCFunctionName const SDLRPCFunctionNameOnButtonPress; +extern SDLRPCFunctionName const SDLRPCFunctionNameOnCommand; +extern SDLRPCFunctionName const SDLRPCFunctionNameOnDriverDistraction; +extern SDLRPCFunctionName const SDLRPCFunctionNameOnEncodedSyncPData; +extern SDLRPCFunctionName const SDLRPCFunctionNameOnHashChange; +extern SDLRPCFunctionName const SDLRPCFunctionNameOnHMIStatus; +extern SDLRPCFunctionName const SDLRPCFunctionNameOnInteriorVehicleData; +extern SDLRPCFunctionName const SDLRPCFunctionNameOnKeyboardInput; +extern SDLRPCFunctionName const SDLRPCFunctionNameOnLanguageChange; +extern SDLRPCFunctionName const SDLRPCFunctionNameOnLockScreenStatus; +extern SDLRPCFunctionName const SDLRPCFunctionNameOnPermissionsChange; +extern SDLRPCFunctionName const SDLRPCFunctionNameOnRCStatus; +extern SDLRPCFunctionName const SDLRPCFunctionNameOnSyncPData; +extern SDLRPCFunctionName const SDLRPCFunctionNameOnSystemCapabilityUpdated; +extern SDLRPCFunctionName const SDLRPCFunctionNameOnSystemRequest; +extern SDLRPCFunctionName const SDLRPCFunctionNameOnTBTClientState; +extern SDLRPCFunctionName const SDLRPCFunctionNameOnTouchEvent; +extern SDLRPCFunctionName const SDLRPCFunctionNameOnVehicleData; +extern SDLRPCFunctionName const SDLRPCFunctionNameOnWayPointChange; +extern SDLRPCFunctionName const SDLRPCFunctionNamePerformAppServiceInteraction; +extern SDLRPCFunctionName const SDLRPCFunctionNamePerformAudioPassThru; +extern SDLRPCFunctionName const SDLRPCFunctionNamePerformInteraction; +extern SDLRPCFunctionName const SDLRPCFunctionNamePublishAppService; +extern SDLRPCFunctionName const SDLRPCFunctionNamePutFile; +extern SDLRPCFunctionName const SDLRPCFunctionNameReadDID; +extern SDLRPCFunctionName const SDLRPCFunctionNameRegisterAppInterface; +extern SDLRPCFunctionName const SDLRPCFunctionNameReserved; +extern SDLRPCFunctionName const SDLRPCFunctionNameResetGlobalProperties; +extern SDLRPCFunctionName const SDLRPCFunctionNameScrollableMessage; +extern SDLRPCFunctionName const SDLRPCFunctionNameSendHapticData; +extern SDLRPCFunctionName const SDLRPCFunctionNameSendLocation; +extern SDLRPCFunctionName const SDLRPCFunctionNameSetAppIcon; +extern SDLRPCFunctionName const SDLRPCFunctionNameSetDisplayLayout; +extern SDLRPCFunctionName const SDLRPCFunctionNameSetGlobalProperties; +extern SDLRPCFunctionName const SDLRPCFunctionNameSetInteriorVehicleData; +extern SDLRPCFunctionName const SDLRPCFunctionNameSetMediaClockTimer; +extern SDLRPCFunctionName const SDLRPCFunctionNameShow; +extern SDLRPCFunctionName const SDLRPCFunctionNameShowConstantTBT; +extern SDLRPCFunctionName const SDLRPCFunctionNameSlider; +extern SDLRPCFunctionName const SDLRPCFunctionNameSpeak; +extern SDLRPCFunctionName const SDLRPCFunctionNameSubscribeButton; +extern SDLRPCFunctionName const SDLRPCFunctionNameSubscribeVehicleData; +extern SDLRPCFunctionName const SDLRPCFunctionNameSubscribeWayPoints; +extern SDLRPCFunctionName const SDLRPCFunctionNameSyncPData; +extern SDLRPCFunctionName const SDLRPCFunctionNameSystemRequest; +extern SDLRPCFunctionName const SDLRPCFunctionNameUnregisterAppInterface; +extern SDLRPCFunctionName const SDLRPCFunctionNameUnsubscribeButton; +extern SDLRPCFunctionName const SDLRPCFunctionNameUnsubscribeVehicleData; +extern SDLRPCFunctionName const SDLRPCFunctionNameUnsubscribeWayPoints; +extern SDLRPCFunctionName const SDLRPCFunctionNameUpdateTurnList; + + diff --git a/SmartDeviceLink/SDLRPCFunctionNames.m b/SmartDeviceLink/SDLRPCFunctionNames.m new file mode 100644 index 000000000..8416ac7a3 --- /dev/null +++ b/SmartDeviceLink/SDLRPCFunctionNames.m @@ -0,0 +1,88 @@ +// +// SDLRPCFunctionNames.m +// SmartDeviceLink +// +// Created by Nicole on 3/5/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import "SDLRPCFunctionNames.h" + +SDLRPCFunctionName const SDLRPCFunctionNameAddCommand = @"AddCommand"; +SDLRPCFunctionName const SDLRPCFunctionNameAddSubMenu = @"AddSubMenu"; +SDLRPCFunctionName const SDLRPCFunctionNameAlert = @"Alert"; +SDLRPCFunctionName const SDLRPCFunctionNameAlertManeuver = @"AlertManeuver"; +SDLRPCFunctionName const SDLRPCFunctionNameButtonPress = @"ButtonPress"; +SDLRPCFunctionName const SDLRPCFunctionNameChangeRegistration = @"ChangeRegistration"; +SDLRPCFunctionName const SDLRPCFunctionNameCreateInteractionChoiceSet = @"CreateInteractionChoiceSet"; +SDLRPCFunctionName const SDLRPCFunctionNameDeleteCommand = @"DeleteCommand"; +SDLRPCFunctionName const SDLRPCFunctionNameDeleteFile = @"DeleteFile"; +SDLRPCFunctionName const SDLRPCFunctionNameDeleteInteractionChoiceSet = @"DeleteInteractionChoiceSet"; +SDLRPCFunctionName const SDLRPCFunctionNameDeleteSubMenu = @"DeleteSubMenu"; +SDLRPCFunctionName const SDLRPCFunctionNameDiagnosticMessage = @"DiagnosticMessage"; +SDLRPCFunctionName const SDLRPCFunctionNameDialNumber = @"DialNumber"; +SDLRPCFunctionName const SDLRPCFunctionNameEncodedSyncPData = @"EncodedSyncPData"; +SDLRPCFunctionName const SDLRPCFunctionNameEndAudioPassThru = @"EndAudioPassThru"; +SDLRPCFunctionName const SDLRPCFunctionNameGenericResponse = @"GenericResponse"; +SDLRPCFunctionName const SDLRPCFunctionNameGetAppServiceData = @"GetAppServiceData"; +SDLRPCFunctionName const SDLRPCFunctionNameGetDTCs = @"GetDTCs"; +SDLRPCFunctionName const SDLRPCFunctionNameGetFile = @"GetFile"; +SDLRPCFunctionName const SDLRPCFunctionNameGetInteriorVehicleData = @"GetInteriorVehicleData"; +SDLRPCFunctionName const SDLRPCFunctionNameGetSystemCapability = @"GetSystemCapability"; +SDLRPCFunctionName const SDLRPCFunctionNameGetVehicleData = @"GetVehicleData"; +SDLRPCFunctionName const SDLRPCFunctionNameGetWayPoints = @"GetWayPoints"; +SDLRPCFunctionName const SDLRPCFunctionNameListFiles = @"ListFiles"; +SDLRPCFunctionName const SDLRPCFunctionNameOnAppInterfaceUnregistered = @"OnAppInterfaceUnregistered"; +SDLRPCFunctionName const SDLRPCFunctionNameOnAppServiceData = @"OnAppServiceData"; +SDLRPCFunctionName const SDLRPCFunctionNameOnAudioPassThru = @"OnAudioPassThru"; +SDLRPCFunctionName const SDLRPCFunctionNameOnButtonEvent = @"OnButtonEvent"; +SDLRPCFunctionName const SDLRPCFunctionNameOnButtonPress = @"OnButtonPress"; +SDLRPCFunctionName const SDLRPCFunctionNameOnCommand = @"OnCommand"; +SDLRPCFunctionName const SDLRPCFunctionNameOnDriverDistraction = @"OnDriverDistraction"; +SDLRPCFunctionName const SDLRPCFunctionNameOnEncodedSyncPData = @"OnEncodedSyncPData"; +SDLRPCFunctionName const SDLRPCFunctionNameOnHashChange = @"OnHashChange"; +SDLRPCFunctionName const SDLRPCFunctionNameOnHMIStatus = @"OnHMIStatus"; +SDLRPCFunctionName const SDLRPCFunctionNameOnInteriorVehicleData = @"OnInteriorVehicleData"; +SDLRPCFunctionName const SDLRPCFunctionNameOnKeyboardInput = @"OnKeyboardInput"; +SDLRPCFunctionName const SDLRPCFunctionNameOnLanguageChange = @"OnLanguageChange"; +SDLRPCFunctionName const SDLRPCFunctionNameOnLockScreenStatus = @"OnLockScreenStatus"; +SDLRPCFunctionName const SDLRPCFunctionNameOnPermissionsChange = @"OnPermissionsChange"; +SDLRPCFunctionName const SDLRPCFunctionNameOnRCStatus = @"OnRCStatus"; +SDLRPCFunctionName const SDLRPCFunctionNameOnSyncPData = @"OnSyncPData"; +SDLRPCFunctionName const SDLRPCFunctionNameOnSystemCapabilityUpdated = @"OnSystemCapabilityUpdated"; +SDLRPCFunctionName const SDLRPCFunctionNameOnSystemRequest = @"OnSystemRequest"; +SDLRPCFunctionName const SDLRPCFunctionNameOnTBTClientState = @"OnTBTClientState"; +SDLRPCFunctionName const SDLRPCFunctionNameOnTouchEvent = @"OnTouchEvent"; +SDLRPCFunctionName const SDLRPCFunctionNameOnVehicleData = @"OnVehicleData"; +SDLRPCFunctionName const SDLRPCFunctionNameOnWayPointChange = @"OnWayPointChange"; +SDLRPCFunctionName const SDLRPCFunctionNamePerformAppServiceInteraction = @"PerformAppServiceInteraction"; +SDLRPCFunctionName const SDLRPCFunctionNamePerformAudioPassThru = @"PerformAudioPassThru"; +SDLRPCFunctionName const SDLRPCFunctionNamePerformInteraction = @"PerformInteraction"; +SDLRPCFunctionName const SDLRPCFunctionNamePublishAppService = @"PublishAppService"; +SDLRPCFunctionName const SDLRPCFunctionNamePutFile = @"PutFile"; +SDLRPCFunctionName const SDLRPCFunctionNameReadDID = @"ReadDID"; +SDLRPCFunctionName const SDLRPCFunctionNameRegisterAppInterface = @"RegisterAppInterface"; +SDLRPCFunctionName const SDLRPCFunctionNameReserved = @"reserved"; +SDLRPCFunctionName const SDLRPCFunctionNameResetGlobalProperties = @"ResetGlobalProperties"; +SDLRPCFunctionName const SDLRPCFunctionNameScrollableMessage = @"ScrollableMessage"; +SDLRPCFunctionName const SDLRPCFunctionNameSendHapticData = @"SendHapticData"; +SDLRPCFunctionName const SDLRPCFunctionNameSendLocation = @"SendLocation"; +SDLRPCFunctionName const SDLRPCFunctionNameSetAppIcon = @"SetAppIcon"; +SDLRPCFunctionName const SDLRPCFunctionNameSetDisplayLayout = @"SetDisplayLayout"; +SDLRPCFunctionName const SDLRPCFunctionNameSetGlobalProperties = @"SetGlobalProperties"; +SDLRPCFunctionName const SDLRPCFunctionNameSetInteriorVehicleData = @"SetInteriorVehicleData"; +SDLRPCFunctionName const SDLRPCFunctionNameSetMediaClockTimer = @"SetMediaClockTimer"; +SDLRPCFunctionName const SDLRPCFunctionNameShow = @"Show"; +SDLRPCFunctionName const SDLRPCFunctionNameShowConstantTBT = @"ShowConstantTBT"; +SDLRPCFunctionName const SDLRPCFunctionNameSlider = @"Slider"; +SDLRPCFunctionName const SDLRPCFunctionNameSpeak = @"Speak"; +SDLRPCFunctionName const SDLRPCFunctionNameSubscribeButton = @"SubscribeButton"; +SDLRPCFunctionName const SDLRPCFunctionNameSubscribeVehicleData = @"SubscribeVehicleData"; +SDLRPCFunctionName const SDLRPCFunctionNameSubscribeWayPoints = @"SubscribeWayPoints"; +SDLRPCFunctionName const SDLRPCFunctionNameSyncPData = @"SyncPData"; +SDLRPCFunctionName const SDLRPCFunctionNameSystemRequest = @"SystemRequest"; +SDLRPCFunctionName const SDLRPCFunctionNameUnregisterAppInterface = @"UnregisterAppInterface"; +SDLRPCFunctionName const SDLRPCFunctionNameUnsubscribeButton = @"UnsubscribeButton"; +SDLRPCFunctionName const SDLRPCFunctionNameUnsubscribeVehicleData = @"UnsubscribeVehicleData"; +SDLRPCFunctionName const SDLRPCFunctionNameUnsubscribeWayPoints = @"UnsubscribeWayPoints"; +SDLRPCFunctionName const SDLRPCFunctionNameUpdateTurnList = @"UpdateTurnList"; diff --git a/SmartDeviceLink/SDLRPCMessage.m b/SmartDeviceLink/SDLRPCMessage.m index 7ca6b4b56..56121b2c1 100644 --- a/SmartDeviceLink/SDLRPCMessage.m +++ b/SmartDeviceLink/SDLRPCMessage.m @@ -5,7 +5,7 @@ #import "SDLRPCMessage.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" NS_ASSUME_NONNULL_BEGIN @@ -17,10 +17,10 @@ NS_ASSUME_NONNULL_BEGIN if (self = [super init]) { function = [[NSMutableDictionary alloc] initWithCapacity:3]; parameters = [[NSMutableDictionary alloc] init]; - messageType = SDLNameRequest; + messageType = SDLRPCParameterNameRequest; [store setObject:function forKey:messageType]; - [function setObject:parameters forKey:SDLNameParameters]; - [function setObject:name forKey:SDLNameOperationName]; + [function setObject:parameters forKey:SDLRPCParameterNameParameters]; + [function setObject:name forKey:SDLRPCParameterNameOperationName]; } return self; } @@ -29,7 +29,7 @@ NS_ASSUME_NONNULL_BEGIN if (self = [super initWithDictionary:dict]) { NSEnumerator *enumerator = [store keyEnumerator]; while (messageType = [enumerator nextObject]) { - if (![messageType isEqualToString:SDLNameBulkData]) { + if (![messageType isEqualToString:SDLRPCParameterNameBulkData]) { break; } } @@ -37,21 +37,21 @@ NS_ASSUME_NONNULL_BEGIN store[messageType] = [store[messageType] mutableCopy]; function = store[messageType]; - function[SDLNameParameters] = [function[SDLNameParameters] mutableCopy]; - parameters = function[SDLNameParameters]; + function[SDLRPCParameterNameParameters] = [function[SDLRPCParameterNameParameters] mutableCopy]; + parameters = function[SDLRPCParameterNameParameters]; } - self.bulkData = dict[SDLNameBulkData]; + self.bulkData = dict[SDLRPCParameterNameBulkData]; } return self; } - (nullable NSString *)getFunctionName { - return [function sdl_objectForName:SDLNameOperationName]; + return [function sdl_objectForName:SDLRPCParameterNameOperationName]; } - (void)setFunctionName:(nullable NSString *)functionName { - [function sdl_setObject:functionName forName:SDLNameOperationName]; + [function sdl_setObject:functionName forName:SDLRPCParameterNameOperationName]; } - (nullable NSObject *)getParameters:(NSString *)functionName { diff --git a/SmartDeviceLink/SDLRPCNotification.m b/SmartDeviceLink/SDLRPCNotification.m index f300a2148..6bec6fd29 100644 --- a/SmartDeviceLink/SDLRPCNotification.m +++ b/SmartDeviceLink/SDLRPCNotification.m @@ -5,7 +5,7 @@ #import "SDLRPCNotification.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" NS_ASSUME_NONNULL_BEGIN @@ -17,7 +17,7 @@ NS_ASSUME_NONNULL_BEGIN return nil; } - messageType = SDLNameNotification; + messageType = SDLRPCParameterNameNotification; [store setObject:function forKey:messageType]; return self; @@ -29,7 +29,7 @@ NS_ASSUME_NONNULL_BEGIN return nil; } - messageType = SDLNameNotification; + messageType = SDLRPCParameterNameNotification; [store setObject:function forKey:messageType]; return self; diff --git a/SmartDeviceLink/SDLRPCParameterNames.h b/SmartDeviceLink/SDLRPCParameterNames.h new file mode 100644 index 000000000..5c285bf97 --- /dev/null +++ b/SmartDeviceLink/SDLRPCParameterNames.h @@ -0,0 +1,671 @@ +// SDLRPCParameterNames.h +// + +#import <Foundation/Foundation.h> +#import "SDLMacros.h" + +NS_ASSUME_NONNULL_BEGIN + +typedef NSString* SDLRPCParameterName SDL_SWIFT_ENUM; + +extern SDLRPCParameterName const SDLRPCParameterNameACEnable; +extern SDLRPCParameterName const SDLRPCParameterNameACEnableAvailable; +extern SDLRPCParameterName const SDLRPCParameterNameACMaxEnable; +extern SDLRPCParameterName const SDLRPCParameterNameACMaxEnableAvailable; +extern SDLRPCParameterName const SDLRPCParameterNameAccelerationPedalPosition; +extern SDLRPCParameterName const SDLRPCParameterNameAcceptsWayPoints; +extern SDLRPCParameterName const SDLRPCParameterNameAction; +extern SDLRPCParameterName const SDLRPCParameterNameActual; +extern SDLRPCParameterName const SDLRPCParameterNameAddress; +extern SDLRPCParameterName const SDLRPCParameterNameAddressLines; +extern SDLRPCParameterName const SDLRPCParameterNameAdministrativeArea; +extern SDLRPCParameterName const SDLRPCParameterNameAirbagStatus; +extern SDLRPCParameterName const SDLRPCParameterNameAlerts; +extern SDLRPCParameterName const SDLRPCParameterNameAlertText1; +extern SDLRPCParameterName const SDLRPCParameterNameAlertText2; +extern SDLRPCParameterName const SDLRPCParameterNameAlertText3; +extern SDLRPCParameterName const SDLRPCParameterNameAlignment; +extern SDLRPCParameterName const SDLRPCParameterNameAllocatedModules; +extern SDLRPCParameterName const SDLRPCParameterNameAllowAppConsumers; +extern SDLRPCParameterName const SDLRPCParameterNameAllowed; +extern SDLRPCParameterName const SDLRPCParameterNameAltitude; +extern SDLRPCParameterName const SDLRPCParameterNameAltitudeMeters; +extern SDLRPCParameterName const SDLRPCParameterNameAmbientLightSensorStatus; +extern SDLRPCParameterName const SDLRPCParameterNameAmbientLightStatus; +extern SDLRPCParameterName const SDLRPCParameterNameApparentTemperature; +extern SDLRPCParameterName const SDLRPCParameterNameApparentTemperatureHigh; +extern SDLRPCParameterName const SDLRPCParameterNameApparentTemperatureLow; +extern SDLRPCParameterName const SDLRPCParameterNameAppBundleId; +extern SDLRPCParameterName const SDLRPCParameterNameAppDisplayName; +extern SDLRPCParameterName const SDLRPCParameterNameAppHMIType; +extern SDLRPCParameterName const SDLRPCParameterNameAppId; +extern SDLRPCParameterName const SDLRPCParameterNameAppInfo; +extern SDLRPCParameterName const SDLRPCParameterNameAppName; +extern SDLRPCParameterName const SDLRPCParameterNameAppServiceId; +extern SDLRPCParameterName const SDLRPCParameterNameAppServiceManifest; +extern SDLRPCParameterName const SDLRPCParameterNameAppServiceRecord; +extern SDLRPCParameterName const SDLRPCParameterNameAppServices; +extern SDLRPCParameterName const SDLRPCParameterNameAppServicesCapabilities; +extern SDLRPCParameterName const SDLRPCParameterNameAppVersion; +extern SDLRPCParameterName const SDLRPCParameterNameAudioControlCapabilities; +extern SDLRPCParameterName const SDLRPCParameterNameAudioControlData; +extern SDLRPCParameterName const SDLRPCParameterNameAudioPassThruCapabilities; +extern SDLRPCParameterName const SDLRPCParameterNameAudioPassThruDisplayText1; +extern SDLRPCParameterName const SDLRPCParameterNameAudioPassThruDisplayText2; +extern SDLRPCParameterName const SDLRPCParameterNameAudioStreamingIndicator; +extern SDLRPCParameterName const SDLRPCParameterNameAudioStreamingState; +extern SDLRPCParameterName const SDLRPCParameterNameAudioType; +extern SDLRPCParameterName const SDLRPCParameterNameAutoCompleteText; +extern SDLRPCParameterName const SDLRPCParameterNameAutoModeEnable; +extern SDLRPCParameterName const SDLRPCParameterNameAutoModeEnableAvailable; +extern SDLRPCParameterName const SDLRPCParameterNameAuxECallNotificationStatus; +extern SDLRPCParameterName const SDLRPCParameterNameAvailableHDs; +extern SDLRPCParameterName const SDLRPCParameterNameAvailableHDsAvailable; +extern SDLRPCParameterName const SDLRPCParameterNameBackgroundColor; +extern SDLRPCParameterName const SDLRPCParameterNameBackTiltAngle; +extern SDLRPCParameterName const SDLRPCParameterNameBackTiltAngleAvailable; +extern SDLRPCParameterName const SDLRPCParameterNameBackVerticalPosition; +extern SDLRPCParameterName const SDLRPCParameterNameBackVerticalPositionAvailable; +extern SDLRPCParameterName const SDLRPCParameterNameBand; +extern SDLRPCParameterName const SDLRPCParameterNameBatteryLevelStatus; +extern SDLRPCParameterName const SDLRPCParameterNameBearing; +extern SDLRPCParameterName const SDLRPCParameterNameBeltStatus; +extern SDLRPCParameterName const SDLRPCParameterNameBitsPerSample; +extern SDLRPCParameterName const SDLRPCParameterNameBodyInformation; +extern SDLRPCParameterName const SDLRPCParameterNameBlue; +extern SDLRPCParameterName const SDLRPCParameterNameBluetoothIconOn; +extern SDLRPCParameterName const SDLRPCParameterNameBulkData; +extern SDLRPCParameterName const SDLRPCParameterNameButtonCapabilities; +extern SDLRPCParameterName const SDLRPCParameterNameButtonEventMode; +extern SDLRPCParameterName const SDLRPCParameterNameButtonName; +extern SDLRPCParameterName const SDLRPCParameterNameButtonPressMode; +extern SDLRPCParameterName const SDLRPCParameterNameColor; +extern SDLRPCParameterName const SDLRPCParameterNameCoolingEnabled; +extern SDLRPCParameterName const SDLRPCParameterNameCoolingEnabledAvailable; +extern SDLRPCParameterName const SDLRPCParameterNameCoolingLevel; +extern SDLRPCParameterName const SDLRPCParameterNameCoolingLevelAvailable; +extern SDLRPCParameterName const SDLRPCParameterNameCoordinate; +extern SDLRPCParameterName const SDLRPCParameterNameCallActive; +extern SDLRPCParameterName const SDLRPCParameterNameCarModeStatus; +extern SDLRPCParameterName const SDLRPCParameterNameCarrier; +extern SDLRPCParameterName const SDLRPCParameterNameChannelId; +extern SDLRPCParameterName const SDLRPCParameterNameChannelName; +extern SDLRPCParameterName const SDLRPCParameterNameChannelSetting; +extern SDLRPCParameterName const SDLRPCParameterNameCharacterSet; +extern SDLRPCParameterName const SDLRPCParameterNameChoiceId; +extern SDLRPCParameterName const SDLRPCParameterNameChoiceSet; +extern SDLRPCParameterName const SDLRPCParameterNameCirculateAirEnable; +extern SDLRPCParameterName const SDLRPCParameterNameCirculateAirEnableAvailable; +extern SDLRPCParameterName const SDLRPCParameterNameClimateControlData; +extern SDLRPCParameterName const SDLRPCParameterNameClimateControlCapabilities; +extern SDLRPCParameterName const SDLRPCParameterNameCloudCover; +extern SDLRPCParameterName const SDLRPCParameterNameClusterModes; +extern SDLRPCParameterName const SDLRPCParameterNameClusterModeStatus; +extern SDLRPCParameterName const SDLRPCParameterNameCommandIcon; +extern SDLRPCParameterName const SDLRPCParameterNameCommandId; +extern SDLRPCParameterName const SDLRPCParameterNameCompassDirection; +extern SDLRPCParameterName const SDLRPCParameterNameCorrelationId; +extern SDLRPCParameterName const SDLRPCParameterNameCountryCode; +extern SDLRPCParameterName const SDLRPCParameterNameCountryName; +extern SDLRPCParameterName const SDLRPCParameterNameCRC; +extern SDLRPCParameterName const SDLRPCParameterNameClockText; +extern SDLRPCParameterName const SDLRPCParameterNameCurrentForecast; +extern SDLRPCParameterName const SDLRPCParameterNameCurrentForecastSupported; +extern SDLRPCParameterName const SDLRPCParameterNameCurrentTemperature; +extern SDLRPCParameterName const SDLRPCParameterNameCushion; +extern SDLRPCParameterName const SDLRPCParameterNameCustomButtonId; +extern SDLRPCParameterName const SDLRPCParameterNameCustomPresets; +extern SDLRPCParameterName const SDLRPCParameterNameData; +extern SDLRPCParameterName const SDLRPCParameterNameDataResult; +extern SDLRPCParameterName const SDLRPCParameterNameDataType; +extern SDLRPCParameterName const SDLRPCParameterNameDay; +extern SDLRPCParameterName const SDLRPCParameterNameDayColorScheme; +extern SDLRPCParameterName const SDLRPCParameterNameDefrostZone; +extern SDLRPCParameterName const SDLRPCParameterNameDefrostZoneAvailable; +extern SDLRPCParameterName const SDLRPCParameterNameDeliveryMode; +extern SDLRPCParameterName const SDLRPCParameterNameDensity; +extern SDLRPCParameterName const SDLRPCParameterNameDensityAvailable; +extern SDLRPCParameterName const SDLRPCParameterNameDesiredTemperature; +extern SDLRPCParameterName const SDLRPCParameterNameDesiredTemperatureAvailable; +extern SDLRPCParameterName const SDLRPCParameterNameDestination; +extern SDLRPCParameterName const SDLRPCParameterNameDestinationETA; +extern SDLRPCParameterName const SDLRPCParameterNameDetails; +extern SDLRPCParameterName const SDLRPCParameterNameDeviceInfo; +extern SDLRPCParameterName const SDLRPCParameterNameDeviceStatus; +extern SDLRPCParameterName const SDLRPCParameterNameDialNumberEnabled; +extern SDLRPCParameterName const SDLRPCParameterNameDIDLocation; +extern SDLRPCParameterName const SDLRPCParameterNameDIDResult; +extern SDLRPCParameterName const SDLRPCParameterNameDimension; +extern SDLRPCParameterName const SDLRPCParameterNameDisplayCapabilities; +extern SDLRPCParameterName const SDLRPCParameterNameDisplayMode; +extern SDLRPCParameterName const SDLRPCParameterNameDisplayModeUnitAvailable; +extern SDLRPCParameterName const SDLRPCParameterNameDisplayLayout; +extern SDLRPCParameterName const SDLRPCParameterNameDisplayName; +extern SDLRPCParameterName const SDLRPCParameterNameDisplayType; +extern SDLRPCParameterName const SDLRPCParameterNameDistanceUnit; +extern SDLRPCParameterName const SDLRPCParameterNameDistanceToEmpty; +extern SDLRPCParameterName const SDLRPCParameterNameDistanceToManeuver; +extern SDLRPCParameterName const SDLRPCParameterNameDistanceToManeuverScale; +extern SDLRPCParameterName const SDLRPCParameterNameDistanceUnitAvailable; +extern SDLRPCParameterName const SDLRPCParameterNameDoublePressAvailable; +extern SDLRPCParameterName const SDLRPCParameterNameDriverAirbagDeployed; +extern SDLRPCParameterName const SDLRPCParameterNameDriverBeltDeployed; +extern SDLRPCParameterName const SDLRPCParameterNameDriverBraking; +extern SDLRPCParameterName const SDLRPCParameterNameDriverBuckleBelted; +extern SDLRPCParameterName const SDLRPCParameterNameDriverCurtainAirbagDeployed; +extern SDLRPCParameterName const SDLRPCParameterNameDriverDistractionStatus; +extern SDLRPCParameterName const SDLRPCParameterNameDriverDoorAjar; +extern SDLRPCParameterName const SDLRPCParameterNameDriverKneeAirbagDeployed; +extern SDLRPCParameterName const SDLRPCParameterNameDriverSideAirbagDeployed; +extern SDLRPCParameterName const SDLRPCParameterNameDrivingSide; +extern SDLRPCParameterName const SDLRPCParameterNameDTC; +extern SDLRPCParameterName const SDLRPCParameterNameDTCMask; +extern SDLRPCParameterName const SDLRPCParameterNameDualModeEnable; +extern SDLRPCParameterName const SDLRPCParameterNameDualModeEnableAvailable; +extern SDLRPCParameterName const SDLRPCParameterNameDuration; +extern SDLRPCParameterName const SDLRPCParameterNameE911Override; +extern SDLRPCParameterName const SDLRPCParameterNameECallConfirmationStatus; +extern SDLRPCParameterName const SDLRPCParameterNameECallEventActive; +extern SDLRPCParameterName const SDLRPCParameterNameECallInfo; +extern SDLRPCParameterName const SDLRPCParameterNameECallNotificationStatus; +extern SDLRPCParameterName const SDLRPCParameterNameECUHeader; +extern SDLRPCParameterName const SDLRPCParameterNameECUName; +extern SDLRPCParameterName const SDLRPCParameterNameElectronicParkBrakeStatus; +extern SDLRPCParameterName const SDLRPCParameterNameEmergencyEvent; +extern SDLRPCParameterName const SDLRPCParameterNameEmergencyEventType; +extern SDLRPCParameterName const SDLRPCParameterNameEndTime; +extern SDLRPCParameterName const SDLRPCParameterNameEngineOilLife; +extern SDLRPCParameterName const SDLRPCParameterNameEngineTorque; +extern SDLRPCParameterName const SDLRPCParameterNameEqualizerAvailable; +extern SDLRPCParameterName const SDLRPCParameterNameEqualizerMaxChannelId; +extern SDLRPCParameterName const SDLRPCParameterNameEqualizerSettings; +extern SDLRPCParameterName const SDLRPCParameterNameETA; +extern SDLRPCParameterName const SDLRPCParameterNameEvent; +extern SDLRPCParameterName const SDLRPCParameterNameExpires; +extern SDLRPCParameterName const SDLRPCParameterNameExternalTemperature; +extern SDLRPCParameterName const SDLRPCParameterNameFanSpeed; +extern SDLRPCParameterName const SDLRPCParameterNameFanSpeedAvailable; +extern SDLRPCParameterName const SDLRPCParameterNameFCCFacilityId; +extern SDLRPCParameterName const SDLRPCParameterNameFilename; +extern SDLRPCParameterName const SDLRPCParameterNameFilenames; +extern SDLRPCParameterName const SDLRPCParameterNameFileType; +extern SDLRPCParameterName const SDLRPCParameterNameFirmness; +extern SDLRPCParameterName const SDLRPCParameterNameFirmwareRevision; +extern SDLRPCParameterName const SDLRPCParameterNameFreeModules; +extern SDLRPCParameterName const SDLRPCParameterNameFrequencyInteger; +extern SDLRPCParameterName const SDLRPCParameterNameFrequencyFraction; +extern SDLRPCParameterName const SDLRPCParameterNameFrontVerticalPosition; +extern SDLRPCParameterName const SDLRPCParameterNameFrontVerticalPositionAvailable; +extern SDLRPCParameterName const SDLRPCParameterNameFuelCutoffStatus; +extern SDLRPCParameterName const SDLRPCParameterNameFuelLevel; +extern SDLRPCParameterName const SDLRPCParameterNameFuelLevelState; +extern SDLRPCParameterName const SDLRPCParameterNameFuelMaintenanceMode; +extern SDLRPCParameterName const SDLRPCParameterNameFuelRange; +extern SDLRPCParameterName const SDLRPCParameterNameFullAppID; +extern SDLRPCParameterName const SDLRPCParameterNameGetWayPointsEnabled; +extern SDLRPCParameterName const SDLRPCParameterNameGPS; +extern SDLRPCParameterName const SDLRPCParameterNameGraphic; +extern SDLRPCParameterName const SDLRPCParameterNameGraphicSupported; +extern SDLRPCParameterName const SDLRPCParameterNameGreen; +extern SDLRPCParameterName const SDLRPCParameterNameHandledRPCs; +extern SDLRPCParameterName const SDLRPCParameterNameHapticRectData; +extern SDLRPCParameterName const SDLRPCParameterNameHapticSpatialDataSupported; +extern SDLRPCParameterName const SDLRPCParameterNameHardware; +extern SDLRPCParameterName const SDLRPCParameterNameHashId; +extern SDLRPCParameterName const SDLRPCParameterNameHDOP; +extern SDLRPCParameterName const SDLRPCParameterNameHDChannel; +extern SDLRPCParameterName const SDLRPCParameterNameHDChannelAvailable; +extern SDLRPCParameterName const SDLRPCParameterNameHDRadioEnable; +extern SDLRPCParameterName const SDLRPCParameterNameHDRadioEnableAvailable; +extern SDLRPCParameterName const SDLRPCParameterNameHeading; +extern SDLRPCParameterName const SDLRPCParameterNameHeadLampStatus; +extern SDLRPCParameterName const SDLRPCParameterNameHeadSupportHorizontalPosition; +extern SDLRPCParameterName const SDLRPCParameterNameHeadSupportHorizontalPositionAvailable; +extern SDLRPCParameterName const SDLRPCParameterNameHeadSupportVerticalPosition; +extern SDLRPCParameterName const SDLRPCParameterNameHeadSupportVerticalPositionAvailable; +extern SDLRPCParameterName const SDLRPCParameterNameHeatingLevel; +extern SDLRPCParameterName const SDLRPCParameterNameHeatingLevelAvailable; +extern SDLRPCParameterName const SDLRPCParameterNameHeatingEnabled; +extern SDLRPCParameterName const SDLRPCParameterNameHeatingEnabledAvailable; +extern SDLRPCParameterName const SDLRPCParameterNameHeatedSteeringWheelAvailable; +extern SDLRPCParameterName const SDLRPCParameterNameHeatedWindshieldAvailable; +extern SDLRPCParameterName const SDLRPCParameterNameHeatedRearWindowAvailable; +extern SDLRPCParameterName const SDLRPCParameterNameHeatedMirrorsAvailable; +extern SDLRPCParameterName const SDLRPCParameterNameHeatedSteeringWheelEnable; +extern SDLRPCParameterName const SDLRPCParameterNameHeatedWindshieldEnable; +extern SDLRPCParameterName const SDLRPCParameterNameHeatedRearWindowEnable; +extern SDLRPCParameterName const SDLRPCParameterNameHeatedMirrorsEnable; +extern SDLRPCParameterName const SDLRPCParameterNameHeight; +extern SDLRPCParameterName const SDLRPCParameterNameHelpPrompt; +extern SDLRPCParameterName const SDLRPCParameterNameHighBeamsOn; +extern SDLRPCParameterName const SDLRPCParameterNameHMICapabilities; +extern SDLRPCParameterName const SDLRPCParameterNameHMIDisplayLanguage; +extern SDLRPCParameterName const SDLRPCParameterNameHMIDisplayLanguageDesired; +extern SDLRPCParameterName const SDLRPCParameterNameHMILevel; +extern SDLRPCParameterName const SDLRPCParameterNameHMIPermissions; +extern SDLRPCParameterName const SDLRPCParameterNameHmiSettingsControlCapabilities; +extern SDLRPCParameterName const SDLRPCParameterNameHmiSettingsControlData; +extern SDLRPCParameterName const SDLRPCParameterNameHMIZoneCapabilities; +extern SDLRPCParameterName const SDLRPCParameterNameHorizontalPosition; +extern SDLRPCParameterName const SDLRPCParameterNameHorizontalPositionAvailable; +extern SDLRPCParameterName const SDLRPCParameterNameHour; +extern SDLRPCParameterName const SDLRPCParameterNameHourlyForecast; +extern SDLRPCParameterName const SDLRPCParameterNameHours; +extern SDLRPCParameterName const SDLRPCParameterNameHumidity; +extern SDLRPCParameterName const SDLRPCParameterNameIconResumed; +extern SDLRPCParameterName const SDLRPCParameterNameId; +extern SDLRPCParameterName const SDLRPCParameterNameIgnitionStableStatus; +extern SDLRPCParameterName const SDLRPCParameterNameIgnitionStatus; +extern SDLRPCParameterName const SDLRPCParameterNameImage; +extern SDLRPCParameterName const SDLRPCParameterNameImageFields; +extern SDLRPCParameterName const SDLRPCParameterNameImageResolution; +extern SDLRPCParameterName const SDLRPCParameterNameImageSupported; +extern SDLRPCParameterName const SDLRPCParameterNameImageTemplate; +extern SDLRPCParameterName const SDLRPCParameterNameImageType; +extern SDLRPCParameterName const SDLRPCParameterNameImageTypeSupported; +extern SDLRPCParameterName const SDLRPCParameterNameInfo; +extern SDLRPCParameterName const SDLRPCParameterNameInitialPrompt; +extern SDLRPCParameterName const SDLRPCParameterNameInitialText; +extern SDLRPCParameterName const SDLRPCParameterNameInnerLeftRear; +extern SDLRPCParameterName const SDLRPCParameterNameInnerRightRear; +extern SDLRPCParameterName const SDLRPCParameterNameInstantFuelConsumption; +extern SDLRPCParameterName const SDLRPCParameterNameInstructions; +extern SDLRPCParameterName const SDLRPCParameterNameInteractionChoiceSetId; +extern SDLRPCParameterName const SDLRPCParameterNameInteractionChoiceSetIdList; +extern SDLRPCParameterName const SDLRPCParameterNameInteractionLayout; +extern SDLRPCParameterName const SDLRPCParameterNameInteractionMode; +extern SDLRPCParameterName const SDLRPCParameterNameIsExplicit; +extern SDLRPCParameterName const SDLRPCParameterNameIsHighlighted; +extern SDLRPCParameterName const SDLRPCParameterNameIsMediaApplication; +extern SDLRPCParameterName const SDLRPCParameterNameIsSubscribed; +extern SDLRPCParameterName const SDLRPCParameterNameJunctionType; +extern SDLRPCParameterName const SDLRPCParameterNameKeepContext; +extern SDLRPCParameterName const SDLRPCParameterNameKeepContextAvailable; +extern SDLRPCParameterName const SDLRPCParameterNameKeyboardLayout; +extern SDLRPCParameterName const SDLRPCParameterNameKeyboardProperties; +extern SDLRPCParameterName const SDLRPCParameterNameKeypressMode; +extern SDLRPCParameterName const SDLRPCParameterNameLabel; +extern SDLRPCParameterName const SDLRPCParameterNameLanguage; +extern SDLRPCParameterName const SDLRPCParameterNameLanguageDesired; +extern SDLRPCParameterName const SDLRPCParameterNameLatitudeDegrees; +extern SDLRPCParameterName const SDLRPCParameterNameLeftFront; +extern SDLRPCParameterName const SDLRPCParameterNameLeftRear; +extern SDLRPCParameterName const SDLRPCParameterNameLeftRearInflatableBelted; +extern SDLRPCParameterName const SDLRPCParameterNameLeftRow2BuckleBelted; +extern SDLRPCParameterName const SDLRPCParameterNameLeftRow3BuckleBelted; +extern SDLRPCParameterName const SDLRPCParameterNameLength; +extern SDLRPCParameterName const SDLRPCParameterNameLightControlCapabilities; +extern SDLRPCParameterName const SDLRPCParameterNameLightControlData; +extern SDLRPCParameterName const SDLRPCParameterNameLightState; +extern SDLRPCParameterName const SDLRPCParameterNameLimitedCharacterList; +extern SDLRPCParameterName const SDLRPCParameterNameLocality; +extern SDLRPCParameterName const SDLRPCParameterNameLocation; +extern SDLRPCParameterName const SDLRPCParameterNameLocationCoordinate; +extern SDLRPCParameterName const SDLRPCParameterNameLocationDescription; +extern SDLRPCParameterName const SDLRPCParameterNameLocationDetails; +extern SDLRPCParameterName const SDLRPCParameterNameLocationImage; +extern SDLRPCParameterName const SDLRPCParameterNameLocationName; +extern SDLRPCParameterName const SDLRPCParameterNameLongitudeDegrees; +extern SDLRPCParameterName const SDLRPCParameterNameLongPress; +extern SDLRPCParameterName const SDLRPCParameterNameLongPressAvailable; +extern SDLRPCParameterName const SDLRPCParameterNameLowBeamsOn; +extern SDLRPCParameterName const SDLRPCParameterNameMainField1; +extern SDLRPCParameterName const SDLRPCParameterNameMainField2; +extern SDLRPCParameterName const SDLRPCParameterNameMainField3; +extern SDLRPCParameterName const SDLRPCParameterNameMainField4; +extern SDLRPCParameterName const SDLRPCParameterNameMainField1Type; +extern SDLRPCParameterName const SDLRPCParameterNameMainField2Type; +extern SDLRPCParameterName const SDLRPCParameterNameMainField3Type; +extern SDLRPCParameterName const SDLRPCParameterNameMainField4Type; +extern SDLRPCParameterName const SDLRPCParameterNameMajorVersion; +extern SDLRPCParameterName const SDLRPCParameterNameMake; +extern SDLRPCParameterName const SDLRPCParameterNameManeuverComplete; +extern SDLRPCParameterName const SDLRPCParameterNameManualTextEntry; +extern SDLRPCParameterName const SDLRPCParameterNameMassageCushionFirmness; +extern SDLRPCParameterName const SDLRPCParameterNameMassageCushionFirmnessAvailable; +extern SDLRPCParameterName const SDLRPCParameterNameMassageEnabled; +extern SDLRPCParameterName const SDLRPCParameterNameMassageEnabledAvailable; +extern SDLRPCParameterName const SDLRPCParameterNameMassageMode; +extern SDLRPCParameterName const SDLRPCParameterNameMassageModeAvailable; +extern SDLRPCParameterName const SDLRPCParameterNameMemoryAvailable; +extern SDLRPCParameterName const SDLRPCParameterNameMassageZone; +extern SDLRPCParameterName const SDLRPCParameterNameMaxBitrate; +extern SDLRPCParameterName const SDLRPCParameterNameMaxDuration; +extern SDLRPCParameterName const SDLRPCParameterNameMaxHourlyForecastAmount; +extern SDLRPCParameterName const SDLRPCParameterNameMaximumChangeVelocity; +extern SDLRPCParameterName const SDLRPCParameterNameMaxMinutelyForecastAmount; +extern SDLRPCParameterName const SDLRPCParameterNameMaxMultidayForecastAmount; +extern SDLRPCParameterName const SDLRPCParameterNameMaxNumberRFCOMMPorts; +extern SDLRPCParameterName const SDLRPCParameterNameMediaAlbum; +extern SDLRPCParameterName const SDLRPCParameterNameMediaArtist; +extern SDLRPCParameterName const SDLRPCParameterNameMediaClock; +extern SDLRPCParameterName const SDLRPCParameterNameMediaClockFormats; +extern SDLRPCParameterName const SDLRPCParameterNameMediaServiceData; +extern SDLRPCParameterName const SDLRPCParameterNameMediaServiceManifest; +extern SDLRPCParameterName const SDLRPCParameterNameMediaTitle; +extern SDLRPCParameterName const SDLRPCParameterNameMediaTrack; +extern SDLRPCParameterName const SDLRPCParameterNameMediaType; +extern SDLRPCParameterName const SDLRPCParameterNameMemory; +extern SDLRPCParameterName const SDLRPCParameterNameMenuIcon; +extern SDLRPCParameterName const SDLRPCParameterNameMenuId; +extern SDLRPCParameterName const SDLRPCParameterNameMenuName; +extern SDLRPCParameterName const SDLRPCParameterNameMenuParams; +extern SDLRPCParameterName const SDLRPCParameterNameMenuTitle; +extern SDLRPCParameterName const SDLRPCParameterNameMessageData; +extern SDLRPCParameterName const SDLRPCParameterNameMessageDataResult; +extern SDLRPCParameterName const SDLRPCParameterNameMessageLength; +extern SDLRPCParameterName const SDLRPCParameterNameMetadataTags; +extern SDLRPCParameterName const SDLRPCParameterNameMiddleRow1BeltDeployed; +extern SDLRPCParameterName const SDLRPCParameterNameMiddleRow1BuckleBelted; +extern SDLRPCParameterName const SDLRPCParameterNameMiddleRow2BuckleBelted; +extern SDLRPCParameterName const SDLRPCParameterNameMiddleRow3BuckleBelted; +extern SDLRPCParameterName const SDLRPCParameterNameMillisecond; +extern SDLRPCParameterName const SDLRPCParameterNameMinorVersion; +extern SDLRPCParameterName const SDLRPCParameterNameMinute; +extern SDLRPCParameterName const SDLRPCParameterNameMinuteForecast; +extern SDLRPCParameterName const SDLRPCParameterNameMinutes; +extern SDLRPCParameterName const SDLRPCParameterNameModel; +extern SDLRPCParameterName const SDLRPCParameterNameModuleData; +extern SDLRPCParameterName const SDLRPCParameterNameModuleName; +extern SDLRPCParameterName const SDLRPCParameterNameModuleType; +extern SDLRPCParameterName const SDLRPCParameterNameModelYear; +extern SDLRPCParameterName const SDLRPCParameterNameMonoAudioOutputMuted; +extern SDLRPCParameterName const SDLRPCParameterNameMonth; +extern SDLRPCParameterName const SDLRPCParameterNameMoonPhase; +extern SDLRPCParameterName const SDLRPCParameterNameMultidayForecast; +extern SDLRPCParameterName const SDLRPCParameterNameMultipleEvents; +extern SDLRPCParameterName const SDLRPCParameterNameMultiTouchAvailable; +extern SDLRPCParameterName const SDLRPCParameterNameMuteAudio; +extern SDLRPCParameterName const SDLRPCParameterNameMyKey; +extern SDLRPCParameterName const SDLRPCParameterNameName; +extern SDLRPCParameterName const SDLRPCParameterNameNavigation; +extern SDLRPCParameterName const SDLRPCParameterNameNavigationCapability; +extern SDLRPCParameterName const SDLRPCParameterNameNavigationServiceData; +extern SDLRPCParameterName const SDLRPCParameterNameNavigationServiceManifest; +extern SDLRPCParameterName const SDLRPCParameterNameNavigationText; +extern SDLRPCParameterName const SDLRPCParameterNameNavigationText1; +extern SDLRPCParameterName const SDLRPCParameterNameNavigationText2; +extern SDLRPCParameterName const SDLRPCParameterNameNearestStormBearing; +extern SDLRPCParameterName const SDLRPCParameterNameNearestStormDistance; +extern SDLRPCParameterName const SDLRPCParameterNameNextInstructionDistance; +extern SDLRPCParameterName const SDLRPCParameterNameNextInstructionDistanceScale; +extern SDLRPCParameterName const SDLRPCParameterNameNextInstructionETA; +extern SDLRPCParameterName const SDLRPCParameterNameNextTurnIcon; +extern SDLRPCParameterName const SDLRPCParameterNameNGNMediaScreenAppName; +extern SDLRPCParameterName const SDLRPCParameterNameNightColorScheme; +extern SDLRPCParameterName const SDLRPCParameterNameNotification; +extern SDLRPCParameterName const SDLRPCParameterNameNumber; +extern SDLRPCParameterName const SDLRPCParameterNameNumberCustomPresetsAvailable; +extern SDLRPCParameterName const SDLRPCParameterNameNumberTicks; +extern SDLRPCParameterName const SDLRPCParameterNameOdometer; +extern SDLRPCParameterName const SDLRPCParameterNameOffset; +extern SDLRPCParameterName const SDLRPCParameterNameOnLockScreenStatus; +extern SDLRPCParameterName const SDLRPCParameterNameOnScreenPresetsAvailable; +extern SDLRPCParameterName const SDLRPCParameterNameOperationName; +extern SDLRPCParameterName const SDLRPCParameterNameOrigin; +extern SDLRPCParameterName const SDLRPCParameterNameOriginApp; +extern SDLRPCParameterName const SDLRPCParameterNameOS; +extern SDLRPCParameterName const SDLRPCParameterNameOSVersion; +extern SDLRPCParameterName const SDLRPCParameterNameParameterPermissions; +extern SDLRPCParameterName const SDLRPCParameterNameParameters; +extern SDLRPCParameterName const SDLRPCParameterNameParentId; +extern SDLRPCParameterName const SDLRPCParameterNameParkBrakeActive; +extern SDLRPCParameterName const SDLRPCParameterNamePassengerAirbagDeployed; +extern SDLRPCParameterName const SDLRPCParameterNamePassengerBeltDeployed; +extern SDLRPCParameterName const SDLRPCParameterNamePassengerBuckleBelted; +extern SDLRPCParameterName const SDLRPCParameterNamePassengerChildDetected; +extern SDLRPCParameterName const SDLRPCParameterNamePassengerCurtainAirbagDeployed; +extern SDLRPCParameterName const SDLRPCParameterNamePassengerDoorAjar; +extern SDLRPCParameterName const SDLRPCParameterNamePassengerKneeAirbagDeployed; +extern SDLRPCParameterName const SDLRPCParameterNamePassengerSideAirbagDeployed; +extern SDLRPCParameterName const SDLRPCParameterNamePatchVersion; +extern SDLRPCParameterName const SDLRPCParameterNamePCMStreamCapabilities; +extern SDLRPCParameterName const SDLRPCParameterNamePDOP; +extern SDLRPCParameterName const SDLRPCParameterNamePermissionItem; +extern SDLRPCParameterName const SDLRPCParameterNamePersistentFile; +extern SDLRPCParameterName const SDLRPCParameterNamePhoneCall; +extern SDLRPCParameterName const SDLRPCParameterNamePhoneCapability; +extern SDLRPCParameterName const SDLRPCParameterNamePhoneNumber; +extern SDLRPCParameterName const SDLRPCParameterNamePhoneRoaming; +extern SDLRPCParameterName const SDLRPCParameterNamePlaylistName; +extern SDLRPCParameterName const SDLRPCParameterNamePlayTone; +extern SDLRPCParameterName const SDLRPCParameterNamePosition; +extern SDLRPCParameterName const SDLRPCParameterNamePostalCode; +extern SDLRPCParameterName const SDLRPCParameterNamePowerModeActive; +extern SDLRPCParameterName const SDLRPCParameterNamePowerModeQualificationStatus; +extern SDLRPCParameterName const SDLRPCParameterNamePowerModeStatus; +extern SDLRPCParameterName const SDLRPCParameterNamePrecipAccumulation; +extern SDLRPCParameterName const SDLRPCParameterNamePrecipIntensity; +extern SDLRPCParameterName const SDLRPCParameterNamePrecipProbability; +extern SDLRPCParameterName const SDLRPCParameterNamePrecipType; +extern SDLRPCParameterName const SDLRPCParameterNamePreferredResolution; +extern SDLRPCParameterName const SDLRPCParameterNamePrerecordedSpeech; +extern SDLRPCParameterName const SDLRPCParameterNamePresetBankCapabilities; +extern SDLRPCParameterName const SDLRPCParameterNamePressAvailable; +extern SDLRPCParameterName const SDLRPCParameterNamePressure; +extern SDLRPCParameterName const SDLRPCParameterNamePressureTelltale; +extern SDLRPCParameterName const SDLRPCParameterNamePrimaryAudioSource; +extern SDLRPCParameterName const SDLRPCParameterNamePrimaryColor; +extern SDLRPCParameterName const SDLRPCParameterNamePRNDL; +extern SDLRPCParameterName const SDLRPCParameterNameProgramIdentification; +extern SDLRPCParameterName const SDLRPCParameterNameProgressIndicator; +extern SDLRPCParameterName const SDLRPCParameterNameProperties; +extern SDLRPCParameterName const SDLRPCParameterNameProgramService; +extern SDLRPCParameterName const SDLRPCParameterNameProgramType; +extern SDLRPCParameterName const SDLRPCParameterNamePrompt; +extern SDLRPCParameterName const SDLRPCParameterNameQueueCurrentTrackNumber; +extern SDLRPCParameterName const SDLRPCParameterNameQueuePlaybackDuration; +extern SDLRPCParameterName const SDLRPCParameterNameQueuePlaybackProgress; +extern SDLRPCParameterName const SDLRPCParameterNameQueueTotalTrackCount; +extern SDLRPCParameterName const SDLRPCParameterNameRadioBandAvailable; +extern SDLRPCParameterName const SDLRPCParameterNameRadioControlCapabilities; +extern SDLRPCParameterName const SDLRPCParameterNameRadioControlData; +extern SDLRPCParameterName const SDLRPCParameterNameRadioEnable; +extern SDLRPCParameterName const SDLRPCParameterNameRadioEnableAvailable; +extern SDLRPCParameterName const SDLRPCParameterNameRadioFrequencyAvailable; +extern SDLRPCParameterName const SDLRPCParameterNameRange; +extern SDLRPCParameterName const SDLRPCParameterNameRDSData; +extern SDLRPCParameterName const SDLRPCParameterNameRDSDataAvailable; +extern SDLRPCParameterName const SDLRPCParameterNameRearLeftDoorAjar; +extern SDLRPCParameterName const SDLRPCParameterNameRearRightDoorAjar; +extern SDLRPCParameterName const SDLRPCParameterNameReason; +extern SDLRPCParameterName const SDLRPCParameterNameRect; +extern SDLRPCParameterName const SDLRPCParameterNameRed; +extern SDLRPCParameterName const SDLRPCParameterNameRegion; +extern SDLRPCParameterName const SDLRPCParameterNameRegions; +extern SDLRPCParameterName const SDLRPCParameterNameRemoteControlCapability; +extern SDLRPCParameterName const SDLRPCParameterNameRequest; +extern SDLRPCParameterName const SDLRPCParameterNameRequestServiceActive; +extern SDLRPCParameterName const SDLRPCParameterNameRequestSubType; +extern SDLRPCParameterName const SDLRPCParameterNameRequestType; +extern SDLRPCParameterName const SDLRPCParameterNameReserved; +extern SDLRPCParameterName const SDLRPCParameterNameResolution; +extern SDLRPCParameterName const SDLRPCParameterNameResolutionHeight; +extern SDLRPCParameterName const SDLRPCParameterNameResolutionWidth; +extern SDLRPCParameterName const SDLRPCParameterNameResponse; +extern SDLRPCParameterName const SDLRPCParameterNameResult; +extern SDLRPCParameterName const SDLRPCParameterNameResultCode; +extern SDLRPCParameterName const SDLRPCParameterNameRightFront; +extern SDLRPCParameterName const SDLRPCParameterNameRightRear; +extern SDLRPCParameterName const SDLRPCParameterNameRightRearInflatableBelted; +extern SDLRPCParameterName const SDLRPCParameterNameRightRow2BuckleBelted; +extern SDLRPCParameterName const SDLRPCParameterNameRightRow3BuckleBelted; +extern SDLRPCParameterName const SDLRPCParameterNameRolloverEvent; +extern SDLRPCParameterName const SDLRPCParameterNameRows; +extern SDLRPCParameterName const SDLRPCParameterNameRPCName; +extern SDLRPCParameterName const SDLRPCParameterNameRPCSpecVersion; +extern SDLRPCParameterName const SDLRPCParameterNameRPM; +extern SDLRPCParameterName const SDLRPCParameterNameRadioText; +extern SDLRPCParameterName const SDLRPCParameterNameSamplingRate; +extern SDLRPCParameterName const SDLRPCParameterNameSatellites; +extern SDLRPCParameterName const SDLRPCParameterNameScreenParams; +extern SDLRPCParameterName const SDLRPCParameterNameScrollableMessageBody; +extern SDLRPCParameterName const SDLRPCParameterNameSDLVersion; +extern SDLRPCParameterName const SDLRPCParameterNameSearchAddress; +extern SDLRPCParameterName const SDLRPCParameterNameSeatControlData; +extern SDLRPCParameterName const SDLRPCParameterNameSeatControlCapabilities; +extern SDLRPCParameterName const SDLRPCParameterNameSecondaryColor; +extern SDLRPCParameterName const SDLRPCParameterNameSecondaryGraphic; +extern SDLRPCParameterName const SDLRPCParameterNameSecondaryImage; +extern SDLRPCParameterName const SDLRPCParameterNameSecondaryText; +extern SDLRPCParameterName const SDLRPCParameterNameSecond; +extern SDLRPCParameterName const SDLRPCParameterNameSeconds; +extern SDLRPCParameterName const SDLRPCParameterNameSendLocationEnabled; +extern SDLRPCParameterName const SDLRPCParameterNameServiceActive; +extern SDLRPCParameterName const SDLRPCParameterNameServiceData; +extern SDLRPCParameterName const SDLRPCParameterNameServiceIcon; +extern SDLRPCParameterName const SDLRPCParameterNameServiceID; +extern SDLRPCParameterName const SDLRPCParameterNameServiceManifest; +extern SDLRPCParameterName const SDLRPCParameterNameServiceName; +extern SDLRPCParameterName const SDLRPCParameterNameServicePublished; +extern SDLRPCParameterName const SDLRPCParameterNameServiceSpecificResult; +extern SDLRPCParameterName const SDLRPCParameterNameServiceType; +extern SDLRPCParameterName const SDLRPCParameterNameServiceUri; +extern SDLRPCParameterName const SDLRPCParameterNameSeverity; +extern SDLRPCParameterName const SDLRPCParameterNameShortPress; +extern SDLRPCParameterName const SDLRPCParameterNameShortPressAvailable; +extern SDLRPCParameterName const SDLRPCParameterNameSignalLevelStatus; +extern SDLRPCParameterName const SDLRPCParameterNameSignalChangeThreshold; +extern SDLRPCParameterName const SDLRPCParameterNameSignalChangeThresholdAvailable; +extern SDLRPCParameterName const SDLRPCParameterNameSignalStrength; +extern SDLRPCParameterName const SDLRPCParameterNameSignalStrengthAvailable; +extern SDLRPCParameterName const SDLRPCParameterNameSiriusXMRadioAvailable; +extern SDLRPCParameterName const SDLRPCParameterNameSISData; +extern SDLRPCParameterName const SDLRPCParameterNameSISDataAvailable; +extern SDLRPCParameterName const SDLRPCParameterNameSliderFooter; +extern SDLRPCParameterName const SDLRPCParameterNameSliderHeader; +extern SDLRPCParameterName const SDLRPCParameterNameSliderPosition; +extern SDLRPCParameterName const SDLRPCParameterNameSoftButtonCapabilities; +extern SDLRPCParameterName const SDLRPCParameterNameSoftButtonId; +extern SDLRPCParameterName const SDLRPCParameterNameSoftButtons; +extern SDLRPCParameterName const SDLRPCParameterNameSource; +extern SDLRPCParameterName const SDLRPCParameterNameSourceAvailable; +extern SDLRPCParameterName const SDLRPCParameterNameSpaceAvailable; +extern SDLRPCParameterName const SDLRPCParameterNameSpeechCapabilities; +extern SDLRPCParameterName const SDLRPCParameterNameSpeed; +extern SDLRPCParameterName const SDLRPCParameterNameRGBColorSpaceAvailable; +extern SDLRPCParameterName const SDLRPCParameterNameStartTime; +extern SDLRPCParameterName const SDLRPCParameterNameState; +extern SDLRPCParameterName const SDLRPCParameterNameStateAvailable; +extern SDLRPCParameterName const SDLRPCParameterNameStateOfCharge; +extern SDLRPCParameterName const SDLRPCParameterNameStationIDNumber; +extern SDLRPCParameterName const SDLRPCParameterNameStationLongName; +extern SDLRPCParameterName const SDLRPCParameterNameStationLocation; +extern SDLRPCParameterName const SDLRPCParameterNameStationMessage; +extern SDLRPCParameterName const SDLRPCParameterNameStationShortName; +extern SDLRPCParameterName const SDLRPCParameterNameStatus; +extern SDLRPCParameterName const SDLRPCParameterNameStatusAvailable; +extern SDLRPCParameterName const SDLRPCParameterNameStatusBar; +extern SDLRPCParameterName const SDLRPCParameterNameSteeringWheelAngle; +extern SDLRPCParameterName const SDLRPCParameterNameStereoAudioOutputMuted; +extern SDLRPCParameterName const SDLRPCParameterNameSubAdministrativeArea; +extern SDLRPCParameterName const SDLRPCParameterNameSubLocality; +extern SDLRPCParameterName const SDLRPCParameterNameSubscribe; +extern SDLRPCParameterName const SDLRPCParameterNameSubThoroughfare; +extern SDLRPCParameterName const SDLRPCParameterNameSuccess; +extern SDLRPCParameterName const SDLRPCParameterNameSummary; +extern SDLRPCParameterName const SDLRPCParameterNameSupportedDiagnosticModes; +extern SDLRPCParameterName const SDLRPCParameterNameSupportedFormats; +extern SDLRPCParameterName const SDLRPCParameterNameSupportedLights; +extern SDLRPCParameterName const SDLRPCParameterNameSyncFileName; +extern SDLRPCParameterName const SDLRPCParameterNameSyncMessageVersion; +extern SDLRPCParameterName const SDLRPCParameterNameSystemAction; +extern SDLRPCParameterName const SDLRPCParameterNameSystemCapability; +extern SDLRPCParameterName const SDLRPCParameterNameSystemCapabilityType; +extern SDLRPCParameterName const SDLRPCParameterNameSystemContext; +extern SDLRPCParameterName const SDLRPCParameterNameSystemFile; +extern SDLRPCParameterName const SDLRPCParameterNameSystemSoftwareVersion; +extern SDLRPCParameterName const SDLRPCParameterNameTrackPlaybackDuration; +extern SDLRPCParameterName const SDLRPCParameterNameTrackPlaybackProgress; +extern SDLRPCParameterName const SDLRPCParameterNameTrafficAnnouncementIdentification; +extern SDLRPCParameterName const SDLRPCParameterNameTargetId; +extern SDLRPCParameterName const SDLRPCParameterNameTemperatureHigh; +extern SDLRPCParameterName const SDLRPCParameterNameTemperatureLow; +extern SDLRPCParameterName const SDLRPCParameterNameTemperatureUnit; +extern SDLRPCParameterName const SDLRPCParameterNameTemperatureUnitAvailable; +extern SDLRPCParameterName const SDLRPCParameterNameTemplatesAvailable; +extern SDLRPCParameterName const SDLRPCParameterNameTertiaryText; +extern SDLRPCParameterName const SDLRPCParameterNameText; +extern SDLRPCParameterName const SDLRPCParameterNameTextFields; +extern SDLRPCParameterName const SDLRPCParameterNameTextMessageAvailable; +extern SDLRPCParameterName const SDLRPCParameterNameThoroughfare; +extern SDLRPCParameterName const SDLRPCParameterNameTime; +extern SDLRPCParameterName const SDLRPCParameterNameTimeIssued; +extern SDLRPCParameterName const SDLRPCParameterNameTimeout; +extern SDLRPCParameterName const SDLRPCParameterNameTimeoutCapitalized; +extern SDLRPCParameterName const SDLRPCParameterNameTimeoutPrompt; +extern SDLRPCParameterName const SDLRPCParameterNameTS; +extern SDLRPCParameterName const SDLRPCParameterNameTimeStamp; +extern SDLRPCParameterName const SDLRPCParameterNameTimeToDestination; +extern SDLRPCParameterName const SDLRPCParameterNameTimezoneHourOffset; +extern SDLRPCParameterName const SDLRPCParameterNameTimezoneMinuteOffset; +extern SDLRPCParameterName const SDLRPCParameterNameTirePressure; +extern SDLRPCParameterName const SDLRPCParameterNameTitle; +extern SDLRPCParameterName const SDLRPCParameterNameTotalDistance; +extern SDLRPCParameterName const SDLRPCParameterNameTouchEventAvailable; +extern SDLRPCParameterName const SDLRPCParameterNameTPMS; +extern SDLRPCParameterName const SDLRPCParameterNameTrafficProgramIdentification; +extern SDLRPCParameterName const SDLRPCParameterNameTriggerSource; +extern SDLRPCParameterName const SDLRPCParameterNameTrim; +extern SDLRPCParameterName const SDLRPCParameterNameTryAgainTime; +extern SDLRPCParameterName const SDLRPCParameterNameTTSChunks; +extern SDLRPCParameterName const SDLRPCParameterNameTTSName; +extern SDLRPCParameterName const SDLRPCParameterNameTurnIcon; +extern SDLRPCParameterName const SDLRPCParameterNameTurnList; +extern SDLRPCParameterName const SDLRPCParameterNameTurnSignal; +extern SDLRPCParameterName const SDLRPCParameterNameType; +extern SDLRPCParameterName const SDLRPCParameterNameUnit; +extern SDLRPCParameterName const SDLRPCParameterNameUnsubscribe; +extern SDLRPCParameterName const SDLRPCParameterNameUpdatedAppServiceRecord; +extern SDLRPCParameterName const SDLRPCParameterNameUpdateMode; +extern SDLRPCParameterName const SDLRPCParameterNameUpdateReason; +extern SDLRPCParameterName const SDLRPCParameterNameUpDownAvailable; +extern SDLRPCParameterName const SDLRPCParameterNameURL; +extern SDLRPCParameterName const SDLRPCParameterNameURLUppercase; +extern SDLRPCParameterName const SDLRPCParameterNameUserDisallowed; +extern SDLRPCParameterName const SDLRPCParameterNameUserSelected; +extern SDLRPCParameterName const SDLRPCParameterNameUTCDay; +extern SDLRPCParameterName const SDLRPCParameterNameUTCHours; +extern SDLRPCParameterName const SDLRPCParameterNameUTCMinutes; +extern SDLRPCParameterName const SDLRPCParameterNameUTCMonth; +extern SDLRPCParameterName const SDLRPCParameterNameUTCSeconds; +extern SDLRPCParameterName const SDLRPCParameterNameUTCYear; +extern SDLRPCParameterName const SDLRPCParameterNameValue; +extern SDLRPCParameterName const SDLRPCParameterNameVDOP; +extern SDLRPCParameterName const SDLRPCParameterNameVehicleType; +extern SDLRPCParameterName const SDLRPCParameterNameVerticalPosition; +extern SDLRPCParameterName const SDLRPCParameterNameVerticalPositionAvailable; +extern SDLRPCParameterName const SDLRPCParameterNameVideoCodec; +extern SDLRPCParameterName const SDLRPCParameterNameVideoProtocol; +extern SDLRPCParameterName const SDLRPCParameterNameVideoStreaming; +extern SDLRPCParameterName const SDLRPCParameterNameVideoStreamingCapability; +extern SDLRPCParameterName const SDLRPCParameterNameVideoStreamingState; +extern SDLRPCParameterName const SDLRPCParameterNameVisibility; +extern SDLRPCParameterName const SDLRPCParameterNameVentilationMode; +extern SDLRPCParameterName const SDLRPCParameterNameVentilationModeAvailable; +extern SDLRPCParameterName const SDLRPCParameterNameVIN; +extern SDLRPCParameterName const SDLRPCParameterNameVoiceRecognitionOn; +extern SDLRPCParameterName const SDLRPCParameterNameVolume; +extern SDLRPCParameterName const SDLRPCParameterNameVolumeAvailable; +extern SDLRPCParameterName const SDLRPCParameterNameVRCapabilities; +extern SDLRPCParameterName const SDLRPCParameterNameVRCommands; +extern SDLRPCParameterName const SDLRPCParameterNameVRHelp; +extern SDLRPCParameterName const SDLRPCParameterNameVRHelpTitle; +extern SDLRPCParameterName const SDLRPCParameterNameVRSynonyms; +extern SDLRPCParameterName const SDLRPCParameterNameWayPoints; +extern SDLRPCParameterName const SDLRPCParameterNameWayPointType; +extern SDLRPCParameterName const SDLRPCParameterNameWeatherForLocationSupported; +extern SDLRPCParameterName const SDLRPCParameterNameWeatherIconImageName; +extern SDLRPCParameterName const SDLRPCParameterNameWeatherServiceData; +extern SDLRPCParameterName const SDLRPCParameterNameWeatherServiceManifest; +extern SDLRPCParameterName const SDLRPCParameterNameWeatherSummary; +extern SDLRPCParameterName const SDLRPCParameterNameWidth; +extern SDLRPCParameterName const SDLRPCParameterNameWindBearing; +extern SDLRPCParameterName const SDLRPCParameterNameWindGust; +extern SDLRPCParameterName const SDLRPCParameterNameWindSpeed; +extern SDLRPCParameterName const SDLRPCParameterNameWiperStatus; +extern SDLRPCParameterName const SDLRPCParameterNameX; +extern SDLRPCParameterName const SDLRPCParameterNameY; +extern SDLRPCParameterName const SDLRPCParameterNameYear; + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLRPCParameterNames.m b/SmartDeviceLink/SDLRPCParameterNames.m new file mode 100644 index 000000000..20fe849d7 --- /dev/null +++ b/SmartDeviceLink/SDLRPCParameterNames.m @@ -0,0 +1,666 @@ +// SDLRPCParameterNames.h +// + +#import "NSMutableDictionary+Store.h" +#import "SDLRPCParameterNames.h" + +NS_ASSUME_NONNULL_BEGIN + +SDLRPCParameterName const SDLRPCParameterNameACEnable = @"acEnable"; +SDLRPCParameterName const SDLRPCParameterNameACEnableAvailable = @"acEnableAvailable"; +SDLRPCParameterName const SDLRPCParameterNameACMaxEnable = @"acMaxEnable"; +SDLRPCParameterName const SDLRPCParameterNameACMaxEnableAvailable = @"acMaxEnableAvailable"; +SDLRPCParameterName const SDLRPCParameterNameAccelerationPedalPosition = @"accPedalPosition"; +SDLRPCParameterName const SDLRPCParameterNameAcceptsWayPoints = @"acceptsWayPoints"; +SDLRPCParameterName const SDLRPCParameterNameAction = @"action"; +SDLRPCParameterName const SDLRPCParameterNameActual = @"actual"; +SDLRPCParameterName const SDLRPCParameterNameAddress = @"address"; +SDLRPCParameterName const SDLRPCParameterNameAddressLines = @"addressLines"; +SDLRPCParameterName const SDLRPCParameterNameAdministrativeArea = @"administrativeArea"; +SDLRPCParameterName const SDLRPCParameterNameAirbagStatus = @"airbagStatus"; +SDLRPCParameterName const SDLRPCParameterNameAlerts = @"alerts"; +SDLRPCParameterName const SDLRPCParameterNameAlertText1 = @"alertText1"; +SDLRPCParameterName const SDLRPCParameterNameAlertText2 = @"alertText2"; +SDLRPCParameterName const SDLRPCParameterNameAlertText3 = @"alertText3"; +SDLRPCParameterName const SDLRPCParameterNameAlignment = @"alignment"; +SDLRPCParameterName const SDLRPCParameterNameAllowAppConsumers = @"allowAppConsumers"; +SDLRPCParameterName const SDLRPCParameterNameAllowed = @"allowed"; +SDLRPCParameterName const SDLRPCParameterNameAllocatedModules = @"allocatedModules"; +SDLRPCParameterName const SDLRPCParameterNameAltitude = @"altitude"; +SDLRPCParameterName const SDLRPCParameterNameAltitudeMeters = @"altitudeMeters"; +SDLRPCParameterName const SDLRPCParameterNameAmbientLightSensorStatus = @"ambientLightSensorStatus"; +SDLRPCParameterName const SDLRPCParameterNameAmbientLightStatus = @"ambientLightStatus"; +SDLRPCParameterName const SDLRPCParameterNameApparentTemperature = @"apparentTemperature"; +SDLRPCParameterName const SDLRPCParameterNameApparentTemperatureHigh = @"apparentTemperatureHigh"; +SDLRPCParameterName const SDLRPCParameterNameApparentTemperatureLow = @"apparentTemperatureLow"; +SDLRPCParameterName const SDLRPCParameterNameAppBundleId = @"appBundleID"; +SDLRPCParameterName const SDLRPCParameterNameAppHMIType = @"appHMIType"; +SDLRPCParameterName const SDLRPCParameterNameAppId = @"appID"; +SDLRPCParameterName const SDLRPCParameterNameAppInfo = @"appInfo"; +SDLRPCParameterName const SDLRPCParameterNameAppName = @"appName"; +SDLRPCParameterName const SDLRPCParameterNameAppServiceId = @"appServiceId"; +SDLRPCParameterName const SDLRPCParameterNameAppServiceManifest = @"appServiceManifest"; +SDLRPCParameterName const SDLRPCParameterNameAppServiceRecord = @"appServiceRecord"; +SDLRPCParameterName const SDLRPCParameterNameAppServices = @"appServices"; +SDLRPCParameterName const SDLRPCParameterNameAppServicesCapabilities = @"appServicesCapabilities"; +SDLRPCParameterName const SDLRPCParameterNameAppDisplayName = @"appDisplayName"; +SDLRPCParameterName const SDLRPCParameterNameAppVersion = @"appVersion"; +SDLRPCParameterName const SDLRPCParameterNameAudioControlCapabilities = @"audioControlCapabilities"; +SDLRPCParameterName const SDLRPCParameterNameAudioControlData = @"audioControlData"; +SDLRPCParameterName const SDLRPCParameterNameAudioPassThruCapabilities = @"audioPassThruCapabilities"; +SDLRPCParameterName const SDLRPCParameterNameAudioPassThruDisplayText1 = @"audioPassThruDisplayText1"; +SDLRPCParameterName const SDLRPCParameterNameAudioPassThruDisplayText2 = @"audioPassThruDisplayText2"; +SDLRPCParameterName const SDLRPCParameterNameAudioStreamingIndicator = @"audioStreamingIndicator"; +SDLRPCParameterName const SDLRPCParameterNameAudioStreamingState = @"audioStreamingState"; +SDLRPCParameterName const SDLRPCParameterNameAudioType = @"audioType"; +SDLRPCParameterName const SDLRPCParameterNameAutoCompleteText = @"autoCompleteText"; +SDLRPCParameterName const SDLRPCParameterNameAutoModeEnable = @"autoModeEnable"; +SDLRPCParameterName const SDLRPCParameterNameAutoModeEnableAvailable = @"autoModeEnableAvailable"; +SDLRPCParameterName const SDLRPCParameterNameAuxECallNotificationStatus = @"auxECallNotificationStatus"; +SDLRPCParameterName const SDLRPCParameterNameAvailableHDs = @"availableHDs"; +SDLRPCParameterName const SDLRPCParameterNameAvailableHDsAvailable = @"availableHDsAvailable"; +SDLRPCParameterName const SDLRPCParameterNameBackgroundColor = @"backgroundColor"; +SDLRPCParameterName const SDLRPCParameterNameBackTiltAngle = @"backTiltAngle"; +SDLRPCParameterName const SDLRPCParameterNameBackTiltAngleAvailable = @"backTiltAngleAvailable"; +SDLRPCParameterName const SDLRPCParameterNameBackVerticalPosition = @"backVerticalPosition"; +SDLRPCParameterName const SDLRPCParameterNameBackVerticalPositionAvailable = @"backVerticalPositionAvailable"; +SDLRPCParameterName const SDLRPCParameterNameBand = @"band"; +SDLRPCParameterName const SDLRPCParameterNameBatteryLevelStatus = @"battLevelStatus"; +SDLRPCParameterName const SDLRPCParameterNameBearing = @"bearing"; +SDLRPCParameterName const SDLRPCParameterNameBeltStatus = @"beltStatus"; +SDLRPCParameterName const SDLRPCParameterNameBitsPerSample = @"bitsPerSample"; +SDLRPCParameterName const SDLRPCParameterNameBodyInformation = @"bodyInformation"; +SDLRPCParameterName const SDLRPCParameterNameBlue = @"blue"; +SDLRPCParameterName const SDLRPCParameterNameBluetoothIconOn = @"btIconOn"; +SDLRPCParameterName const SDLRPCParameterNameBulkData = @"bulkData"; +SDLRPCParameterName const SDLRPCParameterNameButtonCapabilities = @"buttonCapabilities"; +SDLRPCParameterName const SDLRPCParameterNameButtonEventMode = @"buttonEventMode"; +SDLRPCParameterName const SDLRPCParameterNameButtonName = @"buttonName"; +SDLRPCParameterName const SDLRPCParameterNameButtonPressMode = @"buttonPressMode"; +SDLRPCParameterName const SDLRPCParameterNameCoolingEnabled = @"coolingEnabled"; +SDLRPCParameterName const SDLRPCParameterNameCoolingEnabledAvailable = @"coolingEnabledAvailable"; +SDLRPCParameterName const SDLRPCParameterNameCoolingLevel = @"coolingLevel"; +SDLRPCParameterName const SDLRPCParameterNameCoolingLevelAvailable = @"coolingLevelAvailable"; +SDLRPCParameterName const SDLRPCParameterNameCoordinate = @"c"; +SDLRPCParameterName const SDLRPCParameterNameCallActive = @"callActive"; +SDLRPCParameterName const SDLRPCParameterNameCarModeStatus = @"carModeStatus"; +SDLRPCParameterName const SDLRPCParameterNameCarrier = @"carrier"; +SDLRPCParameterName const SDLRPCParameterNameChannelId = @"channelId"; +SDLRPCParameterName const SDLRPCParameterNameChannelName = @"channelName"; +SDLRPCParameterName const SDLRPCParameterNameChannelSetting = @"channelSetting"; +SDLRPCParameterName const SDLRPCParameterNameCharacterSet = @"characterSet"; +SDLRPCParameterName const SDLRPCParameterNameChoiceId = @"choiceID"; +SDLRPCParameterName const SDLRPCParameterNameChoiceSet = @"choiceSet"; +SDLRPCParameterName const SDLRPCParameterNameCirculateAirEnable = @"circulateAirEnable"; +SDLRPCParameterName const SDLRPCParameterNameCirculateAirEnableAvailable = @"circulateAirEnableAvailable"; +SDLRPCParameterName const SDLRPCParameterNameClimateControlData = @"climateControlData"; +SDLRPCParameterName const SDLRPCParameterNameClimateControlCapabilities = @"climateControlCapabilities"; +SDLRPCParameterName const SDLRPCParameterNameCloudCover = @"cloudCover"; +SDLRPCParameterName const SDLRPCParameterNameClusterModes = @"clusterModes"; +SDLRPCParameterName const SDLRPCParameterNameClusterModeStatus = @"clusterModeStatus"; +SDLRPCParameterName const SDLRPCParameterNameColor = @"color"; +SDLRPCParameterName const SDLRPCParameterNameCommandIcon = @"cmdIcon"; +SDLRPCParameterName const SDLRPCParameterNameCommandId = @"cmdID"; +SDLRPCParameterName const SDLRPCParameterNameCompassDirection = @"compassDirection"; +SDLRPCParameterName const SDLRPCParameterNameCorrelationId = @"correlationID"; +SDLRPCParameterName const SDLRPCParameterNameCountryCode = @"countryCode"; +SDLRPCParameterName const SDLRPCParameterNameCountryName = @"countryName"; +SDLRPCParameterName const SDLRPCParameterNameCRC = @"crc"; +SDLRPCParameterName const SDLRPCParameterNameClockText = @"CT"; +SDLRPCParameterName const SDLRPCParameterNameCurrentForecast = @"currentForecast"; +SDLRPCParameterName const SDLRPCParameterNameCurrentForecastSupported = @"currentForecastSupported"; +SDLRPCParameterName const SDLRPCParameterNameCurrentTemperature = @"currentTemperature"; +SDLRPCParameterName const SDLRPCParameterNameCushion = @"cushion"; +SDLRPCParameterName const SDLRPCParameterNameCustomButtonId = @"customButtonID"; +SDLRPCParameterName const SDLRPCParameterNameCustomPresets = @"customPresets"; +SDLRPCParameterName const SDLRPCParameterNameData = @"data"; +SDLRPCParameterName const SDLRPCParameterNameDataResult = @"dataResult"; +SDLRPCParameterName const SDLRPCParameterNameDataType = @"dataType"; +SDLRPCParameterName const SDLRPCParameterNameDay = @"day"; +SDLRPCParameterName const SDLRPCParameterNameDayColorScheme = @"dayColorScheme"; +SDLRPCParameterName const SDLRPCParameterNameDefrostZone = @"defrostZone"; +SDLRPCParameterName const SDLRPCParameterNameDefrostZoneAvailable = @"defrostZoneAvailable"; +SDLRPCParameterName const SDLRPCParameterNameDeliveryMode = @"deliveryMode"; +SDLRPCParameterName const SDLRPCParameterNameDensity = @"density"; +SDLRPCParameterName const SDLRPCParameterNameDensityAvailable = @"densityAvailable"; +SDLRPCParameterName const SDLRPCParameterNameDesiredTemperature = @"desiredTemperature"; +SDLRPCParameterName const SDLRPCParameterNameDesiredTemperatureAvailable = @"desiredTemperatureAvailable"; +SDLRPCParameterName const SDLRPCParameterNameDestination = @"destination"; +SDLRPCParameterName const SDLRPCParameterNameDestinationETA = @"destinationETA"; +SDLRPCParameterName const SDLRPCParameterNameDeviceInfo = @"deviceInfo"; +SDLRPCParameterName const SDLRPCParameterNameDeviceStatus = @"deviceStatus"; +SDLRPCParameterName const SDLRPCParameterNameDetails = @"details"; +SDLRPCParameterName const SDLRPCParameterNameDialNumberEnabled = @"dialNumberEnabled"; +SDLRPCParameterName const SDLRPCParameterNameDIDLocation = @"didLocation"; +SDLRPCParameterName const SDLRPCParameterNameDIDResult = @"didResult"; +SDLRPCParameterName const SDLRPCParameterNameDimension = @"dimension"; +SDLRPCParameterName const SDLRPCParameterNameDisplayCapabilities = @"displayCapabilities"; +SDLRPCParameterName const SDLRPCParameterNameDisplayLayout = @"displayLayout"; +SDLRPCParameterName const SDLRPCParameterNameDisplayMode = @"displayMode"; +SDLRPCParameterName const SDLRPCParameterNameDisplayModeUnitAvailable = @"displayModeUnitAvailable"; +SDLRPCParameterName const SDLRPCParameterNameDisplayType = @"displayType"; +SDLRPCParameterName const SDLRPCParameterNameDistanceToEmpty = @"distanceToEmpty"; +SDLRPCParameterName const SDLRPCParameterNameDistanceToManeuver = @"distanceToManeuver"; +SDLRPCParameterName const SDLRPCParameterNameDistanceToManeuverScale = @"distanceToManeuverScale"; +SDLRPCParameterName const SDLRPCParameterNameDistanceUnitAvailable = @"distanceUnitAvailable"; +SDLRPCParameterName const SDLRPCParameterNameDistanceUnit = @"distanceUnit"; +SDLRPCParameterName const SDLRPCParameterNameDoublePressAvailable = @"doublePressAvailable"; +SDLRPCParameterName const SDLRPCParameterNameDriverAirbagDeployed = @"driverAirbagDeployed"; +SDLRPCParameterName const SDLRPCParameterNameDriverBeltDeployed = @"driverBeltDeployed"; +SDLRPCParameterName const SDLRPCParameterNameDriverBraking = @"driverBraking"; +SDLRPCParameterName const SDLRPCParameterNameDriverBuckleBelted = @"driverBuckleBelted"; +SDLRPCParameterName const SDLRPCParameterNameDriverCurtainAirbagDeployed = @"driverCurtainAirbagDeployed"; +SDLRPCParameterName const SDLRPCParameterNameDriverDistractionStatus = @"driverDistractionStatus"; +SDLRPCParameterName const SDLRPCParameterNameDriverDoorAjar = @"driverDoorAjar"; +SDLRPCParameterName const SDLRPCParameterNameDriverKneeAirbagDeployed = @"driverKneeAirbagDeployed"; +SDLRPCParameterName const SDLRPCParameterNameDriverSideAirbagDeployed = @"driverSideAirbagDeployed"; +SDLRPCParameterName const SDLRPCParameterNameDrivingSide = @"drivingSide"; +SDLRPCParameterName const SDLRPCParameterNameDTC = @"dtc"; +SDLRPCParameterName const SDLRPCParameterNameDTCMask = @"dtcMask"; +SDLRPCParameterName const SDLRPCParameterNameDualModeEnable = @"dualModeEnable"; +SDLRPCParameterName const SDLRPCParameterNameDualModeEnableAvailable = @"dualModeEnableAvailable"; +SDLRPCParameterName const SDLRPCParameterNameDuration = @"duration"; +SDLRPCParameterName const SDLRPCParameterNameE911Override = @"e911Override"; +SDLRPCParameterName const SDLRPCParameterNameECallConfirmationStatus = @"eCallConfirmationStatus"; +SDLRPCParameterName const SDLRPCParameterNameECallEventActive = @"eCallEventActive"; +SDLRPCParameterName const SDLRPCParameterNameECallInfo = @"eCallInfo"; +SDLRPCParameterName const SDLRPCParameterNameECallNotificationStatus = @"eCallNotificationStatus"; +SDLRPCParameterName const SDLRPCParameterNameECUHeader = @"ecuHeader"; +SDLRPCParameterName const SDLRPCParameterNameECUName = @"ecuName"; +SDLRPCParameterName const SDLRPCParameterNameElectronicParkBrakeStatus = @"electronicParkBrakeStatus"; +SDLRPCParameterName const SDLRPCParameterNameEmergencyEvent = @"emergencyEvent"; +SDLRPCParameterName const SDLRPCParameterNameEmergencyEventType = @"emergencyEventType"; +SDLRPCParameterName const SDLRPCParameterNameEndTime = @"endTime"; +SDLRPCParameterName const SDLRPCParameterNameEngineOilLife = @"engineOilLife"; +SDLRPCParameterName const SDLRPCParameterNameEngineTorque = @"engineTorque"; +SDLRPCParameterName const SDLRPCParameterNameEqualizerAvailable = @"equalizerAvailable"; +SDLRPCParameterName const SDLRPCParameterNameEqualizerMaxChannelId = @"equalizerMaxChannelId"; +SDLRPCParameterName const SDLRPCParameterNameEqualizerSettings = @"equalizerSettings";; +SDLRPCParameterName const SDLRPCParameterNameETA = @"eta"; +SDLRPCParameterName const SDLRPCParameterNameEvent = @"event"; +SDLRPCParameterName const SDLRPCParameterNameExpires = @"expires"; +SDLRPCParameterName const SDLRPCParameterNameExternalTemperature = @"externalTemperature"; +SDLRPCParameterName const SDLRPCParameterNameFanSpeed = @"fanSpeed"; +SDLRPCParameterName const SDLRPCParameterNameFanSpeedAvailable = @"fanSpeedAvailable"; +SDLRPCParameterName const SDLRPCParameterNameFCCFacilityId = @"fccFacilityId"; +SDLRPCParameterName const SDLRPCParameterNameFilename = @"fileName"; +SDLRPCParameterName const SDLRPCParameterNameFilenames = @"filenames"; +SDLRPCParameterName const SDLRPCParameterNameFileType = @"fileType"; +SDLRPCParameterName const SDLRPCParameterNameFirmness = @"firmness"; +SDLRPCParameterName const SDLRPCParameterNameFirmwareRevision = @"firmwareRev"; +SDLRPCParameterName const SDLRPCParameterNameFreeModules = @"freeModules"; +SDLRPCParameterName const SDLRPCParameterNameFrequencyInteger = @"frequencyInteger"; +SDLRPCParameterName const SDLRPCParameterNameFrequencyFraction = @"frequencyFraction"; +SDLRPCParameterName const SDLRPCParameterNameFrontVerticalPosition = @"frontVerticalPosition"; +SDLRPCParameterName const SDLRPCParameterNameFrontVerticalPositionAvailable = @"frontVerticalPositionAvailable"; +SDLRPCParameterName const SDLRPCParameterNameFuelCutoffStatus = @"fuelCutoffStatus"; +SDLRPCParameterName const SDLRPCParameterNameFuelLevel = @"fuelLevel"; +SDLRPCParameterName const SDLRPCParameterNameFuelLevelState = @"fuelLevel_State"; +SDLRPCParameterName const SDLRPCParameterNameFuelMaintenanceMode = @"fuelMaintenanceMode"; +SDLRPCParameterName const SDLRPCParameterNameFuelRange = @"fuelRange"; +SDLRPCParameterName const SDLRPCParameterNameFullAppID = @"fullAppID"; +SDLRPCParameterName const SDLRPCParameterNameGetWayPointsEnabled = @"getWayPointsEnabled"; +SDLRPCParameterName const SDLRPCParameterNameGPS = @"gps"; +SDLRPCParameterName const SDLRPCParameterNameGraphic = @"graphic"; +SDLRPCParameterName const SDLRPCParameterNameGraphicSupported = @"graphicSupported"; +SDLRPCParameterName const SDLRPCParameterNameGreen = @"green"; +SDLRPCParameterName const SDLRPCParameterNameHandledRPCs = @"handledRPCs"; +SDLRPCParameterName const SDLRPCParameterNameHapticRectData = @"hapticRectData"; +SDLRPCParameterName const SDLRPCParameterNameHapticSpatialDataSupported = @"hapticSpatialDataSupported"; +SDLRPCParameterName const SDLRPCParameterNameHardware = @"hardware"; +SDLRPCParameterName const SDLRPCParameterNameHashId = @"hashID"; +SDLRPCParameterName const SDLRPCParameterNameHDChannel = @"hdChannel"; +SDLRPCParameterName const SDLRPCParameterNameHDChannelAvailable = @"hdChannelAvailable"; +SDLRPCParameterName const SDLRPCParameterNameHDOP = @"hdop"; +SDLRPCParameterName const SDLRPCParameterNameHDRadioEnable = @"hdRadioEnable"; +SDLRPCParameterName const SDLRPCParameterNameHDRadioEnableAvailable = @"hdRadioEnableAvailable"; +SDLRPCParameterName const SDLRPCParameterNameHeading = @"heading"; +SDLRPCParameterName const SDLRPCParameterNameHeadLampStatus = @"headLampStatus"; +SDLRPCParameterName const SDLRPCParameterNameHeadSupportHorizontalPosition = @"headSupportHorizontalPosition"; +SDLRPCParameterName const SDLRPCParameterNameHeadSupportHorizontalPositionAvailable = @"headSupportHorizontalPositionAvailable"; +SDLRPCParameterName const SDLRPCParameterNameHeadSupportVerticalPosition = @"headSupportVerticalPosition"; +SDLRPCParameterName const SDLRPCParameterNameHeadSupportVerticalPositionAvailable = @"headSupportVerticalPositionAvailable"; +SDLRPCParameterName const SDLRPCParameterNameHeatingLevel = @"heatingLevel"; +SDLRPCParameterName const SDLRPCParameterNameHeatingLevelAvailable = @"heatingLevelAvailable"; +SDLRPCParameterName const SDLRPCParameterNameHeatingEnabled = @"heatingEnabled"; +SDLRPCParameterName const SDLRPCParameterNameHeatingEnabledAvailable = @"heatingEnabledAvailable"; +SDLRPCParameterName const SDLRPCParameterNameHeatedSteeringWheelAvailable = @"heatedSteeringWheelAvailable"; +SDLRPCParameterName const SDLRPCParameterNameHeatedWindshieldAvailable = @"heatedWindshieldAvailable"; +SDLRPCParameterName const SDLRPCParameterNameHeatedRearWindowAvailable = @"heatedRearWindowAvailable"; +SDLRPCParameterName const SDLRPCParameterNameHeatedMirrorsAvailable = @"heatedMirrorsAvailable"; +SDLRPCParameterName const SDLRPCParameterNameHeatedSteeringWheelEnable = @"heatedSteeringWheelEnable"; +SDLRPCParameterName const SDLRPCParameterNameHeatedWindshieldEnable = @"heatedWindshieldEnable"; +SDLRPCParameterName const SDLRPCParameterNameHeatedRearWindowEnable = @"heatedRearWindowEnable"; +SDLRPCParameterName const SDLRPCParameterNameHeatedMirrorsEnable = @"heatedMirrorsEnable"; +SDLRPCParameterName const SDLRPCParameterNameHeight = @"height"; +SDLRPCParameterName const SDLRPCParameterNameHelpPrompt = @"helpPrompt"; +SDLRPCParameterName const SDLRPCParameterNameHighBeamsOn = @"highBeamsOn"; +SDLRPCParameterName const SDLRPCParameterNameHMICapabilities = @"hmiCapabilities"; +SDLRPCParameterName const SDLRPCParameterNameHmiSettingsControlData = @"hmiSettingsControlData"; +SDLRPCParameterName const SDLRPCParameterNameHMIDisplayLanguage = @"hmiDisplayLanguage"; +SDLRPCParameterName const SDLRPCParameterNameHMIDisplayLanguageDesired = @"hmiDisplayLanguageDesired"; +SDLRPCParameterName const SDLRPCParameterNameHMILevel = @"hmiLevel"; +SDLRPCParameterName const SDLRPCParameterNameHMILevelLowercase = @"hmilevel"; +SDLRPCParameterName const SDLRPCParameterNameHMIPermissions = @"hmiPermissions"; +SDLRPCParameterName const SDLRPCParameterNameHmiSettingsControlCapabilities = @"hmiSettingsControlCapabilities"; +SDLRPCParameterName const SDLRPCParameterNameHMIZoneCapabilities = @"hmiZoneCapabilities"; +SDLRPCParameterName const SDLRPCParameterNameHorizontalPosition = @"horizontalPosition"; +SDLRPCParameterName const SDLRPCParameterNameHorizontalPositionAvailable = @"horizontalPositionAvailable"; +SDLRPCParameterName const SDLRPCParameterNameHour = @"hour"; +SDLRPCParameterName const SDLRPCParameterNameHourlyForecast = @"hourlyForecast"; +SDLRPCParameterName const SDLRPCParameterNameHours = @"hours"; +SDLRPCParameterName const SDLRPCParameterNameHumidity = @"humidity"; +SDLRPCParameterName const SDLRPCParameterNameIconResumed = @"iconResumed"; +SDLRPCParameterName const SDLRPCParameterNameId = @"id"; +SDLRPCParameterName const SDLRPCParameterNameIgnitionStableStatus = @"ignitionStableStatus"; +SDLRPCParameterName const SDLRPCParameterNameIgnitionStatus = @"ignitionStatus"; +SDLRPCParameterName const SDLRPCParameterNameImage = @"image"; +SDLRPCParameterName const SDLRPCParameterNameImageFields = @"imageFields"; +SDLRPCParameterName const SDLRPCParameterNameImageResolution = @"imageResolution"; +SDLRPCParameterName const SDLRPCParameterNameImageSupported = @"imageSupported"; +SDLRPCParameterName const SDLRPCParameterNameImageTemplate = @"isTemplate"; +SDLRPCParameterName const SDLRPCParameterNameImageType = @"imageType"; +SDLRPCParameterName const SDLRPCParameterNameImageTypeSupported = @"imageTypeSupported"; +SDLRPCParameterName const SDLRPCParameterNameInfo = @"info"; +SDLRPCParameterName const SDLRPCParameterNameInitialPrompt = @"initialPrompt"; +SDLRPCParameterName const SDLRPCParameterNameInitialText = @"initialText"; +SDLRPCParameterName const SDLRPCParameterNameInnerLeftRear = @"innerLeftRear"; +SDLRPCParameterName const SDLRPCParameterNameInnerRightRear = @"innerRightRear"; +SDLRPCParameterName const SDLRPCParameterNameInstantFuelConsumption = @"instantFuelConsumption"; +SDLRPCParameterName const SDLRPCParameterNameInstructions = @"instructions"; +SDLRPCParameterName const SDLRPCParameterNameInteractionChoiceSetId = @"interactionChoiceSetID"; +SDLRPCParameterName const SDLRPCParameterNameInteractionChoiceSetIdList = @"interactionChoiceSetIDList"; +SDLRPCParameterName const SDLRPCParameterNameInteractionLayout = @"interactionLayout"; +SDLRPCParameterName const SDLRPCParameterNameInteractionMode = @"interactionMode"; +SDLRPCParameterName const SDLRPCParameterNameIsExplicit = @"isExplicit"; +SDLRPCParameterName const SDLRPCParameterNameIsHighlighted = @"isHighlighted"; +SDLRPCParameterName const SDLRPCParameterNameIsMediaApplication = @"isMediaApplication"; +SDLRPCParameterName const SDLRPCParameterNameIsSubscribed = @"isSubscribed"; +SDLRPCParameterName const SDLRPCParameterNameJunctionType = @"junctionType"; +SDLRPCParameterName const SDLRPCParameterNameKeepContext = @"keepContext"; +SDLRPCParameterName const SDLRPCParameterNameKeepContextAvailable = @"keepContextAvailable"; +SDLRPCParameterName const SDLRPCParameterNameKeyboardLayout = @"keyboardLayout"; +SDLRPCParameterName const SDLRPCParameterNameKeyboardProperties = @"keyboardProperties"; +SDLRPCParameterName const SDLRPCParameterNameKeypressMode = @"keypressMode"; +SDLRPCParameterName const SDLRPCParameterNameLabel = @"label"; +SDLRPCParameterName const SDLRPCParameterNameLanguage = @"language"; +SDLRPCParameterName const SDLRPCParameterNameLanguageDesired = @"languageDesired"; +SDLRPCParameterName const SDLRPCParameterNameLatitudeDegrees = @"latitudeDegrees"; +SDLRPCParameterName const SDLRPCParameterNameLeftFront = @"leftFront"; +SDLRPCParameterName const SDLRPCParameterNameLeftRear = @"leftRear"; +SDLRPCParameterName const SDLRPCParameterNameLeftRearInflatableBelted = @"leftRearInflatableBelted"; +SDLRPCParameterName const SDLRPCParameterNameLeftRow2BuckleBelted = @"leftRow2BuckleBelted"; +SDLRPCParameterName const SDLRPCParameterNameLeftRow3BuckleBelted = @"leftRow3BuckleBelted"; +SDLRPCParameterName const SDLRPCParameterNameLength = @"length"; +SDLRPCParameterName const SDLRPCParameterNameLightControlCapabilities = @"lightControlCapabilities"; +SDLRPCParameterName const SDLRPCParameterNameLightControlData = @"lightControlData"; +SDLRPCParameterName const SDLRPCParameterNameLightState = @"lightState"; +SDLRPCParameterName const SDLRPCParameterNameLimitedCharacterList = @"limitedCharacterList"; +SDLRPCParameterName const SDLRPCParameterNameLocality = @"locality"; +SDLRPCParameterName const SDLRPCParameterNameLocation = @"location"; +SDLRPCParameterName const SDLRPCParameterNameLocationCoordinate = @"coordinate"; +SDLRPCParameterName const SDLRPCParameterNameLocationDescription = @"locationDescription"; +SDLRPCParameterName const SDLRPCParameterNameLocationDetails = @"locationDetails"; +SDLRPCParameterName const SDLRPCParameterNameLocationImage = @"locationImage"; +SDLRPCParameterName const SDLRPCParameterNameLocationName = @"locationName"; +SDLRPCParameterName const SDLRPCParameterNameLongitudeDegrees = @"longitudeDegrees"; +SDLRPCParameterName const SDLRPCParameterNameLongPress = @"longPress"; +SDLRPCParameterName const SDLRPCParameterNameLongPressAvailable = @"longPressAvailable"; +SDLRPCParameterName const SDLRPCParameterNameLowBeamsOn = @"lowBeamsOn"; +SDLRPCParameterName const SDLRPCParameterNameMainField1 = @"mainField1"; +SDLRPCParameterName const SDLRPCParameterNameMainField2 = @"mainField2"; +SDLRPCParameterName const SDLRPCParameterNameMainField3 = @"mainField3"; +SDLRPCParameterName const SDLRPCParameterNameMainField4 = @"mainField4"; +SDLRPCParameterName const SDLRPCParameterNameMajorVersion = @"majorVersion"; +SDLRPCParameterName const SDLRPCParameterNameMake = @"make"; +SDLRPCParameterName const SDLRPCParameterNameManeuverComplete = @"maneuverComplete"; +SDLRPCParameterName const SDLRPCParameterNameManualTextEntry = @"manualTextEntry"; +SDLRPCParameterName const SDLRPCParameterNameMassageCushionFirmness = @"massageCushionFirmness"; +SDLRPCParameterName const SDLRPCParameterNameMassageCushionFirmnessAvailable = @"massageCushionFirmnessAvailable"; +SDLRPCParameterName const SDLRPCParameterNameMassageEnabled = @"massageEnabled"; +SDLRPCParameterName const SDLRPCParameterNameMassageEnabledAvailable = @"massageEnabledAvailable"; +SDLRPCParameterName const SDLRPCParameterNameMassageMode = @"massageMode"; +SDLRPCParameterName const SDLRPCParameterNameMassageModeAvailable = @"massageModeAvailable"; +SDLRPCParameterName const SDLRPCParameterNameMassageZone = @"massageZone"; +SDLRPCParameterName const SDLRPCParameterNameMaxBitrate = @"maxBitrate"; +SDLRPCParameterName const SDLRPCParameterNameMaxDuration = @"maxDuration"; +SDLRPCParameterName const SDLRPCParameterNameMaxHourlyForecastAmount = @"maxHourlyForecastAmount"; +SDLRPCParameterName const SDLRPCParameterNameMaximumChangeVelocity = @"maximumChangeVelocity"; +SDLRPCParameterName const SDLRPCParameterNameMaxMinutelyForecastAmount = @"maxMinutelyForecastAmount"; +SDLRPCParameterName const SDLRPCParameterNameMaxMultidayForecastAmount = @"maxMultidayForecastAmount"; +SDLRPCParameterName const SDLRPCParameterNameMaxNumberRFCOMMPorts = @"maxNumberRFCOMMPorts"; +SDLRPCParameterName const SDLRPCParameterNameMediaAlbum = @"mediaAlbum"; +SDLRPCParameterName const SDLRPCParameterNameMediaArtist = @"mediaArtist"; +SDLRPCParameterName const SDLRPCParameterNameMediaClock = @"mediaClock"; +SDLRPCParameterName const SDLRPCParameterNameMediaClockFormats = @"mediaClockFormats"; +SDLRPCParameterName const SDLRPCParameterNameMediaServiceData = @"mediaServiceData"; +SDLRPCParameterName const SDLRPCParameterNameMediaServiceManifest = @"mediaServiceManifest"; +SDLRPCParameterName const SDLRPCParameterNameMediaTitle = @"mediaTitle"; +SDLRPCParameterName const SDLRPCParameterNameMediaTrack = @"mediaTrack"; +SDLRPCParameterName const SDLRPCParameterNameMediaType = @"mediaType"; +SDLRPCParameterName const SDLRPCParameterNameMemory = @"memory"; +SDLRPCParameterName const SDLRPCParameterNameMemoryAvailable = @"memoryAvailable"; +SDLRPCParameterName const SDLRPCParameterNameMenuIcon = @"menuIcon"; +SDLRPCParameterName const SDLRPCParameterNameMenuId = @"menuID"; +SDLRPCParameterName const SDLRPCParameterNameMenuName = @"menuName"; +SDLRPCParameterName const SDLRPCParameterNameMenuParams = @"menuParams"; +SDLRPCParameterName const SDLRPCParameterNameMenuTitle = @"menuTitle"; +SDLRPCParameterName const SDLRPCParameterNameMessageData = @"messageData"; +SDLRPCParameterName const SDLRPCParameterNameMessageDataResult = @"messageDataResult"; +SDLRPCParameterName const SDLRPCParameterNameMessageLength = @"messageLength"; +SDLRPCParameterName const SDLRPCParameterNameMetadataTags = @"metadataTags"; +SDLRPCParameterName const SDLRPCParameterNameMiddleRow1BeltDeployed = @"middleRow1BeltDeployed"; +SDLRPCParameterName const SDLRPCParameterNameMiddleRow1BuckleBelted = @"middleRow1BuckleBelted"; +SDLRPCParameterName const SDLRPCParameterNameMiddleRow2BuckleBelted = @"middleRow2BuckleBelted"; +SDLRPCParameterName const SDLRPCParameterNameMiddleRow3BuckleBelted = @"middleRow3BuckleBelted"; +SDLRPCParameterName const SDLRPCParameterNameMillisecond = @"millisecond"; +SDLRPCParameterName const SDLRPCParameterNameMinorVersion = @"minorVersion"; +SDLRPCParameterName const SDLRPCParameterNameMinute = @"minute"; +SDLRPCParameterName const SDLRPCParameterNameMinuteForecast = @"minuteForecast"; +SDLRPCParameterName const SDLRPCParameterNameMinutes = @"minutes"; +SDLRPCParameterName const SDLRPCParameterNameModel = @"model"; +SDLRPCParameterName const SDLRPCParameterNameModuleData = @"moduleData"; +SDLRPCParameterName const SDLRPCParameterNameModuleName = @"moduleName"; +SDLRPCParameterName const SDLRPCParameterNameModuleType = @"moduleType"; +SDLRPCParameterName const SDLRPCParameterNameModelYear = @"modelYear"; +SDLRPCParameterName const SDLRPCParameterNameMonoAudioOutputMuted = @"monoAudioOutputMuted"; +SDLRPCParameterName const SDLRPCParameterNameMonth = @"month"; +SDLRPCParameterName const SDLRPCParameterNameMoonPhase = @"moonPhase"; +SDLRPCParameterName const SDLRPCParameterNameMultidayForecast = @"multidayForecast"; +SDLRPCParameterName const SDLRPCParameterNameMultipleEvents = @"multipleEvents"; +SDLRPCParameterName const SDLRPCParameterNameMultiTouchAvailable = @"multiTouchAvailable"; +SDLRPCParameterName const SDLRPCParameterNameMuteAudio = @"muteAudio"; +SDLRPCParameterName const SDLRPCParameterNameMyKey = @"myKey"; +SDLRPCParameterName const SDLRPCParameterNameName = @"name"; +SDLRPCParameterName const SDLRPCParameterNameNavigation = @"navigation"; +SDLRPCParameterName const SDLRPCParameterNameNavigationCapability = @"navigationCapability"; +SDLRPCParameterName const SDLRPCParameterNameNavigationServiceData = @"navigationServiceData"; +SDLRPCParameterName const SDLRPCParameterNameNavigationServiceManifest = @"navigationServiceManifest"; +SDLRPCParameterName const SDLRPCParameterNameNavigationText = @"navigationText"; +SDLRPCParameterName const SDLRPCParameterNameNavigationText1 = @"navigationText1"; +SDLRPCParameterName const SDLRPCParameterNameNavigationText2 = @"navigationText2"; +SDLRPCParameterName const SDLRPCParameterNameNearestStormBearing = @"nearestStormBearing"; +SDLRPCParameterName const SDLRPCParameterNameNearestStormDistance = @"nearestStormDistance"; +SDLRPCParameterName const SDLRPCParameterNameNextInstructionDistance = @"nextInstructionDistance"; +SDLRPCParameterName const SDLRPCParameterNameNextInstructionDistanceScale = @"nextInstructionDistanceScale"; +SDLRPCParameterName const SDLRPCParameterNameNextInstructionETA = @"nextInstructionETA"; +SDLRPCParameterName const SDLRPCParameterNameNextTurnIcon = @"nextTurnIcon"; +SDLRPCParameterName const SDLRPCParameterNameNGNMediaScreenAppName = @"ngnMediaScreenAppName"; +SDLRPCParameterName const SDLRPCParameterNameNightColorScheme = @"nightColorScheme"; +SDLRPCParameterName const SDLRPCParameterNameNotification = @"notification"; +SDLRPCParameterName const SDLRPCParameterNameNumber = @"number"; +SDLRPCParameterName const SDLRPCParameterNameNumberCustomPresetsAvailable = @"numCustomPresetsAvailable"; +SDLRPCParameterName const SDLRPCParameterNameNumberTicks = @"numTicks"; +SDLRPCParameterName const SDLRPCParameterNameOdometer = @"odometer"; +SDLRPCParameterName const SDLRPCParameterNameOffset = @"offset"; +SDLRPCParameterName const SDLRPCParameterNameOnLockScreenStatus = @"OnLockScreenStatus"; +SDLRPCParameterName const SDLRPCParameterNameOnScreenPresetsAvailable = @"onScreenPresetsAvailable"; +SDLRPCParameterName const SDLRPCParameterNameOperationName = @"name"; +SDLRPCParameterName const SDLRPCParameterNameOrigin = @"origin"; +SDLRPCParameterName const SDLRPCParameterNameOriginApp = @"originApp"; +SDLRPCParameterName const SDLRPCParameterNameOS = @"os"; +SDLRPCParameterName const SDLRPCParameterNameOSVersion = @"osVersion"; +SDLRPCParameterName const SDLRPCParameterNameParameterPermissions = @"parameterPermissions"; +SDLRPCParameterName const SDLRPCParameterNameParameters = @"parameters"; +SDLRPCParameterName const SDLRPCParameterNameParentId = @"parentID"; +SDLRPCParameterName const SDLRPCParameterNameParkBrakeActive = @"parkBrakeActive"; +SDLRPCParameterName const SDLRPCParameterNamePassengerAirbagDeployed = @"passengerAirbagDeployed"; +SDLRPCParameterName const SDLRPCParameterNamePassengerBeltDeployed = @"passengerBeltDeployed"; +SDLRPCParameterName const SDLRPCParameterNamePassengerBuckleBelted = @"passengerBuckleBelted"; +SDLRPCParameterName const SDLRPCParameterNamePassengerChildDetected = @"passengerChildDetected"; +SDLRPCParameterName const SDLRPCParameterNamePassengerCurtainAirbagDeployed = @"passengerCurtainAirbagDeployed"; +SDLRPCParameterName const SDLRPCParameterNamePassengerDoorAjar = @"passengerDoorAjar"; +SDLRPCParameterName const SDLRPCParameterNamePassengerKneeAirbagDeployed = @"passengerKneeAirbagDeployed"; +SDLRPCParameterName const SDLRPCParameterNamePassengerSideAirbagDeployed = @"passengerSideAirbagDeployed"; +SDLRPCParameterName const SDLRPCParameterNamePatchVersion = @"patchVersion"; +SDLRPCParameterName const SDLRPCParameterNamePCMStreamCapabilities = @"pcmStreamCapabilities"; +SDLRPCParameterName const SDLRPCParameterNamePDOP = @"pdop"; +SDLRPCParameterName const SDLRPCParameterNamePermissionItem = @"permissionItem"; +SDLRPCParameterName const SDLRPCParameterNamePersistentFile = @"persistentFile"; +SDLRPCParameterName const SDLRPCParameterNamePhoneCall = @"phoneCall"; +SDLRPCParameterName const SDLRPCParameterNamePhoneCapability = @"phoneCapability"; +SDLRPCParameterName const SDLRPCParameterNamePhoneNumber = @"phoneNumber"; +SDLRPCParameterName const SDLRPCParameterNamePhoneRoaming = @"phoneRoaming"; +SDLRPCParameterName const SDLRPCParameterNamePrimaryColor = @"primaryColor"; +SDLRPCParameterName const SDLRPCParameterNamePlaylistName = @"playlistName"; +SDLRPCParameterName const SDLRPCParameterNamePlayTone = @"playTone"; +SDLRPCParameterName const SDLRPCParameterNamePosition = @"position"; +SDLRPCParameterName const SDLRPCParameterNamePostalCode = @"postalCode"; +SDLRPCParameterName const SDLRPCParameterNamePrecipAccumulation = @"precipAccumulation"; +SDLRPCParameterName const SDLRPCParameterNamePrecipIntensity = @"precipIntensity"; +SDLRPCParameterName const SDLRPCParameterNamePrecipProbability = @"precipProbability"; +SDLRPCParameterName const SDLRPCParameterNamePrecipType = @"precipType"; +SDLRPCParameterName const SDLRPCParameterNamePowerModeActive = @"powerModeActive"; +SDLRPCParameterName const SDLRPCParameterNamePowerModeQualificationStatus = @"powerModeQualificationStatus"; +SDLRPCParameterName const SDLRPCParameterNamePowerModeStatus = @"powerModeStatus"; +SDLRPCParameterName const SDLRPCParameterNamePreferredResolution = @"preferredResolution"; +SDLRPCParameterName const SDLRPCParameterNamePrerecordedSpeech = @"prerecordedSpeech"; +SDLRPCParameterName const SDLRPCParameterNamePresetBankCapabilities = @"presetBankCapabilities"; +SDLRPCParameterName const SDLRPCParameterNamePressAvailable = @"pressAvailable"; +SDLRPCParameterName const SDLRPCParameterNamePressure = @"pressure"; +SDLRPCParameterName const SDLRPCParameterNamePressureTelltale = @"pressureTelltale"; +SDLRPCParameterName const SDLRPCParameterNamePrimaryAudioSource = @"primaryAudioSource"; +SDLRPCParameterName const SDLRPCParameterNamePRNDL = @"prndl"; +SDLRPCParameterName const SDLRPCParameterNameProgramIdentification = @"PI"; +SDLRPCParameterName const SDLRPCParameterNameProgressIndicator = @"progressIndicator"; +SDLRPCParameterName const SDLRPCParameterNameProperties = @"properties"; +SDLRPCParameterName const SDLRPCParameterNameProgramService = @"PS"; +SDLRPCParameterName const SDLRPCParameterNameProgramType = @"PTY"; +SDLRPCParameterName const SDLRPCParameterNamePrompt = @"prompt"; +SDLRPCParameterName const SDLRPCParameterNameQueueCurrentTrackNumber = @"queueCurrentTrackNumber"; +SDLRPCParameterName const SDLRPCParameterNameQueuePlaybackDuration = @"queuePlaybackDuration"; +SDLRPCParameterName const SDLRPCParameterNameQueuePlaybackProgress = @"queuePlaybackProgress"; +SDLRPCParameterName const SDLRPCParameterNameQueueTotalTrackCount = @"queueTotalTrackCount"; +SDLRPCParameterName const SDLRPCParameterNameRadioBandAvailable = @"radioBandAvailable"; +SDLRPCParameterName const SDLRPCParameterNameRadioControlCapabilities = @"radioControlCapabilities"; +SDLRPCParameterName const SDLRPCParameterNameRadioFrequencyAvailable = @"radioFrequencyAvailable"; +SDLRPCParameterName const SDLRPCParameterNameRadioControlData = @"radioControlData"; +SDLRPCParameterName const SDLRPCParameterNameRadioEnable = @"radioEnable"; +SDLRPCParameterName const SDLRPCParameterNameRadioEnableAvailable = @"radioEnableAvailable"; +SDLRPCParameterName const SDLRPCParameterNameRange = @"range"; +SDLRPCParameterName const SDLRPCParameterNameRDSData = @"rdsData"; +SDLRPCParameterName const SDLRPCParameterNameRDSDataAvailable = @"rdsDataAvailable"; +SDLRPCParameterName const SDLRPCParameterNameRearLeftDoorAjar = @"rearLeftDoorAjar"; +SDLRPCParameterName const SDLRPCParameterNameRearRightDoorAjar = @"rearRightDoorAjar"; +SDLRPCParameterName const SDLRPCParameterNameReason = @"reason"; +SDLRPCParameterName const SDLRPCParameterNameRed = @"red"; +SDLRPCParameterName const SDLRPCParameterNameRect = @"rect"; +SDLRPCParameterName const SDLRPCParameterNameRegion = @"REG"; +SDLRPCParameterName const SDLRPCParameterNameRegions = @"regions"; +SDLRPCParameterName const SDLRPCParameterNameRemoteControlCapability = @"remoteControlCapability"; +SDLRPCParameterName const SDLRPCParameterNameRequest = @"request"; +SDLRPCParameterName const SDLRPCParameterNameRequestServiceActive = @"requestServiceActive"; +SDLRPCParameterName const SDLRPCParameterNameRequestSubType = @"requestSubType"; +SDLRPCParameterName const SDLRPCParameterNameRequestType = @"requestType"; +SDLRPCParameterName const SDLRPCParameterNameReserved = @"reserved"; +SDLRPCParameterName const SDLRPCParameterNameSecondaryColor = @"secondaryColor"; +SDLRPCParameterName const SDLRPCParameterNameResolution = @"resolution"; +SDLRPCParameterName const SDLRPCParameterNameResolutionHeight = @"resolutionHeight"; +SDLRPCParameterName const SDLRPCParameterNameResolutionWidth = @"resolutionWidth"; +SDLRPCParameterName const SDLRPCParameterNameResponse = @"response"; +SDLRPCParameterName const SDLRPCParameterNameResult = @"result"; +SDLRPCParameterName const SDLRPCParameterNameResultCode = @"resultCode"; +SDLRPCParameterName const SDLRPCParameterNameRightFront = @"rightFront"; +SDLRPCParameterName const SDLRPCParameterNameRightRear = @"rightRear"; +SDLRPCParameterName const SDLRPCParameterNameRightRearInflatableBelted = @"rightRearInflatableBelted"; +SDLRPCParameterName const SDLRPCParameterNameRightRow2BuckleBelted = @"rightRow2BuckleBelted"; +SDLRPCParameterName const SDLRPCParameterNameRightRow3BuckleBelted = @"rightRow3BuckleBelted"; +SDLRPCParameterName const SDLRPCParameterNameRolloverEvent = @"rolloverEvent"; +SDLRPCParameterName const SDLRPCParameterNameRows = @"rows"; +SDLRPCParameterName const SDLRPCParameterNameRPCName = @"rpcName"; +SDLRPCParameterName const SDLRPCParameterNameRPCSpecVersion = @"rpcSpecVersion"; +SDLRPCParameterName const SDLRPCParameterNameRPM = @"rpm"; +SDLRPCParameterName const SDLRPCParameterNameRadioText = @"RT"; +SDLRPCParameterName const SDLRPCParameterNameSamplingRate = @"samplingRate"; +SDLRPCParameterName const SDLRPCParameterNameSatellites = @"satellites"; +SDLRPCParameterName const SDLRPCParameterNameScreenParams = @"screenParams"; +SDLRPCParameterName const SDLRPCParameterNameScrollableMessageBody = @"scrollableMessageBody"; +SDLRPCParameterName const SDLRPCParameterNameSDLVersion = @"sdlVersion"; +SDLRPCParameterName const SDLRPCParameterNameSearchAddress = @"searchAddress"; +SDLRPCParameterName const SDLRPCParameterNameSeatControlData = @"seatControlData"; +SDLRPCParameterName const SDLRPCParameterNameSeatControlCapabilities = @"seatControlCapabilities"; +SDLRPCParameterName const SDLRPCParameterNameSecondaryGraphic = @"secondaryGraphic"; +SDLRPCParameterName const SDLRPCParameterNameSecondaryImage = @"secondaryImage"; +SDLRPCParameterName const SDLRPCParameterNameSecondaryText = @"secondaryText"; +SDLRPCParameterName const SDLRPCParameterNameSecond = @"second"; +SDLRPCParameterName const SDLRPCParameterNameSeconds = @"seconds"; +SDLRPCParameterName const SDLRPCParameterNameSendLocationEnabled = @"sendLocationEnabled"; +SDLRPCParameterName const SDLRPCParameterNameServiceActive = @"serviceActive"; +SDLRPCParameterName const SDLRPCParameterNameServiceData = @"serviceData"; +SDLRPCParameterName const SDLRPCParameterNameServiceIcon = @"serviceIcon"; +SDLRPCParameterName const SDLRPCParameterNameServiceID = @"serviceID"; +SDLRPCParameterName const SDLRPCParameterNameServiceManifest = @"serviceManifest"; +SDLRPCParameterName const SDLRPCParameterNameServiceName = @"serviceName"; +SDLRPCParameterName const SDLRPCParameterNameServicePublished = @"servicePublished"; +SDLRPCParameterName const SDLRPCParameterNameServiceSpecificResult = @"serviceSpecificResult"; +SDLRPCParameterName const SDLRPCParameterNameServiceType = @"serviceType"; +SDLRPCParameterName const SDLRPCParameterNameServiceUri = @"serviceUri"; +SDLRPCParameterName const SDLRPCParameterNameDisplayName = @"displayName"; +SDLRPCParameterName const SDLRPCParameterNameSeverity = @"severity"; +SDLRPCParameterName const SDLRPCParameterNameShortPress = @"shortPress"; +SDLRPCParameterName const SDLRPCParameterNameShortPressAvailable = @"shortPressAvailable"; +SDLRPCParameterName const SDLRPCParameterNameSignalLevelStatus = @"signalLevelStatus"; +SDLRPCParameterName const SDLRPCParameterNameSignalChangeThreshold = @"signalChangeThreshold"; +SDLRPCParameterName const SDLRPCParameterNameSignalChangeThresholdAvailable = @"signalChangeThresholdAvailable"; +SDLRPCParameterName const SDLRPCParameterNameSignalStrength = @"signalStrength"; +SDLRPCParameterName const SDLRPCParameterNameSignalStrengthAvailable = @"signalStrengthAvailable"; +SDLRPCParameterName const SDLRPCParameterNameSiriusXMRadioAvailable = @"siriusxmRadioAvailable"; +SDLRPCParameterName const SDLRPCParameterNameSISData = @"sisData"; +SDLRPCParameterName const SDLRPCParameterNameSISDataAvailable = @"sisDataAvailable"; +SDLRPCParameterName const SDLRPCParameterNameSliderFooter = @"sliderFooter"; +SDLRPCParameterName const SDLRPCParameterNameSliderHeader = @"sliderHeader"; +SDLRPCParameterName const SDLRPCParameterNameSliderPosition = @"sliderPosition"; +SDLRPCParameterName const SDLRPCParameterNameSoftButtonCapabilities = @"softButtonCapabilities"; +SDLRPCParameterName const SDLRPCParameterNameSoftButtonId = @"softButtonID"; +SDLRPCParameterName const SDLRPCParameterNameSoftButtons = @"softButtons"; +SDLRPCParameterName const SDLRPCParameterNameSource = @"source"; +SDLRPCParameterName const SDLRPCParameterNameSourceAvailable = @"sourceAvailable"; +SDLRPCParameterName const SDLRPCParameterNameSpaceAvailable = @"spaceAvailable"; +SDLRPCParameterName const SDLRPCParameterNameSpeechCapabilities = @"speechCapabilities"; +SDLRPCParameterName const SDLRPCParameterNameSpeed = @"speed"; +SDLRPCParameterName const SDLRPCParameterNameRGBColorSpaceAvailable = @"rgbColorSpaceAvailable"; +SDLRPCParameterName const SDLRPCParameterNameStartTime = @"startTime"; +SDLRPCParameterName const SDLRPCParameterNameState = @"state"; +SDLRPCParameterName const SDLRPCParameterNameStateAvailable = @"stateAvailable"; +SDLRPCParameterName const SDLRPCParameterNameStateOfCharge = @"stateOfCharge"; +SDLRPCParameterName const SDLRPCParameterNameStationIDNumber = @"stationIDNumber"; +SDLRPCParameterName const SDLRPCParameterNameStationLongName = @"stationLongName"; +SDLRPCParameterName const SDLRPCParameterNameStationLocation = @"stationLocation"; +SDLRPCParameterName const SDLRPCParameterNameStationMessage = @"stationMessage"; +SDLRPCParameterName const SDLRPCParameterNameStationShortName = @"stationShortName"; +SDLRPCParameterName const SDLRPCParameterNameStatus = @"status"; +SDLRPCParameterName const SDLRPCParameterNameStatusAvailable = @"statusAvailable"; +SDLRPCParameterName const SDLRPCParameterNameStatusBar = @"statusBar"; +SDLRPCParameterName const SDLRPCParameterNameSteeringWheelAngle = @"steeringWheelAngle"; +SDLRPCParameterName const SDLRPCParameterNameStereoAudioOutputMuted = @"stereoAudioOutputMuted"; +SDLRPCParameterName const SDLRPCParameterNameSubAdministrativeArea = @"subAdministrativeArea"; +SDLRPCParameterName const SDLRPCParameterNameSubLocality = @"subLocality"; +SDLRPCParameterName const SDLRPCParameterNameSubscribe = @"subscribe"; +SDLRPCParameterName const SDLRPCParameterNameSubThoroughfare = @"subThoroughfare"; +SDLRPCParameterName const SDLRPCParameterNameSuccess = @"success"; +SDLRPCParameterName const SDLRPCParameterNameSummary = @"summary"; +SDLRPCParameterName const SDLRPCParameterNameSupportedDiagnosticModes = @"supportedDiagModes"; +SDLRPCParameterName const SDLRPCParameterNameSupportedFormats = @"supportedFormats"; +SDLRPCParameterName const SDLRPCParameterNameSupportedLights = @"supportedLights"; +SDLRPCParameterName const SDLRPCParameterNameSyncFileName = @"syncFileName"; +SDLRPCParameterName const SDLRPCParameterNameSyncMessageVersion = @"syncMsgVersion"; +SDLRPCParameterName const SDLRPCParameterNameSystemAction = @"systemAction"; +SDLRPCParameterName const SDLRPCParameterNameSystemCapability = @"systemCapability"; +SDLRPCParameterName const SDLRPCParameterNameSystemCapabilityType = @"systemCapabilityType"; +SDLRPCParameterName const SDLRPCParameterNameSystemContext = @"systemContext"; +SDLRPCParameterName const SDLRPCParameterNameSystemFile = @"systemFile"; +SDLRPCParameterName const SDLRPCParameterNameSystemSoftwareVersion = @"systemSoftwareVersion"; +SDLRPCParameterName const SDLRPCParameterNameTrackPlaybackDuration = @"trackPlaybackDuration"; +SDLRPCParameterName const SDLRPCParameterNameTrackPlaybackProgress = @"trackPlaybackProgress"; +SDLRPCParameterName const SDLRPCParameterNameTrafficAnnouncementIdentification = @"TA"; +SDLRPCParameterName const SDLRPCParameterNameTargetId = @"targetID"; +SDLRPCParameterName const SDLRPCParameterNameTemperatureHigh = @"temperatureHigh"; +SDLRPCParameterName const SDLRPCParameterNameTemperatureLow = @"temperatureLow"; +SDLRPCParameterName const SDLRPCParameterNameTemperatureUnit = @"temperatureUnit"; +SDLRPCParameterName const SDLRPCParameterNameTemperatureUnitAvailable = @"temperatureUnitAvailable"; +SDLRPCParameterName const SDLRPCParameterNameTemplatesAvailable = @"templatesAvailable"; +SDLRPCParameterName const SDLRPCParameterNameTertiaryText = @"tertiaryText"; +SDLRPCParameterName const SDLRPCParameterNameText = @"text"; +SDLRPCParameterName const SDLRPCParameterNameTextFields = @"textFields"; +SDLRPCParameterName const SDLRPCParameterNameTextMessageAvailable = @"textMsgAvailable"; +SDLRPCParameterName const SDLRPCParameterNameThoroughfare = @"thoroughfare"; +SDLRPCParameterName const SDLRPCParameterNameTimeIssued = @"timeIssued"; +SDLRPCParameterName const SDLRPCParameterNameTime = @"time"; +SDLRPCParameterName const SDLRPCParameterNameTimeout = @"timeout"; +SDLRPCParameterName const SDLRPCParameterNameTimeoutCapitalized = @"Timeout"; +SDLRPCParameterName const SDLRPCParameterNameTimeoutPrompt = @"timeoutPrompt"; +SDLRPCParameterName const SDLRPCParameterNameTS = @"ts"; +SDLRPCParameterName const SDLRPCParameterNameTimeStamp = @"timeStamp"; +SDLRPCParameterName const SDLRPCParameterNameTimeToDestination = @"timeToDestination"; +SDLRPCParameterName const SDLRPCParameterNameTimezoneHourOffset = @"tz_hour"; +SDLRPCParameterName const SDLRPCParameterNameTimezoneMinuteOffset = @"tz_minute"; +SDLRPCParameterName const SDLRPCParameterNameTirePressure = @"tirePressure"; +SDLRPCParameterName const SDLRPCParameterNameTitle = @"title"; +SDLRPCParameterName const SDLRPCParameterNameTotalDistance = @"totalDistance"; +SDLRPCParameterName const SDLRPCParameterNameTouchEventAvailable = @"touchEventAvailable"; +SDLRPCParameterName const SDLRPCParameterNameTPMS = @"tpms"; +SDLRPCParameterName const SDLRPCParameterNameTrafficProgramIdentification = @"TP"; +SDLRPCParameterName const SDLRPCParameterNameTriggerSource = @"triggerSource"; +SDLRPCParameterName const SDLRPCParameterNameTrim = @"trim"; +SDLRPCParameterName const SDLRPCParameterNameTryAgainTime = @"tryAgainTime"; +SDLRPCParameterName const SDLRPCParameterNameTTSChunks = @"ttsChunks"; +SDLRPCParameterName const SDLRPCParameterNameTTSName = @"ttsName"; +SDLRPCParameterName const SDLRPCParameterNameTurnIcon = @"turnIcon"; +SDLRPCParameterName const SDLRPCParameterNameTurnList = @"turnList"; +SDLRPCParameterName const SDLRPCParameterNameTurnSignal = @"turnSignal"; +SDLRPCParameterName const SDLRPCParameterNameType = @"type"; +SDLRPCParameterName const SDLRPCParameterNameUnit = @"unit"; +SDLRPCParameterName const SDLRPCParameterNameUnsubscribe = @"Unsubscribe"; +SDLRPCParameterName const SDLRPCParameterNameUpdatedAppServiceRecord = @"updatedAppServiceRecord"; +SDLRPCParameterName const SDLRPCParameterNameUpdateMode = @"updateMode"; +SDLRPCParameterName const SDLRPCParameterNameUpdateReason= @"updateReason"; +SDLRPCParameterName const SDLRPCParameterNameUpDownAvailable = @"upDownAvailable"; +SDLRPCParameterName const SDLRPCParameterNameURL = @"url"; +SDLRPCParameterName const SDLRPCParameterNameURLUppercase = @"URL"; +SDLRPCParameterName const SDLRPCParameterNameUserDisallowed = @"userDisallowed"; +SDLRPCParameterName const SDLRPCParameterNameUserSelected = @"userSelected"; +SDLRPCParameterName const SDLRPCParameterNameUTCDay = @"utcDay"; +SDLRPCParameterName const SDLRPCParameterNameUTCHours = @"utcHours"; +SDLRPCParameterName const SDLRPCParameterNameUTCMinutes = @"utcMinutes"; +SDLRPCParameterName const SDLRPCParameterNameUTCMonth = @"utcMonth"; +SDLRPCParameterName const SDLRPCParameterNameUTCSeconds = @"utcSeconds"; +SDLRPCParameterName const SDLRPCParameterNameUTCYear = @"utcYear"; +SDLRPCParameterName const SDLRPCParameterNameValue = @"value"; +SDLRPCParameterName const SDLRPCParameterNameVDOP = @"vdop"; +SDLRPCParameterName const SDLRPCParameterNameVehicleType = @"vehicleType"; +SDLRPCParameterName const SDLRPCParameterNameVerticalPosition = @"verticalPosition"; +SDLRPCParameterName const SDLRPCParameterNameVerticalPositionAvailable = @"verticalPositionAvailable"; +SDLRPCParameterName const SDLRPCParameterNameVideoCodec = @"codec"; +SDLRPCParameterName const SDLRPCParameterNameVideoProtocol = @"protocol"; +SDLRPCParameterName const SDLRPCParameterNameVideoStreaming = @"videoStreaming"; +SDLRPCParameterName const SDLRPCParameterNameVideoStreamingCapability = @"videoStreamingCapability"; +SDLRPCParameterName const SDLRPCParameterNameVideoStreamingState = @"videoStreamingState"; +SDLRPCParameterName const SDLRPCParameterNameVisibility = @"visibility"; +SDLRPCParameterName const SDLRPCParameterNameVentilationMode = @"ventilationMode"; +SDLRPCParameterName const SDLRPCParameterNameVentilationModeAvailable = @"ventilationModeAvailable"; +SDLRPCParameterName const SDLRPCParameterNameVIN = @"vin"; +SDLRPCParameterName const SDLRPCParameterNameVoiceRecognitionOn = @"voiceRecOn"; +SDLRPCParameterName const SDLRPCParameterNameVolume = @"volume"; +SDLRPCParameterName const SDLRPCParameterNameVolumeAvailable = @"volumeAvailable"; +SDLRPCParameterName const SDLRPCParameterNameVRCapabilities = @"vrCapabilities"; +SDLRPCParameterName const SDLRPCParameterNameVRCommands = @"vrCommands"; +SDLRPCParameterName const SDLRPCParameterNameVRHelp = @"vrHelp"; +SDLRPCParameterName const SDLRPCParameterNameVRHelpTitle = @"vrHelpTitle"; +SDLRPCParameterName const SDLRPCParameterNameVRSynonyms = @"vrSynonyms"; +SDLRPCParameterName const SDLRPCParameterNameWayPoints = @"wayPoints"; +SDLRPCParameterName const SDLRPCParameterNameWayPointType = @"wayPointType"; +SDLRPCParameterName const SDLRPCParameterNameWeatherForLocationSupported = @"weatherForLocationSupported"; +SDLRPCParameterName const SDLRPCParameterNameWeatherIconImageName = @"weatherIconImageName"; +SDLRPCParameterName const SDLRPCParameterNameWeatherServiceData = @"weatherServiceData"; +SDLRPCParameterName const SDLRPCParameterNameWeatherServiceManifest = @"weatherServiceManifest"; +SDLRPCParameterName const SDLRPCParameterNameWeatherSummary = @"weatherSummary"; +SDLRPCParameterName const SDLRPCParameterNameWidth = @"width"; +SDLRPCParameterName const SDLRPCParameterNameWindBearing = @"windBearing"; +SDLRPCParameterName const SDLRPCParameterNameWindGust = @"windGust"; +SDLRPCParameterName const SDLRPCParameterNameWindSpeed = @"windSpeed"; +SDLRPCParameterName const SDLRPCParameterNameWiperStatus = @"wiperStatus"; +SDLRPCParameterName const SDLRPCParameterNameX = @"x"; +SDLRPCParameterName const SDLRPCParameterNameY = @"y"; +SDLRPCParameterName const SDLRPCParameterNameYear = @"year"; + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLRPCRequest.m b/SmartDeviceLink/SDLRPCRequest.m index 434c3e781..1b5829b69 100644 --- a/SmartDeviceLink/SDLRPCRequest.m +++ b/SmartDeviceLink/SDLRPCRequest.m @@ -5,18 +5,18 @@ #import "SDLRPCRequest.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLRPCRequest - (NSNumber<SDLInt> *)correlationID { - return [function sdl_objectForName:SDLNameCorrelationId]; + return [function sdl_objectForName:SDLRPCParameterNameCorrelationId]; } - (void)setCorrelationID:(NSNumber<SDLInt> *)corrID { - [function sdl_setObject:corrID forName:SDLNameCorrelationId]; + [function sdl_setObject:corrID forName:SDLRPCParameterNameCorrelationId]; } @end diff --git a/SmartDeviceLink/SDLRPCRequestNotification.h b/SmartDeviceLink/SDLRPCRequestNotification.h new file mode 100644 index 000000000..248358e0a --- /dev/null +++ b/SmartDeviceLink/SDLRPCRequestNotification.h @@ -0,0 +1,51 @@ +// +// SDLRPCRequestNotification.h +// SmartDeviceLink +// +// Created by Nicole on 2/14/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import <Foundation/Foundation.h> + +@class SDLRPCRequest; + +NS_ASSUME_NONNULL_BEGIN + +/** + * A NSNotification object that makes retrieving internal SDLRPCRequest data easier + */ +@interface SDLRPCRequestNotification : NSNotification + +/** + * The request to be included in the userinfo dictionary + */ +@property (copy, nonatomic, readonly) __kindof SDLRPCRequest *request; + +/** + * Create an NSNotification object containing an SDLRPCRequest + * + * @param name The NSNotification name + * @param object The NSNotification object + * @param request The SDLRPCRequest payload + * @return The NSNotification + */ +- (instancetype)initWithName:(NSString *)name object:(nullable id)object rpcRequest:(__kindof SDLRPCRequest *)request; + +/** + * Returns whether or not the containing request is equal to a class, not including subclasses. + * + * @param aClass the class you are questioning + */ +- (BOOL)isRequestMemberOfClass:(Class)aClass; + +/** + * Returns whether or not the containing request is a kind of class, including subclasses. + * + * @param aClass the class you are questioning + */ +- (BOOL)isRequestKindOfClass:(Class)aClass; + +@end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLRPCRequestNotification.m b/SmartDeviceLink/SDLRPCRequestNotification.m new file mode 100644 index 000000000..4ac6250c6 --- /dev/null +++ b/SmartDeviceLink/SDLRPCRequestNotification.m @@ -0,0 +1,49 @@ +// +// SDLRPCRequestNotification.m +// SmartDeviceLink +// +// Created by Nicole on 2/14/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import "SDLRPCRequestNotification.h" + +#import "SDLNotificationConstants.h" +#import "SDLRPCRequest.h" + +NS_ASSUME_NONNULL_BEGIN + +@implementation SDLRPCRequestNotification + +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wimplicit-atomic-properties" +@synthesize name = _name; +@synthesize object = _object; +@synthesize userInfo = _userInfo; +#pragma clang diagnostic pop + +- (instancetype)initWithName:(NSString *)name object:(nullable id)object rpcRequest:(__kindof SDLRPCRequest *)request { + _name = name; + _object = object; + _userInfo = @{SDLNotificationUserInfoObject: request}; + + return self; +} + +- (__kindof SDLRPCRequest *)request { + return _userInfo[SDLNotificationUserInfoObject]; +} + +- (BOOL)isRequestMemberOfClass:(Class)aClass { + NSAssert([self.request isMemberOfClass:aClass], @"A notification was sent with an unanticipated object"); + return [self.request isMemberOfClass:aClass]; +} + +- (BOOL)isRequestKindOfClass:(Class)aClass { + NSAssert([self.request isKindOfClass:aClass], @"A notification was sent with an unanticipated object"); + return [self.request isKindOfClass:aClass]; +} + +@end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLRPCResponse.m b/SmartDeviceLink/SDLRPCResponse.m index a7a839f54..6df0315d7 100644 --- a/SmartDeviceLink/SDLRPCResponse.m +++ b/SmartDeviceLink/SDLRPCResponse.m @@ -5,7 +5,7 @@ #import "SDLRPCResponse.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" #import "SDLResult.h" NS_ASSUME_NONNULL_BEGIN @@ -18,7 +18,7 @@ NS_ASSUME_NONNULL_BEGIN return nil; } - messageType = SDLNameResponse; + messageType = SDLRPCParameterNameResponse; [store sdl_setObject:function forName:messageType]; return self; @@ -30,42 +30,42 @@ NS_ASSUME_NONNULL_BEGIN return nil; } - messageType = SDLNameResponse; + messageType = SDLRPCParameterNameResponse; [store sdl_setObject:function forName:messageType]; return self; } - (NSNumber<SDLInt> *)correlationID { - return [function sdl_objectForName:SDLNameCorrelationId]; + return [function sdl_objectForName:SDLRPCParameterNameCorrelationId]; } - (void)setCorrelationID:(NSNumber<SDLInt> *)corrID { - [function sdl_setObject:corrID forName:SDLNameCorrelationId]; + [function sdl_setObject:corrID forName:SDLRPCParameterNameCorrelationId]; } - (void)setSuccess:(NSNumber<SDLBool> *)success { - [parameters sdl_setObject:success forName:SDLNameSuccess]; + [parameters sdl_setObject:success forName:SDLRPCParameterNameSuccess]; } - (NSNumber<SDLBool> *)success { - return [parameters sdl_objectForName:SDLNameSuccess]; + return [parameters sdl_objectForName:SDLRPCParameterNameSuccess]; } - (void)setResultCode:(SDLResult)resultCode { - [parameters sdl_setObject:resultCode forName:SDLNameResultCode]; + [parameters sdl_setObject:resultCode forName:SDLRPCParameterNameResultCode]; } - (SDLResult)resultCode { - return [parameters sdl_objectForName:SDLNameResultCode]; + return [parameters sdl_objectForName:SDLRPCParameterNameResultCode]; } - (void)setInfo:(nullable NSString *)info { - [parameters sdl_setObject:info forName:SDLNameInfo]; + [parameters sdl_setObject:info forName:SDLRPCParameterNameInfo]; } - (nullable NSString *)info { - return [parameters sdl_objectForName:SDLNameInfo]; + return [parameters sdl_objectForName:SDLRPCParameterNameInfo]; } @end diff --git a/SmartDeviceLink/SDLRPCResponseNotification.h b/SmartDeviceLink/SDLRPCResponseNotification.h index c6c7cdf3a..4434f2a04 100644 --- a/SmartDeviceLink/SDLRPCResponseNotification.h +++ b/SmartDeviceLink/SDLRPCResponseNotification.h @@ -14,22 +14,22 @@ NS_ASSUME_NONNULL_BEGIN /** - An NSNotification object that makes retrieving internal SDLRPCResponse data easier + * A NSNotification object that makes retrieving internal SDLRPCResponse data easier */ @interface SDLRPCResponseNotification : NSNotification /** - The response within the userinfo dictionary + * The response to be included within the userinfo dictionary */ @property (copy, nonatomic, readonly) __kindof SDLRPCResponse *response; /** - Create an NSNotification object caontaining an SDLRPCResponse - - @param name The NSNotification name - @param object The NSNotification object - @param response The SDLRPCResponse payload - @return The NSNotification + * Create an NSNotification object containing an SDLRPCResponse + * + * @param name The NSNotification name + * @param object The NSNotification object + * @param response The SDLRPCResponse payload + * @return The NSNotification */ - (instancetype)initWithName:(NSString *)name object:(nullable id)object rpcResponse:(__kindof SDLRPCResponse *)response; diff --git a/SmartDeviceLink/SDLRPCStruct.m b/SmartDeviceLink/SDLRPCStruct.m index b0bccaac1..9fd177e1d 100644 --- a/SmartDeviceLink/SDLRPCStruct.m +++ b/SmartDeviceLink/SDLRPCStruct.m @@ -5,7 +5,7 @@ #import "SDLRPCStruct.h" #import "SDLEnum.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" NS_ASSUME_NONNULL_BEGIN @@ -34,7 +34,7 @@ NS_ASSUME_NONNULL_BEGIN NSString *messageType = store.keyEnumerator.nextObject; NSMutableDictionary<NSString *, id> *function = store[messageType]; if ([function isKindOfClass:NSMutableDictionary.class]) { - NSMutableDictionary<NSString *, id> *parameters = function[SDLNameParameters]; + NSMutableDictionary<NSString *, id> *parameters = function[SDLRPCParameterNameParameters]; return [self.class sdl_serializeDictionary:parameters version:version]; } else { return [self.class sdl_serializeDictionary:store version:version]; diff --git a/SmartDeviceLink/SDLRadioControlCapabilities.m b/SmartDeviceLink/SDLRadioControlCapabilities.m index db45eb8ae..afb8bc3c1 100644 --- a/SmartDeviceLink/SDLRadioControlCapabilities.m +++ b/SmartDeviceLink/SDLRadioControlCapabilities.m @@ -3,7 +3,7 @@ // #import "SDLRadioControlCapabilities.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" #import "NSMutableDictionary+Store.h" NS_ASSUME_NONNULL_BEGIN @@ -38,107 +38,107 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setModuleName:(NSString *)moduleName { - [store sdl_setObject:moduleName forName:SDLNameModuleName]; + [store sdl_setObject:moduleName forName:SDLRPCParameterNameModuleName]; } - (NSString *)moduleName { - return [store sdl_objectForName:SDLNameModuleName]; + return [store sdl_objectForName:SDLRPCParameterNameModuleName]; } - (void)setRadioEnableAvailable:(nullable NSNumber<SDLBool> *)radioEnableAvailable { - [store sdl_setObject:radioEnableAvailable forName:SDLNameRadioEnableAvailable]; + [store sdl_setObject:radioEnableAvailable forName:SDLRPCParameterNameRadioEnableAvailable]; } - (nullable NSNumber<SDLBool> *)radioEnableAvailable { - return [store sdl_objectForName:SDLNameRadioEnableAvailable]; + return [store sdl_objectForName:SDLRPCParameterNameRadioEnableAvailable]; } - (void)setRadioBandAvailable:(nullable NSNumber<SDLBool> *)radioBandAvailable { - [store sdl_setObject:radioBandAvailable forName:SDLNameRadioBandAvailable]; + [store sdl_setObject:radioBandAvailable forName:SDLRPCParameterNameRadioBandAvailable]; } - (nullable NSNumber<SDLBool> *)radioBandAvailable { - return [store sdl_objectForName:SDLNameRadioBandAvailable]; + return [store sdl_objectForName:SDLRPCParameterNameRadioBandAvailable]; } - (void)setRadioFrequencyAvailable:(nullable NSNumber<SDLBool> *)radioFrequencyAvailable { - [store sdl_setObject:radioFrequencyAvailable forName:SDLNameRadioFrequencyAvailable]; + [store sdl_setObject:radioFrequencyAvailable forName:SDLRPCParameterNameRadioFrequencyAvailable]; } - (nullable NSNumber<SDLBool> *)radioFrequencyAvailable { - return [store sdl_objectForName:SDLNameRadioFrequencyAvailable]; + return [store sdl_objectForName:SDLRPCParameterNameRadioFrequencyAvailable]; } - (void)setHdChannelAvailable:(nullable NSNumber<SDLBool> *)hdChannelAvailable { - [store sdl_setObject:hdChannelAvailable forName:SDLNameHDChannelAvailable]; + [store sdl_setObject:hdChannelAvailable forName:SDLRPCParameterNameHDChannelAvailable]; } - (nullable NSNumber<SDLBool> *)hdChannelAvailable { - return [store sdl_objectForName:SDLNameHDChannelAvailable]; + return [store sdl_objectForName:SDLRPCParameterNameHDChannelAvailable]; } - (void)setRdsDataAvailable:(nullable NSNumber<SDLBool> *)rdsDataAvailable { - [store sdl_setObject:rdsDataAvailable forName:SDLNameRDSDataAvailable]; + [store sdl_setObject:rdsDataAvailable forName:SDLRPCParameterNameRDSDataAvailable]; } - (nullable NSNumber<SDLBool> *)rdsDataAvailable { - return [store sdl_objectForName:SDLNameRDSDataAvailable]; + return [store sdl_objectForName:SDLRPCParameterNameRDSDataAvailable]; } - (void)setAvailableHDsAvailable:(nullable NSNumber<SDLBool> *)availableHDsAvailable { - [store sdl_setObject:availableHDsAvailable forName:SDLNameAvailableHDsAvailable]; + [store sdl_setObject:availableHDsAvailable forName:SDLRPCParameterNameAvailableHDsAvailable]; } - (nullable NSNumber<SDLBool> *)availableHDsAvailable { - return [store sdl_objectForName:SDLNameAvailableHDsAvailable]; + return [store sdl_objectForName:SDLRPCParameterNameAvailableHDsAvailable]; } - (void)setStateAvailable:(nullable NSNumber<SDLBool> *)stateAvailable { - [store sdl_setObject:stateAvailable forName:SDLNameStateAvailable]; + [store sdl_setObject:stateAvailable forName:SDLRPCParameterNameStateAvailable]; } - (nullable NSNumber<SDLBool> *)stateAvailable { - return [store sdl_objectForName:SDLNameStateAvailable]; + return [store sdl_objectForName:SDLRPCParameterNameStateAvailable]; } - (void)setSignalStrengthAvailable:(nullable NSNumber<SDLBool> *)signalStrengthAvailable { - [store sdl_setObject:signalStrengthAvailable forName:SDLNameSignalStrengthAvailable]; + [store sdl_setObject:signalStrengthAvailable forName:SDLRPCParameterNameSignalStrengthAvailable]; } - (nullable NSNumber<SDLBool> *)signalStrengthAvailable { - return [store sdl_objectForName:SDLNameSignalStrengthAvailable]; + return [store sdl_objectForName:SDLRPCParameterNameSignalStrengthAvailable]; } - (void)setSignalChangeThresholdAvailable:(nullable NSNumber<SDLBool> *)signalChangeThresholdAvailable { - [store sdl_setObject:signalChangeThresholdAvailable forName:SDLNameSignalChangeThresholdAvailable]; + [store sdl_setObject:signalChangeThresholdAvailable forName:SDLRPCParameterNameSignalChangeThresholdAvailable]; } - (nullable NSNumber<SDLBool> *)signalChangeThresholdAvailable { - return [store sdl_objectForName:SDLNameSignalChangeThresholdAvailable]; + return [store sdl_objectForName:SDLRPCParameterNameSignalChangeThresholdAvailable]; } - (void)setHdRadioEnableAvailable:(nullable NSNumber<SDLBool> *)hdRadioEnableAvailable { - [store sdl_setObject:hdRadioEnableAvailable forName:SDLNameHDRadioEnableAvailable]; + [store sdl_setObject:hdRadioEnableAvailable forName:SDLRPCParameterNameHDRadioEnableAvailable]; } - (nullable NSNumber<SDLBool> *)hdRadioEnableAvailable { - return [store sdl_objectForName:SDLNameHDRadioEnableAvailable]; + return [store sdl_objectForName:SDLRPCParameterNameHDRadioEnableAvailable]; } - (void)setSiriusXMRadioAvailable:(nullable NSNumber<SDLBool> *)siriusXMRadioAvailable { - [store sdl_setObject:siriusXMRadioAvailable forName:SDLNameSiriusXMRadioAvailable]; + [store sdl_setObject:siriusXMRadioAvailable forName:SDLRPCParameterNameSiriusXMRadioAvailable]; } - (nullable NSNumber<SDLBool> *)siriusXMRadioAvailable { - return [store sdl_objectForName:SDLNameSiriusXMRadioAvailable]; + return [store sdl_objectForName:SDLRPCParameterNameSiriusXMRadioAvailable]; } - (void)setSisDataAvailable:(nullable NSNumber<SDLBool> *)sisDataAvailable { - [store sdl_setObject:sisDataAvailable forName:SDLNameSISDataAvailable]; + [store sdl_setObject:sisDataAvailable forName:SDLRPCParameterNameSISDataAvailable]; } - (nullable NSNumber<SDLBool> *)sisDataAvailable { - return [store sdl_objectForName:SDLNameSISDataAvailable]; + return [store sdl_objectForName:SDLRPCParameterNameSISDataAvailable]; } @end diff --git a/SmartDeviceLink/SDLRadioControlData.m b/SmartDeviceLink/SDLRadioControlData.m index f1af68204..92bc8b60c 100644 --- a/SmartDeviceLink/SDLRadioControlData.m +++ b/SmartDeviceLink/SDLRadioControlData.m @@ -3,7 +3,7 @@ // #import "SDLRadioControlData.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" #import "SDLRDSData.h" #import "SDLSISData.h" #import "NSMutableDictionary+Store.h" @@ -44,99 +44,99 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setFrequencyInteger:(nullable NSNumber<SDLInt> *)frequencyInteger { - [store sdl_setObject:frequencyInteger forName:SDLNameFrequencyInteger]; + [store sdl_setObject:frequencyInteger forName:SDLRPCParameterNameFrequencyInteger]; } - (nullable NSNumber<SDLInt> *)frequencyInteger { - return [store sdl_objectForName:SDLNameFrequencyInteger]; + return [store sdl_objectForName:SDLRPCParameterNameFrequencyInteger]; } - (void)setFrequencyFraction:(nullable NSNumber<SDLInt> *)frequencyFraction { - [store sdl_setObject:frequencyFraction forName:SDLNameFrequencyFraction]; + [store sdl_setObject:frequencyFraction forName:SDLRPCParameterNameFrequencyFraction]; } - (nullable NSNumber<SDLInt> *)frequencyFraction { - return [store sdl_objectForName:SDLNameFrequencyFraction]; + return [store sdl_objectForName:SDLRPCParameterNameFrequencyFraction]; } - (void)setBand:(nullable SDLRadioBand)band { - [store sdl_setObject:band forName:SDLNameBand]; + [store sdl_setObject:band forName:SDLRPCParameterNameBand]; } - (nullable SDLRadioBand)band{ - return [store sdl_objectForName:SDLNameBand]; + return [store sdl_objectForName:SDLRPCParameterNameBand]; } - (void)setRdsData:(nullable SDLRDSData *)rdsData { - [store sdl_setObject:rdsData forName:SDLNameRDSData]; + [store sdl_setObject:rdsData forName:SDLRPCParameterNameRDSData]; } - (nullable SDLRDSData *)rdsData { - return [store sdl_objectForName:SDLNameRDSData ofClass:SDLRDSData.class]; + return [store sdl_objectForName:SDLRPCParameterNameRDSData ofClass:SDLRDSData.class]; } - (void)setAvailableHDs:(nullable NSNumber<SDLInt> *)availableHDs { - [store sdl_setObject:availableHDs forName:SDLNameAvailableHDs]; + [store sdl_setObject:availableHDs forName:SDLRPCParameterNameAvailableHDs]; } - (nullable NSNumber<SDLInt> *)availableHDs { - return [store sdl_objectForName:SDLNameAvailableHDs]; + return [store sdl_objectForName:SDLRPCParameterNameAvailableHDs]; } - (void)setHdChannel:(nullable NSNumber<SDLInt> *)hdChannel { - [store sdl_setObject:hdChannel forName:SDLNameHDChannel]; + [store sdl_setObject:hdChannel forName:SDLRPCParameterNameHDChannel]; } - (nullable NSNumber<SDLInt> *)hdChannel { - return [store sdl_objectForName:SDLNameHDChannel]; + return [store sdl_objectForName:SDLRPCParameterNameHDChannel]; } - (void)setSignalStrength:(nullable NSNumber<SDLInt> *)signalStrength { - [store sdl_setObject:signalStrength forName:SDLNameSignalStrength]; + [store sdl_setObject:signalStrength forName:SDLRPCParameterNameSignalStrength]; } - (nullable NSNumber<SDLInt> *)signalStrength { - return [store sdl_objectForName:SDLNameSignalStrength]; + return [store sdl_objectForName:SDLRPCParameterNameSignalStrength]; } - (void)setSignalChangeThreshold:(nullable NSNumber<SDLInt> *)signalChangeThreshold { - [store sdl_setObject:signalChangeThreshold forName:SDLNameSignalChangeThreshold]; + [store sdl_setObject:signalChangeThreshold forName:SDLRPCParameterNameSignalChangeThreshold]; } - (nullable NSNumber<SDLInt> *)signalChangeThreshold { - return [store sdl_objectForName:SDLNameSignalChangeThreshold]; + return [store sdl_objectForName:SDLRPCParameterNameSignalChangeThreshold]; } - (void)setRadioEnable:(nullable NSNumber<SDLBool> *)radioEnable { - [store sdl_setObject:radioEnable forName:SDLNameRadioEnable]; + [store sdl_setObject:radioEnable forName:SDLRPCParameterNameRadioEnable]; } - (nullable NSNumber<SDLBool> *)radioEnable { - return [store sdl_objectForName:SDLNameRadioEnable]; + return [store sdl_objectForName:SDLRPCParameterNameRadioEnable]; } - (void)setState:(nullable SDLRadioState)state { - [store sdl_setObject:state forName:SDLNameState]; + [store sdl_setObject:state forName:SDLRPCParameterNameState]; } - (nullable SDLRadioState)state { - return [store sdl_objectForName:SDLNameState]; + return [store sdl_objectForName:SDLRPCParameterNameState]; } - (void)setHdRadioEnable:(nullable NSNumber<SDLBool> *)hdRadioEnable { - [store sdl_setObject:hdRadioEnable forName:SDLNameHDRadioEnable]; + [store sdl_setObject:hdRadioEnable forName:SDLRPCParameterNameHDRadioEnable]; } - (nullable NSNumber<SDLBool> *)hdRadioEnable { - return [store sdl_objectForName:SDLNameHDRadioEnable]; + return [store sdl_objectForName:SDLRPCParameterNameHDRadioEnable]; } - (void)setSisData:(nullable SDLSISData *)sisData { - [store sdl_setObject:sisData forName:SDLNameSISData]; + [store sdl_setObject:sisData forName:SDLRPCParameterNameSISData]; } - (nullable SDLSISData *)sisData { - return [store sdl_objectForName:SDLNameSISData ofClass:SDLSISData.class]; + return [store sdl_objectForName:SDLRPCParameterNameSISData ofClass:SDLSISData.class]; } @end diff --git a/SmartDeviceLink/SDLReadDID.m b/SmartDeviceLink/SDLReadDID.m index 9e2a906fd..9e0013ce1 100644 --- a/SmartDeviceLink/SDLReadDID.m +++ b/SmartDeviceLink/SDLReadDID.m @@ -5,14 +5,15 @@ #import "SDLReadDID.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLReadDID - (instancetype)init { - if (self = [super initWithName:SDLNameReadDID]) { + if (self = [super initWithName:SDLRPCFunctionNameReadDID]) { } return self; } @@ -30,19 +31,19 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setEcuName:(NSNumber<SDLInt> *)ecuName { - [parameters sdl_setObject:ecuName forName:SDLNameECUName]; + [parameters sdl_setObject:ecuName forName:SDLRPCParameterNameECUName]; } - (NSNumber<SDLInt> *)ecuName { - return [parameters sdl_objectForName:SDLNameECUName]; + return [parameters sdl_objectForName:SDLRPCParameterNameECUName]; } - (void)setDidLocation:(NSArray<NSNumber<SDLInt> *> *)didLocation { - [parameters sdl_setObject:didLocation forName:SDLNameDIDLocation]; + [parameters sdl_setObject:didLocation forName:SDLRPCParameterNameDIDLocation]; } - (NSArray<NSNumber<SDLInt> *> *)didLocation { - return [parameters sdl_objectForName:SDLNameDIDLocation]; + return [parameters sdl_objectForName:SDLRPCParameterNameDIDLocation]; } @end diff --git a/SmartDeviceLink/SDLReadDIDResponse.m b/SmartDeviceLink/SDLReadDIDResponse.m index 5b3901950..fc6fb60d2 100644 --- a/SmartDeviceLink/SDLReadDIDResponse.m +++ b/SmartDeviceLink/SDLReadDIDResponse.m @@ -6,24 +6,25 @@ #import "NSMutableDictionary+Store.h" #import "SDLDIDResult.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLReadDIDResponse - (instancetype)init { - if (self = [super initWithName:SDLNameReadDID]) { + if (self = [super initWithName:SDLRPCFunctionNameReadDID]) { } return self; } - (void)setDidResult:(nullable NSArray<SDLDIDResult *> *)didResult { - [parameters sdl_setObject:didResult forName:SDLNameDIDResult]; + [parameters sdl_setObject:didResult forName:SDLRPCParameterNameDIDResult]; } - (nullable NSArray<SDLDIDResult *> *)didResult { - return [parameters sdl_objectsForName:SDLNameDIDResult ofClass:SDLDIDResult.class]; + return [parameters sdl_objectsForName:SDLRPCParameterNameDIDResult ofClass:SDLDIDResult.class]; } @end diff --git a/SmartDeviceLink/SDLRectangle.m b/SmartDeviceLink/SDLRectangle.m index d9e6e412b..7434b098d 100644 --- a/SmartDeviceLink/SDLRectangle.m +++ b/SmartDeviceLink/SDLRectangle.m @@ -8,7 +8,7 @@ #import "NSMutableDictionary+Store.h" #import "SDLRectangle.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" @implementation SDLRectangle @@ -29,35 +29,35 @@ } - (void)setX:(NSNumber<SDLFloat> *)x { - [store sdl_setObject:x forName:SDLNameX]; + [store sdl_setObject:x forName:SDLRPCParameterNameX]; } - (NSNumber<SDLFloat> *)x { - return [store sdl_objectForName:SDLNameX]; + return [store sdl_objectForName:SDLRPCParameterNameX]; } - (void)setY:(NSNumber<SDLFloat> *)y { - [store sdl_setObject:y forName:SDLNameY]; + [store sdl_setObject:y forName:SDLRPCParameterNameY]; } - (NSNumber<SDLFloat> *)y { - return [store sdl_objectForName:SDLNameY]; + return [store sdl_objectForName:SDLRPCParameterNameY]; } - (void)setWidth:(NSNumber<SDLFloat> *)width { - [store sdl_setObject:width forName:SDLNameWidth]; + [store sdl_setObject:width forName:SDLRPCParameterNameWidth]; } - (NSNumber<SDLFloat> *)width { - return [store sdl_objectForName:SDLNameWidth]; + return [store sdl_objectForName:SDLRPCParameterNameWidth]; } - (void)setHeight:(NSNumber<SDLFloat> *)height { - [store sdl_setObject:height forName:SDLNameHeight]; + [store sdl_setObject:height forName:SDLRPCParameterNameHeight]; } - (NSNumber<SDLFloat> *)height { - return [store sdl_objectForName:SDLNameHeight]; + return [store sdl_objectForName:SDLRPCParameterNameHeight]; } @end diff --git a/SmartDeviceLink/SDLRegisterAppInterface.m b/SmartDeviceLink/SDLRegisterAppInterface.m index cf23d1be6..82bc3b92b 100644 --- a/SmartDeviceLink/SDLRegisterAppInterface.m +++ b/SmartDeviceLink/SDLRegisterAppInterface.m @@ -11,7 +11,8 @@ #import "SDLGlobals.h" #import "SDLLanguage.h" #import "SDLLifecycleConfiguration.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" #import "SDLSyncMsgVersion.h" #import "SDLTemplateColorScheme.h" #import "SDLTTSChunk.h" @@ -23,7 +24,7 @@ NS_ASSUME_NONNULL_BEGIN #pragma mark - Lifecycle - (instancetype)init { - if (self = [super initWithName:SDLNameRegisterAppInterface]) { + if (self = [super initWithName:SDLRPCFunctionNameRegisterAppInterface]) { } return self; } @@ -116,131 +117,131 @@ NS_ASSUME_NONNULL_BEGIN #pragma mark - Getters and Setters - (void)setSyncMsgVersion:(SDLSyncMsgVersion *)syncMsgVersion { - [parameters sdl_setObject:syncMsgVersion forName:SDLNameSyncMessageVersion]; + [parameters sdl_setObject:syncMsgVersion forName:SDLRPCParameterNameSyncMessageVersion]; } - (SDLSyncMsgVersion *)syncMsgVersion { - return [parameters sdl_objectForName:SDLNameSyncMessageVersion ofClass:SDLSyncMsgVersion.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameSyncMessageVersion ofClass:SDLSyncMsgVersion.class]; } - (void)setAppName:(NSString *)appName { - [parameters sdl_setObject:appName forName:SDLNameAppName]; + [parameters sdl_setObject:appName forName:SDLRPCParameterNameAppName]; } - (NSString *)appName { - return [parameters sdl_objectForName:SDLNameAppName]; + return [parameters sdl_objectForName:SDLRPCParameterNameAppName]; } - (void)setTtsName:(nullable NSArray<SDLTTSChunk *> *)ttsName { - [parameters sdl_setObject:ttsName forName:SDLNameTTSName]; + [parameters sdl_setObject:ttsName forName:SDLRPCParameterNameTTSName]; } - (nullable NSArray<SDLTTSChunk *> *)ttsName { - return [parameters sdl_objectsForName:SDLNameTTSName ofClass:SDLTTSChunk.class]; + return [parameters sdl_objectsForName:SDLRPCParameterNameTTSName ofClass:SDLTTSChunk.class]; } - (void)setNgnMediaScreenAppName:(nullable NSString *)ngnMediaScreenAppName { - [parameters sdl_setObject:ngnMediaScreenAppName forName:SDLNameNGNMediaScreenAppName]; + [parameters sdl_setObject:ngnMediaScreenAppName forName:SDLRPCParameterNameNGNMediaScreenAppName]; } - (nullable NSString *)ngnMediaScreenAppName { - return [parameters sdl_objectForName:SDLNameNGNMediaScreenAppName]; + return [parameters sdl_objectForName:SDLRPCParameterNameNGNMediaScreenAppName]; } - (void)setVrSynonyms:(nullable NSArray<NSString *> *)vrSynonyms { - [parameters sdl_setObject:vrSynonyms forName:SDLNameVRSynonyms]; + [parameters sdl_setObject:vrSynonyms forName:SDLRPCParameterNameVRSynonyms]; } - (nullable NSArray<NSString *> *)vrSynonyms { - return [parameters sdl_objectForName:SDLNameVRSynonyms]; + return [parameters sdl_objectForName:SDLRPCParameterNameVRSynonyms]; } - (void)setIsMediaApplication:(NSNumber<SDLBool> *)isMediaApplication { - [parameters sdl_setObject:isMediaApplication forName:SDLNameIsMediaApplication]; + [parameters sdl_setObject:isMediaApplication forName:SDLRPCParameterNameIsMediaApplication]; } - (NSNumber<SDLBool> *)isMediaApplication { - return [parameters sdl_objectForName:SDLNameIsMediaApplication]; + return [parameters sdl_objectForName:SDLRPCParameterNameIsMediaApplication]; } - (void)setLanguageDesired:(SDLLanguage)languageDesired { - [parameters sdl_setObject:languageDesired forName:SDLNameLanguageDesired]; + [parameters sdl_setObject:languageDesired forName:SDLRPCParameterNameLanguageDesired]; } - (SDLLanguage)languageDesired { - return [parameters sdl_objectForName:SDLNameLanguageDesired]; + return [parameters sdl_objectForName:SDLRPCParameterNameLanguageDesired]; } - (void)setHmiDisplayLanguageDesired:(SDLLanguage)hmiDisplayLanguageDesired { - [parameters sdl_setObject:hmiDisplayLanguageDesired forName:SDLNameHMIDisplayLanguageDesired]; + [parameters sdl_setObject:hmiDisplayLanguageDesired forName:SDLRPCParameterNameHMIDisplayLanguageDesired]; } - (SDLLanguage)hmiDisplayLanguageDesired { - return [parameters sdl_objectForName:SDLNameHMIDisplayLanguageDesired]; + return [parameters sdl_objectForName:SDLRPCParameterNameHMIDisplayLanguageDesired]; } - (void)setAppHMIType:(nullable NSArray<SDLAppHMIType> *)appHMIType { - [parameters sdl_setObject:appHMIType forName:SDLNameAppHMIType]; + [parameters sdl_setObject:appHMIType forName:SDLRPCParameterNameAppHMIType]; } - (nullable NSArray<SDLAppHMIType> *)appHMIType { - return [parameters sdl_objectForName:SDLNameAppHMIType]; + return [parameters sdl_objectForName:SDLRPCParameterNameAppHMIType]; } - (void)setHashID:(nullable NSString *)hashID { - [parameters sdl_setObject:hashID forName:SDLNameHashId]; + [parameters sdl_setObject:hashID forName:SDLRPCParameterNameHashId]; } - (nullable NSString *)hashID { - return [parameters sdl_objectForName:SDLNameHashId]; + return [parameters sdl_objectForName:SDLRPCParameterNameHashId]; } - (void)setDeviceInfo:(nullable SDLDeviceInfo *)deviceInfo { - [parameters sdl_setObject:deviceInfo forName:SDLNameDeviceInfo]; + [parameters sdl_setObject:deviceInfo forName:SDLRPCParameterNameDeviceInfo]; } - (nullable SDLDeviceInfo *)deviceInfo { - return [parameters sdl_objectForName:SDLNameDeviceInfo ofClass:SDLDeviceInfo.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameDeviceInfo ofClass:SDLDeviceInfo.class]; } - (void)setAppID:(NSString *)appID { - [parameters sdl_setObject:appID forName:SDLNameAppId]; + [parameters sdl_setObject:appID forName:SDLRPCParameterNameAppId]; } - (NSString *)appID { - return [parameters sdl_objectForName:SDLNameAppId]; + return [parameters sdl_objectForName:SDLRPCParameterNameAppId]; } - (void)setFullAppID:(nullable NSString *)fullAppID { - [parameters sdl_setObject:fullAppID forName:SDLNameFullAppID]; + [parameters sdl_setObject:fullAppID forName:SDLRPCParameterNameFullAppID]; } - (nullable NSString *)fullAppID { - return [parameters sdl_objectForName:SDLNameFullAppID]; + return [parameters sdl_objectForName:SDLRPCParameterNameFullAppID]; } - (void)setAppInfo:(nullable SDLAppInfo *)appInfo { - [parameters sdl_setObject:appInfo forName:SDLNameAppInfo]; + [parameters sdl_setObject:appInfo forName:SDLRPCParameterNameAppInfo]; } - (nullable SDLAppInfo *)appInfo { - return [parameters sdl_objectForName:SDLNameAppInfo ofClass:SDLAppInfo.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameAppInfo ofClass:SDLAppInfo.class]; } - (void)setDayColorScheme:(nullable SDLTemplateColorScheme *)dayColorScheme { - [parameters sdl_setObject:dayColorScheme forName:SDLNameDayColorScheme]; + [parameters sdl_setObject:dayColorScheme forName:SDLRPCParameterNameDayColorScheme]; } - (nullable SDLTemplateColorScheme *)dayColorScheme { - return [parameters sdl_objectForName:SDLNameDayColorScheme ofClass:[SDLTemplateColorScheme class]]; + return [parameters sdl_objectForName:SDLRPCParameterNameDayColorScheme ofClass:[SDLTemplateColorScheme class]]; } - (void)setNightColorScheme:(nullable SDLTemplateColorScheme *)nightColorScheme { - [parameters sdl_setObject:nightColorScheme forName:SDLNameNightColorScheme]; + [parameters sdl_setObject:nightColorScheme forName:SDLRPCParameterNameNightColorScheme]; } - (nullable SDLTemplateColorScheme *)nightColorScheme { - return [parameters sdl_objectForName:SDLNameNightColorScheme ofClass:[SDLTemplateColorScheme class]]; + return [parameters sdl_objectForName:SDLRPCParameterNameNightColorScheme ofClass:[SDLTemplateColorScheme class]]; } @end diff --git a/SmartDeviceLink/SDLRegisterAppInterfaceResponse.m b/SmartDeviceLink/SDLRegisterAppInterfaceResponse.m index f8b3b626b..a036814f6 100644 --- a/SmartDeviceLink/SDLRegisterAppInterfaceResponse.m +++ b/SmartDeviceLink/SDLRegisterAppInterfaceResponse.m @@ -9,7 +9,8 @@ #import "SDLButtonCapabilities.h" #import "SDLDisplayCapabilities.h" #import "SDLHMICapabilities.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" #import "SDLPresetBankCapabilities.h" #import "SDLSoftButtonCapabilities.h" #import "SDLSyncMsgVersion.h" @@ -21,161 +22,161 @@ NS_ASSUME_NONNULL_BEGIN @implementation SDLRegisterAppInterfaceResponse - (instancetype)init { - if (self = [super initWithName:SDLNameRegisterAppInterface]) { + if (self = [super initWithName:SDLRPCFunctionNameRegisterAppInterface]) { } return self; } - (void)setSyncMsgVersion:(nullable SDLSyncMsgVersion *)syncMsgVersion { - [parameters sdl_setObject:syncMsgVersion forName:SDLNameSyncMessageVersion]; + [parameters sdl_setObject:syncMsgVersion forName:SDLRPCParameterNameSyncMessageVersion]; } - (nullable SDLSyncMsgVersion *)syncMsgVersion { - return [parameters sdl_objectForName:SDLNameSyncMessageVersion ofClass:SDLSyncMsgVersion.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameSyncMessageVersion ofClass:SDLSyncMsgVersion.class]; } - (void)setLanguage:(nullable SDLLanguage)language { - [parameters sdl_setObject:language forName:SDLNameLanguage]; + [parameters sdl_setObject:language forName:SDLRPCParameterNameLanguage]; } - (nullable SDLLanguage)language { - return [parameters sdl_objectForName:SDLNameLanguage]; + return [parameters sdl_objectForName:SDLRPCParameterNameLanguage]; } - (void)setHmiDisplayLanguage:(nullable SDLLanguage)hmiDisplayLanguage { - [parameters sdl_setObject:hmiDisplayLanguage forName:SDLNameHMIDisplayLanguage]; + [parameters sdl_setObject:hmiDisplayLanguage forName:SDLRPCParameterNameHMIDisplayLanguage]; } - (nullable SDLLanguage)hmiDisplayLanguage { - return [parameters sdl_objectForName:SDLNameHMIDisplayLanguage]; + return [parameters sdl_objectForName:SDLRPCParameterNameHMIDisplayLanguage]; } - (void)setDisplayCapabilities:(nullable SDLDisplayCapabilities *)displayCapabilities { - [parameters sdl_setObject:displayCapabilities forName:SDLNameDisplayCapabilities]; + [parameters sdl_setObject:displayCapabilities forName:SDLRPCParameterNameDisplayCapabilities]; } - (nullable SDLDisplayCapabilities *)displayCapabilities { - return [parameters sdl_objectForName:SDLNameDisplayCapabilities ofClass:SDLDisplayCapabilities.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameDisplayCapabilities ofClass:SDLDisplayCapabilities.class]; } - (void)setButtonCapabilities:(nullable NSArray<SDLButtonCapabilities *> *)buttonCapabilities { - [parameters sdl_setObject:buttonCapabilities forName:SDLNameButtonCapabilities]; + [parameters sdl_setObject:buttonCapabilities forName:SDLRPCParameterNameButtonCapabilities]; } - (nullable NSArray<SDLButtonCapabilities *> *)buttonCapabilities { - return [parameters sdl_objectsForName:SDLNameButtonCapabilities ofClass:SDLButtonCapabilities.class]; + return [parameters sdl_objectsForName:SDLRPCParameterNameButtonCapabilities ofClass:SDLButtonCapabilities.class]; } - (void)setSoftButtonCapabilities:(nullable NSArray<SDLSoftButtonCapabilities *> *)softButtonCapabilities { - [parameters sdl_setObject:softButtonCapabilities forName:SDLNameSoftButtonCapabilities]; + [parameters sdl_setObject:softButtonCapabilities forName:SDLRPCParameterNameSoftButtonCapabilities]; } - (nullable NSArray<SDLSoftButtonCapabilities *> *)softButtonCapabilities { - return [parameters sdl_objectsForName:SDLNameSoftButtonCapabilities ofClass:SDLSoftButtonCapabilities.class]; + return [parameters sdl_objectsForName:SDLRPCParameterNameSoftButtonCapabilities ofClass:SDLSoftButtonCapabilities.class]; } - (void)setPresetBankCapabilities:(nullable SDLPresetBankCapabilities *)presetBankCapabilities { - [parameters sdl_setObject:presetBankCapabilities forName:SDLNamePresetBankCapabilities]; + [parameters sdl_setObject:presetBankCapabilities forName:SDLRPCParameterNamePresetBankCapabilities]; } - (nullable SDLPresetBankCapabilities *)presetBankCapabilities { - return [parameters sdl_objectForName:SDLNamePresetBankCapabilities ofClass:SDLPresetBankCapabilities.class]; + return [parameters sdl_objectForName:SDLRPCParameterNamePresetBankCapabilities ofClass:SDLPresetBankCapabilities.class]; } - (void)setHmiZoneCapabilities:(nullable NSArray<SDLHMIZoneCapabilities> *)hmiZoneCapabilities { - [parameters sdl_setObject:hmiZoneCapabilities forName:SDLNameHMIZoneCapabilities]; + [parameters sdl_setObject:hmiZoneCapabilities forName:SDLRPCParameterNameHMIZoneCapabilities]; } - (nullable NSArray<SDLHMIZoneCapabilities> *)hmiZoneCapabilities { - return [parameters sdl_objectForName:SDLNameHMIZoneCapabilities]; + return [parameters sdl_objectForName:SDLRPCParameterNameHMIZoneCapabilities]; } - (void)setSpeechCapabilities:(nullable NSArray<SDLSpeechCapabilities> *)speechCapabilities { - [parameters sdl_setObject:speechCapabilities forName:SDLNameSpeechCapabilities]; + [parameters sdl_setObject:speechCapabilities forName:SDLRPCParameterNameSpeechCapabilities]; } - (nullable NSArray<SDLSpeechCapabilities> *)speechCapabilities { - return [parameters sdl_objectForName:SDLNameSpeechCapabilities]; + return [parameters sdl_objectForName:SDLRPCParameterNameSpeechCapabilities]; } - (void)setPrerecordedSpeech:(nullable NSArray<SDLPrerecordedSpeech> *)prerecordedSpeech { - [parameters sdl_setObject:prerecordedSpeech forName:SDLNamePrerecordedSpeech]; + [parameters sdl_setObject:prerecordedSpeech forName:SDLRPCParameterNamePrerecordedSpeech]; } - (nullable NSArray<SDLPrerecordedSpeech> *)prerecordedSpeech { - return [parameters sdl_objectForName:SDLNamePrerecordedSpeech]; + return [parameters sdl_objectForName:SDLRPCParameterNamePrerecordedSpeech]; } - (void)setVrCapabilities:(nullable NSArray<SDLVRCapabilities> *)vrCapabilities { - [parameters sdl_setObject:vrCapabilities forName:SDLNameVRCapabilities]; + [parameters sdl_setObject:vrCapabilities forName:SDLRPCParameterNameVRCapabilities]; } - (nullable NSArray<SDLVRCapabilities> *)vrCapabilities { - return [parameters sdl_objectForName:SDLNameVRCapabilities]; + return [parameters sdl_objectForName:SDLRPCParameterNameVRCapabilities]; } - (void)setAudioPassThruCapabilities:(nullable NSArray<SDLAudioPassThruCapabilities *> *)audioPassThruCapabilities { - [parameters sdl_setObject:audioPassThruCapabilities forName:SDLNameAudioPassThruCapabilities]; + [parameters sdl_setObject:audioPassThruCapabilities forName:SDLRPCParameterNameAudioPassThruCapabilities]; } - (nullable NSArray<SDLAudioPassThruCapabilities *> *)audioPassThruCapabilities { - return [parameters sdl_objectsForName:SDLNameAudioPassThruCapabilities ofClass:SDLAudioPassThruCapabilities.class]; + return [parameters sdl_objectsForName:SDLRPCParameterNameAudioPassThruCapabilities ofClass:SDLAudioPassThruCapabilities.class]; } - (void)setPcmStreamCapabilities:(nullable SDLAudioPassThruCapabilities *)pcmStreamCapabilities { - [parameters sdl_setObject:pcmStreamCapabilities forName:SDLNamePCMStreamCapabilities]; + [parameters sdl_setObject:pcmStreamCapabilities forName:SDLRPCParameterNamePCMStreamCapabilities]; } - (nullable SDLAudioPassThruCapabilities *)pcmStreamCapabilities { - return [parameters sdl_objectForName:SDLNamePCMStreamCapabilities ofClass:SDLAudioPassThruCapabilities.class]; + return [parameters sdl_objectForName:SDLRPCParameterNamePCMStreamCapabilities ofClass:SDLAudioPassThruCapabilities.class]; } - (void)setVehicleType:(nullable SDLVehicleType *)vehicleType { - [parameters sdl_setObject:vehicleType forName:SDLNameVehicleType]; + [parameters sdl_setObject:vehicleType forName:SDLRPCParameterNameVehicleType]; } - (nullable SDLVehicleType *)vehicleType { - return [parameters sdl_objectForName:SDLNameVehicleType ofClass:[SDLVehicleType class]]; + return [parameters sdl_objectForName:SDLRPCParameterNameVehicleType ofClass:[SDLVehicleType class]]; } - (void)setSupportedDiagModes:(nullable NSArray<NSNumber<SDLInt> *> *)supportedDiagModes { - [parameters sdl_setObject:supportedDiagModes forName:SDLNameSupportedDiagnosticModes]; + [parameters sdl_setObject:supportedDiagModes forName:SDLRPCParameterNameSupportedDiagnosticModes]; } - (nullable NSArray<NSNumber<SDLInt> *> *)supportedDiagModes { - return [parameters sdl_objectForName:SDLNameSupportedDiagnosticModes]; + return [parameters sdl_objectForName:SDLRPCParameterNameSupportedDiagnosticModes]; } - (void)setHmiCapabilities:(nullable SDLHMICapabilities *)hmiCapabilities { - [parameters sdl_setObject:hmiCapabilities forName:SDLNameHMICapabilities]; + [parameters sdl_setObject:hmiCapabilities forName:SDLRPCParameterNameHMICapabilities]; } - (nullable SDLHMICapabilities *)hmiCapabilities { - return [parameters sdl_objectForName:SDLNameHMICapabilities ofClass:SDLHMICapabilities.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameHMICapabilities ofClass:SDLHMICapabilities.class]; } - (void)setSdlVersion:(nullable NSString *)sdlVersion { - [parameters sdl_setObject:sdlVersion forName:SDLNameSDLVersion]; + [parameters sdl_setObject:sdlVersion forName:SDLRPCParameterNameSDLVersion]; } - (nullable NSString *)sdlVersion { - return [parameters sdl_objectForName:SDLNameSDLVersion]; + return [parameters sdl_objectForName:SDLRPCParameterNameSDLVersion]; } - (void)setSystemSoftwareVersion:(nullable NSString *)systemSoftwareVersion { - [parameters sdl_setObject:systemSoftwareVersion forName:SDLNameSystemSoftwareVersion]; + [parameters sdl_setObject:systemSoftwareVersion forName:SDLRPCParameterNameSystemSoftwareVersion]; } - (nullable NSString *)systemSoftwareVersion { - return [parameters sdl_objectForName:SDLNameSystemSoftwareVersion]; + return [parameters sdl_objectForName:SDLRPCParameterNameSystemSoftwareVersion]; } - (void)setIconResumed:(nullable NSNumber<SDLBool> *)iconResumed { - [parameters sdl_setObject:iconResumed forName:SDLNameIconResumed]; + [parameters sdl_setObject:iconResumed forName:SDLRPCParameterNameIconResumed]; } - (nullable NSNumber<SDLBool> *)iconResumed { - return [parameters sdl_objectForName:SDLNameIconResumed]; + return [parameters sdl_objectForName:SDLRPCParameterNameIconResumed]; } @end diff --git a/SmartDeviceLink/SDLRemoteControlCapabilities.m b/SmartDeviceLink/SDLRemoteControlCapabilities.m index 2e4ab7492..af54458bd 100644 --- a/SmartDeviceLink/SDLRemoteControlCapabilities.m +++ b/SmartDeviceLink/SDLRemoteControlCapabilities.m @@ -11,7 +11,7 @@ #import "SDLRadioControlCapabilities.h" #import "SDLSeatControlCapabilities.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" NS_ASSUME_NONNULL_BEGIN @@ -40,59 +40,59 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setClimateControlCapabilities:(nullable NSArray<SDLClimateControlCapabilities *> *)climateControlCapabilities { - [store sdl_setObject:climateControlCapabilities forName:SDLNameClimateControlCapabilities]; + [store sdl_setObject:climateControlCapabilities forName:SDLRPCParameterNameClimateControlCapabilities]; } - (nullable NSArray<SDLClimateControlCapabilities *> *)climateControlCapabilities { - return [store sdl_objectsForName:SDLNameClimateControlCapabilities ofClass:SDLClimateControlCapabilities.class]; + return [store sdl_objectsForName:SDLRPCParameterNameClimateControlCapabilities ofClass:SDLClimateControlCapabilities.class]; } -(void)setRadioControlCapabilities:(nullable NSArray<SDLRadioControlCapabilities *> *)radioControlCapabilities { - [store sdl_setObject:radioControlCapabilities forName:SDLNameRadioControlCapabilities ]; + [store sdl_setObject:radioControlCapabilities forName:SDLRPCParameterNameRadioControlCapabilities ]; } - (nullable NSArray<SDLRadioControlCapabilities *> *)radioControlCapabilities { - return [store sdl_objectsForName:SDLNameRadioControlCapabilities ofClass:SDLRadioControlCapabilities.class]; + return [store sdl_objectsForName:SDLRPCParameterNameRadioControlCapabilities ofClass:SDLRadioControlCapabilities.class]; } - (void)setButtonCapabilities:(nullable NSArray<SDLButtonCapabilities *> *)buttonCapabilities { - [store sdl_setObject:buttonCapabilities forName:SDLNameButtonCapabilities];} + [store sdl_setObject:buttonCapabilities forName:SDLRPCParameterNameButtonCapabilities];} - (nullable NSArray<SDLButtonCapabilities *> *)buttonCapabilities { - return [store sdl_objectsForName:SDLNameButtonCapabilities ofClass:SDLButtonCapabilities.class]; + return [store sdl_objectsForName:SDLRPCParameterNameButtonCapabilities ofClass:SDLButtonCapabilities.class]; } - (void)setSeatControlCapabilities:(nullable NSArray<SDLSeatControlCapabilities *> *)seatControlCapabilities { - [store sdl_setObject:seatControlCapabilities forName:SDLNameSeatControlCapabilities]; + [store sdl_setObject:seatControlCapabilities forName:SDLRPCParameterNameSeatControlCapabilities]; } - (nullable NSArray<SDLSeatControlCapabilities *> *)seatControlCapabilities { - return [store sdl_objectsForName:SDLNameSeatControlCapabilities ofClass:SDLSeatControlCapabilities.class]; + return [store sdl_objectsForName:SDLRPCParameterNameSeatControlCapabilities ofClass:SDLSeatControlCapabilities.class]; } - (void)setAudioControlCapabilities:(nullable NSArray<SDLAudioControlCapabilities *> *)audioControlCapabilities { - [store sdl_setObject:audioControlCapabilities forName:SDLNameAudioControlCapabilities]; + [store sdl_setObject:audioControlCapabilities forName:SDLRPCParameterNameAudioControlCapabilities]; } - (nullable NSArray<SDLAudioControlCapabilities *> *)audioControlCapabilities { - return [store sdl_objectsForName:SDLNameAudioControlCapabilities ofClass:SDLAudioControlCapabilities.class]; + return [store sdl_objectsForName:SDLRPCParameterNameAudioControlCapabilities ofClass:SDLAudioControlCapabilities.class]; } - (void)setHmiSettingsControlCapabilities:(nullable NSArray<SDLHMISettingsControlCapabilities *> *)hmiSettingsControlCapabilities { - [store sdl_setObject:hmiSettingsControlCapabilities forName:SDLNameHmiSettingsControlCapabilities]; + [store sdl_setObject:hmiSettingsControlCapabilities forName:SDLRPCParameterNameHmiSettingsControlCapabilities]; } - (nullable NSArray<SDLHMISettingsControlCapabilities *> *)hmiSettingsControlCapabilities { - return [store sdl_objectsForName:SDLNameHmiSettingsControlCapabilities ofClass:SDLHMISettingsControlCapabilities.class]; + return [store sdl_objectsForName:SDLRPCParameterNameHmiSettingsControlCapabilities ofClass:SDLHMISettingsControlCapabilities.class]; } - (void)setLightControlCapabilities:(nullable NSArray<SDLLightControlCapabilities *> *)lightControlCapabilities { - [store sdl_setObject:lightControlCapabilities forName:SDLNameLightControlCapabilities]; + [store sdl_setObject:lightControlCapabilities forName:SDLRPCParameterNameLightControlCapabilities]; } - (nullable NSArray<SDLLightControlCapabilities *> *)lightControlCapabilities { - return [store sdl_objectsForName:SDLNameLightControlCapabilities ofClass:SDLLightControlCapabilities.class]; + return [store sdl_objectsForName:SDLRPCParameterNameLightControlCapabilities ofClass:SDLLightControlCapabilities.class]; } @end diff --git a/SmartDeviceLink/SDLResetGlobalProperties.m b/SmartDeviceLink/SDLResetGlobalProperties.m index 21242cbab..b0491ccbb 100644 --- a/SmartDeviceLink/SDLResetGlobalProperties.m +++ b/SmartDeviceLink/SDLResetGlobalProperties.m @@ -6,14 +6,15 @@ #import "NSMutableDictionary+Store.h" #import "SDLGlobalProperty.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLResetGlobalProperties - (instancetype)init { - if (self = [super initWithName:SDLNameResetGlobalProperties]) { + if (self = [super initWithName:SDLRPCFunctionNameResetGlobalProperties]) { } return self; } @@ -30,11 +31,11 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setProperties:(NSArray<SDLGlobalProperty> *)properties { - [parameters sdl_setObject:properties forName:SDLNameProperties]; + [parameters sdl_setObject:properties forName:SDLRPCParameterNameProperties]; } - (NSArray<SDLGlobalProperty> *)properties { - return [parameters sdl_objectForName:SDLNameProperties]; + return [parameters sdl_objectForName:SDLRPCParameterNameProperties]; } @end diff --git a/SmartDeviceLink/SDLResetGlobalPropertiesResponse.m b/SmartDeviceLink/SDLResetGlobalPropertiesResponse.m index 4db428b7b..65bde4093 100644 --- a/SmartDeviceLink/SDLResetGlobalPropertiesResponse.m +++ b/SmartDeviceLink/SDLResetGlobalPropertiesResponse.m @@ -5,14 +5,15 @@ #import "SDLResetGlobalPropertiesResponse.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLResetGlobalPropertiesResponse - (instancetype)init { - if (self = [super initWithName:SDLNameResetGlobalProperties]) { + if (self = [super initWithName:SDLRPCFunctionNameResetGlobalProperties]) { } return self; } diff --git a/SmartDeviceLink/SDLSISData.m b/SmartDeviceLink/SDLSISData.m index 27681aab9..276147c03 100644 --- a/SmartDeviceLink/SDLSISData.m +++ b/SmartDeviceLink/SDLSISData.m @@ -5,7 +5,7 @@ #import "SDLStationIDNumber.h" #import "SDLGPSData.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" #import "NSMutableDictionary+Store.h" @@ -28,43 +28,43 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setStationShortName:(nullable NSString *)stationShortName { - [store sdl_setObject:stationShortName forName:SDLNameStationShortName]; + [store sdl_setObject:stationShortName forName:SDLRPCParameterNameStationShortName]; } - (nullable NSString *)stationShortName { - return [store sdl_objectForName:SDLNameStationShortName]; + return [store sdl_objectForName:SDLRPCParameterNameStationShortName]; } - (void)setStationIDNumber:(nullable SDLStationIDNumber *)stationIDNumber { - [store sdl_setObject:stationIDNumber forName:SDLNameStationIDNumber]; + [store sdl_setObject:stationIDNumber forName:SDLRPCParameterNameStationIDNumber]; } - (nullable SDLStationIDNumber *)stationIDNumber { - return [store sdl_objectForName:SDLNameStationIDNumber ofClass:SDLStationIDNumber.class]; + return [store sdl_objectForName:SDLRPCParameterNameStationIDNumber ofClass:SDLStationIDNumber.class]; } - (void)setStationLongName:(nullable NSString *)stationLongName { - [store sdl_setObject:stationLongName forName:SDLNameStationLongName]; + [store sdl_setObject:stationLongName forName:SDLRPCParameterNameStationLongName]; } - (nullable NSString *)stationLongName { - return [store sdl_objectForName:SDLNameStationLongName]; + return [store sdl_objectForName:SDLRPCParameterNameStationLongName]; } - (void)setStationLocation:(nullable SDLGPSData *)stationLocation { - [store sdl_setObject:stationLocation forName:SDLNameStationLocation]; + [store sdl_setObject:stationLocation forName:SDLRPCParameterNameStationLocation]; } - (nullable SDLGPSData *)stationLocation { - return [store sdl_objectForName:SDLNameStationLocation ofClass:SDLGPSData.class]; + return [store sdl_objectForName:SDLRPCParameterNameStationLocation ofClass:SDLGPSData.class]; } - (void)setStationMessage:(nullable NSString *)stationMessage { - [store sdl_setObject:stationMessage forName:SDLNameStationMessage]; + [store sdl_setObject:stationMessage forName:SDLRPCParameterNameStationMessage]; } - (nullable NSString *)stationMessage { - return [store sdl_objectForName:SDLNameStationMessage]; + return [store sdl_objectForName:SDLRPCParameterNameStationMessage]; } @end diff --git a/SmartDeviceLink/SDLScreenParams.m b/SmartDeviceLink/SDLScreenParams.m index d531dfadd..449bd7150 100644 --- a/SmartDeviceLink/SDLScreenParams.m +++ b/SmartDeviceLink/SDLScreenParams.m @@ -5,7 +5,7 @@ #import "NSMutableDictionary+Store.h" #import "SDLImageResolution.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" #import "SDLTouchEventCapabilities.h" NS_ASSUME_NONNULL_BEGIN @@ -13,19 +13,19 @@ NS_ASSUME_NONNULL_BEGIN @implementation SDLScreenParams - (void)setResolution:(SDLImageResolution *)resolution { - [store sdl_setObject:resolution forName:SDLNameResolution]; + [store sdl_setObject:resolution forName:SDLRPCParameterNameResolution]; } - (SDLImageResolution *)resolution { - return [store sdl_objectForName:SDLNameResolution ofClass:SDLImageResolution.class]; + return [store sdl_objectForName:SDLRPCParameterNameResolution ofClass:SDLImageResolution.class]; } - (void)setTouchEventAvailable:(nullable SDLTouchEventCapabilities *)touchEventAvailable { - [store sdl_setObject:touchEventAvailable forName:SDLNameTouchEventAvailable]; + [store sdl_setObject:touchEventAvailable forName:SDLRPCParameterNameTouchEventAvailable]; } - (nullable SDLTouchEventCapabilities *)touchEventAvailable { - return [store sdl_objectForName:SDLNameTouchEventAvailable ofClass:SDLTouchEventCapabilities.class]; + return [store sdl_objectForName:SDLRPCParameterNameTouchEventAvailable ofClass:SDLTouchEventCapabilities.class]; } @end diff --git a/SmartDeviceLink/SDLScrollableMessage.m b/SmartDeviceLink/SDLScrollableMessage.m index f9c92c796..250ffa739 100644 --- a/SmartDeviceLink/SDLScrollableMessage.m +++ b/SmartDeviceLink/SDLScrollableMessage.m @@ -5,7 +5,8 @@ #import "SDLScrollableMessage.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" #import "SDLSoftButton.h" NS_ASSUME_NONNULL_BEGIN @@ -13,7 +14,7 @@ NS_ASSUME_NONNULL_BEGIN @implementation SDLScrollableMessage - (instancetype)init { - if (self = [super initWithName:SDLNameScrollableMessage]) { + if (self = [super initWithName:SDLRPCFunctionNameScrollableMessage]) { } return self; } @@ -42,27 +43,27 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setScrollableMessageBody:(NSString *)scrollableMessageBody { - [parameters sdl_setObject:scrollableMessageBody forName:SDLNameScrollableMessageBody]; + [parameters sdl_setObject:scrollableMessageBody forName:SDLRPCParameterNameScrollableMessageBody]; } - (NSString *)scrollableMessageBody { - return [parameters sdl_objectForName:SDLNameScrollableMessageBody]; + return [parameters sdl_objectForName:SDLRPCParameterNameScrollableMessageBody]; } - (void)setTimeout:(nullable NSNumber<SDLInt> *)timeout { - [parameters sdl_setObject:timeout forName:SDLNameTimeout]; + [parameters sdl_setObject:timeout forName:SDLRPCParameterNameTimeout]; } - (nullable NSNumber<SDLInt> *)timeout { - return [parameters sdl_objectForName:SDLNameTimeout]; + return [parameters sdl_objectForName:SDLRPCParameterNameTimeout]; } - (void)setSoftButtons:(nullable NSArray<SDLSoftButton *> *)softButtons { - [parameters sdl_setObject:softButtons forName:SDLNameSoftButtons]; + [parameters sdl_setObject:softButtons forName:SDLRPCParameterNameSoftButtons]; } - (nullable NSArray<SDLSoftButton *> *)softButtons { - return [parameters sdl_objectsForName:SDLNameSoftButtons ofClass:SDLSoftButton.class]; + return [parameters sdl_objectsForName:SDLRPCParameterNameSoftButtons ofClass:SDLSoftButton.class]; } @end diff --git a/SmartDeviceLink/SDLScrollableMessageResponse.m b/SmartDeviceLink/SDLScrollableMessageResponse.m index 0777c3de2..4065ca985 100644 --- a/SmartDeviceLink/SDLScrollableMessageResponse.m +++ b/SmartDeviceLink/SDLScrollableMessageResponse.m @@ -5,12 +5,13 @@ #import "SDLScrollableMessageResponse.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" @implementation SDLScrollableMessageResponse - (instancetype)init { - if (self = [super initWithName:SDLNameScrollableMessage]) { + if (self = [super initWithName:SDLRPCFunctionNameScrollableMessage]) { } return self; } diff --git a/SmartDeviceLink/SDLSeatControlCapabilities.m b/SmartDeviceLink/SDLSeatControlCapabilities.m index 5f7fd93b0..e0fb23c5d 100644 --- a/SmartDeviceLink/SDLSeatControlCapabilities.m +++ b/SmartDeviceLink/SDLSeatControlCapabilities.m @@ -2,7 +2,7 @@ // #import "SDLSeatControlCapabilities.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" #import "NSMutableDictionary+Store.h" NS_ASSUME_NONNULL_BEGIN @@ -44,158 +44,158 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setModuleName:(NSString *)moduleName { - [store sdl_setObject:moduleName forName:SDLNameModuleName]; + [store sdl_setObject:moduleName forName:SDLRPCParameterNameModuleName]; } - (NSString *)moduleName { - return [store sdl_objectForName:SDLNameModuleName]; + return [store sdl_objectForName:SDLRPCParameterNameModuleName]; } - (void)setHeatingEnabledAvailable:(nullable NSNumber<SDLBool> *)heatingEnabledAvailable { - [store sdl_setObject:heatingEnabledAvailable forName:SDLNameHeatingEnabledAvailable]; + [store sdl_setObject:heatingEnabledAvailable forName:SDLRPCParameterNameHeatingEnabledAvailable]; } - (nullable NSNumber<SDLBool> *)heatingEnabledAvailable { - return [store sdl_objectForName:SDLNameHeatingEnabledAvailable]; + return [store sdl_objectForName:SDLRPCParameterNameHeatingEnabledAvailable]; } - (void)setCoolingEnabledAvailable:(nullable NSNumber<SDLBool> *)coolingEnabledAvailable { - [store sdl_setObject:coolingEnabledAvailable forName:SDLNameCoolingEnabledAvailable]; + [store sdl_setObject:coolingEnabledAvailable forName:SDLRPCParameterNameCoolingEnabledAvailable]; } - (nullable NSNumber<SDLBool> *)coolingEnabledAvailable { - return [store sdl_objectForName:SDLNameCoolingEnabledAvailable]; + return [store sdl_objectForName:SDLRPCParameterNameCoolingEnabledAvailable]; } - (void)setHeatingLevelAvailable:(nullable NSNumber<SDLBool> *)heatingLevelAvailable { - [store sdl_setObject:heatingLevelAvailable forName:SDLNameHeatingLevelAvailable]; + [store sdl_setObject:heatingLevelAvailable forName:SDLRPCParameterNameHeatingLevelAvailable]; } - (nullable NSNumber<SDLBool> *)heatingLevelAvailable { - return [store sdl_objectForName:SDLNameHeatingLevelAvailable]; + return [store sdl_objectForName:SDLRPCParameterNameHeatingLevelAvailable]; } - (void)setCoolingLevelAvailable:(nullable NSNumber<SDLBool> *)coolingLevelAvailable { - [store sdl_setObject:coolingLevelAvailable forName:SDLNameCoolingLevelAvailable]; + [store sdl_setObject:coolingLevelAvailable forName:SDLRPCParameterNameCoolingLevelAvailable]; } - (nullable NSNumber<SDLBool> *)coolingLevelAvailable { - return [store sdl_objectForName:SDLNameCoolingLevelAvailable]; + return [store sdl_objectForName:SDLRPCParameterNameCoolingLevelAvailable]; } - (void)setHorizontalPositionAvailable:(nullable NSNumber<SDLBool> *)horizontalPositionAvailable { - [store sdl_setObject:horizontalPositionAvailable forName:SDLNameHorizontalPositionAvailable]; + [store sdl_setObject:horizontalPositionAvailable forName:SDLRPCParameterNameHorizontalPositionAvailable]; } - (nullable NSNumber<SDLBool> *)horizontalPositionAvailable { - return [store sdl_objectForName:SDLNameHorizontalPositionAvailable]; + return [store sdl_objectForName:SDLRPCParameterNameHorizontalPositionAvailable]; } - (void)setVerticalPositionAvailable:(nullable NSNumber<SDLBool> *)verticalPositionAvailable { - [store sdl_setObject:verticalPositionAvailable forName:SDLNameVerticalPositionAvailable]; + [store sdl_setObject:verticalPositionAvailable forName:SDLRPCParameterNameVerticalPositionAvailable]; } - (nullable NSNumber<SDLBool> *)verticalPositionAvailable { - return [store sdl_objectForName:SDLNameVerticalPositionAvailable]; + return [store sdl_objectForName:SDLRPCParameterNameVerticalPositionAvailable]; } - (void)setFrontVerticalPositionAvailable:(nullable NSNumber<SDLBool> *)frontVerticalPositionAvailable { - [store sdl_setObject:frontVerticalPositionAvailable forName:SDLNameFrontVerticalPositionAvailable]; + [store sdl_setObject:frontVerticalPositionAvailable forName:SDLRPCParameterNameFrontVerticalPositionAvailable]; } - (nullable NSNumber<SDLBool> *)frontVerticalPositionAvailable { - return [store sdl_objectForName:SDLNameFrontVerticalPositionAvailable]; + return [store sdl_objectForName:SDLRPCParameterNameFrontVerticalPositionAvailable]; } - (void)setBackVerticalPositionAvailable:(nullable NSNumber<SDLBool> *)backVerticalPositionAvailable { - [store sdl_setObject:backVerticalPositionAvailable forName:SDLNameBackVerticalPositionAvailable]; + [store sdl_setObject:backVerticalPositionAvailable forName:SDLRPCParameterNameBackVerticalPositionAvailable]; } - (nullable NSNumber<SDLBool> *)backVerticalPositionAvailable { - return [store sdl_objectForName:SDLNameBackVerticalPositionAvailable]; + return [store sdl_objectForName:SDLRPCParameterNameBackVerticalPositionAvailable]; } - (void)setBackTiltAngleAvailable:(nullable NSNumber<SDLBool> *)backTiltAngleAvailable { - [store sdl_setObject:backTiltAngleAvailable forName:SDLNameBackTiltAngleAvailable]; + [store sdl_setObject:backTiltAngleAvailable forName:SDLRPCParameterNameBackTiltAngleAvailable]; } - (nullable NSNumber<SDLBool> *)backTiltAngleAvailable { - return [store sdl_objectForName:SDLNameBackTiltAngleAvailable]; + return [store sdl_objectForName:SDLRPCParameterNameBackTiltAngleAvailable]; } - (void)setHeadSupportHorizontalPositionAvailable:(nullable NSNumber<SDLBool> *)headSupportHorizontalPositionAvailable { - [store sdl_setObject:headSupportHorizontalPositionAvailable forName:SDLNameHeadSupportHorizontalPositionAvailable]; + [store sdl_setObject:headSupportHorizontalPositionAvailable forName:SDLRPCParameterNameHeadSupportHorizontalPositionAvailable]; } - (nullable NSNumber<SDLBool> *)headSupportHorizontalPositionAvailable { - return [store sdl_objectForName:SDLNameHeadSupportHorizontalPositionAvailable]; + return [store sdl_objectForName:SDLRPCParameterNameHeadSupportHorizontalPositionAvailable]; } - (void)setHeadSupportVerticalPositionAvailable:(nullable NSNumber<SDLBool> *)headSupportVerticalPositionAvailable { - [store sdl_setObject:headSupportVerticalPositionAvailable forName:SDLNameHeadSupportVerticalPositionAvailable]; + [store sdl_setObject:headSupportVerticalPositionAvailable forName:SDLRPCParameterNameHeadSupportVerticalPositionAvailable]; } - (nullable NSNumber<SDLBool> *)headSupportVerticalPositionAvailable { - return [store sdl_objectForName:SDLNameHeadSupportVerticalPositionAvailable]; + return [store sdl_objectForName:SDLRPCParameterNameHeadSupportVerticalPositionAvailable]; } - (void)setMassageEnabledAvailable:(nullable NSNumber<SDLBool> *)massageEnabledAvailable { - [store sdl_setObject:massageEnabledAvailable forName:SDLNameMassageEnabledAvailable]; + [store sdl_setObject:massageEnabledAvailable forName:SDLRPCParameterNameMassageEnabledAvailable]; } - (nullable NSNumber<SDLBool> *)massageEnabledAvailable { - return [store sdl_objectForName:SDLNameMassageEnabledAvailable]; + return [store sdl_objectForName:SDLRPCParameterNameMassageEnabledAvailable]; } - (void)setMassageModeAvailable:(nullable NSNumber<SDLBool> *)massageModeAvailable { - [store sdl_setObject:massageModeAvailable forName:SDLNameMassageModeAvailable]; + [store sdl_setObject:massageModeAvailable forName:SDLRPCParameterNameMassageModeAvailable]; } - (nullable NSNumber<SDLBool> *)massageModeAvailable { - return [store sdl_objectForName:SDLNameMassageModeAvailable]; + return [store sdl_objectForName:SDLRPCParameterNameMassageModeAvailable]; } - (void)setMassageCushionFirmnessAvailable:(nullable NSNumber<SDLBool> *)massageCushionFirmnessAvailable { - [store sdl_setObject:massageCushionFirmnessAvailable forName:SDLNameMassageCushionFirmnessAvailable]; + [store sdl_setObject:massageCushionFirmnessAvailable forName:SDLRPCParameterNameMassageCushionFirmnessAvailable]; } - (nullable NSNumber<SDLBool> *)massageCushionFirmnessAvailable { - return [store sdl_objectForName:SDLNameMassageCushionFirmnessAvailable]; + return [store sdl_objectForName:SDLRPCParameterNameMassageCushionFirmnessAvailable]; } - (void)setMemoryAvailable:(nullable NSNumber<SDLBool> *)memoryAvailable { - [store sdl_setObject:memoryAvailable forName:SDLNameMemoryAvailable]; + [store sdl_setObject:memoryAvailable forName:SDLRPCParameterNameMemoryAvailable]; } - (nullable NSNumber<SDLBool> *)memoryAvailable { - return [store sdl_objectForName:SDLNameMemoryAvailable]; + return [store sdl_objectForName:SDLRPCParameterNameMemoryAvailable]; } @end diff --git a/SmartDeviceLink/SDLSeatControlData.m b/SmartDeviceLink/SDLSeatControlData.m index df2b43585..1dac193e7 100644 --- a/SmartDeviceLink/SDLSeatControlData.m +++ b/SmartDeviceLink/SDLSeatControlData.m @@ -2,7 +2,7 @@ // #import "SDLSeatControlData.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" #import "NSMutableDictionary+Store.h" #import "SDLMassageModeData.h" @@ -54,132 +54,132 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setId:(SDLSupportedSeat)id { - [store sdl_setObject:id forName:SDLNameId]; + [store sdl_setObject:id forName:SDLRPCParameterNameId]; } - (SDLSupportedSeat)id { - return [store sdl_objectForName:SDLNameId]; + return [store sdl_objectForName:SDLRPCParameterNameId]; } - (void)setHeatingEnabled:(nullable NSNumber<SDLBool> *)heatingEnabled { - [store sdl_setObject:heatingEnabled forName:SDLNameHeatingEnabled]; + [store sdl_setObject:heatingEnabled forName:SDLRPCParameterNameHeatingEnabled]; } - (nullable NSNumber<SDLBool> *)heatingEnabled { - return [store sdl_objectForName:SDLNameHeatingEnabled]; + return [store sdl_objectForName:SDLRPCParameterNameHeatingEnabled]; } - (void)setCoolingEnabled:(nullable NSNumber<SDLBool> *)coolingEnabled { - [store sdl_setObject:coolingEnabled forName:SDLNameCoolingEnabled]; + [store sdl_setObject:coolingEnabled forName:SDLRPCParameterNameCoolingEnabled]; } - (nullable NSNumber<SDLBool> *)coolingEnabled { - return [store sdl_objectForName:SDLNameCoolingEnabled]; + return [store sdl_objectForName:SDLRPCParameterNameCoolingEnabled]; } - (void)setHeatingLevel:(nullable NSNumber<SDLInt> *)heatingLevel { - [store sdl_setObject:heatingLevel forName:SDLNameHeatingLevel]; + [store sdl_setObject:heatingLevel forName:SDLRPCParameterNameHeatingLevel]; } - (nullable NSNumber<SDLInt> *)heatingLevel { - return [store sdl_objectForName:SDLNameHeatingLevel]; + return [store sdl_objectForName:SDLRPCParameterNameHeatingLevel]; } - (void)setCoolingLevel:(nullable NSNumber<SDLInt> *)coolingLevel { - [store sdl_setObject:coolingLevel forName:SDLNameCoolingLevel]; + [store sdl_setObject:coolingLevel forName:SDLRPCParameterNameCoolingLevel]; } - (nullable NSNumber<SDLInt> *)coolingLevel { - return [store sdl_objectForName:SDLNameCoolingLevel]; + return [store sdl_objectForName:SDLRPCParameterNameCoolingLevel]; } - (void)setHorizontalPosition:(nullable NSNumber<SDLInt> *)horizontalPosition { - [store sdl_setObject:horizontalPosition forName:SDLNameHorizontalPosition]; + [store sdl_setObject:horizontalPosition forName:SDLRPCParameterNameHorizontalPosition]; } - (nullable NSNumber<SDLInt> *)horizontalPosition { - return [store sdl_objectForName:SDLNameHorizontalPosition]; + return [store sdl_objectForName:SDLRPCParameterNameHorizontalPosition]; } - (void)setVerticalPosition:(nullable NSNumber<SDLInt> *)verticalPosition { - [store sdl_setObject:verticalPosition forName:SDLNameVerticalPosition]; + [store sdl_setObject:verticalPosition forName:SDLRPCParameterNameVerticalPosition]; } - (nullable NSNumber<SDLInt> *)verticalPosition { - return [store sdl_objectForName:SDLNameVerticalPosition]; + return [store sdl_objectForName:SDLRPCParameterNameVerticalPosition]; } - (void)setFrontVerticalPosition:(nullable NSNumber<SDLInt> *)frontVerticalPosition { - [store sdl_setObject:frontVerticalPosition forName:SDLNameFrontVerticalPosition]; + [store sdl_setObject:frontVerticalPosition forName:SDLRPCParameterNameFrontVerticalPosition]; } - (nullable NSNumber<SDLInt> *)frontVerticalPosition { - return [store sdl_objectForName:SDLNameFrontVerticalPosition]; + return [store sdl_objectForName:SDLRPCParameterNameFrontVerticalPosition]; } - (void)setBackVerticalPosition:(nullable NSNumber<SDLInt> *)backVerticalPosition { - [store sdl_setObject:backVerticalPosition forName:SDLNameBackVerticalPosition]; + [store sdl_setObject:backVerticalPosition forName:SDLRPCParameterNameBackVerticalPosition]; } - (nullable NSNumber<SDLInt> *)backVerticalPosition { - return [store sdl_objectForName:SDLNameBackVerticalPosition]; + return [store sdl_objectForName:SDLRPCParameterNameBackVerticalPosition]; } - (void)setBackTiltAngle:(nullable NSNumber<SDLInt> *)backTiltAngle { - [store sdl_setObject:backTiltAngle forName:SDLNameBackTiltAngle]; + [store sdl_setObject:backTiltAngle forName:SDLRPCParameterNameBackTiltAngle]; } - (nullable NSNumber<SDLInt> *)backTiltAngle { - return [store sdl_objectForName:SDLNameBackTiltAngle]; + return [store sdl_objectForName:SDLRPCParameterNameBackTiltAngle]; } - (void)setHeadSupportHorizontalPosition:(nullable NSNumber<SDLInt> *)headSupportHorizontalPosition { - [store sdl_setObject:headSupportHorizontalPosition forName:SDLNameHeadSupportHorizontalPosition]; + [store sdl_setObject:headSupportHorizontalPosition forName:SDLRPCParameterNameHeadSupportHorizontalPosition]; } - (nullable NSNumber<SDLInt> *)headSupportHorizontalPosition { - return [store sdl_objectForName:SDLNameHeadSupportHorizontalPosition]; + return [store sdl_objectForName:SDLRPCParameterNameHeadSupportHorizontalPosition]; } -(void)setHeadSupportVerticalPosition:(nullable NSNumber<SDLInt> *)headSupportVerticalPosition { - [store sdl_setObject:headSupportVerticalPosition forName:SDLNameHeadSupportVerticalPosition]; + [store sdl_setObject:headSupportVerticalPosition forName:SDLRPCParameterNameHeadSupportVerticalPosition]; } - (nullable NSNumber<SDLInt> *)headSupportVerticalPosition { - return [store sdl_objectForName:SDLNameHeadSupportVerticalPosition]; + return [store sdl_objectForName:SDLRPCParameterNameHeadSupportVerticalPosition]; } - (void)setMassageEnabled:(nullable NSNumber<SDLBool> *)massageEnabled { - [store sdl_setObject:massageEnabled forName:SDLNameMassageEnabled]; + [store sdl_setObject:massageEnabled forName:SDLRPCParameterNameMassageEnabled]; } - (nullable NSNumber<SDLBool> *)massageEnabled { - return [store sdl_objectForName:SDLNameMassageEnabled]; + return [store sdl_objectForName:SDLRPCParameterNameMassageEnabled]; } - (void)setMassageMode:(nullable NSArray<SDLMassageModeData *> *)massageMode { - [store sdl_setObject:massageMode forName:SDLNameMassageMode]; + [store sdl_setObject:massageMode forName:SDLRPCParameterNameMassageMode]; } - (nullable NSArray<SDLMassageModeData *> *)massageMode { - return [store sdl_objectForName:SDLNameMassageMode ]; + return [store sdl_objectForName:SDLRPCParameterNameMassageMode ]; } - (void)setMassageCushionFirmness:(nullable NSArray<SDLMassageCushionFirmness *> *)massageCushionFirmness { - [store sdl_setObject:massageCushionFirmness forName:SDLNameMassageCushionFirmness]; + [store sdl_setObject:massageCushionFirmness forName:SDLRPCParameterNameMassageCushionFirmness]; } - (nullable NSArray<SDLMassageCushionFirmness *> *)massageCushionFirmness { - return [store sdl_objectForName:SDLNameMassageCushionFirmness]; + return [store sdl_objectForName:SDLRPCParameterNameMassageCushionFirmness]; } - (void)setMemory:(nullable SDLSeatMemoryAction *)memory { - [store sdl_setObject:memory forName:SDLNameMemory]; + [store sdl_setObject:memory forName:SDLRPCParameterNameMemory]; } - (nullable SDLSeatMemoryAction *)memory { - return [store sdl_objectForName:SDLNameMemory ofClass:SDLSeatMemoryAction.class]; + return [store sdl_objectForName:SDLRPCParameterNameMemory ofClass:SDLSeatMemoryAction.class]; } @end diff --git a/SmartDeviceLink/SDLSeatMemoryAction.m b/SmartDeviceLink/SDLSeatMemoryAction.m index 76f519238..3f0ed8a1d 100644 --- a/SmartDeviceLink/SDLSeatMemoryAction.m +++ b/SmartDeviceLink/SDLSeatMemoryAction.m @@ -2,7 +2,7 @@ // #import "SDLSeatMemoryAction.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" #import "NSMutableDictionary+Store.h" NS_ASSUME_NONNULL_BEGIN @@ -32,27 +32,27 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setId:(NSNumber<SDLInt> *)id { - [store sdl_setObject:id forName:SDLNameId]; + [store sdl_setObject:id forName:SDLRPCParameterNameId]; } - (NSNumber<SDLInt> *)id { - return [store sdl_objectForName:SDLNameId]; + return [store sdl_objectForName:SDLRPCParameterNameId]; } - (void)setLabel:(nullable NSString *)label { - [store sdl_setObject:label forName:SDLNameLabel]; + [store sdl_setObject:label forName:SDLRPCParameterNameLabel]; } - (nullable NSString *)label { - return [store sdl_objectForName:SDLNameLabel]; + return [store sdl_objectForName:SDLRPCParameterNameLabel]; } - (void)setAction:(SDLSeatMemoryActionType)action { - [store sdl_setObject:action forName:SDLNameAction]; + [store sdl_setObject:action forName:SDLRPCParameterNameAction]; } - (SDLSeatMemoryActionType)action { - return [store sdl_objectForName:SDLNameAction]; + return [store sdl_objectForName:SDLRPCParameterNameAction]; } @end diff --git a/SmartDeviceLink/SDLSendHapticData.m b/SmartDeviceLink/SDLSendHapticData.m index e428e6f51..fc2af7a90 100644 --- a/SmartDeviceLink/SDLSendHapticData.m +++ b/SmartDeviceLink/SDLSendHapticData.m @@ -7,7 +7,8 @@ // #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" #import "SDLSendHapticData.h" #import "SDLHapticRect.h" @@ -16,7 +17,7 @@ NS_ASSUME_NONNULL_BEGIN @implementation SDLSendHapticData - (instancetype)init { - if (self = [super initWithName:SDLNameSendHapticData]) { + if (self = [super initWithName:SDLRPCFunctionNameSendHapticData]) { } return self; } @@ -33,11 +34,11 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setHapticRectData:(nullable NSArray<SDLHapticRect *> *)hapticRectData { - [parameters sdl_setObject:hapticRectData forName:SDLNameHapticRectData]; + [parameters sdl_setObject:hapticRectData forName:SDLRPCParameterNameHapticRectData]; } - (nullable NSArray<SDLHapticRect *> *)hapticRectData { - return [parameters sdl_objectsForName:SDLNameHapticRectData ofClass:SDLHapticRect.class]; + return [parameters sdl_objectsForName:SDLRPCParameterNameHapticRectData ofClass:SDLHapticRect.class]; } @end diff --git a/SmartDeviceLink/SDLSendHapticDataResponse.m b/SmartDeviceLink/SDLSendHapticDataResponse.m index b1fa03607..4c14b47d7 100644 --- a/SmartDeviceLink/SDLSendHapticDataResponse.m +++ b/SmartDeviceLink/SDLSendHapticDataResponse.m @@ -7,7 +7,8 @@ // Copyright © 2017 smartdevicelink. All rights reserved. // -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" #import "SDLSendHapticDataResponse.h" NS_ASSUME_NONNULL_BEGIN @@ -15,7 +16,7 @@ NS_ASSUME_NONNULL_BEGIN @implementation SDLSendHapticDataResponse - (instancetype)init { - if (self = [super initWithName:SDLNameSendHapticDataResponse]) { + if (self = [super initWithName:SDLRPCFunctionNameSendHapticData]) { } return self; } diff --git a/SmartDeviceLink/SDLSendLocation.m b/SmartDeviceLink/SDLSendLocation.m index 115c30a34..2c630e700 100644 --- a/SmartDeviceLink/SDLSendLocation.m +++ b/SmartDeviceLink/SDLSendLocation.m @@ -5,14 +5,15 @@ #import "SDLSendLocation.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLSendLocation - (instancetype)init { - self = [super initWithName:SDLNameSendLocation]; + self = [super initWithName:SDLRPCFunctionNameSendLocation]; if (!self) { return nil; } @@ -45,83 +46,83 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setLongitudeDegrees:(nullable NSNumber<SDLFloat> *)longitudeDegrees { - [parameters sdl_setObject:longitudeDegrees forName:SDLNameLongitudeDegrees]; + [parameters sdl_setObject:longitudeDegrees forName:SDLRPCParameterNameLongitudeDegrees]; } - (nullable NSNumber<SDLFloat> *)longitudeDegrees { - return [parameters sdl_objectForName:SDLNameLongitudeDegrees]; + return [parameters sdl_objectForName:SDLRPCParameterNameLongitudeDegrees]; } - (void)setLatitudeDegrees:(nullable NSNumber<SDLFloat> *)latitudeDegrees { - [parameters sdl_setObject:latitudeDegrees forName:SDLNameLatitudeDegrees]; + [parameters sdl_setObject:latitudeDegrees forName:SDLRPCParameterNameLatitudeDegrees]; } - (nullable NSNumber<SDLFloat> *)latitudeDegrees { - return [parameters sdl_objectForName:SDLNameLatitudeDegrees]; + return [parameters sdl_objectForName:SDLRPCParameterNameLatitudeDegrees]; } - (void)setLocationName:(nullable NSString *)locationName { - [parameters sdl_setObject:locationName forName:SDLNameLocationName]; + [parameters sdl_setObject:locationName forName:SDLRPCParameterNameLocationName]; } - (nullable NSString *)locationName { - return [parameters sdl_objectForName:SDLNameLocationName]; + return [parameters sdl_objectForName:SDLRPCParameterNameLocationName]; } - (void)setAddressLines:(nullable NSArray<NSString *> *)addressLines { - [parameters sdl_setObject:addressLines forName:SDLNameAddressLines]; + [parameters sdl_setObject:addressLines forName:SDLRPCParameterNameAddressLines]; } - (nullable NSString *)locationDescription { - return [parameters sdl_objectForName:SDLNameLocationDescription]; + return [parameters sdl_objectForName:SDLRPCParameterNameLocationDescription]; } - (void)setLocationDescription:(nullable NSString *)locationDescription { - [parameters sdl_setObject:locationDescription forName:SDLNameLocationDescription]; + [parameters sdl_setObject:locationDescription forName:SDLRPCParameterNameLocationDescription]; } - (nullable NSArray<NSString *> *)addressLines { - return [parameters sdl_objectForName:SDLNameAddressLines]; + return [parameters sdl_objectForName:SDLRPCParameterNameAddressLines]; } - (void)setPhoneNumber:(nullable NSString *)phoneNumber { - [parameters sdl_setObject:phoneNumber forName:SDLNamePhoneNumber]; + [parameters sdl_setObject:phoneNumber forName:SDLRPCParameterNamePhoneNumber]; } - (nullable NSString *)phoneNumber { - return [parameters sdl_objectForName:SDLNamePhoneNumber]; + return [parameters sdl_objectForName:SDLRPCParameterNamePhoneNumber]; } - (void)setLocationImage:(nullable SDLImage *)locationImage { - [parameters sdl_setObject:locationImage forName:SDLNameLocationImage]; + [parameters sdl_setObject:locationImage forName:SDLRPCParameterNameLocationImage]; } - (nullable SDLImage *)locationImage { - return [parameters sdl_objectForName:SDLNameLocationImage ofClass:SDLImage.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameLocationImage ofClass:SDLImage.class]; } - (void)setDeliveryMode:(nullable SDLDeliveryMode)deliveryMode { - [parameters sdl_setObject:deliveryMode forName:SDLNameDeliveryMode]; + [parameters sdl_setObject:deliveryMode forName:SDLRPCParameterNameDeliveryMode]; } - (nullable SDLDeliveryMode)deliveryMode { - return [parameters sdl_objectForName:SDLNameDeliveryMode]; + return [parameters sdl_objectForName:SDLRPCParameterNameDeliveryMode]; } - (void)setTimeStamp:(nullable SDLDateTime *)timeStamp { - [parameters sdl_setObject:timeStamp forName:SDLNameLocationTimeStamp]; + [parameters sdl_setObject:timeStamp forName:SDLRPCParameterNameTimeStamp]; } - (nullable SDLDateTime *)timeStamp { - return [parameters sdl_objectForName:SDLNameLocationTimeStamp ofClass:SDLDateTime.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameTimeStamp ofClass:SDLDateTime.class]; } - (void)setAddress:(nullable SDLOasisAddress *)address { - [parameters sdl_setObject:address forName:SDLNameAddress]; + [parameters sdl_setObject:address forName:SDLRPCParameterNameAddress]; } - (nullable SDLOasisAddress *)address { - return [parameters sdl_objectForName:SDLNameAddress ofClass:SDLOasisAddress.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameAddress ofClass:SDLOasisAddress.class]; } @end diff --git a/SmartDeviceLink/SDLSendLocationResponse.m b/SmartDeviceLink/SDLSendLocationResponse.m index 3b03a5a67..c458097f1 100644 --- a/SmartDeviceLink/SDLSendLocationResponse.m +++ b/SmartDeviceLink/SDLSendLocationResponse.m @@ -5,14 +5,15 @@ #import "SDLSendLocationResponse.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLSendLocationResponse - (instancetype)init { - self = [super initWithName:SDLNameSendLocation]; + self = [super initWithName:SDLRPCFunctionNameSendLocation]; if (!self) { return nil; } diff --git a/SmartDeviceLink/SDLSequentialRPCRequestOperation.h b/SmartDeviceLink/SDLSequentialRPCRequestOperation.h index ee2a499a2..1d13dfbb4 100644 --- a/SmartDeviceLink/SDLSequentialRPCRequestOperation.h +++ b/SmartDeviceLink/SDLSequentialRPCRequestOperation.h @@ -15,8 +15,20 @@ NS_ASSUME_NONNULL_BEGIN +/** + * Sends an array RPCs of type `Request` with the first RPC to be sent at index 0. Sending is sequential, meaning that once an RPC is sent to Core, the operation waits until a response is received from Core before the next request is sent. Requests must get a response from Core before the operation is considered finished. + */ @interface SDLSequentialRPCRequestOperation : SDLAsynchronousOperation +/** + * Convenience init for sending an array of requests sequentially. + * + * @param connectionManager The connection manager used to send the RPCs + * @param requests The requests to be sent to Core + * @param progressHandler Called as each request gets a response from Core + * @param completionHandler Called when all requests have a response from Core + * @return A SDLSequentialRPCRequestOperation object + */ - (instancetype)initWithConnectionManager:(id<SDLConnectionManagerType>)connectionManager requests:(NSArray<SDLRPCRequest *> *)requests progressHandler:(nullable SDLMultipleSequentialRequestProgressHandler)progressHandler completionHandler:(nullable SDLMultipleRequestCompletionHandler)completionHandler; @end diff --git a/SmartDeviceLink/SDLSequentialRPCRequestOperation.m b/SmartDeviceLink/SDLSequentialRPCRequestOperation.m index 142812d40..43b025947 100644 --- a/SmartDeviceLink/SDLSequentialRPCRequestOperation.m +++ b/SmartDeviceLink/SDLSequentialRPCRequestOperation.m @@ -81,7 +81,7 @@ NS_ASSUME_NONNULL_BEGIN // Send the next request SDLRPCRequest *request = self.requests[self.currentRequestIndex]; - [self.connectionManager sendConnectionRequest:request withResponseHandler:^(__kindof SDLRPCRequest * _Nullable request, __kindof SDLRPCResponse * _Nullable response, NSError * _Nullable error) { + [self.connectionManager sendConnectionRequest:(__kindof SDLRPCRequest *)request withResponseHandler:^(__kindof SDLRPCRequest * _Nullable request, __kindof SDLRPCResponse * _Nullable response, NSError * _Nullable error) { self.requestsComplete++; // If this request failed and no request has yet failed, set our internal request failed to YES diff --git a/SmartDeviceLink/SDLServiceUpdateReason.h b/SmartDeviceLink/SDLServiceUpdateReason.h new file mode 100644 index 000000000..09a4c9865 --- /dev/null +++ b/SmartDeviceLink/SDLServiceUpdateReason.h @@ -0,0 +1,39 @@ +// +// SDLServiceUpdateReason.h +// SmartDeviceLink +// +// Created by Nicole on 1/25/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import "SDLEnum.h" + +/** + * Enumeration listing possible service update reasons. + */ +typedef SDLEnum SDLServiceUpdateReason SDL_SWIFT_ENUM; + +/** + * The service has just been published with the module and once activated to the primary service of its type, it will be ready for possible consumption. + */ +extern SDLServiceUpdateReason const SDLServiceUpdatePublished; + +/** + * The service has just been unpublished with the module and is no longer accessible. + */ +extern SDLServiceUpdateReason const SDLServiceUpdateRemoved; + +/** + * The service is activated as the primary service of this type. All requests dealing with this service type will be handled by this service. + */ +extern SDLServiceUpdateReason const SDLServiceUpdateActivated; + +/** + * The service has been deactivated as the primary service of its type. + */ +extern SDLServiceUpdateReason const SDLServiceUpdateDeactivated; + +/** + * The service has updated its manifest. This could imply updated capabilities. + */ +extern SDLServiceUpdateReason const SDLServiceUpdateManifestUpdate; diff --git a/SmartDeviceLink/SDLServiceUpdateReason.m b/SmartDeviceLink/SDLServiceUpdateReason.m new file mode 100644 index 000000000..2a2fe9c82 --- /dev/null +++ b/SmartDeviceLink/SDLServiceUpdateReason.m @@ -0,0 +1,15 @@ +// +// SDLServiceUpdateReason.m +// SmartDeviceLink +// +// Created by Nicole on 1/25/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import "SDLServiceUpdateReason.h" + +SDLServiceUpdateReason const SDLServiceUpdatePublished = @"PUBLISHED"; +SDLServiceUpdateReason const SDLServiceUpdateRemoved = @"REMOVED"; +SDLServiceUpdateReason const SDLServiceUpdateActivated = @"ACTIVATED"; +SDLServiceUpdateReason const SDLServiceUpdateDeactivated = @"DEACTIVATED"; +SDLServiceUpdateReason const SDLServiceUpdateManifestUpdate = @"MANIFEST_UPDATE"; diff --git a/SmartDeviceLink/SDLSetAppIcon.m b/SmartDeviceLink/SDLSetAppIcon.m index 8287d18e8..a360f8237 100644 --- a/SmartDeviceLink/SDLSetAppIcon.m +++ b/SmartDeviceLink/SDLSetAppIcon.m @@ -5,12 +5,13 @@ #import "SDLSetAppIcon.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" @implementation SDLSetAppIcon - (instancetype)init { - if (self = [super initWithName:SDLNameSetAppIcon]) { + if (self = [super initWithName:SDLRPCFunctionNameSetAppIcon]) { } return self; } @@ -27,11 +28,11 @@ } - (void)setSyncFileName:(NSString *)syncFileName { - [parameters sdl_setObject:syncFileName forName:SDLNameSyncFileName]; + [parameters sdl_setObject:syncFileName forName:SDLRPCParameterNameSyncFileName]; } - (NSString *)syncFileName { - return [parameters sdl_objectForName:SDLNameSyncFileName]; + return [parameters sdl_objectForName:SDLRPCParameterNameSyncFileName]; } @end diff --git a/SmartDeviceLink/SDLSetAppIconResponse.m b/SmartDeviceLink/SDLSetAppIconResponse.m index 2a0b72793..2540415fd 100644 --- a/SmartDeviceLink/SDLSetAppIconResponse.m +++ b/SmartDeviceLink/SDLSetAppIconResponse.m @@ -5,14 +5,15 @@ #import "SDLSetAppIconResponse.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLSetAppIconResponse - (instancetype)init { - if (self = [super initWithName:SDLNameSetAppIcon]) { + if (self = [super initWithName:SDLRPCFunctionNameSetAppIcon]) { } return self; } diff --git a/SmartDeviceLink/SDLSetDisplayLayout.m b/SmartDeviceLink/SDLSetDisplayLayout.m index ac3736b5b..fc0d6149f 100644 --- a/SmartDeviceLink/SDLSetDisplayLayout.m +++ b/SmartDeviceLink/SDLSetDisplayLayout.m @@ -5,7 +5,8 @@ #import "SDLSetDisplayLayout.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" #import "SDLTemplateColorScheme.h" NS_ASSUME_NONNULL_BEGIN @@ -13,7 +14,7 @@ NS_ASSUME_NONNULL_BEGIN @implementation SDLSetDisplayLayout - (instancetype)init { - if (self = [super initWithName:SDLNameSetDisplayLayout]) { + if (self = [super initWithName:SDLRPCFunctionNameSetDisplayLayout]) { } return self; } @@ -44,27 +45,27 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setDisplayLayout:(NSString *)displayLayout { - [parameters sdl_setObject:displayLayout forName:SDLNameDisplayLayout]; + [parameters sdl_setObject:displayLayout forName:SDLRPCParameterNameDisplayLayout]; } - (NSString *)displayLayout { - return [parameters sdl_objectForName:SDLNameDisplayLayout]; + return [parameters sdl_objectForName:SDLRPCParameterNameDisplayLayout]; } - (void)setDayColorScheme:(nullable SDLTemplateColorScheme *)dayColorScheme { - [parameters sdl_setObject:dayColorScheme forName:SDLNameDayColorScheme]; + [parameters sdl_setObject:dayColorScheme forName:SDLRPCParameterNameDayColorScheme]; } - (nullable SDLTemplateColorScheme *)dayColorScheme { - return [parameters sdl_objectForName:SDLNameDayColorScheme ofClass:[SDLTemplateColorScheme class]]; + return [parameters sdl_objectForName:SDLRPCParameterNameDayColorScheme ofClass:[SDLTemplateColorScheme class]]; } - (void)setNightColorScheme:(nullable SDLTemplateColorScheme *)nightColorScheme { - [parameters sdl_setObject:nightColorScheme forName:SDLNameNightColorScheme]; + [parameters sdl_setObject:nightColorScheme forName:SDLRPCParameterNameNightColorScheme]; } - (nullable SDLTemplateColorScheme *)nightColorScheme { - return [parameters sdl_objectForName:SDLNameNightColorScheme ofClass:[SDLTemplateColorScheme class]]; + return [parameters sdl_objectForName:SDLRPCParameterNameNightColorScheme ofClass:[SDLTemplateColorScheme class]]; } @end diff --git a/SmartDeviceLink/SDLSetDisplayLayoutResponse.m b/SmartDeviceLink/SDLSetDisplayLayoutResponse.m index c37086684..6fe5946de 100644 --- a/SmartDeviceLink/SDLSetDisplayLayoutResponse.m +++ b/SmartDeviceLink/SDLSetDisplayLayoutResponse.m @@ -7,7 +7,8 @@ #import "NSMutableDictionary+Store.h" #import "SDLButtonCapabilities.h" #import "SDLDisplayCapabilities.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" #import "SDLPresetBankCapabilities.h" #import "SDLSoftButtonCapabilities.h" @@ -16,41 +17,41 @@ NS_ASSUME_NONNULL_BEGIN @implementation SDLSetDisplayLayoutResponse - (instancetype)init { - if (self = [super initWithName:SDLNameSetDisplayLayout]) { + if (self = [super initWithName:SDLRPCFunctionNameSetDisplayLayout]) { } return self; } - (void)setDisplayCapabilities:(nullable SDLDisplayCapabilities *)displayCapabilities { - [parameters sdl_setObject:displayCapabilities forName:SDLNameDisplayCapabilities]; + [parameters sdl_setObject:displayCapabilities forName:SDLRPCParameterNameDisplayCapabilities]; } - (nullable SDLDisplayCapabilities *)displayCapabilities { - return [parameters sdl_objectForName:SDLNameDisplayCapabilities ofClass:SDLDisplayCapabilities.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameDisplayCapabilities ofClass:SDLDisplayCapabilities.class]; } - (void)setButtonCapabilities:(nullable NSArray<SDLButtonCapabilities *> *)buttonCapabilities { - [parameters sdl_setObject:buttonCapabilities forName:SDLNameButtonCapabilities]; + [parameters sdl_setObject:buttonCapabilities forName:SDLRPCParameterNameButtonCapabilities]; } - (nullable NSArray<SDLButtonCapabilities *> *)buttonCapabilities { - return [parameters sdl_objectsForName:SDLNameButtonCapabilities ofClass:SDLButtonCapabilities.class]; + return [parameters sdl_objectsForName:SDLRPCParameterNameButtonCapabilities ofClass:SDLButtonCapabilities.class]; } - (void)setSoftButtonCapabilities:(nullable NSArray<SDLSoftButtonCapabilities *> *)softButtonCapabilities { - [parameters sdl_setObject:softButtonCapabilities forName:SDLNameSoftButtonCapabilities]; + [parameters sdl_setObject:softButtonCapabilities forName:SDLRPCParameterNameSoftButtonCapabilities]; } - (nullable NSArray<SDLSoftButtonCapabilities *> *)softButtonCapabilities { - return [parameters sdl_objectsForName:SDLNameSoftButtonCapabilities ofClass:SDLSoftButtonCapabilities.class]; + return [parameters sdl_objectsForName:SDLRPCParameterNameSoftButtonCapabilities ofClass:SDLSoftButtonCapabilities.class]; } - (void)setPresetBankCapabilities:(nullable SDLPresetBankCapabilities *)presetBankCapabilities { - [parameters sdl_setObject:presetBankCapabilities forName:SDLNamePresetBankCapabilities]; + [parameters sdl_setObject:presetBankCapabilities forName:SDLRPCParameterNamePresetBankCapabilities]; } - (nullable SDLPresetBankCapabilities *)presetBankCapabilities { - return [parameters sdl_objectForName:SDLNamePresetBankCapabilities ofClass:SDLPresetBankCapabilities.class]; + return [parameters sdl_objectForName:SDLRPCParameterNamePresetBankCapabilities ofClass:SDLPresetBankCapabilities.class]; } @end diff --git a/SmartDeviceLink/SDLSetGlobalProperties.m b/SmartDeviceLink/SDLSetGlobalProperties.m index d7ae65c2e..89dbfaaee 100644 --- a/SmartDeviceLink/SDLSetGlobalProperties.m +++ b/SmartDeviceLink/SDLSetGlobalProperties.m @@ -7,7 +7,8 @@ #import "NSMutableDictionary+Store.h" #import "SDLImage.h" #import "SDLKeyboardProperties.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" #import "SDLTTSChunk.h" #import "SDLVrHelpItem.h" @@ -16,7 +17,7 @@ NS_ASSUME_NONNULL_BEGIN @implementation SDLSetGlobalProperties - (instancetype)init { - if (self = [super initWithName:SDLNameSetGlobalProperties]) { + if (self = [super initWithName:SDLRPCFunctionNameSetGlobalProperties]) { } return self; } @@ -47,59 +48,59 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setHelpPrompt:(nullable NSArray<SDLTTSChunk *> *)helpPrompt { - [parameters sdl_setObject:helpPrompt forName:SDLNameHelpPrompt]; + [parameters sdl_setObject:helpPrompt forName:SDLRPCParameterNameHelpPrompt]; } - (nullable NSArray<SDLTTSChunk *> *)helpPrompt { - return [parameters sdl_objectsForName:SDLNameHelpPrompt ofClass:SDLTTSChunk.class]; + return [parameters sdl_objectsForName:SDLRPCParameterNameHelpPrompt ofClass:SDLTTSChunk.class]; } - (void)setTimeoutPrompt:(nullable NSArray<SDLTTSChunk *> *)timeoutPrompt { - [parameters sdl_setObject:timeoutPrompt forName:SDLNameTimeoutPrompt]; + [parameters sdl_setObject:timeoutPrompt forName:SDLRPCParameterNameTimeoutPrompt]; } - (nullable NSArray<SDLTTSChunk *> *)timeoutPrompt { - return [parameters sdl_objectsForName:SDLNameTimeoutPrompt ofClass:SDLTTSChunk.class]; + return [parameters sdl_objectsForName:SDLRPCParameterNameTimeoutPrompt ofClass:SDLTTSChunk.class]; } - (void)setVrHelpTitle:(nullable NSString *)vrHelpTitle { - [parameters sdl_setObject:vrHelpTitle forName:SDLNameVRHelpTitle]; + [parameters sdl_setObject:vrHelpTitle forName:SDLRPCParameterNameVRHelpTitle]; } - (nullable NSString *)vrHelpTitle { - return [parameters sdl_objectForName:SDLNameVRHelpTitle]; + return [parameters sdl_objectForName:SDLRPCParameterNameVRHelpTitle]; } - (void)setVrHelp:(nullable NSArray<SDLVRHelpItem *> *)vrHelp { - [parameters sdl_setObject:vrHelp forName:SDLNameVRHelp]; + [parameters sdl_setObject:vrHelp forName:SDLRPCParameterNameVRHelp]; } - (nullable NSArray<SDLVRHelpItem *> *)vrHelp { - return [parameters sdl_objectsForName:SDLNameVRHelp ofClass:SDLVRHelpItem.class]; + return [parameters sdl_objectsForName:SDLRPCParameterNameVRHelp ofClass:SDLVRHelpItem.class]; } - (void)setMenuTitle:(nullable NSString *)menuTitle { - [parameters sdl_setObject:menuTitle forName:SDLNameMenuTitle]; + [parameters sdl_setObject:menuTitle forName:SDLRPCParameterNameMenuTitle]; } - (nullable NSString *)menuTitle { - return [parameters sdl_objectForName:SDLNameMenuTitle]; + return [parameters sdl_objectForName:SDLRPCParameterNameMenuTitle]; } - (void)setMenuIcon:(nullable SDLImage *)menuIcon { - [parameters sdl_setObject:menuIcon forName:SDLNameMenuIcon]; + [parameters sdl_setObject:menuIcon forName:SDLRPCParameterNameMenuIcon]; } - (nullable SDLImage *)menuIcon { - return [parameters sdl_objectForName:SDLNameMenuIcon ofClass:SDLImage.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameMenuIcon ofClass:SDLImage.class]; } - (void)setKeyboardProperties:(nullable SDLKeyboardProperties *)keyboardProperties { - [parameters sdl_setObject:keyboardProperties forName:SDLNameKeyboardProperties]; + [parameters sdl_setObject:keyboardProperties forName:SDLRPCParameterNameKeyboardProperties]; } - (nullable SDLKeyboardProperties *)keyboardProperties { - return [parameters sdl_objectForName:SDLNameKeyboardProperties ofClass:SDLKeyboardProperties.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameKeyboardProperties ofClass:SDLKeyboardProperties.class]; } @end diff --git a/SmartDeviceLink/SDLSetGlobalPropertiesResponse.m b/SmartDeviceLink/SDLSetGlobalPropertiesResponse.m index 9da9719cc..208c336f1 100644 --- a/SmartDeviceLink/SDLSetGlobalPropertiesResponse.m +++ b/SmartDeviceLink/SDLSetGlobalPropertiesResponse.m @@ -5,14 +5,15 @@ #import "SDLSetGlobalPropertiesResponse.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLSetGlobalPropertiesResponse - (instancetype)init { - if (self = [super initWithName:SDLNameSetGlobalProperties]) { + if (self = [super initWithName:SDLRPCFunctionNameSetGlobalProperties]) { } return self; } diff --git a/SmartDeviceLink/SDLSetInteriorVehicleData.m b/SmartDeviceLink/SDLSetInteriorVehicleData.m index cb0836ec8..bbb875c83 100644 --- a/SmartDeviceLink/SDLSetInteriorVehicleData.m +++ b/SmartDeviceLink/SDLSetInteriorVehicleData.m @@ -3,7 +3,8 @@ // #import "SDLSetInteriorVehicleData.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" #import "NSMutableDictionary+Store.h" #import "SDLModuleData.h" @@ -12,7 +13,7 @@ NS_ASSUME_NONNULL_BEGIN @implementation SDLSetInteriorVehicleData - (instancetype)init { - if (self = [super initWithName:SDLNameSetInteriorVehicleData]) { + if (self = [super initWithName:SDLRPCFunctionNameSetInteriorVehicleData]) { } return self; } @@ -29,11 +30,11 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setModuleData:(SDLModuleData *)moduleData { - [parameters sdl_setObject:moduleData forName:SDLNameModuleData]; + [parameters sdl_setObject:moduleData forName:SDLRPCParameterNameModuleData]; } - (SDLModuleData *)moduleData { - return [parameters sdl_objectForName:SDLNameModuleData ofClass:SDLModuleData.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameModuleData ofClass:SDLModuleData.class]; } @end diff --git a/SmartDeviceLink/SDLSetInteriorVehicleDataResponse.m b/SmartDeviceLink/SDLSetInteriorVehicleDataResponse.m index ccb59ff55..dd9b1b4dd 100644 --- a/SmartDeviceLink/SDLSetInteriorVehicleDataResponse.m +++ b/SmartDeviceLink/SDLSetInteriorVehicleDataResponse.m @@ -3,7 +3,8 @@ // #import "SDLSetInteriorVehicleDataResponse.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" #import "SDLModuleData.h" #import "NSMutableDictionary+Store.h" @@ -12,17 +13,17 @@ NS_ASSUME_NONNULL_BEGIN @implementation SDLSetInteriorVehicleDataResponse - (instancetype)init { - if (self = [super initWithName:SDLNameSetInteriorVehicleData]) { + if (self = [super initWithName:SDLRPCFunctionNameSetInteriorVehicleData]) { } return self; } - (void)setModuleData:(SDLModuleData *)moduleData { - [parameters sdl_setObject:moduleData forName:SDLNameModuleData]; + [parameters sdl_setObject:moduleData forName:SDLRPCParameterNameModuleData]; } - (SDLModuleData *)moduleData { - return [parameters sdl_objectForName:SDLNameModuleData ofClass:SDLModuleData.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameModuleData ofClass:SDLModuleData.class]; } @end diff --git a/SmartDeviceLink/SDLSetMediaClockTimer.m b/SmartDeviceLink/SDLSetMediaClockTimer.m index 18de10cdb..2929a2ab5 100644 --- a/SmartDeviceLink/SDLSetMediaClockTimer.m +++ b/SmartDeviceLink/SDLSetMediaClockTimer.m @@ -5,7 +5,8 @@ #import "SDLSetMediaClockTimer.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" #import "SDLStartTime.h" NS_ASSUME_NONNULL_BEGIN @@ -13,7 +14,7 @@ NS_ASSUME_NONNULL_BEGIN @implementation SDLSetMediaClockTimer - (instancetype)init { - if (self = [super initWithName:SDLNameSetMediaClockTimer]) { + if (self = [super initWithName:SDLRPCFunctionNameSetMediaClockTimer]) { } return self; } @@ -109,35 +110,35 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setStartTime:(nullable SDLStartTime *)startTime { - [parameters sdl_setObject:startTime forName:SDLNameStartTime]; + [parameters sdl_setObject:startTime forName:SDLRPCParameterNameStartTime]; } - (nullable SDLStartTime *)startTime { - return [parameters sdl_objectForName:SDLNameStartTime ofClass:SDLStartTime.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameStartTime ofClass:SDLStartTime.class]; } - (void)setEndTime:(nullable SDLStartTime *)endTime { - [parameters sdl_setObject:endTime forName:SDLNameEndTime]; + [parameters sdl_setObject:endTime forName:SDLRPCParameterNameEndTime]; } - (nullable SDLStartTime *)endTime { - return [parameters sdl_objectForName:SDLNameEndTime ofClass:SDLStartTime.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameEndTime ofClass:SDLStartTime.class]; } - (void)setUpdateMode:(SDLUpdateMode)updateMode { - [parameters sdl_setObject:updateMode forName:SDLNameUpdateMode]; + [parameters sdl_setObject:updateMode forName:SDLRPCParameterNameUpdateMode]; } - (SDLUpdateMode)updateMode { - return [parameters sdl_objectForName:SDLNameUpdateMode]; + return [parameters sdl_objectForName:SDLRPCParameterNameUpdateMode]; } - (void)setAudioStreamingIndicator:(nullable SDLAudioStreamingIndicator)audioStreamingIndicator { - [parameters sdl_setObject:audioStreamingIndicator forName:SDLNameAudioStreamingIndicator]; + [parameters sdl_setObject:audioStreamingIndicator forName:SDLRPCParameterNameAudioStreamingIndicator]; } - (nullable SDLAudioStreamingIndicator)audioStreamingIndicator { - return [parameters sdl_objectForName:SDLNameAudioStreamingIndicator]; + return [parameters sdl_objectForName:SDLRPCParameterNameAudioStreamingIndicator]; } @end diff --git a/SmartDeviceLink/SDLSetMediaClockTimerResponse.m b/SmartDeviceLink/SDLSetMediaClockTimerResponse.m index f293e7d79..856a1a49d 100644 --- a/SmartDeviceLink/SDLSetMediaClockTimerResponse.m +++ b/SmartDeviceLink/SDLSetMediaClockTimerResponse.m @@ -5,14 +5,15 @@ #import "SDLSetMediaClockTimerResponse.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLSetMediaClockTimerResponse - (instancetype)init { - if (self = [super initWithName:SDLNameSetMediaClockTimer]) { + if (self = [super initWithName:SDLRPCFunctionNameSetMediaClockTimer]) { } return self; } diff --git a/SmartDeviceLink/SDLShow.m b/SmartDeviceLink/SDLShow.m index 743e4940a..3556c830f 100644 --- a/SmartDeviceLink/SDLShow.m +++ b/SmartDeviceLink/SDLShow.m @@ -8,7 +8,8 @@ #import "SDLImage.h" #import "SDLMetadataTags.h" #import "SDLMetadataType.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" #import "SDLSoftButton.h" NS_ASSUME_NONNULL_BEGIN @@ -16,7 +17,7 @@ NS_ASSUME_NONNULL_BEGIN @implementation SDLShow - (instancetype)init { - if (self = [super initWithName:SDLNameShow]) { + if (self = [super initWithName:SDLRPCFunctionNameShow]) { } return self; } @@ -97,107 +98,107 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setMainField1:(nullable NSString *)mainField1 { - [parameters sdl_setObject:mainField1 forName:SDLNameMainField1]; + [parameters sdl_setObject:mainField1 forName:SDLRPCParameterNameMainField1]; } - (nullable NSString *)mainField1 { - return [parameters sdl_objectForName:SDLNameMainField1]; + return [parameters sdl_objectForName:SDLRPCParameterNameMainField1]; } - (void)setMainField2:(nullable NSString *)mainField2 { - [parameters sdl_setObject:mainField2 forName:SDLNameMainField2]; + [parameters sdl_setObject:mainField2 forName:SDLRPCParameterNameMainField2]; } - (nullable NSString *)mainField2 { - return [parameters sdl_objectForName:SDLNameMainField2]; + return [parameters sdl_objectForName:SDLRPCParameterNameMainField2]; } - (void)setMainField3:(nullable NSString *)mainField3 { - [parameters sdl_setObject:mainField3 forName:SDLNameMainField3]; + [parameters sdl_setObject:mainField3 forName:SDLRPCParameterNameMainField3]; } - (nullable NSString *)mainField3 { - return [parameters sdl_objectForName:SDLNameMainField3]; + return [parameters sdl_objectForName:SDLRPCParameterNameMainField3]; } - (void)setMainField4:(nullable NSString *)mainField4 { - [parameters sdl_setObject:mainField4 forName:SDLNameMainField4]; + [parameters sdl_setObject:mainField4 forName:SDLRPCParameterNameMainField4]; } - (nullable NSString *)mainField4 { - return [parameters sdl_objectForName:SDLNameMainField4]; + return [parameters sdl_objectForName:SDLRPCParameterNameMainField4]; } - (void)setAlignment:(nullable SDLTextAlignment)alignment { - [parameters sdl_setObject:alignment forName:SDLNameAlignment]; + [parameters sdl_setObject:alignment forName:SDLRPCParameterNameAlignment]; } - (nullable SDLTextAlignment)alignment { - return [parameters sdl_objectForName:SDLNameAlignment]; + return [parameters sdl_objectForName:SDLRPCParameterNameAlignment]; } - (void)setStatusBar:(nullable NSString *)statusBar { - [parameters sdl_setObject:statusBar forName:SDLNameStatusBar]; + [parameters sdl_setObject:statusBar forName:SDLRPCParameterNameStatusBar]; } - (nullable NSString *)statusBar { - return [parameters sdl_objectForName:SDLNameStatusBar]; + return [parameters sdl_objectForName:SDLRPCParameterNameStatusBar]; } - (void)setMediaClock:(nullable NSString *)mediaClock { - [parameters sdl_setObject:mediaClock forName:SDLNameMediaClock]; + [parameters sdl_setObject:mediaClock forName:SDLRPCParameterNameMediaClock]; } - (nullable NSString *)mediaClock { - return [parameters sdl_objectForName:SDLNameMediaClock]; + return [parameters sdl_objectForName:SDLRPCParameterNameMediaClock]; } - (void)setMediaTrack:(nullable NSString *)mediaTrack { - [parameters sdl_setObject:mediaTrack forName:SDLNameMediaTrack]; + [parameters sdl_setObject:mediaTrack forName:SDLRPCParameterNameMediaTrack]; } - (nullable NSString *)mediaTrack { - return [parameters sdl_objectForName:SDLNameMediaTrack]; + return [parameters sdl_objectForName:SDLRPCParameterNameMediaTrack]; } - (void)setGraphic:(nullable SDLImage *)graphic { - [parameters sdl_setObject:graphic forName:SDLNameGraphic]; + [parameters sdl_setObject:graphic forName:SDLRPCParameterNameGraphic]; } - (nullable SDLImage *)graphic { - return [parameters sdl_objectForName:SDLNameGraphic ofClass:SDLImage.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameGraphic ofClass:SDLImage.class]; } - (void)setSecondaryGraphic:(nullable SDLImage *)secondaryGraphic { - [parameters sdl_setObject:secondaryGraphic forName:SDLNameSecondaryGraphic]; + [parameters sdl_setObject:secondaryGraphic forName:SDLRPCParameterNameSecondaryGraphic]; } - (nullable SDLImage *)secondaryGraphic { - return [parameters sdl_objectForName:SDLNameSecondaryGraphic ofClass:SDLImage.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameSecondaryGraphic ofClass:SDLImage.class]; } - (void)setSoftButtons:(nullable NSArray<SDLSoftButton *> *)softButtons { - [parameters sdl_setObject:softButtons forName:SDLNameSoftButtons]; + [parameters sdl_setObject:softButtons forName:SDLRPCParameterNameSoftButtons]; } - (nullable NSArray<SDLSoftButton *> *)softButtons { - return [parameters sdl_objectsForName:SDLNameSoftButtons ofClass:SDLSoftButton.class]; + return [parameters sdl_objectsForName:SDLRPCParameterNameSoftButtons ofClass:SDLSoftButton.class]; } - (void)setCustomPresets:(nullable NSArray<NSString *> *)customPresets { - [parameters sdl_setObject:customPresets forName:SDLNameCustomPresets]; + [parameters sdl_setObject:customPresets forName:SDLRPCParameterNameCustomPresets]; } - (nullable NSArray<NSString *> *)customPresets { - return [parameters sdl_objectForName:SDLNameCustomPresets]; + return [parameters sdl_objectForName:SDLRPCParameterNameCustomPresets]; } - (void)setMetadataTags:(nullable SDLMetadataTags *)metadataTags { - [parameters sdl_setObject:metadataTags forName:SDLNameMetadataTags]; + [parameters sdl_setObject:metadataTags forName:SDLRPCParameterNameMetadataTags]; } - (nullable SDLMetadataTags *)metadataTags { - return [parameters sdl_objectForName:SDLNameMetadataTags ofClass:SDLMetadataTags.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameMetadataTags ofClass:SDLMetadataTags.class]; } @end diff --git a/SmartDeviceLink/SDLShowConstantTBT.m b/SmartDeviceLink/SDLShowConstantTBT.m index f4565d923..d61ae78bf 100644 --- a/SmartDeviceLink/SDLShowConstantTBT.m +++ b/SmartDeviceLink/SDLShowConstantTBT.m @@ -6,7 +6,8 @@ #import "NSMutableDictionary+Store.h" #import "SDLImage.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" #import "SDLSoftButton.h" NS_ASSUME_NONNULL_BEGIN @@ -14,7 +15,7 @@ NS_ASSUME_NONNULL_BEGIN @implementation SDLShowConstantTBT - (instancetype)init { - if (self = [super initWithName:SDLNameShowConstantTBT]) { + if (self = [super initWithName:SDLRPCFunctionNameShowConstantTBT]) { } return self; } @@ -41,91 +42,91 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setNavigationText1:(nullable NSString *)navigationText1 { - [parameters sdl_setObject:navigationText1 forName:SDLNameNavigationText1]; + [parameters sdl_setObject:navigationText1 forName:SDLRPCParameterNameNavigationText1]; } - (nullable NSString *)navigationText1 { - return [parameters sdl_objectForName:SDLNameNavigationText1]; + return [parameters sdl_objectForName:SDLRPCParameterNameNavigationText1]; } - (void)setNavigationText2:(nullable NSString *)navigationText2 { - [parameters sdl_setObject:navigationText2 forName:SDLNameNavigationText2]; + [parameters sdl_setObject:navigationText2 forName:SDLRPCParameterNameNavigationText2]; } - (nullable NSString *)navigationText2 { - return [parameters sdl_objectForName:SDLNameNavigationText2]; + return [parameters sdl_objectForName:SDLRPCParameterNameNavigationText2]; } - (void)setEta:(nullable NSString *)eta { - [parameters sdl_setObject:eta forName:SDLNameETA]; + [parameters sdl_setObject:eta forName:SDLRPCParameterNameETA]; } - (nullable NSString *)eta { - return [parameters sdl_objectForName:SDLNameETA]; + return [parameters sdl_objectForName:SDLRPCParameterNameETA]; } - (void)setTimeToDestination:(nullable NSString *)timeToDestination { - [parameters sdl_setObject:timeToDestination forName:SDLNameTimeToDestination]; + [parameters sdl_setObject:timeToDestination forName:SDLRPCParameterNameTimeToDestination]; } - (nullable NSString *)timeToDestination { - return [parameters sdl_objectForName:SDLNameTimeToDestination]; + return [parameters sdl_objectForName:SDLRPCParameterNameTimeToDestination]; } - (void)setTotalDistance:(nullable NSString *)totalDistance { - [parameters sdl_setObject:totalDistance forName:SDLNameTotalDistance]; + [parameters sdl_setObject:totalDistance forName:SDLRPCParameterNameTotalDistance]; } - (nullable NSString *)totalDistance { - return [parameters sdl_objectForName:SDLNameTotalDistance]; + return [parameters sdl_objectForName:SDLRPCParameterNameTotalDistance]; } - (void)setTurnIcon:(nullable SDLImage *)turnIcon { - [parameters sdl_setObject:turnIcon forName:SDLNameTurnIcon]; + [parameters sdl_setObject:turnIcon forName:SDLRPCParameterNameTurnIcon]; } - (nullable SDLImage *)turnIcon { - return [parameters sdl_objectForName:SDLNameTurnIcon ofClass:SDLImage.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameTurnIcon ofClass:SDLImage.class]; } - (void)setNextTurnIcon:(nullable SDLImage *)nextTurnIcon { - [parameters sdl_setObject:nextTurnIcon forName:SDLNameNextTurnIcon]; + [parameters sdl_setObject:nextTurnIcon forName:SDLRPCParameterNameNextTurnIcon]; } - (nullable SDLImage *)nextTurnIcon { - return [parameters sdl_objectForName:SDLNameNextTurnIcon ofClass:SDLImage.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameNextTurnIcon ofClass:SDLImage.class]; } - (void)setDistanceToManeuver:(nullable NSNumber<SDLFloat> *)distanceToManeuver { - [parameters sdl_setObject:distanceToManeuver forName:SDLNameDistanceToManeuver]; + [parameters sdl_setObject:distanceToManeuver forName:SDLRPCParameterNameDistanceToManeuver]; } - (nullable NSNumber<SDLFloat> *)distanceToManeuver { - return [parameters sdl_objectForName:SDLNameDistanceToManeuver]; + return [parameters sdl_objectForName:SDLRPCParameterNameDistanceToManeuver]; } - (void)setDistanceToManeuverScale:(nullable NSNumber<SDLFloat> *)distanceToManeuverScale { - [parameters sdl_setObject:distanceToManeuverScale forName:SDLNameDistanceToManeuverScale]; + [parameters sdl_setObject:distanceToManeuverScale forName:SDLRPCParameterNameDistanceToManeuverScale]; } - (nullable NSNumber<SDLFloat> *)distanceToManeuverScale { - return [parameters sdl_objectForName:SDLNameDistanceToManeuverScale]; + return [parameters sdl_objectForName:SDLRPCParameterNameDistanceToManeuverScale]; } - (void)setManeuverComplete:(nullable NSNumber<SDLBool> *)maneuverComplete { - [parameters sdl_setObject:maneuverComplete forName:SDLNameManeuverComplete]; + [parameters sdl_setObject:maneuverComplete forName:SDLRPCParameterNameManeuverComplete]; } - (nullable NSNumber<SDLBool> *)maneuverComplete { - return [parameters sdl_objectForName:SDLNameManeuverComplete]; + return [parameters sdl_objectForName:SDLRPCParameterNameManeuverComplete]; } - (void)setSoftButtons:(nullable NSArray<SDLSoftButton *> *)softButtons { - [parameters sdl_setObject:softButtons forName:SDLNameSoftButtons]; + [parameters sdl_setObject:softButtons forName:SDLRPCParameterNameSoftButtons]; } - (nullable NSArray<SDLSoftButton *> *)softButtons { - return [parameters sdl_objectsForName:SDLNameSoftButtons ofClass:SDLSoftButton.class]; + return [parameters sdl_objectsForName:SDLRPCParameterNameSoftButtons ofClass:SDLSoftButton.class]; } @end diff --git a/SmartDeviceLink/SDLShowConstantTBTResponse.m b/SmartDeviceLink/SDLShowConstantTBTResponse.m index 40a9c9bd9..be8bc9363 100644 --- a/SmartDeviceLink/SDLShowConstantTBTResponse.m +++ b/SmartDeviceLink/SDLShowConstantTBTResponse.m @@ -5,14 +5,15 @@ #import "SDLShowConstantTBTResponse.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLShowConstantTBTResponse - (instancetype)init { - if (self = [super initWithName:SDLNameShowConstantTBT]) { + if (self = [super initWithName:SDLRPCFunctionNameShowConstantTBT]) { } return self; } diff --git a/SmartDeviceLink/SDLShowResponse.m b/SmartDeviceLink/SDLShowResponse.m index cca46c426..3f8882729 100644 --- a/SmartDeviceLink/SDLShowResponse.m +++ b/SmartDeviceLink/SDLShowResponse.m @@ -5,14 +5,15 @@ #import "SDLShowResponse.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLShowResponse - (instancetype)init { - if (self = [super initWithName:SDLNameShow]) { + if (self = [super initWithName:SDLRPCFunctionNameShow]) { } return self; } diff --git a/SmartDeviceLink/SDLSingleTireStatus.m b/SmartDeviceLink/SDLSingleTireStatus.m index 6f88953af..8ebc51810 100644 --- a/SmartDeviceLink/SDLSingleTireStatus.m +++ b/SmartDeviceLink/SDLSingleTireStatus.m @@ -5,34 +5,34 @@ #import "NSMutableDictionary+Store.h" #import "NSNumber+NumberType.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLSingleTireStatus - (void)setStatus:(SDLComponentVolumeStatus)status { - [store sdl_setObject:status forName:SDLNameStatus]; + [store sdl_setObject:status forName:SDLRPCParameterNameStatus]; } - (SDLComponentVolumeStatus)status { - return [store sdl_objectForName:SDLNameStatus]; + return [store sdl_objectForName:SDLRPCParameterNameStatus]; } - (void)setMonitoringSystemStatus:(nullable SDLTPMS)monitoringSystemStatus { - [store sdl_setObject:monitoringSystemStatus forName:SDLNameTPMS]; + [store sdl_setObject:monitoringSystemStatus forName:SDLRPCParameterNameTPMS]; } - (nullable SDLTPMS)monitoringSystemStatus { - return [store sdl_objectForName:SDLNameTPMS]; + return [store sdl_objectForName:SDLRPCParameterNameTPMS]; } - (void)setPressure:(nullable NSNumber<SDLFloat> *)pressure { - [store sdl_setObject:pressure forName:SDLNamePressure]; + [store sdl_setObject:pressure forName:SDLRPCParameterNamePressure]; } - (nullable NSNumber<SDLFloat> *)pressure { - return [store sdl_objectForName:SDLNamePressure]; + return [store sdl_objectForName:SDLRPCParameterNamePressure]; } @end diff --git a/SmartDeviceLink/SDLSlider.m b/SmartDeviceLink/SDLSlider.m index 800d65741..cd1b95d29 100644 --- a/SmartDeviceLink/SDLSlider.m +++ b/SmartDeviceLink/SDLSlider.m @@ -5,14 +5,15 @@ #import "SDLSlider.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLSlider - (instancetype)init { - if (self = [super initWithName:SDLNameSlider]) { + if (self = [super initWithName:SDLRPCFunctionNameSlider]) { } return self; } @@ -52,43 +53,43 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setNumTicks:(NSNumber<SDLInt> *)numTicks { - [parameters sdl_setObject:numTicks forName:SDLNameNumberTicks]; + [parameters sdl_setObject:numTicks forName:SDLRPCParameterNameNumberTicks]; } - (NSNumber<SDLInt> *)numTicks { - return [parameters sdl_objectForName:SDLNameNumberTicks]; + return [parameters sdl_objectForName:SDLRPCParameterNameNumberTicks]; } - (void)setPosition:(NSNumber<SDLInt> *)position { - [parameters sdl_setObject:position forName:SDLNamePosition]; + [parameters sdl_setObject:position forName:SDLRPCParameterNamePosition]; } - (NSNumber<SDLInt> *)position { - return [parameters sdl_objectForName:SDLNamePosition]; + return [parameters sdl_objectForName:SDLRPCParameterNamePosition]; } - (void)setSliderHeader:(NSString *)sliderHeader { - [parameters sdl_setObject:sliderHeader forName:SDLNameSliderHeader]; + [parameters sdl_setObject:sliderHeader forName:SDLRPCParameterNameSliderHeader]; } - (NSString *)sliderHeader { - return [parameters sdl_objectForName:SDLNameSliderHeader]; + return [parameters sdl_objectForName:SDLRPCParameterNameSliderHeader]; } - (void)setSliderFooter:(nullable NSArray<NSString *> *)sliderFooter { - [parameters sdl_setObject:sliderFooter forName:SDLNameSliderFooter]; + [parameters sdl_setObject:sliderFooter forName:SDLRPCParameterNameSliderFooter]; } - (nullable NSArray<NSString *> *)sliderFooter { - return [parameters sdl_objectForName:SDLNameSliderFooter]; + return [parameters sdl_objectForName:SDLRPCParameterNameSliderFooter]; } - (void)setTimeout:(nullable NSNumber<SDLInt> *)timeout { - [parameters sdl_setObject:timeout forName:SDLNameTimeout]; + [parameters sdl_setObject:timeout forName:SDLRPCParameterNameTimeout]; } - (nullable NSNumber<SDLInt> *)timeout { - return [parameters sdl_objectForName:SDLNameTimeout]; + return [parameters sdl_objectForName:SDLRPCParameterNameTimeout]; } @end diff --git a/SmartDeviceLink/SDLSliderResponse.m b/SmartDeviceLink/SDLSliderResponse.m index a21661b91..d924b0cb5 100644 --- a/SmartDeviceLink/SDLSliderResponse.m +++ b/SmartDeviceLink/SDLSliderResponse.m @@ -5,24 +5,25 @@ #import "SDLSliderResponse.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLSliderResponse - (instancetype)init { - if (self = [super initWithName:SDLNameSlider]) { + if (self = [super initWithName:SDLRPCFunctionNameSlider]) { } return self; } - (void)setSliderPosition:(nullable NSNumber<SDLInt> *)sliderPosition { - [parameters sdl_setObject:sliderPosition forName:SDLNameSliderPosition]; + [parameters sdl_setObject:sliderPosition forName:SDLRPCParameterNameSliderPosition]; } - (nullable NSNumber<SDLInt> *)sliderPosition { - return [parameters sdl_objectForName:SDLNameSliderPosition]; + return [parameters sdl_objectForName:SDLRPCParameterNameSliderPosition]; } @end diff --git a/SmartDeviceLink/SDLSoftButton.m b/SmartDeviceLink/SDLSoftButton.m index a50bb4bcd..82ed612ea 100644 --- a/SmartDeviceLink/SDLSoftButton.m +++ b/SmartDeviceLink/SDLSoftButton.m @@ -5,7 +5,7 @@ #import "NSMutableDictionary+Store.h" #import "SDLImage.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" NS_ASSUME_NONNULL_BEGIN @@ -40,51 +40,51 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setType:(SDLSoftButtonType)type { - [store sdl_setObject:type forName:SDLNameType]; + [store sdl_setObject:type forName:SDLRPCParameterNameType]; } - (SDLSoftButtonType)type { - return [store sdl_objectForName:SDLNameType]; + return [store sdl_objectForName:SDLRPCParameterNameType]; } - (void)setText:(nullable NSString *)text { - [store sdl_setObject:text forName:SDLNameText]; + [store sdl_setObject:text forName:SDLRPCParameterNameText]; } - (nullable NSString *)text { - return [store sdl_objectForName:SDLNameText]; + return [store sdl_objectForName:SDLRPCParameterNameText]; } - (void)setImage:(nullable SDLImage *)image { - [store sdl_setObject:image forName:SDLNameImage]; + [store sdl_setObject:image forName:SDLRPCParameterNameImage]; } - (nullable SDLImage *)image { - return [store sdl_objectForName:SDLNameImage ofClass:SDLImage.class]; + return [store sdl_objectForName:SDLRPCParameterNameImage ofClass:SDLImage.class]; } - (void)setIsHighlighted:(nullable NSNumber<SDLBool> *)isHighlighted { - [store sdl_setObject:isHighlighted forName:SDLNameIsHighlighted]; + [store sdl_setObject:isHighlighted forName:SDLRPCParameterNameIsHighlighted]; } - (nullable NSNumber<SDLBool> *)isHighlighted { - return [store sdl_objectForName:SDLNameIsHighlighted]; + return [store sdl_objectForName:SDLRPCParameterNameIsHighlighted]; } - (void)setSoftButtonID:(NSNumber<SDLInt> *)softButtonID { - [store sdl_setObject:softButtonID forName:SDLNameSoftButtonId]; + [store sdl_setObject:softButtonID forName:SDLRPCParameterNameSoftButtonId]; } - (NSNumber<SDLInt> *)softButtonID { - return [store sdl_objectForName:SDLNameSoftButtonId]; + return [store sdl_objectForName:SDLRPCParameterNameSoftButtonId]; } - (void)setSystemAction:(nullable SDLSystemAction)systemAction { - [store sdl_setObject:systemAction forName:SDLNameSystemAction]; + [store sdl_setObject:systemAction forName:SDLRPCParameterNameSystemAction]; } - (nullable SDLSystemAction)systemAction { - return [store sdl_objectForName:SDLNameSystemAction]; + return [store sdl_objectForName:SDLRPCParameterNameSystemAction]; } -(id)copyWithZone:(nullable NSZone *)zone { diff --git a/SmartDeviceLink/SDLSoftButtonCapabilities.m b/SmartDeviceLink/SDLSoftButtonCapabilities.m index 6bf391496..438fd5b81 100644 --- a/SmartDeviceLink/SDLSoftButtonCapabilities.m +++ b/SmartDeviceLink/SDLSoftButtonCapabilities.m @@ -5,42 +5,42 @@ #import "SDLSoftButtonCapabilities.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLSoftButtonCapabilities - (void)setShortPressAvailable:(NSNumber<SDLBool> *)shortPressAvailable { - [store sdl_setObject:shortPressAvailable forName:SDLNameShortPressAvailable]; + [store sdl_setObject:shortPressAvailable forName:SDLRPCParameterNameShortPressAvailable]; } - (NSNumber<SDLBool> *)shortPressAvailable { - return [store sdl_objectForName:SDLNameShortPressAvailable]; + return [store sdl_objectForName:SDLRPCParameterNameShortPressAvailable]; } - (void)setLongPressAvailable:(NSNumber<SDLBool> *)longPressAvailable { - [store sdl_setObject:longPressAvailable forName:SDLNameLongPressAvailable]; + [store sdl_setObject:longPressAvailable forName:SDLRPCParameterNameLongPressAvailable]; } - (NSNumber<SDLBool> *)longPressAvailable { - return [store sdl_objectForName:SDLNameLongPressAvailable]; + return [store sdl_objectForName:SDLRPCParameterNameLongPressAvailable]; } - (void)setUpDownAvailable:(NSNumber<SDLBool> *)upDownAvailable { - [store sdl_setObject:upDownAvailable forName:SDLNameUpDownAvailable]; + [store sdl_setObject:upDownAvailable forName:SDLRPCParameterNameUpDownAvailable]; } - (NSNumber<SDLBool> *)upDownAvailable { - return [store sdl_objectForName:SDLNameUpDownAvailable]; + return [store sdl_objectForName:SDLRPCParameterNameUpDownAvailable]; } - (void)setImageSupported:(NSNumber<SDLBool> *)imageSupported { - [store sdl_setObject:imageSupported forName:SDLNameImageSupported]; + [store sdl_setObject:imageSupported forName:SDLRPCParameterNameImageSupported]; } - (NSNumber<SDLBool> *)imageSupported { - return [store sdl_objectForName:SDLNameImageSupported]; + return [store sdl_objectForName:SDLRPCParameterNameImageSupported]; } @end diff --git a/SmartDeviceLink/SDLSoftButtonState.m b/SmartDeviceLink/SDLSoftButtonState.m index e7b63b808..e3fb26495 100644 --- a/SmartDeviceLink/SDLSoftButtonState.m +++ b/SmartDeviceLink/SDLSoftButtonState.m @@ -32,6 +32,8 @@ NS_ASSUME_NONNULL_BEGIN @implementation SDLSoftButtonState - (instancetype)initWithStateName:(NSString *)stateName text:(nullable NSString *)text image:(nullable UIImage *)image { + NSParameterAssert((text != nil) || (image != nil)); + SDLArtwork *artwork = [[SDLArtwork alloc] initWithImage:image persistent:YES asImageFormat:SDLArtworkImageFormatPNG]; return [self initWithStateName:stateName text:text artwork:artwork]; } @@ -40,10 +42,7 @@ NS_ASSUME_NONNULL_BEGIN self = [super init]; if (!self) { return nil; } - if (artwork == nil && text == nil) { - SDLLogE(@"Attempted to create an invalid soft button state: text and artwork are both nil"); - return nil; - } + NSParameterAssert((text != nil) || (artwork != nil)); _name = stateName; _text = text; diff --git a/SmartDeviceLink/SDLSpeak.m b/SmartDeviceLink/SDLSpeak.m index 35516ff43..fb0a063a0 100644 --- a/SmartDeviceLink/SDLSpeak.m +++ b/SmartDeviceLink/SDLSpeak.m @@ -5,7 +5,8 @@ #import "SDLSpeak.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" #import "SDLTTSChunk.h" NS_ASSUME_NONNULL_BEGIN @@ -13,7 +14,7 @@ NS_ASSUME_NONNULL_BEGIN @implementation SDLSpeak - (instancetype)init { - if (self = [super initWithName:SDLNameSpeak]) { + if (self = [super initWithName:SDLRPCFunctionNameSpeak]) { } return self; } @@ -35,11 +36,11 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setTtsChunks:(NSArray<SDLTTSChunk *> *)ttsChunks { - [parameters sdl_setObject:ttsChunks forName:SDLNameTTSChunks]; + [parameters sdl_setObject:ttsChunks forName:SDLRPCParameterNameTTSChunks]; } - (NSArray<SDLTTSChunk *> *)ttsChunks { - return [parameters sdl_objectsForName:SDLNameTTSChunks ofClass:SDLTTSChunk.class]; + return [parameters sdl_objectsForName:SDLRPCParameterNameTTSChunks ofClass:SDLTTSChunk.class]; } @end diff --git a/SmartDeviceLink/SDLSpeakResponse.m b/SmartDeviceLink/SDLSpeakResponse.m index f8e8a248c..95b157682 100644 --- a/SmartDeviceLink/SDLSpeakResponse.m +++ b/SmartDeviceLink/SDLSpeakResponse.m @@ -5,14 +5,15 @@ #import "SDLSpeakResponse.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLSpeakResponse - (instancetype)init { - if (self = [super initWithName:SDLNameSpeak]) { + if (self = [super initWithName:SDLRPCFunctionNameSpeak]) { } return self; } diff --git a/SmartDeviceLink/SDLStartTime.m b/SmartDeviceLink/SDLStartTime.m index 232eed499..3394487ee 100644 --- a/SmartDeviceLink/SDLStartTime.m +++ b/SmartDeviceLink/SDLStartTime.m @@ -5,7 +5,7 @@ #import "SDLStartTime.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" NS_ASSUME_NONNULL_BEGIN @@ -38,27 +38,27 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setHours:(NSNumber<SDLInt> *)hours { - [store sdl_setObject:hours forName:SDLNameHours]; + [store sdl_setObject:hours forName:SDLRPCParameterNameHours]; } - (NSNumber<SDLInt> *)hours { - return [store sdl_objectForName:SDLNameHours]; + return [store sdl_objectForName:SDLRPCParameterNameHours]; } - (void)setMinutes:(NSNumber<SDLInt> *)minutes { - [store sdl_setObject:minutes forName:SDLNameMinutes]; + [store sdl_setObject:minutes forName:SDLRPCParameterNameMinutes]; } - (NSNumber<SDLInt> *)minutes { - return [store sdl_objectForName:SDLNameMinutes]; + return [store sdl_objectForName:SDLRPCParameterNameMinutes]; } - (void)setSeconds:(NSNumber<SDLInt> *)seconds { - [store sdl_setObject:seconds forName:SDLNameSeconds]; + [store sdl_setObject:seconds forName:SDLRPCParameterNameSeconds]; } - (NSNumber<SDLInt> *)seconds { - return [store sdl_objectForName:SDLNameSeconds]; + return [store sdl_objectForName:SDLRPCParameterNameSeconds]; } @end diff --git a/SmartDeviceLink/SDLStationIDNumber.m b/SmartDeviceLink/SDLStationIDNumber.m index db1e6f095..b2d3f8a02 100644 --- a/SmartDeviceLink/SDLStationIDNumber.m +++ b/SmartDeviceLink/SDLStationIDNumber.m @@ -2,7 +2,7 @@ // #import "SDLStationIDNumber.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" #import "NSMutableDictionary+Store.h" NS_ASSUME_NONNULL_BEGIN @@ -22,20 +22,20 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setCountryCode:(nullable NSNumber<SDLInt> *)countryCode { - [store sdl_setObject:countryCode forName:SDLNameCountryCode]; + [store sdl_setObject:countryCode forName:SDLRPCParameterNameCountryCode]; } - (nullable NSNumber<SDLInt> *)countryCode { - return [store sdl_objectForName:SDLNameCountryCode]; + return [store sdl_objectForName:SDLRPCParameterNameCountryCode]; } - (void)setFccFacilityId:(nullable NSNumber<SDLInt> *)fccFacilityId { - [store sdl_setObject:fccFacilityId forName:SDLNameFCCFacilityId]; + [store sdl_setObject:fccFacilityId forName:SDLRPCParameterNameFCCFacilityId]; } - (nullable NSNumber<SDLInt> *)fccFacilityId { - return [store sdl_objectForName:SDLNameFCCFacilityId]; + return [store sdl_objectForName:SDLRPCParameterNameFCCFacilityId]; } @end diff --git a/SmartDeviceLink/SDLSubscribeButton.m b/SmartDeviceLink/SDLSubscribeButton.m index 1a94caa37..da4bd5c54 100644 --- a/SmartDeviceLink/SDLSubscribeButton.m +++ b/SmartDeviceLink/SDLSubscribeButton.m @@ -5,14 +5,15 @@ #import "SDLSubscribeButton.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLSubscribeButton - (instancetype)init { - if (self = [super initWithName:SDLNameSubscribeButton]) { + if (self = [super initWithName:SDLRPCFunctionNameSubscribeButton]) { } return self; } @@ -41,11 +42,11 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setButtonName:(SDLButtonName)buttonName { - [parameters sdl_setObject:buttonName forName:SDLNameButtonName]; + [parameters sdl_setObject:buttonName forName:SDLRPCParameterNameButtonName]; } - (SDLButtonName)buttonName { - return [parameters sdl_objectForName:SDLNameButtonName]; + return [parameters sdl_objectForName:SDLRPCParameterNameButtonName]; } -(id)copyWithZone:(nullable NSZone *)zone { diff --git a/SmartDeviceLink/SDLSubscribeButtonResponse.m b/SmartDeviceLink/SDLSubscribeButtonResponse.m index bf2b860f6..f8d0a4310 100644 --- a/SmartDeviceLink/SDLSubscribeButtonResponse.m +++ b/SmartDeviceLink/SDLSubscribeButtonResponse.m @@ -5,14 +5,15 @@ #import "SDLSubscribeButtonResponse.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLSubscribeButtonResponse - (instancetype)init { - if (self = [super initWithName:SDLNameSubscribeButton]) { + if (self = [super initWithName:SDLRPCFunctionNameSubscribeButton]) { } return self; } diff --git a/SmartDeviceLink/SDLSubscribeVehicleData.m b/SmartDeviceLink/SDLSubscribeVehicleData.m index ee2e3b0e7..6b6debfe9 100644 --- a/SmartDeviceLink/SDLSubscribeVehicleData.m +++ b/SmartDeviceLink/SDLSubscribeVehicleData.m @@ -5,14 +5,15 @@ #import "SDLSubscribeVehicleData.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLSubscribeVehicleData - (instancetype)init { - if (self = [super initWithName:SDLNameSubscribeVehicleData]) { + if (self = [super initWithName:SDLRPCFunctionNameSubscribeVehicleData]) { } return self; } @@ -65,227 +66,227 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setGps:(nullable NSNumber<SDLBool> *)gps { - [parameters sdl_setObject:gps forName:SDLNameGPS]; + [parameters sdl_setObject:gps forName:SDLRPCParameterNameGPS]; } - (nullable NSNumber<SDLBool> *)gps { - return [parameters sdl_objectForName:SDLNameGPS]; + return [parameters sdl_objectForName:SDLRPCParameterNameGPS]; } - (void)setSpeed:(nullable NSNumber<SDLBool> *)speed { - [parameters sdl_setObject:speed forName:SDLNameSpeed]; + [parameters sdl_setObject:speed forName:SDLRPCParameterNameSpeed]; } - (nullable NSNumber<SDLBool> *)speed { - return [parameters sdl_objectForName:SDLNameSpeed]; + return [parameters sdl_objectForName:SDLRPCParameterNameSpeed]; } - (void)setRpm:(nullable NSNumber<SDLBool> *)rpm { - [parameters sdl_setObject:rpm forName:SDLNameRPM]; + [parameters sdl_setObject:rpm forName:SDLRPCParameterNameRPM]; } - (nullable NSNumber<SDLBool> *)rpm { - return [parameters sdl_objectForName:SDLNameRPM]; + return [parameters sdl_objectForName:SDLRPCParameterNameRPM]; } - (void)setFuelLevel:(nullable NSNumber<SDLBool> *)fuelLevel { - [parameters sdl_setObject:fuelLevel forName:SDLNameFuelLevel]; + [parameters sdl_setObject:fuelLevel forName:SDLRPCParameterNameFuelLevel]; } - (nullable NSNumber<SDLBool> *)fuelLevel { - return [parameters sdl_objectForName:SDLNameFuelLevel]; + return [parameters sdl_objectForName:SDLRPCParameterNameFuelLevel]; } - (void)setFuelLevel_State:(nullable NSNumber<SDLBool> *)fuelLevel_State { - [parameters sdl_setObject:fuelLevel_State forName:SDLNameFuelLevelState]; + [parameters sdl_setObject:fuelLevel_State forName:SDLRPCParameterNameFuelLevelState]; } - (nullable NSNumber<SDLBool> *)fuelLevel_State { - return [parameters sdl_objectForName:SDLNameFuelLevelState]; + return [parameters sdl_objectForName:SDLRPCParameterNameFuelLevelState]; } - (void)setFuelRange:(nullable NSNumber<SDLBool> *)fuelRange { - [parameters sdl_setObject:fuelRange forName:SDLNameFuelRange]; + [parameters sdl_setObject:fuelRange forName:SDLRPCParameterNameFuelRange]; } - (nullable NSNumber<SDLBool> *)fuelRange { - return [parameters sdl_objectForName:SDLNameFuelRange]; + return [parameters sdl_objectForName:SDLRPCParameterNameFuelRange]; } - (void)setInstantFuelConsumption:(nullable NSNumber<SDLBool> *)instantFuelConsumption { - [parameters sdl_setObject:instantFuelConsumption forName:SDLNameInstantFuelConsumption]; + [parameters sdl_setObject:instantFuelConsumption forName:SDLRPCParameterNameInstantFuelConsumption]; } - (nullable NSNumber<SDLBool> *)instantFuelConsumption { - return [parameters sdl_objectForName:SDLNameInstantFuelConsumption]; + return [parameters sdl_objectForName:SDLRPCParameterNameInstantFuelConsumption]; } - (void)setExternalTemperature:(nullable NSNumber<SDLBool> *)externalTemperature { - [parameters sdl_setObject:externalTemperature forName:SDLNameExternalTemperature]; + [parameters sdl_setObject:externalTemperature forName:SDLRPCParameterNameExternalTemperature]; } - (nullable NSNumber<SDLBool> *)externalTemperature { - return [parameters sdl_objectForName:SDLNameExternalTemperature]; + return [parameters sdl_objectForName:SDLRPCParameterNameExternalTemperature]; } - (void)setPrndl:(nullable NSNumber<SDLBool> *)prndl { - [parameters sdl_setObject:prndl forName:SDLNamePRNDL]; + [parameters sdl_setObject:prndl forName:SDLRPCParameterNamePRNDL]; } - (nullable NSNumber<SDLBool> *)prndl { - return [parameters sdl_objectForName:SDLNamePRNDL]; + return [parameters sdl_objectForName:SDLRPCParameterNamePRNDL]; } - (void)setTirePressure:(nullable NSNumber<SDLBool> *)tirePressure { - [parameters sdl_setObject:tirePressure forName:SDLNameTirePressure]; + [parameters sdl_setObject:tirePressure forName:SDLRPCParameterNameTirePressure]; } - (nullable NSNumber<SDLBool> *)tirePressure { - return [parameters sdl_objectForName:SDLNameTirePressure]; + return [parameters sdl_objectForName:SDLRPCParameterNameTirePressure]; } - (void)setOdometer:(nullable NSNumber<SDLBool> *)odometer { - [parameters sdl_setObject:odometer forName:SDLNameOdometer]; + [parameters sdl_setObject:odometer forName:SDLRPCParameterNameOdometer]; } - (nullable NSNumber<SDLBool> *)odometer { - return [parameters sdl_objectForName:SDLNameOdometer]; + return [parameters sdl_objectForName:SDLRPCParameterNameOdometer]; } - (void)setBeltStatus:(nullable NSNumber<SDLBool> *)beltStatus { - [parameters sdl_setObject:beltStatus forName:SDLNameBeltStatus]; + [parameters sdl_setObject:beltStatus forName:SDLRPCParameterNameBeltStatus]; } - (nullable NSNumber<SDLBool> *)beltStatus { - return [parameters sdl_objectForName:SDLNameBeltStatus]; + return [parameters sdl_objectForName:SDLRPCParameterNameBeltStatus]; } - (void)setBodyInformation:(nullable NSNumber<SDLBool> *)bodyInformation { - [parameters sdl_setObject:bodyInformation forName:SDLNameBodyInformation]; + [parameters sdl_setObject:bodyInformation forName:SDLRPCParameterNameBodyInformation]; } - (nullable NSNumber<SDLBool> *)bodyInformation { - return [parameters sdl_objectForName:SDLNameBodyInformation]; + return [parameters sdl_objectForName:SDLRPCParameterNameBodyInformation]; } - (void)setDeviceStatus:(nullable NSNumber<SDLBool> *)deviceStatus { - [parameters sdl_setObject:deviceStatus forName:SDLNameDeviceStatus]; + [parameters sdl_setObject:deviceStatus forName:SDLRPCParameterNameDeviceStatus]; } - (nullable NSNumber<SDLBool> *)deviceStatus { - return [parameters sdl_objectForName:SDLNameDeviceStatus]; + return [parameters sdl_objectForName:SDLRPCParameterNameDeviceStatus]; } - (void)setDriverBraking:(nullable NSNumber<SDLBool> *)driverBraking { - [parameters sdl_setObject:driverBraking forName:SDLNameDriverBraking]; + [parameters sdl_setObject:driverBraking forName:SDLRPCParameterNameDriverBraking]; } - (nullable NSNumber<SDLBool> *)driverBraking { - return [parameters sdl_objectForName:SDLNameDriverBraking]; + return [parameters sdl_objectForName:SDLRPCParameterNameDriverBraking]; } - (void)setWiperStatus:(nullable NSNumber<SDLBool> *)wiperStatus { - [parameters sdl_setObject:wiperStatus forName:SDLNameWiperStatus]; + [parameters sdl_setObject:wiperStatus forName:SDLRPCParameterNameWiperStatus]; } - (nullable NSNumber<SDLBool> *)wiperStatus { - return [parameters sdl_objectForName:SDLNameWiperStatus]; + return [parameters sdl_objectForName:SDLRPCParameterNameWiperStatus]; } - (void)setHeadLampStatus:(nullable NSNumber<SDLBool> *)headLampStatus { - [parameters sdl_setObject:headLampStatus forName:SDLNameHeadLampStatus]; + [parameters sdl_setObject:headLampStatus forName:SDLRPCParameterNameHeadLampStatus]; } - (nullable NSNumber<SDLBool> *)headLampStatus { - return [parameters sdl_objectForName:SDLNameHeadLampStatus]; + return [parameters sdl_objectForName:SDLRPCParameterNameHeadLampStatus]; } - (void)setEngineOilLife:(nullable NSNumber<SDLBool> *)engineOilLife { - [parameters sdl_setObject:engineOilLife forName:SDLNameEngineOilLife]; + [parameters sdl_setObject:engineOilLife forName:SDLRPCParameterNameEngineOilLife]; } - (nullable NSNumber<SDLBool> *)engineOilLife { - return [parameters sdl_objectForName:SDLNameEngineOilLife]; + return [parameters sdl_objectForName:SDLRPCParameterNameEngineOilLife]; } - (void)setEngineTorque:(nullable NSNumber<SDLBool> *)engineTorque { - [parameters sdl_setObject:engineTorque forName:SDLNameEngineTorque]; + [parameters sdl_setObject:engineTorque forName:SDLRPCParameterNameEngineTorque]; } - (nullable NSNumber<SDLBool> *)engineTorque { - return [parameters sdl_objectForName:SDLNameEngineTorque]; + return [parameters sdl_objectForName:SDLRPCParameterNameEngineTorque]; } - (void)setAccPedalPosition:(nullable NSNumber<SDLBool> *)accPedalPosition { - [parameters sdl_setObject:accPedalPosition forName:SDLNameAccelerationPedalPosition]; + [parameters sdl_setObject:accPedalPosition forName:SDLRPCParameterNameAccelerationPedalPosition]; } - (nullable NSNumber<SDLBool> *)accPedalPosition { - return [parameters sdl_objectForName:SDLNameAccelerationPedalPosition]; + return [parameters sdl_objectForName:SDLRPCParameterNameAccelerationPedalPosition]; } - (void)setSteeringWheelAngle:(nullable NSNumber<SDLBool> *)steeringWheelAngle { - [parameters sdl_setObject:steeringWheelAngle forName:SDLNameSteeringWheelAngle]; + [parameters sdl_setObject:steeringWheelAngle forName:SDLRPCParameterNameSteeringWheelAngle]; } - (nullable NSNumber<SDLBool> *)steeringWheelAngle { - return [parameters sdl_objectForName:SDLNameSteeringWheelAngle]; + return [parameters sdl_objectForName:SDLRPCParameterNameSteeringWheelAngle]; } - (void)setECallInfo:(nullable NSNumber<SDLBool> *)eCallInfo { - [parameters sdl_setObject:eCallInfo forName:SDLNameECallInfo]; + [parameters sdl_setObject:eCallInfo forName:SDLRPCParameterNameECallInfo]; } - (nullable NSNumber<SDLBool> *)eCallInfo { - return [parameters sdl_objectForName:SDLNameECallInfo]; + return [parameters sdl_objectForName:SDLRPCParameterNameECallInfo]; } - (void)setAirbagStatus:(nullable NSNumber<SDLBool> *)airbagStatus { - [parameters sdl_setObject:airbagStatus forName:SDLNameAirbagStatus]; + [parameters sdl_setObject:airbagStatus forName:SDLRPCParameterNameAirbagStatus]; } - (nullable NSNumber<SDLBool> *)airbagStatus { - return [parameters sdl_objectForName:SDLNameAirbagStatus]; + return [parameters sdl_objectForName:SDLRPCParameterNameAirbagStatus]; } - (void)setEmergencyEvent:(nullable NSNumber<SDLBool> *)emergencyEvent { - [parameters sdl_setObject:emergencyEvent forName:SDLNameEmergencyEvent]; + [parameters sdl_setObject:emergencyEvent forName:SDLRPCParameterNameEmergencyEvent]; } - (nullable NSNumber<SDLBool> *)emergencyEvent { - return [parameters sdl_objectForName:SDLNameEmergencyEvent]; + return [parameters sdl_objectForName:SDLRPCParameterNameEmergencyEvent]; } - (void)setClusterModeStatus:(nullable NSNumber<SDLBool> *)clusterModeStatus { - [parameters sdl_setObject:clusterModeStatus forName:SDLNameClusterModeStatus]; + [parameters sdl_setObject:clusterModeStatus forName:SDLRPCParameterNameClusterModeStatus]; } - (nullable NSNumber<SDLBool> *)clusterModeStatus { - return [parameters sdl_objectForName:SDLNameClusterModeStatus]; + return [parameters sdl_objectForName:SDLRPCParameterNameClusterModeStatus]; } - (void)setMyKey:(nullable NSNumber<SDLBool> *)myKey { - [parameters sdl_setObject:myKey forName:SDLNameMyKey]; + [parameters sdl_setObject:myKey forName:SDLRPCParameterNameMyKey]; } - (nullable NSNumber<SDLBool> *)myKey { - return [parameters sdl_objectForName:SDLNameMyKey]; + return [parameters sdl_objectForName:SDLRPCParameterNameMyKey]; } - (void)setElectronicParkBrakeStatus:(nullable NSNumber<SDLBool> *)electronicParkBrakeStatus { - [parameters sdl_setObject:electronicParkBrakeStatus forName:SDLNameElectronicParkBrakeStatus]; + [parameters sdl_setObject:electronicParkBrakeStatus forName:SDLRPCParameterNameElectronicParkBrakeStatus]; } - (nullable NSNumber<SDLBool> *)electronicParkBrakeStatus { - return [parameters sdl_objectForName:SDLNameElectronicParkBrakeStatus]; + return [parameters sdl_objectForName:SDLRPCParameterNameElectronicParkBrakeStatus]; } - (void)setTurnSignal:(nullable NSNumber<SDLBool> *)turnSignal { - [parameters sdl_setObject:turnSignal forName:SDLNameTurnSignal]; + [parameters sdl_setObject:turnSignal forName:SDLRPCParameterNameTurnSignal]; } - (nullable NSNumber<SDLBool> *)turnSignal { - return [parameters sdl_objectForName:SDLNameTurnSignal]; + return [parameters sdl_objectForName:SDLRPCParameterNameTurnSignal]; } - (void)setCloudAppVehicleID:(nullable NSNumber<SDLBool> *)cloudAppVehicleID { diff --git a/SmartDeviceLink/SDLSubscribeVehicleDataResponse.m b/SmartDeviceLink/SDLSubscribeVehicleDataResponse.m index 6d2c995a4..3e15a3821 100644 --- a/SmartDeviceLink/SDLSubscribeVehicleDataResponse.m +++ b/SmartDeviceLink/SDLSubscribeVehicleDataResponse.m @@ -5,7 +5,8 @@ #import "SDLSubscribeVehicleDataResponse.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" #import "SDLVehicleDataResult.h" NS_ASSUME_NONNULL_BEGIN @@ -13,233 +14,233 @@ NS_ASSUME_NONNULL_BEGIN @implementation SDLSubscribeVehicleDataResponse - (instancetype)init { - if (self = [super initWithName:SDLNameSubscribeVehicleData]) { + if (self = [super initWithName:SDLRPCFunctionNameSubscribeVehicleData]) { } return self; } - (void)setGps:(nullable SDLVehicleDataResult *)gps { - [parameters sdl_setObject:gps forName:SDLNameGPS]; + [parameters sdl_setObject:gps forName:SDLRPCParameterNameGPS]; } - (nullable SDLVehicleDataResult *)gps { - return [parameters sdl_objectForName:SDLNameGPS ofClass:SDLVehicleDataResult.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameGPS ofClass:SDLVehicleDataResult.class]; } - (void)setSpeed:(nullable SDLVehicleDataResult *)speed { - [parameters sdl_setObject:speed forName:SDLNameSpeed]; + [parameters sdl_setObject:speed forName:SDLRPCParameterNameSpeed]; } - (nullable SDLVehicleDataResult *)speed { - return [parameters sdl_objectForName:SDLNameSpeed ofClass:SDLVehicleDataResult.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameSpeed ofClass:SDLVehicleDataResult.class]; } - (void)setRpm:(nullable SDLVehicleDataResult *)rpm { - [parameters sdl_setObject:rpm forName:SDLNameRPM]; + [parameters sdl_setObject:rpm forName:SDLRPCParameterNameRPM]; } - (nullable SDLVehicleDataResult *)rpm { - return [parameters sdl_objectForName:SDLNameRPM ofClass:SDLVehicleDataResult.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameRPM ofClass:SDLVehicleDataResult.class]; } - (void)setFuelLevel:(nullable SDLVehicleDataResult *)fuelLevel { - [parameters sdl_setObject:fuelLevel forName:SDLNameFuelLevel]; + [parameters sdl_setObject:fuelLevel forName:SDLRPCParameterNameFuelLevel]; } - (nullable SDLVehicleDataResult *)fuelLevel { - return [parameters sdl_objectForName:SDLNameFuelLevel ofClass:SDLVehicleDataResult.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameFuelLevel ofClass:SDLVehicleDataResult.class]; } - (void)setFuelLevel_State:(nullable SDLVehicleDataResult *)fuelLevel_State { - [parameters sdl_setObject:fuelLevel_State forName:SDLNameFuelLevelState]; + [parameters sdl_setObject:fuelLevel_State forName:SDLRPCParameterNameFuelLevelState]; } - (nullable SDLVehicleDataResult *)fuelLevel_State { - return [parameters sdl_objectForName:SDLNameFuelLevelState ofClass:SDLVehicleDataResult.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameFuelLevelState ofClass:SDLVehicleDataResult.class]; } - (void)setFuelRange:(nullable SDLVehicleDataResult *)fuelRange { - [parameters sdl_setObject:fuelRange forName:SDLNameFuelRange]; + [parameters sdl_setObject:fuelRange forName:SDLRPCParameterNameFuelRange]; } - (nullable SDLVehicleDataResult *)fuelRange { - return [parameters sdl_objectForName:SDLNameFuelRange ofClass:SDLVehicleDataResult.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameFuelRange ofClass:SDLVehicleDataResult.class]; } - (void)setInstantFuelConsumption:(nullable SDLVehicleDataResult *)instantFuelConsumption { - [parameters sdl_setObject:instantFuelConsumption forName:SDLNameInstantFuelConsumption]; + [parameters sdl_setObject:instantFuelConsumption forName:SDLRPCParameterNameInstantFuelConsumption]; } - (nullable SDLVehicleDataResult *)instantFuelConsumption { - return [parameters sdl_objectForName:SDLNameInstantFuelConsumption ofClass:SDLVehicleDataResult.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameInstantFuelConsumption ofClass:SDLVehicleDataResult.class]; } - (void)setExternalTemperature:(nullable SDLVehicleDataResult *)externalTemperature { - [parameters sdl_setObject:externalTemperature forName:SDLNameExternalTemperature]; + [parameters sdl_setObject:externalTemperature forName:SDLRPCParameterNameExternalTemperature]; } - (nullable SDLVehicleDataResult *)externalTemperature { - return [parameters sdl_objectForName:SDLNameExternalTemperature ofClass:SDLVehicleDataResult.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameExternalTemperature ofClass:SDLVehicleDataResult.class]; } - (void)setPrndl:(nullable SDLVehicleDataResult *)prndl { - [parameters sdl_setObject:prndl forName:SDLNamePRNDL]; + [parameters sdl_setObject:prndl forName:SDLRPCParameterNamePRNDL]; } - (nullable SDLVehicleDataResult *)prndl { - return [parameters sdl_objectForName:SDLNamePRNDL ofClass:SDLVehicleDataResult.class]; + return [parameters sdl_objectForName:SDLRPCParameterNamePRNDL ofClass:SDLVehicleDataResult.class]; } - (void)setTirePressure:(nullable SDLVehicleDataResult *)tirePressure { - [parameters sdl_setObject:tirePressure forName:SDLNameTirePressure]; + [parameters sdl_setObject:tirePressure forName:SDLRPCParameterNameTirePressure]; } - (nullable SDLVehicleDataResult *)tirePressure { - return [parameters sdl_objectForName:SDLNameTirePressure ofClass:SDLVehicleDataResult.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameTirePressure ofClass:SDLVehicleDataResult.class]; } - (void)setOdometer:(nullable SDLVehicleDataResult *)odometer { - [parameters sdl_setObject:odometer forName:SDLNameOdometer]; + [parameters sdl_setObject:odometer forName:SDLRPCParameterNameOdometer]; } - (nullable SDLVehicleDataResult *)odometer { - return [parameters sdl_objectForName:SDLNameOdometer ofClass:SDLVehicleDataResult.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameOdometer ofClass:SDLVehicleDataResult.class]; } - (void)setBeltStatus:(nullable SDLVehicleDataResult *)beltStatus { - [parameters sdl_setObject:beltStatus forName:SDLNameBeltStatus]; + [parameters sdl_setObject:beltStatus forName:SDLRPCParameterNameBeltStatus]; } - (nullable SDLVehicleDataResult *)beltStatus { - return [parameters sdl_objectForName:SDLNameBeltStatus ofClass:SDLVehicleDataResult.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameBeltStatus ofClass:SDLVehicleDataResult.class]; } - (void)setBodyInformation:(nullable SDLVehicleDataResult *)bodyInformation { - [parameters sdl_setObject:bodyInformation forName:SDLNameBodyInformation]; + [parameters sdl_setObject:bodyInformation forName:SDLRPCParameterNameBodyInformation]; } - (nullable SDLVehicleDataResult *)bodyInformation { - return [parameters sdl_objectForName:SDLNameBodyInformation ofClass:SDLVehicleDataResult.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameBodyInformation ofClass:SDLVehicleDataResult.class]; } - (void)setDeviceStatus:(nullable SDLVehicleDataResult *)deviceStatus { - [parameters sdl_setObject:deviceStatus forName:SDLNameDeviceStatus]; + [parameters sdl_setObject:deviceStatus forName:SDLRPCParameterNameDeviceStatus]; } - (nullable SDLVehicleDataResult *)deviceStatus { - return [parameters sdl_objectForName:SDLNameDeviceStatus ofClass:SDLVehicleDataResult.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameDeviceStatus ofClass:SDLVehicleDataResult.class]; } - (void)setDriverBraking:(nullable SDLVehicleDataResult *)driverBraking { - [parameters sdl_setObject:driverBraking forName:SDLNameDriverBraking]; + [parameters sdl_setObject:driverBraking forName:SDLRPCParameterNameDriverBraking]; } - (nullable SDLVehicleDataResult *)driverBraking { - return [parameters sdl_objectForName:SDLNameDriverBraking ofClass:SDLVehicleDataResult.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameDriverBraking ofClass:SDLVehicleDataResult.class]; } - (void)setWiperStatus:(nullable SDLVehicleDataResult *)wiperStatus { - [parameters sdl_setObject:wiperStatus forName:SDLNameWiperStatus]; + [parameters sdl_setObject:wiperStatus forName:SDLRPCParameterNameWiperStatus]; } - (nullable SDLVehicleDataResult *)wiperStatus { - return [parameters sdl_objectForName:SDLNameWiperStatus ofClass:SDLVehicleDataResult.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameWiperStatus ofClass:SDLVehicleDataResult.class]; } - (void)setHeadLampStatus:(nullable SDLVehicleDataResult *)headLampStatus { - [parameters sdl_setObject:headLampStatus forName:SDLNameHeadLampStatus]; + [parameters sdl_setObject:headLampStatus forName:SDLRPCParameterNameHeadLampStatus]; } - (nullable SDLVehicleDataResult *)headLampStatus { - return [parameters sdl_objectForName:SDLNameHeadLampStatus ofClass:SDLVehicleDataResult.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameHeadLampStatus ofClass:SDLVehicleDataResult.class]; } - (void)setEngineOilLife:(nullable NSNumber<SDLBool> *)engineOilLife { - [parameters sdl_setObject:engineOilLife forName:SDLNameEngineOilLife]; + [parameters sdl_setObject:engineOilLife forName:SDLRPCParameterNameEngineOilLife]; } - (nullable NSNumber<SDLBool> *)engineOilLife { - return [parameters sdl_objectForName:SDLNameEngineOilLife]; + return [parameters sdl_objectForName:SDLRPCParameterNameEngineOilLife]; } - (void)setEngineTorque:(nullable SDLVehicleDataResult *)engineTorque { - [parameters sdl_setObject:engineTorque forName:SDLNameEngineTorque]; + [parameters sdl_setObject:engineTorque forName:SDLRPCParameterNameEngineTorque]; } - (nullable SDLVehicleDataResult *)engineTorque { - return [parameters sdl_objectForName:SDLNameEngineTorque ofClass:SDLVehicleDataResult.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameEngineTorque ofClass:SDLVehicleDataResult.class]; } - (void)setAccPedalPosition:(nullable SDLVehicleDataResult *)accPedalPosition { - [parameters sdl_setObject:accPedalPosition forName:SDLNameAccelerationPedalPosition]; + [parameters sdl_setObject:accPedalPosition forName:SDLRPCParameterNameAccelerationPedalPosition]; } - (nullable SDLVehicleDataResult *)accPedalPosition { - return [parameters sdl_objectForName:SDLNameAccelerationPedalPosition ofClass:SDLVehicleDataResult.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameAccelerationPedalPosition ofClass:SDLVehicleDataResult.class]; } - (void)setSteeringWheelAngle:(nullable SDLVehicleDataResult *)steeringWheelAngle { - [parameters sdl_setObject:steeringWheelAngle forName:SDLNameSteeringWheelAngle]; + [parameters sdl_setObject:steeringWheelAngle forName:SDLRPCParameterNameSteeringWheelAngle]; } - (nullable SDLVehicleDataResult *)steeringWheelAngle { - return [parameters sdl_objectForName:SDLNameSteeringWheelAngle ofClass:SDLVehicleDataResult.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameSteeringWheelAngle ofClass:SDLVehicleDataResult.class]; } - (void)setECallInfo:(nullable SDLVehicleDataResult *)eCallInfo { - [parameters sdl_setObject:eCallInfo forName:SDLNameECallInfo]; + [parameters sdl_setObject:eCallInfo forName:SDLRPCParameterNameECallInfo]; } - (nullable SDLVehicleDataResult *)eCallInfo { - return [parameters sdl_objectForName:SDLNameECallInfo ofClass:SDLVehicleDataResult.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameECallInfo ofClass:SDLVehicleDataResult.class]; } - (void)setAirbagStatus:(nullable SDLVehicleDataResult *)airbagStatus { - [parameters sdl_setObject:airbagStatus forName:SDLNameAirbagStatus]; + [parameters sdl_setObject:airbagStatus forName:SDLRPCParameterNameAirbagStatus]; } - (nullable SDLVehicleDataResult *)airbagStatus { - return [parameters sdl_objectForName:SDLNameAirbagStatus ofClass:SDLVehicleDataResult.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameAirbagStatus ofClass:SDLVehicleDataResult.class]; } - (void)setEmergencyEvent:(nullable SDLVehicleDataResult *)emergencyEvent { - [parameters sdl_setObject:emergencyEvent forName:SDLNameEmergencyEvent]; + [parameters sdl_setObject:emergencyEvent forName:SDLRPCParameterNameEmergencyEvent]; } - (nullable SDLVehicleDataResult *)emergencyEvent { - return [parameters sdl_objectForName:SDLNameEmergencyEvent ofClass:SDLVehicleDataResult.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameEmergencyEvent ofClass:SDLVehicleDataResult.class]; } - (void)setClusterModes:(nullable SDLVehicleDataResult *)clusterModes { - [parameters sdl_setObject:clusterModes forName:SDLNameClusterModes]; + [parameters sdl_setObject:clusterModes forName:SDLRPCParameterNameClusterModes]; } - (nullable SDLVehicleDataResult *)clusterModes { - return [parameters sdl_objectForName:SDLNameClusterModes ofClass:SDLVehicleDataResult.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameClusterModes ofClass:SDLVehicleDataResult.class]; } - (void)setMyKey:(nullable SDLVehicleDataResult *)myKey { - [parameters sdl_setObject:myKey forName:SDLNameMyKey]; + [parameters sdl_setObject:myKey forName:SDLRPCParameterNameMyKey]; } - (nullable SDLVehicleDataResult *)myKey { - return [parameters sdl_objectForName:SDLNameMyKey ofClass:SDLVehicleDataResult.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameMyKey ofClass:SDLVehicleDataResult.class]; } - (void)setElectronicParkBrakeStatus:(nullable SDLVehicleDataResult *)electronicParkBrakeStatus { - [parameters sdl_setObject:electronicParkBrakeStatus forName:SDLNameElectronicParkBrakeStatus]; + [parameters sdl_setObject:electronicParkBrakeStatus forName:SDLRPCParameterNameElectronicParkBrakeStatus]; } - (nullable SDLVehicleDataResult *)electronicParkBrakeStatus { - return [parameters sdl_objectForName:SDLNameElectronicParkBrakeStatus ofClass:[SDLVehicleDataResult class]]; + return [parameters sdl_objectForName:SDLRPCParameterNameElectronicParkBrakeStatus ofClass:[SDLVehicleDataResult class]]; } - (void)setTurnSignal:(nullable SDLVehicleDataResult *)turnSignal { - [parameters sdl_setObject:turnSignal forName:SDLNameTurnSignal]; + [parameters sdl_setObject:turnSignal forName:SDLRPCParameterNameTurnSignal]; } - (nullable SDLVehicleDataResult *)turnSignal { - return [parameters sdl_objectForName:SDLNameTurnSignal ofClass:[SDLVehicleDataResult class]]; + return [parameters sdl_objectForName:SDLRPCParameterNameTurnSignal ofClass:[SDLVehicleDataResult class]]; } - (void)setCloudAppVehicleID:(nullable SDLVehicleDataResult *)cloudAppVehicleID { diff --git a/SmartDeviceLink/SDLSubscribeWayPoints.m b/SmartDeviceLink/SDLSubscribeWayPoints.m index cec91c636..206af8d8c 100644 --- a/SmartDeviceLink/SDLSubscribeWayPoints.m +++ b/SmartDeviceLink/SDLSubscribeWayPoints.m @@ -4,14 +4,15 @@ #import "SDLSubscribeWayPoints.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLSubscribeWayPoints - (instancetype)init { - if (self = [super initWithName:SDLNameSubscribeWayPoints]) { + if (self = [super initWithName:SDLRPCFunctionNameSubscribeWayPoints]) { } return self; } diff --git a/SmartDeviceLink/SDLSubscribeWayPointsResponse.m b/SmartDeviceLink/SDLSubscribeWayPointsResponse.m index 11aa5a04b..7de1b3403 100644 --- a/SmartDeviceLink/SDLSubscribeWayPointsResponse.m +++ b/SmartDeviceLink/SDLSubscribeWayPointsResponse.m @@ -5,14 +5,15 @@ #import "SDLSubscribeWayPointsResponse.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLSubscribeWayPointsResponse - (instancetype)init { - if (self = [super initWithName:SDLNameSubscribeWayPoints]) { + if (self = [super initWithName:SDLRPCFunctionNameSubscribeWayPoints]) { } return self; } diff --git a/SmartDeviceLink/SDLSyncMsgVersion.m b/SmartDeviceLink/SDLSyncMsgVersion.m index 7d256ce14..8c3565037 100644 --- a/SmartDeviceLink/SDLSyncMsgVersion.m +++ b/SmartDeviceLink/SDLSyncMsgVersion.m @@ -5,7 +5,7 @@ #import "SDLSyncMsgVersion.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" NS_ASSUME_NONNULL_BEGIN @@ -25,27 +25,27 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setMajorVersion:(NSNumber<SDLInt> *)majorVersion { - [store sdl_setObject:majorVersion forName:SDLNameMajorVersion]; + [store sdl_setObject:majorVersion forName:SDLRPCParameterNameMajorVersion]; } - (NSNumber<SDLInt> *)majorVersion { - return [store sdl_objectForName:SDLNameMajorVersion]; + return [store sdl_objectForName:SDLRPCParameterNameMajorVersion]; } - (void)setMinorVersion:(NSNumber<SDLInt> *)minorVersion { - [store sdl_setObject:minorVersion forName:SDLNameMinorVersion]; + [store sdl_setObject:minorVersion forName:SDLRPCParameterNameMinorVersion]; } - (NSNumber<SDLInt> *)minorVersion { - return [store sdl_objectForName:SDLNameMinorVersion]; + return [store sdl_objectForName:SDLRPCParameterNameMinorVersion]; } - (void)setPatchVersion:(nullable NSNumber<SDLInt> *)patchVersion { - [store sdl_setObject:patchVersion forName:SDLNamePatchVersion]; + [store sdl_setObject:patchVersion forName:SDLRPCParameterNamePatchVersion]; } - (nullable NSNumber<SDLInt> *)patchVersion { - return [store sdl_objectForName:SDLNamePatchVersion]; + return [store sdl_objectForName:SDLRPCParameterNamePatchVersion]; } - (NSString *)description { diff --git a/SmartDeviceLink/SDLSyncPData.m b/SmartDeviceLink/SDLSyncPData.m index 0dceaf65d..1163bc126 100644 --- a/SmartDeviceLink/SDLSyncPData.m +++ b/SmartDeviceLink/SDLSyncPData.m @@ -5,14 +5,15 @@ #import "SDLSyncPData.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLSyncPData - (instancetype)init { - if (self = [super initWithName:SDLNameSyncPData]) { + if (self = [super initWithName:SDLRPCFunctionNameSyncPData]) { } return self; } diff --git a/SmartDeviceLink/SDLSyncPDataResponse.m b/SmartDeviceLink/SDLSyncPDataResponse.m index 2cb1c1164..082b1a1a4 100644 --- a/SmartDeviceLink/SDLSyncPDataResponse.m +++ b/SmartDeviceLink/SDLSyncPDataResponse.m @@ -5,14 +5,15 @@ #import "SDLSyncPDataResponse.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLSyncPDataResponse - (instancetype)init { - if (self = [super initWithName:SDLNameSyncPData]) { + if (self = [super initWithName:SDLRPCFunctionNameSyncPData]) { } return self; } diff --git a/SmartDeviceLink/SDLSystemCapability.h b/SmartDeviceLink/SDLSystemCapability.h index 87ffe9529..503f50f3e 100755 --- a/SmartDeviceLink/SDLSystemCapability.h +++ b/SmartDeviceLink/SDLSystemCapability.h @@ -6,11 +6,10 @@ // Copyright © 2017 smartdevicelink. All rights reserved. // -#import <Foundation/Foundation.h> - #import "SDLRPCStruct.h" #import "SDLSystemCapabilityType.h" +@class SDLAppServicesCapabilities; @class SDLPhoneCapability; @class SDLNavigationCapability; @class SDLVideoStreamingCapability; @@ -19,42 +18,89 @@ NS_ASSUME_NONNULL_BEGIN /** - The systemCapabilityType indicates which type of data should be changed and identifies which data object exists in this struct. For example, if the SystemCapability Type is NAVIGATION then a "navigationCapability" should exist. - - First implemented in SDL Core v4.4 + * The systemCapabilityType indicates which type of data should be changed and identifies which data object exists in this struct. For example, if the SystemCapability Type is NAVIGATION then a "navigationCapability" should exist. + * + * First implemented in SDL Core v4.4 */ @interface SDLSystemCapability : SDLRPCStruct +/** + * Convenience init for an App Service Capability + * + * @param capability Describes the capabilities of app services including what service types are supported and the current state of services + * @return A SDLSystemCapability object + */ +- (instancetype)initWithAppServicesCapabilities:(SDLAppServicesCapabilities *)capability; + +/** + * Convenience init for a Navigation Capability + * + * @param capability Describes the extended capabilities of the onboard navigation system + * @return A SDLSystemCapability object + */ - (instancetype)initWithNavigationCapability:(SDLNavigationCapability *)capability; +/** + * Convenience init for a Phone Capability + * + * @param capability Describes the extended capabilities of the module's phone feature + * @return A SDLSystemCapability object + */ - (instancetype)initWithPhoneCapability:(SDLPhoneCapability *)capability; +/** + * Convenience init for a Video Streaming Capability + * + * @param capability Describes the capabilities of the module's video streaming feature + * @return A SDLSystemCapability object + */ - (instancetype)initWithVideoStreamingCapability:(SDLVideoStreamingCapability *)capability; +/** + * Convenience init for a Remote Control Capability + * + * @param capability Describes the extended capabilities of the module's remote control feature + * @return A SDLSystemCapability object + */ - (instancetype)initWithRemoteControlCapability:(SDLRemoteControlCapabilities *)capability; /** - Used as a descriptor of what data to expect in this struct. The corresponding param to this enum should be included and the only other parameter included. + * Used as a descriptor of what data to expect in this struct. The corresponding param to this enum should be included and the only other parameter included. */ @property (strong, nonatomic) SDLSystemCapabilityType systemCapabilityType; /** - Describes extended capabilities for onboard navigation system + * Describes the capabilities of app services including what service types are supported and the current state of services. + * + * Optional + */ +@property (nullable, strong, nonatomic) SDLAppServicesCapabilities *appServicesCapabilities; + +/** + * Describes the extended capabilities of the onboard navigation system + * + * Optional */ @property (nullable, strong, nonatomic) SDLNavigationCapability *navigationCapability; /** - Describes extended capabilities of the module's phone feature + * Describes the extended capabilities of the module's phone feature + * + * Optional */ @property (nullable, strong, nonatomic) SDLPhoneCapability *phoneCapability; /** - Describes extended capabilities of the module's phone feature + * Describes the capabilities of the module's video streaming feature + * + * Optional */ @property (nullable, strong, nonatomic) SDLVideoStreamingCapability *videoStreamingCapability; /** - Describes extended capabilities of the module's phone feature + * Describes the extended capabilities of the module's remote control feature + * + * Optional */ @property (nullable, strong, nonatomic) SDLRemoteControlCapabilities *remoteControlCapability; diff --git a/SmartDeviceLink/SDLSystemCapability.m b/SmartDeviceLink/SDLSystemCapability.m index 5a469683d..36ff7eadd 100755 --- a/SmartDeviceLink/SDLSystemCapability.m +++ b/SmartDeviceLink/SDLSystemCapability.m @@ -9,7 +9,8 @@ #import "SDLSystemCapability.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLAppServicesCapabilities.h" +#import "SDLRPCParameterNames.h" #import "SDLNavigationCapability.h" #import "SDLPhoneCapability.h" #import "SDLSystemCapabilityType.h" @@ -20,6 +21,18 @@ NS_ASSUME_NONNULL_BEGIN @implementation SDLSystemCapability +- (instancetype)initWithAppServicesCapabilities:(SDLAppServicesCapabilities *)capability { + self = [self init]; + if (!self) { + return nil; + } + + self.systemCapabilityType = SDLSystemCapabilityTypeAppServices; + self.appServicesCapabilities = capability; + + return self; +} + - (instancetype)initWithPhoneCapability:(SDLPhoneCapability *)capability { self = [self init]; if (!self) { @@ -69,45 +82,51 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setSystemCapabilityType:(SDLSystemCapabilityType)type { - [store sdl_setObject:type forName:SDLNameSystemCapabilityType]; + [store sdl_setObject:type forName:SDLRPCParameterNameSystemCapabilityType]; } - (SDLSystemCapabilityType)systemCapabilityType { - return [store sdl_objectForName:SDLNameSystemCapabilityType]; + return [store sdl_objectForName:SDLRPCParameterNameSystemCapabilityType]; } -// TODO: Nav / Phone Capability +- (void)setAppServicesCapabilities:(nullable SDLAppServicesCapabilities *)appServicesCapabilities { + [store sdl_setObject:appServicesCapabilities forName:SDLRPCParameterNameAppServicesCapabilities]; +} + +- (nullable SDLAppServicesCapabilities *)appServicesCapabilities { + return [store sdl_objectForName:SDLRPCParameterNameAppServicesCapabilities ofClass:SDLAppServicesCapabilities.class]; +} - (void)setNavigationCapability:(nullable SDLNavigationCapability *)navigationCapability { - [store sdl_setObject:navigationCapability forName:SDLNameNavigationCapability]; + [store sdl_setObject:navigationCapability forName:SDLRPCParameterNameNavigationCapability]; } - (nullable SDLNavigationCapability *)navigationCapability { - return [store sdl_objectForName:SDLNameNavigationCapability ofClass:SDLNavigationCapability.class]; + return [store sdl_objectForName:SDLRPCParameterNameNavigationCapability ofClass:SDLNavigationCapability.class]; } - (void)setPhoneCapability:(nullable SDLPhoneCapability *)phoneCapability { - [store sdl_setObject:phoneCapability forName:SDLNamePhoneCapability]; + [store sdl_setObject:phoneCapability forName:SDLRPCParameterNamePhoneCapability]; } - (nullable SDLPhoneCapability *)phoneCapability { - return [store sdl_objectForName:SDLNamePhoneCapability ofClass:SDLPhoneCapability.class]; + return [store sdl_objectForName:SDLRPCParameterNamePhoneCapability ofClass:SDLPhoneCapability.class]; } - (void)setVideoStreamingCapability:(nullable SDLVideoStreamingCapability *)videoStreamingCapability { - [store sdl_setObject:videoStreamingCapability forName:SDLNameVideoStreamingCapability]; + [store sdl_setObject:videoStreamingCapability forName:SDLRPCParameterNameVideoStreamingCapability]; } - (nullable SDLVideoStreamingCapability *)videoStreamingCapability { - return [store sdl_objectForName:SDLNameVideoStreamingCapability ofClass:SDLVideoStreamingCapability.class]; + return [store sdl_objectForName:SDLRPCParameterNameVideoStreamingCapability ofClass:SDLVideoStreamingCapability.class]; } - (void)setRemoteControlCapability:(nullable SDLRemoteControlCapabilities *)remoteControlCapability { - [store sdl_setObject:remoteControlCapability forName:SDLNameRemoteControlCapability]; + [store sdl_setObject:remoteControlCapability forName:SDLRPCParameterNameRemoteControlCapability]; } - (nullable SDLRemoteControlCapabilities *)remoteControlCapability { - return [store sdl_objectForName:SDLNameRemoteControlCapability ofClass:SDLRemoteControlCapabilities.class]; + return [store sdl_objectForName:SDLRPCParameterNameRemoteControlCapability ofClass:SDLRemoteControlCapabilities.class]; } @end diff --git a/SmartDeviceLink/SDLSystemCapabilityManager.h b/SmartDeviceLink/SDLSystemCapabilityManager.h index 36f58a735..11e31a1c2 100644 --- a/SmartDeviceLink/SDLSystemCapabilityManager.h +++ b/SmartDeviceLink/SDLSystemCapabilityManager.h @@ -14,6 +14,7 @@ #import "SDLSystemCapabilityType.h" #import "SDLVrCapabilities.h" +@class SDLAppServicesCapabilities; @class SDLAudioPassThruCapabilities; @class SDLButtonCapabilities; @class SDLDisplayCapabilities; @@ -124,6 +125,15 @@ typedef void (^SDLUpdateCapabilityHandler)(NSError * _Nullable error, SDLSystemC @property (nullable, strong, nonatomic, readonly) SDLAudioPassThruCapabilities *pcmStreamCapability; /** + * If returned, the platform supports app services + * + * @see SDLAppServicesCapabilities + * + * Optional + */ +@property (nullable, strong, nonatomic, readonly) SDLAppServicesCapabilities *appServicesCapabilities; + +/** * If returned, the platform supports navigation * * @see SDLNavigationCapability @@ -181,7 +191,7 @@ typedef void (^SDLUpdateCapabilityHandler)(NSError * _Nullable error, SDLSystemC - (void)stop; /** - * Retrieves a capability type from the remote system. This function must be called in order to retrieve the values of `navigationCapability`, `phoneCapability`, `videoStreamingCapability` and `remoteControlCapability`. If you do not call this method first, those values will be nil. After calling this method, assuming there is no error in the handler, you may retrieve the capability you requested from the manager within the handler. + * Retrieves a capability type from the remote system. This function must be called in order to retrieve the values for `navigationCapability`, `phoneCapability`, `videoStreamingCapability`, `remoteControlCapability`, and `appServicesCapabilities`. If you do not call this method first, those values will be nil. After calling this method, assuming there is no error in the handler, you may retrieve the capability you requested from the manager within the handler. * * @param type The type of capability to retrieve * @param handler The handler to be called when the retrieval is complete diff --git a/SmartDeviceLink/SDLSystemCapabilityManager.m b/SmartDeviceLink/SDLSystemCapabilityManager.m index cd9db463a..108b008b9 100644 --- a/SmartDeviceLink/SDLSystemCapabilityManager.m +++ b/SmartDeviceLink/SDLSystemCapabilityManager.m @@ -8,6 +8,7 @@ #import "SDLSystemCapabilityManager.h" +#import "SDLAppServicesCapabilities.h" #import "SDLConnectionManagerType.h" #import "SDLGenericResponse.h" #import "SDLGetSystemCapability.h" @@ -38,6 +39,7 @@ NS_ASSUME_NONNULL_BEGIN @property (nonatomic, assign, readwrite) BOOL vrCapability; @property (nullable, copy, nonatomic, readwrite) NSArray<SDLAudioPassThruCapabilities *> *audioPassThruCapabilities; @property (nullable, strong, nonatomic, readwrite) SDLAudioPassThruCapabilities *pcmStreamCapability; +@property (nullable, strong, nonatomic, readwrite) SDLAppServicesCapabilities *appServicesCapabilities; @property (nullable, strong, nonatomic, readwrite) SDLNavigationCapability *navigationCapability; @property (nullable, strong, nonatomic, readwrite) SDLPhoneCapability *phoneCapability; @property (nullable, strong, nonatomic, readwrite) SDLVideoStreamingCapability *videoStreamingCapability; @@ -131,6 +133,8 @@ NS_ASSUME_NONNULL_BEGIN self.remoteControlCapability = systemCapabilityResponse.remoteControlCapability; } else if ([systemCapabilityType isEqualToEnum:SDLSystemCapabilityTypeVideoStreaming]) { self.videoStreamingCapability = systemCapabilityResponse.videoStreamingCapability; + } else if ([systemCapabilityType isEqualToEnum:SDLSystemCapabilityTypeAppServices]) { + self.appServicesCapabilities = systemCapabilityResponse.appServicesCapabilities; } else { SDLLogW(@"Received response for unknown System Capability Type: %@", systemCapabilityType); } diff --git a/SmartDeviceLink/SDLSystemCapabilityType.h b/SmartDeviceLink/SDLSystemCapabilityType.h index f42d1b2bc..2625217dc 100755 --- a/SmartDeviceLink/SDLSystemCapabilityType.h +++ b/SmartDeviceLink/SDLSystemCapabilityType.h @@ -14,6 +14,11 @@ typedef SDLEnum SDLSystemCapabilityType SDL_SWIFT_ENUM; /** + The app services capability + */ +extern SDLSystemCapabilityType const SDLSystemCapabilityTypeAppServices; + +/** The navigation capability */ extern SDLSystemCapabilityType const SDLSystemCapabilityTypeNavigation; diff --git a/SmartDeviceLink/SDLSystemCapabilityType.m b/SmartDeviceLink/SDLSystemCapabilityType.m index c8a25e755..933a74418 100755 --- a/SmartDeviceLink/SDLSystemCapabilityType.m +++ b/SmartDeviceLink/SDLSystemCapabilityType.m @@ -8,7 +8,7 @@ #import "SDLSystemCapabilityType.h" - +SDLSystemCapabilityType const SDLSystemCapabilityTypeAppServices = @"APP_SERVICES"; SDLSystemCapabilityType const SDLSystemCapabilityTypeNavigation = @"NAVIGATION"; SDLSystemCapabilityType const SDLSystemCapabilityTypePhoneCall = @"PHONE_CALL"; SDLSystemCapabilityType const SDLSystemCapabilityTypeVideoStreaming = @"VIDEO_STREAMING"; diff --git a/SmartDeviceLink/SDLSystemRequest.m b/SmartDeviceLink/SDLSystemRequest.m index d481779cf..200999a3f 100644 --- a/SmartDeviceLink/SDLSystemRequest.m +++ b/SmartDeviceLink/SDLSystemRequest.m @@ -5,14 +5,15 @@ #import "SDLSystemRequest.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLSystemRequest - (instancetype)init { - if (self = [super initWithName:SDLNameSystemRequest]) { + if (self = [super initWithName:SDLRPCFunctionNameSystemRequest]) { } return self; } @@ -41,27 +42,27 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setRequestType:(SDLRequestType)requestType { - [parameters sdl_setObject:requestType forName:SDLNameRequestType]; + [parameters sdl_setObject:requestType forName:SDLRPCParameterNameRequestType]; } - (SDLRequestType)requestType { - return [parameters sdl_objectForName:SDLNameRequestType]; + return [parameters sdl_objectForName:SDLRPCParameterNameRequestType]; } - (void)setRequestSubType:(nullable NSString *)requestSubType { - [parameters sdl_setObject:requestSubType forName:SDLNameRequestSubType]; + [parameters sdl_setObject:requestSubType forName:SDLRPCParameterNameRequestSubType]; } - (nullable NSString *)requestSubType { - return [parameters sdl_objectForName:SDLNameRequestSubType]; + return [parameters sdl_objectForName:SDLRPCParameterNameRequestSubType]; } - (void)setFileName:(nullable NSString *)fileName { - [parameters sdl_setObject:fileName forName:SDLNameFilename]; + [parameters sdl_setObject:fileName forName:SDLRPCParameterNameFilename]; } - (nullable NSString *)fileName { - return [parameters sdl_objectForName:SDLNameFilename]; + return [parameters sdl_objectForName:SDLRPCParameterNameFilename]; } @end diff --git a/SmartDeviceLink/SDLSystemRequestResponse.m b/SmartDeviceLink/SDLSystemRequestResponse.m index f202c544d..8f5150302 100644 --- a/SmartDeviceLink/SDLSystemRequestResponse.m +++ b/SmartDeviceLink/SDLSystemRequestResponse.m @@ -5,14 +5,15 @@ #import "SDLSystemRequestResponse.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLSystemRequestResponse - (instancetype)init { - if (self = [super initWithName:SDLNameSystemRequest]) { + if (self = [super initWithName:SDLRPCFunctionNameSystemRequest]) { } return self; } diff --git a/SmartDeviceLink/SDLTTSChunk.m b/SmartDeviceLink/SDLTTSChunk.m index a8874129b..655013283 100644 --- a/SmartDeviceLink/SDLTTSChunk.m +++ b/SmartDeviceLink/SDLTTSChunk.m @@ -4,7 +4,7 @@ #import "SDLTTSChunk.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" NS_ASSUME_NONNULL_BEGIN @@ -55,19 +55,19 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setText:(NSString *)text { - [store sdl_setObject:text forName:SDLNameText]; + [store sdl_setObject:text forName:SDLRPCParameterNameText]; } - (NSString *)text { - return [store sdl_objectForName:SDLNameText]; + return [store sdl_objectForName:SDLRPCParameterNameText]; } - (void)setType:(SDLSpeechCapabilities)type { - [store sdl_setObject:type forName:SDLNameType]; + [store sdl_setObject:type forName:SDLRPCParameterNameType]; } - (SDLSpeechCapabilities)type { - return [store sdl_objectForName:SDLNameType]; + return [store sdl_objectForName:SDLRPCParameterNameType]; } @end diff --git a/SmartDeviceLink/SDLTemperature.h b/SmartDeviceLink/SDLTemperature.h index 5a22ba962..e93fae6d1 100644 --- a/SmartDeviceLink/SDLTemperature.h +++ b/SmartDeviceLink/SDLTemperature.h @@ -8,23 +8,46 @@ NS_ASSUME_NONNULL_BEGIN /** - Struct using in Remote Control representing a temperature. + * Struct representing a temperature. */ @interface SDLTemperature : SDLRPCStruct -- (instancetype)initWithUnit:(SDLTemperatureUnit)unit value:(float)value; +/** + * Convenience init for a fahrenheit temperature value. + * + * @param value Temperature value in fahrenheit + * @return A SDLTemperature object + */ +- (instancetype)initWithFahrenheitValue:(float)value; + +/** + * Convenience init for a celsius temperature value. + * + * @param value Temperature value in celsius + * @return A SDLTemperature object + */ +- (instancetype)initWithCelsiusValue:(float)value; /** - Temperature Unit + * Convenience init for all parameters. + * + * @param unit Temperature unit + * @param value Temperature value in specified unit + * @return A SDLTemperature object + */ +- (instancetype)initWithUnit:(SDLTemperatureUnit)unit value:(float)value NS_DESIGNATED_INITIALIZER; - Required, float +/** + * Temperature unit + * + * Required, float */ @property (strong, nonatomic) SDLTemperatureUnit unit; /** - Temperature Value in TemperatureUnit specified unit. Range depends on OEM and is not checked by SDL. - - Required, float + * Temperature value in specified unit. Range depends on OEM and is not checked by SDL. + * + * Required, float */ @property (strong, nonatomic) NSNumber<SDLFloat> *value; diff --git a/SmartDeviceLink/SDLTemperature.m b/SmartDeviceLink/SDLTemperature.m index 8d5c5a70f..ab8cfa1e0 100644 --- a/SmartDeviceLink/SDLTemperature.m +++ b/SmartDeviceLink/SDLTemperature.m @@ -3,15 +3,23 @@ // #import "SDLTemperature.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" #import "NSMutableDictionary+Store.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLTemperature +- (instancetype)initWithFahrenheitValue:(float)value { + return [self initWithUnit:SDLTemperatureUnitFahrenheit value:value]; +} + +- (instancetype)initWithCelsiusValue:(float)value { + return [self initWithUnit:SDLTemperatureUnitCelsius value:value]; +} + - (instancetype)initWithUnit:(SDLTemperatureUnit)unit value:(float)value { - self = [self init]; + self = [super init]; if (!self) { return nil; } @@ -23,19 +31,19 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setUnit:(SDLTemperatureUnit)unit { - [store sdl_setObject:unit forName:SDLNameUnit]; + [store sdl_setObject:unit forName:SDLRPCParameterNameUnit]; } - (SDLTemperatureUnit)unit { - return [store sdl_objectForName:SDLNameUnit]; + return [store sdl_objectForName:SDLRPCParameterNameUnit]; } - (void)setValue:(NSNumber<SDLFloat> *)value { - [store sdl_setObject:value forName:SDLNameValue]; + [store sdl_setObject:value forName:SDLRPCParameterNameValue]; } - (NSNumber<SDLFloat> *)value { - return [store sdl_objectForName:SDLNameValue]; + return [store sdl_objectForName:SDLRPCParameterNameValue]; } @end diff --git a/SmartDeviceLink/SDLTemplateColorScheme.m b/SmartDeviceLink/SDLTemplateColorScheme.m index 42f18a702..1172ea77f 100644 --- a/SmartDeviceLink/SDLTemplateColorScheme.m +++ b/SmartDeviceLink/SDLTemplateColorScheme.m @@ -9,7 +9,7 @@ #import "SDLTemplateColorScheme.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" #import "SDLRGBColor.h" NS_ASSUME_NONNULL_BEGIN @@ -39,27 +39,27 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setPrimaryColor:(nullable SDLRGBColor *)primaryColor { - [store sdl_setObject:primaryColor forName:SDLNamePrimaryColor]; + [store sdl_setObject:primaryColor forName:SDLRPCParameterNamePrimaryColor]; } - (nullable SDLRGBColor *)primaryColor { - return [store sdl_objectForName:SDLNamePrimaryColor ofClass:[SDLRGBColor class]]; + return [store sdl_objectForName:SDLRPCParameterNamePrimaryColor ofClass:[SDLRGBColor class]]; } - (void)setSecondaryColor:(nullable SDLRGBColor *)secondaryColor { - [store sdl_setObject:secondaryColor forName:SDLNameSecondaryColor]; + [store sdl_setObject:secondaryColor forName:SDLRPCParameterNameSecondaryColor]; } - (nullable SDLRGBColor *)secondaryColor { - return [store sdl_objectForName:SDLNameSecondaryColor ofClass:[SDLRGBColor class]]; + return [store sdl_objectForName:SDLRPCParameterNameSecondaryColor ofClass:[SDLRGBColor class]]; } - (void)setBackgroundColor:(nullable SDLRGBColor *)backgroundColor { - [store sdl_setObject:backgroundColor forName:SDLNameBackgroundColor]; + [store sdl_setObject:backgroundColor forName:SDLRPCParameterNameBackgroundColor]; } - (nullable SDLRGBColor *)backgroundColor { - return [store sdl_objectForName:SDLNameBackgroundColor ofClass:[SDLRGBColor class]]; + return [store sdl_objectForName:SDLRPCParameterNameBackgroundColor ofClass:[SDLRGBColor class]]; } @end diff --git a/SmartDeviceLink/SDLTextField.m b/SmartDeviceLink/SDLTextField.m index 7e6293f58..d880f1795 100644 --- a/SmartDeviceLink/SDLTextField.m +++ b/SmartDeviceLink/SDLTextField.m @@ -5,7 +5,7 @@ #import "NSMutableDictionary+Store.h" #import "SDLCharacterSet.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" #import "SDLTextFieldName.h" NS_ASSUME_NONNULL_BEGIN @@ -13,35 +13,35 @@ NS_ASSUME_NONNULL_BEGIN @implementation SDLTextField - (void)setName:(SDLTextFieldName)name { - [store sdl_setObject:name forName:SDLNameName]; + [store sdl_setObject:name forName:SDLRPCParameterNameName]; } - (SDLTextFieldName)name { - return [store sdl_objectForName:SDLNameName]; + return [store sdl_objectForName:SDLRPCParameterNameName]; } - (void)setCharacterSet:(SDLCharacterSet)characterSet { - [store sdl_setObject:characterSet forName:SDLNameCharacterSet]; + [store sdl_setObject:characterSet forName:SDLRPCParameterNameCharacterSet]; } - (SDLCharacterSet)characterSet { - return [store sdl_objectForName:SDLNameCharacterSet]; + return [store sdl_objectForName:SDLRPCParameterNameCharacterSet]; } - (void)setWidth:(NSNumber<SDLInt> *)width { - [store sdl_setObject:width forName:SDLNameWidth]; + [store sdl_setObject:width forName:SDLRPCParameterNameWidth]; } - (NSNumber<SDLInt> *)width { - return [store sdl_objectForName:SDLNameWidth]; + return [store sdl_objectForName:SDLRPCParameterNameWidth]; } - (void)setRows:(NSNumber<SDLInt> *)rows { - [store sdl_setObject:rows forName:SDLNameRows]; + [store sdl_setObject:rows forName:SDLRPCParameterNameRows]; } - (NSNumber<SDLInt> *)rows { - return [store sdl_objectForName:SDLNameRows]; + return [store sdl_objectForName:SDLRPCParameterNameRows]; } @end diff --git a/SmartDeviceLink/SDLTireStatus.m b/SmartDeviceLink/SDLTireStatus.m index aad17cdde..10baa94af 100644 --- a/SmartDeviceLink/SDLTireStatus.m +++ b/SmartDeviceLink/SDLTireStatus.m @@ -4,7 +4,7 @@ #import "SDLTireStatus.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" #import "SDLSingleTireStatus.h" NS_ASSUME_NONNULL_BEGIN @@ -12,59 +12,59 @@ NS_ASSUME_NONNULL_BEGIN @implementation SDLTireStatus - (void)setPressureTelltale:(SDLWarningLightStatus)pressureTelltale { - [store sdl_setObject:pressureTelltale forName:SDLNamePressureTelltale]; + [store sdl_setObject:pressureTelltale forName:SDLRPCParameterNamePressureTelltale]; } - (SDLWarningLightStatus)pressureTelltale { - return [store sdl_objectForName:SDLNamePressureTelltale]; + return [store sdl_objectForName:SDLRPCParameterNamePressureTelltale]; } - (void)setLeftFront:(SDLSingleTireStatus *)leftFront { - [store sdl_setObject:leftFront forName:SDLNameLeftFront]; + [store sdl_setObject:leftFront forName:SDLRPCParameterNameLeftFront]; } - (SDLSingleTireStatus *)leftFront { - return [store sdl_objectForName:SDLNameLeftFront ofClass:SDLSingleTireStatus.class]; + return [store sdl_objectForName:SDLRPCParameterNameLeftFront ofClass:SDLSingleTireStatus.class]; } - (void)setRightFront:(SDLSingleTireStatus *)rightFront { - [store sdl_setObject:rightFront forName:SDLNameRightFront]; + [store sdl_setObject:rightFront forName:SDLRPCParameterNameRightFront]; } - (SDLSingleTireStatus *)rightFront { - return [store sdl_objectForName:SDLNameRightFront ofClass:SDLSingleTireStatus.class]; + return [store sdl_objectForName:SDLRPCParameterNameRightFront ofClass:SDLSingleTireStatus.class]; } - (void)setLeftRear:(SDLSingleTireStatus *)leftRear { - [store sdl_setObject:leftRear forName:SDLNameLeftRear]; + [store sdl_setObject:leftRear forName:SDLRPCParameterNameLeftRear]; } - (SDLSingleTireStatus *)leftRear { - return [store sdl_objectForName:SDLNameLeftRear ofClass:SDLSingleTireStatus.class]; + return [store sdl_objectForName:SDLRPCParameterNameLeftRear ofClass:SDLSingleTireStatus.class]; } - (void)setRightRear:(SDLSingleTireStatus *)rightRear { - [store sdl_setObject:rightRear forName:SDLNameRightRear]; + [store sdl_setObject:rightRear forName:SDLRPCParameterNameRightRear]; } - (SDLSingleTireStatus *)rightRear { - return [store sdl_objectForName:SDLNameRightRear ofClass:SDLSingleTireStatus.class]; + return [store sdl_objectForName:SDLRPCParameterNameRightRear ofClass:SDLSingleTireStatus.class]; } - (void)setInnerLeftRear:(SDLSingleTireStatus *)innerLeftRear { - [store sdl_setObject:innerLeftRear forName:SDLNameInnerLeftRear]; + [store sdl_setObject:innerLeftRear forName:SDLRPCParameterNameInnerLeftRear]; } - (SDLSingleTireStatus *)innerLeftRear { - return [store sdl_objectForName:SDLNameInnerLeftRear ofClass:SDLSingleTireStatus.class]; + return [store sdl_objectForName:SDLRPCParameterNameInnerLeftRear ofClass:SDLSingleTireStatus.class]; } - (void)setInnerRightRear:(SDLSingleTireStatus *)innerRightRear { - [store sdl_setObject:innerRightRear forName:SDLNameInnerRightRear]; + [store sdl_setObject:innerRightRear forName:SDLRPCParameterNameInnerRightRear]; } - (SDLSingleTireStatus *)innerRightRear { - return [store sdl_objectForName:SDLNameInnerRightRear ofClass:SDLSingleTireStatus.class]; + return [store sdl_objectForName:SDLRPCParameterNameInnerRightRear ofClass:SDLSingleTireStatus.class]; } @end diff --git a/SmartDeviceLink/SDLTouchCoord.m b/SmartDeviceLink/SDLTouchCoord.m index bba5b593c..e8dd2d520 100644 --- a/SmartDeviceLink/SDLTouchCoord.m +++ b/SmartDeviceLink/SDLTouchCoord.m @@ -5,26 +5,26 @@ #import "SDLTouchCoord.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLTouchCoord - (void)setX:(NSNumber<SDLFloat> *)x { - [store sdl_setObject:x forName:SDLNameX]; + [store sdl_setObject:x forName:SDLRPCParameterNameX]; } - (NSNumber<SDLFloat> *)x { - return [store sdl_objectForName:SDLNameX]; + return [store sdl_objectForName:SDLRPCParameterNameX]; } - (void)setY:(NSNumber<SDLFloat> *)y { - [store sdl_setObject:y forName:SDLNameY]; + [store sdl_setObject:y forName:SDLRPCParameterNameY]; } - (NSNumber<SDLFloat> *)y { - return [store sdl_objectForName:SDLNameY]; + return [store sdl_objectForName:SDLRPCParameterNameY]; } @end diff --git a/SmartDeviceLink/SDLTouchEvent.m b/SmartDeviceLink/SDLTouchEvent.m index 7ff82b3c7..c48b4b61e 100644 --- a/SmartDeviceLink/SDLTouchEvent.m +++ b/SmartDeviceLink/SDLTouchEvent.m @@ -5,7 +5,7 @@ #import "SDLTouchEvent.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" #import "SDLTouchCoord.h" NS_ASSUME_NONNULL_BEGIN @@ -13,27 +13,27 @@ NS_ASSUME_NONNULL_BEGIN @implementation SDLTouchEvent - (void)setTouchEventId:(NSNumber<SDLInt> *)touchEventId { - [store sdl_setObject:touchEventId forName:SDLNameId]; + [store sdl_setObject:touchEventId forName:SDLRPCParameterNameId]; } - (NSNumber<SDLInt> *)touchEventId { - return [store sdl_objectForName:SDLNameId]; + return [store sdl_objectForName:SDLRPCParameterNameId]; } - (void)setTimeStamp:(NSArray<NSNumber<SDLInt> *> *)timeStamp { - [store sdl_setObject:timeStamp forName:SDLNameTimestamp]; + [store sdl_setObject:timeStamp forName:SDLRPCParameterNameTS]; } - (NSArray<NSNumber<SDLInt> *> *)timeStamp { - return [store sdl_objectForName:SDLNameTimestamp]; + return [store sdl_objectForName:SDLRPCParameterNameTS]; } - (void)setCoord:(NSArray<SDLTouchCoord *> *)coord { - [store sdl_setObject:coord forName:SDLNameCoordinate]; + [store sdl_setObject:coord forName:SDLRPCParameterNameCoordinate]; } - (NSArray<SDLTouchCoord *> *)coord { - return [store sdl_objectsForName:SDLNameCoordinate ofClass:SDLTouchCoord.class]; + return [store sdl_objectsForName:SDLRPCParameterNameCoordinate ofClass:SDLTouchCoord.class]; } @end diff --git a/SmartDeviceLink/SDLTouchEventCapabilities.m b/SmartDeviceLink/SDLTouchEventCapabilities.m index cf019dc22..2370f9e48 100644 --- a/SmartDeviceLink/SDLTouchEventCapabilities.m +++ b/SmartDeviceLink/SDLTouchEventCapabilities.m @@ -5,34 +5,34 @@ #import "SDLTouchEventCapabilities.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLTouchEventCapabilities - (void)setPressAvailable:(NSNumber<SDLBool> *)pressAvailable { - [store sdl_setObject:pressAvailable forName:SDLNamePressAvailable]; + [store sdl_setObject:pressAvailable forName:SDLRPCParameterNamePressAvailable]; } - (NSNumber<SDLBool> *)pressAvailable { - return [store sdl_objectForName:SDLNamePressAvailable]; + return [store sdl_objectForName:SDLRPCParameterNamePressAvailable]; } - (void)setMultiTouchAvailable:(NSNumber<SDLBool> *)multiTouchAvailable { - [store sdl_setObject:multiTouchAvailable forName:SDLNameMultiTouchAvailable]; + [store sdl_setObject:multiTouchAvailable forName:SDLRPCParameterNameMultiTouchAvailable]; } - (NSNumber<SDLBool> *)multiTouchAvailable { - return [store sdl_objectForName:SDLNameMultiTouchAvailable]; + return [store sdl_objectForName:SDLRPCParameterNameMultiTouchAvailable]; } - (void)setDoublePressAvailable:(NSNumber<SDLBool> *)doublePressAvailable { - [store sdl_setObject:doublePressAvailable forName:SDLNameDoublePressAvailable]; + [store sdl_setObject:doublePressAvailable forName:SDLRPCParameterNameDoublePressAvailable]; } - (NSNumber<SDLBool> *)doublePressAvailable { - return [store sdl_objectForName:SDLNameDoublePressAvailable]; + return [store sdl_objectForName:SDLRPCParameterNameDoublePressAvailable]; } @end diff --git a/SmartDeviceLink/SDLTurn.m b/SmartDeviceLink/SDLTurn.m index 335142782..a5a166269 100644 --- a/SmartDeviceLink/SDLTurn.m +++ b/SmartDeviceLink/SDLTurn.m @@ -5,7 +5,7 @@ #import "NSMutableDictionary+Store.h" #import "SDLImage.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" NS_ASSUME_NONNULL_BEGIN @@ -24,19 +24,19 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setNavigationText:(nullable NSString *)navigationText { - [store sdl_setObject:navigationText forName:SDLNameNavigationText]; + [store sdl_setObject:navigationText forName:SDLRPCParameterNameNavigationText]; } - (nullable NSString *)navigationText { - return [store sdl_objectForName:SDLNameNavigationText]; + return [store sdl_objectForName:SDLRPCParameterNameNavigationText]; } - (void)setTurnIcon:(nullable SDLImage *)turnIcon { - [store sdl_setObject:turnIcon forName:SDLNameTurnIcon]; + [store sdl_setObject:turnIcon forName:SDLRPCParameterNameTurnIcon]; } - (nullable SDLImage *)turnIcon { - return [store sdl_objectForName:SDLNameTurnIcon ofClass:SDLImage.class]; + return [store sdl_objectForName:SDLRPCParameterNameTurnIcon ofClass:SDLImage.class]; } @end diff --git a/SmartDeviceLink/SDLUnregisterAppInterface.m b/SmartDeviceLink/SDLUnregisterAppInterface.m index 95520fca0..22bfdc590 100644 --- a/SmartDeviceLink/SDLUnregisterAppInterface.m +++ b/SmartDeviceLink/SDLUnregisterAppInterface.m @@ -5,14 +5,15 @@ #import "SDLUnregisterAppInterface.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLUnregisterAppInterface - (instancetype)init { - if (self = [super initWithName:SDLNameUnregisterAppInterface]) { + if (self = [super initWithName:SDLRPCFunctionNameUnregisterAppInterface]) { } return self; } diff --git a/SmartDeviceLink/SDLUnregisterAppInterfaceResponse.m b/SmartDeviceLink/SDLUnregisterAppInterfaceResponse.m index 77e93858b..c9978d630 100644 --- a/SmartDeviceLink/SDLUnregisterAppInterfaceResponse.m +++ b/SmartDeviceLink/SDLUnregisterAppInterfaceResponse.m @@ -5,14 +5,15 @@ #import "SDLUnregisterAppInterfaceResponse.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLUnregisterAppInterfaceResponse - (instancetype)init { - if (self = [super initWithName:SDLNameUnregisterAppInterface]) { + if (self = [super initWithName:SDLRPCFunctionNameUnregisterAppInterface]) { } return self; } diff --git a/SmartDeviceLink/SDLUnsubscribeButton.m b/SmartDeviceLink/SDLUnsubscribeButton.m index 1b1c18616..a20cd1eee 100644 --- a/SmartDeviceLink/SDLUnsubscribeButton.m +++ b/SmartDeviceLink/SDLUnsubscribeButton.m @@ -6,14 +6,15 @@ #import "NSMutableDictionary+Store.h" #import "SDLButtonName.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLUnsubscribeButton - (instancetype)init { - if (self = [super initWithName:SDLNameUnsubscribeButton]) { + if (self = [super initWithName:SDLRPCFunctionNameUnsubscribeButton]) { } return self; } @@ -30,11 +31,11 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setButtonName:(SDLButtonName)buttonName { - [parameters sdl_setObject:buttonName forName:SDLNameButtonName]; + [parameters sdl_setObject:buttonName forName:SDLRPCParameterNameButtonName]; } - (SDLButtonName)buttonName { - return [parameters sdl_objectForName:SDLNameButtonName]; + return [parameters sdl_objectForName:SDLRPCParameterNameButtonName]; } @end diff --git a/SmartDeviceLink/SDLUnsubscribeButtonResponse.m b/SmartDeviceLink/SDLUnsubscribeButtonResponse.m index e92565e58..27f5f0266 100644 --- a/SmartDeviceLink/SDLUnsubscribeButtonResponse.m +++ b/SmartDeviceLink/SDLUnsubscribeButtonResponse.m @@ -5,14 +5,15 @@ #import "SDLUnsubscribeButtonResponse.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLUnsubscribeButtonResponse - (instancetype)init { - if (self = [super initWithName:SDLNameUnsubscribeButton]) { + if (self = [super initWithName:SDLRPCFunctionNameUnsubscribeButton]) { } return self; } diff --git a/SmartDeviceLink/SDLUnsubscribeVehicleData.m b/SmartDeviceLink/SDLUnsubscribeVehicleData.m index 8db047754..d3a03cb60 100644 --- a/SmartDeviceLink/SDLUnsubscribeVehicleData.m +++ b/SmartDeviceLink/SDLUnsubscribeVehicleData.m @@ -5,14 +5,15 @@ #import "SDLUnsubscribeVehicleData.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLUnsubscribeVehicleData - (instancetype)init { - if (self = [super initWithName:SDLNameUnsubscribeVehicleData]) { + if (self = [super initWithName:SDLRPCFunctionNameUnsubscribeVehicleData]) { } return self; } @@ -65,227 +66,227 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setGps:(nullable NSNumber<SDLBool> *)gps { - [parameters sdl_setObject:gps forName:SDLNameGPS]; + [parameters sdl_setObject:gps forName:SDLRPCParameterNameGPS]; } - (nullable NSNumber<SDLBool> *)gps { - return [parameters sdl_objectForName:SDLNameGPS]; + return [parameters sdl_objectForName:SDLRPCParameterNameGPS]; } - (void)setSpeed:(nullable NSNumber<SDLBool> *)speed { - [parameters sdl_setObject:speed forName:SDLNameSpeed]; + [parameters sdl_setObject:speed forName:SDLRPCParameterNameSpeed]; } - (nullable NSNumber<SDLBool> *)speed { - return [parameters sdl_objectForName:SDLNameSpeed]; + return [parameters sdl_objectForName:SDLRPCParameterNameSpeed]; } - (void)setRpm:(nullable NSNumber<SDLBool> *)rpm { - [parameters sdl_setObject:rpm forName:SDLNameRPM]; + [parameters sdl_setObject:rpm forName:SDLRPCParameterNameRPM]; } - (nullable NSNumber<SDLBool> *)rpm { - return [parameters sdl_objectForName:SDLNameRPM]; + return [parameters sdl_objectForName:SDLRPCParameterNameRPM]; } - (void)setFuelLevel:(nullable NSNumber<SDLBool> *)fuelLevel { - [parameters sdl_setObject:fuelLevel forName:SDLNameFuelLevel]; + [parameters sdl_setObject:fuelLevel forName:SDLRPCParameterNameFuelLevel]; } - (nullable NSNumber<SDLBool> *)fuelLevel { - return [parameters sdl_objectForName:SDLNameFuelLevel]; + return [parameters sdl_objectForName:SDLRPCParameterNameFuelLevel]; } - (void)setFuelLevel_State:(nullable NSNumber<SDLBool> *)fuelLevel_State { - [parameters sdl_setObject:fuelLevel_State forName:SDLNameFuelLevelState]; + [parameters sdl_setObject:fuelLevel_State forName:SDLRPCParameterNameFuelLevelState]; } - (nullable NSNumber<SDLBool> *)fuelLevel_State { - return [parameters sdl_objectForName:SDLNameFuelLevelState]; + return [parameters sdl_objectForName:SDLRPCParameterNameFuelLevelState]; } - (void)setFuelRange:(nullable NSNumber<SDLBool> *)fuelRange { - [parameters sdl_setObject:fuelRange forName:SDLNameFuelRange]; + [parameters sdl_setObject:fuelRange forName:SDLRPCParameterNameFuelRange]; } - (nullable NSNumber<SDLBool> *)fuelRange { - return [parameters sdl_objectForName:SDLNameFuelRange]; + return [parameters sdl_objectForName:SDLRPCParameterNameFuelRange]; } - (void)setInstantFuelConsumption:(nullable NSNumber<SDLBool> *)instantFuelConsumption { - [parameters sdl_setObject:instantFuelConsumption forName:SDLNameInstantFuelConsumption]; + [parameters sdl_setObject:instantFuelConsumption forName:SDLRPCParameterNameInstantFuelConsumption]; } - (nullable NSNumber<SDLBool> *)instantFuelConsumption { - return [parameters sdl_objectForName:SDLNameInstantFuelConsumption]; + return [parameters sdl_objectForName:SDLRPCParameterNameInstantFuelConsumption]; } - (void)setExternalTemperature:(nullable NSNumber<SDLBool> *)externalTemperature { - [parameters sdl_setObject:externalTemperature forName:SDLNameExternalTemperature]; + [parameters sdl_setObject:externalTemperature forName:SDLRPCParameterNameExternalTemperature]; } - (nullable NSNumber<SDLBool> *)externalTemperature { - return [parameters sdl_objectForName:SDLNameExternalTemperature]; + return [parameters sdl_objectForName:SDLRPCParameterNameExternalTemperature]; } - (void)setPrndl:(nullable NSNumber<SDLBool> *)prndl { - [parameters sdl_setObject:prndl forName:SDLNamePRNDL]; + [parameters sdl_setObject:prndl forName:SDLRPCParameterNamePRNDL]; } - (nullable NSNumber<SDLBool> *)prndl { - return [parameters sdl_objectForName:SDLNamePRNDL]; + return [parameters sdl_objectForName:SDLRPCParameterNamePRNDL]; } - (void)setTirePressure:(nullable NSNumber<SDLBool> *)tirePressure { - [parameters sdl_setObject:tirePressure forName:SDLNameTirePressure]; + [parameters sdl_setObject:tirePressure forName:SDLRPCParameterNameTirePressure]; } - (nullable NSNumber<SDLBool> *)tirePressure { - return [parameters sdl_objectForName:SDLNameTirePressure]; + return [parameters sdl_objectForName:SDLRPCParameterNameTirePressure]; } - (void)setOdometer:(nullable NSNumber<SDLBool> *)odometer { - [parameters sdl_setObject:odometer forName:SDLNameOdometer]; + [parameters sdl_setObject:odometer forName:SDLRPCParameterNameOdometer]; } - (nullable NSNumber<SDLBool> *)odometer { - return [parameters sdl_objectForName:SDLNameOdometer]; + return [parameters sdl_objectForName:SDLRPCParameterNameOdometer]; } - (void)setBeltStatus:(nullable NSNumber<SDLBool> *)beltStatus { - [parameters sdl_setObject:beltStatus forName:SDLNameBeltStatus]; + [parameters sdl_setObject:beltStatus forName:SDLRPCParameterNameBeltStatus]; } - (nullable NSNumber<SDLBool> *)beltStatus { - return [parameters sdl_objectForName:SDLNameBeltStatus]; + return [parameters sdl_objectForName:SDLRPCParameterNameBeltStatus]; } - (void)setBodyInformation:(nullable NSNumber<SDLBool> *)bodyInformation { - [parameters sdl_setObject:bodyInformation forName:SDLNameBodyInformation]; + [parameters sdl_setObject:bodyInformation forName:SDLRPCParameterNameBodyInformation]; } - (nullable NSNumber<SDLBool> *)bodyInformation { - return [parameters sdl_objectForName:SDLNameBodyInformation]; + return [parameters sdl_objectForName:SDLRPCParameterNameBodyInformation]; } - (void)setDeviceStatus:(nullable NSNumber<SDLBool> *)deviceStatus { - [parameters sdl_setObject:deviceStatus forName:SDLNameDeviceStatus]; + [parameters sdl_setObject:deviceStatus forName:SDLRPCParameterNameDeviceStatus]; } - (nullable NSNumber<SDLBool> *)deviceStatus { - return [parameters sdl_objectForName:SDLNameDeviceStatus]; + return [parameters sdl_objectForName:SDLRPCParameterNameDeviceStatus]; } - (void)setDriverBraking:(nullable NSNumber<SDLBool> *)driverBraking { - [parameters sdl_setObject:driverBraking forName:SDLNameDriverBraking]; + [parameters sdl_setObject:driverBraking forName:SDLRPCParameterNameDriverBraking]; } - (nullable NSNumber<SDLBool> *)driverBraking { - return [parameters sdl_objectForName:SDLNameDriverBraking]; + return [parameters sdl_objectForName:SDLRPCParameterNameDriverBraking]; } - (void)setWiperStatus:(nullable NSNumber<SDLBool> *)wiperStatus { - [parameters sdl_setObject:wiperStatus forName:SDLNameWiperStatus]; + [parameters sdl_setObject:wiperStatus forName:SDLRPCParameterNameWiperStatus]; } - (nullable NSNumber<SDLBool> *)wiperStatus { - return [parameters sdl_objectForName:SDLNameWiperStatus]; + return [parameters sdl_objectForName:SDLRPCParameterNameWiperStatus]; } - (void)setHeadLampStatus:(nullable NSNumber<SDLBool> *)headLampStatus { - [parameters sdl_setObject:headLampStatus forName:SDLNameHeadLampStatus]; + [parameters sdl_setObject:headLampStatus forName:SDLRPCParameterNameHeadLampStatus]; } - (nullable NSNumber<SDLBool> *)headLampStatus { - return [parameters sdl_objectForName:SDLNameHeadLampStatus]; + return [parameters sdl_objectForName:SDLRPCParameterNameHeadLampStatus]; } - (void)setEngineOilLife:(nullable NSNumber<SDLBool> *)engineOilLife { - [parameters sdl_setObject:engineOilLife forName:SDLNameEngineOilLife]; + [parameters sdl_setObject:engineOilLife forName:SDLRPCParameterNameEngineOilLife]; } - (nullable NSNumber<SDLBool> *)engineOilLife { - return [parameters sdl_objectForName:SDLNameEngineOilLife]; + return [parameters sdl_objectForName:SDLRPCParameterNameEngineOilLife]; } - (void)setEngineTorque:(nullable NSNumber<SDLBool> *)engineTorque { - [parameters sdl_setObject:engineTorque forName:SDLNameEngineTorque]; + [parameters sdl_setObject:engineTorque forName:SDLRPCParameterNameEngineTorque]; } - (nullable NSNumber<SDLBool> *)engineTorque { - return [parameters sdl_objectForName:SDLNameEngineTorque]; + return [parameters sdl_objectForName:SDLRPCParameterNameEngineTorque]; } - (void)setAccPedalPosition:(nullable NSNumber<SDLBool> *)accPedalPosition { - [parameters sdl_setObject:accPedalPosition forName:SDLNameAccelerationPedalPosition]; + [parameters sdl_setObject:accPedalPosition forName:SDLRPCParameterNameAccelerationPedalPosition]; } - (nullable NSNumber<SDLBool> *)accPedalPosition { - return [parameters sdl_objectForName:SDLNameAccelerationPedalPosition]; + return [parameters sdl_objectForName:SDLRPCParameterNameAccelerationPedalPosition]; } - (void)setSteeringWheelAngle:(nullable NSNumber<SDLBool> *)steeringWheelAngle { - [parameters sdl_setObject:steeringWheelAngle forName:SDLNameSteeringWheelAngle]; + [parameters sdl_setObject:steeringWheelAngle forName:SDLRPCParameterNameSteeringWheelAngle]; } - (nullable NSNumber<SDLBool> *)steeringWheelAngle { - return [parameters sdl_objectForName:SDLNameSteeringWheelAngle]; + return [parameters sdl_objectForName:SDLRPCParameterNameSteeringWheelAngle]; } - (void)setECallInfo:(nullable NSNumber<SDLBool> *)eCallInfo { - [parameters sdl_setObject:eCallInfo forName:SDLNameECallInfo]; + [parameters sdl_setObject:eCallInfo forName:SDLRPCParameterNameECallInfo]; } - (nullable NSNumber<SDLBool> *)eCallInfo { - return [parameters sdl_objectForName:SDLNameECallInfo]; + return [parameters sdl_objectForName:SDLRPCParameterNameECallInfo]; } - (void)setAirbagStatus:(nullable NSNumber<SDLBool> *)airbagStatus { - [parameters sdl_setObject:airbagStatus forName:SDLNameAirbagStatus]; + [parameters sdl_setObject:airbagStatus forName:SDLRPCParameterNameAirbagStatus]; } - (nullable NSNumber<SDLBool> *)airbagStatus { - return [parameters sdl_objectForName:SDLNameAirbagStatus]; + return [parameters sdl_objectForName:SDLRPCParameterNameAirbagStatus]; } - (void)setEmergencyEvent:(nullable NSNumber<SDLBool> *)emergencyEvent { - [parameters sdl_setObject:emergencyEvent forName:SDLNameEmergencyEvent]; + [parameters sdl_setObject:emergencyEvent forName:SDLRPCParameterNameEmergencyEvent]; } - (nullable NSNumber<SDLBool> *)emergencyEvent { - return [parameters sdl_objectForName:SDLNameEmergencyEvent]; + return [parameters sdl_objectForName:SDLRPCParameterNameEmergencyEvent]; } - (void)setClusterModeStatus:(nullable NSNumber<SDLBool> *)clusterModeStatus { - [parameters sdl_setObject:clusterModeStatus forName:SDLNameClusterModeStatus]; + [parameters sdl_setObject:clusterModeStatus forName:SDLRPCParameterNameClusterModeStatus]; } - (nullable NSNumber<SDLBool> *)clusterModeStatus { - return [parameters sdl_objectForName:SDLNameClusterModeStatus]; + return [parameters sdl_objectForName:SDLRPCParameterNameClusterModeStatus]; } - (void)setMyKey:(nullable NSNumber<SDLBool> *)myKey { - [parameters sdl_setObject:myKey forName:SDLNameMyKey]; + [parameters sdl_setObject:myKey forName:SDLRPCParameterNameMyKey]; } - (nullable NSNumber<SDLBool> *)myKey { - return [parameters sdl_objectForName:SDLNameMyKey]; + return [parameters sdl_objectForName:SDLRPCParameterNameMyKey]; } - (void)setElectronicParkBrakeStatus:(nullable NSNumber<SDLBool> *)electronicParkBrakeStatus { - [parameters sdl_setObject:electronicParkBrakeStatus forName:SDLNameElectronicParkBrakeStatus]; + [parameters sdl_setObject:electronicParkBrakeStatus forName:SDLRPCParameterNameElectronicParkBrakeStatus]; } - (nullable NSNumber<SDLBool> *)electronicParkBrakeStatus { - return [parameters sdl_objectForName:SDLNameElectronicParkBrakeStatus]; + return [parameters sdl_objectForName:SDLRPCParameterNameElectronicParkBrakeStatus]; } - (void)setTurnSignal:(nullable NSNumber<SDLBool> *)turnSignal { - [parameters sdl_setObject:turnSignal forName:SDLNameTurnSignal]; + [parameters sdl_setObject:turnSignal forName:SDLRPCParameterNameTurnSignal]; } - (nullable NSNumber<SDLBool> *)turnSignal { - return [parameters sdl_objectForName:SDLNameTurnSignal]; + return [parameters sdl_objectForName:SDLRPCParameterNameTurnSignal]; } - (void)setCloudAppVehicleID:(nullable NSNumber<SDLBool> *)cloudAppVehicleID { diff --git a/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m b/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m index 7d14e4f28..6c8448790 100644 --- a/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m +++ b/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m @@ -5,7 +5,8 @@ #import "SDLUnsubscribeVehicleDataResponse.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" #import "SDLVehicleDataResult.h" NS_ASSUME_NONNULL_BEGIN @@ -13,233 +14,233 @@ NS_ASSUME_NONNULL_BEGIN @implementation SDLUnsubscribeVehicleDataResponse - (instancetype)init { - if (self = [super initWithName:SDLNameUnsubscribeVehicleData]) { + if (self = [super initWithName:SDLRPCFunctionNameUnsubscribeVehicleData]) { } return self; } - (void)setGps:(nullable SDLVehicleDataResult *)gps { - [parameters sdl_setObject:gps forName:SDLNameGPS]; + [parameters sdl_setObject:gps forName:SDLRPCParameterNameGPS]; } - (nullable SDLVehicleDataResult *)gps { - return [parameters sdl_objectForName:SDLNameGPS ofClass:SDLVehicleDataResult.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameGPS ofClass:SDLVehicleDataResult.class]; } - (void)setSpeed:(nullable SDLVehicleDataResult *)speed { - [parameters sdl_setObject:speed forName:SDLNameSpeed]; + [parameters sdl_setObject:speed forName:SDLRPCParameterNameSpeed]; } - (nullable SDLVehicleDataResult *)speed { - return [parameters sdl_objectForName:SDLNameSpeed ofClass:SDLVehicleDataResult.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameSpeed ofClass:SDLVehicleDataResult.class]; } - (void)setRpm:(nullable SDLVehicleDataResult *)rpm { - [parameters sdl_setObject:rpm forName:SDLNameRPM]; + [parameters sdl_setObject:rpm forName:SDLRPCParameterNameRPM]; } - (nullable SDLVehicleDataResult *)rpm { - return [parameters sdl_objectForName:SDLNameRPM ofClass:SDLVehicleDataResult.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameRPM ofClass:SDLVehicleDataResult.class]; } - (void)setFuelLevel:(nullable SDLVehicleDataResult *)fuelLevel { - [parameters sdl_setObject:fuelLevel forName:SDLNameFuelLevel]; + [parameters sdl_setObject:fuelLevel forName:SDLRPCParameterNameFuelLevel]; } - (nullable SDLVehicleDataResult *)fuelLevel { - return [parameters sdl_objectForName:SDLNameFuelLevel ofClass:SDLVehicleDataResult.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameFuelLevel ofClass:SDLVehicleDataResult.class]; } - (void)setFuelLevel_State:(nullable SDLVehicleDataResult *)fuelLevel_State { - [parameters sdl_setObject:fuelLevel_State forName:SDLNameFuelLevelState]; + [parameters sdl_setObject:fuelLevel_State forName:SDLRPCParameterNameFuelLevelState]; } - (nullable SDLVehicleDataResult *)fuelLevel_State { - return [parameters sdl_objectForName:SDLNameFuelLevelState ofClass:SDLVehicleDataResult.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameFuelLevelState ofClass:SDLVehicleDataResult.class]; } - (void)setFuelRange:(nullable SDLVehicleDataResult *)fuelRange { - [parameters sdl_setObject:fuelRange forName:SDLNameFuelRange]; + [parameters sdl_setObject:fuelRange forName:SDLRPCParameterNameFuelRange]; } - (nullable SDLVehicleDataResult *)fuelRange { - return [parameters sdl_objectForName:SDLNameFuelRange ofClass:SDLVehicleDataResult.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameFuelRange ofClass:SDLVehicleDataResult.class]; } - (void)setInstantFuelConsumption:(nullable SDLVehicleDataResult *)instantFuelConsumption { - [parameters sdl_setObject:instantFuelConsumption forName:SDLNameInstantFuelConsumption]; + [parameters sdl_setObject:instantFuelConsumption forName:SDLRPCParameterNameInstantFuelConsumption]; } - (nullable SDLVehicleDataResult *)instantFuelConsumption { - return [parameters sdl_objectForName:SDLNameInstantFuelConsumption ofClass:SDLVehicleDataResult.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameInstantFuelConsumption ofClass:SDLVehicleDataResult.class]; } - (void)setExternalTemperature:(nullable SDLVehicleDataResult *)externalTemperature { - [parameters sdl_setObject:externalTemperature forName:SDLNameExternalTemperature]; + [parameters sdl_setObject:externalTemperature forName:SDLRPCParameterNameExternalTemperature]; } - (nullable SDLVehicleDataResult *)externalTemperature { - return [parameters sdl_objectForName:SDLNameExternalTemperature ofClass:SDLVehicleDataResult.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameExternalTemperature ofClass:SDLVehicleDataResult.class]; } - (void)setPrndl:(nullable SDLVehicleDataResult *)prndl { - [parameters sdl_setObject:prndl forName:SDLNamePRNDL]; + [parameters sdl_setObject:prndl forName:SDLRPCParameterNamePRNDL]; } - (nullable SDLVehicleDataResult *)prndl { - return [parameters sdl_objectForName:SDLNamePRNDL ofClass:SDLVehicleDataResult.class]; + return [parameters sdl_objectForName:SDLRPCParameterNamePRNDL ofClass:SDLVehicleDataResult.class]; } - (void)setTirePressure:(nullable SDLVehicleDataResult *)tirePressure { - [parameters sdl_setObject:tirePressure forName:SDLNameTirePressure]; + [parameters sdl_setObject:tirePressure forName:SDLRPCParameterNameTirePressure]; } - (nullable SDLVehicleDataResult *)tirePressure { - return [parameters sdl_objectForName:SDLNameTirePressure ofClass:SDLVehicleDataResult.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameTirePressure ofClass:SDLVehicleDataResult.class]; } - (void)setOdometer:(nullable SDLVehicleDataResult *)odometer { - [parameters sdl_setObject:odometer forName:SDLNameOdometer]; + [parameters sdl_setObject:odometer forName:SDLRPCParameterNameOdometer]; } - (nullable SDLVehicleDataResult *)odometer { - return [parameters sdl_objectForName:SDLNameOdometer ofClass:SDLVehicleDataResult.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameOdometer ofClass:SDLVehicleDataResult.class]; } - (void)setBeltStatus:(nullable SDLVehicleDataResult *)beltStatus { - [parameters sdl_setObject:beltStatus forName:SDLNameBeltStatus]; + [parameters sdl_setObject:beltStatus forName:SDLRPCParameterNameBeltStatus]; } - (nullable SDLVehicleDataResult *)beltStatus { - return [parameters sdl_objectForName:SDLNameBeltStatus ofClass:SDLVehicleDataResult.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameBeltStatus ofClass:SDLVehicleDataResult.class]; } - (void)setBodyInformation:(nullable SDLVehicleDataResult *)bodyInformation { - [parameters sdl_setObject:bodyInformation forName:SDLNameBodyInformation]; + [parameters sdl_setObject:bodyInformation forName:SDLRPCParameterNameBodyInformation]; } - (nullable SDLVehicleDataResult *)bodyInformation { - return [parameters sdl_objectForName:SDLNameBodyInformation ofClass:SDLVehicleDataResult.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameBodyInformation ofClass:SDLVehicleDataResult.class]; } - (void)setDeviceStatus:(nullable SDLVehicleDataResult *)deviceStatus { - [parameters sdl_setObject:deviceStatus forName:SDLNameDeviceStatus]; + [parameters sdl_setObject:deviceStatus forName:SDLRPCParameterNameDeviceStatus]; } - (nullable SDLVehicleDataResult *)deviceStatus { - return [parameters sdl_objectForName:SDLNameDeviceStatus ofClass:SDLVehicleDataResult.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameDeviceStatus ofClass:SDLVehicleDataResult.class]; } - (void)setDriverBraking:(nullable SDLVehicleDataResult *)driverBraking { - [parameters sdl_setObject:driverBraking forName:SDLNameDriverBraking]; + [parameters sdl_setObject:driverBraking forName:SDLRPCParameterNameDriverBraking]; } - (nullable SDLVehicleDataResult *)driverBraking { - return [parameters sdl_objectForName:SDLNameDriverBraking ofClass:SDLVehicleDataResult.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameDriverBraking ofClass:SDLVehicleDataResult.class]; } - (void)setWiperStatus:(nullable SDLVehicleDataResult *)wiperStatus { - [parameters sdl_setObject:wiperStatus forName:SDLNameWiperStatus]; + [parameters sdl_setObject:wiperStatus forName:SDLRPCParameterNameWiperStatus]; } - (nullable SDLVehicleDataResult *)wiperStatus { - return [parameters sdl_objectForName:SDLNameWiperStatus ofClass:SDLVehicleDataResult.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameWiperStatus ofClass:SDLVehicleDataResult.class]; } - (void)setHeadLampStatus:(nullable SDLVehicleDataResult *)headLampStatus { - [parameters sdl_setObject:headLampStatus forName:SDLNameHeadLampStatus]; + [parameters sdl_setObject:headLampStatus forName:SDLRPCParameterNameHeadLampStatus]; } - (nullable SDLVehicleDataResult *)headLampStatus { - return [parameters sdl_objectForName:SDLNameHeadLampStatus ofClass:SDLVehicleDataResult.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameHeadLampStatus ofClass:SDLVehicleDataResult.class]; } - (void)setEngineOilLife:(nullable SDLVehicleDataResult *)engineOilLife { - [parameters sdl_setObject:engineOilLife forName:SDLNameEngineOilLife]; + [parameters sdl_setObject:engineOilLife forName:SDLRPCParameterNameEngineOilLife]; } - (nullable SDLVehicleDataResult *)engineOilLife { - return [parameters sdl_objectForName:SDLNameEngineOilLife]; + return [parameters sdl_objectForName:SDLRPCParameterNameEngineOilLife]; } - (void)setEngineTorque:(nullable SDLVehicleDataResult *)engineTorque { - [parameters sdl_setObject:engineTorque forName:SDLNameEngineTorque]; + [parameters sdl_setObject:engineTorque forName:SDLRPCParameterNameEngineTorque]; } - (nullable SDLVehicleDataResult *)engineTorque { - return [parameters sdl_objectForName:SDLNameEngineTorque ofClass:SDLVehicleDataResult.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameEngineTorque ofClass:SDLVehicleDataResult.class]; } - (void)setAccPedalPosition:(nullable SDLVehicleDataResult *)accPedalPosition { - [parameters sdl_setObject:accPedalPosition forName:SDLNameAccelerationPedalPosition]; + [parameters sdl_setObject:accPedalPosition forName:SDLRPCParameterNameAccelerationPedalPosition]; } - (nullable SDLVehicleDataResult *)accPedalPosition { - return [parameters sdl_objectForName:SDLNameAccelerationPedalPosition ofClass:SDLVehicleDataResult.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameAccelerationPedalPosition ofClass:SDLVehicleDataResult.class]; } - (void)setSteeringWheelAngle:(nullable SDLVehicleDataResult *)steeringWheelAngle { - [parameters sdl_setObject:steeringWheelAngle forName:SDLNameSteeringWheelAngle]; + [parameters sdl_setObject:steeringWheelAngle forName:SDLRPCParameterNameSteeringWheelAngle]; } - (nullable SDLVehicleDataResult *)steeringWheelAngle { - return [parameters sdl_objectForName:SDLNameSteeringWheelAngle ofClass:SDLVehicleDataResult.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameSteeringWheelAngle ofClass:SDLVehicleDataResult.class]; } - (void)setECallInfo:(nullable SDLVehicleDataResult *)eCallInfo { - [parameters sdl_setObject:eCallInfo forName:SDLNameECallInfo]; + [parameters sdl_setObject:eCallInfo forName:SDLRPCParameterNameECallInfo]; } - (nullable SDLVehicleDataResult *)eCallInfo { - return [parameters sdl_objectForName:SDLNameECallInfo ofClass:SDLVehicleDataResult.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameECallInfo ofClass:SDLVehicleDataResult.class]; } - (void)setAirbagStatus:(nullable SDLVehicleDataResult *)airbagStatus { - [parameters sdl_setObject:airbagStatus forName:SDLNameAirbagStatus]; + [parameters sdl_setObject:airbagStatus forName:SDLRPCParameterNameAirbagStatus]; } - (nullable SDLVehicleDataResult *)airbagStatus { - return [parameters sdl_objectForName:SDLNameAirbagStatus ofClass:SDLVehicleDataResult.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameAirbagStatus ofClass:SDLVehicleDataResult.class]; } - (void)setEmergencyEvent:(nullable SDLVehicleDataResult *)emergencyEvent { - [parameters sdl_setObject:emergencyEvent forName:SDLNameEmergencyEvent]; + [parameters sdl_setObject:emergencyEvent forName:SDLRPCParameterNameEmergencyEvent]; } - (nullable SDLVehicleDataResult *)emergencyEvent { - return [parameters sdl_objectForName:SDLNameEmergencyEvent ofClass:SDLVehicleDataResult.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameEmergencyEvent ofClass:SDLVehicleDataResult.class]; } - (void)setClusterModes:(nullable SDLVehicleDataResult *)clusterModes { - [parameters sdl_setObject:clusterModes forName:SDLNameClusterModes]; + [parameters sdl_setObject:clusterModes forName:SDLRPCParameterNameClusterModes]; } - (nullable SDLVehicleDataResult *)clusterModes { - return [parameters sdl_objectForName:SDLNameClusterModes ofClass:SDLVehicleDataResult.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameClusterModes ofClass:SDLVehicleDataResult.class]; } - (void)setMyKey:(nullable SDLVehicleDataResult *)myKey { - [parameters sdl_setObject:myKey forName:SDLNameMyKey]; + [parameters sdl_setObject:myKey forName:SDLRPCParameterNameMyKey]; } - (nullable SDLVehicleDataResult *)myKey { - return [parameters sdl_objectForName:SDLNameMyKey ofClass:SDLVehicleDataResult.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameMyKey ofClass:SDLVehicleDataResult.class]; } - (void)setElectronicParkBrakeStatus:(nullable SDLVehicleDataResult *)electronicParkBrakeStatus { - [parameters sdl_setObject:electronicParkBrakeStatus forName:SDLNameElectronicParkBrakeStatus]; + [parameters sdl_setObject:electronicParkBrakeStatus forName:SDLRPCParameterNameElectronicParkBrakeStatus]; } - (nullable SDLVehicleDataResult *)electronicParkBrakeStatus { - return [parameters sdl_objectForName:SDLNameElectronicParkBrakeStatus ofClass:[SDLVehicleDataResult class]]; + return [parameters sdl_objectForName:SDLRPCParameterNameElectronicParkBrakeStatus ofClass:[SDLVehicleDataResult class]]; } - (void)setTurnSignal:(nullable SDLVehicleDataResult *)turnSignal { - [parameters sdl_setObject:turnSignal forName:SDLNameTurnSignal]; + [parameters sdl_setObject:turnSignal forName:SDLRPCParameterNameTurnSignal]; } - (nullable SDLVehicleDataResult *)turnSignal { - return [parameters sdl_objectForName:SDLNameTurnSignal ofClass:SDLVehicleDataResult.class]; + return [parameters sdl_objectForName:SDLRPCParameterNameTurnSignal ofClass:SDLVehicleDataResult.class]; } - (void)setCloudAppVehicleID:(nullable SDLVehicleDataResult *)cloudAppVehicleID { diff --git a/SmartDeviceLink/SDLUnsubscribeWayPoints.m b/SmartDeviceLink/SDLUnsubscribeWayPoints.m index 4504eba66..a086688e5 100644 --- a/SmartDeviceLink/SDLUnsubscribeWayPoints.m +++ b/SmartDeviceLink/SDLUnsubscribeWayPoints.m @@ -4,14 +4,15 @@ #import "SDLUnsubscribeWayPoints.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLUnsubscribeWayPoints - (instancetype)init { - if (self = [super initWithName:SDLNameUnsubscribeWayPoints]) { + if (self = [super initWithName:SDLRPCFunctionNameUnsubscribeWayPoints]) { } return self; } diff --git a/SmartDeviceLink/SDLUnsubscribeWayPointsResponse.m b/SmartDeviceLink/SDLUnsubscribeWayPointsResponse.m index 2db5d017f..4d48fb340 100644 --- a/SmartDeviceLink/SDLUnsubscribeWayPointsResponse.m +++ b/SmartDeviceLink/SDLUnsubscribeWayPointsResponse.m @@ -4,14 +4,15 @@ #import "SDLUnsubscribeWayPointsResponse.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLUnsubscribeWayPointsResponse - (instancetype)init { - if (self = [super initWithName:SDLNameUnsubscribeWayPoints]) { + if (self = [super initWithName:SDLRPCFunctionNameUnsubscribeWayPoints]) { } return self; } diff --git a/SmartDeviceLink/SDLUpdateTurnList.m b/SmartDeviceLink/SDLUpdateTurnList.m index b6361f666..c4cad5a40 100644 --- a/SmartDeviceLink/SDLUpdateTurnList.m +++ b/SmartDeviceLink/SDLUpdateTurnList.m @@ -5,7 +5,8 @@ #import "SDLUpdateTurnList.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" #import "SDLSoftButton.h" #import "SDLTurn.h" @@ -14,7 +15,7 @@ NS_ASSUME_NONNULL_BEGIN @implementation SDLUpdateTurnList - (instancetype)init { - if (self = [super initWithName:SDLNameUpdateTurnList]) { + if (self = [super initWithName:SDLRPCFunctionNameUpdateTurnList]) { } return self; } @@ -32,19 +33,19 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setTurnList:(nullable NSArray<SDLTurn *> *)turnList { - [parameters sdl_setObject:turnList forName:SDLNameTurnList]; + [parameters sdl_setObject:turnList forName:SDLRPCParameterNameTurnList]; } - (nullable NSArray<SDLTurn *> *)turnList { - return [parameters sdl_objectsForName:SDLNameTurnList ofClass:SDLTurn.class]; + return [parameters sdl_objectsForName:SDLRPCParameterNameTurnList ofClass:SDLTurn.class]; } - (void)setSoftButtons:(nullable NSArray<SDLSoftButton *> *)softButtons { - [parameters sdl_setObject:softButtons forName:SDLNameSoftButtons]; + [parameters sdl_setObject:softButtons forName:SDLRPCParameterNameSoftButtons]; } - (nullable NSArray<SDLSoftButton *> *)softButtons { - return [parameters sdl_objectsForName:SDLNameSoftButtons ofClass:SDLSoftButton.class]; + return [parameters sdl_objectsForName:SDLRPCParameterNameSoftButtons ofClass:SDLSoftButton.class]; } @end diff --git a/SmartDeviceLink/SDLUpdateTurnListResponse.m b/SmartDeviceLink/SDLUpdateTurnListResponse.m index d77ded773..2759e6e26 100644 --- a/SmartDeviceLink/SDLUpdateTurnListResponse.m +++ b/SmartDeviceLink/SDLUpdateTurnListResponse.m @@ -5,14 +5,15 @@ #import "SDLUpdateTurnListResponse.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLUpdateTurnListResponse - (instancetype)init { - if (self = [super initWithName:SDLNameUpdateTurnList]) { + if (self = [super initWithName:SDLRPCFunctionNameUpdateTurnList]) { } return self; } diff --git a/SmartDeviceLink/SDLV2ProtocolMessage.m b/SmartDeviceLink/SDLV2ProtocolMessage.m index 65694651e..4e50b6df1 100644 --- a/SmartDeviceLink/SDLV2ProtocolMessage.m +++ b/SmartDeviceLink/SDLV2ProtocolMessage.m @@ -6,6 +6,7 @@ #import "SDLLogMacros.h" #import "SDLProtocolHeader.h" #import "SDLRPCPayload.h" +#import "SDLRPCParameterNames.h" NS_ASSUME_NONNULL_BEGIN @@ -36,8 +37,8 @@ NS_ASSUME_NONNULL_BEGIN // Create the inner dictionary with the RPC properties NSMutableDictionary <NSString *, id> *innerDictionary = [[NSMutableDictionary alloc] init]; NSString *functionName = [[SDLFunctionID sharedInstance] functionNameForId:rpcPayload.functionID]; - innerDictionary[SDLNameOperationName] = functionName; - innerDictionary[SDLNameCorrelationId] = @(rpcPayload.correlationID); + innerDictionary[SDLRPCParameterNameOperationName] = functionName; + innerDictionary[SDLRPCParameterNameCorrelationId] = @(rpcPayload.correlationID); // Get the json data from the struct if (rpcPayload.jsonData) { @@ -46,18 +47,18 @@ NS_ASSUME_NONNULL_BEGIN if (error != nil) { SDLLogE(@"Error decoding JSON data: %@", error); } else if (jsonDictionary) { - [innerDictionary setObject:jsonDictionary forKey:SDLNameParameters]; + [innerDictionary setObject:jsonDictionary forKey:SDLRPCParameterNameParameters]; } } // Store it in the containing dictionary UInt8 rpcType = rpcPayload.rpcType; - NSArray<NSString *> *rpcTypeNames = @[SDLNameRequest, SDLNameResponse, SDLNameNotification]; + NSArray<NSString *> *rpcTypeNames = @[SDLRPCParameterNameRequest, SDLRPCParameterNameResponse, SDLRPCParameterNameNotification]; [rpcMessageAsDictionary setObject:innerDictionary forKey:rpcTypeNames[rpcType]]; // The bulk data also goes in the dictionary if (rpcPayload.binaryData) { - [rpcMessageAsDictionary setObject:rpcPayload.binaryData forKey:SDLNameBulkData]; + [rpcMessageAsDictionary setObject:rpcPayload.binaryData forKey:SDLRPCParameterNameBulkData]; } return rpcMessageAsDictionary; diff --git a/SmartDeviceLink/SDLVehicleDataResult.m b/SmartDeviceLink/SDLVehicleDataResult.m index 3f4585076..52d6225a8 100644 --- a/SmartDeviceLink/SDLVehicleDataResult.m +++ b/SmartDeviceLink/SDLVehicleDataResult.m @@ -4,26 +4,26 @@ #import "SDLVehicleDataResult.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLVehicleDataResult - (void)setDataType:(SDLVehicleDataType)dataType { - [store sdl_setObject:dataType forName:SDLNameDataType]; + [store sdl_setObject:dataType forName:SDLRPCParameterNameDataType]; } - (SDLVehicleDataType)dataType { - return [store sdl_objectForName:SDLNameDataType]; + return [store sdl_objectForName:SDLRPCParameterNameDataType]; } - (void)setResultCode:(SDLVehicleDataResultCode)resultCode { - [store sdl_setObject:resultCode forName:SDLNameResultCode]; + [store sdl_setObject:resultCode forName:SDLRPCParameterNameResultCode]; } - (SDLVehicleDataResultCode)resultCode { - return [store sdl_objectForName:SDLNameResultCode]; + return [store sdl_objectForName:SDLRPCParameterNameResultCode]; } @end diff --git a/SmartDeviceLink/SDLVehicleType.m b/SmartDeviceLink/SDLVehicleType.m index 73e98aa20..f41f5bec3 100644 --- a/SmartDeviceLink/SDLVehicleType.m +++ b/SmartDeviceLink/SDLVehicleType.m @@ -5,42 +5,42 @@ #import "SDLVehicleType.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" NS_ASSUME_NONNULL_BEGIN @implementation SDLVehicleType - (void)setMake:(nullable NSString *)make { - [store sdl_setObject:make forName:SDLNameMake]; + [store sdl_setObject:make forName:SDLRPCParameterNameMake]; } - (nullable NSString *)make { - return [store sdl_objectForName:SDLNameMake]; + return [store sdl_objectForName:SDLRPCParameterNameMake]; } - (void)setModel:(nullable NSString *)model { - [store sdl_setObject:model forName:SDLNameModel]; + [store sdl_setObject:model forName:SDLRPCParameterNameModel]; } - (nullable NSString *)model { - return [store sdl_objectForName:SDLNameModel]; + return [store sdl_objectForName:SDLRPCParameterNameModel]; } - (void)setModelYear:(nullable NSString *)modelYear { - [store sdl_setObject:modelYear forName:SDLNameModelYear]; + [store sdl_setObject:modelYear forName:SDLRPCParameterNameModelYear]; } - (nullable NSString *)modelYear { - return [store sdl_objectForName:SDLNameModelYear]; + return [store sdl_objectForName:SDLRPCParameterNameModelYear]; } - (void)setTrim:(nullable NSString *)trim { - [store sdl_setObject:trim forName:SDLNameTrim]; + [store sdl_setObject:trim forName:SDLRPCParameterNameTrim]; } - (nullable NSString *)trim { - return [store sdl_objectForName:SDLNameTrim]; + return [store sdl_objectForName:SDLRPCParameterNameTrim]; } @end diff --git a/SmartDeviceLink/SDLVideoStreamingCapability.m b/SmartDeviceLink/SDLVideoStreamingCapability.m index c5f5ae26c..5593c27d9 100644 --- a/SmartDeviceLink/SDLVideoStreamingCapability.m +++ b/SmartDeviceLink/SDLVideoStreamingCapability.m @@ -11,7 +11,7 @@ #import "SDLVideoStreamingFormat.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" NS_ASSUME_NONNULL_BEGIN @@ -32,35 +32,35 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setPreferredResolution:(nullable SDLImageResolution *)preferredResolution { - [store sdl_setObject:preferredResolution forName:SDLNamePreferredResolution]; + [store sdl_setObject:preferredResolution forName:SDLRPCParameterNamePreferredResolution]; } - (nullable SDLImageResolution *)preferredResolution { - return [store sdl_objectForName:SDLNamePreferredResolution ofClass:SDLImageResolution.class]; + return [store sdl_objectForName:SDLRPCParameterNamePreferredResolution ofClass:SDLImageResolution.class]; } - (void)setMaxBitrate:(nullable NSNumber<SDLInt> *)maxBitrate { - [store sdl_setObject:maxBitrate forName:SDLNameMaxBitrate]; + [store sdl_setObject:maxBitrate forName:SDLRPCParameterNameMaxBitrate]; } - (nullable NSNumber<SDLInt> *)maxBitrate { - return [store sdl_objectForName:SDLNameMaxBitrate]; + return [store sdl_objectForName:SDLRPCParameterNameMaxBitrate]; } - (void)setSupportedFormats:(nullable NSArray<SDLVideoStreamingFormat *> *)supportedFormats { - [store sdl_setObject:supportedFormats forName:SDLNameSupportedFormats]; + [store sdl_setObject:supportedFormats forName:SDLRPCParameterNameSupportedFormats]; } - (nullable NSArray<SDLVideoStreamingFormat *> *)supportedFormats { - return [store sdl_objectsForName:SDLNameSupportedFormats ofClass:SDLVideoStreamingFormat.class]; + return [store sdl_objectsForName:SDLRPCParameterNameSupportedFormats ofClass:SDLVideoStreamingFormat.class]; } - (void)setHapticSpatialDataSupported:(nullable NSNumber<SDLBool> *)hapticSpatialDataSupported { - [store sdl_setObject:hapticSpatialDataSupported forName:SDLNameHapticSpatialDataSupported]; + [store sdl_setObject:hapticSpatialDataSupported forName:SDLRPCParameterNameHapticSpatialDataSupported]; } - (nullable NSNumber<SDLBool> *)hapticSpatialDataSupported { - return [store sdl_objectForName:SDLNameHapticSpatialDataSupported]; + return [store sdl_objectForName:SDLRPCParameterNameHapticSpatialDataSupported]; } @end diff --git a/SmartDeviceLink/SDLVideoStreamingFormat.m b/SmartDeviceLink/SDLVideoStreamingFormat.m index 35c639537..bbae3ffca 100644 --- a/SmartDeviceLink/SDLVideoStreamingFormat.m +++ b/SmartDeviceLink/SDLVideoStreamingFormat.m @@ -8,7 +8,7 @@ #import "SDLVideoStreamingFormat.h" #import "NSMutableDictionary+Store.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" NS_ASSUME_NONNULL_BEGIN @@ -25,19 +25,19 @@ NS_ASSUME_NONNULL_BEGIN } - (SDLVideoStreamingProtocol)protocol { - return [store sdl_objectForName:SDLNameVideoProtocol]; + return [store sdl_objectForName:SDLRPCParameterNameVideoProtocol]; } - (void)setProtocol:(SDLVideoStreamingProtocol)protocol { - [store sdl_setObject:protocol forName:SDLNameVideoProtocol]; + [store sdl_setObject:protocol forName:SDLRPCParameterNameVideoProtocol]; } - (SDLVideoStreamingCodec)codec { - return [store sdl_objectForName:SDLNameVideoCodec]; + return [store sdl_objectForName:SDLRPCParameterNameVideoCodec]; } - (void)setCodec:(SDLVideoStreamingCodec)codec { - [store sdl_setObject:codec forName:SDLNameVideoCodec]; + [store sdl_setObject:codec forName:SDLRPCParameterNameVideoCodec]; } @end diff --git a/SmartDeviceLink/SDLVrHelpItem.m b/SmartDeviceLink/SDLVrHelpItem.m index 4136578fe..7aa1c962f 100644 --- a/SmartDeviceLink/SDLVrHelpItem.m +++ b/SmartDeviceLink/SDLVrHelpItem.m @@ -6,7 +6,7 @@ #import "NSMutableDictionary+Store.h" #import "SDLImage.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" NS_ASSUME_NONNULL_BEGIN @@ -36,27 +36,27 @@ NS_ASSUME_NONNULL_BEGIN } - (void)setText:(NSString *)text { - [store sdl_setObject:text forName:SDLNameText]; + [store sdl_setObject:text forName:SDLRPCParameterNameText]; } - (NSString *)text { - return [store sdl_objectForName:SDLNameText]; + return [store sdl_objectForName:SDLRPCParameterNameText]; } - (void)setImage:(nullable SDLImage *)image { - [store sdl_setObject:image forName:SDLNameImage]; + [store sdl_setObject:image forName:SDLRPCParameterNameImage]; } - (nullable SDLImage *)image { - return [store sdl_objectForName:SDLNameImage ofClass:SDLImage.class]; + return [store sdl_objectForName:SDLRPCParameterNameImage ofClass:SDLImage.class]; } - (void)setPosition:(NSNumber<SDLInt> *)position { - [store sdl_setObject:position forName:SDLNamePosition]; + [store sdl_setObject:position forName:SDLRPCParameterNamePosition]; } - (NSNumber<SDLInt> *)position { - return [store sdl_objectForName:SDLNamePosition]; + return [store sdl_objectForName:SDLRPCParameterNamePosition]; } @end diff --git a/SmartDeviceLink/SDLWeatherAlert.h b/SmartDeviceLink/SDLWeatherAlert.h new file mode 100644 index 000000000..29a7824e7 --- /dev/null +++ b/SmartDeviceLink/SDLWeatherAlert.h @@ -0,0 +1,73 @@ +// +// SDLWeatherAlert.h +// SmartDeviceLink +// +// Created by Nicole on 2/6/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import "SDLRPCRequest.h" +#import "SDLDateTime.h" + +NS_ASSUME_NONNULL_BEGIN + +@interface SDLWeatherAlert : SDLRPCStruct + +/** + * Convenience init for all parameters + * + * @param title The title of the alert + * @param summary A summary for the alert + * @param expires The date the alert expires + * @param regions Regions affected + * @param severity Severity + * @param timeIssued The date the alert was issued + * @return A SDLWeatherAlert alert + */ +- (instancetype)initWithTitle:(nullable NSString *)title summary:(nullable NSString *)summary expires:(nullable SDLDateTime *)expires regions:(nullable NSArray<NSString *> *)regions severity:(nullable NSString *)severity timeIssued:(nullable SDLDateTime *)timeIssued; + +/** + * The title of the alert. + * + * String, Optional + */ +@property (nullable, strong, nonatomic) NSString *title; + +/** + * A summary for the alert. + * + * String, Optional + */ +@property (nullable, strong, nonatomic) NSString *summary; + +/** + * The date the alert expires. + * + * SDLDateTime, Optional + */ +@property (nullable, strong, nonatomic) SDLDateTime *expires; + +/** + * Regions affected. + * + * Array of Strings, Optional, minsize="1" maxsize="99" + */ +@property (nullable, strong, nonatomic) NSArray<NSString *> *regions; + +/** + * Severity of the weather alert. + * + * String, Optional + */ +@property (nullable, strong, nonatomic) NSString *severity; + +/** + * The date the alert was issued. + * + * SDLDateTime, Optional + */ +@property (nullable, strong, nonatomic) SDLDateTime *timeIssued; + +@end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLWeatherAlert.m b/SmartDeviceLink/SDLWeatherAlert.m new file mode 100644 index 000000000..7568ec924 --- /dev/null +++ b/SmartDeviceLink/SDLWeatherAlert.m @@ -0,0 +1,84 @@ +// +// SDLWeatherAlert.m +// SmartDeviceLink +// +// Created by Nicole on 2/6/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import "SDLWeatherAlert.h" + +#import "NSMutableDictionary+Store.h" +#import "SDLRPCParameterNames.h" + +NS_ASSUME_NONNULL_BEGIN + +@implementation SDLWeatherAlert + +- (instancetype)initWithTitle:(nullable NSString *)title summary:(nullable NSString *)summary expires:(nullable SDLDateTime *)expires regions:(nullable NSArray<NSString *> *)regions severity:(nullable NSString *)severity timeIssued:(nullable SDLDateTime *)timeIssued { + self = [self init]; + if (!self) { + return nil; + } + + self.title = title; + self.summary = summary; + self.expires = expires; + self.regions = regions; + self.severity = severity; + self.timeIssued = timeIssued; + + return self; +} + +- (void)setTitle:(nullable NSString *)title { + [store sdl_setObject:title forName:SDLRPCParameterNameTitle]; +} + +- (nullable NSString *)title { + return [store sdl_objectForName:SDLRPCParameterNameTitle]; +} + +- (void)setSummary:(nullable NSString *)summary { + [store sdl_setObject:summary forName:SDLRPCParameterNameSummary]; +} + +- (nullable NSString *)summary { + return [store sdl_objectForName:SDLRPCParameterNameSummary]; +} + +- (void)setExpires:(nullable SDLDateTime *)expires { + [store sdl_setObject:expires forName:SDLRPCParameterNameExpires]; +} + +- (nullable SDLDateTime *)expires { + return [store sdl_objectForName:SDLRPCParameterNameExpires ofClass:SDLDateTime.class]; +} + +- (void)setRegions:(nullable NSArray<NSString *> *)regions { + [store sdl_setObject:regions forName:SDLRPCParameterNameRegions]; +} + +- (nullable NSArray<NSString *> *)regions { + return [store sdl_objectForName:SDLRPCParameterNameRegions]; +} + +- (void)setSeverity:(nullable NSString *)severity { + [store sdl_setObject:severity forName:SDLRPCParameterNameSeverity]; +} + +- (nullable NSString *)severity { + return [store sdl_objectForName:SDLRPCParameterNameSeverity]; +} + +- (void)setTimeIssued:(nullable SDLDateTime *)timeIssued { + [store sdl_setObject:timeIssued forName:SDLRPCParameterNameTimeIssued]; +} + +- (nullable SDLDateTime *)timeIssued { + return [store sdl_objectForName:SDLRPCParameterNameTimeIssued ofClass:SDLDateTime.class]; +} + +@end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLWeatherData.h b/SmartDeviceLink/SDLWeatherData.h new file mode 100644 index 000000000..28bc3a434 --- /dev/null +++ b/SmartDeviceLink/SDLWeatherData.h @@ -0,0 +1,204 @@ +// +// SDLWeatherData.h +// SmartDeviceLink +// +// Created by Nicole on 2/7/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import "SDLRPCRequest.h" + +@class SDLDateTime; +@class SDLTemperature; + + +NS_ASSUME_NONNULL_BEGIN + +@interface SDLWeatherData : SDLRPCStruct + +/** + * Convenience init for all parameters + * + * @param currentTemperature The current temperature + * @param temperatureHigh The predicted high temperature for the day + * @param temperatureLow The predicted low temperature for the day + * @param apparentTemperature The apparent temperature + * @param apparentTemperatureHigh The predicted high apparent temperature for the day + * @param apparentTemperatureLow The predicted low apparent temperature for the day + * @param weatherSummary A summary of the weather + * @param time The time this data refers to + * @param humidity From 0 to 1, percentage humidity + * @param cloudCover From 0 to 1, percentage cloud cover + * @param moonPhase From 0 to 1, percentage of the moon seen, e.g. 0 = no moon, 0.25 = quarter moon + * @param windBearing In degrees, true north at 0 degrees + * @param windGust In km/hr + * @param windSpeed In km/hr + * @param nearestStormBearing In degrees, true north at 0 degrees + * @param nearestStormDistance In km + * @param precipAccumulation In cm + * @param precipIntensity In cm of water per hour + * @param precipProbability From 0 to 1, percentage chance + * @param precipType A description of the precipitation type (e.g. "rain", "snow", "sleet", "hail") + * @param visibility In km + * @param weatherIconImageName Name of the icon + * @return A SDLWeatherData object + */ +- (instancetype)initWithCurrentTemperature:(nullable SDLTemperature *)currentTemperature temperatureHigh:(nullable SDLTemperature *)temperatureHigh temperatureLow:(nullable SDLTemperature *)temperatureLow apparentTemperature:(nullable SDLTemperature *)apparentTemperature apparentTemperatureHigh:(nullable SDLTemperature *)apparentTemperatureHigh apparentTemperatureLow:(nullable SDLTemperature *)apparentTemperatureLow weatherSummary:(nullable NSString *)weatherSummary time:(nullable SDLDateTime *)time humidity:(nullable NSNumber<SDLFloat> *)humidity cloudCover:(nullable NSNumber<SDLFloat> *)cloudCover moonPhase:(nullable NSNumber<SDLFloat> *)moonPhase windBearing:(nullable NSNumber<SDLInt> *)windBearing windGust:(nullable NSNumber<SDLFloat> *)windGust windSpeed:(nullable NSNumber<SDLFloat> *)windSpeed nearestStormBearing:(nullable NSNumber<SDLInt> *)nearestStormBearing nearestStormDistance:(nullable NSNumber<SDLInt> *)nearestStormDistance precipAccumulation:(nullable NSNumber<SDLFloat> *)precipAccumulation precipIntensity:(nullable NSNumber<SDLFloat> *)precipIntensity precipProbability:(nullable NSNumber<SDLFloat> *)precipProbability precipType:(nullable NSString *)precipType visibility:(nullable NSNumber<SDLFloat> *)visibility weatherIconImageName:(nullable NSString *)weatherIconImageName; + +/** + * The current temperature. + * + * SDLTemperature, Optional + */ +@property (nullable, strong, nonatomic) SDLTemperature *currentTemperature; + +/** + * The predicted high temperature for the day. + * + * SDLTemperature, Optional + */ +@property (nullable, strong, nonatomic) SDLTemperature *temperatureHigh; + +/** + * The predicted low temperature for the day. + * + * SDLTemperature, Optional + */ +@property (nullable, strong, nonatomic) SDLTemperature *temperatureLow; + +/** + * The apparent temperature. + * + * SDLTemperature, Optional + */ +@property (nullable, strong, nonatomic) SDLTemperature *apparentTemperature; + +/** + * The predicted high apparent temperature for the day. + * + * SDLTemperature, Optional + */ +@property (nullable, strong, nonatomic) SDLTemperature *apparentTemperatureHigh; + +/** + * The predicted low apparent temperature for the day. + * + * SDLTemperature, Optional + */ +@property (nullable, strong, nonatomic) SDLTemperature *apparentTemperatureLow; + +/** + * A summary of the weather. + * + * String, Optional + */ +@property (nullable, strong, nonatomic) NSString *weatherSummary; + +/** + * The time this data refers to. + * + * SDLDateTime, Optional + */ +@property (nullable, strong, nonatomic) SDLDateTime *time; + +/** + * From 0 to 1, percentage humidity. + * + * Float, Optional, minvalue="0" maxvalue="1" + */ +@property (nullable, strong, nonatomic) NSNumber<SDLFloat> *humidity; + +/** + * From 0 to 1, percentage cloud cover. + * + * Float, Optional, minvalue="0" maxvalue="1" + */ +@property (nullable, strong, nonatomic) NSNumber<SDLFloat> *cloudCover; + +/** + * From 0 to 1, percentage of the moon seen, e.g. 0 = no moon, 0.25 = quarter moon + * + * Float, Optional, minvalue="0" maxvalue="1" + */ +@property (nullable, strong, nonatomic) NSNumber<SDLFloat> *moonPhase; + +/** + * In degrees, true north at 0 degrees. + * + * Integer, Optional + */ +@property (nullable, strong, nonatomic) NSNumber<SDLInt> *windBearing; + +/** + * In km/hr + * + * Float, Optional + */ +@property (nullable, strong, nonatomic) NSNumber<SDLFloat> *windGust; + +/** + * In km/hr + * + * Float, Optional + */ +@property (nullable, strong, nonatomic) NSNumber<SDLFloat> *windSpeed; + +/** + * In degrees, true north at 0 degrees. + * + * Integer, Optional + */ +@property (nullable, strong, nonatomic) NSNumber<SDLInt> *nearestStormBearing; + +/** + * In km + * + * Integer, Optional + */ +@property (nullable, strong, nonatomic) NSNumber<SDLInt> *nearestStormDistance; + +/** + * In cm + * + * Float, Optional + */ +@property (nullable, strong, nonatomic) NSNumber<SDLFloat> *precipAccumulation; + +/** + * In cm of water per hour. + * + * Float, Optional + */ +@property (nullable, strong, nonatomic) NSNumber<SDLFloat> *precipIntensity; + +/** + * From 0 to 1, percentage chance. + * + * Float, Optional, minvalue="0" maxvalue="1" + */ +@property (nullable, strong, nonatomic) NSNumber<SDLFloat> *precipProbability; + +/** + * A description of the precipitation type (e.g. "rain", "snow", "sleet", "hail") + * + * String, Optional + */ +@property (nullable, strong, nonatomic) NSString *precipType; + +/** + * In km + * + * Float, Optional + */ +@property (nullable, strong, nonatomic) NSNumber<SDLFloat> *visibility; + +/** + * Name of the icon + * + * String, Optional + */ +@property (nullable, strong, nonatomic) NSString *weatherIconImageName; + +@end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLWeatherData.m b/SmartDeviceLink/SDLWeatherData.m new file mode 100644 index 000000000..408cdccaa --- /dev/null +++ b/SmartDeviceLink/SDLWeatherData.m @@ -0,0 +1,230 @@ +// +// SDLWeatherData.m +// SmartDeviceLink +// +// Created by Nicole on 2/7/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import "SDLWeatherData.h" + +#import "NSMutableDictionary+Store.h" +#import "SDLDateTime.h" +#import "SDLRPCParameterNames.h" +#import "SDLTemperature.h" + +NS_ASSUME_NONNULL_BEGIN + +@implementation SDLWeatherData + +- (instancetype)initWithCurrentTemperature:(nullable SDLTemperature *)currentTemperature temperatureHigh:(nullable SDLTemperature *)temperatureHigh temperatureLow:(nullable SDLTemperature *)temperatureLow apparentTemperature:(nullable SDLTemperature *)apparentTemperature apparentTemperatureHigh:(nullable SDLTemperature *)apparentTemperatureHigh apparentTemperatureLow:(nullable SDLTemperature *)apparentTemperatureLow weatherSummary:(nullable NSString *)weatherSummary time:(nullable SDLDateTime *)time humidity:(nullable NSNumber<SDLFloat> *)humidity cloudCover:(nullable NSNumber<SDLFloat> *)cloudCover moonPhase:(nullable NSNumber<SDLFloat> *)moonPhase windBearing:(nullable NSNumber<SDLInt> *)windBearing windGust:(nullable NSNumber<SDLFloat> *)windGust windSpeed:(nullable NSNumber<SDLFloat> *)windSpeed nearestStormBearing:(nullable NSNumber<SDLInt> *)nearestStormBearing nearestStormDistance:(nullable NSNumber<SDLInt> *)nearestStormDistance precipAccumulation:(nullable NSNumber<SDLFloat> *)precipAccumulation precipIntensity:(nullable NSNumber<SDLFloat> *)precipIntensity precipProbability:(nullable NSNumber<SDLFloat> *)precipProbability precipType:(nullable NSString *)precipType visibility:(nullable NSNumber<SDLFloat> *)visibility weatherIconImageName:(nullable NSString *)weatherIconImageName { + self = [self init]; + if (!self) { + return nil; + } + + self.currentTemperature = currentTemperature; + self.temperatureHigh = temperatureHigh; + self.temperatureLow = temperatureLow; + self.apparentTemperature = apparentTemperature; + self.apparentTemperatureHigh = apparentTemperatureHigh; + self.apparentTemperatureLow = apparentTemperatureLow; + self.weatherSummary = weatherSummary; + self.time = time; + self.humidity = humidity; + self.cloudCover = cloudCover; + self.moonPhase = moonPhase; + self.windBearing = windBearing; + self.windGust = windGust; + self.windSpeed = windSpeed; + self.nearestStormBearing = nearestStormBearing; + self.nearestStormDistance = nearestStormDistance; + self.precipAccumulation = precipAccumulation; + self.precipIntensity = precipIntensity; + self.precipProbability = precipProbability; + self.precipType = precipType; + self.visibility = visibility; + self.weatherIconImageName = weatherIconImageName; + + return self; +} + +- (void)setCurrentTemperature:(nullable SDLTemperature *)currentTemperature { + [store sdl_setObject:currentTemperature forName:SDLRPCParameterNameCurrentTemperature]; +} + +- (nullable SDLTemperature *)currentTemperature { + return [store sdl_objectForName:SDLRPCParameterNameCurrentTemperature ofClass:SDLTemperature.class]; +} + +- (void)setTemperatureHigh:(nullable SDLTemperature *)temperatureHigh { + [store sdl_setObject:temperatureHigh forName:SDLRPCParameterNameTemperatureHigh]; +} + +- (nullable SDLTemperature *)temperatureHigh { + return [store sdl_objectForName:SDLRPCParameterNameTemperatureHigh ofClass:SDLTemperature.class]; +} + +- (void)setTemperatureLow:(nullable SDLTemperature *)temperatureLow { + [store sdl_setObject:temperatureLow forName:SDLRPCParameterNameTemperatureLow]; +} + +- (nullable SDLTemperature *)temperatureLow { + return [store sdl_objectForName:SDLRPCParameterNameTemperatureLow ofClass:SDLTemperature.class]; +} + +- (void)setApparentTemperature:(nullable SDLTemperature *)apparentTemperature { + [store sdl_setObject:apparentTemperature forName:SDLRPCParameterNameApparentTemperature]; +} + +- (nullable SDLTemperature *)apparentTemperature { + return [store sdl_objectForName:SDLRPCParameterNameApparentTemperature ofClass:SDLTemperature.class]; +} + +- (void)setApparentTemperatureHigh:(nullable SDLTemperature *)apparentTemperatureHigh { + [store sdl_setObject:apparentTemperatureHigh forName:SDLRPCParameterNameApparentTemperatureHigh]; +} + +- (nullable SDLTemperature *)apparentTemperatureHigh { + return [store sdl_objectForName:SDLRPCParameterNameApparentTemperatureHigh ofClass:SDLTemperature.class]; +} + +- (void)setApparentTemperatureLow:(nullable SDLTemperature *)apparentTemperatureLow { + [store sdl_setObject:apparentTemperatureLow forName:SDLRPCParameterNameApparentTemperatureLow]; +} + +- (nullable SDLTemperature *)apparentTemperatureLow { + return [store sdl_objectForName:SDLRPCParameterNameApparentTemperatureLow ofClass:SDLTemperature.class]; +} + +- (void)setWeatherSummary:(nullable NSString *)weatherSummary { + [store sdl_setObject:weatherSummary forName:SDLRPCParameterNameWeatherSummary]; +} + +- (nullable NSString *)weatherSummary { + return [store sdl_objectForName:SDLRPCParameterNameWeatherSummary]; +} + +- (void)setTime:(nullable SDLDateTime *)time { + [store sdl_setObject:time forName:SDLRPCParameterNameTime]; +} + +- (nullable SDLDateTime *)time { + return [store sdl_objectForName:SDLRPCParameterNameTime ofClass:SDLDateTime.class]; +} + +- (void)setHumidity:(nullable NSNumber<SDLFloat> *)humidity { + [store sdl_setObject:humidity forName:SDLRPCParameterNameHumidity]; +} + +- (nullable NSNumber<SDLFloat> *)humidity { + return [store sdl_objectForName:SDLRPCParameterNameHumidity]; +} + +- (void)setCloudCover:(nullable NSNumber<SDLFloat> *)cloudCover { + [store sdl_setObject:cloudCover forName:SDLRPCParameterNameCloudCover]; +} + +- (nullable NSNumber<SDLFloat> *)cloudCover { + return [store sdl_objectForName:SDLRPCParameterNameCloudCover]; +} + +- (void)setMoonPhase:(nullable NSNumber<SDLFloat> *)moonPhase { + [store sdl_setObject:moonPhase forName:SDLRPCParameterNameMoonPhase]; +} + +- (nullable NSNumber<SDLFloat> *)moonPhase { + return [store sdl_objectForName:SDLRPCParameterNameMoonPhase]; +} + +- (void)setWindBearing:(nullable NSNumber<SDLInt> *)windBearing { + [store sdl_setObject:windBearing forName:SDLRPCParameterNameWindBearing]; +} + +- (nullable NSNumber<SDLInt> *)windBearing { + return [store sdl_objectForName:SDLRPCParameterNameWindBearing]; +} + +- (void)setWindGust:(nullable NSNumber<SDLFloat> *)windGust { + [store sdl_setObject:windGust forName:SDLRPCParameterNameWindGust]; +} + +- (nullable NSNumber<SDLFloat> *)windGust { + return [store sdl_objectForName:SDLRPCParameterNameWindGust]; +} + +- (void)setWindSpeed:(nullable NSNumber<SDLFloat> *)windSpeed { + [store sdl_setObject:windSpeed forName:SDLRPCParameterNameWindSpeed]; +} + +- (nullable NSNumber<SDLFloat> *)windSpeed { + return [store sdl_objectForName:SDLRPCParameterNameWindSpeed]; +} + +- (void)setNearestStormBearing:(nullable NSNumber<SDLInt> *)nearestStormBearing { + [store sdl_setObject:nearestStormBearing forName:SDLRPCParameterNameNearestStormBearing]; +} + +- (nullable NSNumber<SDLInt> *)nearestStormBearing { + return [store sdl_objectForName:SDLRPCParameterNameNearestStormBearing]; +} + +- (void)setNearestStormDistance:(nullable NSNumber<SDLInt> *)nearestStormDistance { + [store sdl_setObject:nearestStormDistance forName:SDLRPCParameterNameNearestStormDistance]; +} + +- (nullable NSNumber<SDLInt> *)nearestStormDistance { + return [store sdl_objectForName:SDLRPCParameterNameNearestStormDistance]; +} + +- (void)setPrecipAccumulation:(nullable NSNumber<SDLFloat> *)precipAccumulation { + [store sdl_setObject:precipAccumulation forName:SDLRPCParameterNamePrecipAccumulation]; +} + +- (nullable NSNumber<SDLFloat> *)precipAccumulation { + return [store sdl_objectForName:SDLRPCParameterNamePrecipAccumulation]; +} + +- (void)setPrecipIntensity:(nullable NSNumber<SDLFloat> *)precipIntensity { + [store sdl_setObject:precipIntensity forName:SDLRPCParameterNamePrecipIntensity]; +} + +- (nullable NSNumber<SDLFloat> *)precipIntensity { + return [store sdl_objectForName:SDLRPCParameterNamePrecipIntensity]; +} + +- (void)setPrecipProbability:(nullable NSNumber<SDLFloat> *)precipProbability { + [store sdl_setObject:precipProbability forName:SDLRPCParameterNamePrecipProbability]; +} + +- (nullable NSNumber<SDLFloat> *)precipProbability { + return [store sdl_objectForName:SDLRPCParameterNamePrecipProbability]; +} + +- (void)setPrecipType:(nullable NSString *)precipType { + [store sdl_setObject:precipType forName:SDLRPCParameterNamePrecipType]; +} + +- (nullable NSString *)precipType { + return [store sdl_objectForName:SDLRPCParameterNamePrecipType]; +} + +- (void)setVisibility:(nullable NSNumber<SDLFloat> *)visibility { + [store sdl_setObject:visibility forName:SDLRPCParameterNameVisibility]; +} + +- (nullable NSNumber<SDLFloat> *)visibility { + return [store sdl_objectForName:SDLRPCParameterNameVisibility]; +} + +- (void)setWeatherIconImageName:(nullable NSString *)weatherIconImageName { + [store sdl_setObject:weatherIconImageName forName:SDLRPCParameterNameWeatherIconImageName]; +} + +- (nullable NSString *)weatherIconImageName { + return [store sdl_objectForName:SDLRPCParameterNameWeatherIconImageName]; +} + +@end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLWeatherServiceData.h b/SmartDeviceLink/SDLWeatherServiceData.h new file mode 100644 index 000000000..488e30fb3 --- /dev/null +++ b/SmartDeviceLink/SDLWeatherServiceData.h @@ -0,0 +1,87 @@ +// +// SDLWeatherServiceData.h +// SmartDeviceLink +// +// Created by Nicole on 2/7/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import "SDLRPCRequest.h" + +#import "SDLLocationDetails.h" +#import "SDLWeatherData.h" +#import "SDLWeatherAlert.h" + +NS_ASSUME_NONNULL_BEGIN + +/** + * This data is related to what a weather service would provide. + */ +@interface SDLWeatherServiceData : SDLRPCStruct + +/** + * Convenience init for required parameters. + * + * @param location The location + * @return A SDLWeatherServiceData object + */ +- (instancetype)initWithLocation:(SDLLocationDetails *)location NS_DESIGNATED_INITIALIZER; + +/** + * Convenience init for all parameters. + * + * @param location The location + * @param currentForecast The current forecast + * @param minuteForecast A minute-by-minute array of forecasts + * @param hourlyForecast An hour-by-hour array of forecasts + * @param multidayForecast A day-by-day array of forecasts + * @param alerts An array of weather alerts + * @return A SDLWeatherServiceData object + */ +- (instancetype)initWithLocation:(SDLLocationDetails *)location currentForecast:(nullable SDLWeatherData *)currentForecast minuteForecast:(nullable NSArray<SDLWeatherData *> *)minuteForecast hourlyForecast:(nullable NSArray<SDLWeatherData *> *)hourlyForecast multidayForecast:(nullable NSArray<SDLWeatherData *> *)multidayForecast alerts:(nullable NSArray<SDLWeatherAlert *> *)alerts; + +/** + * The location. + * + * SDLLocationDetails, Required + */ +@property (strong, nonatomic) SDLLocationDetails *location; + +/** + * The current forecast. + * + * SDLWeatherData, Optional + */ +@property (nullable, strong, nonatomic) SDLWeatherData *currentForecast; + +/** + * A minute-by-minute array of forecasts. + * + * Array of SDLWeatherData, Optional, minsize="15" maxsize="60" + */ +@property (nullable, strong, nonatomic) NSArray<SDLWeatherData *> *minuteForecast; + +/** + * An hour-by-hour array of forecasts. + * + * Array of SDLWeatherData, Optional, minsize="1" maxsize="96" + */ +@property (nullable, strong, nonatomic) NSArray<SDLWeatherData *> *hourlyForecast; + +/** + * A day-by-day array of forecasts. + * + * Array of SDLWeatherData, Optional, minsize="1" maxsize="30" + */ +@property (nullable, strong, nonatomic) NSArray<SDLWeatherData *> *multidayForecast; + +/** + * An array of weather alerts. This array should be ordered with the first object being the current day. + * + * Array of SDLWeatherData, Optional, minsize="1" maxsize="10" + */ +@property (nullable, strong, nonatomic) NSArray<SDLWeatherAlert *> *alerts; + +@end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLWeatherServiceData.m b/SmartDeviceLink/SDLWeatherServiceData.m new file mode 100644 index 000000000..43091590f --- /dev/null +++ b/SmartDeviceLink/SDLWeatherServiceData.m @@ -0,0 +1,94 @@ +// +// SDLWeatherServiceData.m +// SmartDeviceLink +// +// Created by Nicole on 2/7/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import "SDLWeatherServiceData.h" + +#import "NSMutableDictionary+Store.h" +#import "SDLRPCParameterNames.h" + +NS_ASSUME_NONNULL_BEGIN + +@implementation SDLWeatherServiceData + +- (instancetype)initWithLocation:(SDLLocationDetails *)location { + self = [super init]; + if (!self) { + return nil; + } + + self.location = location; + + return self; +} + +- (instancetype)initWithLocation:(SDLLocationDetails *)location currentForecast:(nullable SDLWeatherData *)currentForecast minuteForecast:(nullable NSArray<SDLWeatherData *> *)minuteForecast hourlyForecast:(nullable NSArray<SDLWeatherData *> *)hourlyForecast multidayForecast:(nullable NSArray<SDLWeatherData *> *)multidayForecast alerts:(nullable NSArray<SDLWeatherAlert *> *)alerts { + self = [self initWithLocation:location]; + if (!self) { + return nil; + } + + self.currentForecast = currentForecast; + self.minuteForecast = minuteForecast; + self.hourlyForecast = hourlyForecast; + self.multidayForecast = multidayForecast; + self.alerts = alerts; + + return self; +} + +- (void)setLocation:(SDLLocationDetails *)location { + [store sdl_setObject:location forName:SDLRPCParameterNameLocation]; +} + +- (SDLLocationDetails *)location { + return [store sdl_objectForName:SDLRPCParameterNameLocation ofClass:SDLLocationDetails.class]; +} + +- (void)setCurrentForecast:(nullable SDLWeatherData *)currentForecast { + [store sdl_setObject:currentForecast forName:SDLRPCParameterNameCurrentForecast]; +} + +- (nullable SDLWeatherData *)currentForecast { + return [store sdl_objectForName:SDLRPCParameterNameCurrentForecast ofClass:SDLWeatherData.class]; +} + +- (void)setMinuteForecast:(nullable NSArray<SDLWeatherData *> *)minuteForecast { + [store sdl_setObject:minuteForecast forName:SDLRPCParameterNameMinuteForecast]; +} + +- (nullable NSArray<SDLWeatherData *> *)minuteForecast { + return [store sdl_objectsForName:SDLRPCParameterNameMinuteForecast ofClass:SDLWeatherData.class]; +} + +- (void)setHourlyForecast:(nullable NSArray<SDLWeatherData *> *)hourlyForecast { + [store sdl_setObject:hourlyForecast forName:SDLRPCParameterNameHourlyForecast]; +} + +- (nullable NSArray<SDLWeatherData *> *)hourlyForecast { + return [store sdl_objectsForName:SDLRPCParameterNameHourlyForecast ofClass:SDLWeatherData.class]; +} + +- (void)setMultidayForecast:(nullable NSArray<SDLWeatherData *> *)multidayForecast { + [store sdl_setObject:multidayForecast forName:SDLRPCParameterNameMultidayForecast]; +} + +- (nullable NSArray<SDLWeatherData *> *)multidayForecast { + return [store sdl_objectsForName:SDLRPCParameterNameMultidayForecast ofClass:SDLWeatherData.class]; +} + +- (void)setAlerts:(nullable NSArray<SDLWeatherAlert *> *)alerts { + [store sdl_setObject:alerts forName:SDLRPCParameterNameAlerts]; +} + +- (nullable NSArray<SDLWeatherAlert *> *)alerts { + return [store sdl_objectsForName:SDLRPCParameterNameAlerts ofClass:SDLWeatherAlert.class]; +} + +@end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLWeatherServiceManifest.h b/SmartDeviceLink/SDLWeatherServiceManifest.h new file mode 100644 index 000000000..761474b44 --- /dev/null +++ b/SmartDeviceLink/SDLWeatherServiceManifest.h @@ -0,0 +1,67 @@ +// +// SDLWeatherServiceManifest.h +// SmartDeviceLink +// +// Created by Nicole on 2/8/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import "SDLRPCRequest.h" + +NS_ASSUME_NONNULL_BEGIN + +/** + * A weather service manifest. + */ +@interface SDLWeatherServiceManifest : SDLRPCStruct + +/** + * Convenience init for all parameters. + * + * @param currentForecastSupported Whether or not the current forcast is supported. + * @param maxMultidayForecastAmount The maximum number of day-by-day forecasts. + * @param maxHourlyForecastAmount The maximum number of hour-by-hour forecasts. + * @param maxMinutelyForecastAmount The maximum number of minute-by-minute forecasts. + * @param weatherForLocationSupported Whether or not the weather for location is supported. + * @return A SDLWeatherServiceManifest object + */ +- (instancetype)initWithCurrentForecastSupported:(BOOL)currentForecastSupported maxMultidayForecastAmount:(UInt32)maxMultidayForecastAmount maxHourlyForecastAmount:(UInt32)maxHourlyForecastAmount maxMinutelyForecastAmount:(UInt32)maxMinutelyForecastAmount weatherForLocationSupported:(BOOL)weatherForLocationSupported; + +/** + * Whether or not the current forcast is supported. + * + * Boolean, Optional + */ +@property (nullable, strong, nonatomic) NSNumber<SDLBool> *currentForecastSupported; + +/** + * The maximum number of day-by-day forecasts. + * + * Integer, Optional + */ +@property (nullable, strong, nonatomic) NSNumber<SDLInt> *maxMultidayForecastAmount; + +/** + * The maximum number of hour-by-hour forecasts. + * + * Integer, Optional + */ +@property (nullable, strong, nonatomic) NSNumber<SDLInt> *maxHourlyForecastAmount; + +/** + * The maximum number of minute-by-minute forecasts. + * + * Integer, Optional + */ +@property (nullable, strong, nonatomic) NSNumber<SDLInt> *maxMinutelyForecastAmount; + +/** + * Whether or not the weather for location is supported. + * + * Boolean, Optional + */ +@property (nullable, strong, nonatomic) NSNumber<SDLBool> *weatherForLocationSupported; + +@end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLWeatherServiceManifest.m b/SmartDeviceLink/SDLWeatherServiceManifest.m new file mode 100644 index 000000000..7f170357e --- /dev/null +++ b/SmartDeviceLink/SDLWeatherServiceManifest.m @@ -0,0 +1,75 @@ +// +// SDLWeatherServiceManifest.m +// SmartDeviceLink +// +// Created by Nicole on 2/8/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import "SDLWeatherServiceManifest.h" + +#import "NSMutableDictionary+Store.h" +#import "SDLRPCParameterNames.h" + +NS_ASSUME_NONNULL_BEGIN + +@implementation SDLWeatherServiceManifest + +- (instancetype)initWithCurrentForecastSupported:(BOOL)currentForecastSupported maxMultidayForecastAmount:(UInt32)maxMultidayForecastAmount maxHourlyForecastAmount:(UInt32)maxHourlyForecastAmount maxMinutelyForecastAmount:(UInt32)maxMinutelyForecastAmount weatherForLocationSupported:(BOOL)weatherForLocationSupported { + self = [self init]; + if (!self) { + return nil; + } + + self.currentForecastSupported = @(currentForecastSupported); + self.maxMultidayForecastAmount = @(maxMultidayForecastAmount); + self.maxHourlyForecastAmount = @(maxHourlyForecastAmount); + self.maxMinutelyForecastAmount = @(maxMinutelyForecastAmount); + self.weatherForLocationSupported = @(weatherForLocationSupported); + + return self; +} + +- (void)setCurrentForecastSupported:(nullable NSNumber<SDLBool> *)currentForecastSupported { + [store sdl_setObject:currentForecastSupported forName:SDLRPCParameterNameCurrentForecastSupported]; +} + +- (nullable NSNumber<SDLBool> *)currentForecastSupported { + return [store sdl_objectForName:SDLRPCParameterNameCurrentForecastSupported]; +} + +- (void)setMaxMultidayForecastAmount:(nullable NSNumber<SDLInt> *)maxMultidayForecastAmount { + [store sdl_setObject:maxMultidayForecastAmount forName:SDLRPCParameterNameMaxMultidayForecastAmount]; +} + +- (nullable NSNumber<SDLInt> *)maxMultidayForecastAmount { + return [store sdl_objectForName:SDLRPCParameterNameMaxMultidayForecastAmount]; +} + +- (void)setMaxHourlyForecastAmount:(nullable NSNumber<SDLInt> *)maxHourlyForecastAmount { + [store sdl_setObject:maxHourlyForecastAmount forName:SDLRPCParameterNameMaxHourlyForecastAmount]; +} + +- (nullable NSNumber<SDLInt> *)maxHourlyForecastAmount { + return [store sdl_objectForName:SDLRPCParameterNameMaxHourlyForecastAmount]; +} + +- (void)setMaxMinutelyForecastAmount:(nullable NSNumber<SDLInt> *)maxMinutelyForecastAmount { + [store sdl_setObject:maxMinutelyForecastAmount forName:SDLRPCParameterNameMaxMinutelyForecastAmount]; +} + +- (nullable NSNumber<SDLInt> *)maxMinutelyForecastAmount { + return [store sdl_objectForName:SDLRPCParameterNameMaxMinutelyForecastAmount]; +} + +- (void)setWeatherForLocationSupported:(nullable NSNumber<SDLBool> *)weatherForLocationSupported { + [store sdl_setObject:weatherForLocationSupported forName:SDLRPCParameterNameWeatherForLocationSupported]; +} + +- (nullable NSNumber<SDLBool> *)weatherForLocationSupported { + return [store sdl_objectForName:SDLRPCParameterNameWeatherForLocationSupported]; +} + +@end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SmartDeviceLink.h b/SmartDeviceLink/SmartDeviceLink.h index 4464e81ea..4ae1a7d37 100644 --- a/SmartDeviceLink/SmartDeviceLink.h +++ b/SmartDeviceLink/SmartDeviceLink.h @@ -35,14 +35,18 @@ FOUNDATION_EXPORT const unsigned char SmartDeviceLinkVersionString[]; #import "SDLEncodedSyncPData.h" #import "SDLEndAudioPassThru.h" #import "SDLGetCloudAppProperties.h" +#import "SDLGetAppServiceData.h" #import "SDLGetDTCs.h" +#import "SDLGetFile.h" #import "SDLGetInteriorVehicleData.h" #import "SDLGetSystemCapability.h" #import "SDLGetVehicleData.h" #import "SDLGetWayPoints.h" #import "SDLListFiles.h" +#import "SDLPerformAppServiceInteraction.h" #import "SDLPerformAudioPassThru.h" #import "SDLPerformInteraction.h" +#import "SDLPublishAppService.h" #import "SDLPutFile.h" #import "SDLReadDID.h" #import "SDLRegisterAppInterface.h" @@ -64,6 +68,7 @@ FOUNDATION_EXPORT const unsigned char SmartDeviceLinkVersionString[]; #import "SDLSubscribeVehicleData.h" #import "SDLSubscribeWayPoints.h" #import "SDLSyncPData.h" +#import "SDLSystemRequest.h" #import "SDLUnregisterAppInterface.h" #import "SDLUnsubscribeButton.h" #import "SDLUnsubscribeVehicleData.h" @@ -88,14 +93,18 @@ FOUNDATION_EXPORT const unsigned char SmartDeviceLinkVersionString[]; #import "SDLEndAudioPassThruResponse.h" #import "SDLGenericResponse.h" #import "SDLGetCloudAppPropertiesResponse.h" +#import "SDLGetAppServiceDataResponse.h" #import "SDLGetDTCsResponse.h" +#import "SDLGetFileResponse.h" #import "SDLGetInteriorVehicleDataResponse.h" #import "SDLGetSystemCapabilityResponse.h" #import "SDLGetVehicleDataResponse.h" #import "SDLGetWayPointsResponse.h" #import "SDLListFilesResponse.h" +#import "SDLPerformAppServiceInteractionResponse.h" #import "SDLPerformAudioPassThruResponse.h" #import "SDLPerformInteractionResponse.h" +#import "SDLPublishAppServiceResponse.h" #import "SDLPutFileResponse.h" #import "SDLReadDIDResponse.h" #import "SDLRegisterAppInterfaceResponse.h" @@ -125,6 +134,7 @@ FOUNDATION_EXPORT const unsigned char SmartDeviceLinkVersionString[]; // Notifications #import "SDLOnAppInterfaceUnregistered.h" +#import "SDLOnAppServiceData.h" #import "SDLOnAudioPassThru.h" #import "SDLOnButtonEvent.h" #import "SDLOnButtonPress.h" @@ -140,6 +150,7 @@ FOUNDATION_EXPORT const unsigned char SmartDeviceLinkVersionString[]; #import "SDLOnPermissionsChange.h" #import "SDLOnRCStatus.h" #import "SDLOnSyncPData.h" +#import "SDLOnSystemCapabilityUpdated.h" #import "SDLOnSystemRequest.h" #import "SDLOnTBTClientState.h" #import "SDLOnTouchEvent.h" @@ -149,6 +160,11 @@ FOUNDATION_EXPORT const unsigned char SmartDeviceLinkVersionString[]; // Structs #import "SDLAirbagStatus.h" #import "SDLAppInfo.h" +#import "SDLAppServiceCapability.h" +#import "SDLAppServiceData.h" +#import "SDLAppServiceManifest.h" +#import "SDLAppServiceRecord.h" +#import "SDLAppServicesCapabilities.h" #import "SDLAudioControlData.h" #import "SDLAudioControlCapabilities.h" #import "SDLAudioPassThruCapabilities.h" @@ -188,11 +204,16 @@ FOUNDATION_EXPORT const unsigned char SmartDeviceLinkVersionString[]; #import "SDLLocationDetails.h" #import "SDLMassageCushionFirmness.h" #import "SDLMassageModeData.h" +#import "SDLMediaServiceData.h" +#import "SDLMediaServiceManifest.h" #import "SDLMenuParams.h" #import "SDLMetadataTags.h" #import "SDLModuleData.h" #import "SDLMyKey.h" #import "SDLNavigationCapability.h" +#import "SDLNavigationInstruction.h" +#import "SDLNavigationServiceData.h" +#import "SDLNavigationServiceManifest.h" #import "SDLOasisAddress.h" #import "SDLParameterPermissions.h" #import "SDLPermissionItem.h" @@ -230,11 +251,16 @@ FOUNDATION_EXPORT const unsigned char SmartDeviceLinkVersionString[]; #import "SDLVideoStreamingCapability.h" #import "SDLVideoStreamingFormat.h" #import "SDLVrHelpItem.h" +#import "SDLWeatherAlert.h" +#import "SDLWeatherData.h" +#import "SDLWeatherServiceData.h" +#import "SDLWeatherServiceManifest.h" // Enums #import "SDLAmbientLightStatus.h" #import "SDLAppHMIType.h" #import "SDLAppInterfaceUnregisteredReason.h" +#import "SDLAppServiceType.h" #import "SDLAudioStreamingState.h" #import "SDLAudioStreamingIndicator.h" #import "SDLAudioType.h" @@ -250,6 +276,7 @@ FOUNDATION_EXPORT const unsigned char SmartDeviceLinkVersionString[]; #import "SDLDeliveryMode.h" #import "SDLDeviceLevelStatus.h" #import "SDLDimension.h" +#import "SDLDirection.h" #import "SDLDisplayMode.h" #import "SDLDisplayType.h" #import "SDLDistanceUnit.h" @@ -282,8 +309,11 @@ FOUNDATION_EXPORT const unsigned char SmartDeviceLinkVersionString[]; #import "SDLMassageMode.h" #import "SDLMassageZone.h" #import "SDLMediaClockFormat.h" +#import "SDLMediaType.h" #import "SDLMetadataType.h" #import "SDLModuleType.h" +#import "SDLNavigationAction.h" +#import "SDLNavigationJunction.h" #import "SDLPRNDL.h" #import "SDLPermissionStatus.h" #import "SDLPowerModeQualificationStatus.h" @@ -298,6 +328,7 @@ FOUNDATION_EXPORT const unsigned char SmartDeviceLinkVersionString[]; #import "SDLResult.h" #import "SDLSamplingRate.h" #import "SDLSeatMemoryActionType.h" +#import "SDLServiceUpdateReason.h" #import "SDLSupportedSeat.h" #import "SDLSoftButtonType.h" #import "SDLSpeechCapabilities.h" @@ -390,6 +421,8 @@ FOUNDATION_EXPORT const unsigned char SmartDeviceLinkVersionString[]; // Utilities #import "NSNumber+NumberType.h" #import "SDLErrorConstants.h" +#import "SDLFunctionID.h" +#import "SDLRPCFunctionNames.h" #import "SDLNotificationConstants.h" #import "SDLStreamingMediaManagerConstants.h" #import "SDLVersion.h" @@ -397,6 +430,7 @@ FOUNDATION_EXPORT const unsigned char SmartDeviceLinkVersionString[]; // Notifications #import "SDLRPCNotificationNotification.h" #import "SDLRPCResponseNotification.h" +#import "SDLRPCRequestNotification.h" // Logger #import "SDLLogConstants.h" diff --git a/SmartDeviceLinkTests/DevAPISpecs/Notification Tests/SDLRPCNotificationNotificationSpec.m b/SmartDeviceLinkTests/DevAPISpecs/Notification Tests/SDLRPCNotificationNotificationSpec.m new file mode 100644 index 000000000..307e45d81 --- /dev/null +++ b/SmartDeviceLinkTests/DevAPISpecs/Notification Tests/SDLRPCNotificationNotificationSpec.m @@ -0,0 +1,41 @@ +// +// SDLRPCNotificationNotificationSpec.m +// SmartDeviceLinkTests +// +// Created by Nicole on 3/1/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import <Quick/Quick.h> +#import <Nimble/Nimble.h> + +#import "SDLNotificationConstants.h" +#import "SDLOnCommand.h" +#import "SDLRPCNotification.h" +#import "SDLRPCNotificationNotification.h" + +QuickSpecBegin(SDLRPCNotificationNotificationSpec) + +describe(@"A request notification notification", ^{ + __block SDLRPCNotification *testNotification = nil; + __block NSString *testName = nil; + + beforeEach(^{ + testNotification = [[SDLOnCommand alloc] initWithName:@"testNotification"]; + testName = SDLDidReceiveCommandNotification; + }); + + it(@"Should initialize correctly with initWithName:object:rpcRequest:", ^{ + SDLRPCNotificationNotification *testRequestNotification = [[SDLRPCNotificationNotification alloc] initWithName:testName object:nil rpcNotification:testNotification]; + + expect(testRequestNotification.name).to(equal(testName)); + expect(testRequestNotification.userInfo).to(equal(@{SDLNotificationUserInfoObject: testNotification})); + expect(testRequestNotification.object).to(beNil()); + expect(testRequestNotification.notification).to(equal(testNotification)); + expect([testRequestNotification isNotificationKindOfClass:SDLRPCNotification.class]).to(beTrue()); + expect([testRequestNotification isNotificationMemberOfClass:SDLOnCommand.class]).to(beTrue()); + }); +}); + +QuickSpecEnd + diff --git a/SmartDeviceLinkTests/DevAPISpecs/Notification Tests/SDLRPCRequestNotificationSpec.m b/SmartDeviceLinkTests/DevAPISpecs/Notification Tests/SDLRPCRequestNotificationSpec.m new file mode 100644 index 000000000..4751c9361 --- /dev/null +++ b/SmartDeviceLinkTests/DevAPISpecs/Notification Tests/SDLRPCRequestNotificationSpec.m @@ -0,0 +1,41 @@ +// +// SDLRPCRequestNotificationSpec.m +// SmartDeviceLinkTests +// +// Created by Nicole on 2/14/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import <Quick/Quick.h> +#import <Nimble/Nimble.h> + +#import "SDLNotificationConstants.h" +#import "SDLAddCommand.h" +#import "SDLRPCRequestNotification.h" + + +QuickSpecBegin(SDLRPCRequestNotificationSpec) + +describe(@"A request notification", ^{ + __block SDLRPCRequest *testRequest = nil; + __block NSString *testName = nil; + + beforeEach(^{ + testRequest = [[SDLAddCommand alloc] initWithName:@"testRequest"]; + testName = SDLDidReceiveAddCommandResponse; + }); + + it(@"Should initialize correctly with initWithName:object:rpcRequest:", ^{ + SDLRPCRequestNotification *testNotification = [[SDLRPCRequestNotification alloc] initWithName:testName object:nil rpcRequest:testRequest]; + + expect(testNotification.name).to(equal(testName)); + expect(testNotification.userInfo).to(equal(@{SDLNotificationUserInfoObject: testRequest})); + expect(testNotification.object).to(beNil()); + expect(testNotification.request).to(equal(testRequest)); + expect([testNotification isRequestKindOfClass:SDLRPCRequest.class]).to(beTrue()); + expect([testNotification isRequestMemberOfClass:SDLAddCommand.class]).to(beTrue()); + }); +}); + +QuickSpecEnd + diff --git a/SmartDeviceLinkTests/DevAPISpecs/Notification Tests/SDLRPCResponseNotificationSpec.m b/SmartDeviceLinkTests/DevAPISpecs/Notification Tests/SDLRPCResponseNotificationSpec.m new file mode 100644 index 000000000..a0aaf3b08 --- /dev/null +++ b/SmartDeviceLinkTests/DevAPISpecs/Notification Tests/SDLRPCResponseNotificationSpec.m @@ -0,0 +1,39 @@ +// +// SDLRPCResponseNotificationSpec.m +// SmartDeviceLinkTests +// +// Created by Nicole on 3/1/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import <Quick/Quick.h> +#import <Nimble/Nimble.h> + +#import "SDLNotificationConstants.h" +#import "SDLAddCommandResponse.h" +#import "SDLRPCResponseNotification.h" + +QuickSpecBegin(SDLRPCResponseNotificationSpec) + +describe(@"A response notification", ^{ + __block SDLRPCResponse *testResponse = nil; + __block NSString *testName = nil; + + beforeEach(^{ + testResponse = [[SDLAddCommandResponse alloc] initWithName:@"testResponse"]; + testName = SDLDidReceiveAddCommandRequest; + }); + + it(@"Should initialize correctly with initWithName:object:rpcRequest:", ^{ + SDLRPCResponseNotification *testNotification = [[SDLRPCResponseNotification alloc] initWithName:testName object:nil rpcResponse:testResponse]; + + expect(testNotification.name).to(equal(testName)); + expect(testNotification.userInfo).to(equal(@{SDLNotificationUserInfoObject: testResponse})); + expect(testNotification.object).to(beNil()); + expect(testNotification.response).to(equal(testResponse)); + expect([testNotification isResponseKindOfClass:SDLRPCResponse.class]).to(beTrue()); + expect([testNotification isResponseMemberOfClass:SDLAddCommandResponse.class]).to(beTrue()); + }); +}); + +QuickSpecEnd diff --git a/SmartDeviceLinkTests/DevAPISpecs/SDLLifecycleManagerSpec.m b/SmartDeviceLinkTests/DevAPISpecs/SDLLifecycleManagerSpec.m index f2429beb9..728dcc99f 100644 --- a/SmartDeviceLinkTests/DevAPISpecs/SDLLifecycleManagerSpec.m +++ b/SmartDeviceLinkTests/DevAPISpecs/SDLLifecycleManagerSpec.m @@ -4,6 +4,7 @@ #import "SDLLifecycleManager.h" +#import "SDLAppServiceData.h" #import "SDLConfiguration.h" #import "SDLConnectionManagerType.h" #import "SDLError.h" @@ -16,8 +17,10 @@ #import "SDLLogConfiguration.h" #import "SDLManagerDelegate.h" #import "SDLNotificationDispatcher.h" +#import "SDLOnAppServiceData.h" #import "SDLOnHashChange.h" #import "SDLOnHMIStatus.h" +#import "SDLPerformAppServiceInteractionResponse.h" #import "SDLPermissionManager.h" #import "SDLProxy.h" #import "SDLProtocol.h" @@ -129,6 +132,8 @@ describe(@"a lifecycle manager", ^{ expect(testManager.responseDispatcher).toNot(beNil()); expect(testManager.streamManager).toNot(beNil()); expect(testManager.systemCapabilityManager).toNot(beNil()); + expect(testManager.rpcOperationQueue).toNot(beNil()); + expect(testManager.rpcOperationQueue.maxConcurrentOperationCount).to(equal(3)); expect(@([testManager conformsToProtocol:@protocol(SDLConnectionManagerType)])).to(equal(@YES)); expect(testManager.authToken).to(beNil()); }); @@ -471,13 +476,44 @@ describe(@"a lifecycle manager", ^{ [testManager.lifecycleStateMachine setToState:SDLLifecycleStateReady fromOldState:nil callEnterTransition:NO]; }); - it(@"can send an RPC", ^{ + it(@"can send an RPC of type Request", ^{ SDLShow *testShow = [[SDLShow alloc] initWithMainField1:@"test" mainField2:nil alignment:nil]; - [testManager sendRequest:testShow]; + [testManager sendRPC:testShow]; - OCMVerify([proxyMock sendRPC:[OCMArg isKindOfClass:[SDLShow class]]]); + [NSThread sleepForTimeInterval:0.1]; + + OCMVerify([proxyMock sendRPC:[OCMArg isKindOfClass:SDLShow.class]]); }); - + + it(@"can send an RPC of type Response", ^{ + SDLPerformAppServiceInteractionResponse *testResponse = [[SDLPerformAppServiceInteractionResponse alloc] init]; + [testManager sendRPC:testResponse]; + testResponse.correlationID = @(2); + testResponse.success = @(true); + testResponse.resultCode = SDLResultSuccess; + testResponse.info = @"testResponse info"; + + [NSThread sleepForTimeInterval:0.1]; + + OCMVerify([proxyMock sendRPC:[OCMArg isKindOfClass:SDLPerformAppServiceInteractionResponse.class]]); + }); + + it(@"can send an RPC of type Notification", ^{ + SDLOnAppServiceData *testNotification = [[SDLOnAppServiceData alloc] initWithServiceData:[[SDLAppServiceData alloc] init]]; + [testManager sendRPC:testNotification]; + + [NSThread sleepForTimeInterval:0.1]; + + OCMVerify([proxyMock sendRPC:[OCMArg isKindOfClass:SDLOnAppServiceData.class]]); + }); + + it(@"should throw an exception if the RPC is not of type `Request`, `Response` or `Notification`", ^{ + SDLRPCMessage *testMessage = [[SDLRPCMessage alloc] init]; + expectAction(^{ + [testManager sendRPC:testMessage]; + }).to(raiseException()); + }); + describe(@"stopping the manager", ^{ beforeEach(^{ [testManager stop]; diff --git a/SmartDeviceLinkTests/DevAPISpecs/SDLNotificationDispatcherSpec.m b/SmartDeviceLinkTests/DevAPISpecs/SDLNotificationDispatcherSpec.m deleted file mode 100644 index 975d55cb5..000000000 --- a/SmartDeviceLinkTests/DevAPISpecs/SDLNotificationDispatcherSpec.m +++ /dev/null @@ -1,120 +0,0 @@ -#import <Quick/Quick.h> -#import <Nimble/Nimble.h> - -#import "SDLNotificationConstants.h" -#import "SDLNotificationDispatcher.h" - - -QuickSpecBegin(SDLNotificationDispatcherSpec) - -describe(@"a notification dispatcher", ^{ - __block SDLNotificationDispatcher *testDispatcher = nil; - - beforeEach(^{ - testDispatcher = [[SDLNotificationDispatcher alloc] init]; - }); - - it(@"should conform to SDLProxyListener", ^{ - expect(@([testDispatcher conformsToProtocol:@protocol(SDLProxyListener)])).to(beTruthy()); - - expect(@([testDispatcher respondsToSelector:@selector(onSetCloudAppProperties:)])).to(beTruthy()); - expect(@([testDispatcher respondsToSelector:@selector(onGetCloudAppProperties:)])).to(beTruthy()); - - expect(@([testDispatcher respondsToSelector:@selector(onOnDriverDistraction:)])).to(beTruthy()); - expect(@([testDispatcher respondsToSelector:@selector(onOnHMIStatus:)])).to(beTruthy()); - expect(@([testDispatcher respondsToSelector:@selector(onProxyClosed)])).to(beTruthy()); - expect(@([testDispatcher respondsToSelector:@selector(onProxyOpened)])).to(beTruthy()); - expect(@([testDispatcher respondsToSelector:@selector(onAddCommandResponse:)])).to(beTruthy()); - expect(@([testDispatcher respondsToSelector:@selector(onAddSubMenuResponse:)])).to(beTruthy()); - expect(@([testDispatcher respondsToSelector:@selector(onAlertManeuverResponse:)])).to(beTruthy()); - expect(@([testDispatcher respondsToSelector:@selector(onAlertResponse:)])).to(beTruthy()); - expect(@([testDispatcher respondsToSelector:@selector(onButtonPressResponse:)])).to(beTruthy()); - expect(@([testDispatcher respondsToSelector:@selector(onChangeRegistrationResponse:)])).to(beTruthy()); - expect(@([testDispatcher respondsToSelector:@selector(onCreateInteractionChoiceSetResponse:)])).to(beTruthy()); - expect(@([testDispatcher respondsToSelector:@selector(onDeleteCommandResponse:)])).to(beTruthy()); - expect(@([testDispatcher respondsToSelector:@selector(onDeleteInteractionChoiceSetResponse:)])).to(beTruthy()); - expect(@([testDispatcher respondsToSelector:@selector(onDeleteSubMenuResponse:)])).to(beTruthy()); - expect(@([testDispatcher respondsToSelector:@selector(onDiagnosticMessageResponse:)])).to(beTruthy()); - expect(@([testDispatcher respondsToSelector:@selector(onDialNumberResponse:)])).to(beTruthy()); - expect(@([testDispatcher respondsToSelector:@selector(onEncodedSyncPDataResponse:)])).to(beTruthy()); - expect(@([testDispatcher respondsToSelector:@selector(onEndAudioPassThruResponse:)])).to(beTruthy()); - expect(@([testDispatcher respondsToSelector:@selector(onError:)])).to(beTruthy()); - expect(@([testDispatcher respondsToSelector:@selector(onGenericResponse:)])).to(beTruthy()); - expect(@([testDispatcher respondsToSelector:@selector(onGetCloudAppPropertiesResponse:)])).to(beTruthy()); - expect(@([testDispatcher respondsToSelector:@selector(onGetDTCsResponse:)])).to(beTruthy()); - expect(@([testDispatcher respondsToSelector:@selector(onGetInteriorVehicleDataResponse:)])).to(beTruthy()); - expect(@([testDispatcher respondsToSelector:@selector(onGetSystemCapabilityResponse:)])).to(beTruthy()); - expect(@([testDispatcher respondsToSelector:@selector(onGetVehicleDataResponse:)])).to(beTruthy()); - expect(@([testDispatcher respondsToSelector:@selector(onGetWayPointsResponse:)])).to(beTruthy()); - expect(@([testDispatcher respondsToSelector:@selector(onReceivedLockScreenIcon:)])).to(beTruthy()); - expect(@([testDispatcher respondsToSelector:@selector(onOnAppInterfaceUnregistered:)])).to(beTruthy()); - expect(@([testDispatcher respondsToSelector:@selector(onOnAudioPassThru:)])).to(beTruthy()); - expect(@([testDispatcher respondsToSelector:@selector(onOnButtonEvent:)])).to(beTruthy()); - expect(@([testDispatcher respondsToSelector:@selector(onOnButtonPress:)])).to(beTruthy()); - expect(@([testDispatcher respondsToSelector:@selector(onOnCommand:)])).to(beTruthy()); - expect(@([testDispatcher respondsToSelector:@selector(onOnEncodedSyncPData:)])).to(beTruthy()); - expect(@([testDispatcher respondsToSelector:@selector(onOnHashChange:)])).to(beTruthy()); - expect(@([testDispatcher respondsToSelector:@selector(onOnLanguageChange:)])).to(beTruthy()); - expect(@([testDispatcher respondsToSelector:@selector(onOnLockScreenNotification:)])).to(beTruthy()); - expect(@([testDispatcher respondsToSelector:@selector(onOnSyncPData:)])).to(beTruthy()); - expect(@([testDispatcher respondsToSelector:@selector(onOnRCStatus:)])).to(beTruthy()); - expect(@([testDispatcher respondsToSelector:@selector(onOnSystemRequest:)])).to(beTruthy()); - expect(@([testDispatcher respondsToSelector:@selector(onOnTBTClientState:)])).to(beTruthy()); - expect(@([testDispatcher respondsToSelector:@selector(onOnTouchEvent:)])).to(beTruthy()); - expect(@([testDispatcher respondsToSelector:@selector(onOnVehicleData:)])).to(beTruthy()); - expect(@([testDispatcher respondsToSelector:@selector(onOnWayPointChange:)])).to(beTruthy()); - expect(@([testDispatcher respondsToSelector:@selector(onPerformAudioPassThruResponse:)])).to(beTruthy()); - expect(@([testDispatcher respondsToSelector:@selector(onPerformInteractionResponse:)])).to(beTruthy()); - expect(@([testDispatcher respondsToSelector:@selector(onPutFileResponse:)])).to(beTruthy()); - expect(@([testDispatcher respondsToSelector:@selector(onReadDIDResponse:)])).to(beTruthy()); - expect(@([testDispatcher respondsToSelector:@selector(onRegisterAppInterfaceResponse:)])).to(beTruthy()); - expect(@([testDispatcher respondsToSelector:@selector(onResetGlobalPropertiesResponse:)])).to(beTruthy()); - expect(@([testDispatcher respondsToSelector:@selector(onScrollableMessageResponse:)])).to(beTruthy()); - expect(@([testDispatcher respondsToSelector:@selector(onSendHapticDataResponse:)])).to(beTruthy()); - expect(@([testDispatcher respondsToSelector:@selector(onSendLocationResponse:)])).to(beTruthy()); - expect(@([testDispatcher respondsToSelector:@selector(onSetAppIconResponse:)])).to(beTruthy()); - expect(@([testDispatcher respondsToSelector:@selector(onSetCloudAppPropertiesResponse:)])).to(beTruthy()); - expect(@([testDispatcher respondsToSelector:@selector(onSetDisplayLayoutResponse:)])).to(beTruthy()); - expect(@([testDispatcher respondsToSelector:@selector(onSetGlobalPropertiesResponse:)])).to(beTruthy()); - expect(@([testDispatcher respondsToSelector:@selector(onSetInteriorVehicleDataResponse:)])).to(beTruthy()); - expect(@([testDispatcher respondsToSelector:@selector(onSetMediaClockTimerResponse:)])).to(beTruthy()); - expect(@([testDispatcher respondsToSelector:@selector(onShowConstantTBTResponse:)])).to(beTruthy()); - expect(@([testDispatcher respondsToSelector:@selector(onShowResponse:)])).to(beTruthy()); - expect(@([testDispatcher respondsToSelector:@selector(onSliderResponse:)])).to(beTruthy()); - expect(@([testDispatcher respondsToSelector:@selector(onSpeakResponse:)])).to(beTruthy()); - expect(@([testDispatcher respondsToSelector:@selector(onSubscribeButtonResponse:)])).to(beTruthy()); - expect(@([testDispatcher respondsToSelector:@selector(onSubscribeVehicleDataResponse:)])).to(beTruthy()); - expect(@([testDispatcher respondsToSelector:@selector(onSubscribeWayPointsResponse:)])).to(beTruthy()); - expect(@([testDispatcher respondsToSelector:@selector(onSyncPDataResponse:)])).to(beTruthy()); - expect(@([testDispatcher respondsToSelector:@selector(onUpdateTurnListResponse:)])).to(beTruthy()); - expect(@([testDispatcher respondsToSelector:@selector(onUnregisterAppInterfaceResponse:)])).to(beTruthy()); - expect(@([testDispatcher respondsToSelector:@selector(onUnsubscribeButtonResponse:)])).to(beTruthy()); - expect(@([testDispatcher respondsToSelector:@selector(onUnsubscribeVehicleDataResponse:)])).to(beTruthy()); - expect(@([testDispatcher respondsToSelector:@selector(onUnsubscribeWayPointsResponse:)])).to(beTruthy()); - }); - - describe(@"when told to post a notification", ^{ - __block NSString *testNotificationName = nil; - __block NSString *testUserInfo = nil; - - __block NSNotification *returnNotification = nil; - - beforeEach(^{ - testNotificationName = @"com.test.notification"; - testUserInfo = @"testuserinfo"; - - [[NSNotificationCenter defaultCenter] addObserverForName:testNotificationName object:nil queue:nil usingBlock:^(NSNotification * _Nonnull note) { - returnNotification = note; - }]; - - [testDispatcher postNotificationName:testNotificationName infoObject:testUserInfo]; - }); - - it(@"should post", ^{ - expect(returnNotification.userInfo[SDLNotificationUserInfoObject]).toEventually(match(testUserInfo)); - expect(returnNotification.object).toEventually(equal(testDispatcher)); - }); - }); -}); - -QuickSpecEnd diff --git a/SmartDeviceLinkTests/DevAPISpecs/SDLSoftButtonStateSpec.m b/SmartDeviceLinkTests/DevAPISpecs/SDLSoftButtonStateSpec.m index ffea7c58e..e62a9256f 100644 --- a/SmartDeviceLinkTests/DevAPISpecs/SDLSoftButtonStateSpec.m +++ b/SmartDeviceLinkTests/DevAPISpecs/SDLSoftButtonStateSpec.m @@ -60,6 +60,17 @@ describe(@"soft button state", ^{ expect(testSoftButton.image.value).to(equal(testArtworkName)); }); }); + +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wunused-value" + context(@"when created invalid", ^{ + it(@"should assert", ^{ + expectAction(^{ + [[SDLSoftButtonState alloc] initWithStateName:testStateName text:nil image:nil]; + }).to(raiseException()); + }); + }); +#pragma clang diagnostic pop }); QuickSpecEnd diff --git a/SmartDeviceLinkTests/Notifications/SDLNotificationDispatcherSpec.m b/SmartDeviceLinkTests/Notifications/SDLNotificationDispatcherSpec.m new file mode 100644 index 000000000..5b3f87212 --- /dev/null +++ b/SmartDeviceLinkTests/Notifications/SDLNotificationDispatcherSpec.m @@ -0,0 +1,255 @@ +#import <Quick/Quick.h> +#import <Nimble/Nimble.h> + +#import "SDLAddCommand.h" +#import "SDLAddCommandResponse.h" +#import "SDLNotificationConstants.h" +#import "SDLNotificationDispatcher.h" +#import "SDLOnCommand.h" +#import "SDLRPCNotificationNotification.h" +#import "SDLRPCRequestNotification.h" +#import "SDLRPCResponseNotification.h" + +QuickSpecBegin(SDLNotificationDispatcherSpec) + +describe(@"a notification dispatcher", ^{ + __block SDLNotificationDispatcher *testDispatcher = nil; + + beforeEach(^{ + testDispatcher = [[SDLNotificationDispatcher alloc] init]; + }); + + it(@"should conform to SDLProxyListener", ^{ + expect(@([testDispatcher conformsToProtocol:@protocol(SDLProxyListener)])).to(beTruthy()); + + // Responses + expect(@([testDispatcher respondsToSelector:@selector(onOnDriverDistraction:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onOnHMIStatus:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onProxyClosed)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onProxyOpened)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onAddCommandResponse:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onAddSubMenuResponse:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onAlertManeuverResponse:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onAlertResponse:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onButtonPressResponse:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onChangeRegistrationResponse:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onCreateInteractionChoiceSetResponse:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onDeleteCommandResponse:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onDeleteInteractionChoiceSetResponse:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onDeleteSubMenuResponse:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onDiagnosticMessageResponse:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onDialNumberResponse:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onEncodedSyncPDataResponse:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onEndAudioPassThruResponse:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onError:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onGenericResponse:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onGetAppServiceDataResponse:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onGetDTCsResponse:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onGetFileResponse:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onGetInteriorVehicleDataResponse:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onGetSystemCapabilityResponse:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onGetVehicleDataResponse:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onGetWayPointsResponse:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onReceivedLockScreenIcon:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onPerformAppServiceInteractionResponse:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onPerformAudioPassThruResponse:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onPerformInteractionResponse:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onPublishAppServiceResponse:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onPutFileResponse:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onReadDIDResponse:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onRegisterAppInterfaceResponse:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onResetGlobalPropertiesResponse:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onScrollableMessageResponse:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onSendHapticDataResponse:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onSendLocationResponse:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onSetAppIconResponse:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onSetDisplayLayoutResponse:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onSetGlobalPropertiesResponse:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onSetInteriorVehicleDataResponse:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onSetMediaClockTimerResponse:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onShowConstantTBTResponse:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onShowResponse:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onSliderResponse:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onSpeakResponse:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onSubscribeButtonResponse:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onSubscribeVehicleDataResponse:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onSubscribeWayPointsResponse:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onSyncPDataResponse:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onUpdateTurnListResponse:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onUnregisterAppInterfaceResponse:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onUnsubscribeButtonResponse:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onUnsubscribeVehicleDataResponse:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onUnsubscribeWayPointsResponse:)])).to(beTruthy()); + + // Requests + expect(@([testDispatcher respondsToSelector:@selector(onAddCommand:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onAddSubMenu:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onAlert:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onAlertManeuver:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onButtonPress:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onChangeRegistration:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onCreateInteractionChoiceSet:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onDeleteCommand:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onDeleteFile:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onDeleteInteractionChoiceSet:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onDeleteSubMenu:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onDiagnosticMessage:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onDialNumber:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onEncodedSyncPData:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onEndAudioPassThru:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onGetAppServiceData:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onGetDTCs:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onGetFile:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onGetInteriorVehicleData:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onGetSystemCapability:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onGetVehicleData:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onGetWayPoints:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onListFiles:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onPerformAppServiceInteraction:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onPerformAudioPassThru:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onPerformInteraction:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onPublishAppService:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onPutFile:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onReadDID:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onRegisterAppInterface:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onResetGlobalProperties:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onScrollableMessage:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onSendHapticData:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onSendLocation:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onSetAppIcon:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onSetDisplayLayout:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onSetGlobalProperties:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onSetInteriorVehicleData:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onSetMediaClockTimer:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onShow:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onShowConstantTBT:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onSlider:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onSpeak:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onSubscribeButton:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onSubscribeVehicleData:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onSubscribeWayPoints:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onSyncPData:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onSystemRequest:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onUnregisterAppInterface:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onUnsubscribeButton:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onUnsubscribeVehicleData:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onUnsubscribeWayPoints:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onUpdateTurnList:)])).to(beTruthy()); + + // Notifications + expect(@([testDispatcher respondsToSelector:@selector(onOnAppInterfaceUnregistered:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onOnAppServiceData:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onOnAudioPassThru:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onOnButtonEvent:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onOnButtonPress:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onOnCommand:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onOnEncodedSyncPData:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onOnHashChange:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onOnLanguageChange:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onOnLockScreenNotification:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onOnRCStatus:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onOnSyncPData:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onOnSystemCapabilityUpdated:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onOnSystemRequest:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onOnTBTClientState:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onOnTouchEvent:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onOnVehicleData:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onOnWayPointChange:)])).to(beTruthy()); + }); + + describe(@"when told to post a notification", ^{ + __block NSString *testNotificationName = nil; + __block NSString *testUserInfo = nil; + __block NSNotification *returnNotification = nil; + + beforeEach(^{ + testNotificationName = @"com.test.notification"; + testUserInfo = @"testuserinfo"; + + [[NSNotificationCenter defaultCenter] addObserverForName:testNotificationName object:nil queue:nil usingBlock:^(NSNotification * _Nonnull note) { + returnNotification = note; + }]; + + [testDispatcher postNotificationName:testNotificationName infoObject:testUserInfo]; + }); + + it(@"should post", ^{ + expect(returnNotification.userInfo[SDLNotificationUserInfoObject]).toEventually(match(testUserInfo)); + expect(returnNotification.object).toEventually(equal(testDispatcher)); + }); + }); + + describe(@"when told to post a response", ^{ + __block NSString *testNotificationName = nil; + __block SDLAddCommandResponse *testResponse = nil; + __block SDLRPCResponseNotification *testNotification = nil; + + beforeEach(^{ + testNotificationName = SDLDidReceiveAddCommandResponse; + testResponse = [[SDLAddCommandResponse alloc] init]; + + [[NSNotificationCenter defaultCenter] addObserverForName:testNotificationName object:nil queue:nil usingBlock:^(NSNotification * _Nonnull note) { + SDLRPCResponseNotification *requestNotification = (SDLRPCResponseNotification *)note; + testNotification = requestNotification; + }]; + + [testDispatcher postRPCResponseNotification:testNotificationName response:testResponse]; + }); + + it(@"should successfully post a response", ^{ + expect(testNotification.name).toEventually(equal(testNotificationName)); + expect(testNotification.response).toEventually(equal(testResponse)); + expect(testNotification.object).toEventually(equal(testDispatcher)); + }); + }); + + describe(@"when told to post a request", ^{ + __block NSString *testNotificationName = nil; + __block SDLAddCommand *testRequest = nil; + __block SDLRPCRequestNotification *testNotification = nil; + + beforeEach(^{ + testNotificationName = SDLDidReceiveAddCommandRequest; + testRequest = [[SDLAddCommand alloc] init]; + + [[NSNotificationCenter defaultCenter] addObserverForName:testNotificationName object:nil queue:nil usingBlock:^(NSNotification * _Nonnull note) { + SDLRPCRequestNotification *requestNotification = (SDLRPCRequestNotification *)note; + testNotification = requestNotification; + }]; + + [testDispatcher postRPCRequestNotification:testNotificationName request:testRequest]; + }); + + it(@"should successfully post a request", ^{ + expect(testNotification.name).toEventually(equal(testNotificationName)); + expect(testNotification.request).toEventually(equal(testRequest)); + expect(testNotification.object).toEventually(equal(testDispatcher)); + }); + }); + + describe(@"when told to post a notification", ^{ + __block NSString *testNotificationName = nil; + __block SDLOnCommand *testNotificationRequest = nil; + __block SDLRPCNotificationNotification *testNotification = nil; + + beforeEach(^{ + testNotificationName = SDLDidReceiveCommandNotification; + testNotificationRequest = [[SDLOnCommand alloc] init]; + + [[NSNotificationCenter defaultCenter] addObserverForName:testNotificationName object:nil queue:nil usingBlock:^(NSNotification * _Nonnull note) { + SDLRPCNotificationNotification *requestNotification = (SDLRPCNotificationNotification *)note; + testNotification = requestNotification; + }]; + + [testDispatcher postRPCNotificationNotification:testNotificationName notification:testNotificationRequest]; + }); + + it(@"should successfully post a notification", ^{ + expect(testNotification.name).toEventually(equal(testNotificationName)); + expect(testNotification.notification).toEventually(equal(testNotificationRequest)); + expect(testNotification.object).toEventually(equal(testDispatcher)); + }); + }); +}); + +QuickSpecEnd diff --git a/SmartDeviceLinkTests/DevAPISpecs/SDLResponseDispatcherSpec.m b/SmartDeviceLinkTests/Notifications/SDLResponseDispatcherSpec.m index 410d24386..410d24386 100644 --- a/SmartDeviceLinkTests/DevAPISpecs/SDLResponseDispatcherSpec.m +++ b/SmartDeviceLinkTests/Notifications/SDLResponseDispatcherSpec.m diff --git a/SmartDeviceLinkTests/ProtocolSpecs/HeaderSpecs/SDLProtocolHeaderSpec.m b/SmartDeviceLinkTests/ProtocolSpecs/HeaderSpecs/SDLProtocolHeaderSpec.m index f2aeb1303..a578ec561 100644 --- a/SmartDeviceLinkTests/ProtocolSpecs/HeaderSpecs/SDLProtocolHeaderSpec.m +++ b/SmartDeviceLinkTests/ProtocolSpecs/HeaderSpecs/SDLProtocolHeaderSpec.m @@ -11,7 +11,7 @@ #import "SDLProtocolHeader.h" #import "SDLV1ProtocolHeader.h" #import "SDLV2ProtocolHeader.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLProtocolHeaderSpec) diff --git a/SmartDeviceLinkTests/ProtocolSpecs/HeaderSpecs/SDLV1ProtocolHeaderSpec.m b/SmartDeviceLinkTests/ProtocolSpecs/HeaderSpecs/SDLV1ProtocolHeaderSpec.m index 66abf2022..a7c6c1660 100644 --- a/SmartDeviceLinkTests/ProtocolSpecs/HeaderSpecs/SDLV1ProtocolHeaderSpec.m +++ b/SmartDeviceLinkTests/ProtocolSpecs/HeaderSpecs/SDLV1ProtocolHeaderSpec.m @@ -9,7 +9,7 @@ #import <Nimble/Nimble.h> #import "SDLV1ProtocolHeader.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLV1ProtocolHeaderSpec) diff --git a/SmartDeviceLinkTests/ProtocolSpecs/HeaderSpecs/SDLV2ProtocolHeaderSpec.m b/SmartDeviceLinkTests/ProtocolSpecs/HeaderSpecs/SDLV2ProtocolHeaderSpec.m index 74969e062..1ade6e426 100644 --- a/SmartDeviceLinkTests/ProtocolSpecs/HeaderSpecs/SDLV2ProtocolHeaderSpec.m +++ b/SmartDeviceLinkTests/ProtocolSpecs/HeaderSpecs/SDLV2ProtocolHeaderSpec.m @@ -9,7 +9,7 @@ #import <Nimble/Nimble.h> #import "SDLV2ProtocolHeader.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLV2ProtocolHeaderSpec) diff --git a/SmartDeviceLinkTests/ProtocolSpecs/MessageSpecs/SDLProtocolMessageSpec.m b/SmartDeviceLinkTests/ProtocolSpecs/MessageSpecs/SDLProtocolMessageSpec.m index 8c6f03f9c..b562d8c2d 100644 --- a/SmartDeviceLinkTests/ProtocolSpecs/MessageSpecs/SDLProtocolMessageSpec.m +++ b/SmartDeviceLinkTests/ProtocolSpecs/MessageSpecs/SDLProtocolMessageSpec.m @@ -15,7 +15,7 @@ #import "SDLV1ProtocolMessage.h" #import "SDLV2ProtocolHeader.h" #import "SDLV2ProtocolMessage.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLProtocolMessageSpec) diff --git a/SmartDeviceLinkTests/ProtocolSpecs/MessageSpecs/SDLProtocolSpec.m b/SmartDeviceLinkTests/ProtocolSpecs/MessageSpecs/SDLProtocolSpec.m index 7d625556a..a087dc86f 100644 --- a/SmartDeviceLinkTests/ProtocolSpecs/MessageSpecs/SDLProtocolSpec.m +++ b/SmartDeviceLinkTests/ProtocolSpecs/MessageSpecs/SDLProtocolSpec.m @@ -18,7 +18,7 @@ #import "SDLProtocolMessage.h" #import "SDLProtocolReceivedMessageRouter.h" #import "SDLRPCRequest.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" #import "SDLV1ProtocolMessage.h" #import "SDLV2ProtocolMessage.h" #import "SDLV1ProtocolHeader.h" @@ -28,12 +28,12 @@ QuickSpecBegin(SDLProtocolSpec) //Test dictionaries -NSDictionary* dictionaryV1 = @{SDLNameRequest: - @{SDLNameOperationName:@"DeleteCommand", - SDLNameCorrelationId:@0x98765, - SDLNameParameters: - @{SDLNameCommandId:@55}}}; -NSDictionary* dictionaryV2 = @{SDLNameCommandId:@55}; +NSDictionary* dictionaryV1 = @{SDLRPCParameterNameRequest: + @{SDLRPCParameterNameOperationName:@"DeleteCommand", + SDLRPCParameterNameCorrelationId:@0x98765, + SDLRPCParameterNameParameters: + @{SDLRPCParameterNameCommandId:@55}}}; +NSDictionary* dictionaryV2 = @{SDLRPCParameterNameCommandId:@55}; describe(@"Send StartService Tests", ^ { context(@"Unsecure", ^{ diff --git a/SmartDeviceLinkTests/ProtocolSpecs/MessageSpecs/SDLV2ProtocolMessageSpec.m b/SmartDeviceLinkTests/ProtocolSpecs/MessageSpecs/SDLV2ProtocolMessageSpec.m index 3b73eb172..fe447388c 100644 --- a/SmartDeviceLinkTests/ProtocolSpecs/MessageSpecs/SDLV2ProtocolMessageSpec.m +++ b/SmartDeviceLinkTests/ProtocolSpecs/MessageSpecs/SDLV2ProtocolMessageSpec.m @@ -12,7 +12,7 @@ #import "SDLV2ProtocolMessage.h" #import "SDLV2ProtocolHeader.h" #import "SDLRPCPayload.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLV2ProtocolMessageSpec) diff --git a/SmartDeviceLinkTests/ProtocolSpecs/SDLFunctionIDSpec.m b/SmartDeviceLinkTests/ProtocolSpecs/SDLFunctionIDSpec.m index 322c410eb..e1b32df29 100644 --- a/SmartDeviceLinkTests/ProtocolSpecs/SDLFunctionIDSpec.m +++ b/SmartDeviceLinkTests/ProtocolSpecs/SDLFunctionIDSpec.m @@ -9,7 +9,7 @@ #import <Nimble/Nimble.h> #import "SDLFunctionID.h" -#import "SDLNames.h" +#import "SDLRPCFunctionNames.h" QuickSpecBegin(SDLFunctionIDSpec) @@ -17,153 +17,155 @@ SDLFunctionID* functionID = [SDLFunctionID sharedInstance]; describe(@"GetFunctionName Tests", ^ { it(@"Should return the correct function name", ^ { - expect([functionID functionNameForId:1]).to(equal(SDLNameRegisterAppInterface)); - expect([functionID functionNameForId:2]).to(equal(SDLNameUnregisterAppInterface)); - expect([functionID functionNameForId:3]).to(equal(SDLNameSetGlobalProperties)); - expect([functionID functionNameForId:4]).to(equal(SDLNameResetGlobalProperties)); - expect([functionID functionNameForId:5]).to(equal(SDLNameAddCommand)); - expect([functionID functionNameForId:6]).to(equal(SDLNameDeleteCommand)); - expect([functionID functionNameForId:7]).to(equal(SDLNameAddSubMenu)); - expect([functionID functionNameForId:8]).to(equal(SDLNameDeleteSubMenu)); - expect([functionID functionNameForId:9]).to(equal(SDLNameCreateInteractionChoiceSet)); - expect([functionID functionNameForId:10]).to(equal(SDLNamePerformInteraction)); - expect([functionID functionNameForId:11]).to(equal(SDLNameDeleteInteractionChoiceSet)); - expect([functionID functionNameForId:12]).to(equal(SDLNameAlert)); - expect([functionID functionNameForId:13]).to(equal(SDLNameShow)); - expect([functionID functionNameForId:14]).to(equal(SDLNameSpeak)); - expect([functionID functionNameForId:15]).to(equal(SDLNameSetMediaClockTimer)); - expect([functionID functionNameForId:16]).to(equal(SDLNamePerformAudioPassThru)); - expect([functionID functionNameForId:17]).to(equal(SDLNameEndAudioPassThru)); - expect([functionID functionNameForId:18]).to(equal(SDLNameSubscribeButton)); - expect([functionID functionNameForId:19]).to(equal(SDLNameUnsubscribeButton)); - expect([functionID functionNameForId:20]).to(equal(SDLNameSubscribeVehicleData)); - expect([functionID functionNameForId:21]).to(equal(SDLNameUnsubscribeVehicleData)); - expect([functionID functionNameForId:22]).to(equal(SDLNameGetVehicleData)); - expect([functionID functionNameForId:23]).to(equal(SDLNameReadDID)); - expect([functionID functionNameForId:24]).to(equal(SDLNameGetDTCs)); - expect([functionID functionNameForId:25]).to(equal(SDLNameScrollableMessage)); - expect([functionID functionNameForId:26]).to(equal(SDLNameSlider)); - expect([functionID functionNameForId:27]).to(equal(SDLNameShowConstantTBT)); - expect([functionID functionNameForId:28]).to(equal(SDLNameAlertManeuver)); - expect([functionID functionNameForId:29]).to(equal(SDLNameUpdateTurnList)); - expect([functionID functionNameForId:30]).to(equal(SDLNameChangeRegistration)); - expect([functionID functionNameForId:31]).to(equal(SDLNameGenericResponse)); - expect([functionID functionNameForId:32]).to(equal(SDLNamePutFile)); - expect([functionID functionNameForId:33]).to(equal(SDLNameDeleteFile)); - expect([functionID functionNameForId:34]).to(equal(SDLNameListFiles)); - expect([functionID functionNameForId:35]).to(equal(SDLNameSetAppIcon)); - expect([functionID functionNameForId:36]).to(equal(SDLNameSetDisplayLayout)); - expect([functionID functionNameForId:37]).to(equal(SDLNameDiagnosticMessage)); - expect([functionID functionNameForId:38]).to(equal(SDLNameSystemRequest)); - expect([functionID functionNameForId:39]).to(equal(SDLNameSendLocation)); - expect([functionID functionNameForId:40]).to(equal(SDLNameDialNumber)); - expect([functionID functionNameForId:45]).to(equal(SDLNameGetWayPoints)); - expect([functionID functionNameForId:46]).to(equal(SDLNameSubscribeWayPoints)); - expect([functionID functionNameForId:47]).to(equal(SDLNameUnsubscribeWayPoints)); - expect([functionID functionNameForId:48]).to(equal(SDLNameGetSystemCapability)); - expect([functionID functionNameForId:49]).to(equal(SDLNameSendHapticData)); - expect([functionID functionNameForId:50]).to(equal(SDLNameSetCloudAppProperties)); - expect([functionID functionNameForId:51]).to(equal(SDLNameGetCloudAppProperties)); - expect([functionID functionNameForId:32768]).to(equal(SDLNameOnHMIStatus)); - expect([functionID functionNameForId:32769]).to(equal(SDLNameOnAppInterfaceUnregistered)); - expect([functionID functionNameForId:32770]).to(equal(SDLNameOnButtonEvent)); - expect([functionID functionNameForId:32771]).to(equal(SDLNameOnButtonPress)); - expect([functionID functionNameForId:32772]).to(equal(SDLNameOnVehicleData)); - expect([functionID functionNameForId:32773]).to(equal(SDLNameOnCommand)); - expect([functionID functionNameForId:32774]).to(equal(SDLNameOnTBTClientState)); - expect([functionID functionNameForId:32775]).to(equal(SDLNameOnDriverDistraction)); - expect([functionID functionNameForId:32776]).to(equal(SDLNameOnPermissionsChange)); - expect([functionID functionNameForId:32777]).to(equal(SDLNameOnAudioPassThru)); - expect([functionID functionNameForId:32778]).to(equal(SDLNameOnLanguageChange)); - expect([functionID functionNameForId:32779]).to(equal(SDLNameOnKeyboardInput)); - expect([functionID functionNameForId:32780]).to(equal(SDLNameOnTouchEvent)); - expect([functionID functionNameForId:32781]).to(equal(SDLNameOnSystemRequest)); - expect([functionID functionNameForId:32782]).to(equal(SDLNameOnHashChange)); - expect([functionID functionNameForId:32784]).to(equal(SDLNameOnWayPointChange)); - expect([functionID functionNameForId:32785]).to(equal(SDLNameOnRCStatus)); + expect([functionID functionNameForId:1]).to(equal(SDLRPCFunctionNameRegisterAppInterface)); + expect([functionID functionNameForId:2]).to(equal(SDLRPCFunctionNameUnregisterAppInterface)); + expect([functionID functionNameForId:3]).to(equal(SDLRPCFunctionNameSetGlobalProperties)); + expect([functionID functionNameForId:4]).to(equal(SDLRPCFunctionNameResetGlobalProperties)); + expect([functionID functionNameForId:5]).to(equal(SDLRPCFunctionNameAddCommand)); + expect([functionID functionNameForId:6]).to(equal(SDLRPCFunctionNameDeleteCommand)); + expect([functionID functionNameForId:7]).to(equal(SDLRPCFunctionNameAddSubMenu)); + expect([functionID functionNameForId:8]).to(equal(SDLRPCFunctionNameDeleteSubMenu)); + expect([functionID functionNameForId:9]).to(equal(SDLRPCFunctionNameCreateInteractionChoiceSet)); + expect([functionID functionNameForId:10]).to(equal(SDLRPCFunctionNamePerformInteraction)); + expect([functionID functionNameForId:11]).to(equal(SDLRPCFunctionNameDeleteInteractionChoiceSet)); + expect([functionID functionNameForId:12]).to(equal(SDLRPCFunctionNameAlert)); + expect([functionID functionNameForId:13]).to(equal(SDLRPCFunctionNameShow)); + expect([functionID functionNameForId:14]).to(equal(SDLRPCFunctionNameSpeak)); + expect([functionID functionNameForId:15]).to(equal(SDLRPCFunctionNameSetMediaClockTimer)); + expect([functionID functionNameForId:16]).to(equal(SDLRPCFunctionNamePerformAudioPassThru)); + expect([functionID functionNameForId:17]).to(equal(SDLRPCFunctionNameEndAudioPassThru)); + expect([functionID functionNameForId:18]).to(equal(SDLRPCFunctionNameSubscribeButton)); + expect([functionID functionNameForId:19]).to(equal(SDLRPCFunctionNameUnsubscribeButton)); + expect([functionID functionNameForId:20]).to(equal(SDLRPCFunctionNameSubscribeVehicleData)); + expect([functionID functionNameForId:21]).to(equal(SDLRPCFunctionNameUnsubscribeVehicleData)); + expect([functionID functionNameForId:22]).to(equal(SDLRPCFunctionNameGetVehicleData)); + expect([functionID functionNameForId:23]).to(equal(SDLRPCFunctionNameReadDID)); + expect([functionID functionNameForId:24]).to(equal(SDLRPCFunctionNameGetDTCs)); + expect([functionID functionNameForId:25]).to(equal(SDLRPCFunctionNameScrollableMessage)); + expect([functionID functionNameForId:26]).to(equal(SDLRPCFunctionNameSlider)); + expect([functionID functionNameForId:27]).to(equal(SDLRPCFunctionNameShowConstantTBT)); + expect([functionID functionNameForId:28]).to(equal(SDLRPCFunctionNameAlertManeuver)); + expect([functionID functionNameForId:29]).to(equal(SDLRPCFunctionNameUpdateTurnList)); + expect([functionID functionNameForId:30]).to(equal(SDLRPCFunctionNameChangeRegistration)); + expect([functionID functionNameForId:31]).to(equal(SDLRPCFunctionNameGenericResponse)); + expect([functionID functionNameForId:32]).to(equal(SDLRPCFunctionNamePutFile)); + expect([functionID functionNameForId:33]).to(equal(SDLRPCFunctionNameDeleteFile)); + expect([functionID functionNameForId:34]).to(equal(SDLRPCFunctionNameListFiles)); + expect([functionID functionNameForId:35]).to(equal(SDLRPCFunctionNameSetAppIcon)); + expect([functionID functionNameForId:36]).to(equal(SDLRPCFunctionNameSetDisplayLayout)); + expect([functionID functionNameForId:37]).to(equal(SDLRPCFunctionNameDiagnosticMessage)); + expect([functionID functionNameForId:38]).to(equal(SDLRPCFunctionNameSystemRequest)); + expect([functionID functionNameForId:39]).to(equal(SDLRPCFunctionNameSendLocation)); + expect([functionID functionNameForId:40]).to(equal(SDLRPCFunctionNameDialNumber)); + expect([functionID functionNameForId:45]).to(equal(SDLRPCFunctionNameGetWayPoints)); + expect([functionID functionNameForId:46]).to(equal(SDLRPCFunctionNameSubscribeWayPoints)); + expect([functionID functionNameForId:47]).to(equal(SDLRPCFunctionNameUnsubscribeWayPoints)); + expect([functionID functionNameForId:48]).to(equal(SDLRPCFunctionNameGetSystemCapability)); + expect([functionID functionNameForId:49]).to(equal(SDLRPCFunctionNameSendHapticData)); + expect([functionID functionNameForId:52]).to(equal(SDLRPCFunctionNamePublishAppService)); + expect([functionID functionNameForId:53]).to(equal(SDLRPCFunctionNameGetAppServiceData)); + expect([functionID functionNameForId:54]).to(equal(SDLRPCFunctionNameGetFile)); + expect([functionID functionNameForId:55]).to(equal(SDLRPCFunctionNamePerformAppServiceInteraction)); + expect([functionID functionNameForId:32768]).to(equal(SDLRPCFunctionNameOnHMIStatus)); + expect([functionID functionNameForId:32769]).to(equal(SDLRPCFunctionNameOnAppInterfaceUnregistered)); + expect([functionID functionNameForId:32770]).to(equal(SDLRPCFunctionNameOnButtonEvent)); + expect([functionID functionNameForId:32771]).to(equal(SDLRPCFunctionNameOnButtonPress)); + expect([functionID functionNameForId:32772]).to(equal(SDLRPCFunctionNameOnVehicleData)); + expect([functionID functionNameForId:32773]).to(equal(SDLRPCFunctionNameOnCommand)); + expect([functionID functionNameForId:32774]).to(equal(SDLRPCFunctionNameOnTBTClientState)); + expect([functionID functionNameForId:32775]).to(equal(SDLRPCFunctionNameOnDriverDistraction)); + expect([functionID functionNameForId:32776]).to(equal(SDLRPCFunctionNameOnPermissionsChange)); + expect([functionID functionNameForId:32777]).to(equal(SDLRPCFunctionNameOnAudioPassThru)); + expect([functionID functionNameForId:32778]).to(equal(SDLRPCFunctionNameOnLanguageChange)); + expect([functionID functionNameForId:32779]).to(equal(SDLRPCFunctionNameOnKeyboardInput)); + expect([functionID functionNameForId:32780]).to(equal(SDLRPCFunctionNameOnTouchEvent)); + expect([functionID functionNameForId:32781]).to(equal(SDLRPCFunctionNameOnSystemRequest)); + expect([functionID functionNameForId:32782]).to(equal(SDLRPCFunctionNameOnHashChange)); + expect([functionID functionNameForId:32784]).to(equal(SDLRPCFunctionNameOnWayPointChange)); + expect([functionID functionNameForId:32785]).to(equal(SDLRPCFunctionNameOnRCStatus)); + expect([functionID functionNameForId:32786]).to(equal(SDLRPCFunctionNameOnAppServiceData)); + expect([functionID functionNameForId:32787]).to(equal(SDLRPCFunctionNameOnSystemCapabilityUpdated)); //Not listed in Spec - expect([functionID functionNameForId:65536]).to(equal(SDLNameEncodedSyncPData)); - expect([functionID functionNameForId:65537]).to(equal(SDLNameSyncPData)); + expect([functionID functionNameForId:65536]).to(equal(SDLRPCFunctionNameEncodedSyncPData)); + expect([functionID functionNameForId:65537]).to(equal(SDLRPCFunctionNameSyncPData)); - expect([functionID functionNameForId:98304]).to(equal(SDLNameOnEncodedSyncPData)); - expect([functionID functionNameForId:98305]).to(equal(SDLNameOnSyncPData)); + expect([functionID functionNameForId:98304]).to(equal(SDLRPCFunctionNameOnEncodedSyncPData)); + expect([functionID functionNameForId:98305]).to(equal(SDLRPCFunctionNameOnSyncPData)); }); }); describe(@"GetFunctionID Tests", ^ { it(@"Should return the correct function ID", ^ { - expect([functionID functionIdForName:SDLNameRegisterAppInterface]).to(equal(@1)); - expect([functionID functionIdForName:SDLNameUnregisterAppInterface]).to(equal(@2)); - expect([functionID functionIdForName:SDLNameSetGlobalProperties]).to(equal(@3)); - expect([functionID functionIdForName:SDLNameResetGlobalProperties]).to(equal(@4)); - expect([functionID functionIdForName:SDLNameAddCommand]).to(equal(@5)); - expect([functionID functionIdForName:SDLNameDeleteCommand]).to(equal(@6)); - expect([functionID functionIdForName:SDLNameAddSubMenu]).to(equal(@7)); - expect([functionID functionIdForName:SDLNameDeleteSubMenu]).to(equal(@8)); - expect([functionID functionIdForName:SDLNameCreateInteractionChoiceSet]).to(equal(@9)); - expect([functionID functionIdForName:SDLNamePerformInteraction]).to(equal(@10)); - expect([functionID functionIdForName:SDLNameDeleteInteractionChoiceSet]).to(equal(@11)); - expect([functionID functionIdForName:SDLNameAlert]).to(equal(@12)); - expect([functionID functionIdForName:SDLNameShow]).to(equal(@13)); - expect([functionID functionIdForName:SDLNameSpeak]).to(equal(@14)); - expect([functionID functionIdForName:SDLNameSetMediaClockTimer]).to(equal(@15)); - expect([functionID functionIdForName:SDLNamePerformAudioPassThru]).to(equal(@16)); - expect([functionID functionIdForName:SDLNameEndAudioPassThru]).to(equal(@17)); - expect([functionID functionIdForName:SDLNameSubscribeButton]).to(equal(@18)); - expect([functionID functionIdForName:SDLNameUnsubscribeButton]).to(equal(@19)); - expect([functionID functionIdForName:SDLNameSubscribeVehicleData]).to(equal(@20)); - expect([functionID functionIdForName:SDLNameUnsubscribeVehicleData]).to(equal(@21)); - expect([functionID functionIdForName:SDLNameGetVehicleData]).to(equal(@22)); - expect([functionID functionIdForName:SDLNameReadDID]).to(equal(@23)); - expect([functionID functionIdForName:SDLNameGetDTCs]).to(equal(@24)); - expect([functionID functionIdForName:SDLNameScrollableMessage]).to(equal(@25)); - expect([functionID functionIdForName:SDLNameSlider]).to(equal(@26)); - expect([functionID functionIdForName:SDLNameShowConstantTBT]).to(equal(@27)); - expect([functionID functionIdForName:SDLNameAlertManeuver]).to(equal(@28)); - expect([functionID functionIdForName:SDLNameUpdateTurnList]).to(equal(@29)); - expect([functionID functionIdForName:SDLNameChangeRegistration]).to(equal(@30)); - expect([functionID functionIdForName:SDLNameGenericResponse]).to(equal(@31)); - expect([functionID functionIdForName:SDLNamePutFile]).to(equal(@32)); - expect([functionID functionIdForName:SDLNameDeleteFile]).to(equal(@33)); - expect([functionID functionIdForName:SDLNameListFiles]).to(equal(@34)); - expect([functionID functionIdForName:SDLNameSetAppIcon]).to(equal(@35)); - expect([functionID functionIdForName:SDLNameSetDisplayLayout]).to(equal(@36)); - expect([functionID functionIdForName:SDLNameDiagnosticMessage]).to(equal(@37)); - expect([functionID functionIdForName:SDLNameSystemRequest]).to(equal(@38)); - expect([functionID functionIdForName:SDLNameSendLocation]).to(equal(@39)); - expect([functionID functionIdForName:SDLNameDialNumber]).to(equal(@40)); - expect([functionID functionIdForName:SDLNameGetWayPoints]).to(equal(@45)); - expect([functionID functionIdForName:SDLNameSubscribeWayPoints]).to(equal(@46)); - expect([functionID functionIdForName:SDLNameUnsubscribeWayPoints]).to(equal(@47)); - expect([functionID functionIdForName:SDLNameGetSystemCapability]).to(equal(@48)); - expect([functionID functionIdForName:SDLNameSendHapticData]).to(equal(@49)); - expect([functionID functionIdForName:SDLNameSetCloudAppProperties]).to(equal(@50)); - expect([functionID functionIdForName:SDLNameGetCloudAppProperties]).to(equal(@51)); - expect([functionID functionIdForName:SDLNameOnHMIStatus]).to(equal(@32768)); - expect([functionID functionIdForName:SDLNameOnAppInterfaceUnregistered]).to(equal(@32769)); - expect([functionID functionIdForName:SDLNameOnButtonEvent]).to(equal(@32770)); - expect([functionID functionIdForName:SDLNameOnButtonPress]).to(equal(@32771)); - expect([functionID functionIdForName:SDLNameOnVehicleData]).to(equal(@32772)); - expect([functionID functionIdForName:SDLNameOnCommand]).to(equal(@32773)); - expect([functionID functionIdForName:SDLNameOnTBTClientState]).to(equal(@32774)); - expect([functionID functionIdForName:SDLNameOnDriverDistraction]).to(equal(@32775)); - expect([functionID functionIdForName:SDLNameOnPermissionsChange]).to(equal(@32776)); - expect([functionID functionIdForName:SDLNameOnAudioPassThru]).to(equal(@32777)); - expect([functionID functionIdForName:SDLNameOnLanguageChange]).to(equal(@32778)); - expect([functionID functionIdForName:SDLNameOnKeyboardInput]).to(equal(@32779)); - expect([functionID functionIdForName:SDLNameOnTouchEvent]).to(equal(@32780)); - expect([functionID functionIdForName:SDLNameOnSystemRequest]).to(equal(@32781)); - expect([functionID functionIdForName:SDLNameOnHashChange]).to(equal(@32782)); - expect([functionID functionIdForName:SDLNameOnWayPointChange]).to(equal(@32784)); - expect([functionID functionIdForName:SDLNameOnRCStatus]).to(equal(@32785)); + expect([functionID functionIdForName:SDLRPCFunctionNameRegisterAppInterface]).to(equal(@1)); + expect([functionID functionIdForName:SDLRPCFunctionNameUnregisterAppInterface]).to(equal(@2)); + expect([functionID functionIdForName:SDLRPCFunctionNameSetGlobalProperties]).to(equal(@3)); + expect([functionID functionIdForName:SDLRPCFunctionNameResetGlobalProperties]).to(equal(@4)); + expect([functionID functionIdForName:SDLRPCFunctionNameAddCommand]).to(equal(@5)); + expect([functionID functionIdForName:SDLRPCFunctionNameDeleteCommand]).to(equal(@6)); + expect([functionID functionIdForName:SDLRPCFunctionNameAddSubMenu]).to(equal(@7)); + expect([functionID functionIdForName:SDLRPCFunctionNameDeleteSubMenu]).to(equal(@8)); + expect([functionID functionIdForName:SDLRPCFunctionNameCreateInteractionChoiceSet]).to(equal(@9)); + expect([functionID functionIdForName:SDLRPCFunctionNamePerformInteraction]).to(equal(@10)); + expect([functionID functionIdForName:SDLRPCFunctionNameDeleteInteractionChoiceSet]).to(equal(@11)); + expect([functionID functionIdForName:SDLRPCFunctionNameAlert]).to(equal(@12)); + expect([functionID functionIdForName:SDLRPCFunctionNameShow]).to(equal(@13)); + expect([functionID functionIdForName:SDLRPCFunctionNameSpeak]).to(equal(@14)); + expect([functionID functionIdForName:SDLRPCFunctionNameSetMediaClockTimer]).to(equal(@15)); + expect([functionID functionIdForName:SDLRPCFunctionNamePerformAudioPassThru]).to(equal(@16)); + expect([functionID functionIdForName:SDLRPCFunctionNameEndAudioPassThru]).to(equal(@17)); + expect([functionID functionIdForName:SDLRPCFunctionNameSubscribeButton]).to(equal(@18)); + expect([functionID functionIdForName:SDLRPCFunctionNameUnsubscribeButton]).to(equal(@19)); + expect([functionID functionIdForName:SDLRPCFunctionNameSubscribeVehicleData]).to(equal(@20)); + expect([functionID functionIdForName:SDLRPCFunctionNameUnsubscribeVehicleData]).to(equal(@21)); + expect([functionID functionIdForName:SDLRPCFunctionNameGetVehicleData]).to(equal(@22)); + expect([functionID functionIdForName:SDLRPCFunctionNameReadDID]).to(equal(@23)); + expect([functionID functionIdForName:SDLRPCFunctionNameGetDTCs]).to(equal(@24)); + expect([functionID functionIdForName:SDLRPCFunctionNameScrollableMessage]).to(equal(@25)); + expect([functionID functionIdForName:SDLRPCFunctionNameSlider]).to(equal(@26)); + expect([functionID functionIdForName:SDLRPCFunctionNameShowConstantTBT]).to(equal(@27)); + expect([functionID functionIdForName:SDLRPCFunctionNameAlertManeuver]).to(equal(@28)); + expect([functionID functionIdForName:SDLRPCFunctionNameUpdateTurnList]).to(equal(@29)); + expect([functionID functionIdForName:SDLRPCFunctionNameChangeRegistration]).to(equal(@30)); + expect([functionID functionIdForName:SDLRPCFunctionNameGenericResponse]).to(equal(@31)); + expect([functionID functionIdForName:SDLRPCFunctionNamePutFile]).to(equal(@32)); + expect([functionID functionIdForName:SDLRPCFunctionNameDeleteFile]).to(equal(@33)); + expect([functionID functionIdForName:SDLRPCFunctionNameListFiles]).to(equal(@34)); + expect([functionID functionIdForName:SDLRPCFunctionNameSetAppIcon]).to(equal(@35)); + expect([functionID functionIdForName:SDLRPCFunctionNameSetDisplayLayout]).to(equal(@36)); + expect([functionID functionIdForName:SDLRPCFunctionNameDiagnosticMessage]).to(equal(@37)); + expect([functionID functionIdForName:SDLRPCFunctionNameSystemRequest]).to(equal(@38)); + expect([functionID functionIdForName:SDLRPCFunctionNameSendLocation]).to(equal(@39)); + expect([functionID functionIdForName:SDLRPCFunctionNameDialNumber]).to(equal(@40)); + expect([functionID functionIdForName:SDLRPCFunctionNameGetWayPoints]).to(equal(@45)); + expect([functionID functionIdForName:SDLRPCFunctionNameSubscribeWayPoints]).to(equal(@46)); + expect([functionID functionIdForName:SDLRPCFunctionNameUnsubscribeWayPoints]).to(equal(@47)); + expect([functionID functionIdForName:SDLRPCFunctionNameGetSystemCapability]).to(equal(@48)); + expect([functionID functionIdForName:SDLRPCFunctionNameSendHapticData]).to(equal(@49)); + expect([functionID functionIdForName:SDLRPCFunctionNameOnHMIStatus]).to(equal(@32768)); + expect([functionID functionIdForName:SDLRPCFunctionNameOnAppInterfaceUnregistered]).to(equal(@32769)); + expect([functionID functionIdForName:SDLRPCFunctionNameOnButtonEvent]).to(equal(@32770)); + expect([functionID functionIdForName:SDLRPCFunctionNameOnButtonPress]).to(equal(@32771)); + expect([functionID functionIdForName:SDLRPCFunctionNameOnVehicleData]).to(equal(@32772)); + expect([functionID functionIdForName:SDLRPCFunctionNameOnCommand]).to(equal(@32773)); + expect([functionID functionIdForName:SDLRPCFunctionNameOnTBTClientState]).to(equal(@32774)); + expect([functionID functionIdForName:SDLRPCFunctionNameOnDriverDistraction]).to(equal(@32775)); + expect([functionID functionIdForName:SDLRPCFunctionNameOnPermissionsChange]).to(equal(@32776)); + expect([functionID functionIdForName:SDLRPCFunctionNameOnAudioPassThru]).to(equal(@32777)); + expect([functionID functionIdForName:SDLRPCFunctionNameOnLanguageChange]).to(equal(@32778)); + expect([functionID functionIdForName:SDLRPCFunctionNameOnKeyboardInput]).to(equal(@32779)); + expect([functionID functionIdForName:SDLRPCFunctionNameOnTouchEvent]).to(equal(@32780)); + expect([functionID functionIdForName:SDLRPCFunctionNameOnSystemRequest]).to(equal(@32781)); + expect([functionID functionIdForName:SDLRPCFunctionNameOnHashChange]).to(equal(@32782)); + expect([functionID functionIdForName:SDLRPCFunctionNameOnWayPointChange]).to(equal(@32784)); + expect([functionID functionIdForName:SDLRPCFunctionNameOnRCStatus]).to(equal(@32785)); //Not listed in Spec - expect([functionID functionIdForName:SDLNameEncodedSyncPData]).to(equal(@65536)); - expect([functionID functionIdForName:SDLNameSyncPData]).to(equal(@65537)); + expect([functionID functionIdForName:SDLRPCFunctionNameEncodedSyncPData]).to(equal(@65536)); + expect([functionID functionIdForName:SDLRPCFunctionNameSyncPData]).to(equal(@65537)); - expect([functionID functionIdForName:SDLNameOnEncodedSyncPData]).to(equal(@98304)); - expect([functionID functionIdForName:SDLNameOnSyncPData]).to(equal(@98305)); + expect([functionID functionIdForName:SDLRPCFunctionNameOnEncodedSyncPData]).to(equal(@98304)); + expect([functionID functionIdForName:SDLRPCFunctionNameOnSyncPData]).to(equal(@98305)); }); }); diff --git a/SmartDeviceLinkTests/ProtocolSpecs/SDLProtocolMessageAssemblerSpec.m b/SmartDeviceLinkTests/ProtocolSpecs/SDLProtocolMessageAssemblerSpec.m index 1c7187387..b3826428a 100644 --- a/SmartDeviceLinkTests/ProtocolSpecs/SDLProtocolMessageAssemblerSpec.m +++ b/SmartDeviceLinkTests/ProtocolSpecs/SDLProtocolMessageAssemblerSpec.m @@ -12,7 +12,7 @@ #import "SDLProtocolMessageAssembler.h" #import "SDLV2ProtocolHeader.h" #import "SDLV2ProtocolMessage.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLProtocolMessageAssemblerSpec) diff --git a/SmartDeviceLinkTests/ProtocolSpecs/SDLProtocolMessageDisassemblerSpec.m b/SmartDeviceLinkTests/ProtocolSpecs/SDLProtocolMessageDisassemblerSpec.m index ad662b47b..9c211ba05 100644 --- a/SmartDeviceLinkTests/ProtocolSpecs/SDLProtocolMessageDisassemblerSpec.m +++ b/SmartDeviceLinkTests/ProtocolSpecs/SDLProtocolMessageDisassemblerSpec.m @@ -13,7 +13,7 @@ #import "SDLProtocolMessageDisassembler.h" #import "SDLV2ProtocolHeader.h" #import "SDLV2ProtocolMessage.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" #import "SDLVersion.h" QuickSpecBegin(SDLProtocolMessageDisassemblerSpec) diff --git a/SmartDeviceLinkTests/ProtocolSpecs/SDLProtocolReceivedMessageRouterSpec.m b/SmartDeviceLinkTests/ProtocolSpecs/SDLProtocolReceivedMessageRouterSpec.m index 747a087b1..ab91a5de2 100644 --- a/SmartDeviceLinkTests/ProtocolSpecs/SDLProtocolReceivedMessageRouterSpec.m +++ b/SmartDeviceLinkTests/ProtocolSpecs/SDLProtocolReceivedMessageRouterSpec.m @@ -12,7 +12,7 @@ #import "SDLProtocolReceivedMessageRouter.h" #import "SDLV2ProtocolHeader.h" #import "SDLV2ProtocolMessage.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLProtocolReceivedMessageRouterSpec) diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLAppServiceTypeSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLAppServiceTypeSpec.m new file mode 100644 index 000000000..269c14d31 --- /dev/null +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLAppServiceTypeSpec.m @@ -0,0 +1,26 @@ +// +// SDLAppServiceTypeSpec.m +// SmartDeviceLinkTests +// +// Created by Nicole on 1/30/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import <Quick/Quick.h> +#import <Nimble/Nimble.h> + +#import "SDLAppServiceType.h" + + +QuickSpecBegin(SDLAppServiceTypeSpec) + +describe(@"Individual Enum Value Tests", ^{ + it(@"Should match internal values", ^{ + expect(SDLAppServiceTypeMedia).to(equal(@"MEDIA")); + expect(SDLAppServiceTypeWeather).to(equal(@"WEATHER")); + expect(SDLAppServiceTypeNavigation).to(equal(@"NAVIGATION")); + }); +}); + +QuickSpecEnd + diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLDirectionSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLDirectionSpec.m new file mode 100644 index 000000000..86033c90b --- /dev/null +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLDirectionSpec.m @@ -0,0 +1,23 @@ +// +// SDLDirectionSpec.m +// SmartDeviceLinkTests +// +// Created by Nicole on 2/22/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import <Quick/Quick.h> +#import <Nimble/Nimble.h> + +#import "SDLDirection.h" + +QuickSpecBegin(SDLDirectionSpec) + +describe(@"Individual Enum Value Tests", ^ { + it(@"Should match internal values", ^ { + expect(SDLDirectionLeft).to(equal(@"LEFT")); + expect(SDLDirectionRight).to(equal(@"RIGHT")); + }); +}); + +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLMediaTypeSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLMediaTypeSpec.m new file mode 100644 index 000000000..6e355cdd4 --- /dev/null +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLMediaTypeSpec.m @@ -0,0 +1,25 @@ +// +// SDLMediaTypeSpec.m +// SmartDeviceLinkTests +// +// Created by Nicole on 2/8/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import <Quick/Quick.h> +#import <Nimble/Nimble.h> + +#import "SDLMediaType.h" + +QuickSpecBegin(SDLMediaTypeSpec) + +describe(@"Individual Enum Value Tests", ^{ + it(@"Should match internal values", ^{ + expect(SDLMediaTypeMusic).to(equal(@"MUSIC")); + expect(SDLMediaTypePodcast).to(equal(@"PODCAST")); + expect(SDLMediaTypeAudiobook).to(equal(@"AUDIOBOOK")); + expect(SDLMediaTypeOther).to(equal(@"OTHER")); + }); +}); + +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLNavigationActionSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLNavigationActionSpec.m new file mode 100644 index 000000000..d4e4dbaa3 --- /dev/null +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLNavigationActionSpec.m @@ -0,0 +1,28 @@ +// +// SDLNavigationActionSpec.m +// SmartDeviceLinkTests +// +// Created by Nicole on 2/22/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import <Quick/Quick.h> +#import <Nimble/Nimble.h> + +#import "SDLNavigationAction.h" + +QuickSpecBegin(SDLNavigationActionSpec) + +describe(@"Individual Enum Value Tests", ^ { + it(@"Should match internal values", ^ { + expect(SDLNavigationActionTurn).to(equal(@"TURN")); + expect(SDLNavigationActionExit).to(equal(@"EXIT")); + expect(SDLNavigationActionStay).to(equal(@"STAY")); + expect(SDLNavigationActionMerge).to(equal(@"MERGE")); + expect(SDLNavigationActionFerry).to(equal(@"FERRY")); + expect(SDLNavigationActionCarShuttleTrain).to(equal(@"CAR_SHUTTLE_TRAIN")); + expect(SDLNavigationActionWaypoint).to(equal(@"WAYPOINT")); + }); +}); + +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLNavigationJunctionSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLNavigationJunctionSpec.m new file mode 100644 index 000000000..456d4b5bc --- /dev/null +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLNavigationJunctionSpec.m @@ -0,0 +1,31 @@ +// +// SDLNavigationJunctionSpec.m +// SmartDeviceLinkTests +// +// Created by Nicole on 2/22/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import <Quick/Quick.h> +#import <Nimble/Nimble.h> + +#import "SDLNavigationJunction.h" + +QuickSpecBegin(SDLNavigationJunctionSpec) + +describe(@"Individual Enum Value Tests", ^ { + it(@"Should match internal values", ^ { + expect(SDLNavigationJunctionRegular).to(equal(@"REGULAR")); + expect(SDLNavigationJunctionBifurcation).to(equal(@"BIFURCATION")); + expect(SDLNavigationJunctionMultiCarriageway).to(equal(@"MULTI_CARRIAGEWAY")); + expect(SDLNavigationJunctionRoundabout).to(equal(@"ROUNDABOUT")); + expect(SDLNavigationJunctionTraversableRoundabout).to(equal(@"TRAVERSABLE_ROUNDABOUT")); + expect(SDLNavigationJunctionJughandle).to(equal(@"JUGHANDLE")); + expect(SDLNavigationJunctionAllWayYield).to(equal(@"ALL_WAY_YIELD")); + expect(SDLNavigationJunctionTurnAround).to(equal(@"TURN_AROUND")); + }); +}); + +QuickSpecEnd + + diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLServiceUpdateReasonSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLServiceUpdateReasonSpec.m new file mode 100644 index 000000000..a66d2df97 --- /dev/null +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLServiceUpdateReasonSpec.m @@ -0,0 +1,26 @@ +// +// SDLServiceUpdateReasonSpec.m +// SmartDeviceLinkTests +// +// Created by Nicole on 1/30/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import <Quick/Quick.h> +#import <Nimble/Nimble.h> + +#import "SDLServiceUpdateReason.h" + +QuickSpecBegin(SDLServiceUpdateReasonSpec) + +describe(@"Individual Enum Value Tests", ^{ + it(@"Should match internal values", ^{ + expect(SDLServiceUpdatePublished).to(equal(@"PUBLISHED")); + expect(SDLServiceUpdateRemoved).to(equal(@"REMOVED")); + expect(SDLServiceUpdateActivated).to(equal(@"ACTIVATED")); + expect(SDLServiceUpdateDeactivated).to(equal(@"DEACTIVATED")); + expect(SDLServiceUpdateManifestUpdate).to(equal(@"MANIFEST_UPDATE")); + }); +}); + +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLSystemCapabilityTypeSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLSystemCapabilityTypeSpec.m index 0acaa4b6e..58bb889dc 100755 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLSystemCapabilityTypeSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLSystemCapabilityTypeSpec.m @@ -10,6 +10,7 @@ QuickSpecBegin(SDLSystemCapabilityTypeSpec) describe(@"Individual Enum Value Tests", ^ { it(@"Should match internal values", ^ { + expect(SDLSystemCapabilityTypeAppServices).to(equal(@"APP_SERVICES")); expect(SDLSystemCapabilityTypeNavigation).to(equal(@"NAVIGATION")); expect(SDLSystemCapabilityTypePhoneCall).to(equal(@"PHONE_CALL")); expect(SDLSystemCapabilityTypeVideoStreaming).to(equal(@"VIDEO_STREAMING")); diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnAppInterfaceUnregisteredSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnAppInterfaceUnregisteredSpec.m index b35d34d9c..fd5980b58 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnAppInterfaceUnregisteredSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnAppInterfaceUnregisteredSpec.m @@ -10,7 +10,8 @@ #import "SDLAppInterfaceUnregisteredReason.h" #import "SDLOnAppInterfaceUnregistered.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" QuickSpecBegin(SDLOnAppInterfaceUnregisteredSpec) @@ -24,10 +25,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameNotification: - @{SDLNameParameters: - @{SDLNameReason:SDLAppInterfaceUnregisteredReasonAppUnauthorized}, - SDLNameOperationName:SDLNameOnAppInterfaceUnregistered}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLRPCParameterNameNotification: + @{SDLRPCParameterNameParameters: + @{SDLRPCParameterNameReason:SDLAppInterfaceUnregisteredReasonAppUnauthorized}, + SDLRPCParameterNameOperationName:SDLRPCFunctionNameOnAppInterfaceUnregistered}} mutableCopy]; SDLOnAppInterfaceUnregistered* testNotification = [[SDLOnAppInterfaceUnregistered alloc] initWithDictionary:dict]; expect(testNotification.reason).to(equal(SDLAppInterfaceUnregisteredReasonAppUnauthorized)); diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnAppServiceDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnAppServiceDataSpec.m new file mode 100644 index 000000000..b5fe3fff0 --- /dev/null +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnAppServiceDataSpec.m @@ -0,0 +1,60 @@ +// +// SDLOnAppServiceDataSpec.m +// SmartDeviceLinkTests +// +// Created by Nicole on 2/7/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import <Quick/Quick.h> +#import <Nimble/Nimble.h> + +#import "SDLAppServiceData.h" +#import "SDLOnAppServiceData.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" + +QuickSpecBegin(SDLOnAppServiceDataSpec) + +describe(@"Getter/Setter Tests", ^{ + __block SDLAppServiceData *testAppServiceData = nil; + + beforeEach(^{ + testAppServiceData = [[SDLAppServiceData alloc] init]; + testAppServiceData.serviceId = @"testServiceId"; + }); + + it(@"Should set and get correctly", ^{ + SDLOnAppServiceData *testNotification = [[SDLOnAppServiceData alloc] init]; + testNotification.serviceData = testAppServiceData; + + expect(testNotification.serviceData).to(equal(testAppServiceData)); + }); + + it(@"Should get correctly when initialized with a dictionary", ^{ + NSDictionary *dict = @{SDLRPCParameterNameNotification:@{ + SDLRPCParameterNameParameters:@{ + SDLRPCParameterNameServiceData:testAppServiceData + }, + SDLRPCParameterNameOperationName:SDLRPCFunctionNameOnAppServiceData}}; + SDLOnAppServiceData *testNotification = [[SDLOnAppServiceData alloc] initWithDictionary:dict]; + + expect(testNotification.serviceData).to(equal(testAppServiceData)); + }); + + it(@"Should get correctly when initialized with initWithServiceData:", ^{ + SDLOnAppServiceData *testNotification = [[SDLOnAppServiceData alloc] initWithServiceData:testAppServiceData]; + + expect(testNotification.serviceData).to(equal(testAppServiceData)); + }); + + it(@"Should return nil if not set", ^{ + SDLOnAppServiceData *testNotification = [[SDLOnAppServiceData alloc] init]; + + expect(testNotification.serviceData).to(beNil()); + }); +}); + +QuickSpecEnd + + diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnAudioPassThruSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnAudioPassThruSpec.m index 213246b1c..8c6e16456 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnAudioPassThruSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnAudioPassThruSpec.m @@ -9,8 +9,9 @@ #import <Nimble/Nimble.h> #import "SDLOnAudioPassThru.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" QuickSpecBegin(SDLOnAudioPassThruSpec) -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnButtonEventSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnButtonEventSpec.m index b303ffd1a..2a298eb5e 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnButtonEventSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnButtonEventSpec.m @@ -10,7 +10,8 @@ #import "SDLButtonEventMode.h" #import "SDLButtonName.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" #import "SDLOnButtonEvent.h" @@ -30,12 +31,12 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameNotification: - @{SDLNameParameters: - @{SDLNameButtonName:SDLButtonNameCustomButton, - SDLNameButtonEventMode:SDLButtonEventModeButtonDown, - SDLNameCustomButtonId:@4252}, - SDLNameOperationName:SDLNameOnButtonEvent}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLRPCParameterNameNotification: + @{SDLRPCParameterNameParameters: + @{SDLRPCParameterNameButtonName:SDLButtonNameCustomButton, + SDLRPCParameterNameButtonEventMode:SDLButtonEventModeButtonDown, + SDLRPCParameterNameCustomButtonId:@4252}, + SDLRPCParameterNameOperationName:SDLRPCFunctionNameOnButtonEvent}} mutableCopy]; SDLOnButtonEvent* testNotification = [[SDLOnButtonEvent alloc] initWithDictionary:dict]; expect(testNotification.buttonName).to(equal(SDLButtonNameCustomButton)); diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnButtonPressSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnButtonPressSpec.m index 5737c2f81..1b098318b 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnButtonPressSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnButtonPressSpec.m @@ -11,7 +11,8 @@ #import "SDLButtonName.h" #import "SDLButtonPressMode.h" #import "SDLOnButtonPress.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" QuickSpecBegin(SDLOnButtonPressSpec) @@ -30,12 +31,12 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameNotification: - @{SDLNameParameters: - @{SDLNameButtonName:SDLButtonNameCustomButton, - SDLNameButtonPressMode:SDLButtonPressModeLong, - SDLNameCustomButtonId:@5642}, - SDLNameOperationName:SDLNameOnButtonPress}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLRPCParameterNameNotification: + @{SDLRPCParameterNameParameters: + @{SDLRPCParameterNameButtonName:SDLButtonNameCustomButton, + SDLRPCParameterNameButtonPressMode:SDLButtonPressModeLong, + SDLRPCParameterNameCustomButtonId:@5642}, + SDLRPCParameterNameOperationName:SDLRPCFunctionNameOnButtonPress}} mutableCopy]; SDLOnButtonPress* testNotification = [[SDLOnButtonPress alloc] initWithDictionary:dict]; expect(testNotification.buttonName).to(equal(SDLButtonNameCustomButton)); diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnCommandSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnCommandSpec.m index 6257a13cb..aac8b32b1 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnCommandSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnCommandSpec.m @@ -8,7 +8,8 @@ #import <Quick/Quick.h> #import <Nimble/Nimble.h> -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" #import "SDLOnCommand.h" #import "SDLTriggerSource.h" @@ -26,11 +27,11 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameNotification: - @{SDLNameParameters: - @{SDLNameCommandId:@5676544, - SDLNameTriggerSource:SDLTriggerSourceKeyboard}, - SDLNameOperationName:SDLNameOnCommand}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLRPCParameterNameNotification: + @{SDLRPCParameterNameParameters: + @{SDLRPCParameterNameCommandId:@5676544, + SDLRPCParameterNameTriggerSource:SDLTriggerSourceKeyboard}, + SDLRPCParameterNameOperationName:SDLRPCFunctionNameOnCommand}} mutableCopy]; SDLOnCommand* testNotification = [[SDLOnCommand alloc] initWithDictionary:dict]; expect(testNotification.cmdID).to(equal(@5676544)); diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnDriverDistractionSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnDriverDistractionSpec.m index b46e31ee6..b03394532 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnDriverDistractionSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnDriverDistractionSpec.m @@ -10,7 +10,8 @@ #import "SDLDriverDistractionState.h" #import "SDLOnDriverDistraction.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" QuickSpecBegin(SDLOnDriverDistractionSpec) @@ -24,10 +25,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameNotification: - @{SDLNameParameters: - @{SDLNameState:SDLDriverDistractionStateOn}, - SDLNameOperationName:SDLNameOnDriverDistraction}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLRPCParameterNameNotification: + @{SDLRPCParameterNameParameters: + @{SDLRPCParameterNameState:SDLDriverDistractionStateOn}, + SDLRPCParameterNameOperationName:SDLRPCFunctionNameOnDriverDistraction}} mutableCopy]; SDLOnDriverDistraction* testNotification = [[SDLOnDriverDistraction alloc] initWithDictionary:dict]; expect(testNotification.state).to(equal(SDLDriverDistractionStateOn)); diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnEncodedSyncPDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnEncodedSyncPDataSpec.m index b3fd3447e..c3cf634b8 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnEncodedSyncPDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnEncodedSyncPDataSpec.m @@ -9,7 +9,8 @@ #import <Nimble/Nimble.h> #import "SDLOnEncodedSyncPData.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" QuickSpecBegin(SDLOnEncodedSyncPDataSpec) @@ -27,12 +28,12 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary<NSString *, id> *dict = [@{SDLNameNotification: - @{SDLNameParameters: - @{SDLNameData:[@[@0] mutableCopy], - SDLNameURLUppercase:@"www.zombo.com", - SDLNameTimeoutCapitalized:@564}, - SDLNameOperationName:SDLNameOnEncodedSyncPData}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLRPCParameterNameNotification: + @{SDLRPCParameterNameParameters: + @{SDLRPCParameterNameData:[@[@0] mutableCopy], + SDLRPCParameterNameURLUppercase:@"www.zombo.com", + SDLRPCParameterNameTimeoutCapitalized:@564}, + SDLRPCParameterNameOperationName:SDLRPCFunctionNameOnEncodedSyncPData}} mutableCopy]; SDLOnEncodedSyncPData* testNotification = [[SDLOnEncodedSyncPData alloc] initWithDictionary:dict]; expect(testNotification.data).to(equal([@[@0] mutableCopy])); diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnHMIStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnHMIStatusSpec.m index 649e7aa74..c3aca6127 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnHMIStatusSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnHMIStatusSpec.m @@ -11,7 +11,8 @@ #import "SDLAudioStreamingState.h" #import "SDLHMILevel.h" #import "SDLOnHMIStatus.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" #import "SDLSystemContext.h" @@ -33,13 +34,13 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameNotification: - @{SDLNameParameters: - @{SDLNameHMILevel: SDLHMILevelLimited, - SDLNameAudioStreamingState: SDLAudioStreamingStateAttenuated, - SDLNameSystemContext: SDLSystemContextHMIObscured, - SDLNameVideoStreamingState: SDLVideoStreamingStateStreamable}, - SDLNameOperationName:SDLNameOnHMIStatus}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLRPCParameterNameNotification: + @{SDLRPCParameterNameParameters: + @{SDLRPCParameterNameHMILevel: SDLHMILevelLimited, + SDLRPCParameterNameAudioStreamingState: SDLAudioStreamingStateAttenuated, + SDLRPCParameterNameSystemContext: SDLSystemContextHMIObscured, + SDLRPCParameterNameVideoStreamingState: SDLVideoStreamingStateStreamable}, + SDLRPCParameterNameOperationName:SDLRPCFunctionNameOnHMIStatus}} mutableCopy]; SDLOnHMIStatus* testNotification = [[SDLOnHMIStatus alloc] initWithDictionary:dict]; expect(testNotification.hmiLevel).to(equal(SDLHMILevelLimited)); diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnHashChangeSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnHashChangeSpec.m index 14148d4ad..035afda9d 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnHashChangeSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnHashChangeSpec.m @@ -9,7 +9,8 @@ #import <Nimble/Nimble.h> #import "SDLOnHashChange.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" QuickSpecBegin(SDLOnHashChangeSpec) @@ -23,10 +24,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary<NSString *, id> *dict = [@{SDLNameNotification: - @{SDLNameParameters: - @{SDLNameHashId:@"hash"}, - SDLNameOperationName:SDLNameOnHashChange}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLRPCParameterNameNotification: + @{SDLRPCParameterNameParameters: + @{SDLRPCParameterNameHashId:@"hash"}, + SDLRPCParameterNameOperationName:SDLRPCFunctionNameOnHashChange}} mutableCopy]; SDLOnHashChange* testNotification = [[SDLOnHashChange alloc] initWithDictionary:dict]; expect(testNotification.hashID).to(equal(@"hash")); diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnInteriorVehicleDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnInteriorVehicleDataSpec.m index 0a4badfe2..45ae4c993 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnInteriorVehicleDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnInteriorVehicleDataSpec.m @@ -9,7 +9,8 @@ #import <Nimble/Nimble.h> #import "SDLOnInteriorVehicleData.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" #import "SDLModuleData.h" QuickSpecBegin(SDLOnInteriorVehicleDataSpec) @@ -30,10 +31,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary<NSString *, id> *dict = [@{SDLNameNotification: - @{SDLNameParameters: - @{SDLNameModuleData:someModuleData}, - SDLNameOperationName:SDLNameOnInteriorVehicleData}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLRPCParameterNameNotification: + @{SDLRPCParameterNameParameters: + @{SDLRPCParameterNameModuleData:someModuleData}, + SDLRPCParameterNameOperationName:SDLRPCFunctionNameOnInteriorVehicleData}} mutableCopy]; SDLOnInteriorVehicleData* testNotification = [[SDLOnInteriorVehicleData alloc] initWithDictionary:dict]; expect(testNotification.moduleData).to(equal(someModuleData)); diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnKeyboardInputSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnKeyboardInputSpec.m index 4f64d8f37..baec5f3c7 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnKeyboardInputSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnKeyboardInputSpec.m @@ -10,7 +10,8 @@ #import "SDLKeyboardEvent.h" #import "SDLOnKeyboardInput.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" QuickSpecBegin(SDLOnKeyboardInputSpec) @@ -26,11 +27,11 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameNotification: - @{SDLNameParameters: - @{SDLNameEvent:SDLKeyboardEventSubmitted, - SDLNameData:@"qwertyg"}, - SDLNameOperationName:SDLNameOnKeyboardInput}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLRPCParameterNameNotification: + @{SDLRPCParameterNameParameters: + @{SDLRPCParameterNameEvent:SDLKeyboardEventSubmitted, + SDLRPCParameterNameData:@"qwertyg"}, + SDLRPCParameterNameOperationName:SDLRPCFunctionNameOnKeyboardInput}} mutableCopy]; SDLOnKeyboardInput* testNotification = [[SDLOnKeyboardInput alloc] initWithDictionary:dict]; expect(testNotification.event).to(equal(SDLKeyboardEventSubmitted)); diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnLanguageChangeSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnLanguageChangeSpec.m index 6dfa256f6..c8e589a54 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnLanguageChangeSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnLanguageChangeSpec.m @@ -10,7 +10,8 @@ #import "SDLLanguage.h" #import "SDLOnLanguageChange.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" QuickSpecBegin(SDLOnLanguageChangeSpec) @@ -27,11 +28,11 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameNotification: - @{SDLNameParameters: - @{SDLNameLanguage:SDLLanguageEsEs, - SDLNameHMIDisplayLanguage:SDLLanguageDeDe}, - SDLNameOperationName:SDLNameOnLanguageChange}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLRPCParameterNameNotification: + @{SDLRPCParameterNameParameters: + @{SDLRPCParameterNameLanguage:SDLLanguageEsEs, + SDLRPCParameterNameHMIDisplayLanguage:SDLLanguageDeDe}, + SDLRPCParameterNameOperationName:SDLRPCFunctionNameOnLanguageChange}} mutableCopy]; SDLOnLanguageChange* testNotification = [[SDLOnLanguageChange alloc] initWithDictionary:dict]; expect(testNotification.language).to(equal(SDLLanguageEsEs)); diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnLockScreenStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnLockScreenStatusSpec.m index c2e64ef3a..3355797d8 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnLockScreenStatusSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnLockScreenStatusSpec.m @@ -11,7 +11,8 @@ #import "SDLOnLockScreenStatus.h" #import "SDLHMILevel.h" #import "SDLLockScreenStatus.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" QuickSpecBegin(SDLOnLockScreenStatusSpec) @@ -31,13 +32,13 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameNotification: - @{SDLNameParameters: + NSMutableDictionary* dict = [@{SDLRPCParameterNameNotification: + @{SDLRPCParameterNameParameters: @{@"driverDistractionStatus":@NO, @"userSelected":@3, @"OnLockScreenStatus":SDLLockScreenStatusRequired, @"hmiLevel":SDLHMILevelNone}, - SDLNameOperationName:@"OnLockScreenStatus"}} mutableCopy]; + SDLRPCParameterNameOperationName:@"OnLockScreenStatus"}} mutableCopy]; SDLOnLockScreenStatus* testNotification = [[SDLOnLockScreenStatus alloc] initWithDictionary:dict]; expect(testNotification.driverDistractionStatus).to(equal(@NO)); diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnPermissionsChangeSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnPermissionsChangeSpec.m index a66e22654..70e5c103a 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnPermissionsChangeSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnPermissionsChangeSpec.m @@ -10,7 +10,8 @@ #import "SDLOnPermissionsChange.h" #import "SDLPermissionItem.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" QuickSpecBegin(SDLOnPermissionsChangeSpec) @@ -26,10 +27,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary<NSString *, id> *dict = [@{SDLNameNotification: - @{SDLNameParameters: - @{SDLNamePermissionItem:[@[item] mutableCopy]}, - SDLNameOperationName:SDLNameOnPermissionsChange}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLRPCParameterNameNotification: + @{SDLRPCParameterNameParameters: + @{SDLRPCParameterNamePermissionItem:[@[item] mutableCopy]}, + SDLRPCParameterNameOperationName:SDLRPCFunctionNameOnPermissionsChange}} mutableCopy]; SDLOnPermissionsChange* testNotification = [[SDLOnPermissionsChange alloc] initWithDictionary:dict]; expect(testNotification.permissionItem).to(equal([@[item] mutableCopy])); diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnRCStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnRCStatusSpec.m index 4f733d7a8..584bcd3ec 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnRCStatusSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnRCStatusSpec.m @@ -8,7 +8,8 @@ #import "SDLOnRCStatus.h" #import "SDLModuleData.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" QuickSpecBegin(SDLOnRCStatusSpec) SDLModuleData * allocatedModule = [[SDLModuleData alloc] init]; @@ -28,13 +29,13 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary<NSString *, id> *dict = [@{SDLNameNotification: - @{SDLNameParameters: - @{SDLNameAllocatedModules:[@[allocatedModule] copy], - SDLNameFreeModules:[@[freeModule] copy], - SDLNameAllowed:@YES + NSMutableDictionary<NSString *, id> *dict = [@{SDLRPCParameterNameNotification: + @{SDLRPCParameterNameParameters: + @{SDLRPCParameterNameAllocatedModules:[@[allocatedModule] copy], + SDLRPCParameterNameFreeModules:[@[freeModule] copy], + SDLRPCParameterNameAllowed:@YES }, - SDLNameOperationName:SDLNameOnRCStatus}} mutableCopy]; + SDLRPCParameterNameOperationName:SDLRPCFunctionNameOnRCStatus}} mutableCopy]; SDLOnRCStatus* testNotification = [[SDLOnRCStatus alloc] initWithDictionary:dict]; expect(testNotification.allowed).to(equal(@YES)); diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnSyncPDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnSyncPDataSpec.m index c14fe1d52..89f0d5b7e 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnSyncPDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnSyncPDataSpec.m @@ -9,7 +9,8 @@ #import <Nimble/Nimble.h> #import "SDLOnSyncPData.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" QuickSpecBegin(SDLOnSyncPDataSpec) @@ -25,11 +26,11 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary<NSString *, id> *dict = [@{SDLNameNotification: - @{SDLNameParameters: - @{SDLNameURLUppercase:@"https://www.youtube.com/watch?v=ygr5AHufBN4", - SDLNameTimeoutCapitalized:@8357}, - SDLNameOperationName:SDLNameOnSyncPData}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLRPCParameterNameNotification: + @{SDLRPCParameterNameParameters: + @{SDLRPCParameterNameURLUppercase:@"https://www.youtube.com/watch?v=ygr5AHufBN4", + SDLRPCParameterNameTimeoutCapitalized:@8357}, + SDLRPCParameterNameOperationName:SDLRPCFunctionNameOnSyncPData}} mutableCopy]; SDLOnSyncPData* testNotification = [[SDLOnSyncPData alloc] initWithDictionary:dict]; expect(testNotification.URL).to(equal(@"https://www.youtube.com/watch?v=ygr5AHufBN4")); diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnSystemCapabilityUpdatedSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnSystemCapabilityUpdatedSpec.m new file mode 100644 index 000000000..b6102042d --- /dev/null +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnSystemCapabilityUpdatedSpec.m @@ -0,0 +1,59 @@ +// +// SDLOnSystemCapabilityUpdatedSpec.m +// SmartDeviceLinkTests +// +// Created by Nicole on 2/6/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import <Quick/Quick.h> +#import <Nimble/Nimble.h> + +#import "SDLOnSystemCapabilityUpdated.h" +#import "SDLPhoneCapability.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" +#import "SDLSystemCapability.h" + +QuickSpecBegin(SDLOnSystemCapabilityUpdatedSpec) + +describe(@"Getter/Setter Tests", ^ { + __block SDLSystemCapability *testSystemCapability = nil; + + beforeEach(^{ + SDLPhoneCapability *testPhoneCapability = [[SDLPhoneCapability alloc] initWithDialNumber:true]; + testSystemCapability = [[SDLSystemCapability alloc] initWithPhoneCapability:testPhoneCapability]; + }); + + it(@"Should set and get correctly", ^{ + SDLOnSystemCapabilityUpdated *testNotification = [[SDLOnSystemCapabilityUpdated alloc] init]; + testNotification.systemCapability = testSystemCapability; + + expect(testNotification.systemCapability).to(equal(testSystemCapability)); + }); + + it(@"Should get correctly when initialized with a dictionary", ^{ + NSDictionary *dict = @{SDLRPCParameterNameNotification:@{ + SDLRPCParameterNameParameters:@{ + SDLRPCParameterNameSystemCapability:testSystemCapability + }, + SDLRPCParameterNameOperationName:SDLRPCFunctionNameOnSystemCapabilityUpdated}}; + SDLOnSystemCapabilityUpdated *testNotification = [[SDLOnSystemCapabilityUpdated alloc] initWithDictionary:dict]; + + expect(testNotification.systemCapability).to(equal(testSystemCapability)); + }); + + it(@"Should get correctly when initialized with initWithSystemCapability:", ^{ + SDLOnSystemCapabilityUpdated *testNotification = [[SDLOnSystemCapabilityUpdated alloc] initWithSystemCapability:testSystemCapability]; + + expect(testNotification.systemCapability).to(equal(testSystemCapability)); + }); + + it(@"Should return nil if not set", ^{ + SDLOnSystemCapabilityUpdated *testNotification = [[SDLOnSystemCapabilityUpdated alloc] init]; + + expect(testNotification.systemCapability).to(beNil()); + }); +}); + +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnSystemRequestSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnSystemRequestSpec.m index 6f7545c68..0f2227ff7 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnSystemRequestSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnSystemRequestSpec.m @@ -9,7 +9,8 @@ #import <Nimble/Nimble.h> #import "SDLFileType.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" #import "SDLOnSystemRequest.h" #import "SDLRequestType.h" @@ -38,16 +39,16 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameNotification: - @{SDLNameParameters: - @{SDLNameRequestType:SDLRequestTypeFileResume, - SDLNameRequestSubType: @"subtype", - SDLNameURL:[@[@"www.google.com"] mutableCopy], - SDLNameTimeout:@52345, - SDLNameFileType:SDLFileTypePNG, - SDLNameOffset:@2532678684, - SDLNameLength:@50000000000}, - SDLNameOperationName:SDLNameOnSystemRequest}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLRPCParameterNameNotification: + @{SDLRPCParameterNameParameters: + @{SDLRPCParameterNameRequestType:SDLRequestTypeFileResume, + SDLRPCParameterNameRequestSubType: @"subtype", + SDLRPCParameterNameURL:[@[@"www.google.com"] mutableCopy], + SDLRPCParameterNameTimeout:@52345, + SDLRPCParameterNameFileType:SDLFileTypePNG, + SDLRPCParameterNameOffset:@2532678684, + SDLRPCParameterNameLength:@50000000000}, + SDLRPCParameterNameOperationName:SDLRPCFunctionNameOnSystemRequest}} mutableCopy]; SDLOnSystemRequest* testNotification = [[SDLOnSystemRequest alloc] initWithDictionary:dict]; expect(testNotification.requestType).to(equal(SDLRequestTypeFileResume)); diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnTBTClientStateSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnTBTClientStateSpec.m index 70ed4648b..f0a39c387 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnTBTClientStateSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnTBTClientStateSpec.m @@ -9,7 +9,8 @@ #import <Nimble/Nimble.h> #import "SDLOnTBTClientState.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" #import "SDLTBTState.h" @@ -25,10 +26,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameNotification: - @{SDLNameParameters: - @{SDLNameState:SDLTBTStateETARequest}, - SDLNameOperationName:SDLNameOnTBTClientState}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLRPCParameterNameNotification: + @{SDLRPCParameterNameParameters: + @{SDLRPCParameterNameState:SDLTBTStateETARequest}, + SDLRPCParameterNameOperationName:SDLRPCFunctionNameOnTBTClientState}} mutableCopy]; SDLOnTBTClientState* testNotification = [[SDLOnTBTClientState alloc] initWithDictionary:dict]; expect(testNotification.state).to(equal(SDLTBTStateETARequest)); diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnTouchEventSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnTouchEventSpec.m index 930ed95f8..6445c2e64 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnTouchEventSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnTouchEventSpec.m @@ -9,7 +9,8 @@ #import <Nimble/Nimble.h> #import "SDLOnTouchEvent.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" #import "SDLTouchEvent.h" #import "SDLTouchType.h" @@ -30,11 +31,11 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameNotification: - @{SDLNameParameters: - @{SDLNameType:SDLTouchTypeBegin, - SDLNameEvent:[@[event] mutableCopy]}, - SDLNameOperationName:SDLNameOnTouchEvent}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLRPCParameterNameNotification: + @{SDLRPCParameterNameParameters: + @{SDLRPCParameterNameType:SDLTouchTypeBegin, + SDLRPCParameterNameEvent:[@[event] mutableCopy]}, + SDLRPCParameterNameOperationName:SDLRPCFunctionNameOnTouchEvent}} mutableCopy]; SDLOnTouchEvent* testNotification = [[SDLOnTouchEvent alloc] initWithDictionary:dict]; expect(testNotification.type).to(equal(SDLTouchTypeBegin)); diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnVehicleDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnVehicleDataSpec.m index a743fc0d9..d28a9c843 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnVehicleDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnVehicleDataSpec.m @@ -9,7 +9,8 @@ #import <Nimble/Nimble.h> #import "SmartDeviceLink.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" QuickSpecBegin(SDLOnVehicleDataSpec) @@ -112,39 +113,39 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSDictionary* dict = @{SDLNameNotification: - @{SDLNameParameters: - @{SDLNameAccelerationPedalPosition:@99.99999999, - SDLNameAirbagStatus:airbag, - SDLNameBeltStatus:belt, - SDLNameBodyInformation:body, - SDLNameCloudAppVehicleID:cloudAppVehicleID, - SDLNameClusterModeStatus:clusterMode, - SDLNameDeviceStatus:device, - SDLNameDriverBraking:SDLVehicleDataEventStatusYes, - SDLNameECallInfo:eCall, - SDLNameElectronicParkBrakeStatus:SDLElectronicParkBrakeStatusDriveActive, - SDLNameEmergencyEvent:event, - SDLNameEngineOilLife:@45.1, - SDLNameEngineTorque:@-200.124, - SDLNameExternalTemperature:@-10, - SDLNameFuelLevel:@10.3, - SDLNameFuelLevelState:SDLComponentVolumeStatusAlert, - SDLNameFuelRange:@[fuelRange], - SDLNameGPS:gps, - SDLNameHeadLampStatus:headLamp, - SDLNameInstantFuelConsumption:@4000.63, - SDLNameMyKey:myKey, - SDLNameOdometer:@100050, - SDLNamePRNDL:SDLPRNDLDrive, - SDLNameRPM:@4242, - SDLNameSpeed:@70.1, - SDLNameSteeringWheelAngle:@0.000000001, - SDLNameTirePressure:tires, - SDLNameTurnSignal:SDLTurnSignalOff, - SDLNameVIN:@"222222222722", - SDLNameWiperStatus:SDLWiperStatusStalled}, - SDLNameOperationName:SDLNameOnVehicleData}}; + NSDictionary* dict = @{SDLRPCParameterNameNotification: + @{SDLRPCParameterNameParameters: + @{SDLRPCParameterNameAccelerationPedalPosition:@99.99999999, + SDLRPCParameterNameAirbagStatus:airbag, + SDLRPCParameterNameBeltStatus:belt, + SDLRPCParameterNameBodyInformation:body, + SDLRPCParameterNameCloudAppVehicleID:cloudAppVehicleID, + SDLRPCParameterNameClusterModeStatus:clusterMode, + SDLRPCParameterNameDeviceStatus:device, + SDLRPCParameterNameDriverBraking:SDLVehicleDataEventStatusYes, + SDLRPCParameterNameECallInfo:eCall, + SDLRPCParameterNameElectronicParkBrakeStatus:SDLElectronicParkBrakeStatusDriveActive, + SDLRPCParameterNameEmergencyEvent:event, + SDLRPCParameterNameEngineOilLife:@45.1, + SDLRPCParameterNameEngineTorque:@-200.124, + SDLRPCParameterNameExternalTemperature:@-10, + SDLRPCParameterNameFuelLevel:@10.3, + SDLRPCParameterNameFuelLevelState:SDLComponentVolumeStatusAlert, + SDLRPCParameterNameFuelRange:@[fuelRange], + SDLRPCParameterNameGPS:gps, + SDLRPCParameterNameHeadLampStatus:headLamp, + SDLRPCParameterNameInstantFuelConsumption:@4000.63, + SDLRPCParameterNameMyKey:myKey, + SDLRPCParameterNameOdometer:@100050, + SDLRPCParameterNamePRNDL:SDLPRNDLDrive, + SDLRPCParameterNameRPM:@4242, + SDLRPCParameterNameSpeed:@70.1, + SDLRPCParameterNameSteeringWheelAngle:@0.000000001, + SDLRPCParameterNameTirePressure:tires, + SDLRPCParameterNameTurnSignal:SDLTurnSignalOff, + SDLRPCParameterNameVIN:@"222222222722", + SDLRPCParameterNameWiperStatus:SDLWiperStatusStalled}, + SDLRPCParameterNameOperationName:SDLRPCFunctionNameOnVehicleData}}; SDLOnVehicleData* testNotification = [[SDLOnVehicleData alloc] initWithDictionary:dict]; expect(testNotification.accPedalPosition).to(equal(@99.99999999)); diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnWaypointChangeSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnWaypointChangeSpec.m index bee2e3cda..94e319360 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnWaypointChangeSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnWaypointChangeSpec.m @@ -11,7 +11,8 @@ #import "SDLImage.h" #import "SDLLocationCoordinate.h" #import "SDLLocationDetails.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" #import "SDLOasisAddress.h" QuickSpecBegin(SDLOnWayPointChangeSpec) @@ -63,12 +64,12 @@ describe(@"Getter/Setter Tests", ^ { someWaypoints = @[someLocation]; - NSDictionary *initDict = @{SDLNameNotification : @{ - SDLNameParameters: @{ - SDLNameWayPoints: someWaypoints + NSDictionary *initDict = @{SDLRPCParameterNameNotification : @{ + SDLRPCParameterNameParameters: @{ + SDLRPCParameterNameWayPoints: someWaypoints } }, - SDLNameOperationName:SDLNameOnWayPointChange + SDLRPCParameterNameOperationName:SDLRPCFunctionNameOnWayPointChange }; testNotification = [[SDLOnWayPointChange alloc] initWithDictionary:[NSMutableDictionary dictionaryWithDictionary:initDict]]; @@ -84,8 +85,8 @@ describe(@"Getter/Setter Tests", ^ { context(@"when parameters are not set", ^{ beforeEach(^{ NSDictionary *initDict = @{ - SDLNameNotification: @{ - SDLNameParameters: @{} + SDLRPCParameterNameNotification: @{ + SDLRPCParameterNameParameters: @{} } }; diff --git a/SmartDeviceLinkTests/RPCSpecs/PayloadSpecs/SDLRPCPayloadSpec.m b/SmartDeviceLinkTests/RPCSpecs/PayloadSpecs/SDLRPCPayloadSpec.m index cde24a77a..4139677e3 100644 --- a/SmartDeviceLinkTests/RPCSpecs/PayloadSpecs/SDLRPCPayloadSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/PayloadSpecs/SDLRPCPayloadSpec.m @@ -8,16 +8,17 @@ #import <Quick/Quick.h> #import <Nimble/Nimble.h> +#import "SDLRPCParameterNames.h" #import "SDLRPCPayload.h" #import "SDLRPCMessageType.h" -#import "SDLNames.h" +#import "SDLRPCFunctionNames.h" QuickSpecBegin(SDLRPCPayloadSpec) __block SDLRPCPayload* testPayload; -__block NSDictionary* dict = @{SDLNameResponse: - @{SDLNameParameters:@{}, - SDLNameOperationName:SDLNameDeleteCommand}}; +__block NSDictionary* dict = @{SDLRPCParameterNameResponse: + @{SDLRPCParameterNameParameters:@{}, + SDLRPCParameterNameOperationName:SDLRPCFunctionNameDeleteCommand}}; NSData* (^testData)(void) = ^NSData* { NSData* jsonData = [NSJSONSerialization dataWithJSONObject:dict options:0 error:0]; diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAddCommandSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAddCommandSpec.m index 5f7bcf105..7d7d3214c 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAddCommandSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAddCommandSpec.m @@ -11,7 +11,8 @@ #import "SDLAddCommand.h" #import "SDLImage.h" #import "SDLMenuParams.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" QuickSpecBegin(SDLAddCommandSpec) @@ -34,13 +35,13 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary<NSString *, id> *dict = [@{SDLNameRequest: - @{SDLNameParameters: - @{SDLNameCommandId:@434577, - SDLNameMenuParams:menu, - SDLNameVRCommands:[@[@"name", @"anotherName"] mutableCopy], - SDLNameCommandIcon:image}, - SDLNameOperationName:SDLNameAddCommand}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLRPCParameterNameRequest: + @{SDLRPCParameterNameParameters: + @{SDLRPCParameterNameCommandId:@434577, + SDLRPCParameterNameMenuParams:menu, + SDLRPCParameterNameVRCommands:[@[@"name", @"anotherName"] mutableCopy], + SDLRPCParameterNameCommandIcon:image}, + SDLRPCParameterNameOperationName:SDLRPCFunctionNameAddCommand}} mutableCopy]; SDLAddCommand* testRequest = [[SDLAddCommand alloc] initWithDictionary:dict]; diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAddSubMenuSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAddSubMenuSpec.m index 18f09da8e..28584c689 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAddSubMenuSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAddSubMenuSpec.m @@ -10,7 +10,8 @@ #import "SDLAddSubMenu.h" #import "SDLImage.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" QuickSpecBegin(SDLAddSubMenuSpec) @@ -69,16 +70,16 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary<NSString *, id> *dict = [@{SDLNameRequest: - @{SDLNameParameters: - @{SDLNameMenuId:@4345645, - SDLNamePosition:@27, - SDLNameMenuName:@"Welcome to the menu", - SDLNameMenuIcon: @{ - SDLNameValue: @"Test" + NSMutableDictionary<NSString *, id> *dict = [@{SDLRPCParameterNameRequest: + @{SDLRPCParameterNameParameters: + @{SDLRPCParameterNameMenuId:@4345645, + SDLRPCParameterNamePosition:@27, + SDLRPCParameterNameMenuName:@"Welcome to the menu", + SDLRPCParameterNameMenuIcon: @{ + SDLRPCParameterNameValue: @"Test" } }, - SDLNameOperationName:SDLNameAddSubMenu}} mutableCopy]; + SDLRPCParameterNameOperationName:SDLRPCFunctionNameAddSubMenu}} mutableCopy]; SDLAddSubMenu* testRequest = [[SDLAddSubMenu alloc] initWithDictionary:dict]; expect(testRequest.menuID).to(equal(@(menuId))); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAlertManeuverSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAlertManeuverSpec.m index 4d42280db..63ee96868 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAlertManeuverSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAlertManeuverSpec.m @@ -11,7 +11,8 @@ #import "SDLAlertManeuver.h" #import "SDLTTSChunk.h" #import "SDLSoftButton.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" QuickSpecBegin(SDLAlertManeuverSpec) @@ -30,11 +31,11 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary<NSString *, id> *dict = [@{SDLNameRequest: - @{SDLNameParameters: - @{SDLNameTTSChunks:[@[tts] mutableCopy], - SDLNameSoftButtons:[@[button] mutableCopy]}, - SDLNameOperationName:SDLNameAlertManeuver}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLRPCParameterNameRequest: + @{SDLRPCParameterNameParameters: + @{SDLRPCParameterNameTTSChunks:[@[tts] mutableCopy], + SDLRPCParameterNameSoftButtons:[@[button] mutableCopy]}, + SDLRPCParameterNameOperationName:SDLRPCFunctionNameAlertManeuver}} mutableCopy]; SDLAlertManeuver* testRequest = [[SDLAlertManeuver alloc] initWithDictionary:dict]; expect(testRequest.ttsChunks).to(equal([@[tts] mutableCopy])); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAlertSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAlertSpec.m index 521c8b8f3..0460df923 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAlertSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAlertSpec.m @@ -11,7 +11,8 @@ #import "SDLAlert.h" #import "SDLTTSChunk.h" #import "SDLSoftButton.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" QuickSpecBegin(SDLAlertSpec) @@ -42,17 +43,17 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary<NSString *, id> *dict = [@{SDLNameRequest: - @{SDLNameParameters: - @{SDLNameAlertText1:@"alert#1", - SDLNameAlertText2:@"alert#2", - SDLNameAlertText3:@"alert#3", - SDLNameTTSChunks:[@[tts] mutableCopy], - SDLNameDuration:@4357, - SDLNamePlayTone:@YES, - SDLNameProgressIndicator:@NO, - SDLNameSoftButtons:[@[button] mutableCopy]}, - SDLNameOperationName:SDLNameAlert}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLRPCParameterNameRequest: + @{SDLRPCParameterNameParameters: + @{SDLRPCParameterNameAlertText1:@"alert#1", + SDLRPCParameterNameAlertText2:@"alert#2", + SDLRPCParameterNameAlertText3:@"alert#3", + SDLRPCParameterNameTTSChunks:[@[tts] mutableCopy], + SDLRPCParameterNameDuration:@4357, + SDLRPCParameterNamePlayTone:@YES, + SDLRPCParameterNameProgressIndicator:@NO, + SDLRPCParameterNameSoftButtons:[@[button] mutableCopy]}, + SDLRPCParameterNameOperationName:SDLRPCFunctionNameAlert}} mutableCopy]; SDLAlert* testRequest = [[SDLAlert alloc] initWithDictionary:dict]; expect(testRequest.alertText1).to(equal(@"alert#1")); @@ -66,17 +67,17 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should handle NSNull", ^{ - NSMutableDictionary* dict = [@{SDLNameRequest: - @{SDLNameParameters: - @{SDLNameAlertText1:@"alert#1", - SDLNameAlertText2:@"alert#2", - SDLNameAlertText3:@"alert#3", - SDLNameTTSChunks:[@[tts] mutableCopy], - SDLNameDuration:@4357, - SDLNamePlayTone:@YES, - SDLNameProgressIndicator:@NO, - SDLNameSoftButtons:[NSNull null]}, - SDLNameOperationName:SDLNameAlert}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLRPCParameterNameRequest: + @{SDLRPCParameterNameParameters: + @{SDLRPCParameterNameAlertText1:@"alert#1", + SDLRPCParameterNameAlertText2:@"alert#2", + SDLRPCParameterNameAlertText3:@"alert#3", + SDLRPCParameterNameTTSChunks:[@[tts] mutableCopy], + SDLRPCParameterNameDuration:@4357, + SDLRPCParameterNamePlayTone:@YES, + SDLRPCParameterNameProgressIndicator:@NO, + SDLRPCParameterNameSoftButtons:[NSNull null]}, + SDLRPCParameterNameOperationName:SDLRPCFunctionNameAlert}} mutableCopy]; SDLAlert* testRequest = [[SDLAlert alloc] initWithDictionary:dict]; expect(testRequest.softButtons).to(beEmpty()); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLButtonPressSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLButtonPressSpec.m index 011c3782f..fc22e5c54 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLButtonPressSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLButtonPressSpec.m @@ -8,7 +8,8 @@ #import <Quick/Quick.h> #import <Nimble/Nimble.h> -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" #import "SDLButtonPress.h" #import "SDLModuleType.h" #import "SDLButtonName.h" @@ -31,12 +32,12 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized with a dictionary", ^ { - NSMutableDictionary<NSString *, id> *dict = [@{SDLNameRequest: - @{SDLNameParameters: - @{SDLNameModuleType : SDLModuleTypeClimate, - SDLNameButtonName : SDLButtonNameAC, - SDLNameButtonPressMode : SDLButtonPressModeShort}, - SDLNameOperationName:SDLNameButtonPress}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLRPCParameterNameRequest: + @{SDLRPCParameterNameParameters: + @{SDLRPCParameterNameModuleType : SDLModuleTypeClimate, + SDLRPCParameterNameButtonName : SDLButtonNameAC, + SDLRPCParameterNameButtonPressMode : SDLButtonPressModeShort}, + SDLRPCParameterNameOperationName:SDLRPCFunctionNameButtonPress}} mutableCopy]; SDLButtonPress* testRequest = [[SDLButtonPress alloc] initWithDictionary:dict]; expect(testRequest.moduleType).to(equal(SDLModuleTypeClimate)); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLChangeRegistrationSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLChangeRegistrationSpec.m index 98f05983d..40ada9d6f 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLChangeRegistrationSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLChangeRegistrationSpec.m @@ -10,7 +10,8 @@ #import "SDLChangeRegistration.h" #import "SDLLanguage.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" #import "SDLTTSChunk.h" @@ -112,15 +113,15 @@ describe(@"change registration", ^ { someNGNMediaAppName = @"some media app name"; someVRSynonyms = @[@"some1", @"some2"]; - NSMutableDictionary<NSString *, id> *dict = [@{SDLNameRequest: - @{SDLNameParameters: - @{SDLNameLanguage:someLanguage, - SDLNameHMIDisplayLanguage:someOtherLanguage, - SDLNameAppName:someAppName, - SDLNameTTSName:someTTSChunks, - SDLNameNGNMediaScreenAppName:someNGNMediaAppName, - SDLNameVRSynonyms:someVRSynonyms}, - SDLNameOperationName:SDLNameChangeRegistration}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLRPCParameterNameRequest: + @{SDLRPCParameterNameParameters: + @{SDLRPCParameterNameLanguage:someLanguage, + SDLRPCParameterNameHMIDisplayLanguage:someOtherLanguage, + SDLRPCParameterNameAppName:someAppName, + SDLRPCParameterNameTTSName:someTTSChunks, + SDLRPCParameterNameNGNMediaScreenAppName:someNGNMediaAppName, + SDLRPCParameterNameVRSynonyms:someVRSynonyms}, + SDLRPCParameterNameOperationName:SDLRPCFunctionNameChangeRegistration}} mutableCopy]; testRequest = [[SDLChangeRegistration alloc] initWithDictionary:dict]; }); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLCreateInteractionChoiceSetSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLCreateInteractionChoiceSetSpec.m index 52c496f8b..973189701 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLCreateInteractionChoiceSetSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLCreateInteractionChoiceSetSpec.m @@ -10,7 +10,8 @@ #import "SDLCreateInteractionChoiceSet.h" #import "SDLChoice.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" QuickSpecBegin(SDLCreateInteractionChoiceSetSpec) @@ -28,11 +29,11 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary<NSString *, id> *dict = [@{SDLNameRequest: - @{SDLNameParameters: - @{SDLNameInteractionChoiceSetId:@141414, - SDLNameChoiceSet:[@[choice] mutableCopy]}, - SDLNameOperationName:SDLNameCreateInteractionChoiceSet}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLRPCParameterNameRequest: + @{SDLRPCParameterNameParameters: + @{SDLRPCParameterNameInteractionChoiceSetId:@141414, + SDLRPCParameterNameChoiceSet:[@[choice] mutableCopy]}, + SDLRPCParameterNameOperationName:SDLRPCFunctionNameCreateInteractionChoiceSet}} mutableCopy]; SDLCreateInteractionChoiceSet* testRequest = [[SDLCreateInteractionChoiceSet alloc] initWithDictionary:dict]; expect(testRequest.interactionChoiceSetID).to(equal(@141414)); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteCommandSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteCommandSpec.m index b71e48028..fc275fd96 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteCommandSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteCommandSpec.m @@ -9,7 +9,8 @@ #import <Nimble/Nimble.h> #import "SDLDeleteCommand.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" QuickSpecBegin(SDLDeleteCommandSpec) @@ -23,10 +24,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary<NSString *, id> *dict = [@{SDLNameRequest: - @{SDLNameParameters: - @{SDLNameCommandId:@11223344}, - SDLNameOperationName:SDLNameDeleteCommand}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLRPCParameterNameRequest: + @{SDLRPCParameterNameParameters: + @{SDLRPCParameterNameCommandId:@11223344}, + SDLRPCParameterNameOperationName:SDLRPCFunctionNameDeleteCommand}} mutableCopy]; SDLDeleteCommand* testRequest = [[SDLDeleteCommand alloc] initWithDictionary:dict]; expect(testRequest.cmdID).to(equal(@11223344)); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteFileSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteFileSpec.m index 18ce7d1d7..bb07a874d 100755 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteFileSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteFileSpec.m @@ -9,7 +9,8 @@ #import <Nimble/Nimble.h> #import "SDLDeleteFile.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" QuickSpecBegin(SDLDeleteFileSpec) @@ -23,10 +24,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary<NSString *, id> *dict = [@{SDLNameRequest: - @{SDLNameParameters: - @{SDLNameSyncFileName:@"synchro"}, - SDLNameOperationName:SDLNameDeleteFile}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLRPCParameterNameRequest: + @{SDLRPCParameterNameParameters: + @{SDLRPCParameterNameSyncFileName:@"synchro"}, + SDLRPCParameterNameOperationName:SDLRPCFunctionNameDeleteFile}} mutableCopy]; SDLDeleteFile* testRequest = [[SDLDeleteFile alloc] initWithDictionary:dict]; expect(testRequest.syncFileName).to(equal(@"synchro")); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteInteractionChoiceSetSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteInteractionChoiceSetSpec.m index bcc2c3756..81e6f9d2c 100755 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteInteractionChoiceSetSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteInteractionChoiceSetSpec.m @@ -9,7 +9,8 @@ #import <Nimble/Nimble.h> #import "SDLDeleteInteractionChoiceSet.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" QuickSpecBegin(SDLDeleteInteractionChoiceSetSpec) @@ -23,10 +24,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary<NSString *, id> *dict = [@{SDLNameRequest: - @{SDLNameParameters: - @{SDLNameInteractionChoiceSetId:@20314}, - SDLNameOperationName:SDLNameDeleteInteractionChoiceSet}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLRPCParameterNameRequest: + @{SDLRPCParameterNameParameters: + @{SDLRPCParameterNameInteractionChoiceSetId:@20314}, + SDLRPCParameterNameOperationName:SDLRPCFunctionNameDeleteInteractionChoiceSet}} mutableCopy]; SDLDeleteInteractionChoiceSet* testRequest = [[SDLDeleteInteractionChoiceSet alloc] initWithDictionary:dict]; expect(testRequest.interactionChoiceSetID).to(equal(@20314)); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteSubMenuSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteSubMenuSpec.m index 888d94f59..5f628f745 100755 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteSubMenuSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteSubMenuSpec.m @@ -9,7 +9,8 @@ #import <Nimble/Nimble.h> #import "SDLDeleteSubMenu.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" QuickSpecBegin(SDLDeleteSubMenuSpec) @@ -23,10 +24,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary<NSString *, id> *dict = [@{SDLNameRequest: - @{SDLNameParameters: - @{SDLNameMenuId:@25614}, - SDLNameOperationName:SDLNameDeleteSubMenu}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLRPCParameterNameRequest: + @{SDLRPCParameterNameParameters: + @{SDLRPCParameterNameMenuId:@25614}, + SDLRPCParameterNameOperationName:SDLRPCFunctionNameDeleteSubMenu}} mutableCopy]; SDLDeleteSubMenu* testRequest = [[SDLDeleteSubMenu alloc] initWithDictionary:dict]; expect(testRequest.menuID).to(equal(@25614)); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDiagnosticMessageSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDiagnosticMessageSpec.m index c07a8b5fc..bd75d5853 100755 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDiagnosticMessageSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDiagnosticMessageSpec.m @@ -9,7 +9,8 @@ #import <Nimble/Nimble.h> #import "SDLDiagnosticMessage.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" QuickSpecBegin(SDLDiagnosticMessageSpec) @@ -27,12 +28,12 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary<NSString *, id> *dict = [@{SDLNameRequest: - @{SDLNameParameters: - @{SDLNameTargetId:@3562, - SDLNameMessageLength:@55555, - SDLNameMessageData:[@[@1, @4, @16, @64] mutableCopy]}, - SDLNameOperationName:SDLNameDiagnosticMessage}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLRPCParameterNameRequest: + @{SDLRPCParameterNameParameters: + @{SDLRPCParameterNameTargetId:@3562, + SDLRPCParameterNameMessageLength:@55555, + SDLRPCParameterNameMessageData:[@[@1, @4, @16, @64] mutableCopy]}, + SDLRPCParameterNameOperationName:SDLRPCFunctionNameDiagnosticMessage}} mutableCopy]; SDLDiagnosticMessage* testRequest = [[SDLDiagnosticMessage alloc] initWithDictionary:dict]; expect(testRequest.targetID).to(equal(@3562)); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDialNumberSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDialNumberSpec.m index a150144c1..100b6786e 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDialNumberSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDialNumberSpec.m @@ -6,7 +6,7 @@ #import <Nimble/Nimble.h> #import "SDLDialNumber.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLDialNumberSpec) @@ -43,9 +43,9 @@ describe(@"Dial Number RPC", ^{ beforeEach(^{ somePhoneNumber = @"1234567890"; NSDictionary *initDict = @{ - SDLNameRequest: @{ - SDLNameParameters: @{ - SDLNameNumber: [somePhoneNumber copy] + SDLRPCParameterNameRequest: @{ + SDLRPCParameterNameParameters: @{ + SDLRPCParameterNameNumber: [somePhoneNumber copy] } } }; @@ -62,8 +62,8 @@ describe(@"Dial Number RPC", ^{ __block SDLDialNumber *testRequest = nil; beforeEach(^{ NSDictionary *initDict = @{ - SDLNameRequest: @{ - SDLNameParameters: @{ + SDLRPCParameterNameRequest: @{ + SDLRPCParameterNameParameters: @{ } } }; diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLEncodedSyncPDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLEncodedSyncPDataSpec.m index 739db2b66..d273002fe 100755 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLEncodedSyncPDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLEncodedSyncPDataSpec.m @@ -9,7 +9,8 @@ #import <Nimble/Nimble.h> #import "SDLEncodedSyncPData.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" QuickSpecBegin(SDLEncodedSyncPDataSpec) @@ -23,10 +24,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary<NSString *, id> *dict = [@{SDLNameRequest: - @{SDLNameParameters: - @{SDLNameData:[@[@2, @2, @2] mutableCopy]}, - SDLNameOperationName:SDLNameEncodedSyncPData}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLRPCParameterNameRequest: + @{SDLRPCParameterNameParameters: + @{SDLRPCParameterNameData:[@[@2, @2, @2] mutableCopy]}, + SDLRPCParameterNameOperationName:SDLRPCFunctionNameEncodedSyncPData}} mutableCopy]; SDLEncodedSyncPData* testRequest = [[SDLEncodedSyncPData alloc] initWithDictionary:dict]; expect(testRequest.data).to(equal([@[@2, @2, @2] mutableCopy])); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLEndAudioPassThruSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLEndAudioPassThruSpec.m index 843d917be..0207f1bc8 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLEndAudioPassThruSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLEndAudioPassThruSpec.m @@ -9,7 +9,7 @@ #import <Nimble/Nimble.h> #import "SDLEndAudioPassThru.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLEndAudioPassThruSpec) diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetAppServiceDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetAppServiceDataSpec.m new file mode 100644 index 000000000..a094ef46d --- /dev/null +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetAppServiceDataSpec.m @@ -0,0 +1,83 @@ +// +// SDLGetAppServiceDataSpec.m +// SmartDeviceLinkTests +// +// Created by Nicole on 2/6/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import <Quick/Quick.h> +#import <Nimble/Nimble.h> + +#import "SDLAppServiceType.h" +#import "SDLGetAppServiceData.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" + +QuickSpecBegin(SDLGetAppServiceDataSpec) + +describe(@"Getter/Setter Tests", ^{ + __block NSString *testServiceType = nil; + __block SDLAppServiceType testAppServiceType = nil; + __block BOOL testSubscribe = nil; + + beforeEach(^{ + testServiceType = SDLAppServiceTypeWeather; + testAppServiceType = SDLAppServiceTypeMedia; + testSubscribe = YES; + }); + + it(@"Should set and get correctly", ^{ + SDLGetAppServiceData *testRequest = [[SDLGetAppServiceData alloc] init]; + testRequest.serviceType = testServiceType; + testRequest.subscribe = @(testSubscribe); + + expect(testRequest.serviceType).to(equal(testServiceType)); + expect(testRequest.subscribe).to(beTrue()); + }); + + it(@"Should initialize correctly with a dictionary", ^{ + NSDictionary *dict = @{SDLRPCParameterNameRequest:@{ + SDLRPCParameterNameParameters:@{ + SDLRPCParameterNameServiceType:testServiceType, + SDLRPCParameterNameSubscribe:@(testSubscribe) + }, + SDLRPCParameterNameOperationName:SDLRPCFunctionNameGetAppServiceData}}; + SDLGetAppServiceData *testRequest = [[SDLGetAppServiceData alloc] initWithDictionary:dict]; + + expect(testRequest.serviceType).to(equal(testServiceType)); + expect(testRequest.subscribe).to(beTrue()); + }); + + it(@"Should initialize correctly with initWithServiceType:", ^{ + SDLGetAppServiceData *testRequest = [[SDLGetAppServiceData alloc] initWithServiceType:testServiceType]; + + expect(testRequest.serviceType).to(equal(testServiceType)); + expect(testRequest.subscribe).to(beNil()); + }); + + it(@"Should initialize correctly with initWithAppServiceType:", ^{ + SDLGetAppServiceData *testRequest = [[SDLGetAppServiceData alloc] initWithAppServiceType:testAppServiceType]; + + expect(testRequest.serviceType).to(equal(testAppServiceType)); + expect(testRequest.subscribe).to(beNil()); + }); + + it(@"Should initialize correctly with initWithServiceType:subscribe:", ^{ + SDLGetAppServiceData *testRequest = [[SDLGetAppServiceData alloc] initWithServiceType:testServiceType subscribe:testSubscribe]; + + expect(testRequest.serviceType).to(equal(testServiceType)); + expect(testRequest.subscribe).to(beTrue()); + }); + + it(@"Should return nil if not set", ^{ + SDLGetAppServiceData *testRequest = [[SDLGetAppServiceData alloc] init]; + + expect(testRequest.serviceType).to(beNil()); + expect(testRequest.subscribe).to(beNil()); + }); +}); + +QuickSpecEnd + + diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetDTCsSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetDTCsSpec.m index fcdec90f8..25e489c46 100755 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetDTCsSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetDTCsSpec.m @@ -9,7 +9,8 @@ #import <Nimble/Nimble.h> #import "SDLGetDTCs.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" QuickSpecBegin(SDLGetDTCsSpec) @@ -25,11 +26,11 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary<NSString *, id> *dict = [@{SDLNameRequest: - @{SDLNameParameters: - @{SDLNameECUName:@4321, - SDLNameDTCMask:@22}, - SDLNameOperationName:SDLNameEndAudioPassThru}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLRPCParameterNameRequest: + @{SDLRPCParameterNameParameters: + @{SDLRPCParameterNameECUName:@4321, + SDLRPCParameterNameDTCMask:@22}, + SDLRPCParameterNameOperationName:SDLRPCFunctionNameEndAudioPassThru}} mutableCopy]; SDLGetDTCs* testRequest = [[SDLGetDTCs alloc] initWithDictionary:dict]; expect(testRequest.ecuName).to(equal(@4321)); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetFileSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetFileSpec.m new file mode 100644 index 000000000..f2f25dfbc --- /dev/null +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetFileSpec.m @@ -0,0 +1,109 @@ +// +// SDLGetFileSpec.m +// SmartDeviceLinkTests +// +// Created by Nicole on 2/7/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import <Quick/Quick.h> +#import <Nimble/Nimble.h> + +#import "SDLGetFile.h" +#import "SDLFileType.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" + +QuickSpecBegin(SDLGetFileSpec) + +describe(@"Getter/Setter Tests", ^{ + __block NSString *testFileName = nil; + __block NSString *testAppServiceId = nil; + __block SDLFileType testFileType = nil; + __block int testOffset = 45; + __block int testLength = 67; + + beforeEach(^{ + testFileName = @"testFileName"; + testAppServiceId = @"testAppServiceId"; + testFileType = SDLFileTypePNG; + }); + + it(@"Should set and get correctly", ^{ + SDLGetFile *testRequest = [[SDLGetFile alloc] init]; + testRequest.fileName = testFileName; + testRequest.appServiceId = testAppServiceId; + testRequest.fileType = testFileType; + testRequest.offset = @(testOffset); + testRequest.length = @(testLength); + + expect(testRequest.fileName).to(equal(testFileName)); + expect(testRequest.appServiceId).to(equal(testAppServiceId)); + expect(testRequest.fileType).to(equal(testFileType)); + expect(testRequest.offset).to(equal(testOffset)); + expect(testRequest.length).to(equal(testLength)); + }); + + it(@"Should initialize correctly with a dictionary", ^{ + NSDictionary *dict = @{SDLRPCParameterNameRequest:@{ + SDLRPCParameterNameParameters:@{ + SDLRPCParameterNameFilename:testFileName, + SDLRPCParameterNameAppServiceId:testAppServiceId, + SDLRPCParameterNameFileType:testFileType, + SDLRPCParameterNameOffset:@(testOffset), + SDLRPCParameterNameLength:@(testLength) + }, + SDLRPCParameterNameOperationName:SDLRPCFunctionNameGetFile}}; + SDLGetFile *testRequest = [[SDLGetFile alloc] initWithDictionary:dict]; + + expect(testRequest.fileName).to(equal(testFileName)); + expect(testRequest.appServiceId).to(equal(testAppServiceId)); + expect(testRequest.fileType).to(equal(testFileType)); + expect(testRequest.offset).to(equal(testOffset)); + expect(testRequest.length).to(equal(testLength)); + }); + + it(@"Should initialize correctly with initWithFileName:", ^{ + SDLGetFile *testRequest = [[SDLGetFile alloc] initWithFileName:testFileName]; + + expect(testRequest.fileName).to(equal(testFileName)); + expect(testRequest.appServiceId).to(beNil()); + expect(testRequest.fileType).to(beNil()); + expect(testRequest.offset).to(beNil()); + expect(testRequest.length).to(beNil()); + }); + + it(@"Should initialize correctly with initWithFileName:appServiceId:fileType:", ^{ + SDLGetFile *testRequest = [[SDLGetFile alloc] initWithFileName:testFileName appServiceId:testAppServiceId fileType:testFileType]; + + expect(testRequest.fileName).to(equal(testFileName)); + expect(testRequest.appServiceId).to(equal(testAppServiceId)); + expect(testRequest.fileType).to(equal(testFileType)); + expect(testRequest.offset).to(beNil()); + expect(testRequest.length).to(beNil()); + }); + + it(@"Should initialize correctly with initWithFileName:appServiceId:fileType:offset:length:", ^{ + SDLGetFile *testRequest = [[SDLGetFile alloc] initWithFileName:testFileName appServiceId:testAppServiceId fileType:testFileType offset:testOffset length:testLength]; + + expect(testRequest.fileName).to(equal(testFileName)); + expect(testRequest.appServiceId).to(equal(testAppServiceId)); + expect(testRequest.fileType).to(equal(testFileType)); + expect(testRequest.offset).to(equal(testOffset)); + expect(testRequest.length).to(equal(testLength)); + }); + + it(@"Should return nil if not set", ^{ + SDLGetFile *testRequest = [[SDLGetFile alloc] init]; + + expect(testRequest.fileName).to(beNil()); + expect(testRequest.appServiceId).to(beNil()); + expect(testRequest.fileType).to(beNil()); + expect(testRequest.offset).to(beNil()); + expect(testRequest.length).to(beNil()); + }); +}); + +QuickSpecEnd + + diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetInteriorVehicleDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetInteriorVehicleDataSpec.m index 12dfceec7..600c9826b 100755 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetInteriorVehicleDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetInteriorVehicleDataSpec.m @@ -10,7 +10,8 @@ #import "SDLGetInteriorVehicleData.h" #import "SDLModuleType.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" QuickSpecBegin(SDLGetInteriorVehicleDataSpec) @@ -25,11 +26,11 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized with a dictionary", ^ { - NSMutableDictionary<NSString *, id> *dict = [@{SDLNameRequest: - @{SDLNameParameters: - @{SDLNameModuleType : SDLModuleTypeRadio, - SDLNameSubscribe : @YES}, - SDLNameOperationName:SDLNameGetInteriorVehicleData}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLRPCParameterNameRequest: + @{SDLRPCParameterNameParameters: + @{SDLRPCParameterNameModuleType : SDLModuleTypeRadio, + SDLRPCParameterNameSubscribe : @YES}, + SDLRPCParameterNameOperationName:SDLRPCFunctionNameGetInteriorVehicleData}} mutableCopy]; SDLGetInteriorVehicleData* testRequest = [[SDLGetInteriorVehicleData alloc] initWithDictionary:dict]; expect(testRequest.moduleType).to(equal(SDLModuleTypeRadio)); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetSystemCapabilitiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetSystemCapabilitiesSpec.m index 99feed6f3..a5cbac428 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetSystemCapabilitiesSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetSystemCapabilitiesSpec.m @@ -6,7 +6,7 @@ #import "SDLGetSystemCapability.h" #import "SDLSystemCapabilityType.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLGetSystemCapabilitiesSpec) @@ -22,9 +22,9 @@ describe(@"Getter/Setter Tests", ^ { describe(@"Initialization tests", ^{ it(@"Should get correctly when initialized with a dictionary", ^ { - NSDictionary *dict = @{SDLNameRequest: @{ - SDLNameParameters: @{ - SDLNameSystemCapabilityType: @"PHONE_CALL" + NSDictionary *dict = @{SDLRPCParameterNameRequest: @{ + SDLRPCParameterNameParameters: @{ + SDLRPCParameterNameSystemCapabilityType: @"PHONE_CALL" } } }; diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetSystemCapabilitySpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetSystemCapabilitySpec.m new file mode 100644 index 000000000..77d175818 --- /dev/null +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetSystemCapabilitySpec.m @@ -0,0 +1,76 @@ +// +// SDLGetSystemCapabilitySpec.m +// SmartDeviceLinkTests +// +// Created by Nicole on 2/6/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import <Quick/Quick.h> +#import <Nimble/Nimble.h> + +#import "SDLGetSystemCapability.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" +#import "SDLSystemCapabilityType.h" + +QuickSpecBegin(SDLGetSystemCapabilitySpec) + +describe(@"Getter/Setter Tests", ^ { + __block SDLSystemCapabilityType testSystemCapabilityType = nil; + __block BOOL testSubcribe = nil; + + beforeEach(^{ + testSystemCapabilityType = SDLSystemCapabilityTypeAppServices; + testSubcribe = NO; + }); + + it(@"Should set and get correctly", ^{ + SDLGetSystemCapability *testRequest = [[SDLGetSystemCapability alloc] init]; + testRequest.systemCapabilityType = testSystemCapabilityType; + testRequest.subscribe = @(testSubcribe); + + expect(testRequest.systemCapabilityType).to(equal(testSystemCapabilityType)); + expect(testRequest.subscribe).to(beFalse()); + }); + + it(@"Should return nil if not set", ^{ + SDLGetSystemCapability *testRequest = [[SDLGetSystemCapability alloc] init]; + + expect(testRequest.systemCapabilityType).to(beNil()); + expect(testRequest.subscribe).to(beNil()); + }); + + describe(@"initializing", ^{ + it(@"Should initialize correctly with a dictionary", ^{ + NSDictionary *dict = @{SDLRPCParameterNameRequest:@{ + SDLRPCParameterNameParameters:@{ + SDLRPCParameterNameSystemCapabilityType:testSystemCapabilityType, + SDLRPCParameterNameSubscribe:@(testSubcribe) + }, + SDLRPCParameterNameOperationName:SDLRPCFunctionNameGetSystemCapability}}; + SDLGetSystemCapability *testRequest = [[SDLGetSystemCapability alloc] initWithDictionary:dict]; + + expect(testRequest.systemCapabilityType).to(equal(testSystemCapabilityType)); + expect(testRequest.subscribe).to(beFalse()); + }); + + + it(@"Should initialize correctly with initWithType:", ^{ + SDLGetSystemCapability *testRequest = [[SDLGetSystemCapability alloc] initWithType:testSystemCapabilityType]; + + expect(testRequest.systemCapabilityType).to(equal(testSystemCapabilityType)); + expect(testRequest.subscribe).to(beNil()); + }); + + it(@"Should initialize correctly with initWithType:subscribe:", ^{ + SDLGetSystemCapability *testRequest = [[SDLGetSystemCapability alloc] initWithType:testSystemCapabilityType subscribe:testSubcribe]; + + expect(testRequest.systemCapabilityType).to(equal(testSystemCapabilityType)); + expect(testRequest.subscribe).to(beFalse()); + }); + }); +}); + +QuickSpecEnd + diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m index a32ff2567..36c28f921 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m @@ -9,7 +9,8 @@ #import <Nimble/Nimble.h> #import "SDLGetVehicleData.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" QuickSpecBegin(SDLGetVehicleDataSpec) @@ -79,38 +80,38 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSDictionary<NSString *, id> *dict = @{SDLNameRequest: - @{SDLNameParameters: - @{SDLNameAccelerationPedalPosition:@YES, - SDLNameAirbagStatus:@YES, - SDLNameBeltStatus:@YES, - SDLNameBodyInformation:@YES, - SDLNameCloudAppVehicleID:@YES, - SDLNameClusterModeStatus:@YES, - SDLNameDeviceStatus:@YES, - SDLNameDriverBraking:@YES, - SDLNameECallInfo:@YES, - SDLNameElectronicParkBrakeStatus:@YES, - SDLNameEmergencyEvent:@NO, - SDLNameEngineOilLife:@YES, - SDLNameEngineTorque:@YES, - SDLNameExternalTemperature:@NO, - SDLNameFuelLevel:@YES, - SDLNameFuelLevelState:@YES, - SDLNameFuelRange:@YES, - SDLNameGPS:@YES, - SDLNameHeadLampStatus:@YES, - SDLNameInstantFuelConsumption:@YES, - SDLNameMyKey:@YES, - SDLNameOdometer:@YES, - SDLNamePRNDL:@YES, - SDLNameRPM:@YES, - SDLNameSpeed:@YES, - SDLNameSteeringWheelAngle:@NO, - SDLNameTirePressure:@YES, - SDLNameTurnSignal:@NO, - SDLNameWiperStatus:@YES}, - SDLNameOperationName:SDLNameGetVehicleData}}; + NSDictionary<NSString *, id> *dict = @{SDLRPCParameterNameRequest: + @{SDLRPCParameterNameParameters: + @{SDLRPCParameterNameAccelerationPedalPosition:@YES, + SDLRPCParameterNameAirbagStatus:@YES, + SDLRPCParameterNameBeltStatus:@YES, + SDLRPCParameterNameBodyInformation:@YES, + SDLRPCParameterCloudAppVehicleID:@YES, + SDLRPCParameterNameClusterModeStatus:@YES, + SDLRPCParameterNameDeviceStatus:@YES, + SDLRPCParameterNameDriverBraking:@YES, + SDLRPCParameterNameECallInfo:@YES, + SDLRPCParameterNameElectronicParkBrakeStatus:@YES, + SDLRPCParameterNameEmergencyEvent:@NO, + SDLRPCParameterNameEngineOilLife:@YES, + SDLRPCParameterNameEngineTorque:@YES, + SDLRPCParameterNameExternalTemperature:@NO, + SDLRPCParameterNameFuelLevel:@YES, + SDLRPCParameterNameFuelLevelState:@YES, + SDLRPCParameterNameFuelRange:@YES, + SDLRPCParameterNameGPS:@YES, + SDLRPCParameterNameHeadLampStatus:@YES, + SDLRPCParameterNameInstantFuelConsumption:@YES, + SDLRPCParameterNameMyKey:@YES, + SDLRPCParameterNameOdometer:@YES, + SDLRPCParameterNamePRNDL:@YES, + SDLRPCParameterNameRPM:@YES, + SDLRPCParameterNameSpeed:@YES, + SDLRPCParameterNameSteeringWheelAngle:@NO, + SDLRPCParameterNameTirePressure:@YES, + SDLRPCParameterNameTurnSignal:@NO, + SDLRPCParameterNameWiperStatus:@YES}, + SDLRPCParameterNameOperationName:SDLRPCFunctionNameGetVehicleData}}; SDLGetVehicleData* testRequest = [[SDLGetVehicleData alloc] initWithDictionary:dict]; expect(testRequest.accPedalPosition).to(equal(@YES)); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetWaypointsSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetWaypointsSpec.m index 45946f405..3b0c706c3 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetWaypointsSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetWaypointsSpec.m @@ -8,7 +8,8 @@ #import "SDLGetWaypoints.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" #import "SDLWayPointType.h" QuickSpecBegin(SDLGetWaypointsSpec) @@ -23,10 +24,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameRequest: - @{SDLNameParameters: - @{SDLNameWayPointType:SDLWayPointTypeAll}, - SDLNameOperationName:SDLNameGetWayPoints}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLRPCParameterNameRequest: + @{SDLRPCParameterNameParameters: + @{SDLRPCParameterNameWayPointType:SDLWayPointTypeAll}, + SDLRPCParameterNameOperationName:SDLRPCFunctionNameGetWayPoints}} mutableCopy]; SDLGetWayPoints* testRequest = [[SDLGetWayPoints alloc] initWithDictionary:dict]; expect(testRequest.waypointType).to(equal(SDLWayPointTypeAll)); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLListFilesSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLListFilesSpec.m index 0f0084f41..7039ace5a 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLListFilesSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLListFilesSpec.m @@ -9,8 +9,8 @@ #import <Nimble/Nimble.h> #import "SDLListFiles.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLListFilesSpec) -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPerformAppServiceInteractionSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPerformAppServiceInteractionSpec.m new file mode 100644 index 000000000..7d5cde77a --- /dev/null +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPerformAppServiceInteractionSpec.m @@ -0,0 +1,90 @@ +// +// SDLPerformAppServiceInteractionSpec.m +// SmartDeviceLinkTests +// +// Created by Nicole on 2/6/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import <Quick/Quick.h> +#import <Nimble/Nimble.h> + +#import "SDLPerformAppServiceInteraction.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" + +QuickSpecBegin(SDLPerformAppServiceInteractionSpec) + +describe(@"Getter/Setter Tests", ^{ + __block NSString *testServiceUri = nil; + __block NSString *testServiceID = nil; + __block NSString *testOriginApp = nil; + __block BOOL testRequestServiceActive = nil; + + beforeEach(^{ + testServiceUri = @"testServiceUri"; + testServiceID = @"testServiceID"; + testOriginApp = @"testOriginApp"; + testRequestServiceActive = true; + }); + + it(@"Should set and get correctly", ^{ + SDLPerformAppServiceInteraction *testRequest = [[SDLPerformAppServiceInteraction alloc] init]; + testRequest.serviceUri = testServiceUri; + testRequest.serviceID = testServiceID; + testRequest.originApp = testOriginApp; + testRequest.requestServiceActive = @(testRequestServiceActive); + + expect(testRequest.serviceUri).to(equal(testServiceUri)); + expect(testRequest.serviceID).to(equal(testServiceID)); + expect(testRequest.originApp).to(equal(testOriginApp)); + expect(testRequest.requestServiceActive).to(beTrue()); + }); + + it(@"Should initialize correctly with a dictionary", ^{ + NSDictionary *dict = @{SDLRPCParameterNameRequest:@{ + SDLRPCParameterNameParameters:@{ + SDLRPCParameterNameServiceUri:testServiceUri, + SDLRPCParameterNameServiceID:testServiceID, + SDLRPCParameterNameOriginApp:testOriginApp, + SDLRPCParameterNameRequestServiceActive:@(testRequestServiceActive) + }, + SDLRPCParameterNameOperationName:SDLRPCFunctionNamePerformAppServiceInteraction}}; + SDLPerformAppServiceInteraction *testRequest = [[SDLPerformAppServiceInteraction alloc] initWithDictionary:dict]; + + expect(testRequest.serviceUri).to(equal(testServiceUri)); + expect(testRequest.serviceID).to(equal(testServiceID)); + expect(testRequest.originApp).to(equal(testOriginApp)); + expect(testRequest.requestServiceActive).to(beTrue()); + }); + + it(@"Should initialize correctly with initWithServiceUri:appServiceId:originApp:", ^{ + SDLPerformAppServiceInteraction *testRequest = [[SDLPerformAppServiceInteraction alloc] initWithServiceUri:testServiceUri serviceID:testServiceID originApp:testOriginApp]; + + expect(testRequest.serviceUri).to(equal(testServiceUri)); + expect(testRequest.serviceID).to(equal(testServiceID)); + expect(testRequest.originApp).to(equal(testOriginApp)); + expect(testRequest.requestServiceActive).to(beNil()); + }); + + it(@"Should initialize correctly with initWithServiceUri:appServiceId:originApp:requestServiceActive:", ^{ + SDLPerformAppServiceInteraction *testRequest = [[SDLPerformAppServiceInteraction alloc] initWithServiceUri:testServiceUri serviceID:testServiceID originApp:testOriginApp requestServiceActive:testRequestServiceActive]; + + expect(testRequest.serviceUri).to(equal(testServiceUri)); + expect(testRequest.serviceID).to(equal(testServiceID)); + expect(testRequest.originApp).to(equal(testOriginApp)); + expect(testRequest.requestServiceActive).to(beTrue()); + }); + + it(@"Should return nil if not set", ^{ + SDLPerformAppServiceInteraction *testRequest = [[SDLPerformAppServiceInteraction alloc] init]; + + expect(testRequest.serviceUri).to(beNil()); + expect(testRequest.serviceID).to(beNil()); + expect(testRequest.originApp).to(beNil()); + expect(testRequest.requestServiceActive).to(beNil()); + }); +}); + +QuickSpecEnd + diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPerformAudioPassThruSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPerformAudioPassThruSpec.m index e55cf86be..ec8799689 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPerformAudioPassThruSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPerformAudioPassThruSpec.m @@ -10,7 +10,8 @@ #import "SDLAudioType.h" #import "SDLBitsPerSample.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" #import "SDLPerformAudioPassThru.h" #import "SDLSamplingRate.h" @@ -39,16 +40,16 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameRequest: - @{SDLNameParameters: - @{SDLNameAudioPassThruDisplayText1:@"passthru#1", - SDLNameAudioPassThruDisplayText2:@"passthru#2", - SDLNameSamplingRate:SDLSamplingRate22KHZ, - SDLNameMaxDuration:@34563, - SDLNameBitsPerSample:SDLBitsPerSample16Bit, - SDLNameAudioType:SDLAudioTypePCM, - SDLNameMuteAudio:@NO}, - SDLNameOperationName:SDLNamePerformAudioPassThru}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLRPCParameterNameRequest: + @{SDLRPCParameterNameParameters: + @{SDLRPCParameterNameAudioPassThruDisplayText1:@"passthru#1", + SDLRPCParameterNameAudioPassThruDisplayText2:@"passthru#2", + SDLRPCParameterNameSamplingRate:SDLSamplingRate22KHZ, + SDLRPCParameterNameMaxDuration:@34563, + SDLRPCParameterNameBitsPerSample:SDLBitsPerSample16Bit, + SDLRPCParameterNameAudioType:SDLAudioTypePCM, + SDLRPCParameterNameMuteAudio:@NO}, + SDLRPCParameterNameOperationName:SDLRPCFunctionNamePerformAudioPassThru}} mutableCopy]; SDLPerformAudioPassThru* testRequest = [[SDLPerformAudioPassThru alloc] initWithDictionary:dict]; expect(testRequest.audioPassThruDisplayText1).to(equal(@"passthru#1")); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPerformInteractionSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPerformInteractionSpec.m index 337008aee..6c905afbe 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPerformInteractionSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPerformInteractionSpec.m @@ -13,7 +13,8 @@ #import "SDLPerformInteraction.h" #import "SDLTTSChunk.h" #import "SDLVrHelpItem.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" QuickSpecBegin(SDLPerformInteractionSpec) @@ -48,18 +49,18 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameRequest: - @{SDLNameParameters: - @{SDLNameInitialText:@"a", - SDLNameInitialPrompt:[@[chunk1] mutableCopy], - SDLNameInteractionMode:SDLInteractionModeVoiceRecognitionOnly, - SDLNameInteractionChoiceSetIdList:[@[@1, @2, @3] mutableCopy], - SDLNameHelpPrompt:[@[chunk2] mutableCopy], - SDLNameTimeoutPrompt:[@[chunk3] mutableCopy], - SDLNameTimeout:@42000, - SDLNameVRHelp:[@[helpItem] mutableCopy], - SDLNameInteractionLayout:SDLLayoutModeIconWithSearch}, - SDLNameOperationName:SDLNamePerformInteraction}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLRPCParameterNameRequest: + @{SDLRPCParameterNameParameters: + @{SDLRPCParameterNameInitialText:@"a", + SDLRPCParameterNameInitialPrompt:[@[chunk1] mutableCopy], + SDLRPCParameterNameInteractionMode:SDLInteractionModeVoiceRecognitionOnly, + SDLRPCParameterNameInteractionChoiceSetIdList:[@[@1, @2, @3] mutableCopy], + SDLRPCParameterNameHelpPrompt:[@[chunk2] mutableCopy], + SDLRPCParameterNameTimeoutPrompt:[@[chunk3] mutableCopy], + SDLRPCParameterNameTimeout:@42000, + SDLRPCParameterNameVRHelp:[@[helpItem] mutableCopy], + SDLRPCParameterNameInteractionLayout:SDLLayoutModeIconWithSearch}, + SDLRPCParameterNameOperationName:SDLRPCFunctionNamePerformInteraction}} mutableCopy]; SDLPerformInteraction* testRequest = [[SDLPerformInteraction alloc] initWithDictionary:dict]; expect(testRequest.initialText).to(equal(@"a")); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPublishAppServiceSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPublishAppServiceSpec.m new file mode 100644 index 000000000..a11ec3fb0 --- /dev/null +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPublishAppServiceSpec.m @@ -0,0 +1,59 @@ +// +// SDLPublishAppServiceSpec.m +// SmartDeviceLinkTests +// +// Created by Nicole on 2/5/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import <Quick/Quick.h> +#import <Nimble/Nimble.h> + +#import "SDLAppServiceManifest.h" +#import "SDLPublishAppService.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" + +QuickSpecBegin(SDLPublishAppServiceSpec) + +describe(@"Getter/Setter Tests", ^{ + __block SDLAppServiceManifest *testAppServiceManifest = nil; + + beforeEach(^{ + testAppServiceManifest = [[SDLAppServiceManifest alloc] init]; + }); + + it(@"Should set and get correctly", ^{ + SDLPublishAppService *testRequest = [[SDLPublishAppService alloc] init]; + testRequest.appServiceManifest = testAppServiceManifest; + + expect(testRequest.appServiceManifest).to(equal(testAppServiceManifest)); + }); + + it(@"Should return nil if not set", ^{ + SDLPublishAppService *testRequest = [[SDLPublishAppService alloc] init]; + + expect(testRequest.appServiceManifest).to(beNil()); + }); + + describe(@"initializing", ^{ + it(@"Should initialize correctly with a dictionary", ^{ + NSDictionary *dict = @{SDLRPCParameterNameRequest:@{ + SDLRPCParameterNameParameters:@{ + SDLRPCParameterNameAppServiceManifest:testAppServiceManifest + }, + SDLRPCParameterNameOperationName:SDLRPCFunctionNamePublishAppService}}; + SDLPublishAppService *testRequest = [[SDLPublishAppService alloc] initWithDictionary:dict]; + + expect(testRequest.appServiceManifest).to(equal(testAppServiceManifest)); + }); + + it(@"Should initialize correctly with initWithAppServiceManifest:", ^{ + SDLPublishAppService *testRequest = [[SDLPublishAppService alloc] initWithAppServiceManifest:testAppServiceManifest]; + + expect(testRequest.appServiceManifest).to(equal(testAppServiceManifest)); + }); + }); +}); + +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPutFileSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPutFileSpec.m index 88b7310f5..b8c8f4f6b 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPutFileSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPutFileSpec.m @@ -9,7 +9,8 @@ #import <Nimble/Nimble.h> #import "SDLFileType.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" #import "SDLPutFile.h" #import <zlib.h> @@ -43,16 +44,16 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get and set correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameRequest: - @{SDLNameParameters: - @{ SDLNameSyncFileName:@"fileName", - SDLNameFileType:SDLFileTypeJPEG, - SDLNamePersistentFile:@YES, - SDLNameSystemFile:@NO, - SDLNameOffset:@987654321, - SDLNameLength:@123456789, - SDLNameCRC:@0xffffffff}, - SDLNameOperationName:SDLNamePutFile}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLRPCParameterNameRequest: + @{SDLRPCParameterNameParameters: + @{ SDLRPCParameterNameSyncFileName:@"fileName", + SDLRPCParameterNameFileType:SDLFileTypeJPEG, + SDLRPCParameterNamePersistentFile:@YES, + SDLRPCParameterNameSystemFile:@NO, + SDLRPCParameterNameOffset:@987654321, + SDLRPCParameterNameLength:@123456789, + SDLRPCParameterNameCRC:@0xffffffff}, + SDLRPCParameterNameOperationName:SDLRPCFunctionNamePutFile}} mutableCopy]; SDLPutFile* testRequest = [[SDLPutFile alloc] initWithDictionary:dict]; expect(testRequest.syncFileName).to(equal(@"fileName")); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLReadDIDSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLReadDIDSpec.m index f0290c3b6..a5ee105d1 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLReadDIDSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLReadDIDSpec.m @@ -9,7 +9,8 @@ #import <Nimble/Nimble.h> #import "SDLReadDID.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" QuickSpecBegin(SDLReadDIDSpec) @@ -25,11 +26,11 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary<NSString *, id> *dict = [@{SDLNameRequest: - @{SDLNameParameters: - @{SDLNameECUName:@33112, - SDLNameDIDLocation:[@[@200, @201, @205] mutableCopy]}, - SDLNameOperationName:SDLNameEndAudioPassThru}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLRPCParameterNameRequest: + @{SDLRPCParameterNameParameters: + @{SDLRPCParameterNameECUName:@33112, + SDLRPCParameterNameDIDLocation:[@[@200, @201, @205] mutableCopy]}, + SDLRPCParameterNameOperationName:SDLRPCFunctionNameEndAudioPassThru}} mutableCopy]; SDLReadDID* testRequest = [[SDLReadDID alloc] initWithDictionary:dict]; expect(testRequest.ecuName).to(equal(@33112)); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLRegisterAppInterfaceSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLRegisterAppInterfaceSpec.m index 6a157725f..d559adaa2 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLRegisterAppInterfaceSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLRegisterAppInterfaceSpec.m @@ -14,7 +14,8 @@ #import "SDLDeviceInfo.h" #import "SDLLanguage.h" #import "SDLLifecycleConfiguration.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" #import "SDLRegisterAppInterface.h" #import "SDLSyncMsgVersion.h" #import "SDLTemplateColorScheme.h" @@ -92,26 +93,26 @@ describe(@"RegisterAppInterface Tests", ^{ }); it(@"Should get correctly when initialized with a dictionary", ^ { - NSDictionary* dict = @{SDLNameRequest: - @{SDLNameParameters: - @{SDLNameSyncMessageVersion:version, - SDLNameAppName:appName, - SDLNameTTSName:[@[chunk] mutableCopy], - SDLNameNGNMediaScreenAppName:shortAppName, - SDLNameVRSynonyms:@[vrSynonyms], - SDLNameIsMediaApplication:isMediaApp, - SDLNameLanguageDesired:SDLLanguageNoNo, - SDLNameHMIDisplayLanguageDesired:SDLLanguagePtPt, - SDLNameAppHMIType:appTypes, - SDLNameHashId:resumeHash, - SDLNameDeviceInfo:info, - SDLNameFullAppID:fullAppId, - SDLNameAppId:appId, - SDLNameAppInfo:appInfo, - SDLNameDayColorScheme: colorScheme, - SDLNameNightColorScheme: colorScheme, + NSDictionary* dict = @{SDLRPCParameterNameRequest: + @{SDLRPCParameterNameParameters: + @{SDLRPCParameterNameSyncMessageVersion:version, + SDLRPCParameterNameAppName:appName, + SDLRPCParameterNameTTSName:[@[chunk] mutableCopy], + SDLRPCParameterNameNGNMediaScreenAppName:shortAppName, + SDLRPCParameterNameVRSynonyms:@[vrSynonyms], + SDLRPCParameterNameIsMediaApplication:isMediaApp, + SDLRPCParameterNameLanguageDesired:SDLLanguageNoNo, + SDLRPCParameterNameHMIDisplayLanguageDesired:SDLLanguagePtPt, + SDLRPCParameterNameAppHMIType:appTypes, + SDLRPCParameterNameHashId:resumeHash, + SDLRPCParameterNameDeviceInfo:info, + SDLRPCParameterNameFullAppID:fullAppId, + SDLRPCParameterNameAppId:appId, + SDLRPCParameterNameAppInfo:appInfo, + SDLRPCParameterNameDayColorScheme: colorScheme, + SDLRPCParameterNameNightColorScheme: colorScheme, }, - SDLNameOperationName:SDLNameRegisterAppInterface}}; + SDLRPCParameterNameOperationName:SDLRPCFunctionNameRegisterAppInterface}}; SDLRegisterAppInterface* testRegisterAppInterface = [[SDLRegisterAppInterface alloc] initWithDictionary:dict]; expect(testRegisterAppInterface.syncMsgVersion).to(equal(version)); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLResetGlobalPropertiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLResetGlobalPropertiesSpec.m index 1d45f37a4..67ffbbec9 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLResetGlobalPropertiesSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLResetGlobalPropertiesSpec.m @@ -10,7 +10,8 @@ #import "SDLResetGlobalProperties.h" #import "SDLGlobalProperty.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" QuickSpecBegin(SDLResetGlobalPropertiesSpec) @@ -24,10 +25,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameRequest: - @{SDLNameParameters: - @{SDLNameProperties:[@[SDLGlobalPropertyMenuName, SDLGlobalPropertyVoiceRecognitionHelpTitle] copy]}, - SDLNameOperationName:SDLNameResetGlobalProperties}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLRPCParameterNameRequest: + @{SDLRPCParameterNameParameters: + @{SDLRPCParameterNameProperties:[@[SDLGlobalPropertyMenuName, SDLGlobalPropertyVoiceRecognitionHelpTitle] copy]}, + SDLRPCParameterNameOperationName:SDLRPCFunctionNameResetGlobalProperties}} mutableCopy]; SDLResetGlobalProperties* testRequest = [[SDLResetGlobalProperties alloc] initWithDictionary:dict]; expect(testRequest.properties).to(equal([@[SDLGlobalPropertyMenuName, SDLGlobalPropertyVoiceRecognitionHelpTitle] copy])); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLScrollableMessageSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLScrollableMessageSpec.m index f4b50c3f9..d8074b2eb 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLScrollableMessageSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLScrollableMessageSpec.m @@ -10,7 +10,8 @@ #import "SDLScrollableMessage.h" #import "SDLSoftButton.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" QuickSpecBegin(SDLScrollableMessageSpec) @@ -30,12 +31,12 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary<NSString *, id> *dict = [@{SDLNameRequest: - @{SDLNameParameters: - @{SDLNameScrollableMessageBody:@"thatmessagebody", - SDLNameTimeout:@9182, - SDLNameSoftButtons:[@[button] mutableCopy]}, - SDLNameOperationName:SDLNameScrollableMessage}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLRPCParameterNameRequest: + @{SDLRPCParameterNameParameters: + @{SDLRPCParameterNameScrollableMessageBody:@"thatmessagebody", + SDLRPCParameterNameTimeout:@9182, + SDLRPCParameterNameSoftButtons:[@[button] mutableCopy]}, + SDLRPCParameterNameOperationName:SDLRPCFunctionNameScrollableMessage}} mutableCopy]; SDLScrollableMessage* testRequest = [[SDLScrollableMessage alloc] initWithDictionary:dict]; expect(testRequest.scrollableMessageBody).to(equal(@"thatmessagebody")); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSendHapticDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSendHapticDataSpec.m index 24bf7ddb2..d02e8f9bb 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSendHapticDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSendHapticDataSpec.m @@ -11,7 +11,8 @@ #import <Quick/Quick.h> #import <Nimble/Nimble.h> -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" #import "SDLHapticRect.h" #import "SDLRectangle.h" #import "SDLSendHapticData.h" @@ -36,10 +37,10 @@ describe(@"Initialization Tests", ^ { context(@"Init tests", ^{ it(@"Should get correctly when initialized with a dictionary", ^ { - NSMutableDictionary* dict = [@{SDLNameRequest: - @{SDLNameParameters: - @{SDLNameHapticRectData:@[testStruct]}, - SDLNameOperationName:SDLNameSendHapticData}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLRPCParameterNameRequest: + @{SDLRPCParameterNameParameters: + @{SDLRPCParameterNameHapticRectData:@[testStruct]}, + SDLRPCParameterNameOperationName:SDLRPCFunctionNameSendHapticData}} mutableCopy]; SDLSendHapticData *testRequest = [[SDLSendHapticData alloc] initWithDictionary:dict]; expect(testRequest.hapticRectData).to(equal(@[testStruct])); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSendLocationSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSendLocationSpec.m index c0539943a..43c02d4c4 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSendLocationSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSendLocationSpec.m @@ -5,7 +5,8 @@ #import <Quick/Quick.h> #import <Nimble/Nimble.h> -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" #import "SDLSendLocation.h" @@ -163,19 +164,20 @@ describe(@"Send Location RPC", ^{ someTime = [[SDLDateTime alloc] init]; someAddress = [[SDLOasisAddress alloc] init]; NSDictionary *initDict = @{ - SDLNameRequest: @{ - SDLNameParameters: @{ - SDLNameLongitudeDegrees: someLongitude, - SDLNameLatitudeDegrees: someLatitude, - SDLNameLocationName: someLocation, - SDLNameLocationDescription: someLocationDescription, - SDLNameAddressLines: someAddressLines, - SDLNamePhoneNumber: somePhoneNumber, - SDLNameLocationImage: someImage, - SDLNameDeliveryMode: someDeliveryMode, - SDLNameLocationTimeStamp: someTime, - SDLNameAddress: someAddress - } + SDLRPCParameterNameRequest: @{ + SDLRPCParameterNameParameters: @{ + SDLRPCParameterNameLongitudeDegrees: someLongitude, + SDLRPCParameterNameLatitudeDegrees: someLatitude, + SDLRPCParameterNameLocationName: someLocation, + SDLRPCParameterNameLocationDescription: someLocationDescription, + SDLRPCParameterNameAddressLines: someAddressLines, + SDLRPCParameterNamePhoneNumber: somePhoneNumber, + SDLRPCParameterNameLocationImage: someImage, + SDLRPCParameterNameDeliveryMode: someDeliveryMode, + SDLRPCParameterNameTimeStamp: someTime, + SDLRPCParameterNameAddress: someAddress + }, + SDLRPCParameterNameOperationName:SDLRPCFunctionNameSendLocation } }; @@ -237,8 +239,8 @@ describe(@"Send Location RPC", ^{ context(@"when parameters are not set", ^{ beforeEach(^{ NSDictionary<NSString *, id> *initDict = @{ - SDLNameRequest: @{ - SDLNameParameters: @{} + SDLRPCParameterNameRequest: @{ + SDLRPCParameterNameParameters: @{} } }; diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetAppIconSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetAppIconSpec.m index 29c0f14f5..983d79eeb 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetAppIconSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetAppIconSpec.m @@ -9,7 +9,8 @@ #import <Nimble/Nimble.h> #import "SDLSetAppIcon.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" QuickSpecBegin(SDLSetAppIconSpec) @@ -23,10 +24,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary<NSString *, id> *dict = [@{SDLNameRequest: - @{SDLNameParameters: - @{SDLNameSyncFileName:@"A/File/Name"}, - SDLNameOperationName:SDLNameSetAppIcon}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLRPCParameterNameRequest: + @{SDLRPCParameterNameParameters: + @{SDLRPCParameterNameSyncFileName:@"A/File/Name"}, + SDLRPCParameterNameOperationName:SDLRPCFunctionNameSetAppIcon}} mutableCopy]; SDLSetAppIcon* testRequest = [[SDLSetAppIcon alloc] initWithDictionary:dict]; expect(testRequest.syncFileName).to(equal(@"A/File/Name")); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetDisplayLayoutSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetDisplayLayoutSpec.m index 60880f283..397b2e88b 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetDisplayLayoutSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetDisplayLayoutSpec.m @@ -5,7 +5,8 @@ #import <Quick/Quick.h> #import <Nimble/Nimble.h> -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" #import "SDLSetDisplayLayout.h" #import "SDLTemplateColorScheme.h" @@ -43,10 +44,10 @@ describe(@"SetDisplayLayout Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary<NSString *, id> *dict = [@{SDLNameRequest: - @{SDLNameParameters: - @{SDLNameDisplayLayout:@"wat"}, - SDLNameOperationName:SDLNameSetDisplayLayout}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLRPCParameterNameRequest: + @{SDLRPCParameterNameParameters: + @{SDLRPCParameterNameDisplayLayout:@"wat"}, + SDLRPCParameterNameOperationName:SDLRPCFunctionNameSetDisplayLayout}} mutableCopy]; SDLSetDisplayLayout* testRequest = [[SDLSetDisplayLayout alloc] initWithDictionary:dict]; expect(testRequest.displayLayout).to(equal(@"wat")); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetGlobalPropertiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetGlobalPropertiesSpec.m index 15062d29b..f983a1da9 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetGlobalPropertiesSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetGlobalPropertiesSpec.m @@ -10,7 +10,8 @@ #import "SDLImage.h" #import "SDLKeyboardProperties.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" #import "SDLSetGlobalProperties.h" #import "SDLTTSChunk.h" #import "SDLVrHelpItem.h" @@ -46,16 +47,16 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary<NSString *, id> *dict = [@{SDLNameRequest: - @{SDLNameParameters: - @{SDLNameHelpPrompt:[@[chunk1] mutableCopy], - SDLNameTimeoutPrompt:[@[chunk2] mutableCopy], - SDLNameVRHelpTitle:@"vr", - SDLNameVRHelp:[@[help] mutableCopy], - SDLNameMenuTitle:@"TheNewMenu", - SDLNameMenuIcon:image, - SDLNameKeyboardProperties:keyboard}, - SDLNameOperationName:SDLNameSetGlobalProperties}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLRPCParameterNameRequest: + @{SDLRPCParameterNameParameters: + @{SDLRPCParameterNameHelpPrompt:[@[chunk1] mutableCopy], + SDLRPCParameterNameTimeoutPrompt:[@[chunk2] mutableCopy], + SDLRPCParameterNameVRHelpTitle:@"vr", + SDLRPCParameterNameVRHelp:[@[help] mutableCopy], + SDLRPCParameterNameMenuTitle:@"TheNewMenu", + SDLRPCParameterNameMenuIcon:image, + SDLRPCParameterNameKeyboardProperties:keyboard}, + SDLRPCParameterNameOperationName:SDLRPCFunctionNameSetGlobalProperties}} mutableCopy]; SDLSetGlobalProperties* testRequest = [[SDLSetGlobalProperties alloc] initWithDictionary:dict]; expect(testRequest.helpPrompt).to(equal([@[chunk1] mutableCopy])); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetInteriorVehicleDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetInteriorVehicleDataSpec.m index 5eb39c8f2..d77ce6a89 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetInteriorVehicleDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetInteriorVehicleDataSpec.m @@ -9,7 +9,8 @@ #import <Nimble/Nimble.h> #import "SDLSetInteriorVehicleData.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" #import "SDLModuleData.h" @@ -26,10 +27,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary<NSString *, id> *dict = [@{SDLNameRequest: - @{SDLNameParameters: - @{SDLNameModuleData : someModuleData}, - SDLNameOperationName:SDLNameSetInteriorVehicleData}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLRPCParameterNameRequest: + @{SDLRPCParameterNameParameters: + @{SDLRPCParameterNameModuleData : someModuleData}, + SDLRPCParameterNameOperationName:SDLRPCFunctionNameSetInteriorVehicleData}} mutableCopy]; SDLSetInteriorVehicleData* testRequest = [[SDLSetInteriorVehicleData alloc] initWithDictionary:dict]; expect(testRequest.moduleData).to(equal(someModuleData)); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetMediaClockTimerSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetMediaClockTimerSpec.m index f2d4fb312..bd806af6b 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetMediaClockTimerSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetMediaClockTimerSpec.m @@ -8,7 +8,8 @@ #import <Quick/Quick.h> #import <Nimble/Nimble.h> -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" #import "SDLSetMediaClockTimer.h" #import "SDLStartTime.h" #import "SDLUpdateMode.h" @@ -26,14 +27,14 @@ describe(@"SetMediaClocktimer Spec", ^ { describe(@"when initialized", ^{ it(@"should properly initialize with initWithDictionary:", ^{ - NSMutableDictionary* dict = [@{SDLNameRequest: - @{SDLNameParameters: - @{SDLNameStartTime:time1, - SDLNameEndTime:time2, - SDLNameUpdateMode:testUpdateMode, - SDLNameAudioStreamingIndicator:testIndicator + NSMutableDictionary* dict = [@{SDLRPCParameterNameRequest: + @{SDLRPCParameterNameParameters: + @{SDLRPCParameterNameStartTime:time1, + SDLRPCParameterNameEndTime:time2, + SDLRPCParameterNameUpdateMode:testUpdateMode, + SDLRPCParameterNameAudioStreamingIndicator:testIndicator }, - SDLNameOperationName:SDLNameSetMediaClockTimer}} mutableCopy]; + SDLRPCParameterNameOperationName:SDLRPCFunctionNameSetMediaClockTimer}} mutableCopy]; SDLSetMediaClockTimer* testRequest = [[SDLSetMediaClockTimer alloc] initWithDictionary:dict]; expect(testRequest.startTime).to(equal(time1)); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLShowConstantTBTSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLShowConstantTBTSpec.m index 491096b84..451dece6d 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLShowConstantTBTSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLShowConstantTBTSpec.m @@ -9,7 +9,8 @@ #import <Nimble/Nimble.h> #import "SDLImage.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" #import "SDLShowConstantTBT.h" #import "SDLSoftButton.h" @@ -50,20 +51,20 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary<NSString *, id> *dict = [@{SDLNameRequest: - @{SDLNameParameters: - @{SDLNameNavigationText1:@"nav1", - SDLNameNavigationText2:@"nav2", - SDLNameETA:@"4/1/7015", - SDLNameTimeToDestination:@"5000 Years", - SDLNameTotalDistance:@"1 parsec", - SDLNameTurnIcon:image1, - SDLNameNextTurnIcon:image2, - SDLNameDistanceToManeuver:@2, - SDLNameDistanceToManeuverScale:@4, - SDLNameManeuverComplete:@NO, - SDLNameSoftButtons:[@[button] mutableCopy]}, - SDLNameOperationName:SDLNameShowConstantTBT}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLRPCParameterNameRequest: + @{SDLRPCParameterNameParameters: + @{SDLRPCParameterNameNavigationText1:@"nav1", + SDLRPCParameterNameNavigationText2:@"nav2", + SDLRPCParameterNameETA:@"4/1/7015", + SDLRPCParameterNameTimeToDestination:@"5000 Years", + SDLRPCParameterNameTotalDistance:@"1 parsec", + SDLRPCParameterNameTurnIcon:image1, + SDLRPCParameterNameNextTurnIcon:image2, + SDLRPCParameterNameDistanceToManeuver:@2, + SDLRPCParameterNameDistanceToManeuverScale:@4, + SDLRPCParameterNameManeuverComplete:@NO, + SDLRPCParameterNameSoftButtons:[@[button] mutableCopy]}, + SDLRPCParameterNameOperationName:SDLRPCFunctionNameShowConstantTBT}} mutableCopy]; SDLShowConstantTBT* testRequest = [[SDLShowConstantTBT alloc] initWithDictionary:dict]; expect(testRequest.navigationText1).to(equal(@"nav1")); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLShowSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLShowSpec.m index cab6d5867..341500b20 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLShowSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLShowSpec.m @@ -11,7 +11,8 @@ #import "SDLImage.h" #import "SDLMetadataTags.h" #import "SDLMetadataType.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" #import "SDLShow.h" #import "SDLSoftButton.h" #import "SDLTextAlignment.h" @@ -312,22 +313,22 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized with a dictionary", ^ { - NSMutableDictionary* dict = [@{SDLNameRequest: - @{SDLNameParameters: - @{SDLNameMainField1:@"field1", - SDLNameMainField2:@"field2", - SDLNameMainField3:@"field3", - SDLNameMainField4:@"field4", - SDLNameAlignment:SDLTextAlignmentLeft, - SDLNameStatusBar:@"status", - SDLNameMediaClock:@"TheTime", - SDLNameMediaTrack:@"In The Clear", - SDLNameGraphic:image1, - SDLNameSecondaryGraphic:image2, - SDLNameSoftButtons:[@[button] mutableCopy], - SDLNameCustomPresets:[@[@"preset1", @"preset2"] mutableCopy], - SDLNameMetadataTags:testMetadata}, - SDLNameOperationName:SDLNameShow}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLRPCParameterNameRequest: + @{SDLRPCParameterNameParameters: + @{SDLRPCParameterNameMainField1:@"field1", + SDLRPCParameterNameMainField2:@"field2", + SDLRPCParameterNameMainField3:@"field3", + SDLRPCParameterNameMainField4:@"field4", + SDLRPCParameterNameAlignment:SDLTextAlignmentLeft, + SDLRPCParameterNameStatusBar:@"status", + SDLRPCParameterNameMediaClock:@"TheTime", + SDLRPCParameterNameMediaTrack:@"In The Clear", + SDLRPCParameterNameGraphic:image1, + SDLRPCParameterNameSecondaryGraphic:image2, + SDLRPCParameterNameSoftButtons:[@[button] mutableCopy], + SDLRPCParameterNameCustomPresets:[@[@"preset1", @"preset2"] mutableCopy], + SDLRPCParameterNameMetadataTags:testMetadata}, + SDLRPCParameterNameOperationName:SDLRPCFunctionNameShow}} mutableCopy]; SDLShow* testRequest = [[SDLShow alloc] initWithDictionary:dict]; expect(testRequest.mainField1).to(equal(@"field1")); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSliderSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSliderSpec.m index e1fb58dc1..e5b3ba339 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSliderSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSliderSpec.m @@ -9,7 +9,8 @@ #import <Nimble/Nimble.h> #import "SDLSlider.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" QuickSpecBegin(SDLSliderSpec) @@ -49,14 +50,14 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized with a dictionary", ^ { - NSDictionary<NSString *, id> *dict = @{SDLNameRequest: - @{SDLNameParameters: - @{SDLNameNumberTicks:@(testNumTicks), - SDLNamePosition:@(testPosition), - SDLNameSliderHeader:testHeader, - SDLNameSliderFooter:testFooters, - SDLNameTimeout:@(testTimeout)}, - SDLNameOperationName:SDLNameSlider}}; + NSDictionary<NSString *, id> *dict = @{SDLRPCParameterNameRequest: + @{SDLRPCParameterNameParameters: + @{SDLRPCParameterNameNumberTicks:@(testNumTicks), + SDLRPCParameterNamePosition:@(testPosition), + SDLRPCParameterNameSliderHeader:testHeader, + SDLRPCParameterNameSliderFooter:testFooters, + SDLRPCParameterNameTimeout:@(testTimeout)}, + SDLRPCParameterNameOperationName:SDLRPCFunctionNameSlider}}; testRequest = [[SDLSlider alloc] initWithDictionary:dict]; expect(testRequest.numTicks).to(equal(testNumTicks)); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSpeakSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSpeakSpec.m index e336b0067..761c10505 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSpeakSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSpeakSpec.m @@ -10,7 +10,8 @@ #import "SDLSpeak.h" #import "SDLTTSChunk.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" QuickSpecBegin(SDLSpeakSpec) @@ -26,10 +27,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary<NSString *, id> *dict = [@{SDLNameRequest: - @{SDLNameParameters: - @{SDLNameTTSChunks:[@[chunk] mutableCopy]}, - SDLNameOperationName:SDLNameSpeak}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLRPCParameterNameRequest: + @{SDLRPCParameterNameParameters: + @{SDLRPCParameterNameTTSChunks:[@[chunk] mutableCopy]}, + SDLRPCParameterNameOperationName:SDLRPCFunctionNameSpeak}} mutableCopy]; SDLSpeak* testRequest = [[SDLSpeak alloc] initWithDictionary:dict]; expect(testRequest.ttsChunks).to(equal([@[chunk] mutableCopy])); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeButtonSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeButtonSpec.m index c541ccc40..d748e24bd 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeButtonSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeButtonSpec.m @@ -9,7 +9,8 @@ #import <Nimble/Nimble.h> #import "SDLButtonName.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" #import "SDLSubscribeButton.h" @@ -25,10 +26,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameRequest: - @{SDLNameParameters: - @{SDLNameButtonName:SDLButtonNamePreset5}, - SDLNameOperationName:SDLNameSubscribeButton}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLRPCParameterNameRequest: + @{SDLRPCParameterNameParameters: + @{SDLRPCParameterNameButtonName:SDLButtonNamePreset5}, + SDLRPCParameterNameOperationName:SDLRPCFunctionNameSubscribeButton}} mutableCopy]; SDLSubscribeButton* testRequest = [[SDLSubscribeButton alloc] initWithDictionary:dict]; expect(testRequest.buttonName).to(equal(SDLButtonNamePreset5)); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeVehicleDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeVehicleDataSpec.m index ba0671043..c90c8a45e 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeVehicleDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeVehicleDataSpec.m @@ -9,7 +9,8 @@ #import <Nimble/Nimble.h> #import "SDLSubscribeVehicleData.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" QuickSpecBegin(SDLSubscribeVehicleDataSpec) @@ -78,39 +79,39 @@ describe(@"Getter/Setter Tests", ^ { expect(testRequest.wiperStatus).to(equal(@NO)); }); - it(@"Should get correctly when initialized", ^ { - NSDictionary<NSString *, id> *dict = @{SDLNameRequest: - @{SDLNameParameters: - @{SDLNameAccelerationPedalPosition:@YES, - SDLNameAirbagStatus:@YES, - SDLNameBeltStatus:@YES, - SDLNameBodyInformation:@YES, - SDLNameCloudAppVehicleID:@YES, - SDLNameClusterModeStatus:@YES, - SDLNameDeviceStatus:@YES, - SDLNameDriverBraking:@YES, - SDLNameECallInfo:@YES, - SDLNameElectronicParkBrakeStatus: @YES, - SDLNameEmergencyEvent:@NO, - SDLNameEngineOilLife:@YES, - SDLNameEngineTorque:@YES, - SDLNameExternalTemperature:@NO, - SDLNameFuelLevel:@YES, - SDLNameFuelLevelState:@YES, - SDLNameFuelRange:@YES, - SDLNameGPS:@YES, - SDLNameHeadLampStatus:@YES, - SDLNameInstantFuelConsumption:@YES, - SDLNameMyKey:@YES, - SDLNameOdometer:@YES, - SDLNamePRNDL:@YES, - SDLNameRPM:@YES, - SDLNameSpeed:@YES, - SDLNameSteeringWheelAngle:@NO, - SDLNameTirePressure:@YES, - SDLNameTurnSignal:@NO, - SDLNameWiperStatus:@NO}, - SDLNameOperationName:SDLNameSubscribeVehicleData}}; + it(@"Should get correctly when initialized with a dictionary", ^ { + NSDictionary<NSString *, id> *dict = @{SDLRPCParameterNameRequest: + @{SDLRPCParameterNameParameters: + @{SDLRPCParameterNameAccelerationPedalPosition:@YES, + SDLRPCParameterNameAirbagStatus:@YES, + SDLRPCParameterNameBeltStatus:@YES, + SDLRPCParameterNameBodyInformation:@YES, + SDLRPCParameterNameCloudAppVehicleID:@YES, + SDLRPCParameterNameClusterModeStatus:@YES, + SDLRPCParameterNameDeviceStatus:@YES, + SDLRPCParameterNameDriverBraking:@YES, + SDLRPCParameterNameECallInfo:@YES, + SDLRPCParameterNameElectronicParkBrakeStatus: @YES, + SDLRPCParameterNameEmergencyEvent:@NO, + SDLRPCParameterNameEngineOilLife:@YES, + SDLRPCParameterNameEngineTorque:@YES, + SDLRPCParameterNameExternalTemperature:@NO, + SDLRPCParameterNameFuelLevel:@YES, + SDLRPCParameterNameFuelLevelState:@YES, + SDLRPCParameterNameFuelRange:@YES, + SDLRPCParameterNameGPS:@YES, + SDLRPCParameterNameHeadLampStatus:@YES, + SDLRPCParameterNameInstantFuelConsumption:@YES, + SDLRPCParameterNameMyKey:@YES, + SDLRPCParameterNameOdometer:@YES, + SDLRPCParameterNamePRNDL:@YES, + SDLRPCParameterNameRPM:@YES, + SDLRPCParameterNameSpeed:@YES, + SDLRPCParameterNameSteeringWheelAngle:@NO, + SDLRPCParameterNameTirePressure:@YES, + SDLRPCParameterNameTurnSignal:@NO, + SDLRPCParameterNameWiperStatus:@NO}, + SDLRPCParameterNameOperationName:SDLRPCFunctionNameSubscribeVehicleData}}; SDLSubscribeVehicleData* testRequest = [[SDLSubscribeVehicleData alloc] initWithDictionary:dict]; expect(testRequest.accPedalPosition).to(equal(@YES)); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSyncPDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSyncPDataSpec.m index 300583447..5ab7f0171 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSyncPDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSyncPDataSpec.m @@ -9,7 +9,7 @@ #import <Nimble/Nimble.h> #import "SDLSyncPData.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLSyncPDataSpec) diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSystemRequestSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSystemRequestSpec.m index 80b1543e8..1b27f45a8 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSystemRequestSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSystemRequestSpec.m @@ -10,7 +10,8 @@ #import "SDLSystemRequest.h" #import "SDLRequestType.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" QuickSpecBegin(SDLSystemRequestSpec) @@ -21,12 +22,12 @@ describe(@"Getter/Setter Tests", ^ { describe(@"initializers", ^{ it(@"should get correctly when initialized with dictionary", ^ { - NSMutableDictionary* dict = [@{SDLNameRequest: - @{SDLNameParameters: - @{SDLNameRequestType:SDLRequestTypeAuthenticationRequest, - SDLNameRequestSubType: testSubType, - SDLNameFilename:testFileName}, - SDLNameOperationName:SDLNameSystemRequest}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLRPCParameterNameRequest: + @{SDLRPCParameterNameParameters: + @{SDLRPCParameterNameRequestType:SDLRequestTypeAuthenticationRequest, + SDLRPCParameterNameRequestSubType: testSubType, + SDLRPCParameterNameFilename:testFileName}, + SDLRPCParameterNameOperationName:SDLRPCFunctionNameSystemRequest}} mutableCopy]; SDLSystemRequest* testRequest = [[SDLSystemRequest alloc] initWithDictionary:dict]; expect(testRequest.requestType).to(equal(testRequestType)); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnregisterAppInterfaceSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnregisterAppInterfaceSpec.m index 746c07d2b..e610e7aa2 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnregisterAppInterfaceSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnregisterAppInterfaceSpec.m @@ -9,7 +9,7 @@ #import <Nimble/Nimble.h> #import "SDLUnregisterAppInterface.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLUnregisterAppInterfaceSpec) diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeButtonSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeButtonSpec.m index e4d693685..dd7f72d28 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeButtonSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeButtonSpec.m @@ -9,7 +9,8 @@ #import <Nimble/Nimble.h> #import "SDLButtonName.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" #import "SDLUnsubscribeButton.h" @@ -25,10 +26,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameRequest: - @{SDLNameParameters: - @{SDLNameButtonName:SDLButtonNamePreset0}, - SDLNameOperationName:SDLNameUnsubscribeButton}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLRPCParameterNameRequest: + @{SDLRPCParameterNameParameters: + @{SDLRPCParameterNameButtonName:SDLButtonNamePreset0}, + SDLRPCParameterNameOperationName:SDLRPCFunctionNameUnsubscribeButton}} mutableCopy]; SDLUnsubscribeButton* testRequest = [[SDLUnsubscribeButton alloc] initWithDictionary:dict]; expect(testRequest.buttonName).to(equal(SDLButtonNamePreset0)); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeVehicleDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeVehicleDataSpec.m index 6dd9da0a2..f538f412e 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeVehicleDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeVehicleDataSpec.m @@ -9,7 +9,8 @@ #import <Nimble/Nimble.h> #import "SDLUnsubscribeVehicleData.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" QuickSpecBegin(SDLUnsubscribeVehicleDataSpec) @@ -78,39 +79,39 @@ describe(@"Getter/Setter Tests", ^ { expect(testRequest.wiperStatus).to(equal(@YES)); }); - it(@"Should get correctly when initialized", ^ { - NSDictionary<NSString *, id> *dict = @{SDLNameRequest: - @{SDLNameParameters: - @{SDLNameAccelerationPedalPosition:@YES, - SDLNameAirbagStatus:@YES, - SDLNameBeltStatus:@YES, - SDLNameBodyInformation:@YES, - SDLNameCloudAppVehicleID:@YES, - SDLNameClusterModeStatus:@YES, - SDLNameDeviceStatus:@YES, - SDLNameDriverBraking:@YES, - SDLNameECallInfo:@YES, - SDLNameElectronicParkBrakeStatus: @YES, - SDLNameEmergencyEvent:@YES, - SDLNameEngineOilLife:@YES, - SDLNameEngineTorque:@YES, - SDLNameExternalTemperature:@YES, - SDLNameFuelLevel:@YES, - SDLNameFuelLevelState:@YES, - SDLNameFuelRange:@YES, - SDLNameGPS:@YES, - SDLNameHeadLampStatus:@YES, - SDLNameInstantFuelConsumption:@YES, - SDLNameMyKey:@YES, - SDLNameOdometer:@YES, - SDLNamePRNDL:@YES, - SDLNameRPM:@YES, - SDLNameSpeed:@YES, - SDLNameSteeringWheelAngle:@YES, - SDLNameTirePressure:@YES, - SDLNameTurnSignal:@YES, - SDLNameWiperStatus:@YES}, - SDLNameOperationName:SDLNameUnsubscribeVehicleData}}; + it(@"Should get correctly when initialized with a dictionary", ^ { + NSDictionary<NSString *, id> *dict = @{SDLRPCParameterNameRequest: + @{SDLRPCParameterNameParameters: + @{SDLRPCParameterNameAccelerationPedalPosition:@YES, + SDLRPCParameterNameAirbagStatus:@YES, + SDLRPCParameterNameBeltStatus:@YES, + SDLRPCParameterNameBodyInformation:@YES, + SDLRPCParameterNameCloudAppVehicleID:@YES, + SDLRPCParameterNameClusterModeStatus:@YES, + SDLRPCParameterNameDeviceStatus:@YES, + SDLRPCParameterNameDriverBraking:@YES, + SDLRPCParameterNameECallInfo:@YES, + SDLRPCParameterNameElectronicParkBrakeStatus: @YES, + SDLRPCParameterNameEmergencyEvent:@YES, + SDLRPCParameterNameEngineOilLife:@YES, + SDLRPCParameterNameEngineTorque:@YES, + SDLRPCParameterNameExternalTemperature:@YES, + SDLRPCParameterNameFuelLevel:@YES, + SDLRPCParameterNameFuelLevelState:@YES, + SDLRPCParameterNameFuelRange:@YES, + SDLRPCParameterNameGPS:@YES, + SDLRPCParameterNameHeadLampStatus:@YES, + SDLRPCParameterNameInstantFuelConsumption:@YES, + SDLRPCParameterNameMyKey:@YES, + SDLRPCParameterNameOdometer:@YES, + SDLRPCParameterNamePRNDL:@YES, + SDLRPCParameterNameRPM:@YES, + SDLRPCParameterNameSpeed:@YES, + SDLRPCParameterNameSteeringWheelAngle:@YES, + SDLRPCParameterNameTirePressure:@YES, + SDLRPCParameterNameTurnSignal:@YES, + SDLRPCParameterNameWiperStatus:@YES}, + SDLRPCParameterNameOperationName:SDLRPCFunctionNameUnsubscribeVehicleData}}; SDLUnsubscribeVehicleData* testRequest = [[SDLUnsubscribeVehicleData alloc] initWithDictionary:dict]; expect(testRequest.accPedalPosition).to(equal(@YES)); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUpdateTurnListSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUpdateTurnListSpec.m index 24bd699d2..1fe93731f 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUpdateTurnListSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUpdateTurnListSpec.m @@ -11,7 +11,8 @@ #import "SDLUpdateTurnList.h" #import "SDLTurn.h" #import "SDLSoftButton.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" QuickSpecBegin(SDLUpdateTurnListSpec) @@ -30,11 +31,11 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary<NSString *, id> *dict = [@{SDLNameRequest: - @{SDLNameParameters: - @{SDLNameTurnList:[@[turn] mutableCopy], - SDLNameSoftButtons:[@[button] mutableCopy]}, - SDLNameOperationName:SDLNameUpdateTurnList}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLRPCParameterNameRequest: + @{SDLRPCParameterNameParameters: + @{SDLRPCParameterNameTurnList:[@[turn] mutableCopy], + SDLRPCParameterNameSoftButtons:[@[button] mutableCopy]}, + SDLRPCParameterNameOperationName:SDLRPCFunctionNameUpdateTurnList}} mutableCopy]; SDLUpdateTurnList* testRequest = [[SDLUpdateTurnList alloc] initWithDictionary:dict]; expect(testRequest.turnList).to(equal([@[turn] mutableCopy])); diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLAddCommandResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLAddCommandResponseSpec.m index ff1f36682..cdce0363a 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLAddCommandResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLAddCommandResponseSpec.m @@ -9,7 +9,7 @@ #import <Nimble/Nimble.h> #import "SDLAddCommandResponse.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLAddCommandResponseSpec) diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLAddSubMenuResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLAddSubMenuResponseSpec.m index a351d0ee2..bc34dbec0 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLAddSubMenuResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLAddSubMenuResponseSpec.m @@ -9,8 +9,8 @@ #import <Nimble/Nimble.h> #import "SDLAddSubMenuResponse.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLAddSubMenuResponseSpec) -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLAlertManeuverResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLAlertManeuverResponseSpec.m index 5b4860134..ab4bdc999 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLAlertManeuverResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLAlertManeuverResponseSpec.m @@ -9,8 +9,8 @@ #import <Nimble/Nimble.h> #import "SDLAlertManeuverResponse.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLAlertManeuverResponseSpec) -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLAlertResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLAlertResponseSpec.m index 73cb0023c..99541d772 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLAlertResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLAlertResponseSpec.m @@ -9,7 +9,7 @@ #import <Nimble/Nimble.h> #import "SDLAlertResponse.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLAlertResponseSpec) diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLButtonPressResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLButtonPressResponseSpec.m index d9fc72fc8..824355600 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLButtonPressResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLButtonPressResponseSpec.m @@ -9,7 +9,7 @@ #import <Nimble/Nimble.h> #import "SDLButtonPressResponse.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLButtonPressResponseSpec) diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLChangeRegistrationResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLChangeRegistrationResponseSpec.m index c6e0b27d9..e130579e3 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLChangeRegistrationResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLChangeRegistrationResponseSpec.m @@ -9,8 +9,8 @@ #import <Nimble/Nimble.h> #import "SDLChangeRegistrationResponse.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLChangeRegistrationResponseSpec) -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLCreateInteractionChoiceSetResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLCreateInteractionChoiceSetResponseSpec.m index 3b3d27e90..06a66ab68 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLCreateInteractionChoiceSetResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLCreateInteractionChoiceSetResponseSpec.m @@ -9,8 +9,8 @@ #import <Nimble/Nimble.h> #import "SDLCreateInteractionChoiceSetResponse.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLCreateInteractionChoiceSetResponseSpec) -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLDeleteCommandResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLDeleteCommandResponseSpec.m index 013702513..00687d419 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLDeleteCommandResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLDeleteCommandResponseSpec.m @@ -9,8 +9,8 @@ #import <Nimble/Nimble.h> #import "SDLDeleteCommandResponse.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLDeleteCommandResponseSpec) -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLDeleteFileResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLDeleteFileResponseSpec.m index 13f68a2ea..6eb54798e 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLDeleteFileResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLDeleteFileResponseSpec.m @@ -9,7 +9,8 @@ #import <Nimble/Nimble.h> #import "SDLDeleteFileResponse.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" QuickSpecBegin(SDLDeleteFileResponseSpec) @@ -23,10 +24,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary<NSString *, id> *dict = [@{SDLNameResponse: - @{SDLNameParameters: - @{SDLNameSpaceAvailable:@0}, - SDLNameOperationName:SDLNameDeleteFile}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLRPCParameterNameResponse: + @{SDLRPCParameterNameParameters: + @{SDLRPCParameterNameSpaceAvailable:@0}, + SDLRPCParameterNameOperationName:SDLRPCFunctionNameDeleteFile}} mutableCopy]; SDLDeleteFileResponse* testResponse = [[SDLDeleteFileResponse alloc] initWithDictionary:dict]; expect(testResponse.spaceAvailable).to(equal(@0)); diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLDeleteInteractionChoiceSetResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLDeleteInteractionChoiceSetResponseSpec.m index 4f3f0c4c1..8ba0d0a0e 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLDeleteInteractionChoiceSetResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLDeleteInteractionChoiceSetResponseSpec.m @@ -9,8 +9,8 @@ #import <Nimble/Nimble.h> #import "SDLDeleteInteractionChoiceSetResponse.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLDeleteInteractionChoiceSetResponseSpec) -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLDeleteSubMenuResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLDeleteSubMenuResponseSpec.m index c17b91d1c..934bbd0ff 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLDeleteSubMenuResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLDeleteSubMenuResponseSpec.m @@ -9,8 +9,8 @@ #import <Nimble/Nimble.h> #import "SDLDeleteSubMenuResponse.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLDeleteSubMenuResponseSpec) -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLDiagnosticMessageResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLDiagnosticMessageResponseSpec.m index eac33a7da..b8efd9c97 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLDiagnosticMessageResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLDiagnosticMessageResponseSpec.m @@ -9,7 +9,8 @@ #import <Nimble/Nimble.h> #import "SDLDiagnosticMessageResponse.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" QuickSpecBegin(SDLDiagnosticMessageResponseSpec) @@ -23,10 +24,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary<NSString *, id> *dict = [@{SDLNameResponse: - @{SDLNameParameters: - @{SDLNameMessageDataResult:@[@3, @9, @27, @81]}, - SDLNameOperationName:SDLNameDiagnosticMessage}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLRPCParameterNameResponse: + @{SDLRPCParameterNameParameters: + @{SDLRPCParameterNameMessageDataResult:@[@3, @9, @27, @81]}, + SDLRPCParameterNameOperationName:SDLRPCFunctionNameDiagnosticMessage}} mutableCopy]; SDLDiagnosticMessageResponse* testResponse = [[SDLDiagnosticMessageResponse alloc] initWithDictionary:dict]; expect(testResponse.messageDataResult).to(equal(@[@3, @9, @27, @81])); diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLEncodedSyncPDataResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLEncodedSyncPDataResponseSpec.m index 4324f0bb8..f7005bc62 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLEncodedSyncPDataResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLEncodedSyncPDataResponseSpec.m @@ -9,8 +9,8 @@ #import <Nimble/Nimble.h> #import "SDLEncodedSyncPDataResponse.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLEncodedSyncPDataResponseSpec) -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLEndAudioPassThruResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLEndAudioPassThruResponseSpec.m index 5fcc7d6d8..d9afc109b 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLEndAudioPassThruResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLEndAudioPassThruResponseSpec.m @@ -9,8 +9,8 @@ #import <Nimble/Nimble.h> #import "SDLEndAudioPassThruResponse.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLEndAudioPassThruResponseSpec) -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGenericResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGenericResponseSpec.m index 227aea92d..8198bb65e 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGenericResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGenericResponseSpec.m @@ -9,8 +9,8 @@ #import <Nimble/Nimble.h> #import "SDLGenericResponse.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLGenericResponseSpec) -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetAppServiceDataResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetAppServiceDataResponseSpec.m new file mode 100644 index 000000000..53b04382b --- /dev/null +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetAppServiceDataResponseSpec.m @@ -0,0 +1,60 @@ +// +// SDLGetAppServiceDataResponseSpec.m +// SmartDeviceLinkTests +// +// Created by Nicole on 2/6/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import <Quick/Quick.h> +#import <Nimble/Nimble.h> + +#import "SDLAppServiceData.h" +#import "SDLAppServiceType.h" +#import "SDLGetAppServiceDataResponse.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" + +QuickSpecBegin(SDLGetAppServiceDataResponseSpec) + +describe(@"Getter/Setter Tests", ^{ + __block SDLAppServiceData *testAppServiceData = nil; + + beforeEach(^{ + testAppServiceData = [[SDLAppServiceData alloc] init]; + testAppServiceData.serviceType = SDLAppServiceTypeMedia; + }); + + it(@"Should set and get correctly", ^{ + SDLGetAppServiceDataResponse *testResponse = [[SDLGetAppServiceDataResponse alloc] init]; + testResponse.serviceData = testAppServiceData; + + expect(testResponse.serviceData).to(equal(testAppServiceData)); + }); + + it(@"Should get correctly when initialized with a dictionary", ^{ + NSDictionary *dict = @{SDLRPCParameterNameResponse:@{ + SDLRPCParameterNameParameters:@{ + SDLRPCParameterNameServiceData:testAppServiceData + }, + SDLRPCParameterNameOperationName:SDLRPCFunctionNameGetAppServiceData}}; + SDLGetAppServiceDataResponse *testResponse = [[SDLGetAppServiceDataResponse alloc] initWithDictionary:dict]; + + expect(testResponse.serviceData).to(equal(testAppServiceData)); + }); + + it(@"Should get correctly when initialized with initWithAppServiceData:", ^{ + SDLGetAppServiceDataResponse *testResponse = [[SDLGetAppServiceDataResponse alloc] initWithAppServiceData:testAppServiceData]; + + expect(testResponse.serviceData).to(equal(testAppServiceData)); + }); + + it(@"Should return nil if not set", ^{ + SDLGetAppServiceDataResponse *testResponse = [[SDLGetAppServiceDataResponse alloc] init]; + + expect(testResponse.serviceData).to(beNil()) + ; + }); +}); + +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetDTCsResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetDTCsResponseSpec.m index d22e8fd1b..5c6ea8658 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetDTCsResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetDTCsResponseSpec.m @@ -9,7 +9,8 @@ #import <Nimble/Nimble.h> #import "SDLGetDTCsResponse.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" QuickSpecBegin(SDLGetDTCsResponseSpec) @@ -25,11 +26,11 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary<NSString *, id> *dict = [@{SDLNameResponse: - @{SDLNameParameters: - @{SDLNameECUHeader:@404, - SDLNameDTC:[@[@"FFFF", @"FFFE", @"FFFD"] mutableCopy]}, - SDLNameOperationName:SDLNameGetDTCs}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLRPCParameterNameResponse: + @{SDLRPCParameterNameParameters: + @{SDLRPCParameterNameECUHeader:@404, + SDLRPCParameterNameDTC:[@[@"FFFF", @"FFFE", @"FFFD"] mutableCopy]}, + SDLRPCParameterNameOperationName:SDLRPCFunctionNameGetDTCs}} mutableCopy]; SDLGetDTCsResponse* testResponse = [[SDLGetDTCsResponse alloc] initWithDictionary:dict]; expect(testResponse.ecuHeader).to(equal(@404)); diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetFileResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetFileResponseSpec.m new file mode 100644 index 000000000..04bc119be --- /dev/null +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetFileResponseSpec.m @@ -0,0 +1,81 @@ +// +// SDLGetFileResponseSpec.m +// SmartDeviceLinkTests +// +// Created by Nicole on 2/7/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import <Quick/Quick.h> +#import <Nimble/Nimble.h> + +#import "SDLFileType.h" +#import "SDLGetFileResponse.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" + +QuickSpecBegin(SDLGetFileResponseSpec) + +describe(@"Getter/Setter Tests", ^{ + __block int testOffset = 34; + __block int testLength = 2; + __block SDLFileType testFileType = nil; + __block int testCrc = 2267295; + + beforeEach(^{ + testFileType = SDLFileTypeJPEG; + }); + + it(@"Should set and get correctly", ^{ + SDLGetFileResponse *testResponse = [[SDLGetFileResponse alloc] init]; + testResponse.offset = @(testOffset); + testResponse.length = @(testLength); + testResponse.fileType = testFileType; + testResponse.crc = @(testCrc); + + expect(testResponse.offset).to(equal(testOffset)); + expect(testResponse.length).to(equal(testLength)); + expect(testResponse.fileType).to(equal(testFileType)); + expect(testResponse.crc).to(equal(testCrc)); + }); + + it(@"Should get correctly when initialized with a dictionary", ^{ + NSDictionary *dict = @{SDLRPCParameterNameResponse:@{ + SDLRPCParameterNameParameters:@{ + SDLRPCParameterNameOffset:@(testOffset), + SDLRPCParameterNameLength:@(testLength), + SDLRPCParameterNameFileType:testFileType, + SDLRPCParameterNameCRC:@(testCrc) + }, + SDLRPCParameterNameOperationName:SDLRPCFunctionNameGetFile}}; + SDLGetFileResponse *testResponse = [[SDLGetFileResponse alloc] initWithDictionary:dict]; + + expect(testResponse.offset).to(equal(testOffset)); + expect(testResponse.length).to(equal(testLength)); + expect(testResponse.fileType).to(equal(testFileType)); + expect(testResponse.crc).to(equal(testCrc)); + }); + + it(@"Should get correctly when initialized with initWithOffset:length:fileType:crc:", ^{ + SDLGetFileResponse *testResponse = [[SDLGetFileResponse alloc] initWithOffset:testOffset length:testLength fileType:testFileType crc:testCrc]; + + expect(testResponse.offset).to(equal(testOffset)); + expect(testResponse.length).to(equal(testLength)); + expect(testResponse.fileType).to(equal(testFileType)); + expect(testResponse.crc).to(equal(testCrc)); + }); + + it(@"Should return nil if not set", ^{ + SDLGetFileResponse *testResponse = [[SDLGetFileResponse alloc] init]; + + expect(testResponse.offset).to(beNil()); + expect(testResponse.length).to(beNil()); + expect(testResponse.fileType).to(beNil()); + expect(testResponse.crc).to(beNil()); + }); +}); + +QuickSpecEnd + + + diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetInteriorVehicleDataResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetInteriorVehicleDataResponseSpec.m index 7878eedce..7541d2625 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetInteriorVehicleDataResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetInteriorVehicleDataResponseSpec.m @@ -10,7 +10,8 @@ #import "SDLGetInteriorVehicleDataResponse.h" #import "SDLModuleData.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" QuickSpecBegin(SDLGetInteriorVehicleDataResponseSpec) @@ -34,11 +35,11 @@ describe(@"Getter/Setter Tests", ^ { it(@"Should get correctly when initialized", ^ { - NSMutableDictionary<NSString *, id> *dict = [@{SDLNameResponse: - @{SDLNameParameters: - @{SDLNameModuleData:someModuleData, - SDLNameIsSubscribed:@NO}, - SDLNameOperationName:SDLNameGetInteriorVehicleData}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLRPCParameterNameResponse: + @{SDLRPCParameterNameParameters: + @{SDLRPCParameterNameModuleData:someModuleData, + SDLRPCParameterNameIsSubscribed:@NO}, + SDLRPCParameterNameOperationName:SDLRPCFunctionNameGetInteriorVehicleData}} mutableCopy]; SDLGetInteriorVehicleDataResponse* testResponse = [[SDLGetInteriorVehicleDataResponse alloc] initWithDictionary:dict]; expect(testResponse.moduleData).to(equal(someModuleData)); diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetSystemCapabilityResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetSystemCapabilityResponseSpec.m index a7f6ed74f..54d9c561e 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetSystemCapabilityResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetSystemCapabilityResponseSpec.m @@ -5,7 +5,8 @@ #import "SDLGetSystemCapabilityResponse.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" #import "SDLNavigationCapability.h" #import "SDLSystemCapability.h" #import "SDLSystemCapabilityType.h" @@ -27,12 +28,17 @@ describe(@"Getter/Setter Tests", ^ { describe(@"Initialization tests", ^{ it(@"Should get correctly when initialized with a dictionary", ^ { - NSDictionary *dict = @{SDLNameResponse: @{ - SDLNameParameters: @{ - SDLNameSystemCapability: @{SDLNameSystemCapabilityType: @"NAVIGATION", - SDLNameNavigationCapability: @{SDLNameGetWayPointsEnabled: @(NO), - SDLNameSendLocationEnabled: @(YES)}} - } + NSDictionary *dict = @{ + SDLRPCParameterNameResponse: @{ + SDLRPCParameterNameParameters: @{ + SDLRPCParameterNameSystemCapability: @{ + SDLRPCParameterNameSystemCapabilityType: @"NAVIGATION", + SDLRPCParameterNameNavigationCapability: @{ + SDLRPCParameterNameGetWayPointsEnabled: @(NO), + SDLRPCParameterNameSendLocationEnabled: @(YES)} + } + }, + SDLRPCParameterNameOperationName:SDLRPCFunctionNameGetSystemCapability } }; SDLGetSystemCapabilityResponse *testResponse = [[SDLGetSystemCapabilityResponse alloc] initWithDictionary:dict]; @@ -41,6 +47,7 @@ describe(@"Initialization tests", ^{ expect(testResponse.systemCapability.navigationCapability.sendLocationEnabled).to(equal(YES)); expect(testResponse.systemCapability.navigationCapability.getWayPointsEnabled).to(equal(NO)); expect(testResponse.systemCapability.phoneCapability).to(beNil()); + expect(testResponse.name).to(equal(SDLRPCFunctionNameGetSystemCapability)); }); it(@"Should return nil if not set", ^ { diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetVehicleDataResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetVehicleDataResponseSpec.m index e844bc02f..02ac2ab85 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetVehicleDataResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetVehicleDataResponseSpec.m @@ -9,7 +9,8 @@ #import <Nimble/Nimble.h> #import "SmartDeviceLink.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" QuickSpecBegin(SDLGetVehicleDataResponseSpec) @@ -114,40 +115,40 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameNotification: - @{SDLNameParameters: + NSMutableDictionary* dict = [@{SDLRPCParameterNameNotification: + @{SDLRPCParameterNameParameters: @{ - SDLNameAccelerationPedalPosition:@0, - SDLNameAirbagStatus:airbag, - SDLNameBeltStatus:belt, - SDLNameBodyInformation:body, - SDLNameCloudAppVehicleID:cloudAppVehicleID, - SDLNameClusterModeStatus:clusterMode, - SDLNameDeviceStatus:device, - SDLNameDriverBraking:SDLVehicleDataEventStatusNoEvent, - SDLNameECallInfo:eCall, - SDLNameElectronicParkBrakeStatus:SDLElectronicParkBrakeStatusDriveActive, - SDLNameEmergencyEvent:event, - SDLNameEngineOilLife:@23.22, - SDLNameEngineTorque:@630.4, - SDLNameExternalTemperature:@0, - SDLNameFuelLevel:@99.9999, - SDLNameFuelLevelState:SDLComponentVolumeStatusFault, - SDLNameFuelRange:@[fuelRange], - SDLNameGPS:gps, - SDLNameHeadLampStatus:headLamp, - SDLNameInstantFuelConsumption:@40.7, - SDLNameMyKey:myKey, - SDLNameOdometer:@70000, - SDLNamePRNDL:SDLPRNDLPark, - SDLNameRPM:@3, - SDLNameSpeed:@100, - SDLNameSteeringWheelAngle:@-1500, - SDLNameTirePressure:tires, - SDLNameTurnSignal:SDLTurnSignalOff, - SDLNameVIN:vin, - SDLNameWiperStatus:SDLWiperStatusAutomaticHigh}, - SDLNameOperationName:SDLNameGetVehicleData}} mutableCopy]; + SDLRPCParameterNameAccelerationPedalPosition:@0, + SDLRPCParameterNameAirbagStatus:airbag, + SDLRPCParameterNameBeltStatus:belt, + SDLRPCParameterNameBodyInformation:body, + SDLRPCParameterNameCloudAppVehicleID:cloudAppVehicleID, + SDLRPCParameterNameClusterModeStatus:clusterMode, + SDLRPCParameterNameDeviceStatus:device, + SDLRPCParameterNameDriverBraking:SDLVehicleDataEventStatusNoEvent, + SDLRPCParameterNameECallInfo:eCall, + SDLRPCParameterNameElectronicParkBrakeStatus:SDLElectronicParkBrakeStatusDriveActive, + SDLRPCParameterNameEmergencyEvent:event, + SDLRPCParameterNameEngineOilLife:@23.22, + SDLRPCParameterNameEngineTorque:@630.4, + SDLRPCParameterNameExternalTemperature:@0, + SDLRPCParameterNameFuelLevel:@99.9999, + SDLRPCParameterNameFuelLevelState:SDLComponentVolumeStatusFault, + SDLRPCParameterNameFuelRange:@[fuelRange], + SDLRPCParameterNameGPS:gps, + SDLRPCParameterNameHeadLampStatus:headLamp, + SDLRPCParameterNameInstantFuelConsumption:@40.7, + SDLRPCParameterNameMyKey:myKey, + SDLRPCParameterNameOdometer:@70000, + SDLRPCParameterNamePRNDL:SDLPRNDLPark, + SDLRPCParameterNameRPM:@3, + SDLRPCParameterNameSpeed:@100, + SDLRPCParameterNameSteeringWheelAngle:@-1500, + SDLRPCParameterNameTirePressure:tires, + SDLRPCParameterNameTurnSignal:SDLTurnSignalOff, + SDLRPCParameterNameVIN:@"6574839201", + SDLRPCParameterNameWiperStatus:SDLWiperStatusAutomaticHigh}, + SDLRPCParameterNameOperationName:SDLRPCFunctionNameGetVehicleData}} mutableCopy]; SDLGetVehicleDataResponse* testResponse = [[SDLGetVehicleDataResponse alloc] initWithDictionary:dict]; expect(testResponse.accPedalPosition).to(equal(@0)); diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetWaypointsResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetWaypointsResponseSpec.m index 9b5f0b873..c54acf9fa 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetWaypointsResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetWaypointsResponseSpec.m @@ -11,7 +11,7 @@ #import "SDLImage.h" #import "SDLLocationCoordinate.h" #import "SDLLocationDetails.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" #import "SDLOasisAddress.h" QuickSpecBegin(SDLGetWaypointsResponseSpec) @@ -63,9 +63,9 @@ describe(@"Getter/Setter Tests", ^ { someWaypoints = @[someLocation]; - NSDictionary *initDict = @{SDLNameResponse : @{ - SDLNameParameters: @{ - SDLNameWayPoints: someWaypoints + NSDictionary *initDict = @{SDLRPCParameterNameResponse : @{ + SDLRPCParameterNameParameters: @{ + SDLRPCParameterNameWayPoints: someWaypoints } } }; @@ -83,8 +83,8 @@ describe(@"Getter/Setter Tests", ^ { context(@"when parameters are not set", ^{ beforeEach(^{ NSDictionary *initDict = @{ - SDLNameRequest: @{ - SDLNameParameters: @{} + SDLRPCParameterNameRequest: @{ + SDLRPCParameterNameParameters: @{} } }; diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLListFilesResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLListFilesResponseSpec.m index 9cc6571a5..02ab663c8 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLListFilesResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLListFilesResponseSpec.m @@ -9,7 +9,8 @@ #import <Nimble/Nimble.h> #import "SDLListFilesResponse.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" QuickSpecBegin(SDLListFilesResponseSpec) @@ -25,11 +26,11 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary<NSString *, id> *dict = [@{SDLNameResponse: - @{SDLNameParameters: - @{SDLNameFilenames:[@[@"Music/music.mp3", @"Documents/document.txt", @"Downloads/format.exe"] mutableCopy], - SDLNameSpaceAvailable:@500000000}, - SDLNameOperationName:SDLNameListFiles}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLRPCParameterNameResponse: + @{SDLRPCParameterNameParameters: + @{SDLRPCParameterNameFilenames:[@[@"Music/music.mp3", @"Documents/document.txt", @"Downloads/format.exe"] mutableCopy], + SDLRPCParameterNameSpaceAvailable:@500000000}, + SDLRPCParameterNameOperationName:SDLRPCFunctionNameListFiles}} mutableCopy]; SDLListFilesResponse* testResponse = [[SDLListFilesResponse alloc] initWithDictionary:dict]; expect(testResponse.filenames).to(equal([@[@"Music/music.mp3", @"Documents/document.txt", @"Downloads/format.exe"] mutableCopy])); diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLPerformAppServiceInteractionResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLPerformAppServiceInteractionResponseSpec.m new file mode 100644 index 000000000..9ac23a78f --- /dev/null +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLPerformAppServiceInteractionResponseSpec.m @@ -0,0 +1,56 @@ +// +// SDLPerformAppServiceInteractionResponseSpec.m +// SmartDeviceLinkTests +// +// Created by Nicole on 2/6/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import <Quick/Quick.h> +#import <Nimble/Nimble.h> + +#import "SDLPerformAppServiceInteractionResponse.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" + +QuickSpecBegin(SDLPerformAppServiceInteractionResponseSpec) + +describe(@"Getter/Setter Tests", ^{ + __block NSString *testServiceSpecificResult = nil; + + beforeEach(^{ + testServiceSpecificResult = @"testServiceSpecificResult"; + }); + + it(@"Should set and get correctly", ^{ + SDLPerformAppServiceInteractionResponse *testResponse = [[SDLPerformAppServiceInteractionResponse alloc] init]; + testResponse.serviceSpecificResult = testServiceSpecificResult; + + expect(testResponse.serviceSpecificResult).to(equal(testServiceSpecificResult)); + }); + + it(@"Should get correctly when initialized with a dictionary", ^{ + NSDictionary *dict = @{SDLRPCParameterNameResponse:@{ + SDLRPCParameterNameParameters:@{ + SDLRPCParameterNameServiceSpecificResult:testServiceSpecificResult + }, + SDLRPCParameterNameOperationName:SDLRPCFunctionNamePublishAppService}}; + SDLPerformAppServiceInteractionResponse *testResponse = [[SDLPerformAppServiceInteractionResponse alloc] initWithDictionary:dict]; + + expect(testResponse.serviceSpecificResult).to(equal(testServiceSpecificResult)); + }); + + it(@"Should get correctly when initialized with initWithServiceSpecificResult:", ^{ + SDLPerformAppServiceInteractionResponse *testResponse = [[SDLPerformAppServiceInteractionResponse alloc] initWithServiceSpecificResult:testServiceSpecificResult]; + + expect(testResponse.serviceSpecificResult).to(equal(testServiceSpecificResult)); + }); + + it(@"Should return nil if not set", ^{ + SDLPerformAppServiceInteractionResponse *testResponse = [[SDLPerformAppServiceInteractionResponse alloc] init]; + + expect(testResponse.serviceSpecificResult).to(beNil()); + }); +}); + +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLPerformAudioPassThruResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLPerformAudioPassThruResponseSpec.m index eb661c3f2..9101fc39e 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLPerformAudioPassThruResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLPerformAudioPassThruResponseSpec.m @@ -9,8 +9,8 @@ #import <Nimble/Nimble.h> #import "SDLPerformAudioPassThruResponse.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLPerformAudioPassThruResponseSpec) -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLPerformInteractionResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLPerformInteractionResponseSpec.m index fc2219356..832ed3e44 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLPerformInteractionResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLPerformInteractionResponseSpec.m @@ -9,7 +9,8 @@ #import <Nimble/Nimble.h> #import "SDLPerformInteractionResponse.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" #import "SDLTriggerSource.h" @@ -29,12 +30,12 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameResponse: - @{SDLNameParameters: - @{SDLNameChoiceId:@25, - SDLNameManualTextEntry:@"entry", - SDLNameTriggerSource:SDLTriggerSourceKeyboard}, - SDLNameOperationName:SDLNamePerformInteraction}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLRPCParameterNameResponse: + @{SDLRPCParameterNameParameters: + @{SDLRPCParameterNameChoiceId:@25, + SDLRPCParameterNameManualTextEntry:@"entry", + SDLRPCParameterNameTriggerSource:SDLTriggerSourceKeyboard}, + SDLRPCParameterNameOperationName:SDLRPCFunctionNamePerformInteraction}} mutableCopy]; SDLPerformInteractionResponse* testResponse = [[SDLPerformInteractionResponse alloc] initWithDictionary:dict]; expect(testResponse.choiceID).to(equal(@25)); diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLPublishAppServiceResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLPublishAppServiceResponseSpec.m new file mode 100644 index 000000000..7c3e84317 --- /dev/null +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLPublishAppServiceResponseSpec.m @@ -0,0 +1,60 @@ +// +// SDLPublishAppServiceResponseSpec.m +// SmartDeviceLinkTests +// +// Created by Nicole on 2/5/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import <Quick/Quick.h> +#import <Nimble/Nimble.h> + +#import "SDLPublishAppServiceResponse.h" +#import "SDLAppServiceRecord.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" + +QuickSpecBegin(SDLPublishAppServiceResponseSpec) + +describe(@"Getter/Setter Tests", ^{ + __block SDLAppServiceRecord *testAppServiceRecord = nil; + + beforeEach(^{ + testAppServiceRecord = [[SDLAppServiceRecord alloc] init]; + testAppServiceRecord.serviceID = @"testServiceId"; + }); + + it(@"Should set and get correctly", ^{ + SDLPublishAppServiceResponse *testResponse = [[SDLPublishAppServiceResponse alloc] init]; + testResponse.appServiceRecord = testAppServiceRecord; + + expect(testResponse.appServiceRecord).to(equal(testAppServiceRecord)); + }); + + it(@"Should get correctly when initialized with a dictionary", ^{ + NSDictionary *dict = @{SDLRPCParameterNameResponse:@{ + SDLRPCParameterNameParameters:@{ + SDLRPCParameterNameAppServiceRecord:testAppServiceRecord + }, + SDLRPCParameterNameOperationName:SDLRPCFunctionNamePublishAppService}}; + SDLPublishAppServiceResponse *testResponse = [[SDLPublishAppServiceResponse alloc] initWithDictionary:dict]; + + expect(testResponse.appServiceRecord).to(equal(testAppServiceRecord)); + }); + + it(@"Should get correctly when initialized with initWithAppServiceRecord:", ^{ + SDLPublishAppServiceResponse *testResponse = [[SDLPublishAppServiceResponse alloc] initWithAppServiceRecord:testAppServiceRecord]; + + expect(testResponse.appServiceRecord).to(equal(testAppServiceRecord)); + }); + + it(@"Should return nil if not set", ^{ + SDLPublishAppServiceResponse *testResponse = [[SDLPublishAppServiceResponse alloc] init]; + + expect(testResponse.appServiceRecord).to(beNil()); + }); +}); + +QuickSpecEnd + + diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLPutFileResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLPutFileResponseSpec.m index 9fb2f42ad..347be0314 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLPutFileResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLPutFileResponseSpec.m @@ -9,7 +9,8 @@ #import <Nimble/Nimble.h> #import "SDLPutFileResponse.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" QuickSpecBegin(SDLPutFileResponseSpec) @@ -23,11 +24,11 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSDictionary<NSString *, id> *dict = @{SDLNameResponse: - @{SDLNameParameters: - @{SDLNameSpaceAvailable:@1248, + NSDictionary<NSString *, id> *dict = @{SDLRPCParameterNameResponse: + @{SDLRPCParameterNameParameters: + @{SDLRPCParameterNameSpaceAvailable:@1248, }, - SDLNameOperationName:SDLNamePutFile}}; + SDLRPCParameterNameOperationName:SDLRPCFunctionNamePutFile}}; SDLPutFileResponse* testResponse = [[SDLPutFileResponse alloc] initWithDictionary:dict]; expect(testResponse.spaceAvailable).to(equal(@1248)); diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLReadDIDResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLReadDIDResponseSpec.m index e8432243a..1ecc59fc9 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLReadDIDResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLReadDIDResponseSpec.m @@ -10,7 +10,8 @@ #import "SDLReadDIDResponse.h" #import "SDLDIDResult.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" QuickSpecBegin(SDLReadDIDResponseSpec) @@ -26,10 +27,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary<NSString *, id> *dict = [@{SDLNameResponse: - @{SDLNameParameters: - @{SDLNameDIDResult:[@[result] mutableCopy]}, - SDLNameOperationName:SDLNameReadDID}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLRPCParameterNameResponse: + @{SDLRPCParameterNameParameters: + @{SDLRPCParameterNameDIDResult:[@[result] mutableCopy]}, + SDLRPCParameterNameOperationName:SDLRPCFunctionNameReadDID}} mutableCopy]; SDLReadDIDResponse* testResponse = [[SDLReadDIDResponse alloc] initWithDictionary:dict]; expect(testResponse.didResult).to(equal([@[result] mutableCopy])); diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLRegisterAppInterfaceResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLRegisterAppInterfaceResponseSpec.m index 9a4854fcc..5610dea06 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLRegisterAppInterfaceResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLRegisterAppInterfaceResponseSpec.m @@ -9,7 +9,8 @@ #import <Nimble/Nimble.h> #import "SmartDeviceLink.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" QuickSpecBegin(SDLRegisterAppInterfaceResponseSpec) @@ -69,29 +70,29 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSDictionary *dict = @{SDLNameRequest: - @{SDLNameParameters: - @{SDLNameSyncMessageVersion:version, - SDLNameLanguage:SDLLanguageEsMx, - SDLNameHMIDisplayLanguage:SDLLanguageRuRu, - SDLNameDisplayCapabilities:info, - SDLNameButtonCapabilities:@[button], - SDLNameSoftButtonCapabilities:@[softButton], - SDLNamePresetBankCapabilities:presetBank, - SDLNameHMIZoneCapabilities:@[SDLHMIZoneCapabilitiesBack, SDLHMIZoneCapabilitiesFront], - SDLNameSpeechCapabilities:@[SDLSpeechCapabilitiesSAPIPhonemes, SDLSpeechCapabilitiesSilence], - SDLNameVRCapabilities:@[SDLVRCapabilitiesText], - SDLNameAudioPassThruCapabilities:@[audioPassThru], - SDLNamePCMStreamCapabilities: audioPassThru, - SDLNameVehicleType:vehicle, - SDLNamePrerecordedSpeech:@[SDLPrerecordedSpeechListen, SDLPrerecordedSpeechHelp], - SDLNameSupportedDiagnosticModes:@[@67, @99, @111], - SDLNameHMICapabilities: hmiCapabilities, - SDLNameSDLVersion: @"sdlVersion", - SDLNameSystemSoftwareVersion: @"systemSoftwareVersion", - SDLNameIconResumed: @YES, + NSDictionary *dict = @{SDLRPCParameterNameRequest: + @{SDLRPCParameterNameParameters: + @{SDLRPCParameterNameSyncMessageVersion:version, + SDLRPCParameterNameLanguage:SDLLanguageEsMx, + SDLRPCParameterNameHMIDisplayLanguage:SDLLanguageRuRu, + SDLRPCParameterNameDisplayCapabilities:info, + SDLRPCParameterNameButtonCapabilities:@[button], + SDLRPCParameterNameSoftButtonCapabilities:@[softButton], + SDLRPCParameterNamePresetBankCapabilities:presetBank, + SDLRPCParameterNameHMIZoneCapabilities:@[SDLHMIZoneCapabilitiesBack, SDLHMIZoneCapabilitiesFront], + SDLRPCParameterNameSpeechCapabilities:@[SDLSpeechCapabilitiesSAPIPhonemes, SDLSpeechCapabilitiesSilence], + SDLRPCParameterNameVRCapabilities:@[SDLVRCapabilitiesText], + SDLRPCParameterNameAudioPassThruCapabilities:@[audioPassThru], + SDLRPCParameterNamePCMStreamCapabilities: audioPassThru, + SDLRPCParameterNameVehicleType:vehicle, + SDLRPCParameterNamePrerecordedSpeech:@[SDLPrerecordedSpeechListen, SDLPrerecordedSpeechHelp], + SDLRPCParameterNameSupportedDiagnosticModes:@[@67, @99, @111], + SDLRPCParameterNameHMICapabilities: hmiCapabilities, + SDLRPCParameterNameSDLVersion: @"sdlVersion", + SDLRPCParameterNameSystemSoftwareVersion: @"systemSoftwareVersion", + SDLRPCParameterNameIconResumed: @YES, }, - SDLNameOperationName:SDLNameRegisterAppInterface}}; + SDLRPCParameterNameOperationName:SDLRPCFunctionNameRegisterAppInterface}}; SDLRegisterAppInterfaceResponse* testResponse = [[SDLRegisterAppInterfaceResponse alloc] initWithDictionary:dict]; expect(testResponse.syncMsgVersion).to(equal(version)); diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLResetGlobalPropertiesResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLResetGlobalPropertiesResponseSpec.m index fb9b4a2ed..95286de9c 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLResetGlobalPropertiesResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLResetGlobalPropertiesResponseSpec.m @@ -9,8 +9,8 @@ #import <Nimble/Nimble.h> #import "SDLResetGlobalPropertiesResponse.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLResetGlobalPropertiesResponseSpec) -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLScrollableMessageResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLScrollableMessageResponseSpec.m index 5cebb0229..662b508e9 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLScrollableMessageResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLScrollableMessageResponseSpec.m @@ -9,8 +9,8 @@ #import <Nimble/Nimble.h> #import "SDLScrollableMessageResponse.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLScrollableMessageResponseSpec) -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSendHapticDataResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSendHapticDataResponseSpec.m index 29be138ad..6f6993125 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSendHapticDataResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSendHapticDataResponseSpec.m @@ -11,7 +11,7 @@ #import <Quick/Quick.h> #import <Nimble/Nimble.h> -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" #import "SDLSendHapticDataResponse.h" QuickSpecBegin(SDLSendHapticDataResponseSpec) diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSetAppIconResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSetAppIconResponseSpec.m index 44593a080..eec77c545 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSetAppIconResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSetAppIconResponseSpec.m @@ -9,7 +9,7 @@ #import <Nimble/Nimble.h> #import "SDLSetAppIconResponse.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLSetAppIconResponseSpec) diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSetDisplayLayoutResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSetDisplayLayoutResponseSpec.m index 29b589eef..41e36b842 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSetDisplayLayoutResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSetDisplayLayoutResponseSpec.m @@ -10,7 +10,8 @@ #import "SDLButtonCapabilities.h" #import "SDLDisplayCapabilities.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" #import "SDLPresetBankCapabilities.h" #import "SDLSetDisplayLayoutResponse.h" #import "SDLSoftButtonCapabilities.h" @@ -39,13 +40,13 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary<NSString *, id> *dict = [@{SDLNameRequest: - @{SDLNameParameters: - @{SDLNameDisplayCapabilities:info, - SDLNameButtonCapabilities:[@[button] mutableCopy], - SDLNameSoftButtonCapabilities:[@[softButton] mutableCopy], - SDLNamePresetBankCapabilities:presetBank}, - SDLNameOperationName:SDLNameSetDisplayLayout}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLRPCParameterNameRequest: + @{SDLRPCParameterNameParameters: + @{SDLRPCParameterNameDisplayCapabilities:info, + SDLRPCParameterNameButtonCapabilities:[@[button] mutableCopy], + SDLRPCParameterNameSoftButtonCapabilities:[@[softButton] mutableCopy], + SDLRPCParameterNamePresetBankCapabilities:presetBank}, + SDLRPCParameterNameOperationName:SDLRPCFunctionNameSetDisplayLayout}} mutableCopy]; SDLSetDisplayLayoutResponse* testResponse = [[SDLSetDisplayLayoutResponse alloc] initWithDictionary:dict]; expect(testResponse.displayCapabilities).to(equal(info)); diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSetGlobalPropertiesResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSetGlobalPropertiesResponseSpec.m index 80a5f47ec..5ed1eb45c 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSetGlobalPropertiesResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSetGlobalPropertiesResponseSpec.m @@ -9,7 +9,7 @@ #import <Nimble/Nimble.h> #import "SDLSetGlobalPropertiesResponse.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLSetGlobalPropertiesResponseSpec) diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSetInteriorVehicleDataResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSetInteriorVehicleDataResponseSpec.m index a41210e91..cbb26be8b 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSetInteriorVehicleDataResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSetInteriorVehicleDataResponseSpec.m @@ -10,7 +10,8 @@ #import "SDLSetInteriorVehicleDataResponse.h" #import "SDLModuleData.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" QuickSpecBegin(SDLSetInteriorVehicleDataResponseSpec) @@ -31,10 +32,10 @@ describe(@"Getter/Setter Tests", ^ { it(@"Should get correctly when initialized", ^ { - NSMutableDictionary<NSString *, id> *dict = [@{SDLNameResponse: - @{SDLNameParameters: - @{SDLNameModuleData:someModuleData}, - SDLNameOperationName:SDLNameSetInteriorVehicleData}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLRPCParameterNameResponse: + @{SDLRPCParameterNameParameters: + @{SDLRPCParameterNameModuleData:someModuleData}, + SDLRPCParameterNameOperationName:SDLRPCFunctionNameSetInteriorVehicleData}} mutableCopy]; SDLSetInteriorVehicleDataResponse* testResponse = [[SDLSetInteriorVehicleDataResponse alloc] initWithDictionary:dict]; expect(testResponse.moduleData).to(equal(someModuleData)); diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSetMediaClockTimerResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSetMediaClockTimerResponseSpec.m index e840213d6..dfc0abdf2 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSetMediaClockTimerResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSetMediaClockTimerResponseSpec.m @@ -9,7 +9,7 @@ #import <Nimble/Nimble.h> #import "SDLSetMediaClockTimerResponse.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLSetMediaClockTimerResponseSpec) diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLShowConstantTBTResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLShowConstantTBTResponseSpec.m index 1bd2c57cd..d7ca02d43 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLShowConstantTBTResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLShowConstantTBTResponseSpec.m @@ -9,7 +9,7 @@ #import <Nimble/Nimble.h> #import "SDLShowConstantTBTResponse.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLShowConstantTBTResponseSpec) diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLShowResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLShowResponseSpec.m index bbfa524c0..23ae97f4d 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLShowResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLShowResponseSpec.m @@ -9,7 +9,7 @@ #import <Nimble/Nimble.h> #import "SDLShowResponse.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLShowResponseSpec) diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSliderResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSliderResponseSpec.m index b7dce33cb..bddbb04a4 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSliderResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSliderResponseSpec.m @@ -10,7 +10,8 @@ #import "SDLSliderResponse.h" #import "SDLDIDResult.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" QuickSpecBegin(SDLSliderResponseSpec) @@ -24,10 +25,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary<NSString *, id> *dict = [@{SDLNameResponse: - @{SDLNameParameters: - @{SDLNameSliderPosition:@13}, - SDLNameOperationName:SDLNameSlider}} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLRPCParameterNameResponse: + @{SDLRPCParameterNameParameters: + @{SDLRPCParameterNameSliderPosition:@13}, + SDLRPCParameterNameOperationName:SDLRPCFunctionNameSlider}} mutableCopy]; SDLSliderResponse* testResponse = [[SDLSliderResponse alloc] initWithDictionary:dict]; expect(testResponse.sliderPosition).to(equal(@13)); diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSpeakResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSpeakResponseSpec.m index 688e8f34c..dd3264265 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSpeakResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSpeakResponseSpec.m @@ -9,7 +9,7 @@ #import <Nimble/Nimble.h> #import "SDLSpeakResponse.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLSpeakResponseSpec) diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeButtonResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeButtonResponseSpec.m index 5e78d95ed..e97276a4a 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeButtonResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeButtonResponseSpec.m @@ -9,8 +9,8 @@ #import <Nimble/Nimble.h> #import "SDLSubscribeButtonResponse.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLSubscribeButtonResponseSpec) -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m index 8ea1c9107..fa3f163a4 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m @@ -8,7 +8,8 @@ #import <Quick/Quick.h> #import <Nimble/Nimble.h> -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" #import "SDLSubscribeVehicleDataResponse.h" #import "SDLVehicleDataResult.h" @@ -83,38 +84,38 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSDictionary<NSString *, id> *dict = @{SDLNameResponse: - @{SDLNameParameters: - @{SDLNameAccelerationPedalPosition:vehicleDataResult, - SDLNameAirbagStatus:vehicleDataResult, - SDLNameBeltStatus:vehicleDataResult, - SDLNameBodyInformation:vehicleDataResult, - SDLNameCloudAppVehicleID:vehicleDataResult, - SDLNameClusterModes:vehicleDataResult, - SDLNameDeviceStatus:vehicleDataResult, - SDLNameDriverBraking:vehicleDataResult, - SDLNameECallInfo:vehicleDataResult, - SDLNameElectronicParkBrakeStatus:vehicleDataResult, - SDLNameEmergencyEvent:vehicleDataResult, - SDLNameEngineOilLife:vehicleDataResult, - SDLNameEngineTorque:vehicleDataResult, - SDLNameExternalTemperature:vehicleDataResult, - SDLNameFuelLevel:vehicleDataResult, - SDLNameFuelLevelState:vehicleDataResult, - SDLNameFuelRange:vehicleDataResult, - SDLNameGPS:vehicleDataResult, - SDLNameHeadLampStatus:vehicleDataResult, - SDLNameInstantFuelConsumption:vehicleDataResult, - SDLNameMyKey:vehicleDataResult, - SDLNameOdometer:vehicleDataResult, - SDLNamePRNDL:vehicleDataResult, - SDLNameRPM:vehicleDataResult, - SDLNameSpeed:vehicleDataResult, - SDLNameSteeringWheelAngle:vehicleDataResult, - SDLNameTirePressure:vehicleDataResult, - SDLNameTurnSignal:vehicleDataResult, - SDLNameWiperStatus:vehicleDataResult}, - SDLNameOperationName:SDLNameSubscribeVehicleData}}; + NSDictionary<NSString *, id> *dict = @{SDLRPCParameterNameResponse: + @{SDLRPCParameterNameParameters: + @{SDLRPCParameterNameAccelerationPedalPosition:vehicleDataResult, + SDLRPCParameterNameAirbagStatus:vehicleDataResult, + SDLRPCParameterNameBeltStatus:vehicleDataResult, + SDLRPCParameterNameBodyInformation:vehicleDataResult, + SDLRPCParameterNameCloudAppVehicleID:vehicleDataResult, + SDLRPCParameterNameClusterModes:vehicleDataResult, + SDLRPCParameterNameDeviceStatus:vehicleDataResult, + SDLRPCParameterNameDriverBraking:vehicleDataResult, + SDLRPCParameterNameECallInfo:vehicleDataResult, + SDLRPCParameterNameElectronicParkBrakeStatus:vehicleDataResult, + SDLRPCParameterNameEmergencyEvent:vehicleDataResult, + SDLRPCParameterNameEngineOilLife:vehicleDataResult, + SDLRPCParameterNameEngineTorque:vehicleDataResult, + SDLRPCParameterNameExternalTemperature:vehicleDataResult, + SDLRPCParameterNameFuelLevel:vehicleDataResult, + SDLRPCParameterNameFuelLevelState:vehicleDataResult, + SDLRPCParameterNameFuelRange:vehicleDataResult, + SDLRPCParameterNameGPS:vehicleDataResult, + SDLRPCParameterNameHeadLampStatus:vehicleDataResult, + SDLRPCParameterNameInstantFuelConsumption:vehicleDataResult, + SDLRPCParameterNameMyKey:vehicleDataResult, + SDLRPCParameterNameOdometer:vehicleDataResult, + SDLRPCParameterNamePRNDL:vehicleDataResult, + SDLRPCParameterNameRPM:vehicleDataResult, + SDLRPCParameterNameSpeed:vehicleDataResult, + SDLRPCParameterNameSteeringWheelAngle:vehicleDataResult, + SDLRPCParameterNameTirePressure:vehicleDataResult, + SDLRPCParameterNameTurnSignal:vehicleDataResult, + SDLRPCParameterNameWiperStatus:vehicleDataResult}, + SDLRPCParameterNameOperationName:SDLRPCFunctionNameSubscribeVehicleData}}; SDLSubscribeVehicleDataResponse* testResponse = [[SDLSubscribeVehicleDataResponse alloc] initWithDictionary:dict]; expect(testResponse.accPedalPosition).to(equal(vehicleDataResult)); diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSyncPDataResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSyncPDataResponseSpec.m index 6a287f226..511a0df77 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSyncPDataResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSyncPDataResponseSpec.m @@ -9,8 +9,8 @@ #import <Nimble/Nimble.h> #import "SDLSyncPDataResponse.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLSyncPDataResponseSpec) -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSystemRequestResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSystemRequestResponseSpec.m index 2571379c8..4624f6de8 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSystemRequestResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSystemRequestResponseSpec.m @@ -9,8 +9,8 @@ #import <Nimble/Nimble.h> #import "SDLSystemRequestResponse.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLSystemRequestResponseSpec) -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnregisterAppInterfaceResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnregisterAppInterfaceResponseSpec.m index f10eb6048..0384a94af 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnregisterAppInterfaceResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnregisterAppInterfaceResponseSpec.m @@ -9,8 +9,8 @@ #import <Nimble/Nimble.h> #import "SDLUnregisterAppInterfaceResponse.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLUnregisterAppInterfaceResponseSpec) -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeButtonResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeButtonResponseSpec.m index ca76ef4e7..4f3052ccc 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeButtonResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeButtonResponseSpec.m @@ -9,8 +9,8 @@ #import <Nimble/Nimble.h> #import "SDLUnsubscribeButtonResponse.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLUnsubscribeButtonResponseSpec) -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m index 0ebf3d4f4..d9ba58f6b 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m @@ -9,7 +9,8 @@ #import <Nimble/Nimble.h> #import "SDLUnsubscribeVehicleDataResponse.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" #import "SDLVehicleDataResult.h" @@ -83,39 +84,39 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary<NSString *, id> *dict = [@{SDLNameResponse: - @{SDLNameParameters: - @{SDLNameGPS:vehicleDataResult, - SDLNameSpeed:vehicleDataResult, - SDLNameRPM:vehicleDataResult, - SDLNameFuelLevel:vehicleDataResult, - SDLNameFuelLevelState:vehicleDataResult, - SDLNameFuelRange:vehicleDataResult, - SDLNameInstantFuelConsumption:vehicleDataResult, - SDLNameExternalTemperature:vehicleDataResult, - SDLNamePRNDL:vehicleDataResult, - SDLNameTirePressure:vehicleDataResult, - SDLNameOdometer:vehicleDataResult, - SDLNameBeltStatus:vehicleDataResult, - SDLNameBodyInformation:vehicleDataResult, - SDLNameDeviceStatus:vehicleDataResult, - SDLNameDriverBraking:vehicleDataResult, - SDLNameWiperStatus:vehicleDataResult, - SDLNameHeadLampStatus:vehicleDataResult, - SDLNameEngineOilLife:vehicleDataResult, - SDLNameEngineTorque:vehicleDataResult, - SDLNameAccelerationPedalPosition:vehicleDataResult, - SDLNameSteeringWheelAngle:vehicleDataResult, - SDLNameECallInfo:vehicleDataResult, - SDLNameAirbagStatus:vehicleDataResult, - SDLNameEmergencyEvent:vehicleDataResult, - SDLNameClusterModes:vehicleDataResult, - SDLNameMyKey:vehicleDataResult, - SDLNameElectronicParkBrakeStatus:vehicleDataResult, - SDLNameTurnSignal:vehicleDataResult, - SDLNameCloudAppVehicleID:vehicleDataResult + NSMutableDictionary<NSString *, id> *dict = [@{SDLRPCParameterNameResponse: + @{SDLRPCParameterNameParameters: + @{SDLRPCParameterNameGPS:vehicleDataResult, + SDLRPCParameterNameSpeed:vehicleDataResult, + SDLRPCParameterNameRPM:vehicleDataResult, + SDLRPCParameterNameFuelLevel:vehicleDataResult, + SDLRPCParameterNameFuelLevelState:vehicleDataResult, + SDLRPCParameterNameFuelRange:vehicleDataResult, + SDLRPCParameterNameInstantFuelConsumption:vehicleDataResult, + SDLRPCParameterNameExternalTemperature:vehicleDataResult, + SDLRPCParameterNamePRNDL:vehicleDataResult, + SDLRPCParameterNameTirePressure:vehicleDataResult, + SDLRPCParameterNameOdometer:vehicleDataResult, + SDLRPCParameterNameBeltStatus:vehicleDataResult, + SDLRPCParameterNameBodyInformation:vehicleDataResult, + SDLRPCParameterNameDeviceStatus:vehicleDataResult, + SDLRPCParameterNameDriverBraking:vehicleDataResult, + SDLRPCParameterNameWiperStatus:vehicleDataResult, + SDLRPCParameterNameHeadLampStatus:vehicleDataResult, + SDLRPCParameterNameEngineOilLife:vehicleDataResult, + SDLRPCParameterNameEngineTorque:vehicleDataResult, + SDLRPCParameterNameAccelerationPedalPosition:vehicleDataResult, + SDLRPCParameterNameSteeringWheelAngle:vehicleDataResult, + SDLRPCParameterNameECallInfo:vehicleDataResult, + SDLRPCParameterNameAirbagStatus:vehicleDataResult, + SDLRPCParameterNameEmergencyEvent:vehicleDataResult, + SDLRPCParameterNameClusterModes:vehicleDataResult, + SDLRPCParameterNameMyKey:vehicleDataResult, + SDLRPCParameterNameElectronicParkBrakeStatus:vehicleDataResult, + SDLRPCParameterNameTurnSignal:vehicleDataResult, + SDLRPCParameterNameCloudAppVehicleID:vehicleDataResult }, - SDLNameOperationName:SDLNameUnsubscribeVehicleData}} mutableCopy]; + SDLRPCParameterNameOperationName:SDLRPCFunctionNameUnsubscribeVehicleData}} mutableCopy]; SDLUnsubscribeVehicleDataResponse* testResponse = [[SDLUnsubscribeVehicleDataResponse alloc] initWithDictionary:dict]; expect(testResponse.gps).to(equal(vehicleDataResult)); diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUpdateTurnListResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUpdateTurnListResponseSpec.m index d455dea46..28679dddf 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUpdateTurnListResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUpdateTurnListResponseSpec.m @@ -9,8 +9,8 @@ #import <Nimble/Nimble.h> #import "SDLUpdateTurnListResponse.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLUpdateTurnListResponseSpec) -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAirbagStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAirbagStatusSpec.m index 01a535ce4..032857f4b 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAirbagStatusSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAirbagStatusSpec.m @@ -9,7 +9,7 @@ #import <Nimble/Nimble.h> #import "SDLAirbagStatus.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" #import "SDLVehicleDataEventStatus.h" @@ -39,14 +39,14 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameDriverAirbagDeployed:SDLVehicleDataEventStatusYes, - SDLNameDriverSideAirbagDeployed:SDLVehicleDataEventStatusNoEvent, - SDLNameDriverCurtainAirbagDeployed:SDLVehicleDataEventStatusNo, - SDLNamePassengerAirbagDeployed:SDLVehicleDataEventStatusNotSupported, - SDLNamePassengerCurtainAirbagDeployed:SDLVehicleDataEventStatusFault, - SDLNameDriverKneeAirbagDeployed:SDLVehicleDataEventStatusNo, - SDLNamePassengerSideAirbagDeployed:SDLVehicleDataEventStatusYes, - SDLNamePassengerKneeAirbagDeployed:SDLVehicleDataEventStatusNoEvent} mutableCopy]; + NSMutableDictionary* dict = [@{SDLRPCParameterNameDriverAirbagDeployed:SDLVehicleDataEventStatusYes, + SDLRPCParameterNameDriverSideAirbagDeployed:SDLVehicleDataEventStatusNoEvent, + SDLRPCParameterNameDriverCurtainAirbagDeployed:SDLVehicleDataEventStatusNo, + SDLRPCParameterNamePassengerAirbagDeployed:SDLVehicleDataEventStatusNotSupported, + SDLRPCParameterNamePassengerCurtainAirbagDeployed:SDLVehicleDataEventStatusFault, + SDLRPCParameterNameDriverKneeAirbagDeployed:SDLVehicleDataEventStatusNo, + SDLRPCParameterNamePassengerSideAirbagDeployed:SDLVehicleDataEventStatusYes, + SDLRPCParameterNamePassengerKneeAirbagDeployed:SDLVehicleDataEventStatusNoEvent} mutableCopy]; SDLAirbagStatus* testStruct = [[SDLAirbagStatus alloc] initWithDictionary:dict]; expect(testStruct.driverAirbagDeployed).to(equal(SDLVehicleDataEventStatusYes)); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAppInfoSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAppInfoSpec.m index b8495dc74..f230a7898 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAppInfoSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAppInfoSpec.m @@ -10,7 +10,7 @@ #import <Nimble/Nimble.h> #import "SDLAppInfo.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLAppInfoSpec) @@ -28,9 +28,9 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary<NSString *, id> *dict = [@{SDLNameAppDisplayName:@"display name", - SDLNameAppVersion:@"1.2.3.4", - SDLNameAppBundleId:@"com.app.bundle"} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLRPCParameterNameAppDisplayName:@"display name", + SDLRPCParameterNameAppVersion:@"1.2.3.4", + SDLRPCParameterNameAppBundleId:@"com.app.bundle"} mutableCopy]; SDLAppInfo* testStruct = [[SDLAppInfo alloc] initWithDictionary:dict]; expect(testStruct.appDisplayName).to(equal(@"display name")); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAppServiceCapabilitySpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAppServiceCapabilitySpec.m new file mode 100644 index 000000000..220ce9e30 --- /dev/null +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAppServiceCapabilitySpec.m @@ -0,0 +1,68 @@ +// +// SDLAppServiceCapabilitySpec.m +// SmartDeviceLinkTests +// +// Created by Nicole on 1/30/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import <Quick/Quick.h> +#import <Nimble/Nimble.h> + +#import "SDLAppServiceCapability.h" +#import "SDLAppServiceRecord.h" +#import "SDLRPCParameterNames.h" + +QuickSpecBegin(SDLAppServiceCapabilitySpec) + +describe(@"Getter/Setter Tests", ^{ + __block SDLServiceUpdateReason testUpdateReason = nil; + __block SDLAppServiceRecord *testUpdatedAppServiceRecord = nil; + + beforeEach(^{ + testUpdateReason = SDLServiceUpdateActivated; + testUpdatedAppServiceRecord = [[SDLAppServiceRecord alloc] initWithDictionary:@{SDLRPCParameterNameServiceID:@"1234", SDLRPCParameterNameServicePublished:@YES}]; + }); + + it(@"Should set and get correctly", ^{ + SDLAppServiceCapability *testStruct = [[SDLAppServiceCapability alloc] init]; + testStruct.updateReason = testUpdateReason; + testStruct.updatedAppServiceRecord = testUpdatedAppServiceRecord; + + expect(testStruct.updateReason).to(equal(testUpdateReason)); + expect(testStruct.updatedAppServiceRecord).to(equal(testUpdatedAppServiceRecord)); + }); + + it(@"Should get correctly when initialized with a dictionary", ^{ + NSDictionary *dict = @{SDLRPCParameterNameUpdateReason:testUpdateReason, + SDLRPCParameterNameUpdatedAppServiceRecord:testUpdatedAppServiceRecord + }; + + SDLAppServiceCapability *testStruct = [[SDLAppServiceCapability alloc] initWithDictionary:dict]; + expect(testStruct.updateReason).to(equal(testUpdateReason)); + expect(testStruct.updatedAppServiceRecord).to(equal(testUpdatedAppServiceRecord)); + }); + + it(@"Should get correctly when initialized with initWithUpdatedAppServiceRecord:", ^{ + SDLAppServiceCapability *testStruct = [[SDLAppServiceCapability alloc] initWithUpdatedAppServiceRecord:testUpdatedAppServiceRecord]; + + expect(testStruct.updateReason).to(beNil()); + expect(testStruct.updatedAppServiceRecord).to(equal(testUpdatedAppServiceRecord)); + }); + + it(@"Should get correctly when initialized with initWithUpdateReason:updatedAppServiceRecord", ^{ + SDLAppServiceCapability *testStruct = [[SDLAppServiceCapability alloc] initWithUpdateReason:testUpdateReason updatedAppServiceRecord:testUpdatedAppServiceRecord]; + + expect(testStruct.updateReason).to(equal(testUpdateReason)); + expect(testStruct.updatedAppServiceRecord).to(equal(testUpdatedAppServiceRecord)); + }); + + it(@"Should return nil if not set", ^{ + SDLAppServiceCapability *testStruct = [[SDLAppServiceCapability alloc] init]; + + expect(testStruct.updateReason).to(beNil()); + expect(testStruct.updatedAppServiceRecord).to(beNil()); + }); +}); + +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAppServiceDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAppServiceDataSpec.m new file mode 100644 index 000000000..3e94c5def --- /dev/null +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAppServiceDataSpec.m @@ -0,0 +1,140 @@ +// +// SDLAppServiceDataSpec.m +// SmartDeviceLinkTests +// +// Created by Nicole on 2/5/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import <Quick/Quick.h> +#import <Nimble/Nimble.h> + +#import "SDLAppServiceData.h" +#import "SDLAppServiceType.h" +#import "SDLMediaServiceData.h" +#import "SDLNavigationServiceData.h" +#import "SDLRPCParameterNames.h" +#import "SDLWeatherServiceData.h" + +QuickSpecBegin(SDLAppServiceDataSpec) + +describe(@"Getter/Setter Tests", ^{ + __block NSString *testServiceType = nil; + __block SDLAppServiceType testAppServiceType = nil; + __block NSString *testServiceId = nil; + __block SDLMediaServiceData *testMediaServiceData = nil; + __block SDLWeatherServiceData *testWeatherServiceData = nil; + __block SDLNavigationServiceData *testNavigationServiceData = nil; + + beforeEach(^{ + testServiceType = SDLAppServiceTypeMedia; + testAppServiceType = SDLAppServiceTypeNavigation; + testServiceId = @"a1*54z"; + testMediaServiceData = [[SDLMediaServiceData alloc] init]; + testWeatherServiceData = [[SDLWeatherServiceData alloc] init]; + testNavigationServiceData = [[SDLNavigationServiceData alloc] init]; + }); + + it(@"Should set and get correctly", ^{ + SDLAppServiceData *testStruct = [[SDLAppServiceData alloc] init]; + testStruct.serviceType = testServiceType; + testStruct.serviceId = testServiceId; + testStruct.mediaServiceData = testMediaServiceData; + testStruct.weatherServiceData = testWeatherServiceData; + testStruct.navigationServiceData = testNavigationServiceData; + + expect(testStruct.serviceType).to(equal(testServiceType)); + expect(testStruct.serviceId).to(equal(testServiceId)); + expect(testStruct.mediaServiceData).to(equal(testMediaServiceData)); + expect(testStruct.weatherServiceData).to(equal(testWeatherServiceData)); + expect(testStruct.navigationServiceData).to(equal(testNavigationServiceData)); + }); + + it(@"Should get correctly when initialized with a dictionary", ^{ + NSDictionary *dict = @{SDLRPCParameterNameServiceType:testServiceType, + SDLRPCParameterNameServiceID:testServiceId, + SDLRPCParameterNameMediaServiceData:testMediaServiceData, + SDLRPCParameterNameWeatherServiceData:testWeatherServiceData, + SDLRPCParameterNameNavigationServiceData:testNavigationServiceData + }; + SDLAppServiceData *testStruct = [[SDLAppServiceData alloc] initWithDictionary:dict]; + + expect(testStruct.serviceType).to(equal(testServiceType)); + expect(testStruct.serviceId).to(equal(testServiceId)); + expect(testStruct.mediaServiceData).to(equal(testMediaServiceData)); + expect(testStruct.weatherServiceData).to(equal(testWeatherServiceData)); + expect(testStruct.navigationServiceData).to(equal(testNavigationServiceData)); + }); + + it(@"Should get correctly when initialized with initWithServiceType:serviceId:", ^{ + SDLAppServiceData *testStruct = [[SDLAppServiceData alloc] initWithServiceType:testServiceType serviceId:testServiceId]; + + expect(testStruct.serviceType).to(equal(testServiceType)); + expect(testStruct.serviceId).to(equal(testServiceId)); + expect(testStruct.mediaServiceData).to(beNil()); + expect(testStruct.weatherServiceData).to(beNil()); + expect(testStruct.navigationServiceData).to(beNil()); + }); + + it(@"Should get correctly when initialized with initWithAppServiceType:serviceId:", ^{ + SDLAppServiceData *testStruct = [[SDLAppServiceData alloc] initWithAppServiceType:testAppServiceType serviceId:testServiceId]; + + expect(testStruct.serviceType).to(equal(testAppServiceType)); + expect(testStruct.serviceId).to(equal(testServiceId)); + expect(testStruct.mediaServiceData).to(beNil()); + expect(testStruct.weatherServiceData).to(beNil()); + expect(testStruct.navigationServiceData).to(beNil()); + }); + + it(@"Should get correctly when initialized with initWithMediaServiceData:serviceId:", ^{ + SDLAppServiceData *testStruct = [[SDLAppServiceData alloc] initWithMediaServiceData:testMediaServiceData serviceId:testServiceId]; + + expect(testStruct.serviceType).to(equal(SDLAppServiceTypeMedia)); + expect(testStruct.serviceId).to(equal(testServiceId)); + expect(testStruct.mediaServiceData).to(equal(testMediaServiceData)); + expect(testStruct.weatherServiceData).to(beNil()); + expect(testStruct.navigationServiceData).to(beNil()); + }); + + it(@"Should get correctly when initialized with initWithWeatherServiceData:serviceId:", ^{ + SDLAppServiceData *testStruct = [[SDLAppServiceData alloc] initWithWeatherServiceData:testWeatherServiceData serviceId:testServiceId]; + + expect(testStruct.serviceType).to(equal(SDLAppServiceTypeWeather)); + expect(testStruct.serviceId).to(equal(testServiceId)); + expect(testStruct.mediaServiceData).to(beNil()); + expect(testStruct.weatherServiceData).to(equal(testWeatherServiceData)); + expect(testStruct.navigationServiceData).to(beNil()); + }); + + it(@"Should get correctly when initialized with initWithNavigationServiceData:serviceId:", ^{ + SDLAppServiceData *testStruct = [[SDLAppServiceData alloc] initWithNavigationServiceData:testNavigationServiceData serviceId:testServiceId]; + + expect(testStruct.serviceType).to(equal(SDLAppServiceTypeNavigation)); + expect(testStruct.serviceId).to(equal(testServiceId)); + expect(testStruct.mediaServiceData).to(beNil()); + expect(testStruct.weatherServiceData).to(beNil()); + expect(testStruct.navigationServiceData).to(equal(testNavigationServiceData)); + }); + + it(@"Should get correctly when initialized with initWithServiceType:serviceId:mediaServiceData:weatherServiceData:navigationServiceData:", ^{ + SDLAppServiceData *testStruct = [[SDLAppServiceData alloc] initWithServiceType:testServiceType serviceId:testServiceId mediaServiceData:testMediaServiceData weatherServiceData:testWeatherServiceData navigationServiceData:testNavigationServiceData]; + + expect(testStruct.serviceType).to(equal(testServiceType)); + expect(testStruct.serviceId).to(equal(testServiceId)); + expect(testStruct.mediaServiceData).to(equal(testMediaServiceData)); + expect(testStruct.weatherServiceData).to(equal(testWeatherServiceData)); + expect(testStruct.navigationServiceData).to(equal(testNavigationServiceData)); + }); + + it(@"Should return nil if not set", ^{ + SDLAppServiceData *testStruct = [[SDLAppServiceData alloc] init]; + + expect(testStruct.serviceType).to(beNil()); + expect(testStruct.serviceId).to(beNil()); + expect(testStruct.mediaServiceData).to(beNil()); + expect(testStruct.weatherServiceData).to(beNil()); + expect(testStruct.navigationServiceData).to(beNil()); + }); +}); + +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAppServiceManifestSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAppServiceManifestSpec.m new file mode 100644 index 000000000..3b3467c3a --- /dev/null +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAppServiceManifestSpec.m @@ -0,0 +1,196 @@ +// +// SDLAppServiceManifestSpec.m +// SmartDeviceLinkTests +// +// Created by Nicole on 1/30/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import <Quick/Quick.h> +#import <Nimble/Nimble.h> + +#import "SDLAppServiceManifest.h" +#import "SDLAppServiceType.h" +#import "SDLFunctionID.h" +#import "SDLImage.h" +#import "SDLNavigationServiceManifest.h" +#import "SDLMediaServiceManifest.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" +#import "SDLSyncMsgVersion.h" +#import "SDLWeatherServiceManifest.h" + +QuickSpecBegin(SDLAppServiceManifestSpec) + +describe(@"Getter/Setter Tests", ^ { + __block NSString *testServiceName = nil; + __block NSString *testServiceType = nil; + __block SDLAppServiceType testAppServiceType = nil; + __block SDLImage *testServiceIcon = nil; + __block NSNumber<SDLBool> *testAllowAppConsumers = nil; + __block SDLSyncMsgVersion *testRPCSpecVersion = nil; + __block NSArray<NSNumber<SDLInt> *> *testHandledRPCs = nil; + __block SDLWeatherServiceManifest *testWeatherServiceManifest = nil; + __block SDLMediaServiceManifest *testMediaServiceManifest = nil; + __block SDLNavigationServiceManifest *testNavigationServiceManifest = nil; + + beforeEach(^{ + testServiceName = @"testService"; + testServiceType = SDLAppServiceTypeMedia; + testAppServiceType = SDLAppServiceTypeNavigation; + testServiceIcon = [[SDLImage alloc] initWithName:@"testImage" isTemplate:false]; + testAllowAppConsumers = @YES; + testRPCSpecVersion = [[SDLSyncMsgVersion alloc] initWithMajorVersion:5 minorVersion:2 patchVersion:1]; + testHandledRPCs = [[NSArray alloc] initWithObjects:[SDLFunctionID.sharedInstance functionIdForName:SDLRPCFunctionNameAddCommand], [SDLFunctionID.sharedInstance functionIdForName:SDLRPCFunctionNameCreateInteractionChoiceSet], nil]; + testWeatherServiceManifest = [[SDLWeatherServiceManifest alloc] initWithCurrentForecastSupported:true maxMultidayForecastAmount:3 maxHourlyForecastAmount:0 maxMinutelyForecastAmount:0 weatherForLocationSupported:false]; + testMediaServiceManifest = [[SDLMediaServiceManifest alloc] init]; + testNavigationServiceManifest = [[SDLNavigationServiceManifest alloc] init]; + }); + + it(@"Should set and get correctly", ^{ + SDLAppServiceManifest *testStruct = [[SDLAppServiceManifest alloc] init]; + testStruct.serviceName = testServiceName; + testStruct.serviceType = testServiceType; + testStruct.serviceIcon = testServiceIcon; + testStruct.allowAppConsumers = testAllowAppConsumers; + testStruct.rpcSpecVersion = testRPCSpecVersion; + testStruct.handledRPCs = testHandledRPCs; + testStruct.weatherServiceManifest = testWeatherServiceManifest; + testStruct.mediaServiceManifest = testMediaServiceManifest; + testStruct.navigationServiceManifest = testNavigationServiceManifest; + + expect(testStruct.serviceName).to(match(testServiceName)); + expect(testStruct.serviceType).to(match(testServiceType)); + expect(testStruct.serviceIcon).to(equal(testServiceIcon)); + expect(testStruct.allowAppConsumers).to(beTrue()); + expect(testStruct.rpcSpecVersion).to(equal(testRPCSpecVersion)); + expect(testStruct.handledRPCs).to(equal(testHandledRPCs)); + expect(testStruct.weatherServiceManifest).to(equal(testWeatherServiceManifest)); + expect(testStruct.mediaServiceManifest).to(equal(testMediaServiceManifest)); + expect(testStruct.navigationServiceManifest).to(equal(testNavigationServiceManifest)); + }); + + it(@"Should get correctly when initialized with a dictionary", ^{ + NSDictionary *dict = @{SDLRPCParameterNameServiceName:testServiceName, + SDLRPCParameterNameServiceType:testServiceType, + SDLRPCParameterNameServiceIcon:testServiceIcon, + SDLRPCParameterNameAllowAppConsumers:testAllowAppConsumers, + SDLRPCParameterNameRPCSpecVersion:testRPCSpecVersion, + SDLRPCParameterNameHandledRPCs:testHandledRPCs, + SDLRPCParameterNameWeatherServiceManifest:testWeatherServiceManifest, + SDLRPCParameterNameMediaServiceManifest:testMediaServiceManifest, + SDLRPCParameterNameNavigationServiceManifest:testNavigationServiceManifest + }; + SDLAppServiceManifest *testStruct = [[SDLAppServiceManifest alloc] initWithDictionary:dict]; + + expect(testStruct.serviceName).to(match(testServiceName)); + expect(testStruct.serviceType).to(equal(testServiceType)); + expect(testStruct.serviceIcon).to(equal(testServiceIcon)); + expect(testStruct.allowAppConsumers).to(beTrue()); + expect(testStruct.rpcSpecVersion).to(equal(testRPCSpecVersion)); + expect(testStruct.handledRPCs).to(equal(testHandledRPCs)); + expect(testStruct.weatherServiceManifest).to(equal(testWeatherServiceManifest)); + expect(testStruct.mediaServiceManifest).to(equal(testMediaServiceManifest)); + expect(testStruct.navigationServiceManifest).to(equal(testNavigationServiceManifest)); + }); + + it(@"Should init correctly with initWithServiceType:", ^{ + SDLAppServiceManifest *testStruct = [[SDLAppServiceManifest alloc] initWithServiceType:testServiceType]; + + expect(testStruct.serviceName).to(beNil()); + expect(testStruct.serviceType).to(equal(testServiceType)); + expect(testStruct.serviceIcon).to(beNil()); + expect(testStruct.allowAppConsumers).to(beNil()); + expect(testStruct.rpcSpecVersion).to(beNil()); + expect(testStruct.handledRPCs).to(beNil()); + expect(testStruct.weatherServiceManifest).to(beNil()); + expect(testStruct.mediaServiceManifest).to(beNil()); + expect(testStruct.navigationServiceManifest).to(beNil()); + }); + + it(@"Should init correctly with initWithAppServiceType:", ^{ + SDLAppServiceManifest *testStruct = [[SDLAppServiceManifest alloc] initWithAppServiceType:testAppServiceType]; + + expect(testStruct.serviceName).to(beNil()); + expect(testStruct.serviceType).to(equal(testAppServiceType)); + expect(testStruct.serviceIcon).to(beNil()); + expect(testStruct.allowAppConsumers).to(beNil()); + expect(testStruct.rpcSpecVersion).to(beNil()); + expect(testStruct.handledRPCs).to(beNil()); + expect(testStruct.weatherServiceManifest).to(beNil()); + expect(testStruct.mediaServiceManifest).to(beNil()); + expect(testStruct.navigationServiceManifest).to(beNil()); + }); + + it(@"Should init correctly with initWithMediaServiceName:serviceIcon:allowAppConsumers:rpcSpecVersion:handledRPCs:mediaServiceManifest:", ^{ + SDLAppServiceManifest *testStruct = [[SDLAppServiceManifest alloc] initWithMediaServiceName:testServiceName serviceIcon:testServiceIcon allowAppConsumers:testAllowAppConsumers rpcSpecVersion:testRPCSpecVersion handledRPCs:testHandledRPCs mediaServiceManifest:testMediaServiceManifest]; + + expect(testStruct.serviceName).to(match(testServiceName)); + expect(testStruct.serviceType).to(equal(SDLAppServiceTypeMedia)); + expect(testStruct.serviceIcon).to(equal(testServiceIcon)); + expect(testStruct.allowAppConsumers).to(beTrue()); + expect(testStruct.rpcSpecVersion).to(equal(testRPCSpecVersion)); + expect(testStruct.handledRPCs).to(equal(testHandledRPCs)); + expect(testStruct.weatherServiceManifest).to(beNil()); + expect(testStruct.mediaServiceManifest).to(equal(testMediaServiceManifest)); + expect(testStruct.navigationServiceManifest).to(beNil()); + }); + + it(@"Should init correctly with initWithWeatherServiceName:serviceIcon:allowAppConsumers:rpcSpecVersion:handledRPCs:weatherServiceManifest:", ^{ + SDLAppServiceManifest *testStruct = [[SDLAppServiceManifest alloc] initWithWeatherServiceName:testServiceName serviceIcon:testServiceIcon allowAppConsumers:testAllowAppConsumers rpcSpecVersion:testRPCSpecVersion handledRPCs:testHandledRPCs weatherServiceManifest:testWeatherServiceManifest]; + + expect(testStruct.serviceName).to(match(testServiceName)); + expect(testStruct.serviceType).to(equal(SDLAppServiceTypeWeather)); + expect(testStruct.serviceIcon).to(equal(testServiceIcon)); + expect(testStruct.allowAppConsumers).to(beTrue()); + expect(testStruct.rpcSpecVersion).to(equal(testRPCSpecVersion)); + expect(testStruct.handledRPCs).to(equal(testHandledRPCs)); + expect(testStruct.weatherServiceManifest).to(equal(testWeatherServiceManifest)); + expect(testStruct.mediaServiceManifest).to(beNil()); + expect(testStruct.navigationServiceManifest).to(beNil()); + }); + + it(@"Should init correctly with initWithNavigationServiceName:serviceIcon:allowAppConsumers:rpcSpecVersion:handledRPCs:navigationServiceManifest:", ^{ + SDLAppServiceManifest *testStruct = [[SDLAppServiceManifest alloc] initWithNavigationServiceName:testServiceName serviceIcon:testServiceIcon allowAppConsumers:testAllowAppConsumers rpcSpecVersion:testRPCSpecVersion handledRPCs:testHandledRPCs navigationServiceManifest:testNavigationServiceManifest]; + + expect(testStruct.serviceName).to(match(testServiceName)); + expect(testStruct.serviceType).to(equal(SDLAppServiceTypeNavigation)); + expect(testStruct.serviceIcon).to(equal(testServiceIcon)); + expect(testStruct.allowAppConsumers).to(beTrue()); + expect(testStruct.rpcSpecVersion).to(equal(testRPCSpecVersion)); + expect(testStruct.handledRPCs).to(equal(testHandledRPCs)); + expect(testStruct.weatherServiceManifest).to(beNil()); + expect(testStruct.mediaServiceManifest).to(beNil()); + expect(testStruct.navigationServiceManifest).to(equal(testNavigationServiceManifest)); + }); + + it(@"Should init correctly with initWithServiceName:serviceType:serviceIcon:allowAppConsumers:rpcSpecVersion:handledRPCs:mediaServiceManifest:weatherServiceManifest:navigationServiceManifest:", ^{ + SDLAppServiceManifest *testStruct = [[SDLAppServiceManifest alloc] initWithServiceName:testServiceName serviceType:testServiceType serviceIcon:testServiceIcon allowAppConsumers:testAllowAppConsumers rpcSpecVersion:testRPCSpecVersion handledRPCs:testHandledRPCs mediaServiceManifest:testMediaServiceManifest weatherServiceManifest:testWeatherServiceManifest navigationServiceManifest:testNavigationServiceManifest]; + + expect(testStruct.serviceName).to(match(testServiceName)); + expect(testStruct.serviceType).to(equal(testServiceType)); + expect(testStruct.serviceIcon).to(equal(testServiceIcon)); + expect(testStruct.allowAppConsumers).to(beTrue()); + expect(testStruct.rpcSpecVersion).to(equal(testRPCSpecVersion)); + expect(testStruct.handledRPCs).to(equal(testHandledRPCs)); + expect(testStruct.weatherServiceManifest).to(equal(testWeatherServiceManifest)); + expect(testStruct.mediaServiceManifest).to(equal(testMediaServiceManifest)); + expect(testStruct.navigationServiceManifest).to(equal(testNavigationServiceManifest)); + }); + + it(@"Should return nil if not set", ^{ + SDLAppServiceManifest *testStruct = [[SDLAppServiceManifest alloc] init]; + + expect(testStruct.serviceName).to(beNil()); + expect(testStruct.serviceType).to(beNil()); + expect(testStruct.serviceIcon).to(beNil()); + expect(testStruct.allowAppConsumers).to(beNil()); + expect(testStruct.rpcSpecVersion).to(beNil()); + expect(testStruct.handledRPCs).to(beNil()); + expect(testStruct.weatherServiceManifest).to(beNil()); + expect(testStruct.mediaServiceManifest).to(beNil()); + expect(testStruct.navigationServiceManifest).to(beNil()); + }); +}); + +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAppServiceRecordSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAppServiceRecordSpec.m new file mode 100644 index 000000000..f0d99c84f --- /dev/null +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAppServiceRecordSpec.m @@ -0,0 +1,78 @@ +// +// SDLAppServiceRecordSpec.m +// SmartDeviceLinkTests +// +// Created by Nicole on 1/29/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import <Quick/Quick.h> +#import <Nimble/Nimble.h> + +#import "SDLAppServiceManifest.h" +#import "SDLAppServiceRecord.h" +#import "SDLRPCParameterNames.h" + +QuickSpecBegin(SDLAppServiceRecordSpec) + +describe(@"Getter/Setter Tests", ^{ + __block NSString *testServiceID = nil; + __block SDLAppServiceManifest *testAppServiceManifest = nil; + __block NSNumber<SDLBool> *testServicePublished = nil; + __block NSNumber<SDLBool> *testServiceActive = nil; + + beforeEach(^{ + testServiceID = @"12345"; + testAppServiceManifest = [[SDLAppServiceManifest alloc] initWithDictionary:@{SDLRPCParameterNameAllowAppConsumers:@NO}]; + testServicePublished = @NO; + testServiceActive = @YES; + }); + + it(@"Should set and get correctly", ^{ + SDLAppServiceRecord *testStruct = [[SDLAppServiceRecord alloc] init]; + testStruct.serviceID = testServiceID; + testStruct.serviceManifest = testAppServiceManifest; + testStruct.servicePublished = testServicePublished; + testStruct.serviceActive = testServiceActive; + + expect(testStruct.serviceID).to(match(testServiceID)); + expect(testStruct.serviceManifest).to(equal(testAppServiceManifest)); + expect(testStruct.servicePublished).to(equal(testServicePublished)); + expect(testStruct.serviceActive).to(equal(testServiceActive)); + }); + + it(@"Should initWithServiceId:serviceManifest:servicePublished:serviceActive: correctly", ^{ + SDLAppServiceRecord *testStruct = [[SDLAppServiceRecord alloc] initWithServiceID:testServiceID serviceManifest:testAppServiceManifest servicePublished:false serviceActive:true]; + + expect(testStruct.serviceID).to(match(testServiceID)); + expect(testStruct.serviceManifest).to(equal(testAppServiceManifest)); + expect(testStruct.servicePublished).to(equal(testServicePublished)); + expect(testStruct.serviceActive).to(equal(testServiceActive)); + }); + + it(@"Should get correctly when initialized with a dictionary", ^{ + NSDictionary *dict = @{SDLRPCParameterNameServiceID:testServiceID, + SDLRPCParameterNameServiceManifest:testAppServiceManifest, + SDLRPCParameterNameServicePublished:testServicePublished, + SDLRPCParameterNameServiceActive:testServiceActive + }; + SDLAppServiceRecord *testStruct = [[SDLAppServiceRecord alloc] initWithDictionary:dict]; + + expect(testStruct.serviceID).to(match(testServiceID)); + expect(testStruct.serviceManifest).to(equal(testAppServiceManifest)); + expect(testStruct.servicePublished).to(equal(testServicePublished)); + expect(testStruct.serviceActive).to(equal(testServiceActive)); + }); + + it(@"Should return nil if not set", ^{ + SDLAppServiceRecord *testStruct = [[SDLAppServiceRecord alloc] init]; + + expect(testStruct.serviceID).to(beNil()); + expect(testStruct.serviceManifest).to(beNil()); + expect(testStruct.servicePublished).to(beNil()); + expect(testStruct.serviceActive).to(beNil()); + }); +}); + +QuickSpecEnd + diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAppServicesCapabilitiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAppServicesCapabilitiesSpec.m new file mode 100644 index 000000000..486a664e8 --- /dev/null +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAppServicesCapabilitiesSpec.m @@ -0,0 +1,53 @@ +// +// SDLAppServicesCapabilitiesSpec.m +// SmartDeviceLinkTests +// +// Created by Nicole on 1/30/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import <Quick/Quick.h> +#import <Nimble/Nimble.h> + +#import "SDLAppServiceCapability.h" +#import "SDLAppServicesCapabilities.h" +#import "SDLRPCParameterNames.h" + +QuickSpecBegin(SDLAppServicesCapabilitiesSpec) + +describe(@"Getter/Setter Tests", ^{ + __block NSArray<SDLAppServiceCapability *> *testAppServices = nil; + + beforeEach(^{ + testAppServices = @[[[SDLAppServiceCapability alloc] initWithDictionary:@{SDLRPCParameterNameUpdateReason:SDLServiceUpdateRemoved}]]; + }); + + it(@"Should set and get correctly", ^{ + SDLAppServicesCapabilities *testStruct = [[SDLAppServicesCapabilities alloc] init]; + testStruct.appServices = testAppServices; + + expect(testStruct.appServices).to(equal(testAppServices)); + }); + + it(@"Should set and get with initWithServicesSupported:appServices:", ^{ + SDLAppServicesCapabilities *testStruct = [[SDLAppServicesCapabilities alloc] initWithAppServices:testAppServices]; + + expect(testStruct.appServices).to(equal(testAppServices)); + }); + + it(@"Should get correctly when initialized with a dictionary", ^{ + NSDictionary *dict = @{SDLRPCParameterNameAppServices:testAppServices + }; + SDLAppServicesCapabilities *testStruct = [[SDLAppServicesCapabilities alloc] initWithDictionary:dict]; + + expect(testStruct.appServices).to(equal(testAppServices)); + }); + + it(@"Should return nil if not set", ^{ + SDLAppServicesCapabilities *testStruct = [[SDLAppServicesCapabilities alloc] init]; + + expect(testStruct.appServices).to(beNil()); + }); +}); + +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAudioControlCapabilitiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAudioControlCapabilitiesSpec.m index f785e9bce..d99d76c22 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAudioControlCapabilitiesSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAudioControlCapabilitiesSpec.m @@ -9,7 +9,7 @@ #import <Nimble/Nimble.h> #import "SDLAudioControlCapabilities.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin( SDLAudioControlCapabilitiesSpec) @@ -56,12 +56,12 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameModuleName:@"module", - SDLNameSourceAvailable:@(NO), - SDLNameKeepContextAvailable: @YES, - SDLNameVolumeAvailable:@(YES), - SDLNameEqualizerAvailable:@(NO), - SDLNameEqualizerMaxChannelId:@12 + NSMutableDictionary* dict = [@{SDLRPCParameterNameModuleName:@"module", + SDLRPCParameterNameSourceAvailable:@(NO), + SDLRPCParameterNameKeepContextAvailable: @YES, + SDLRPCParameterNameVolumeAvailable:@(YES), + SDLRPCParameterNameEqualizerAvailable:@(NO), + SDLRPCParameterNameEqualizerMaxChannelId:@12 } mutableCopy]; SDLAudioControlCapabilities* testStruct = [[SDLAudioControlCapabilities alloc] initWithDictionary:dict]; diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAudioControlDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAudioControlDataSpec.m index f12cbc52b..19b88b71b 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAudioControlDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAudioControlDataSpec.m @@ -11,7 +11,7 @@ #import "SDLAudioControlData.h" #import "SDLPrimaryAudioSource.h" #import "SDLEqualizerSettings.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin( SDLAudioControlDataSpec) @@ -43,10 +43,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameSource:SDLPrimaryAudioSourceCD, - SDLNameKeepContext:@(NO), - SDLNameVolume:@(NO), - SDLNameEqualizerSettings:[@[someEqualizerSettings] copy] + NSMutableDictionary* dict = [@{SDLRPCParameterNameSource:SDLPrimaryAudioSourceCD, + SDLRPCParameterNameKeepContext:@(NO), + SDLRPCParameterNameVolume:@(NO), + SDLRPCParameterNameEqualizerSettings:[@[someEqualizerSettings] copy] } mutableCopy]; SDLAudioControlData* testStruct = [[SDLAudioControlData alloc] initWithDictionary:dict]; diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAudioPassThruCapabilitiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAudioPassThruCapabilitiesSpec.m index 5e2981852..915af499a 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAudioPassThruCapabilitiesSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAudioPassThruCapabilitiesSpec.m @@ -11,7 +11,7 @@ #import "SDLAudioPassThruCapabilities.h" #import "SDLAudioType.h" #import "SDLBitsPerSample.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" #import "SDLSamplingRate.h" @@ -31,9 +31,9 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameSamplingRate:SDLSamplingRate22KHZ, - SDLNameBitsPerSample:SDLBitsPerSample8Bit, - SDLNameAudioType:SDLAudioTypePCM} mutableCopy]; + NSMutableDictionary* dict = [@{SDLRPCParameterNameSamplingRate:SDLSamplingRate22KHZ, + SDLRPCParameterNameBitsPerSample:SDLBitsPerSample8Bit, + SDLRPCParameterNameAudioType:SDLAudioTypePCM} mutableCopy]; SDLAudioPassThruCapabilities* testStruct = [[SDLAudioPassThruCapabilities alloc] initWithDictionary:dict]; expect(testStruct.samplingRate).to(equal(SDLSamplingRate22KHZ)); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLBeltStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLBeltStatusSpec.m index e6e9495c5..dbe9d7b1f 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLBeltStatusSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLBeltStatusSpec.m @@ -9,7 +9,7 @@ #import <Nimble/Nimble.h> #import "SDLBeltStatus.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" #import "SDLVehicleDataEventStatus.h" @@ -53,21 +53,21 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameDriverBeltDeployed:SDLVehicleDataEventStatusNoEvent, - SDLNamePassengerBeltDeployed:SDLVehicleDataEventStatusYes, - SDLNamePassengerBuckleBelted:SDLVehicleDataEventStatusNo, - SDLNameDriverBuckleBelted:SDLVehicleDataEventStatusFault, - SDLNameLeftRow2BuckleBelted:SDLVehicleDataEventStatusYes, - SDLNamePassengerChildDetected:SDLVehicleDataEventStatusNo, - SDLNameRightRow2BuckleBelted:SDLVehicleDataEventStatusNotSupported, - SDLNameMiddleRow2BuckleBelted:SDLVehicleDataEventStatusNoEvent, - SDLNameMiddleRow3BuckleBelted:SDLVehicleDataEventStatusYes, - SDLNameLeftRow3BuckleBelted:SDLVehicleDataEventStatusFault, - SDLNameRightRow3BuckleBelted:SDLVehicleDataEventStatusNo, - SDLNameLeftRearInflatableBelted:SDLVehicleDataEventStatusNotSupported, - SDLNameRightRearInflatableBelted:SDLVehicleDataEventStatusFault, - SDLNameMiddleRow1BeltDeployed:SDLVehicleDataEventStatusNoEvent, - SDLNameMiddleRow1BuckleBelted:SDLVehicleDataEventStatusNotSupported} mutableCopy]; + NSMutableDictionary* dict = [@{SDLRPCParameterNameDriverBeltDeployed:SDLVehicleDataEventStatusNoEvent, + SDLRPCParameterNamePassengerBeltDeployed:SDLVehicleDataEventStatusYes, + SDLRPCParameterNamePassengerBuckleBelted:SDLVehicleDataEventStatusNo, + SDLRPCParameterNameDriverBuckleBelted:SDLVehicleDataEventStatusFault, + SDLRPCParameterNameLeftRow2BuckleBelted:SDLVehicleDataEventStatusYes, + SDLRPCParameterNamePassengerChildDetected:SDLVehicleDataEventStatusNo, + SDLRPCParameterNameRightRow2BuckleBelted:SDLVehicleDataEventStatusNotSupported, + SDLRPCParameterNameMiddleRow2BuckleBelted:SDLVehicleDataEventStatusNoEvent, + SDLRPCParameterNameMiddleRow3BuckleBelted:SDLVehicleDataEventStatusYes, + SDLRPCParameterNameLeftRow3BuckleBelted:SDLVehicleDataEventStatusFault, + SDLRPCParameterNameRightRow3BuckleBelted:SDLVehicleDataEventStatusNo, + SDLRPCParameterNameLeftRearInflatableBelted:SDLVehicleDataEventStatusNotSupported, + SDLRPCParameterNameRightRearInflatableBelted:SDLVehicleDataEventStatusFault, + SDLRPCParameterNameMiddleRow1BeltDeployed:SDLVehicleDataEventStatusNoEvent, + SDLRPCParameterNameMiddleRow1BuckleBelted:SDLVehicleDataEventStatusNotSupported} mutableCopy]; SDLBeltStatus* testStruct = [[SDLBeltStatus alloc] initWithDictionary:dict]; expect(testStruct.driverBeltDeployed).to(equal(SDLVehicleDataEventStatusNoEvent)); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLBodyInformationSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLBodyInformationSpec.m index 6ed210075..9c8765525 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLBodyInformationSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLBodyInformationSpec.m @@ -11,7 +11,7 @@ #import "SDLBodyInformation.h" #import "SDLIgnitionStableStatus.h" #import "SDLIgnitionStatus.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLBodyInformationSpec) @@ -37,13 +37,13 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameParkBrakeActive:@YES, - SDLNameIgnitionStableStatus:SDLIgnitionStableStatusNotStable, - SDLNameIgnitionStatus:SDLIgnitionStatusStart, - SDLNameDriverDoorAjar:@NO, - SDLNamePassengerDoorAjar:@NO, - SDLNameRearLeftDoorAjar:@NO, - SDLNameRearRightDoorAjar:@YES} mutableCopy]; + NSMutableDictionary* dict = [@{SDLRPCParameterNameParkBrakeActive:@YES, + SDLRPCParameterNameIgnitionStableStatus:SDLIgnitionStableStatusNotStable, + SDLRPCParameterNameIgnitionStatus:SDLIgnitionStatusStart, + SDLRPCParameterNameDriverDoorAjar:@NO, + SDLRPCParameterNamePassengerDoorAjar:@NO, + SDLRPCParameterNameRearLeftDoorAjar:@NO, + SDLRPCParameterNameRearRightDoorAjar:@YES} mutableCopy]; SDLBodyInformation* testStruct = [[SDLBodyInformation alloc] initWithDictionary:dict]; expect(testStruct.parkBrakeActive).to(equal(@YES)); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLButtonCapabilitiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLButtonCapabilitiesSpec.m index b10e0b094..f4a0a3a89 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLButtonCapabilitiesSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLButtonCapabilitiesSpec.m @@ -10,7 +10,7 @@ #import "SDLButtonCapabilities.h" #import "SDLButtonName.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLButtonCapabilitiesSpec) @@ -31,10 +31,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameName:SDLButtonNameCustomButton, - SDLNameShortPressAvailable:@YES, - SDLNameLongPressAvailable:@YES, - SDLNameUpDownAvailable:@NO} mutableCopy]; + NSMutableDictionary* dict = [@{SDLRPCParameterNameName:SDLButtonNameCustomButton, + SDLRPCParameterNameShortPressAvailable:@YES, + SDLRPCParameterNameLongPressAvailable:@YES, + SDLRPCParameterNameUpDownAvailable:@NO} mutableCopy]; SDLButtonCapabilities* testStruct = [[SDLButtonCapabilities alloc] initWithDictionary:dict]; expect(testStruct.name).to(equal(SDLButtonNameCustomButton)); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLChoiceSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLChoiceSpec.m index 3fa486a98..7cb870b61 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLChoiceSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLChoiceSpec.m @@ -10,7 +10,7 @@ #import "SDLChoice.h" #import "SDLImage.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLChoiceSpec) @@ -40,13 +40,13 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary<NSString *, id> *dict = [@{SDLNameChoiceId:@3, - SDLNameMenuName:@"Hello", - SDLNameVRCommands:[@[@"1", @"2"] mutableCopy], - SDLNameImage:image, - SDLNameSecondaryText:@"Arbitrary", - SDLNameTertiaryText:@"qwerty", - SDLNameSecondaryImage:secondaryImage} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLRPCParameterNameChoiceId:@3, + SDLRPCParameterNameMenuName:@"Hello", + SDLRPCParameterNameVRCommands:[@[@"1", @"2"] mutableCopy], + SDLRPCParameterNameImage:image, + SDLRPCParameterNameSecondaryText:@"Arbitrary", + SDLRPCParameterNameTertiaryText:@"qwerty", + SDLRPCParameterNameSecondaryImage:secondaryImage} mutableCopy]; SDLChoice* testStruct = [[SDLChoice alloc] initWithDictionary:dict]; expect(testStruct.choiceID).to(equal(@3)); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLClimateControlCapabilitiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLClimateControlCapabilitiesSpec.m index 298dd27a3..1bc146b4e 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLClimateControlCapabilitiesSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLClimateControlCapabilitiesSpec.m @@ -11,7 +11,7 @@ #import "SDLClimateControlCapabilities.h" #import "SDLDefrostZone.h" #import "SDLVentilationMode.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLClimateControlCapabilitiesSpec) @@ -57,22 +57,22 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary<NSString *, id> *dict = [@{SDLNameModuleName:@"Name", - SDLNameFanSpeedAvailable:@YES, - SDLNameDesiredTemperatureAvailable:@NO, - SDLNameACEnableAvailable:@NO, - SDLNameACMaxEnableAvailable:@NO, - SDLNameCirculateAirEnableAvailable:@YES, - SDLNameAutoModeEnableAvailable:@NO, - SDLNameDualModeEnableAvailable:@NO, - SDLNameDefrostZoneAvailable:@YES, - SDLNameDefrostZone:[@[SDLDefrostZoneFront] copy], - SDLNameVentilationModeAvailable:@NO, - SDLNameVentilationMode:[@[SDLVentilationModeUpper] copy], - SDLNameHeatedSteeringWheelAvailable:@YES, - SDLNameHeatedWindshieldAvailable:@NO, - SDLNameHeatedRearWindowAvailable:@YES, - SDLNameHeatedMirrorsAvailable:@NO + NSMutableDictionary<NSString *, id> *dict = [@{SDLRPCParameterNameModuleName:@"Name", + SDLRPCParameterNameFanSpeedAvailable:@YES, + SDLRPCParameterNameDesiredTemperatureAvailable:@NO, + SDLRPCParameterNameACEnableAvailable:@NO, + SDLRPCParameterNameACMaxEnableAvailable:@NO, + SDLRPCParameterNameCirculateAirEnableAvailable:@YES, + SDLRPCParameterNameAutoModeEnableAvailable:@NO, + SDLRPCParameterNameDualModeEnableAvailable:@NO, + SDLRPCParameterNameDefrostZoneAvailable:@YES, + SDLRPCParameterNameDefrostZone:[@[SDLDefrostZoneFront] copy], + SDLRPCParameterNameVentilationModeAvailable:@NO, + SDLRPCParameterNameVentilationMode:[@[SDLVentilationModeUpper] copy], + SDLRPCParameterNameHeatedSteeringWheelAvailable:@YES, + SDLRPCParameterNameHeatedWindshieldAvailable:@NO, + SDLRPCParameterNameHeatedRearWindowAvailable:@YES, + SDLRPCParameterNameHeatedMirrorsAvailable:@NO } mutableCopy]; SDLClimateControlCapabilities* testStruct = [[SDLClimateControlCapabilities alloc] initWithDictionary:dict]; diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLClimateControlDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLClimateControlDataSpec.m index 2075fb53d..8864f9ef5 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLClimateControlDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLClimateControlDataSpec.m @@ -12,7 +12,7 @@ #import "SDLTemperature.h" #import "SDLDefrostZone.h" #import "SDLVentilationMode.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLClimateControlDataSpec) @@ -100,20 +100,20 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized with a dictionary", ^ { - NSMutableDictionary<NSString *, id> *dict = [@{SDLNameFanSpeed : @43, - SDLNameCurrentTemperature : currentTemp, - SDLNameDesiredTemperature : desiredTemp, - SDLNameACEnable : @YES, - SDLNameCirculateAirEnable : @YES, - SDLNameAutoModeEnable : @NO, - SDLNameDefrostZone : SDLDefrostZoneFront, - SDLNameDualModeEnable : @NO, - SDLNameACMaxEnable : @YES, - SDLNameVentilationMode :SDLVentilationModeBoth, - SDLNameHeatedSteeringWheelEnable:@NO, - SDLNameHeatedWindshieldEnable:@YES, - SDLNameHeatedRearWindowEnable:@NO, - SDLNameHeatedMirrorsEnable:@YES, + NSMutableDictionary<NSString *, id> *dict = [@{SDLRPCParameterNameFanSpeed : @43, + SDLRPCParameterNameCurrentTemperature : currentTemp, + SDLRPCParameterNameDesiredTemperature : desiredTemp, + SDLRPCParameterNameACEnable : @YES, + SDLRPCParameterNameCirculateAirEnable : @YES, + SDLRPCParameterNameAutoModeEnable : @NO, + SDLRPCParameterNameDefrostZone : SDLDefrostZoneFront, + SDLRPCParameterNameDualModeEnable : @NO, + SDLRPCParameterNameACMaxEnable : @YES, + SDLRPCParameterNameVentilationMode :SDLVentilationModeBoth, + SDLRPCParameterNameHeatedSteeringWheelEnable:@NO, + SDLRPCParameterNameHeatedWindshieldEnable:@YES, + SDLRPCParameterNameHeatedRearWindowEnable:@NO, + SDLRPCParameterNameHeatedMirrorsEnable:@YES, } mutableCopy]; SDLClimateControlData* testStruct = [[SDLClimateControlData alloc] initWithDictionary:dict]; diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLClusterModeStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLClusterModeStatusSpec.m index f61afe79e..fcafcde1b 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLClusterModeStatusSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLClusterModeStatusSpec.m @@ -12,7 +12,7 @@ #import "SDLClusterModeStatus.h" #import "SDLPowerModeQualificationStatus.h" #import "SDLPowerModeStatus.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLClusterModeStatusSpec) @@ -32,10 +32,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNamePowerModeActive:@NO, - SDLNamePowerModeQualificationStatus:SDLPowerModeQualificationStatusOk, - SDLNameCarModeStatus:SDLCarModeStatusCrash, - SDLNamePowerModeStatus:SDLPowerModeStatusKeyOut} mutableCopy]; + NSMutableDictionary* dict = [@{SDLRPCParameterNamePowerModeActive:@NO, + SDLRPCParameterNamePowerModeQualificationStatus:SDLPowerModeQualificationStatusOk, + SDLRPCParameterNameCarModeStatus:SDLCarModeStatusCrash, + SDLRPCParameterNamePowerModeStatus:SDLPowerModeStatusKeyOut} mutableCopy]; SDLClusterModeStatus* testStruct = [[SDLClusterModeStatus alloc] initWithDictionary:dict]; expect(testStruct.powerModeActive).to(equal(@NO)); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDIDResult.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDIDResult.m index d0715bded..263793455 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDIDResult.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDIDResult.m @@ -9,7 +9,7 @@ #import <Nimble/Nimble.h> #import "SDLDIDResult.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" #import "SDLVehicleDataResultCode.h" @@ -29,9 +29,9 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameResultCode:SDLVehicleDataResultCodeDataNotSubscribed, - SDLNameDIDLocation:@300, - SDLNameData:@"gertwydhty4235tdhedt4tue"} mutableCopy]; + NSMutableDictionary* dict = [@{SDLRPCParameterNameResultCode:SDLVehicleDataResultCodeDataNotSubscribed, + SDLRPCParameterNameDIDLocation:@300, + SDLRPCParameterNameData:@"gertwydhty4235tdhedt4tue"} mutableCopy]; SDLDIDResult* testStruct = [[SDLDIDResult alloc] initWithDictionary:dict]; expect(testStruct.resultCode).to(equal(SDLVehicleDataResultCodeDataNotSubscribed)); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDateTimeSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDateTimeSpec.m index c152ad461..5f4091d0f 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDateTimeSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDateTimeSpec.m @@ -12,7 +12,7 @@ #import <Nimble/Nimble.h> #import "SDLDateTime.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLDateTimeSpec) @@ -42,15 +42,15 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized with dictionary", ^{ - NSMutableDictionary* dict = [@{SDLNameMillisecond:@100, - SDLNameSecond:@4, - SDLNameMinute:@12, - SDLNameHour:@20, - SDLNameDay:@30, - SDLNameMonth:@1, - SDLNameYear:@4000, - SDLNameTimezoneMinuteOffset:@0, - SDLNameTimezoneHourOffset:@1000} mutableCopy]; + NSMutableDictionary* dict = [@{SDLRPCParameterNameMillisecond:@100, + SDLRPCParameterNameSecond:@4, + SDLRPCParameterNameMinute:@12, + SDLRPCParameterNameHour:@20, + SDLRPCParameterNameDay:@30, + SDLRPCParameterNameMonth:@1, + SDLRPCParameterNameYear:@4000, + SDLRPCParameterNameTimezoneMinuteOffset:@0, + SDLRPCParameterNameTimezoneHourOffset:@1000} mutableCopy]; SDLDateTime* testStruct = [[SDLDateTime alloc] initWithDictionary:dict]; expect(testStruct.millisecond).to(equal(@100)); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDeviceInfoSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDeviceInfoSpec.m index 3108257f4..d1fcc5b55 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDeviceInfoSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDeviceInfoSpec.m @@ -9,7 +9,7 @@ #import <Nimble/Nimble.h> #import "SDLDeviceInfo.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLDeviceInfoSpec) @@ -33,12 +33,12 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary<NSString *, id> *dict = [@{SDLNameHardware:@"GDFR34F", - SDLNameFirmwareRevision:@"4.2a", - SDLNameOS:@"Robot", - SDLNameOSVersion:@"9.9", - SDLNameCarrier:@"ThatOneWirelessCompany", - SDLNameMaxNumberRFCOMMPorts:@20} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLRPCParameterNameHardware:@"GDFR34F", + SDLRPCParameterNameFirmwareRevision:@"4.2a", + SDLRPCParameterNameOS:@"Robot", + SDLRPCParameterNameOSVersion:@"9.9", + SDLRPCParameterNameCarrier:@"ThatOneWirelessCompany", + SDLRPCParameterNameMaxNumberRFCOMMPorts:@20} mutableCopy]; SDLDeviceInfo* testStruct = [[SDLDeviceInfo alloc] initWithDictionary:dict]; expect(testStruct.hardware).to(equal(@"GDFR34F")); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDeviceStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDeviceStatusSpec.m index eb56a11a0..847c7b95c 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDeviceStatusSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDeviceStatusSpec.m @@ -10,7 +10,7 @@ #import "SDLDeviceLevelStatus.h" #import "SDLDeviceStatus.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" #import "SDLPrimaryAudioSource.h" @@ -46,17 +46,17 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameVoiceRecognitionOn:@NO, - SDLNameBluetoothIconOn:@NO, - SDLNameCallActive:@YES, - SDLNamePhoneRoaming:@NO, - SDLNameTextMessageAvailable:@YES, - SDLNameBatteryLevelStatus:SDLDeviceLevelStatusFourBars, - SDLNameStereoAudioOutputMuted:@YES, - SDLNameMonoAudioOutputMuted:@YES, - SDLNameSignalLevelStatus:SDLDeviceLevelStatusTwoBars, - SDLNamePrimaryAudioSource:SDLPrimaryAudioSourceBluetoothStereo, - SDLNameECallEventActive:@NO} mutableCopy]; + NSMutableDictionary* dict = [@{SDLRPCParameterNameVoiceRecognitionOn:@NO, + SDLRPCParameterNameBluetoothIconOn:@NO, + SDLRPCParameterNameCallActive:@YES, + SDLRPCParameterNamePhoneRoaming:@NO, + SDLRPCParameterNameTextMessageAvailable:@YES, + SDLRPCParameterNameBatteryLevelStatus:SDLDeviceLevelStatusFourBars, + SDLRPCParameterNameStereoAudioOutputMuted:@YES, + SDLRPCParameterNameMonoAudioOutputMuted:@YES, + SDLRPCParameterNameSignalLevelStatus:SDLDeviceLevelStatusTwoBars, + SDLRPCParameterNamePrimaryAudioSource:SDLPrimaryAudioSourceBluetoothStereo, + SDLRPCParameterNameECallEventActive:@NO} mutableCopy]; SDLDeviceStatus* testStruct = [[SDLDeviceStatus alloc] initWithDictionary:dict]; expect(testStruct.voiceRecOn).to(equal(@NO)); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDisplayCapabilitiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDisplayCapabilitiesSpec.m index 6c68a3e26..ab19ae425 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDisplayCapabilitiesSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDisplayCapabilitiesSpec.m @@ -12,7 +12,7 @@ #import "SDLDisplayType.h" #import "SDLImageField.h" #import "SDLMediaClockFormat.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" #import "SDLScreenParams.h" #import "SDLTextField.h" @@ -52,15 +52,15 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameDisplayType:SDLDisplayTypeGen26DMA, - SDLNameDisplayName: @"test", - SDLNameTextFields:[@[textField] mutableCopy], - SDLNameImageFields:[@[imageField] mutableCopy], - SDLNameMediaClockFormats:[@[SDLMediaClockFormatClockText1, SDLMediaClockFormatClock3, SDLMediaClockFormatClockText3] copy], - SDLNameGraphicSupported:@YES, - SDLNameTemplatesAvailable:[@[@"String", @"String", @"String"] mutableCopy], - SDLNameScreenParams:screenParams, - SDLNameNumberCustomPresetsAvailable:@43} mutableCopy]; + NSMutableDictionary* dict = [@{SDLRPCParameterNameDisplayType:SDLDisplayTypeGen26DMA, + SDLRPCParameterNameDisplayName: @"test", + SDLRPCParameterNameTextFields:[@[textField] mutableCopy], + SDLRPCParameterNameImageFields:[@[imageField] mutableCopy], + SDLRPCParameterNameMediaClockFormats:[@[SDLMediaClockFormatClockText1, SDLMediaClockFormatClock3, SDLMediaClockFormatClockText3] copy], + SDLRPCParameterNameGraphicSupported:@YES, + SDLRPCParameterNameTemplatesAvailable:[@[@"String", @"String", @"String"] mutableCopy], + SDLRPCParameterNameScreenParams:screenParams, + SDLRPCParameterNameNumberCustomPresetsAvailable:@43} mutableCopy]; SDLDisplayCapabilities* testStruct = [[SDLDisplayCapabilities alloc] initWithDictionary:dict]; expect(testStruct.displayType).to(equal(SDLDisplayTypeGen26DMA)); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLECallInfoSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLECallInfoSpec.m index c69c46b84..d7229bdbc 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLECallInfoSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLECallInfoSpec.m @@ -11,7 +11,7 @@ #import "SDLVehicleDataNotificationStatus.h" #import "SDLECallConfirmationStatus.h" #import "SDLECallInfo.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLECallInfoSpec) @@ -30,9 +30,9 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameECallNotificationStatus:SDLVehicleDataNotificationStatusNormal, - SDLNameAuxECallNotificationStatus:SDLVehicleDataNotificationStatusActive, - SDLNameECallConfirmationStatus:SDLECallConfirmationStatusInProgress} mutableCopy]; + NSMutableDictionary* dict = [@{SDLRPCParameterNameECallNotificationStatus:SDLVehicleDataNotificationStatusNormal, + SDLRPCParameterNameAuxECallNotificationStatus:SDLVehicleDataNotificationStatusActive, + SDLRPCParameterNameECallConfirmationStatus:SDLECallConfirmationStatusInProgress} mutableCopy]; SDLECallInfo* testStruct = [[SDLECallInfo alloc] initWithDictionary:dict]; expect(testStruct.eCallNotificationStatus).to(equal(SDLVehicleDataNotificationStatusNormal)); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLEmergencyEventSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLEmergencyEventSpec.m index 0048ffdff..3ac05c2e5 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLEmergencyEventSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLEmergencyEventSpec.m @@ -11,7 +11,7 @@ #import "SDLEmergencyEvent.h" #import "SDLEmergencyEventType.h" #import "SDLFuelCutoffStatus.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" #import "SDLVehicleDataEventStatus.h" @@ -35,11 +35,11 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameEmergencyEventType:SDLEmergencyEventTypeFrontal, - SDLNameFuelCutoffStatus:SDLFuelCutoffStatusNormalOperation, - SDLNameRolloverEvent:SDLVehicleDataEventStatusYes, - SDLNameMaximumChangeVelocity:@33, - SDLNameMultipleEvents:SDLVehicleDataEventStatusNo} mutableCopy]; + NSMutableDictionary* dict = [@{SDLRPCParameterNameEmergencyEventType:SDLEmergencyEventTypeFrontal, + SDLRPCParameterNameFuelCutoffStatus:SDLFuelCutoffStatusNormalOperation, + SDLRPCParameterNameRolloverEvent:SDLVehicleDataEventStatusYes, + SDLRPCParameterNameMaximumChangeVelocity:@33, + SDLRPCParameterNameMultipleEvents:SDLVehicleDataEventStatusNo} mutableCopy]; SDLEmergencyEvent* testStruct = [[SDLEmergencyEvent alloc] initWithDictionary:dict]; expect(testStruct.emergencyEventType).to(equal(SDLEmergencyEventTypeFrontal)); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLEqualizerSettingsSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLEqualizerSettingsSpec.m index cd5dfe3b1..599a36b1c 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLEqualizerSettingsSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLEqualizerSettingsSpec.m @@ -8,7 +8,7 @@ #import <Nimble/Nimble.h> #import "SDLEqualizerSettings.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLEqualizerSettingsSpec) @@ -35,9 +35,9 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameChannelId:@2, - SDLNameChannelName:@"channel", - SDLNameChannelSetting:@45 + NSMutableDictionary* dict = [@{SDLRPCParameterNameChannelId:@2, + SDLRPCParameterNameChannelName:@"channel", + SDLRPCParameterNameChannelSetting:@45 } mutableCopy]; SDLEqualizerSettings* testStruct = [[SDLEqualizerSettings alloc] initWithDictionary:dict]; diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLFuelRangeSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLFuelRangeSpec.m index f812613da..8461f67a9 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLFuelRangeSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLFuelRangeSpec.m @@ -12,7 +12,7 @@ #import <Nimble/Nimble.h> #import "SDLFuelRange.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLFuelRangeSpec) @@ -28,8 +28,8 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSDictionary *dict = @{SDLNameType:SDLFuelTypeLPG, - SDLNameRange:@23 + NSDictionary *dict = @{SDLRPCParameterNameType:SDLFuelTypeLPG, + SDLRPCParameterNameRange:@23 }; SDLFuelRange *testStruct = [[SDLFuelRange alloc] initWithDictionary:dict]; diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLGPSDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLGPSDataSpec.m index 35cc2b659..9251e315f 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLGPSDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLGPSDataSpec.m @@ -11,7 +11,7 @@ #import "SDLCompassDirection.h" #import "SDLDimension.h" #import "SDLGPSData.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLGPSDataSpec) @@ -60,24 +60,24 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameLongitudeDegrees:@31.41592653589793, - SDLNameLatitudeDegrees:@45, - SDLNameUTCYear:@2015, - SDLNameUTCMonth:@1, - SDLNameUTCDay:@26, - SDLNameUTCHours:@23, - SDLNameUTCMinutes:@59, - SDLNameUTCSeconds:@59, - SDLNameCompassDirection:SDLCompassDirectionSoutheast, - SDLNamePDOP:@3.4, - SDLNameHDOP:@9.9, - SDLNameVDOP:@0, - SDLNameActual:@NO, - SDLNameSatellites:@12, - SDLNameDimension:SDLDimension3D, - SDLNameAltitude:@3000, - SDLNameHeading:@96, - SDLNameSpeed:@64} mutableCopy]; + NSMutableDictionary* dict = [@{SDLRPCParameterNameLongitudeDegrees:@31.41592653589793, + SDLRPCParameterNameLatitudeDegrees:@45, + SDLRPCParameterNameUTCYear:@2015, + SDLRPCParameterNameUTCMonth:@1, + SDLRPCParameterNameUTCDay:@26, + SDLRPCParameterNameUTCHours:@23, + SDLRPCParameterNameUTCMinutes:@59, + SDLRPCParameterNameUTCSeconds:@59, + SDLRPCParameterNameCompassDirection:SDLCompassDirectionSoutheast, + SDLRPCParameterNamePDOP:@3.4, + SDLRPCParameterNameHDOP:@9.9, + SDLRPCParameterNameVDOP:@0, + SDLRPCParameterNameActual:@NO, + SDLRPCParameterNameSatellites:@12, + SDLRPCParameterNameDimension:SDLDimension3D, + SDLRPCParameterNameAltitude:@3000, + SDLRPCParameterNameHeading:@96, + SDLRPCParameterNameSpeed:@64} mutableCopy]; SDLGPSData* testStruct = [[SDLGPSData alloc] initWithDictionary:dict]; expect(testStruct.longitudeDegrees).to(equal(@31.41592653589793)); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHMICapabilitiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHMICapabilitiesSpec.m index 72cc3df64..c47c4ce24 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHMICapabilitiesSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHMICapabilitiesSpec.m @@ -7,7 +7,7 @@ #import <Nimble/Nimble.h> #import "SDLHMICapabilities.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLHMICapabilitiesSpec) @@ -42,9 +42,9 @@ describe(@"SDLHMICapabilities struct", ^{ context(@"When initialized with a dictionary", ^{ beforeEach(^{ NSDictionary<NSString *, NSNumber *> *structInitDict = @{ - SDLNameNavigation: someNavigationState, - SDLNamePhoneCall: somePhoneCallState, - SDLNameVideoStreaming: someVideoStreamState + SDLRPCParameterNameNavigation: someNavigationState, + SDLRPCParameterNamePhoneCall: somePhoneCallState, + SDLRPCParameterNameVideoStreaming: someVideoStreamState }; testStruct = [[SDLHMICapabilities alloc] initWithDictionary:[structInitDict mutableCopy]]; }); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHMIPermissionsSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHMIPermissionsSpec.m index aed9830d4..9b677e6ee 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHMIPermissionsSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHMIPermissionsSpec.m @@ -10,7 +10,7 @@ #import "SDLHMIPermissions.h" #import "SDLHMILevel.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLHMIPermissionsSpec) @@ -26,8 +26,8 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameAllowed:[@[SDLHMILevelBackground, SDLHMILevelFull] copy], - SDLNameUserDisallowed:[@[SDLHMILevelNone, SDLHMILevelLimited] copy]} mutableCopy]; + NSMutableDictionary* dict = [@{SDLRPCParameterNameAllowed:[@[SDLHMILevelBackground, SDLHMILevelFull] copy], + SDLRPCParameterNameUserDisallowed:[@[SDLHMILevelNone, SDLHMILevelLimited] copy]} mutableCopy]; SDLHMIPermissions* testStruct = [[SDLHMIPermissions alloc] initWithDictionary:dict]; expect(testStruct.allowed).to(equal([@[SDLHMILevelBackground, SDLHMILevelFull] copy])); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHMISettingsControlCapabilitiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHMISettingsControlCapabilitiesSpec.m index f9b60810d..7bc085453 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHMISettingsControlCapabilitiesSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHMISettingsControlCapabilitiesSpec.m @@ -9,7 +9,7 @@ #import <Nimble/Nimble.h> #import "SDLHMISettingsControlCapabilities.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLHMISettingsControlCapabilitiesSpec) @@ -48,10 +48,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameModuleName:@"temperatureUnit", - SDLNameTemperatureUnitAvailable:@(YES), - SDLNameDistanceUnitAvailable:@(YES), - SDLNameDisplayModeUnitAvailable:@(NO) + NSMutableDictionary* dict = [@{SDLRPCParameterNameModuleName:@"temperatureUnit", + SDLRPCParameterNameTemperatureUnitAvailable:@(YES), + SDLRPCParameterNameDistanceUnitAvailable:@(YES), + SDLRPCParameterNameDisplayModeUnitAvailable:@(NO) } mutableCopy]; SDLHMISettingsControlCapabilities* testStruct = [[SDLHMISettingsControlCapabilities alloc] initWithDictionary:dict]; diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHMISettingsControlDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHMISettingsControlDataSpec.m index f2a1cd399..59f730476 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHMISettingsControlDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHMISettingsControlDataSpec.m @@ -7,7 +7,7 @@ #import <Nimble/Nimble.h> #import "SDLHMISettingsControlData.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLHMISettingsControlDataSpec) @@ -34,9 +34,9 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameDisplayMode:SDLDisplayModeAuto, - SDLNameTemperatureUnit:SDLTemperatureUnitCelsius, - SDLNameDistanceUnit:SDLDistanceUnitKilometers} mutableCopy]; + NSMutableDictionary* dict = [@{SDLRPCParameterNameDisplayMode:SDLDisplayModeAuto, + SDLRPCParameterNameTemperatureUnit:SDLTemperatureUnitCelsius, + SDLRPCParameterNameDistanceUnit:SDLDistanceUnitKilometers} mutableCopy]; SDLHMISettingsControlData* testStruct = [[SDLHMISettingsControlData alloc] initWithDictionary:dict]; expect(testStruct.displayMode).to(equal(SDLDisplayModeAuto)); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHapticRectSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHapticRectSpec.m index 6235ea62f..b5ea6b725 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHapticRectSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHapticRectSpec.m @@ -11,7 +11,7 @@ #import <Quick/Quick.h> #import <Nimble/Nimble.h> -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" #import "SDLHapticRect.h" #import "SDLRectangle.h" @@ -41,12 +41,12 @@ describe(@"Getter/Setter Tests", ^{ }); it(@"Should get correctly when initialized with a dict", ^{ - NSMutableDictionary *dict = [@{SDLNameId:@2, - SDLNameRect: @{ - SDLNameX:@20, - SDLNameY:@200, - SDLNameWidth:@2000, - SDLNameHeight:@3000 + NSMutableDictionary *dict = [@{SDLRPCParameterNameId:@2, + SDLRPCParameterNameRect: @{ + SDLRPCParameterNameX:@20, + SDLRPCParameterNameY:@200, + SDLRPCParameterNameWidth:@2000, + SDLRPCParameterNameHeight:@3000 } } mutableCopy]; SDLHapticRect *testStruct = [[SDLHapticRect alloc] initWithDictionary:dict]; diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHeadLampStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHeadLampStatusSpec.m index fe7a21198..201ce6bce 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHeadLampStatusSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHeadLampStatusSpec.m @@ -10,7 +10,7 @@ #import "SDLAmbientLightStatus.h" #import "SDLHeadLampStatus.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLHeadLampStatusSpec) @@ -29,9 +29,9 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameLowBeamsOn:@YES, - SDLNameHighBeamsOn:@NO, - SDLNameAmbientLightSensorStatus:SDLAmbientLightStatusTwilight3} mutableCopy]; + NSMutableDictionary* dict = [@{SDLRPCParameterNameLowBeamsOn:@YES, + SDLRPCParameterNameHighBeamsOn:@NO, + SDLRPCParameterNameAmbientLightSensorStatus:SDLAmbientLightStatusTwilight3} mutableCopy]; SDLHeadLampStatus* testStruct = [[SDLHeadLampStatus alloc] initWithDictionary:dict]; expect(testStruct.lowBeamsOn).to(equal(@YES)); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLImageFieldSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLImageFieldSpec.m index b40371a4d..3850163be 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLImageFieldSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLImageFieldSpec.m @@ -12,7 +12,7 @@ #import "SDLImageField.h" #import "SDLImageFieldName.h" #import "SDLImageResolution.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLImageFieldSpec) @@ -33,9 +33,9 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameName:SDLImageFieldNameTurnIcon, - SDLNameImageTypeSupported:[@[SDLFileTypePNG, SDLFileTypeJPEG] copy], - SDLNameImageResolution:resolution} mutableCopy]; + NSMutableDictionary* dict = [@{SDLRPCParameterNameName:SDLImageFieldNameTurnIcon, + SDLRPCParameterNameImageTypeSupported:[@[SDLFileTypePNG, SDLFileTypeJPEG] copy], + SDLRPCParameterNameImageResolution:resolution} mutableCopy]; SDLImageField* testStruct = [[SDLImageField alloc] initWithDictionary:dict]; expect(testStruct.name).to(equal(SDLImageFieldNameTurnIcon)); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLImageResolutionSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLImageResolutionSpec.m index c56008516..8bacdab56 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLImageResolutionSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLImageResolutionSpec.m @@ -2,7 +2,7 @@ #import <Nimble/Nimble.h> #import "SDLImageResolution.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLImageResolutionSpec) @@ -25,8 +25,8 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSDictionary *dict = @{SDLNameResolutionHeight:@69, - SDLNameResolutionWidth:@869, + NSDictionary *dict = @{SDLRPCParameterNameResolutionHeight:@69, + SDLRPCParameterNameResolutionWidth:@869, }; SDLImageResolution *testStruct = [[SDLImageResolution alloc] initWithDictionary:dict]; diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLImageSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLImageSpec.m index a88619d1b..62335c659 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLImageSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLImageSpec.m @@ -10,7 +10,7 @@ #import "SDLImage.h" #import "SDLImageType.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLImageSpec) @@ -47,9 +47,9 @@ describe(@"Getter/Setter Tests", ^{ NSString *value = @"value"; SDLImageType imageType = SDLImageTypeStatic; - NSDictionary* dict = [@{SDLNameValue:value, - SDLNameImageType:imageType, - SDLNameImageTemplate:@YES + NSDictionary* dict = [@{SDLRPCParameterNameValue:value, + SDLRPCParameterNameImageType:imageType, + SDLRPCParameterNameImageTemplate:@YES } mutableCopy]; testSDLImage = [[SDLImage alloc] initWithDictionary:dict]; diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLKeyboardPropertiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLKeyboardPropertiesSpec.m index 4a8dc21bb..a615413fa 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLKeyboardPropertiesSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLKeyboardPropertiesSpec.m @@ -12,7 +12,7 @@ #import "SDLKeypressMode.h" #import "SDLKeyboardProperties.h" #import "SDLLanguage.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLKeyboardPropertiesSpec) @@ -35,11 +35,11 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameLanguage:SDLLanguageDaDk, - SDLNameKeyboardLayout:SDLKeyboardLayoutQWERTZ, - SDLNameKeypressMode:SDLKeypressModeResendCurrentEntry, - SDLNameLimitedCharacterList:[@[@"s", @"r", @"f", @"q"] mutableCopy], - SDLNameAutoCompleteText:@"Auto Carrot"} mutableCopy]; + NSMutableDictionary* dict = [@{SDLRPCParameterNameLanguage:SDLLanguageDaDk, + SDLRPCParameterNameKeyboardLayout:SDLKeyboardLayoutQWERTZ, + SDLRPCParameterNameKeypressMode:SDLKeypressModeResendCurrentEntry, + SDLRPCParameterNameLimitedCharacterList:[@[@"s", @"r", @"f", @"q"] mutableCopy], + SDLRPCParameterNameAutoCompleteText:@"Auto Carrot"} mutableCopy]; SDLKeyboardProperties* testStruct = [[SDLKeyboardProperties alloc] initWithDictionary:dict]; expect(testStruct.language).to(equal(SDLLanguageDaDk)); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLLightCapabilitiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLLightCapabilitiesSpec.m index c3dc54ffa..a5aa62996 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLLightCapabilitiesSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLLightCapabilitiesSpec.m @@ -7,7 +7,7 @@ #import <Quick/Quick.h> #import <Nimble/Nimble.h> -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" #import "SDLLightName.h" #import "SDLLightCapabilities.h" @@ -37,9 +37,9 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameName:SDLLightNameFogLights, - SDLNameDensityAvailable:@YES, - SDLNameRGBColorSpaceAvailable:@NO + NSMutableDictionary* dict = [@{SDLRPCParameterNameName:SDLLightNameFogLights, + SDLRPCParameterNameDensityAvailable:@YES, + SDLRPCParameterNameRGBColorSpaceAvailable:@NO } mutableCopy]; SDLLightCapabilities* testStruct = [[SDLLightCapabilities alloc] initWithDictionary:dict]; diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLLightControlCapabilitiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLLightControlCapabilitiesSpec.m index 1bcfad24c..837a6cacd 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLLightControlCapabilitiesSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLLightControlCapabilitiesSpec.m @@ -9,7 +9,7 @@ #import <Nimble/Nimble.h> #import "SDLLightControlCapabilities.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" #import "SDLLightCapabilities.h" QuickSpecBegin( SDLLightControlCapabilitiesSpec) @@ -37,8 +37,8 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameModuleName:@"moduleName", - SDLNameSupportedLights:[@[somelightCapabilities] copy] + NSMutableDictionary* dict = [@{SDLRPCParameterNameModuleName:@"moduleName", + SDLRPCParameterNameSupportedLights:[@[somelightCapabilities] copy] } mutableCopy]; SDLLightControlCapabilities* testStruct = [[SDLLightControlCapabilities alloc] initWithDictionary:dict]; diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLLightControlDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLLightControlDataSpec.m index 40f342f05..a882bdf2f 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLLightControlDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLLightControlDataSpec.m @@ -9,7 +9,7 @@ #import <Nimble/Nimble.h> #import "SDLLightControlData.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" #import "SDLLightState.h" QuickSpecBegin(SDLLightControlDataSpec) @@ -31,7 +31,7 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameLightState:[@[someLightState] copy]} mutableCopy]; + NSMutableDictionary* dict = [@{SDLRPCParameterNameLightState:[@[someLightState] copy]} mutableCopy]; SDLLightControlData* testStruct = [[SDLLightControlData alloc] initWithDictionary:dict]; diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLLightStateSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLLightStateSpec.m index 3975cb3ed..dc478bb06 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLLightStateSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLLightStateSpec.m @@ -11,7 +11,7 @@ #import "SDLLightStatus.h" #import "SDLRGBColor.h" #import "SDLLightName.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLLightStateSpec) @@ -63,10 +63,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameId:SDLLightNameFogLights, - SDLNameStatus:SDLLightStatusOn, - SDLNameDensity:@(0.5), - SDLNameColor:someRGBColor} mutableCopy]; + NSMutableDictionary* dict = [@{SDLRPCParameterNameId:SDLLightNameFogLights, + SDLRPCParameterNameStatus:SDLLightStatusOn, + SDLRPCParameterNameDensity:@(0.5), + SDLRPCParameterNameColor:someRGBColor} mutableCopy]; SDLLightState* testStruct = [[SDLLightState alloc] initWithDictionary:dict]; diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLLocationCoordinateSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLLocationCoordinateSpec.m index 663eae3fe..011c8f8e4 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLLocationCoordinateSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLLocationCoordinateSpec.m @@ -7,7 +7,7 @@ #import <Nimble/Nimble.h> #import "SDLLocationCoordinate.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLLocationCoordinateSpec) @@ -51,8 +51,8 @@ describe(@"Getter/Setter Tests", ^ { someLongitude = @123.4567; someLatitude = @65.4321; NSDictionary *initDict = @{ - SDLNameLongitudeDegrees: someLongitude, - SDLNameLatitudeDegrees: someLatitude, + SDLRPCParameterNameLongitudeDegrees: someLongitude, + SDLRPCParameterNameLatitudeDegrees: someLatitude, }; testStruct = [[SDLLocationCoordinate alloc] initWithDictionary:[NSMutableDictionary dictionaryWithDictionary:initDict]]; @@ -69,7 +69,18 @@ describe(@"Getter/Setter Tests", ^ { expect(testStruct.latitudeDegrees).to(beIdenticalTo(someLatitude)); }); }); - + + context(@"when init with initWithLatitudeDegrees:longitudeDegrees", ^{ + it(@"should get and set correctly", ^{ + float testLatitude = 34.5; + float testLongitude = 120.345; + SDLLocationCoordinate *testStruct = [[SDLLocationCoordinate alloc] initWithLatitudeDegrees:testLatitude longitudeDegrees:testLongitude]; + + expect(testStruct.latitudeDegrees).to(equal(testLatitude)); + expect(testStruct.longitudeDegrees).to(equal(testLongitude)); + }); + }); + context(@"when parameters are not set", ^{ beforeEach(^{ NSDictionary *initDict = @{ diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLLocationDetailsSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLLocationDetailsSpec.m index de18bb501..5bbdd7f00 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLLocationDetailsSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLLocationDetailsSpec.m @@ -10,7 +10,7 @@ #import "SDLImage.h" #import "SDLLocationCoordinate.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" #import "SDLOasisAddress.h" QuickSpecBegin(SDLLocationDetailsSpec) @@ -87,6 +87,51 @@ describe(@"Getter/Setter Tests", ^ { }); }); + + context(@"when initialized with a convenience init", ^{ + __block SDLLocationCoordinate *testCoordinate = nil; + __block NSString *testLocationName = nil; + __block NSArray<NSString *> *testAddressLines = nil; + __block NSString *testLocationDescription = nil; + __block NSString *testPhoneNumber = nil; + __block SDLImage *testLocationImage = nil; + __block SDLOasisAddress *testSearchAddress = nil; + + beforeEach(^{ + testCoordinate = [[SDLLocationCoordinate alloc] init]; + testLocationName = @"testLocationName"; + testAddressLines = @[@"testAddressLines1", @"testAddressLines2"]; + testLocationDescription = @"testLocationDescription"; + testPhoneNumber = @"testPhoneNumber"; + testLocationImage = [[SDLImage alloc] initWithStaticIconName:SDLStaticIconNameKey]; + testSearchAddress = [[SDLOasisAddress alloc] init]; + }); + + it(@"should init correctly with initWithCoordinate:", ^{ + testStruct = [[SDLLocationDetails alloc] initWithCoordinate:testCoordinate]; + + expect(testStruct.coordinate).to(equal(testCoordinate)); + expect(testStruct.locationName).to(beNil()); + expect(testStruct.addressLines).to(beNil()); + expect(testStruct.locationDescription).to(beNil()); + expect(testStruct.phoneNumber).to(beNil()); + expect(testStruct.locationImage).to(beNil()); + expect(testStruct.searchAddress).to(beNil()); + }); + + it(@"should init correctly with all parameters", ^{ + testStruct = [[SDLLocationDetails alloc] initWithCoordinate:testCoordinate locationName:testLocationName addressLines:testAddressLines locationDescription:testLocationDescription phoneNumber:testPhoneNumber locationImage:testLocationImage searchAddress:testSearchAddress]; + + expect(testStruct.coordinate).to(equal(testCoordinate)); + expect(testStruct.locationName).to(equal(testLocationName)); + expect(testStruct.addressLines).to(equal(testAddressLines)); + expect(testStruct.locationDescription).to(equal(testLocationDescription)); + expect(testStruct.phoneNumber).to(equal(testPhoneNumber)); + expect(testStruct.locationImage).to(equal(testLocationImage)); + expect(testStruct.searchAddress).to(equal(testSearchAddress)); + }); + + }); describe(@"when initialized with a dictionary", ^{ context(@"when parameters are set correctly", ^{ @@ -99,13 +144,13 @@ describe(@"Getter/Setter Tests", ^ { someImage = [[SDLImage alloc] init]; someAddress = [[SDLOasisAddress alloc] initWithSubThoroughfare:@"test" thoroughfare:@"1" locality:@"local" administrativeArea:@"admin" postalCode:@"48067" countryCode:@"12345"]; NSDictionary *initDict = @{ - SDLNameLocationCoordinate: someCoordinate, - SDLNameLocationName: someLocation, - SDLNameLocationDescription: someLocationDescription, - SDLNameAddressLines: someAddressLines, - SDLNamePhoneNumber: somePhoneNumber, - SDLNameLocationImage: someImage, - SDLNameSearchAddress: someAddress + SDLRPCParameterNameLocationCoordinate: someCoordinate, + SDLRPCParameterNameLocationName: someLocation, + SDLRPCParameterNameLocationDescription: someLocationDescription, + SDLRPCParameterNameAddressLines: someAddressLines, + SDLRPCParameterNamePhoneNumber: somePhoneNumber, + SDLRPCParameterNameLocationImage: someImage, + SDLRPCParameterNameSearchAddress: someAddress }; testStruct = [[SDLLocationDetails alloc] initWithDictionary:[NSMutableDictionary dictionaryWithDictionary:initDict]]; @@ -151,8 +196,8 @@ describe(@"Getter/Setter Tests", ^ { context(@"when parameters are not set", ^{ beforeEach(^{ NSDictionary *initDict = @{ - SDLNameRequest: @{ - SDLNameParameters: @{} + SDLRPCParameterNameRequest: @{ + SDLRPCParameterNameParameters: @{} } }; diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLMassageCushionFirmnessSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLMassageCushionFirmnessSpec.m index 4fc8f0b43..1bd9b0a83 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLMassageCushionFirmnessSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLMassageCushionFirmnessSpec.m @@ -7,7 +7,7 @@ #import <Quick/Quick.h> #import <Nimble/Nimble.h> -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" #import "SDLMassageCushionFirmness.h" QuickSpecBegin(SDLMassageCushionFirmnessSpec) @@ -31,8 +31,8 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameCushion:SDLMassageCushionSeatBolsters, - SDLNameFirmness:@12 + NSMutableDictionary* dict = [@{SDLRPCParameterNameCushion:SDLMassageCushionSeatBolsters, + SDLRPCParameterNameFirmness:@12 } mutableCopy]; SDLMassageCushionFirmness* testStruct = [[SDLMassageCushionFirmness alloc] initWithDictionary:dict]; diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLMassageModeDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLMassageModeDataSpec.m index 6b52a36b2..486049ffe 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLMassageModeDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLMassageModeDataSpec.m @@ -8,7 +8,7 @@ #import <Quick/Quick.h> #import <Nimble/Nimble.h> -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" #import "SDLMassageModeData.h" QuickSpecBegin(SDLMassageModeDataSpec) @@ -32,8 +32,8 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameMassageMode:SDLMassageModeLow, - SDLNameMassageZone:SDLMassageZoneLumbar + NSMutableDictionary* dict = [@{SDLRPCParameterNameMassageMode:SDLMassageModeLow, + SDLRPCParameterNameMassageZone:SDLMassageZoneLumbar } mutableCopy]; SDLMassageModeData* testStruct = [[SDLMassageModeData alloc] initWithDictionary:dict]; diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLMediaServiceDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLMediaServiceDataSpec.m new file mode 100644 index 000000000..821b7a098 --- /dev/null +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLMediaServiceDataSpec.m @@ -0,0 +1,136 @@ +// +// SDLMediaServiceDataSpec.m +// SmartDeviceLinkTests +// +// Created by Nicole on 2/8/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import <Quick/Quick.h> +#import <Nimble/Nimble.h> + +#import "SDLMediaServiceData.h" +#import "SDLMediaType.h" +#import "SDLRPCParameterNames.h" + +QuickSpecBegin(SDLMediaServiceDataSpec) + +describe(@"Getter/Setter Tests", ^{ + __block SDLMediaType testMediaType = nil; + __block NSString *testMediaTitle = nil; + __block NSString *testMediaArtist = nil; + __block NSString *testMediaAlbum = nil; + __block NSString *testPlaylistName = nil; + __block BOOL testIsExplicit = nil; + __block int testTrackPlaybackProgress = 45; + __block int testTrackPlaybackDuration = 3; + __block int testQueuePlaybackProgress = 21; + __block int testQueuePlaybackDuration = 5; + __block int testQueueCurrentTrackNumber = 3; + __block int testQueueTotalTrackCount = 56; + + beforeEach(^{ + testMediaType = SDLMediaTypePodcast; + testMediaTitle = @"testMediaTitle"; + testMediaArtist = @"testMediaArtist"; + testMediaAlbum = @"testMediaAlbum"; + testPlaylistName = @"testPlaylistName"; + testIsExplicit = true; + }); + + it(@"Should set and get correctly", ^{ + SDLMediaServiceData *testStruct = [[SDLMediaServiceData alloc] init]; + testStruct.mediaType = testMediaType; + testStruct.mediaTitle = testMediaTitle; + testStruct.mediaArtist = testMediaArtist; + testStruct.mediaAlbum = testMediaAlbum; + testStruct.playlistName = testPlaylistName; + testStruct.isExplicit = @(testIsExplicit); + testStruct.trackPlaybackProgress = @(testTrackPlaybackProgress); + testStruct.trackPlaybackDuration = @(testTrackPlaybackDuration); + testStruct.queuePlaybackProgress = @(testQueuePlaybackProgress); + testStruct.queuePlaybackDuration = @(testQueuePlaybackDuration); + testStruct.queueCurrentTrackNumber = @(testQueueCurrentTrackNumber); + testStruct.queueTotalTrackCount = @(testQueueTotalTrackCount); + + expect(testStruct.mediaType).to(equal(testMediaType)); + expect(testStruct.mediaTitle).to(equal(testMediaTitle)); + expect(testStruct.mediaArtist).to(equal(testMediaArtist)); + expect(testStruct.mediaAlbum).to(equal(testMediaAlbum)); + expect(testStruct.playlistName).to(equal(testPlaylistName)); + expect(testStruct.isExplicit).to(equal(testIsExplicit)); + expect(testStruct.trackPlaybackProgress).to(equal(testTrackPlaybackProgress)); + expect(testStruct.trackPlaybackDuration).to(equal(testTrackPlaybackDuration)); + expect(testStruct.queuePlaybackProgress).to(equal(testQueuePlaybackProgress)); + expect(testStruct.queuePlaybackDuration).to(equal(testQueuePlaybackDuration)); + expect(testStruct.queueCurrentTrackNumber).to(equal(testQueueCurrentTrackNumber)); + expect(testStruct.queueTotalTrackCount).to(equal(testQueueTotalTrackCount)); + }); + + it(@"Should get correctly when initialized with a dictionary", ^{ + NSDictionary *dict = @{SDLRPCParameterNameMediaType:testMediaType, + SDLRPCParameterNameMediaTitle:testMediaTitle, + SDLRPCParameterNameMediaArtist:testMediaArtist, + SDLRPCParameterNameMediaAlbum:testMediaAlbum, + SDLRPCParameterNamePlaylistName:testPlaylistName, + SDLRPCParameterNameIsExplicit:@(testIsExplicit), + SDLRPCParameterNameTrackPlaybackProgress:@(testTrackPlaybackProgress), + SDLRPCParameterNameTrackPlaybackDuration:@(testTrackPlaybackDuration), + SDLRPCParameterNameQueuePlaybackProgress:@(testQueuePlaybackProgress), + SDLRPCParameterNameQueuePlaybackDuration:@(testQueuePlaybackDuration), + SDLRPCParameterNameQueueCurrentTrackNumber:@(testQueueCurrentTrackNumber), + SDLRPCParameterNameQueueTotalTrackCount:@(testQueueTotalTrackCount) + }; + SDLMediaServiceData *testStruct = [[SDLMediaServiceData alloc] initWithDictionary:dict]; + + expect(testStruct.mediaType).to(equal(testMediaType)); + expect(testStruct.mediaTitle).to(equal(testMediaTitle)); + expect(testStruct.mediaArtist).to(equal(testMediaArtist)); + expect(testStruct.mediaAlbum).to(equal(testMediaAlbum)); + expect(testStruct.playlistName).to(equal(testPlaylistName)); + expect(testStruct.isExplicit).to(equal(testIsExplicit)); + expect(testStruct.trackPlaybackProgress).to(equal(testTrackPlaybackProgress)); + expect(testStruct.trackPlaybackDuration).to(equal(testTrackPlaybackDuration)); + expect(testStruct.queuePlaybackProgress).to(equal(testQueuePlaybackProgress)); + expect(testStruct.queuePlaybackDuration).to(equal(testQueuePlaybackDuration)); + expect(testStruct.queueCurrentTrackNumber).to(equal(testQueueCurrentTrackNumber)); + expect(testStruct.queueTotalTrackCount).to(equal(testQueueTotalTrackCount)); + }); + + it(@"Should get correctly when initialized with initWithMediaType:mediaTitle:mediaArtist:mediaAlbum:playlistName:isExplicit:trackPlaybackProgress:trackPlaybackDuration:queuePlaybackProgress:queuePlaybackDuration:queueCurrentTrackNumber:queueTotalTrackCount:", ^{ + SDLMediaServiceData *testStruct = [[SDLMediaServiceData alloc] initWithMediaType:testMediaType mediaTitle:testMediaTitle mediaArtist:testMediaArtist mediaAlbum:testMediaAlbum playlistName:testPlaylistName isExplicit:testIsExplicit trackPlaybackProgress:testTrackPlaybackProgress trackPlaybackDuration:testTrackPlaybackDuration queuePlaybackProgress:testQueuePlaybackProgress queuePlaybackDuration:testQueuePlaybackDuration queueCurrentTrackNumber:testQueueCurrentTrackNumber queueTotalTrackCount:testQueueTotalTrackCount]; + + expect(testStruct.mediaType).to(equal(testMediaType)); + expect(testStruct.mediaTitle).to(equal(testMediaTitle)); + expect(testStruct.mediaArtist).to(equal(testMediaArtist)); + expect(testStruct.mediaAlbum).to(equal(testMediaAlbum)); + expect(testStruct.playlistName).to(equal(testPlaylistName)); + expect(testStruct.isExplicit).to(equal(testIsExplicit)); + expect(testStruct.trackPlaybackProgress).to(equal(testTrackPlaybackProgress)); + expect(testStruct.trackPlaybackDuration).to(equal(testTrackPlaybackDuration)); + expect(testStruct.queuePlaybackProgress).to(equal(testQueuePlaybackProgress)); + expect(testStruct.queuePlaybackDuration).to(equal(testQueuePlaybackDuration)); + expect(testStruct.queueCurrentTrackNumber).to(equal(testQueueCurrentTrackNumber)); + expect(testStruct.queueTotalTrackCount).to(equal(testQueueTotalTrackCount)); + }); + + it(@"Should return nil if not set", ^{ + SDLMediaServiceData *testStruct = [[SDLMediaServiceData alloc] init]; + + expect(testStruct.mediaType).to(beNil()); + expect(testStruct.mediaTitle).to(beNil()); + expect(testStruct.mediaArtist).to(beNil()); + expect(testStruct.mediaAlbum).to(beNil()); + expect(testStruct.playlistName).to(beNil()); + expect(testStruct.isExplicit).to(beNil()); + expect(testStruct.trackPlaybackProgress).to(beNil()); + expect(testStruct.trackPlaybackDuration).to(beNil()); + expect(testStruct.queuePlaybackProgress).to(beNil()); + expect(testStruct.queuePlaybackDuration).to(beNil()); + expect(testStruct.queueCurrentTrackNumber).to(beNil()); + expect(testStruct.queueTotalTrackCount).to(beNil()); + }); +}); + +QuickSpecEnd + diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLMediaServiceManifestSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLMediaServiceManifestSpec.m new file mode 100644 index 000000000..bdd8dab4b --- /dev/null +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLMediaServiceManifestSpec.m @@ -0,0 +1,33 @@ +// +// SDLMediaServiceManifestSpec.m +// SmartDeviceLinkTests +// +// Created by Nicole on 2/11/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import <Quick/Quick.h> +#import <Nimble/Nimble.h> + +#import "SDLMediaServiceManifest.h" + +QuickSpecBegin(SDLMediaServiceManifestSpec) + +describe(@"Getter/Setter Tests", ^{ + it(@"Should set and get correctly", ^{ + SDLMediaServiceManifest *testStruct = [[SDLMediaServiceManifest alloc] init]; + + // no parameters to test + expect(testStruct).toNot(beNil()); + }); + + it(@"Should get correctly when initialized with a dictionary", ^{ + NSDictionary *dict = @{}; + SDLMediaServiceManifest *testStruct = [[SDLMediaServiceManifest alloc] initWithDictionary:dict]; + + // no parameters to test + expect(testStruct).toNot(beNil()); + }); +}); + +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLMenuParamsSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLMenuParamsSpec.m index e2f5612d7..3b70bbfc8 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLMenuParamsSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLMenuParamsSpec.m @@ -9,7 +9,7 @@ #import <Nimble/Nimble.h> #import "SDLMenuParams.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLMenuParamsSpec) @@ -27,9 +27,9 @@ describe(@"Initialization tests", ^{ }); it(@"should properly initialize initWithDictionary", ^{ - NSMutableDictionary* dict = [@{SDLNameParentId:@(testParentId), - SDLNamePosition:@(testPosition), - SDLNameMenuName:testMenuName} mutableCopy]; + NSMutableDictionary* dict = [@{SDLRPCParameterNameParentId:@(testParentId), + SDLRPCParameterNamePosition:@(testPosition), + SDLRPCParameterNameMenuName:testMenuName} mutableCopy]; SDLMenuParams* testStruct = [[SDLMenuParams alloc] initWithDictionary:dict]; expect(testStruct.parentID).to(equal(@(testParentId))); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLMetadataTagsSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLMetadataTagsSpec.m index db7d2d855..471508861 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLMetadataTagsSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLMetadataTagsSpec.m @@ -12,7 +12,7 @@ #import <Nimble/Nimble.h> #import "SDLMetadataTags.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" #import "SDLMetadataType.h" QuickSpecBegin(SDLMetadataTagsSpec) diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLModuleDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLModuleDataSpec.m index 8e57eef6b..5a67924ad 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLModuleDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLModuleDataSpec.m @@ -16,7 +16,7 @@ #import "SDLAudioControlData.h" #import "SDLLightControlData.h" #import "SDLHMISettingsControlData.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLModuleDataSpec) @@ -43,13 +43,13 @@ describe(@"Initialization tests", ^{ it(@"should properly initialize initWithDictionary", ^{ - NSMutableDictionary* dict = [@{SDLNameModuleType:SDLModuleTypeRadio, - SDLNameRadioControlData:someRadioData, - SDLNameClimateControlData:someClimateData, - SDLNameSeatControlData:someSeatData, - SDLNameAudioControlData:someAudioData, - SDLNameLightControlData:someLightData, - SDLNameHmiSettingsControlData:someHMISettingsData} mutableCopy]; + NSMutableDictionary* dict = [@{SDLRPCParameterNameModuleType:SDLModuleTypeRadio, + SDLRPCParameterNameRadioControlData:someRadioData, + SDLRPCParameterNameClimateControlData:someClimateData, + SDLRPCParameterNameSeatControlData:someSeatData, + SDLRPCParameterNameAudioControlData:someAudioData, + SDLRPCParameterNameLightControlData:someLightData, + SDLRPCParameterNameHmiSettingsControlData:someHMISettingsData} mutableCopy]; SDLModuleData* testStruct = [[SDLModuleData alloc] initWithDictionary:dict]; expect(testStruct.moduleType).to(equal(SDLModuleTypeRadio)); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLMyKeySpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLMyKeySpec.m index 6d0a462fb..0eab03e46 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLMyKeySpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLMyKeySpec.m @@ -9,7 +9,7 @@ #import <Nimble/Nimble.h> #import "SDLMyKey.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" #import "SDLVehicleDataStatus.h" @@ -25,7 +25,7 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameE911Override:SDLVehicleDataStatusOn} mutableCopy]; + NSMutableDictionary* dict = [@{SDLRPCParameterNameE911Override:SDLVehicleDataStatusOn} mutableCopy]; SDLMyKey* testStruct = [[SDLMyKey alloc] initWithDictionary:dict]; expect(testStruct.e911Override).to(equal(SDLVehicleDataStatusOn)); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLNavigationCapabilitySpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLNavigationCapabilitySpec.m index 99c85cdc8..e6db95484 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLNavigationCapabilitySpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLNavigationCapabilitySpec.m @@ -4,7 +4,7 @@ #import <Nimble/Nimble.h> #import "SDLNavigationCapability.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLNavigationCapabilitySpec) @@ -23,8 +23,8 @@ describe(@"Getter/Setter Tests", ^ { describe(@"Initialization tests", ^{ it(@"Should get correctly when initialized with a dictionary", ^ { - NSDictionary *dict = @{SDLNameGetWayPointsEnabled: @(YES), - SDLNameSendLocationEnabled: @(YES)}; + NSDictionary *dict = @{SDLRPCParameterNameGetWayPointsEnabled: @(YES), + SDLRPCParameterNameSendLocationEnabled: @(YES)}; SDLNavigationCapability* testStruct = [[SDLNavigationCapability alloc] initWithDictionary:dict]; expect(testStruct.getWayPointsEnabled).to(equal(YES)); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLNavigationInstructionSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLNavigationInstructionSpec.m new file mode 100644 index 000000000..f7edb055b --- /dev/null +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLNavigationInstructionSpec.m @@ -0,0 +1,124 @@ +// +// SDLNavigationInstructionSpec.m +// SmartDeviceLinkTests +// +// Created by Nicole on 2/22/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import <Quick/Quick.h> +#import <Nimble/Nimble.h> + +#import "SDLDateTime.h" +#import "SDLImage.h" +#import "SDLLocationDetails.h" +#import "SDLNavigationInstruction.h" +#import "SDLRPCParameterNames.h" + +QuickSpecBegin(SDLNavigationInstructionSpec) + +describe(@"Getter/Setter Tests", ^{ + __block SDLLocationDetails *testLocationDetails = nil; + __block SDLNavigationAction testAction = nil; + __block SDLDateTime *testETA = nil; + __block int testBearing = 34; + __block SDLNavigationJunction testJunctionType = nil; + __block SDLDirection testDrivingSide = nil; + __block NSString *testDetails = nil; + __block SDLImage *testImage = nil; + + beforeEach(^{ + testLocationDetails = [[SDLLocationDetails alloc] init]; + testAction = SDLNavigationActionExit; + testETA = [[SDLDateTime alloc] initWithHour:3 minute:2]; + testJunctionType = SDLNavigationJunctionJughandle; + testDrivingSide = SDLDirectionLeft; + testDetails = @"testDetails"; + testImage = [[SDLImage alloc] init]; + }); + + it(@"Should set and get correctly", ^{ + SDLNavigationInstruction *testStruct = [[SDLNavigationInstruction alloc] init]; + testStruct.locationDetails = testLocationDetails; + testStruct.action = testAction; + testStruct.eta = testETA; + testStruct.bearing = @(testBearing); + testStruct.junctionType = testJunctionType; + testStruct.drivingSide = testDrivingSide; + testStruct.details = testDetails; + testStruct.image = testImage; + + expect(testStruct.locationDetails).to(equal(testLocationDetails)); + expect(testStruct.action).to(equal(testAction)); + expect(testStruct.eta).to(equal(testETA)); + expect(testStruct.bearing).to(equal(testBearing)); + expect(testStruct.junctionType).to(equal(testJunctionType)); + expect(testStruct.drivingSide).to(equal(testDrivingSide)); + expect(testStruct.details).to(equal(testDetails)); + expect(testStruct.image).to(equal(testImage)); + }); + + it(@"Should get correctly when initialized with a dictionary", ^{ + NSDictionary *dict = @{SDLRPCParameterNameLocationDetails:testLocationDetails, + SDLRPCParameterNameAction:testAction, + SDLRPCParameterNameETA:testETA, + SDLRPCParameterNameBearing:@(testBearing), + SDLRPCParameterNameJunctionType:testJunctionType, + SDLRPCParameterNameDrivingSide:testDrivingSide, + SDLRPCParameterNameDetails:testDetails, + SDLRPCParameterNameImage:testImage + }; + SDLNavigationInstruction *testStruct = [[SDLNavigationInstruction alloc] initWithDictionary:dict]; + + expect(testStruct.locationDetails).to(equal(testLocationDetails)); + expect(testStruct.action).to(equal(testAction)); + expect(testStruct.eta).to(equal(testETA)); + expect(testStruct.bearing).to(equal(testBearing)); + expect(testStruct.junctionType).to(equal(testJunctionType)); + expect(testStruct.drivingSide).to(equal(testDrivingSide)); + expect(testStruct.details).to(equal(testDetails)); + expect(testStruct.image).to(equal(testImage)); + }); + + it(@"Should initialize correctly with initWithLocationDetails:action:", ^{ + SDLNavigationInstruction *testStruct = [[SDLNavigationInstruction alloc] initWithLocationDetails:testLocationDetails action:testAction]; + + expect(testStruct.locationDetails).to(equal(testLocationDetails)); + expect(testStruct.action).to(equal(testAction)); + expect(testStruct.eta).to(beNil()); + expect(testStruct.bearing).to(beNil()); + expect(testStruct.junctionType).to(beNil()); + expect(testStruct.drivingSide).to(beNil()); + expect(testStruct.details).to(beNil()); + expect(testStruct.image).to(beNil()); + }); + + it(@"Should initialize correctly with initWithLocationDetails:action:eta:bearing:junctionType:drivingSide:details:details image:", ^{ + SDLNavigationInstruction *testStruct = [[SDLNavigationInstruction alloc] initWithLocationDetails:testLocationDetails action:testAction eta:testETA bearing:testBearing junctionType:testJunctionType drivingSide:testDrivingSide details:testDetails image:testImage]; + + expect(testStruct.locationDetails).to(equal(testLocationDetails)); + expect(testStruct.action).to(equal(testAction)); + expect(testStruct.eta).to(equal(testETA)); + expect(testStruct.bearing).to(equal(testBearing)); + expect(testStruct.junctionType).to(equal(testJunctionType)); + expect(testStruct.drivingSide).to(equal(testDrivingSide)); + expect(testStruct.details).to(equal(testDetails)); + expect(testStruct.image).to(equal(testImage)); + }); + + it(@"Should return nil if not set", ^{ + SDLNavigationInstruction *testStruct = [[SDLNavigationInstruction alloc] init]; + + expect(testStruct.locationDetails).to(beNil()); + expect(testStruct.action).to(beNil()); + expect(testStruct.eta).to(beNil()); + expect(testStruct.bearing).to(beNil()); + expect(testStruct.junctionType).to(beNil()); + expect(testStruct.drivingSide).to(beNil()); + expect(testStruct.details).to(beNil()); + expect(testStruct.image).to(beNil()); + }); +}); + +QuickSpecEnd + diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLNavigationServiceDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLNavigationServiceDataSpec.m new file mode 100644 index 000000000..96ec6dae7 --- /dev/null +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLNavigationServiceDataSpec.m @@ -0,0 +1,132 @@ +// +// SDLNavigationServiceDataSpec.m +// SmartDeviceLinkTests +// +// Created by Nicole on 2/25/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import <Quick/Quick.h> +#import <Nimble/Nimble.h> + +#import "SDLDateTime.h" +#import "SDLLocationDetails.h" +#import "SDLRPCParameterNames.h" +#import "SDLNavigationInstruction.h" +#import "SDLNavigationServiceData.h" + + +QuickSpecBegin(SDLNavigationServiceDataSpec) + +describe(@"Getter/Setter Tests", ^{ + __block SDLDateTime *testTimestamp = nil; + __block SDLLocationDetails *testOrigin = nil; + __block SDLLocationDetails *testDestination = nil; + __block SDLDateTime *testDestinationETA = nil; + __block NSArray<SDLNavigationInstruction *> *testInstructions = nil; + __block SDLDateTime *testNextInstructionETA = nil; + __block float testNextInstructionDistance = 45.3; + __block float testNextInstructionDistanceScale = 0.3; + __block NSString *testPrompt = nil; + + beforeEach(^{ + testTimestamp = [[SDLDateTime alloc] initWithHour:4 minute:3]; + testOrigin = [[SDLLocationDetails alloc] init]; + testDestination = [[SDLLocationDetails alloc] init]; + testDestinationETA = [[SDLDateTime alloc] initWithHour:6 minute:1 second:1 millisecond:1]; + testInstructions = @[[[SDLNavigationInstruction alloc] init], [[SDLNavigationInstruction alloc] init]]; + testNextInstructionETA = [[SDLDateTime alloc] initWithHour:2 minute:0]; + testPrompt = @"testPrompt"; + }); + + it(@"Should set and get correctly", ^{ + SDLNavigationServiceData *testStruct = [[SDLNavigationServiceData alloc] init]; + testStruct.timestamp = testTimestamp; + testStruct.origin = testOrigin; + testStruct.destination = testDestination; + testStruct.destinationETA = testDestinationETA; + testStruct.instructions = testInstructions; + testStruct.nextInstructionETA = testNextInstructionETA; + testStruct.nextInstructionDistance = @(testNextInstructionDistance); + testStruct.nextInstructionDistanceScale = @(testNextInstructionDistanceScale); + testStruct.prompt = testPrompt; + + expect(testStruct.timestamp).to(equal(testTimestamp)); + expect(testStruct.origin).to(equal(testOrigin)); + expect(testStruct.destination).to(equal(testDestination)); + expect(testStruct.destinationETA).to(equal(testDestinationETA)); + expect(testStruct.instructions).to(equal(testInstructions)); + expect(testStruct.nextInstructionETA).to(equal(testNextInstructionETA)); + expect(testStruct.nextInstructionDistance).to(equal(testNextInstructionDistance)); + expect(testStruct.nextInstructionDistanceScale).to(equal(testNextInstructionDistanceScale)); + expect(testStruct.prompt).to(equal(testPrompt)); + }); + + it(@"Should get correctly when initialized with a dictionary", ^{ + NSDictionary *dict = @{SDLRPCParameterNameTimeStamp:testTimestamp, + SDLRPCParameterNameOrigin:testOrigin, + SDLRPCParameterNameDestination:testDestination, + SDLRPCParameterNameDestinationETA:testDestinationETA, + SDLRPCParameterNameInstructions:testInstructions, + SDLRPCParameterNameNextInstructionETA:testNextInstructionETA, + SDLRPCParameterNameNextInstructionDistance:@(testNextInstructionDistance), + SDLRPCParameterNameNextInstructionDistanceScale:@(testNextInstructionDistanceScale), + SDLRPCParameterNamePrompt:testPrompt + }; + SDLNavigationServiceData *testStruct = [[SDLNavigationServiceData alloc] initWithDictionary:dict]; + + expect(testStruct.timestamp).to(equal(testTimestamp)); + expect(testStruct.origin).to(equal(testOrigin)); + expect(testStruct.destination).to(equal(testDestination)); + expect(testStruct.destinationETA).to(equal(testDestinationETA)); + expect(testStruct.instructions).to(equal(testInstructions)); + expect(testStruct.nextInstructionETA).to(equal(testNextInstructionETA)); + expect(testStruct.nextInstructionDistance).to(equal(testNextInstructionDistance)); + expect(testStruct.nextInstructionDistanceScale).to(equal(testNextInstructionDistanceScale)); + expect(testStruct.prompt).to(equal(testPrompt)); + }); + + it(@"Should initialize correctly with initWithTimestamp:", ^{ + SDLNavigationServiceData *testStruct = [[SDLNavigationServiceData alloc] initWithTimestamp:testTimestamp]; + + expect(testStruct.timestamp).to(equal(testTimestamp)); + expect(testStruct.origin).to(beNil()); + expect(testStruct.destination).to(beNil()); + expect(testStruct.destinationETA).to(beNil()); + expect(testStruct.instructions).to(beNil()); + expect(testStruct.nextInstructionETA).to(beNil()); + expect(testStruct.nextInstructionDistance).to(beNil()); + expect(testStruct.nextInstructionDistanceScale).to(beNil()); + expect(testStruct.prompt).to(beNil()); + }); + + it(@"Should initialize correctly with initWithTimestamp:origin:destination:destinationETA:instructions:nextInstructionETA:nextInstructionDistance:nextInstructionDistanceScale:prompt:", ^{ + SDLNavigationServiceData *testStruct = [[SDLNavigationServiceData alloc] initWithTimestamp:testTimestamp origin:testOrigin destination:testDestination destinationETA:testDestinationETA instructions:testInstructions nextInstructionETA:testNextInstructionETA nextInstructionDistance:testNextInstructionDistance nextInstructionDistanceScale:testNextInstructionDistanceScale prompt:testPrompt]; + + expect(testStruct.timestamp).to(equal(testTimestamp)); + expect(testStruct.origin).to(equal(testOrigin)); + expect(testStruct.destination).to(equal(testDestination)); + expect(testStruct.destinationETA).to(equal(testDestinationETA)); + expect(testStruct.instructions).to(equal(testInstructions)); + expect(testStruct.nextInstructionETA).to(equal(testNextInstructionETA)); + expect(testStruct.nextInstructionDistance).to(equal(testNextInstructionDistance)); + expect(testStruct.nextInstructionDistanceScale).to(equal(testNextInstructionDistanceScale)); + expect(testStruct.prompt).to(equal(testPrompt)); + }); + + it(@"Should return nil if not set", ^{ + SDLNavigationServiceData *testStruct = [[SDLNavigationServiceData alloc] init]; + + expect(testStruct.timestamp).to(beNil()); + expect(testStruct.origin).to(beNil()); + expect(testStruct.destination).to(beNil()); + expect(testStruct.destinationETA).to(beNil()); + expect(testStruct.instructions).to(beNil()); + expect(testStruct.nextInstructionETA).to(beNil()); + expect(testStruct.nextInstructionDistance).to(beNil()); + expect(testStruct.nextInstructionDistanceScale).to(beNil()); + expect(testStruct.prompt).to(beNil()); + }); +}); + +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLNavigationServiceManifestSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLNavigationServiceManifestSpec.m new file mode 100644 index 000000000..30786c531 --- /dev/null +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLNavigationServiceManifestSpec.m @@ -0,0 +1,51 @@ +// +// SDLNavigationServiceManifestSpec.m +// SmartDeviceLinkTests +// +// Created by Nicole on 2/25/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import <Quick/Quick.h> +#import <Nimble/Nimble.h> + +#import "SDLRPCParameterNames.h" +#import "SDLNavigationServiceManifest.h" + +QuickSpecBegin(SDLNavigationServiceManifestSpec) + +describe(@"Getter/Setter Tests", ^{ + __block BOOL testAcceptsWayPoints = nil; + + beforeEach(^{ + testAcceptsWayPoints = false; + }); + + it(@"Should set and get correctly", ^{ + SDLNavigationServiceManifest *testStruct = [[SDLNavigationServiceManifest alloc] init]; + testStruct.acceptsWayPoints = @(testAcceptsWayPoints); + + expect(testStruct.acceptsWayPoints).to(equal(testAcceptsWayPoints)); + }); + + it(@"Should get correctly when initialized with a dictionary", ^{ + NSDictionary *dict = @{SDLRPCParameterNameAcceptsWayPoints:@(testAcceptsWayPoints)}; + SDLNavigationServiceManifest *testStruct = [[SDLNavigationServiceManifest alloc] initWithDictionary:dict]; + + expect(testStruct.acceptsWayPoints).to(equal(testAcceptsWayPoints)); + }); + + it(@"Should initialize correctly with a convenience init", ^{ + SDLNavigationServiceManifest *testStruct = [[SDLNavigationServiceManifest alloc] initWithAcceptsWayPoints:testAcceptsWayPoints]; + + expect(testStruct.acceptsWayPoints).to(equal(testAcceptsWayPoints)); + }); + + it(@"Should return nil if not set", ^{ + SDLNavigationServiceManifest *testStruct = [[SDLNavigationServiceManifest alloc] init]; + + expect(testStruct.acceptsWayPoints).to(beNil()); + }); +}); + +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLOasisAddressSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLOasisAddressSpec.m index 5a4bf7cef..dbada5f4e 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLOasisAddressSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLOasisAddressSpec.m @@ -7,7 +7,7 @@ #import <Nimble/Nimble.h> #import "SDLOasisAddress.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLOasisAddressSpec) @@ -38,15 +38,15 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameCountryName:@"United States", - SDLNameCountryCode:@"US", - SDLNamePostalCode:@"123456", - SDLNameAdministrativeArea:@"CA", - SDLNameSubAdministrativeArea:@"Santa Clara", - SDLNameLocality:@"Palo Alto", - SDLNameSubLocality:@"18", - SDLNameThoroughfare:@"Candy Lane", - SDLNameSubThoroughfare:@"123"} mutableCopy]; + NSMutableDictionary* dict = [@{SDLRPCParameterNameCountryName:@"United States", + SDLRPCParameterNameCountryCode:@"US", + SDLRPCParameterNamePostalCode:@"123456", + SDLRPCParameterNameAdministrativeArea:@"CA", + SDLRPCParameterNameSubAdministrativeArea:@"Santa Clara", + SDLRPCParameterNameLocality:@"Palo Alto", + SDLRPCParameterNameSubLocality:@"18", + SDLRPCParameterNameThoroughfare:@"Candy Lane", + SDLRPCParameterNameSubThoroughfare:@"123"} mutableCopy]; SDLOasisAddress* testStruct = [[SDLOasisAddress alloc] initWithDictionary:dict]; expect(testStruct.countryName).to(equal(@"United States")); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLParameterPermissionsSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLParameterPermissionsSpec.m index 92b6a5ef6..746bbea63 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLParameterPermissionsSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLParameterPermissionsSpec.m @@ -10,7 +10,7 @@ #import "SDLParameterPermissions.h" #import "SDLHMILevel.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLParameterPermissionsSpec) @@ -26,8 +26,8 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameAllowed:[@[SDLHMILevelBackground, SDLHMILevelFull] copy], - SDLNameUserDisallowed:[@[SDLHMILevelNone, SDLHMILevelLimited] copy]} mutableCopy]; + NSMutableDictionary* dict = [@{SDLRPCParameterNameAllowed:[@[SDLHMILevelBackground, SDLHMILevelFull] copy], + SDLRPCParameterNameUserDisallowed:[@[SDLHMILevelNone, SDLHMILevelLimited] copy]} mutableCopy]; SDLParameterPermissions* testStruct = [[SDLParameterPermissions alloc] initWithDictionary:dict]; expect(testStruct.allowed).to(equal([@[SDLHMILevelBackground, SDLHMILevelFull] copy])); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLPermissionItemSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLPermissionItemSpec.m index 4ff0ce5e5..8f629a11d 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLPermissionItemSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLPermissionItemSpec.m @@ -11,7 +11,7 @@ #import "SDLHMIPermissions.h" #import "SDLParameterPermissions.h" #import "SDLPermissionItem.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLPermissionItemSpec) @@ -32,9 +32,9 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary<NSString *, id> *dict = [@{SDLNameRPCName:@"RPCNameThing", - SDLNameHMIPermissions:hmiPermissions, - SDLNameParameterPermissions:parameterPermissions} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLRPCParameterNameRPCName:@"RPCNameThing", + SDLRPCParameterNameHMIPermissions:hmiPermissions, + SDLRPCParameterNameParameterPermissions:parameterPermissions} mutableCopy]; SDLPermissionItem* testStruct = [[SDLPermissionItem alloc] initWithDictionary:dict]; expect(testStruct.rpcName).to(equal(@"RPCNameThing")); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLPhoneCapabilitySpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLPhoneCapabilitySpec.m index af01dae52..a38ddec4b 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLPhoneCapabilitySpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLPhoneCapabilitySpec.m @@ -4,7 +4,7 @@ #import <Nimble/Nimble.h> #import "SDLPhoneCapability.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLPhoneCapabilitySpec) @@ -20,7 +20,7 @@ describe(@"Getter/Setter Tests", ^ { describe(@"Initialization tests", ^{ it(@"Should get correctly when initialized with a dictionary", ^ { - NSDictionary *dict = @{SDLNameDialNumberEnabled: @(YES)}; + NSDictionary *dict = @{SDLRPCParameterNameDialNumberEnabled: @(YES)}; SDLPhoneCapability *testStruct = [[SDLPhoneCapability alloc] initWithDictionary:dict]; expect(testStruct.dialNumberEnabled).to(equal(YES)); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLPresetBankCapabilitiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLPresetBankCapabilitiesSpec.m index 8bab3c147..b10eace7b 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLPresetBankCapabilitiesSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLPresetBankCapabilitiesSpec.m @@ -9,7 +9,7 @@ #import <Nimble/Nimble.h> #import "SDLPresetBankCapabilities.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLPresetBankCapabilitiesSpec) @@ -23,7 +23,7 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary<NSString *, id> *dict = [@{SDLNameOnScreenPresetsAvailable:@YES} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLRPCParameterNameOnScreenPresetsAvailable:@YES} mutableCopy]; SDLPresetBankCapabilities* testStruct = [[SDLPresetBankCapabilities alloc] initWithDictionary:dict]; expect(testStruct.onScreenPresetsAvailable).to(equal(@YES)); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLRDSDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLRDSDataSpec.m index 414aaa22c..082f201e3 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLRDSDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLRDSDataSpec.m @@ -9,7 +9,7 @@ #import <Nimble/Nimble.h> #import "SDLRDSData.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLRDSDataSpec) @@ -30,14 +30,14 @@ describe(@"Initialization tests", ^{ it(@"should properly initialize initWithDictionary", ^{ - NSMutableDictionary* dict = [@{SDLNameProgramService : @"ps", - SDLNameRadioText : @"rt", - SDLNameClockText : @"2017-07-25T19:20:30-5:00", - SDLNameProgramIdentification : @"pi", - SDLNameProgramType : @5, - SDLNameTrafficProgramIdentification : @NO, - SDLNameTrafficAnnouncementIdentification : @YES, - SDLNameRegion : @"reg"} mutableCopy]; + NSMutableDictionary* dict = [@{SDLRPCParameterNameProgramService : @"ps", + SDLRPCParameterNameRadioText : @"rt", + SDLRPCParameterNameClockText : @"2017-07-25T19:20:30-5:00", + SDLRPCParameterNameProgramIdentification : @"pi", + SDLRPCParameterNameProgramType : @5, + SDLRPCParameterNameTrafficProgramIdentification : @NO, + SDLRPCParameterNameTrafficAnnouncementIdentification : @YES, + SDLRPCParameterNameRegion : @"reg"} mutableCopy]; SDLRDSData* testStruct = [[SDLRDSData alloc] initWithDictionary:dict]; expect(testStruct.programService).to(equal(@"ps")); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLRGBColorSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLRGBColorSpec.m index 49c423d41..766b72298 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLRGBColorSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLRGBColorSpec.m @@ -3,7 +3,7 @@ #import "SDLRGBColor.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLRGBColorSpec) @@ -38,9 +38,9 @@ describe(@"RGBColor Tests", ^{ }); it(@"Should get correctly when initialized with a dict", ^{ - NSDictionary *dict = @{SDLNameRed: @0, - SDLNameGreen: @100, - SDLNameBlue: @255}; + NSDictionary *dict = @{SDLRPCParameterNameRed: @0, + SDLRPCParameterNameGreen: @100, + SDLRPCParameterNameBlue: @255}; SDLRGBColor *testStruct = [[SDLRGBColor alloc] initWithDictionary:dict]; expect(testStruct.red).to(equal(@0)); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLRadioControlCapabilitiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLRadioControlCapabilitiesSpec.m index d51d7910e..8ac7c7563 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLRadioControlCapabilitiesSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLRadioControlCapabilitiesSpec.m @@ -9,7 +9,7 @@ #import <Nimble/Nimble.h> #import "SDLRadioControlCapabilities.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLRadioControlCapabilitiesSpec) @@ -36,19 +36,19 @@ describe(@"Initialization tests", ^{ it(@"should properly initialize initWithDictionary", ^{ - NSMutableDictionary* dict = [@{SDLNameModuleName : @"someName", - SDLNameRadioEnableAvailable : @YES, - SDLNameRadioBandAvailable : @YES, - SDLNameRadioFrequencyAvailable : @YES, - SDLNameHDChannelAvailable : @NO, - SDLNameRDSDataAvailable : @NO, - SDLNameAvailableHDsAvailable : @NO, - SDLNameStateAvailable : @YES, - SDLNameSignalStrengthAvailable : @YES, - SDLNameSignalChangeThresholdAvailable : @NO, - SDLNameHDRadioEnableAvailable : @YES, - SDLNameSiriusXMRadioAvailable : @NO, - SDLNameSISDataAvailable:@YES + NSMutableDictionary* dict = [@{SDLRPCParameterNameModuleName : @"someName", + SDLRPCParameterNameRadioEnableAvailable : @YES, + SDLRPCParameterNameRadioBandAvailable : @YES, + SDLRPCParameterNameRadioFrequencyAvailable : @YES, + SDLRPCParameterNameHDChannelAvailable : @NO, + SDLRPCParameterNameRDSDataAvailable : @NO, + SDLRPCParameterNameAvailableHDsAvailable : @NO, + SDLRPCParameterNameStateAvailable : @YES, + SDLRPCParameterNameSignalStrengthAvailable : @YES, + SDLRPCParameterNameSignalChangeThresholdAvailable : @NO, + SDLRPCParameterNameHDRadioEnableAvailable : @YES, + SDLRPCParameterNameSiriusXMRadioAvailable : @NO, + SDLRPCParameterNameSISDataAvailable:@YES } mutableCopy]; SDLRadioControlCapabilities* testStruct = [[SDLRadioControlCapabilities alloc] initWithDictionary:dict]; diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLRadioControlDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLRadioControlDataSpec.m index d974c1b2c..58d9f8f92 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLRadioControlDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLRadioControlDataSpec.m @@ -13,7 +13,7 @@ #import "SDLRadioState.h" #import "SDLRDSData.h" #import "SDLSISData.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLRadioControlDataSpec) __block SDLRDSData* someRdsData = [[SDLRDSData alloc] init]; @@ -37,17 +37,17 @@ describe(@"Initialization tests", ^{ }); it(@"should properly initialize initWithDictionary", ^{ - NSMutableDictionary* dict = [@{SDLNameFrequencyInteger : @101, - SDLNameFrequencyFraction : @7, - SDLNameBand : SDLRadioBandAM, - SDLNameRDSData : someRdsData, - SDLNameAvailableHDs : @2, - SDLNameHDChannel : @2, - SDLNameSignalStrength : @54, - SDLNameSignalChangeThreshold : @76, - SDLNameRadioEnable : @YES, - SDLNameState : SDLRadioStateNotFound, - SDLNameHDRadioEnable : @NO + NSMutableDictionary* dict = [@{SDLRPCParameterNameFrequencyInteger : @101, + SDLRPCParameterNameFrequencyFraction : @7, + SDLRPCParameterNameBand : SDLRadioBandAM, + SDLRPCParameterNameRDSData : someRdsData, + SDLRPCParameterNameAvailableHDs : @2, + SDLRPCParameterNameHDChannel : @2, + SDLRPCParameterNameSignalStrength : @54, + SDLRPCParameterNameSignalChangeThreshold : @76, + SDLRPCParameterNameRadioEnable : @YES, + SDLRPCParameterNameState : SDLRadioStateNotFound, + SDLRPCParameterNameHDRadioEnable : @NO } mutableCopy]; SDLRadioControlData* testStruct = [[SDLRadioControlData alloc] initWithDictionary:dict]; diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLRectangleSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLRectangleSpec.m index 87c516bfa..ceb7628e9 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLRectangleSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLRectangleSpec.m @@ -3,7 +3,7 @@ #import <Quick/Quick.h> #import <Nimble/Nimble.h> -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" #import "SDLRectangle.h" QuickSpecBegin(SDLRectangleSpec) @@ -33,10 +33,10 @@ describe(@"Rectangle Tests", ^{ }); it(@"Should get correctly when initialized with a dict", ^{ - NSDictionary *dict = @{SDLNameX:@20, - SDLNameY:@200, - SDLNameWidth:@2000, - SDLNameHeight:@3000}; + NSDictionary *dict = @{SDLRPCParameterNameX:@20, + SDLRPCParameterNameY:@200, + SDLRPCParameterNameWidth:@2000, + SDLRPCParameterNameHeight:@3000}; SDLRectangle *testStruct = [[SDLRectangle alloc] initWithDictionary:dict]; expect(testStruct.x).to(equal(@20)); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLRemoteControlCapabilitiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLRemoteControlCapabilitiesSpec.m index 7067d058d..c8b359d49 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLRemoteControlCapabilitiesSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLRemoteControlCapabilitiesSpec.m @@ -16,7 +16,7 @@ #import "SDLRadioControlCapabilities.h" #import "SDLSeatControlCapabilities.h" #import "SDLButtonCapabilities.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLRemoteControlCapabilitiesSpec) @@ -49,13 +49,13 @@ describe(@"Initialization tests", ^{ it(@"should properly initialize initWithDictionary", ^{ - NSMutableDictionary* dict = [@{SDLNameClimateControlCapabilities : [@[someClimateControlCapabilities] copy], - SDLNameRadioControlCapabilities :[@[someRadioControlCapabilities] copy], - SDLNameButtonCapabilities :[@[someButtonControlCapabilities] copy], - SDLNameSeatControlCapabilities:[@[someSeatControlCapabilities]copy], - SDLNameAudioControlCapabilities :[@[someAudioControlCapabilities] copy], - SDLNameLightControlCapabilities :[@[someLightControlCapabilities] copy], - SDLNameHmiSettingsControlCapabilities : [@[someHMISettingsControlCapabilities] copy] + NSMutableDictionary* dict = [@{SDLRPCParameterNameClimateControlCapabilities : [@[someClimateControlCapabilities] copy], + SDLRPCParameterNameRadioControlCapabilities :[@[someRadioControlCapabilities] copy], + SDLRPCParameterNameButtonCapabilities :[@[someButtonControlCapabilities] copy], + SDLRPCParameterNameSeatControlCapabilities:[@[someSeatControlCapabilities]copy], + SDLRPCParameterNameAudioControlCapabilities :[@[someAudioControlCapabilities] copy], + SDLRPCParameterNameLightControlCapabilities :[@[someLightControlCapabilities] copy], + SDLRPCParameterNameHmiSettingsControlCapabilities : [@[someHMISettingsControlCapabilities] copy] } mutableCopy]; SDLRemoteControlCapabilities* testStruct = [[SDLRemoteControlCapabilities alloc] initWithDictionary:dict]; diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSISDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSISDataSpec.m index 3c20090aa..6803917cb 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSISDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSISDataSpec.m @@ -8,7 +8,7 @@ #import <Quick/Quick.h> #import <Nimble/Nimble.h> -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" #import "SDLSISData.h" #import "SDLStationIDNumber.h" #import "SDLGPSData.h" @@ -48,11 +48,11 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameStationShortName:@"short", - SDLNameStationLongName:@"long", - SDLNameStationLocation:someLocation, - SDLNameStationIDNumber:someID, - SDLNameStationMessage:@"message" + NSMutableDictionary* dict = [@{SDLRPCParameterNameStationShortName:@"short", + SDLRPCParameterNameStationLongName:@"long", + SDLRPCParameterNameStationLocation:someLocation, + SDLRPCParameterNameStationIDNumber:someID, + SDLRPCParameterNameStationMessage:@"message" } mutableCopy]; SDLSISData* testStruct = [[SDLSISData alloc] initWithDictionary:dict]; diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLScreenParamsSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLScreenParamsSpec.m index 6c574d040..421272ba4 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLScreenParamsSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLScreenParamsSpec.m @@ -9,7 +9,7 @@ #import <Nimble/Nimble.h> #import "SDLImageResolution.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" #import "SDLScreenParams.h" #import "SDLTouchEventCapabilities.h" @@ -31,8 +31,8 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary<NSString *, id> *dict = [@{SDLNameResolution:resolution, - SDLNameTouchEventAvailable:capabilities} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLRPCParameterNameResolution:resolution, + SDLRPCParameterNameTouchEventAvailable:capabilities} mutableCopy]; SDLScreenParams* testStruct = [[SDLScreenParams alloc] initWithDictionary:dict]; expect(testStruct.resolution).to(equal(resolution)); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSeatControlCapabilitiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSeatControlCapabilitiesSpec.m index 07f6b8c4a..ed1cb779b 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSeatControlCapabilitiesSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSeatControlCapabilitiesSpec.m @@ -9,7 +9,7 @@ #import <Quick/Quick.h> #import <Nimble/Nimble.h> -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" #import "SDLSeatControlCapabilities.h" @@ -100,22 +100,22 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameModuleName:@"moduleName", - SDLNameHeatingEnabledAvailable:(@YES), - SDLNameCoolingEnabledAvailable:@YES, - SDLNameHeatingLevelAvailable:@YES, - SDLNameCoolingLevelAvailable:@NO, - SDLNameHorizontalPositionAvailable:@NO, - SDLNameVerticalPositionAvailable:@NO, - SDLNameFrontVerticalPositionAvailable:@NO, - SDLNameBackVerticalPositionAvailable:@NO, - SDLNameBackTiltAngleAvailable:@YES, - SDLNameHeadSupportHorizontalPositionAvailable:@NO, - SDLNameHeadSupportVerticalPositionAvailable:@YES, - SDLNameMassageEnabledAvailable:@NO, - SDLNameMassageModeAvailable:@YES, - SDLNameMassageCushionFirmnessAvailable:@NO, - SDLNameMemoryAvailable:@NO + NSMutableDictionary* dict = [@{SDLRPCParameterNameModuleName:@"moduleName", + SDLRPCParameterNameHeatingEnabledAvailable:(@YES), + SDLRPCParameterNameCoolingEnabledAvailable:@YES, + SDLRPCParameterNameHeatingLevelAvailable:@YES, + SDLRPCParameterNameCoolingLevelAvailable:@NO, + SDLRPCParameterNameHorizontalPositionAvailable:@NO, + SDLRPCParameterNameVerticalPositionAvailable:@NO, + SDLRPCParameterNameFrontVerticalPositionAvailable:@NO, + SDLRPCParameterNameBackVerticalPositionAvailable:@NO, + SDLRPCParameterNameBackTiltAngleAvailable:@YES, + SDLRPCParameterNameHeadSupportHorizontalPositionAvailable:@NO, + SDLRPCParameterNameHeadSupportVerticalPositionAvailable:@YES, + SDLRPCParameterNameMassageEnabledAvailable:@NO, + SDLRPCParameterNameMassageModeAvailable:@YES, + SDLRPCParameterNameMassageCushionFirmnessAvailable:@NO, + SDLRPCParameterNameMemoryAvailable:@NO } mutableCopy]; SDLSeatControlCapabilities *testStruct = [[SDLSeatControlCapabilities alloc] initWithDictionary:dict]; diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSeatControlDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSeatControlDataSpec.m index 02dc0500f..f7b75b357 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSeatControlDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSeatControlDataSpec.m @@ -8,7 +8,7 @@ #import <Quick/Quick.h> #import <Nimble/Nimble.h> -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" #import "SDLSeatControlData.h" #import "SDLMassageModeData.h" #import "SDLMassageCushionFirmness.h" @@ -109,22 +109,22 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameId:SDLSupportedSeatDriver, - SDLNameHeatingEnabled:@NO, - SDLNameCoolingEnabled:@YES, - SDLNameHeatingLevel:@25, - SDLNameCoolingLevel:@10, - SDLNameHorizontalPosition:@23, - SDLNameVerticalPosition:@25, - SDLNameFrontVerticalPosition:@12, - SDLNameBackVerticalPosition:@34, - SDLNameBackTiltAngle:@2, - SDLNameHeadSupportHorizontalPosition:@3, - SDLNameHeadSupportVerticalPosition:@43, - SDLNameMassageEnabled:@YES, - SDLNameMassageMode:[@[massageModeData] mutableCopy], - SDLNameMassageCushionFirmness:[@[massageCushionFirmness] mutableCopy], - SDLNameMemory:seatMemoryAction + NSMutableDictionary* dict = [@{SDLRPCParameterNameId:SDLSupportedSeatDriver, + SDLRPCParameterNameHeatingEnabled:@NO, + SDLRPCParameterNameCoolingEnabled:@YES, + SDLRPCParameterNameHeatingLevel:@25, + SDLRPCParameterNameCoolingLevel:@10, + SDLRPCParameterNameHorizontalPosition:@23, + SDLRPCParameterNameVerticalPosition:@25, + SDLRPCParameterNameFrontVerticalPosition:@12, + SDLRPCParameterNameBackVerticalPosition:@34, + SDLRPCParameterNameBackTiltAngle:@2, + SDLRPCParameterNameHeadSupportHorizontalPosition:@3, + SDLRPCParameterNameHeadSupportVerticalPosition:@43, + SDLRPCParameterNameMassageEnabled:@YES, + SDLRPCParameterNameMassageMode:[@[massageModeData] mutableCopy], + SDLRPCParameterNameMassageCushionFirmness:[@[massageCushionFirmness] mutableCopy], + SDLRPCParameterNameMemory:seatMemoryAction } mutableCopy]; SDLSeatControlData *testStruct = [[SDLSeatControlData alloc] initWithDictionary:dict]; diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSeatMemoryActionSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSeatMemoryActionSpec.m index a256e50a8..aaeece688 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSeatMemoryActionSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSeatMemoryActionSpec.m @@ -8,7 +8,7 @@ #import <Quick/Quick.h> #import <Nimble/Nimble.h> -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" #import "SDLSeatMemoryAction.h" QuickSpecBegin(SDLSeatMemoryActionSpec) @@ -37,9 +37,9 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameId:@54, - SDLNameLabel:@"none", - SDLNameAction: SDLSeatMemoryActionTypeNone + NSMutableDictionary* dict = [@{SDLRPCParameterNameId:@54, + SDLRPCParameterNameLabel:@"none", + SDLRPCParameterNameAction: SDLSeatMemoryActionTypeNone } mutableCopy]; SDLSeatMemoryAction *testStruct = [[SDLSeatMemoryAction alloc] initWithDictionary:dict]; diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSingleTireStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSingleTireStatusSpec.m index 1fc06535e..41b685e31 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSingleTireStatusSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSingleTireStatusSpec.m @@ -10,7 +10,7 @@ #import "SDLSingleTireStatus.h" #import "SDLComponentVolumeStatus.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLSingleTireStatusSpec) @@ -29,9 +29,9 @@ describe(@"Getter/Setter Tests", ^ { it(@"Should get correctly when initialized", ^ { NSDictionary* dict = @{ - SDLNameStatus: SDLComponentVolumeStatusLow, - SDLNameTPMS: SDLTPMSLow, - SDLNamePressure: @67.78 + SDLRPCParameterNameStatus: SDLComponentVolumeStatusLow, + SDLRPCParameterNameTPMS: SDLTPMSLow, + SDLRPCParameterNamePressure: @67.78 }; SDLSingleTireStatus* testStruct = [[SDLSingleTireStatus alloc] initWithDictionary:dict]; diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSoftButtonCapabilitiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSoftButtonCapabilitiesSpec.m index 4000f2764..131ddebf1 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSoftButtonCapabilitiesSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSoftButtonCapabilitiesSpec.m @@ -9,7 +9,7 @@ #import <Nimble/Nimble.h> #import "SDLSoftButtonCapabilities.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLSoftButtonCapabilitiesSpec) @@ -29,10 +29,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary<NSString *, id> *dict = [@{SDLNameShortPressAvailable:@NO, - SDLNameLongPressAvailable:@YES, - SDLNameUpDownAvailable:@NO, - SDLNameImageSupported:@NO} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLRPCParameterNameShortPressAvailable:@NO, + SDLRPCParameterNameLongPressAvailable:@YES, + SDLRPCParameterNameUpDownAvailable:@NO, + SDLRPCParameterNameImageSupported:@NO} mutableCopy]; SDLSoftButtonCapabilities* testStruct = [[SDLSoftButtonCapabilities alloc] initWithDictionary:dict]; expect(testStruct.shortPressAvailable).to(equal(@NO)); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSoftButtonSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSoftButtonSpec.m index df938b7dc..6c637bc38 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSoftButtonSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSoftButtonSpec.m @@ -9,7 +9,7 @@ #import <Nimble/Nimble.h> #import "SDLImage.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" #import "SDLSoftButton.h" #import "SDLSoftButtonType.h" #import "SDLSystemAction.h" @@ -39,12 +39,12 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameType:SDLSoftButtonTypeImage, - SDLNameText:@"Button", - SDLNameImage:image, - SDLNameIsHighlighted:@YES, - SDLNameSoftButtonId:@5423, - SDLNameSystemAction:SDLSystemActionKeepContext} mutableCopy]; + NSMutableDictionary* dict = [@{SDLRPCParameterNameType:SDLSoftButtonTypeImage, + SDLRPCParameterNameText:@"Button", + SDLRPCParameterNameImage:image, + SDLRPCParameterNameIsHighlighted:@YES, + SDLRPCParameterNameSoftButtonId:@5423, + SDLRPCParameterNameSystemAction:SDLSystemActionKeepContext} mutableCopy]; SDLSoftButton* testStruct = [[SDLSoftButton alloc] initWithDictionary:dict]; expect(testStruct.type).to(equal(SDLSoftButtonTypeImage)); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLStartTimeSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLStartTimeSpec.m index 209b8d75d..f4ba0eacd 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLStartTimeSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLStartTimeSpec.m @@ -9,7 +9,7 @@ #import <Nimble/Nimble.h> #import "SDLStartTime.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLStartTimeSpec) @@ -30,9 +30,9 @@ describe(@"StartTime Spec", ^ { }); it(@"should properly initialize with initWithDictionary:", ^{ - NSDictionary<NSString *, id> *dict = @{SDLNameHours:@(testHours), - SDLNameMinutes:@(testMinutes), - SDLNameSeconds:@(testSeconds)}; + NSDictionary<NSString *, id> *dict = @{SDLRPCParameterNameHours:@(testHours), + SDLRPCParameterNameMinutes:@(testMinutes), + SDLRPCParameterNameSeconds:@(testSeconds)}; SDLStartTime *testStruct = [[SDLStartTime alloc] initWithDictionary:dict]; expect(testStruct.hours).to(equal(@(testHours))); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLStationIDNumberSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLStationIDNumberSpec.m index 3cd543f80..92390aab4 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLStationIDNumberSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLStationIDNumberSpec.m @@ -8,7 +8,7 @@ #import <Quick/Quick.h> #import <Nimble/Nimble.h> -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" #import "SDLStationIDNumber.h" QuickSpecBegin(SDLStationIDNumberSpec) @@ -33,8 +33,8 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameCountryCode:@91, - SDLNameFCCFacilityId:@23 + NSMutableDictionary* dict = [@{SDLRPCParameterNameCountryCode:@91, + SDLRPCParameterNameFCCFacilityId:@23 } mutableCopy]; SDLStationIDNumber* testStruct = [[SDLStationIDNumber alloc] initWithDictionary:dict]; diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSyncMsgVersionSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSyncMsgVersionSpec.m index 598f04d2e..f8bc93df5 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSyncMsgVersionSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSyncMsgVersionSpec.m @@ -9,7 +9,7 @@ #import <Nimble/Nimble.h> #import "SDLSyncMsgVersion.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLSyncMsgVersionSpec) @@ -27,9 +27,9 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameMajorVersion:@4, - SDLNameMinorVersion:@532, - SDLNamePatchVersion:@12} mutableCopy]; + NSMutableDictionary* dict = [@{SDLRPCParameterNameMajorVersion:@4, + SDLRPCParameterNameMinorVersion:@532, + SDLRPCParameterNamePatchVersion:@12} mutableCopy]; SDLSyncMsgVersion* testStruct = [[SDLSyncMsgVersion alloc] initWithDictionary:dict]; expect(testStruct.majorVersion).to(equal(@4)); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSystemCapabilitySpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSystemCapabilitySpec.m index abfd13afb..c759058d8 100755 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSystemCapabilitySpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSystemCapabilitySpec.m @@ -5,69 +5,93 @@ #import "SDLSystemCapability.h" +#import "SDLAppServicesCapabilities.h" #import "SDLImageResolution.h" #import "SDLNavigationCapability.h" #import "SDLPhoneCapability.h" #import "SDLSystemCapabilityType.h" #import "SDLRemoteControlCapabilities.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" #import "SDLVideoStreamingCapability.h" #import "SDLVideoStreamingCodec.h" #import "SDLVideoStreamingFormat.h" #import "SDLVideoStreamingProtocol.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLSystemCapabilitySpec) -SDLRemoteControlCapabilities *someRemoteControlCapabilities = [[SDLRemoteControlCapabilities alloc] init]; describe(@"Getter/Setter Tests", ^ { + __block SDLAppServicesCapabilities *testAppServicesCapabilities = nil; + __block SDLNavigationCapability *testNavigationCapability = nil; + __block SDLPhoneCapability *testPhoneCapability = nil; + __block SDLRemoteControlCapabilities *testRemoteControlCapabilities = nil; + __block SDLVideoStreamingCapability *testVideoStreamingCapability = nil; + + beforeEach(^{ + testAppServicesCapabilities = [[SDLAppServicesCapabilities alloc] initWithAppServices:nil]; + testNavigationCapability = [[SDLNavigationCapability alloc] initWithSendLocation:YES waypoints:NO]; + testPhoneCapability = [[SDLPhoneCapability alloc] initWithDialNumber:YES]; + testRemoteControlCapabilities = [[SDLRemoteControlCapabilities alloc] initWithClimateControlCapabilities:nil radioControlCapabilities:nil buttonCapabilities:nil seatControlCapabilities:nil audioControlCapabilities:nil hmiSettingsControlCapabilities:nil lightControlCapabilities:nil]; + testVideoStreamingCapability = [[SDLVideoStreamingCapability alloc] initWithPreferredResolution:[[SDLImageResolution alloc] initWithWidth:50 height:50] maxBitrate:5 supportedFormats:@[] hapticDataSupported:false]; + }); + it(@"Should set and get correctly", ^ { SDLSystemCapability *testStruct = [[SDLSystemCapability alloc] init]; - testStruct.systemCapabilityType = SDLSystemCapabilityTypeNavigation; - testStruct.navigationCapability = [[SDLNavigationCapability alloc] initWithSendLocation:YES waypoints:NO]; - testStruct.phoneCapability = [[SDLPhoneCapability alloc] initWithDialNumber:YES]; - testStruct.remoteControlCapability = someRemoteControlCapabilities; + testStruct.appServicesCapabilities = testAppServicesCapabilities; + testStruct.navigationCapability = testNavigationCapability; + testStruct.phoneCapability = testPhoneCapability; + testStruct.videoStreamingCapability = testVideoStreamingCapability; + testStruct.remoteControlCapability = testRemoteControlCapabilities; expect(testStruct.systemCapabilityType).to(equal(SDLSystemCapabilityTypeNavigation)); - expect(testStruct.navigationCapability.sendLocationEnabled).to(equal(YES)); - expect(testStruct.navigationCapability.getWayPointsEnabled).to(equal(NO)); - expect(testStruct.phoneCapability.dialNumberEnabled).to(equal(YES)); - - testStruct.systemCapabilityType = SDLSystemCapabilityTypeVideoStreaming; - - expect(testStruct.systemCapabilityType).to(equal(SDLSystemCapabilityTypeVideoStreaming)); - expect(testStruct.remoteControlCapability).to(equal(someRemoteControlCapabilities)); - + expect(testStruct.appServicesCapabilities).to(equal(testAppServicesCapabilities)); + expect(testStruct.navigationCapability).to(equal(testNavigationCapability)); + expect(testStruct.phoneCapability).to(equal(testPhoneCapability)); + expect(testStruct.videoStreamingCapability).to(equal(testVideoStreamingCapability)); + expect(testStruct.remoteControlCapability).to(equal(testRemoteControlCapabilities)); }); -}); -describe(@"Initialization tests", ^{ it(@"Should get correctly when initialized with a dictionary", ^ { - NSMutableDictionary* dict = [@{SDLNameSystemCapabilityType: @"NAVIGATION", - SDLNameNavigationCapability: @{SDLNameGetWayPointsEnabled: @(NO), - SDLNameSendLocationEnabled: @(YES)}, - SDLNamePhoneCapability: @{SDLNameDialNumberEnabled: @(YES)}, - SDLNameRemoteControlCapability: someRemoteControlCapabilities} mutableCopy]; + NSDictionary *dict = @{ + SDLRPCParameterNameSystemCapabilityType:SDLSystemCapabilityTypeNavigation, + SDLRPCParameterNameAppServicesCapabilities:testAppServicesCapabilities, + SDLRPCParameterNameNavigationCapability:testNavigationCapability, + SDLRPCParameterNamePhoneCapability:testPhoneCapability, + SDLRPCParameterNameRemoteControlCapability:testRemoteControlCapabilities, + SDLRPCParameterNameVideoStreamingCapability:testVideoStreamingCapability + }; SDLSystemCapability *testStruct = [[SDLSystemCapability alloc] initWithDictionary:dict]; expect(testStruct.systemCapabilityType).to(equal(SDLSystemCapabilityTypeNavigation)); - expect(testStruct.navigationCapability.sendLocationEnabled).to(equal(YES)); - expect(testStruct.navigationCapability.getWayPointsEnabled).to(equal(NO)); - expect(testStruct.phoneCapability.dialNumberEnabled).to(equal(YES)); - expect(testStruct.remoteControlCapability).to(equal(someRemoteControlCapabilities)); + expect(testStruct.appServicesCapabilities).to(equal(testAppServicesCapabilities)); + expect(testStruct.navigationCapability).to(equal(testNavigationCapability)); + expect(testStruct.phoneCapability).to(equal(testPhoneCapability)); + expect(testStruct.remoteControlCapability).to(equal(testRemoteControlCapabilities)); + expect(testStruct.videoStreamingCapability).to(equal(testVideoStreamingCapability)); }); it(@"Should return nil if not set", ^ { SDLSystemCapability *testStruct = [[SDLSystemCapability alloc] init]; expect(testStruct.systemCapabilityType).to(beNil()); + expect(testStruct.appServicesCapabilities).to(beNil()); expect(testStruct.navigationCapability).to(beNil()); expect(testStruct.phoneCapability).to(beNil()); expect(testStruct.videoStreamingCapability).to(beNil()); expect(testStruct.remoteControlCapability).to(beNil()); + }); + it(@"should initialize correctly with initWithAppServicesCapabilities:", ^{ + SDLSystemCapability *testStruct = [[SDLSystemCapability alloc] initWithAppServicesCapabilities:testAppServicesCapabilities]; + + expect(testStruct.systemCapabilityType).to(equal(SDLSystemCapabilityTypeAppServices)); + expect(testStruct.appServicesCapabilities).to(equal(testAppServicesCapabilities)); + expect(testStruct.navigationCapability).to(beNil()); + expect(testStruct.phoneCapability).to(beNil()); + expect(testStruct.remoteControlCapability).to(beNil()); + expect(testStruct.videoStreamingCapability).to(beNil()); }); it(@"should initialize correctly with initWithPhoneCapability:", ^{ @@ -75,10 +99,11 @@ describe(@"Initialization tests", ^{ SDLSystemCapability *testStruct = [[SDLSystemCapability alloc] initWithPhoneCapability:testPhoneStruct]; expect(testStruct.systemCapabilityType).to(equal(SDLSystemCapabilityTypePhoneCall)); - expect(testStruct.phoneCapability.dialNumberEnabled).to(equal(YES)); + expect(testStruct.appServicesCapabilities).to(beNil()); expect(testStruct.navigationCapability).to(beNil()); - expect(testStruct.videoStreamingCapability).to(beNil()); + expect(testStruct.phoneCapability).to(equal(testPhoneStruct)); expect(testStruct.remoteControlCapability).to(beNil()); + expect(testStruct.videoStreamingCapability).to(beNil()); }); it(@"should initialize correctly with initWithNavigationCapability:", ^{ @@ -86,11 +111,11 @@ describe(@"Initialization tests", ^{ SDLSystemCapability *testStruct = [[SDLSystemCapability alloc] initWithNavigationCapability:testNavStruct]; expect(testStruct.systemCapabilityType).to(equal(SDLSystemCapabilityTypeNavigation)); - expect(testStruct.navigationCapability.sendLocationEnabled).to(equal(YES)); - expect(testStruct.navigationCapability.getWayPointsEnabled).to(equal(YES)); + expect(testStruct.appServicesCapabilities).to(beNil()); + expect(testStruct.navigationCapability).to(equal(testNavStruct)); expect(testStruct.phoneCapability).to(beNil()); - expect(testStruct.videoStreamingCapability).to(beNil()); expect(testStruct.remoteControlCapability).to(beNil()); + expect(testStruct.videoStreamingCapability).to(beNil()); }); it(@"should initialize correctly with initWithVideoStreamingCapability:", ^{ @@ -115,19 +140,22 @@ describe(@"Initialization tests", ^{ SDLSystemCapability *testStruct = [[SDLSystemCapability alloc] initWithVideoStreamingCapability:testVidStruct]; expect(testStruct.systemCapabilityType).to(equal(SDLSystemCapabilityTypeVideoStreaming)); - expect(testStruct.navigationCapability.sendLocationEnabled).to(beNil()); - expect(testStruct.navigationCapability.getWayPointsEnabled).to(beNil()); + expect(testStruct.appServicesCapabilities).to(beNil()); + expect(testStruct.navigationCapability).to(beNil()); expect(testStruct.phoneCapability).to(beNil()); - + expect(testStruct.remoteControlCapability).to(beNil()); + expect(testStruct.videoStreamingCapability).to(equal(testVidStruct)); }); it(@"should initialize correctly with initWithRemoteControlCapability:", ^{ - SDLSystemCapability *testStruct = [[SDLSystemCapability alloc] initWithRemoteControlCapability:someRemoteControlCapabilities]; + SDLSystemCapability *testStruct = [[SDLSystemCapability alloc] initWithRemoteControlCapability:testRemoteControlCapabilities]; expect(testStruct.systemCapabilityType).to(equal(SDLSystemCapabilityTypeRemoteControl)); + expect(testStruct.appServicesCapabilities).to(beNil()); expect(testStruct.navigationCapability).to(beNil()); expect(testStruct.phoneCapability).to(beNil()); - expect(testStruct.remoteControlCapability).to(equal(someRemoteControlCapabilities)); + expect(testStruct.remoteControlCapability).to(equal(testRemoteControlCapabilities)); + expect(testStruct.videoStreamingCapability).to(beNil()); }); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTTSChunkSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTTSChunkSpec.m index ef4d741ec..3111d04a0 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTTSChunkSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTTSChunkSpec.m @@ -8,7 +8,7 @@ #import <Quick/Quick.h> #import <Nimble/Nimble.h> -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" #import "SDLSpeechCapabilities.h" #import "SDLTTSChunk.h" @@ -30,8 +30,8 @@ describe(@"TTS Chunk Tests", ^{ }); it(@"should correctly initialize with initWithDictionary", ^{ - NSDictionary* dict = @{SDLNameText: testText, - SDLNameType: testCapabilities}; + NSDictionary* dict = @{SDLRPCParameterNameText: testText, + SDLRPCParameterNameType: testCapabilities}; testStruct = [[SDLTTSChunk alloc] initWithDictionary:dict]; expect(testStruct.text).to(equal(testText)); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTemperatureSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTemperatureSpec.m index 9151e0df5..3e234d098 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTemperatureSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTemperatureSpec.m @@ -10,7 +10,7 @@ #import "SDLTemperature.h" #import "SDLTemperatureUnit.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLTemperatureSpec) @@ -25,20 +25,36 @@ describe(@"Initialization tests", ^{ it(@"should properly initialize initWithDictionary", ^{ - NSMutableDictionary* dict = [@{SDLNameUnit : SDLTemperatureUnitCelsius , - SDLNameValue:@30 } mutableCopy]; + NSMutableDictionary* dict = [@{SDLRPCParameterNameUnit : SDLTemperatureUnitCelsius , + SDLRPCParameterNameValue:@30 } mutableCopy]; SDLTemperature* testStruct = [[SDLTemperature alloc] initWithDictionary:dict]; expect(testStruct.unit).to(equal(SDLTemperatureUnitCelsius)); expect(testStruct.value).to(equal(@30)); }); - it(@"should initialize correctly with Unit and value", ^{ + it(@"should initialize correctly with initWithUnit:value:", ^{ SDLTemperature *testStruct = [[SDLTemperature alloc] initWithUnit:SDLTemperatureUnitCelsius value:30]; expect(testStruct.unit).to(equal(SDLTemperatureUnitCelsius)); expect(testStruct.value).to(equal(@30)); }); + + it(@"should initialize correctly with initWithFahrenheitValue:", ^{ + float fahrenheitValue = 22.121; + SDLTemperature *testStruct = [[SDLTemperature alloc] initWithFahrenheitValue:fahrenheitValue]; + + expect(testStruct.unit).to(equal(SDLTemperatureUnitFahrenheit)); + expect(testStruct.value).to(equal(fahrenheitValue)); + }); + + it(@"should initialize correctly with initWithCelsiusValue:", ^{ + float celsiusValue = -40.2; + SDLTemperature *testStruct = [[SDLTemperature alloc] initWithCelsiusValue:celsiusValue]; + + expect(testStruct.unit).to(equal(SDLTemperatureUnitCelsius)); + expect(testStruct.value).to(equal(celsiusValue)); + }); it(@"Should set and get correctly", ^{ SDLTemperature* testStruct = [[SDLTemperature alloc] init]; diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTemplateColorSchemeSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTemplateColorSchemeSpec.m index 48112cf6f..f52354d7b 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTemplateColorSchemeSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTemplateColorSchemeSpec.m @@ -4,7 +4,7 @@ #import "SDLRGBColor.h" #import "SDLTemplateColorScheme.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLTemplateColorSchemeSpec) @@ -51,9 +51,9 @@ describe(@"TemplateColor Tests", ^{ }); it(@"Should get correctly when initialized with a dict", ^{ - NSDictionary *dict = @{SDLNameRed: @0, - SDLNameGreen: @100, - SDLNameBlue: @255}; + NSDictionary *dict = @{SDLRPCParameterNameRed: @0, + SDLRPCParameterNameGreen: @100, + SDLRPCParameterNameBlue: @255}; SDLRGBColor *testStruct = [[SDLRGBColor alloc] initWithDictionary:dict]; expect(testStruct.red).to(equal(@0)); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTextFieldSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTextFieldSpec.m index 065945f48..983ec47a1 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTextFieldSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTextFieldSpec.m @@ -9,7 +9,7 @@ #import <Nimble/Nimble.h> #import "SDLCharacterSet.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" #import "SDLTextField.h" #import "SDLTextFieldName.h" @@ -32,10 +32,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameName:SDLTextFieldNameTertiaryText, - SDLNameCharacterSet:SDLCharacterSetType5, - SDLNameWidth:@111, - SDLNameRows:@4} mutableCopy]; + NSMutableDictionary* dict = [@{SDLRPCParameterNameName:SDLTextFieldNameTertiaryText, + SDLRPCParameterNameCharacterSet:SDLCharacterSetType5, + SDLRPCParameterNameWidth:@111, + SDLRPCParameterNameRows:@4} mutableCopy]; SDLTextField* testStruct = [[SDLTextField alloc] initWithDictionary:dict]; expect(testStruct.name).to(equal(SDLTextFieldNameTertiaryText)); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTireStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTireStatusSpec.m index ebe9eb7e3..67243d863 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTireStatusSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTireStatusSpec.m @@ -11,7 +11,7 @@ #import "SDLTireStatus.h" #import "SDLSingleTireStatus.h" #import "SDLWarningLightStatus.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLTireStatusSpec) @@ -44,13 +44,13 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNamePressureTelltale:SDLWarningLightStatusOff, - SDLNameLeftFront:tire1, - SDLNameRightFront:tire2, - SDLNameLeftRear:tire3, - SDLNameRightRear:tire4, - SDLNameInnerLeftRear:tire5, - SDLNameInnerRightRear:tire6} mutableCopy]; + NSMutableDictionary* dict = [@{SDLRPCParameterNamePressureTelltale:SDLWarningLightStatusOff, + SDLRPCParameterNameLeftFront:tire1, + SDLRPCParameterNameRightFront:tire2, + SDLRPCParameterNameLeftRear:tire3, + SDLRPCParameterNameRightRear:tire4, + SDLRPCParameterNameInnerLeftRear:tire5, + SDLRPCParameterNameInnerRightRear:tire6} mutableCopy]; SDLTireStatus* testStruct = [[SDLTireStatus alloc] initWithDictionary:dict]; expect(testStruct.pressureTelltale).to(equal(SDLWarningLightStatusOff)); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchCoordSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchCoordSpec.m index bc9ab9495..c0dcee58a 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchCoordSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchCoordSpec.m @@ -9,7 +9,7 @@ #import <Nimble/Nimble.h> #import "SDLTouchCoord.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLTouchCoordSpec) @@ -25,8 +25,8 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary<NSString *, id> *dict = [@{SDLNameX:@67, - SDLNameY:@362} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLRPCParameterNameX:@67, + SDLRPCParameterNameY:@362} mutableCopy]; SDLTouchCoord* testStruct = [[SDLTouchCoord alloc] initWithDictionary:dict]; expect(testStruct.x).to(equal(@67)); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchEventCapabilitiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchEventCapabilitiesSpec.m index 6df769068..e54ec7b26 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchEventCapabilitiesSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchEventCapabilitiesSpec.m @@ -9,7 +9,7 @@ #import <Nimble/Nimble.h> #import "SDLTouchEventCapabilities.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLTouchEventCapabilitiesSpec) @@ -27,9 +27,9 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary<NSString *, id> *dict = [@{SDLNamePressAvailable:@YES, - SDLNameMultiTouchAvailable:@NO, - SDLNameDoublePressAvailable:@NO} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLRPCParameterNamePressAvailable:@YES, + SDLRPCParameterNameMultiTouchAvailable:@NO, + SDLRPCParameterNameDoublePressAvailable:@NO} mutableCopy]; SDLTouchEventCapabilities* testStruct = [[SDLTouchEventCapabilities alloc] initWithDictionary:dict]; expect(testStruct.pressAvailable).to(equal(@YES)); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchEventSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchEventSpec.m index 0419916e5..1939c356e 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchEventSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchEventSpec.m @@ -10,7 +10,7 @@ #import "SDLTouchEvent.h" #import "SDLTouchCoord.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLTouchEventSpec) @@ -30,9 +30,9 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary<NSString *, id> *dict = [@{SDLNameId:@3, - SDLNameTimestamp:[@[@23, @52, @41345234] mutableCopy], - SDLNameCoordinate:[@[coord] mutableCopy]} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLRPCParameterNameId:@3, + SDLRPCParameterNameTS:[@[@23, @52, @41345234] mutableCopy], + SDLRPCParameterNameCoordinate:[@[coord] mutableCopy]} mutableCopy]; SDLTouchEvent* testStruct = [[SDLTouchEvent alloc] initWithDictionary:dict]; expect(testStruct.touchEventId).to(equal(@3)); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTurnSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTurnSpec.m index c445da76e..defce62e7 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTurnSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTurnSpec.m @@ -9,7 +9,7 @@ #import <Nimble/Nimble.h> #import "SDLTurn.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" #import "SDLImage.h" QuickSpecBegin(SDLTurnSpec) @@ -28,8 +28,8 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary<NSString *, id> *dict = [@{SDLNameNavigationText:@"NAVTEXT", - SDLNameTurnIcon:image} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLRPCParameterNameNavigationText:@"NAVTEXT", + SDLRPCParameterNameTurnIcon:image} mutableCopy]; SDLTurn* testStruct = [[SDLTurn alloc] initWithDictionary:dict]; expect(testStruct.navigationText).to(equal(@"NAVTEXT")); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVehicleDataResultSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVehicleDataResultSpec.m index fba4445bc..0c1c6c899 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVehicleDataResultSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVehicleDataResultSpec.m @@ -11,7 +11,7 @@ #import "SDLVehicleDataResult.h" #import "SDLVehicleDataResultCode.h" #import "SDLVehicleDataType.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLVehicleDataResultSpec) @@ -27,8 +27,8 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameDataType:SDLVehicleDataTypeAirbagStatus, - SDLNameResultCode:SDLVehicleDataResultCodeDisallowed} mutableCopy]; + NSMutableDictionary* dict = [@{SDLRPCParameterNameDataType:SDLVehicleDataTypeAirbagStatus, + SDLRPCParameterNameResultCode:SDLVehicleDataResultCodeDisallowed} mutableCopy]; SDLVehicleDataResult* testStruct = [[SDLVehicleDataResult alloc] initWithDictionary:dict]; expect(testStruct.dataType).to(equal(SDLVehicleDataTypeAirbagStatus)); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVehicleTypeSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVehicleTypeSpec.m index eefc4618b..a4f3efa0d 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVehicleTypeSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVehicleTypeSpec.m @@ -9,7 +9,7 @@ #import <Nimble/Nimble.h> #import "SDLVehicleType.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLVehicleTypeSpec) @@ -29,10 +29,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary<NSString *, id> *dict = [@{SDLNameMake:@"Make", - SDLNameModel:@"Model", - SDLNameModelYear:@"3.141*10^36", - SDLNameTrim:@"AE"} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLRPCParameterNameMake:@"Make", + SDLRPCParameterNameModel:@"Model", + SDLRPCParameterNameModelYear:@"3.141*10^36", + SDLRPCParameterNameTrim:@"AE"} mutableCopy]; SDLVehicleType* testStruct = [[SDLVehicleType alloc] initWithDictionary:dict]; expect(testStruct.make).to(equal(@"Make")); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVideoStreamingCapabilitySpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVideoStreamingCapabilitySpec.m index ce42ce9d2..274d625d5 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVideoStreamingCapabilitySpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVideoStreamingCapabilitySpec.m @@ -11,7 +11,7 @@ #import <Quick/Quick.h> #import <Nimble/Nimble.h> -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" #import "SDLImageResolution.h" #import "SDLVideoStreamingCapability.h" #import "SDLVideoStreamingCodec.h" @@ -39,10 +39,10 @@ describe(@"Initialization tests", ^{ NSArray<SDLVideoStreamingFormat *> *formatArray = @[format1, format2]; - NSMutableDictionary* dict = [@{SDLNamePreferredResolution: resolution, - SDLNameMaxBitrate: maxBitrate, - SDLNameSupportedFormats: formatArray, - SDLNameHapticSpatialDataSupported: hapticDataSupported} mutableCopy]; + NSMutableDictionary* dict = [@{SDLRPCParameterNamePreferredResolution: resolution, + SDLRPCParameterNameMaxBitrate: maxBitrate, + SDLRPCParameterNameSupportedFormats: formatArray, + SDLRPCParameterNameHapticSpatialDataSupported: hapticDataSupported} mutableCopy]; SDLVideoStreamingCapability* testStruct = [[SDLVideoStreamingCapability alloc] initWithDictionary:dict]; diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVideoStreamingFormatSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVideoStreamingFormatSpec.m index 551110ee8..a6b386738 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVideoStreamingFormatSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVideoStreamingFormatSpec.m @@ -11,7 +11,7 @@ #import <Quick/Quick.h> #import <Nimble/Nimble.h> -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" #import "SDLVideoStreamingCodec.h" #import "SDLVideoStreamingFormat.h" #import "SDLVideoStreamingProtocol.h" @@ -20,8 +20,8 @@ QuickSpecBegin(SDLVideoStreamingFormatSpec) describe(@"Initialization tests", ^{ it(@"Should get correctly when initialized with a dictionary", ^ { - NSMutableDictionary* dict = [@{SDLNameVideoProtocol: SDLVideoStreamingProtocolRAW, - SDLNameVideoCodec: SDLVideoStreamingCodecH264} mutableCopy]; + NSMutableDictionary* dict = [@{SDLRPCParameterNameVideoProtocol: SDLVideoStreamingProtocolRAW, + SDLRPCParameterNameVideoCodec: SDLVideoStreamingCodecH264} mutableCopy]; SDLVideoStreamingFormat* testStruct = [[SDLVideoStreamingFormat alloc] initWithDictionary:dict]; expect(testStruct.protocol).to(equal(SDLVideoStreamingProtocolRAW)); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVrHelpItemSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVrHelpItemSpec.m index 307d92621..ea2153359 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVrHelpItemSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVrHelpItemSpec.m @@ -9,7 +9,7 @@ #import <Nimble/Nimble.h> #import "SDLImage.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" #import "SDLVrHelpItem.h" @@ -31,9 +31,9 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary<NSString *, id> *dict = [@{SDLNameText:@"DON'T PANIC", - SDLNameImage:image, - SDLNamePosition:@42} mutableCopy]; + NSMutableDictionary<NSString *, id> *dict = [@{SDLRPCParameterNameText:@"DON'T PANIC", + SDLRPCParameterNameImage:image, + SDLRPCParameterNamePosition:@42} mutableCopy]; SDLVRHelpItem* testStruct = [[SDLVRHelpItem alloc] initWithDictionary:dict]; expect(testStruct.text).to(equal(@"DON'T PANIC")); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLWeatherAlertSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLWeatherAlertSpec.m new file mode 100644 index 000000000..e4c34b529 --- /dev/null +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLWeatherAlertSpec.m @@ -0,0 +1,94 @@ +// +// SDLWeatherAlertSpec.m +// SmartDeviceLinkTests +// +// Created by Nicole on 2/7/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import <Quick/Quick.h> +#import <Nimble/Nimble.h> + +#import "SDLDateTime.h" +#import "SDLRPCParameterNames.h" +#import "SDLWeatherAlert.h" + +QuickSpecBegin(SDLWeatherAlertSpec) + +describe(@"Getter/Setter Tests", ^{ + __block NSString *testTitle = nil; + __block NSString *testSummary = nil; + __block SDLDateTime *testExpires = nil; + __block NSArray<NSString *> *testRegions = nil; + __block NSString *testSeverity = nil; + __block SDLDateTime *testTimeIssued = nil; + + beforeEach(^{ + testTitle = @"testTitle"; + testSummary = @"testSummary"; + testExpires = [[SDLDateTime alloc] initWithHour:5 minute:1 second:2 millisecond:2]; + testRegions = @[@"testRegion1" , @"testRegion2"]; + testSeverity = @"testSeverity"; + testTimeIssued = [[SDLDateTime alloc] initWithHour:3 minute:1 second:1 millisecond:23 day:1 month:2 year:1223]; + }); + + it(@"Should set and get correctly", ^{ + SDLWeatherAlert *testStruct = [[SDLWeatherAlert alloc] init]; + testStruct.title = testTitle; + testStruct.summary = testSummary; + testStruct.expires = testExpires; + testStruct.regions = testRegions; + testStruct.severity = testSeverity; + testStruct.timeIssued = testTimeIssued; + + expect(testStruct.title).to(equal(testTitle)); + expect(testStruct.summary).to(equal(testSummary)); + expect(testStruct.expires).to(equal(testExpires)); + expect(testStruct.regions).to(equal(testRegions)); + expect(testStruct.severity).to(equal(testSeverity)); + expect(testStruct.timeIssued).to(equal(testTimeIssued)); + }); + + it(@"Should get correctly when initialized with a dictionary", ^{ + NSDictionary *dict = @{SDLRPCParameterNameTitle:testTitle, + SDLRPCParameterNameSummary:testSummary, + SDLRPCParameterNameExpires:testExpires, + SDLRPCParameterNameRegions:testRegions, + SDLRPCParameterNameSeverity:testSeverity, + SDLRPCParameterNameTimeIssued:testTimeIssued + }; + SDLWeatherAlert *testStruct = [[SDLWeatherAlert alloc] initWithDictionary:dict]; + + expect(testStruct.title).to(equal(testTitle)); + expect(testStruct.summary).to(equal(testSummary)); + expect(testStruct.expires).to(equal(testExpires)); + expect(testStruct.regions).to(equal(testRegions)); + expect(testStruct.severity).to(equal(testSeverity)); + expect(testStruct.timeIssued).to(equal(testTimeIssued)); + }); + + it(@"Should get correctly when initialized with a convenience init", ^{ + SDLWeatherAlert *testStruct = [[SDLWeatherAlert alloc] initWithTitle:testTitle summary:testSummary expires:testExpires regions:testRegions severity:testSeverity timeIssued:testTimeIssued]; + + expect(testStruct.title).to(equal(testTitle)); + expect(testStruct.summary).to(equal(testSummary)); + expect(testStruct.expires).to(equal(testExpires)); + expect(testStruct.regions).to(equal(testRegions)); + expect(testStruct.severity).to(equal(testSeverity)); + expect(testStruct.timeIssued).to(equal(testTimeIssued)); + }); + + it(@"Should return nil if not set", ^{ + SDLWeatherAlert *testStruct = [[SDLWeatherAlert alloc] init]; + + expect(testStruct.title).to(beNil()); + expect(testStruct.summary).to(beNil()); + expect(testStruct.expires).to(beNil()); + expect(testStruct.regions).to(beNil()); + expect(testStruct.severity).to(beNil()); + expect(testStruct.timeIssued).to(beNil()); + }); +}); + +QuickSpecEnd + diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLWeatherDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLWeatherDataSpec.m new file mode 100644 index 000000000..757162aab --- /dev/null +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLWeatherDataSpec.m @@ -0,0 +1,212 @@ +// +// SDLWeatherDataSpec.m +// SmartDeviceLinkTests +// +// Created by Nicole on 2/7/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import <Quick/Quick.h> +#import <Nimble/Nimble.h> + +#import "SDLDateTime.h" +#import "SDLRPCParameterNames.h" +#import "SDLTemperature.h" +#import "SDLWeatherData.h" + +QuickSpecBegin(SDLWeatherDataSpec) + +describe(@"Getter/Setter Tests", ^{ + __block SDLTemperature *testCurrentTemp = nil; + __block SDLTemperature *testTempHigh = nil; + __block SDLTemperature *testTempLow = nil; + __block SDLTemperature *testApparentTemp = nil; + __block SDLTemperature *testApparentTempHigh = nil; + __block SDLTemperature *testApparentTempLow = nil; + __block NSString *testWeatherSummary = nil; + __block SDLDateTime *testTime = nil; + __block float testHumidity = 0.175; + __block float testCloudCover = 0.2; + __block float testMoonPhase = 0.1; + __block int testWindBearing = 1.65; + __block float testWindGust = 34.2; + __block float testWindSpeed = 12.01; + __block int testNearestStormBearing = 1; + __block int testNearestStormDistance = 45; + __block float testPrecipAccumulation = 2.34; + __block float testPrecipIntensity = 4.55; + __block float testPrecipProbability = 0.45; + __block NSString *testPrecipType = nil; + __block float testVisibility = 0.1; + __block NSString *testWeatherIconImageName = nil; + + beforeEach(^{ + testCurrentTemp = [[SDLTemperature alloc] initWithUnit:SDLTemperatureUnitFahrenheit value:2]; + testTempHigh = [[SDLTemperature alloc] initWithUnit:SDLTemperatureUnitFahrenheit value:3]; + testTempLow = [[SDLTemperature alloc] initWithUnit:SDLTemperatureUnitFahrenheit value:4]; + testApparentTemp = [[SDLTemperature alloc] initWithUnit:SDLTemperatureUnitFahrenheit value:5]; + testApparentTempHigh = [[SDLTemperature alloc] initWithUnit:SDLTemperatureUnitFahrenheit value:6]; + testApparentTempLow = [[SDLTemperature alloc] initWithUnit:SDLTemperatureUnitFahrenheit value:7]; + testWeatherSummary = @"testWeatherSummary"; + testTime = [[SDLDateTime alloc] initWithHour:4 minute:5]; + testPrecipType = @"testPrecipType"; + testWeatherIconImageName = @"testWeatherIconImageName"; + }); + + it(@"Should set and get correctly", ^{ + SDLWeatherData *testStruct = [[SDLWeatherData alloc] init]; + testStruct.currentTemperature = testCurrentTemp; + testStruct.temperatureHigh = testTempHigh; + testStruct.temperatureLow = testTempLow; + testStruct.apparentTemperature = testApparentTemp; + testStruct.apparentTemperatureHigh = testApparentTempHigh; + testStruct.apparentTemperatureLow = testApparentTempLow; + testStruct.weatherSummary = testWeatherSummary; + testStruct.time = testTime; + testStruct.humidity = @(testHumidity); + testStruct.cloudCover = @(testCloudCover); + testStruct.moonPhase = @(testMoonPhase); + testStruct.windBearing = @(testWindBearing); + testStruct.windGust = @(testWindGust); + testStruct.windSpeed = @(testWindSpeed); + testStruct.nearestStormBearing = @(testNearestStormBearing); + testStruct.nearestStormDistance = @(testNearestStormDistance); + testStruct.precipAccumulation = @(testPrecipAccumulation); + testStruct.precipIntensity = @(testPrecipIntensity); + testStruct.precipProbability = @(testPrecipProbability); + testStruct.precipType = testPrecipType; + testStruct.visibility = @(testVisibility); + testStruct.weatherIconImageName = testWeatherIconImageName; + + expect(testStruct.currentTemperature).to(equal(testCurrentTemp)); + expect(testStruct.temperatureHigh).to(equal(testTempHigh)); + expect(testStruct.temperatureLow).to(equal(testTempLow)); + expect(testStruct.apparentTemperature).to(equal(testApparentTemp)); + expect(testStruct.apparentTemperatureHigh).to(equal(testApparentTempHigh)); + expect(testStruct.apparentTemperatureLow).to(equal(testApparentTempLow)); + expect(testStruct.weatherSummary).to(equal(testWeatherSummary)); + expect(testStruct.time).to(equal(testTime)); + expect(testStruct.humidity).to(equal(testHumidity)); + expect(testStruct.cloudCover).to(equal(testCloudCover)); + expect(testStruct.moonPhase).to(equal(testMoonPhase)); + expect(testStruct.windBearing).to(equal(testWindBearing)); + expect(testStruct.windGust).to(equal(testWindGust)); + expect(testStruct.windSpeed).to(equal(testWindSpeed)); + expect(testStruct.nearestStormBearing).to(equal(testNearestStormBearing)); + expect(testStruct.nearestStormDistance).to(equal(testNearestStormDistance)); + expect(testStruct.precipAccumulation).to(equal(testPrecipAccumulation)); + expect(testStruct.precipIntensity).to(equal(testPrecipIntensity)); + expect(testStruct.precipProbability).to(equal(testPrecipProbability)); + expect(testStruct.precipType).to(equal(testPrecipType)); + expect(testStruct.visibility).to(equal(testVisibility)); + expect(testStruct.weatherIconImageName).to(equal(testWeatherIconImageName)); + }); + + it(@"Should get correctly when initialized with a dictionary", ^{ + NSDictionary *dict = @{SDLRPCParameterNameCurrentTemperature:testCurrentTemp, + SDLRPCParameterNameTemperatureHigh:testTempHigh, + SDLRPCParameterNameTemperatureLow:testTempLow, + SDLRPCParameterNameApparentTemperature:testApparentTemp, + SDLRPCParameterNameApparentTemperatureHigh:testApparentTempHigh, + SDLRPCParameterNameApparentTemperatureLow:testApparentTempLow, + SDLRPCParameterNameWeatherSummary:testWeatherSummary, + SDLRPCParameterNameTime:testTime, + SDLRPCParameterNameHumidity:@(testHumidity), + SDLRPCParameterNameCloudCover:@(testCloudCover), + SDLRPCParameterNameMoonPhase:@(testMoonPhase), + SDLRPCParameterNameWindBearing:@(testWindBearing), + SDLRPCParameterNameWindGust:@(testWindGust), + SDLRPCParameterNameWindSpeed:@(testWindSpeed), + SDLRPCParameterNameNearestStormBearing:@(testNearestStormBearing), + SDLRPCParameterNameNearestStormDistance:@(testNearestStormDistance), + SDLRPCParameterNamePrecipAccumulation:@(testPrecipAccumulation), + SDLRPCParameterNamePrecipIntensity:@(testPrecipIntensity), + SDLRPCParameterNamePrecipProbability:@(testPrecipProbability), + SDLRPCParameterNamePrecipType:testPrecipType, + SDLRPCParameterNameVisibility:@(testVisibility), + SDLRPCParameterNameWeatherIconImageName:testWeatherIconImageName + }; + SDLWeatherData *testStruct = [[SDLWeatherData alloc] initWithDictionary:dict]; + + expect(testStruct.currentTemperature).to(equal(testCurrentTemp)); + expect(testStruct.temperatureHigh).to(equal(testTempHigh)); + expect(testStruct.temperatureLow).to(equal(testTempLow)); + expect(testStruct.apparentTemperature).to(equal(testApparentTemp)); + expect(testStruct.apparentTemperatureHigh).to(equal(testApparentTempHigh)); + expect(testStruct.apparentTemperatureLow).to(equal(testApparentTempLow)); + expect(testStruct.weatherSummary).to(equal(testWeatherSummary)); + expect(testStruct.time).to(equal(testTime)); + expect(testStruct.humidity).to(equal(testHumidity)); + expect(testStruct.cloudCover).to(equal(testCloudCover)); + expect(testStruct.moonPhase).to(equal(testMoonPhase)); + expect(testStruct.windBearing).to(equal(testWindBearing)); + expect(testStruct.windGust).to(equal(testWindGust)); + expect(testStruct.windSpeed).to(equal(testWindSpeed)); + expect(testStruct.nearestStormBearing).to(equal(testNearestStormBearing)); + expect(testStruct.nearestStormDistance).to(equal(testNearestStormDistance)); + expect(testStruct.precipAccumulation).to(equal(testPrecipAccumulation)); + expect(testStruct.precipIntensity).to(equal(testPrecipIntensity)); + expect(testStruct.precipProbability).to(equal(testPrecipProbability)); + expect(testStruct.precipType).to(equal(testPrecipType)); + expect(testStruct.visibility).to(equal(testVisibility)); + expect(testStruct.weatherIconImageName).to(equal(testWeatherIconImageName)); + }); + + it(@"Should get correctly when initialized with a convenience init", ^{ + SDLWeatherData *testStruct = [[SDLWeatherData alloc] initWithCurrentTemperature:testCurrentTemp temperatureHigh:testTempHigh temperatureLow:testTempLow apparentTemperature:testApparentTemp apparentTemperatureHigh:testApparentTempHigh apparentTemperatureLow:testApparentTempLow weatherSummary:testWeatherSummary time:testTime humidity:@(testHumidity) cloudCover:@(testCloudCover) moonPhase:@(testMoonPhase) windBearing:@(testWindBearing) windGust:@(testWindGust) windSpeed:@(testWindSpeed) nearestStormBearing:@(testNearestStormBearing) nearestStormDistance:@(testNearestStormDistance) precipAccumulation:@(testPrecipAccumulation) precipIntensity:@(testPrecipIntensity) precipProbability:@(testPrecipProbability) precipType:testPrecipType visibility:@(testVisibility) weatherIconImageName:testWeatherIconImageName]; + + expect(testStruct.currentTemperature).to(equal(testCurrentTemp)); + expect(testStruct.temperatureHigh).to(equal(testTempHigh)); + expect(testStruct.temperatureLow).to(equal(testTempLow)); + expect(testStruct.apparentTemperature).to(equal(testApparentTemp)); + expect(testStruct.apparentTemperatureHigh).to(equal(testApparentTempHigh)); + expect(testStruct.apparentTemperatureLow).to(equal(testApparentTempLow)); + expect(testStruct.weatherSummary).to(equal(testWeatherSummary)); + expect(testStruct.time).to(equal(testTime)); + expect(testStruct.humidity).to(equal(testHumidity)); + expect(testStruct.cloudCover).to(equal(testCloudCover)); + expect(testStruct.moonPhase).to(equal(testMoonPhase)); + expect(testStruct.windBearing).to(equal(testWindBearing)); + expect(testStruct.windGust).to(equal(testWindGust)); + expect(testStruct.windSpeed).to(equal(testWindSpeed)); + expect(testStruct.nearestStormBearing).to(equal(testNearestStormBearing)); + expect(testStruct.nearestStormDistance).to(equal(testNearestStormDistance)); + expect(testStruct.precipAccumulation).to(equal(testPrecipAccumulation)); + expect(testStruct.precipIntensity).to(equal(testPrecipIntensity)); + expect(testStruct.precipProbability).to(equal(testPrecipProbability)); + expect(testStruct.precipType).to(equal(testPrecipType)); + expect(testStruct.visibility).to(equal(testVisibility)); + expect(testStruct.weatherIconImageName).to(equal(testWeatherIconImageName)); + }); + + + it(@"Should return nil if not set", ^{ + SDLWeatherData *testStruct = [[SDLWeatherData alloc] init]; + + expect(testStruct.currentTemperature).to(beNil()); + expect(testStruct.temperatureHigh).to(beNil()); + expect(testStruct.temperatureLow).to(beNil()); + expect(testStruct.apparentTemperature).to(beNil()); + expect(testStruct.apparentTemperatureHigh).to(beNil()); + expect(testStruct.apparentTemperatureLow).to(beNil()); + expect(testStruct.weatherSummary).to(beNil()); + expect(testStruct.time).to(beNil()); + expect(testStruct.humidity).to(beNil()); + expect(testStruct.cloudCover).to(beNil()); + expect(testStruct.moonPhase).to(beNil()); + expect(testStruct.windBearing).to(beNil()); + expect(testStruct.windGust).to(beNil()); + expect(testStruct.windSpeed).to(beNil()); + expect(testStruct.nearestStormBearing).to(beNil()); + expect(testStruct.nearestStormDistance).to(beNil()); + expect(testStruct.precipAccumulation).to(beNil()); + expect(testStruct.precipIntensity).to(beNil()); + expect(testStruct.precipProbability).to(beNil()); + expect(testStruct.precipType).to(beNil()); + expect(testStruct.visibility).to(beNil()); + expect(testStruct.weatherIconImageName).to(beNil()); + }); +}); + +QuickSpecEnd + diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLWeatherServiceDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLWeatherServiceDataSpec.m new file mode 100644 index 000000000..dadf888a4 --- /dev/null +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLWeatherServiceDataSpec.m @@ -0,0 +1,115 @@ +// +// SDLWeatherServiceDataSpec.m +// SmartDeviceLinkTests +// +// Created by Nicole on 2/8/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import <Quick/Quick.h> +#import <Nimble/Nimble.h> + +#import "SDLLocationDetails.h" +#import "SDLRPCParameterNames.h" +#import "SDLWeatherData.h" +#import "SDLWeatherAlert.h" +#import "SDLWeatherServiceData.h" + +QuickSpecBegin(SDLWeatherServiceDataSpec) + +describe(@"Getter/Setter Tests", ^{ + __block SDLLocationDetails *testLocation = nil; + __block SDLWeatherData *testCurrentForecast = nil; + __block NSArray<SDLWeatherData *> *testMinuteForecast = nil; + __block NSArray<SDLWeatherData *> *testHourlyForecast = nil; + __block NSArray<SDLWeatherData *> *testMultidayForecast = nil; + __block NSArray<SDLWeatherAlert *> *testAlerts = nil; + + beforeEach(^{ + testLocation = [[SDLLocationDetails alloc] init]; + testLocation.locationName = @"testLocationName"; + + SDLWeatherData *testWeatherDataA = [[SDLWeatherData alloc] initWithDictionary:@{SDLRPCParameterNameWeatherSummary:@"testWeatherDataA"}]; + SDLWeatherData *testWeatherDataB = [[SDLWeatherData alloc] initWithDictionary:@{SDLRPCParameterNameWeatherSummary:@"testWeatherDataB"}]; + SDLWeatherData *testWeatherDataC = [[SDLWeatherData alloc] initWithDictionary:@{SDLRPCParameterNameWeatherSummary:@"testWeatherDataC"}]; + testCurrentForecast = testWeatherDataA; + testMinuteForecast = @[testWeatherDataA]; + testHourlyForecast = @[testWeatherDataB, testWeatherDataA]; + testMultidayForecast = @[testWeatherDataA, testWeatherDataC]; + + SDLWeatherAlert *testWeatherAlertA = [[SDLWeatherAlert alloc] initWithDictionary:@{SDLRPCParameterNameTitle:@"testWeatherAlertA"}]; + testAlerts = @[testWeatherAlertA]; + }); + + it(@"Should set and get correctly", ^{ + SDLWeatherServiceData *testStruct = [[SDLWeatherServiceData alloc] init]; + testStruct.location = testLocation; + testStruct.currentForecast = testCurrentForecast; + testStruct.minuteForecast = testMinuteForecast; + testStruct.hourlyForecast = testHourlyForecast; + testStruct.multidayForecast = testMultidayForecast; + testStruct.alerts = testAlerts; + + expect(testStruct.location).to(equal(testLocation)); + expect(testStruct.currentForecast).to(equal(testCurrentForecast)); + expect(testStruct.minuteForecast).to(equal(testMinuteForecast)); + expect(testStruct.hourlyForecast).to(equal(testHourlyForecast)); + expect(testStruct.multidayForecast).to(equal(testMultidayForecast)); + expect(testStruct.alerts).to(equal(testAlerts)); + }); + + it(@"Should get correctly when initialized with a dictionary", ^{ + NSDictionary *dict = @{SDLRPCParameterNameLocation:testLocation, + SDLRPCParameterNameCurrentForecast:testCurrentForecast, + SDLRPCParameterNameMinuteForecast:testMinuteForecast, + SDLRPCParameterNameHourlyForecast:testHourlyForecast, + SDLRPCParameterNameMultidayForecast:testMultidayForecast, + SDLRPCParameterNameAlerts:testAlerts + }; + SDLWeatherServiceData *testStruct = [[SDLWeatherServiceData alloc] initWithDictionary:dict]; + + expect(testStruct.location).to(equal(testLocation)); + expect(testStruct.currentForecast).to(equal(testCurrentForecast)); + expect(testStruct.minuteForecast).to(equal(testMinuteForecast)); + expect(testStruct.hourlyForecast).to(equal(testHourlyForecast)); + expect(testStruct.multidayForecast).to(equal(testMultidayForecast)); + expect(testStruct.alerts).to(equal(testAlerts)); + }); + + it(@"Should get correctly when initialized with initWithLocation:", ^{ + SDLWeatherServiceData *testStruct = [[SDLWeatherServiceData alloc] initWithLocation:testLocation]; + + expect(testStruct.location).to(equal(testLocation)); + expect(testStruct.currentForecast).to(beNil()); + expect(testStruct.minuteForecast).to(beNil()); + expect(testStruct.hourlyForecast).to(beNil()); + expect(testStruct.multidayForecast).to(beNil()); + expect(testStruct.alerts).to(beNil()); + }); + + it(@"Should get correctly when initialized with initWithLocation:currentForecast:currentForecast minuteForecast:hourlyForecast:multidayForecast:alerts:", ^{ + SDLWeatherServiceData *testStruct = [[SDLWeatherServiceData alloc] initWithLocation:testLocation currentForecast:testCurrentForecast minuteForecast:testMinuteForecast hourlyForecast:testHourlyForecast multidayForecast:testMultidayForecast alerts:testAlerts]; + + expect(testStruct.location).to(equal(testLocation)); + expect(testStruct.currentForecast).to(equal(testCurrentForecast)); + expect(testStruct.minuteForecast).to(equal(testMinuteForecast)); + expect(testStruct.hourlyForecast).to(equal(testHourlyForecast)); + expect(testStruct.multidayForecast).to(equal(testMultidayForecast)); + expect(testStruct.alerts).to(equal(testAlerts)); + }); + + it(@"Should return nil if not set", ^{ + SDLWeatherServiceData *testStruct = [[SDLWeatherServiceData alloc] init]; + + expect(testStruct.location).to(beNil()); + expect(testStruct.currentForecast).to(beNil()); + expect(testStruct.minuteForecast).to(beNil()); + expect(testStruct.hourlyForecast).to(beNil()); + expect(testStruct.multidayForecast).to(beNil()); + expect(testStruct.alerts).to(beNil()); + }); +}); + +QuickSpecEnd + + diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLWeatherServiceManifestSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLWeatherServiceManifestSpec.m new file mode 100644 index 000000000..1a495d633 --- /dev/null +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLWeatherServiceManifestSpec.m @@ -0,0 +1,82 @@ +// +// SDLWeatherServiceManifestSpec.m +// SmartDeviceLinkTests +// +// Created by Nicole on 2/8/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import <Quick/Quick.h> +#import <Nimble/Nimble.h> + +#import "SDLRPCParameterNames.h" +#import "SDLWeatherServiceManifest.h" + +QuickSpecBegin(SDLWeatherServiceManifestSpec) + +describe(@"Getter/Setter Tests", ^{ + __block BOOL testCurrentForecastSupported = nil; + __block int testMaxMultidayForecastAmount = 3; + __block int testMaxHourlyForecastAmount = 78; + __block int testMaxMinutelyForecastAmount = 13; + __block BOOL testWeatherForLocationSupported = nil; + + beforeEach(^{ + testCurrentForecastSupported = false; + testCurrentForecastSupported = true; + }); + + it(@"Should set and get correctly", ^{ + SDLWeatherServiceManifest *testStruct = [[SDLWeatherServiceManifest alloc] init]; + testStruct.currentForecastSupported = @(testCurrentForecastSupported); + testStruct.maxMultidayForecastAmount = @(testMaxMultidayForecastAmount); + testStruct.maxHourlyForecastAmount = @(testMaxHourlyForecastAmount); + testStruct.maxMinutelyForecastAmount = @(testMaxMinutelyForecastAmount); + testStruct.weatherForLocationSupported = @(testWeatherForLocationSupported); + + expect(testStruct.currentForecastSupported).to(equal(testCurrentForecastSupported)); + expect(testStruct.maxMultidayForecastAmount).to(equal(testMaxMultidayForecastAmount)); + expect(testStruct.maxHourlyForecastAmount).to(equal(testMaxHourlyForecastAmount)); + expect(testStruct.maxMinutelyForecastAmount).to(equal(testMaxMinutelyForecastAmount)); + expect(testStruct.weatherForLocationSupported).to(equal(testWeatherForLocationSupported)); + }); + + it(@"Should get correctly when initialized with a dictionary", ^{ + NSDictionary *dict = @{SDLRPCParameterNameCurrentForecastSupported:@(testCurrentForecastSupported), + SDLRPCParameterNameMaxMultidayForecastAmount:@(testMaxMultidayForecastAmount), + SDLRPCParameterNameMaxHourlyForecastAmount:@(testMaxHourlyForecastAmount), + SDLRPCParameterNameMaxMinutelyForecastAmount:@(testMaxMinutelyForecastAmount), + SDLRPCParameterNameWeatherForLocationSupported:@(testWeatherForLocationSupported) + }; + SDLWeatherServiceManifest *testStruct = [[SDLWeatherServiceManifest alloc] initWithDictionary:dict]; + + expect(testStruct.currentForecastSupported).to(equal(testCurrentForecastSupported)); + expect(testStruct.maxMultidayForecastAmount).to(equal(testMaxMultidayForecastAmount)); + expect(testStruct.maxHourlyForecastAmount).to(equal(testMaxHourlyForecastAmount)); + expect(testStruct.maxMinutelyForecastAmount).to(equal(testMaxMinutelyForecastAmount)); + expect(testStruct.weatherForLocationSupported).to(equal(testWeatherForLocationSupported)); + }); + + it(@"Should initialize correctly with initWithCurrentForecastSupported:maxMultidayForecastAmount:maxHourlyForecastAmount:maxMinutelyForecastAmount:weatherForLocationSupported:", ^{ + SDLWeatherServiceManifest *testStruct = [[SDLWeatherServiceManifest alloc] initWithCurrentForecastSupported:testCurrentForecastSupported maxMultidayForecastAmount:testMaxMultidayForecastAmount maxHourlyForecastAmount:testMaxHourlyForecastAmount maxMinutelyForecastAmount:testMaxMinutelyForecastAmount weatherForLocationSupported:testWeatherForLocationSupported]; + + expect(testStruct.currentForecastSupported).to(equal(testCurrentForecastSupported)); + expect(testStruct.maxMultidayForecastAmount).to(equal(testMaxMultidayForecastAmount)); + expect(testStruct.maxHourlyForecastAmount).to(equal(testMaxHourlyForecastAmount)); + expect(testStruct.maxMinutelyForecastAmount).to(equal(testMaxMinutelyForecastAmount)); + expect(testStruct.weatherForLocationSupported).to(equal(testWeatherForLocationSupported)); + }); + + it(@"Should return nil if not set", ^{ + SDLWeatherServiceManifest *testStruct = [[SDLWeatherServiceManifest alloc] init]; + + expect(testStruct.currentForecastSupported).to(beNil()); + expect(testStruct.maxMultidayForecastAmount).to(beNil()); + expect(testStruct.maxHourlyForecastAmount).to(beNil()); + expect(testStruct.maxMinutelyForecastAmount).to(beNil()); + expect(testStruct.weatherForLocationSupported).to(beNil()); + }); +}); + +QuickSpecEnd + diff --git a/SmartDeviceLinkTests/RPCSpecs/SuperclassSpecs/SDLRPCMessageSpec.m b/SmartDeviceLinkTests/RPCSpecs/SuperclassSpecs/SDLRPCMessageSpec.m index 57dbd3513..0ace806a0 100644 --- a/SmartDeviceLinkTests/RPCSpecs/SuperclassSpecs/SDLRPCMessageSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/SuperclassSpecs/SDLRPCMessageSpec.m @@ -9,7 +9,7 @@ #import <Nimble/Nimble.h> #import "SDLRPCMessage.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" QuickSpecBegin(SDLRPCMessageSpec) @@ -21,13 +21,13 @@ describe(@"Readonly Property Tests", ^ { }); it(@"Should get correctly when initialized with dictionary", ^ { - SDLRPCMessage* testMessage = [[SDLRPCMessage alloc] initWithDictionary:[@{SDLNameNotification: - @{SDLNameParameters: + SDLRPCMessage* testMessage = [[SDLRPCMessage alloc] initWithDictionary:[@{SDLRPCParameterNameNotification: + @{SDLRPCParameterNameParameters: @{@"name":@"George"}, - SDLNameOperationName:@"Poorly Named"}} mutableCopy]]; + SDLRPCParameterNameOperationName:@"Poorly Named"}} mutableCopy]]; expect(testMessage.name).to(equal(@"Poorly Named")); - expect(testMessage.messageType).to(equal(SDLNameNotification)); + expect(testMessage.messageType).to(equal(SDLRPCParameterNameNotification)); }); }); @@ -41,10 +41,10 @@ describe(@"Parameter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - SDLRPCMessage* testMessage = [[SDLRPCMessage alloc] initWithDictionary:[@{SDLNameResponse: - @{SDLNameParameters: + SDLRPCMessage* testMessage = [[SDLRPCMessage alloc] initWithDictionary:[@{SDLRPCParameterNameResponse: + @{SDLRPCParameterNameParameters: @{@"age":@25}, - SDLNameOperationName:@"Nameless"}} mutableCopy]]; + SDLRPCParameterNameOperationName:@"Nameless"}} mutableCopy]]; expect([testMessage getParameters:@"age"]).to(equal(@25)); }); @@ -66,10 +66,10 @@ describe(@"FunctionName Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - SDLRPCMessage* testMessage = [[SDLRPCMessage alloc] initWithDictionary:[@{SDLNameRequest: - @{SDLNameParameters: + SDLRPCMessage* testMessage = [[SDLRPCMessage alloc] initWithDictionary:[@{SDLRPCParameterNameRequest: + @{SDLRPCParameterNameParameters: @{@"age":@25}, - SDLNameOperationName:@"DoNothing"}} mutableCopy]]; + SDLRPCParameterNameOperationName:@"DoNothing"}} mutableCopy]]; expect([testMessage getFunctionName]).to(equal(@"DoNothing")); @@ -79,8 +79,8 @@ describe(@"FunctionName Tests", ^ { }); it(@"Should be nil if not set", ^ { - SDLRPCMessage* testMessage = [[SDLRPCMessage alloc] initWithDictionary:[@{SDLNameNotification: - @{SDLNameParameters: + SDLRPCMessage* testMessage = [[SDLRPCMessage alloc] initWithDictionary:[@{SDLRPCParameterNameNotification: + @{SDLRPCParameterNameParameters: @{}}} mutableCopy]]; expect([testMessage getFunctionName]).to(beNil()); }); @@ -97,10 +97,10 @@ describe(@"BulkDataTests", ^ { }); it(@"Should get correctly when initialized", ^ { - SDLRPCMessage* testMessage = [[SDLRPCMessage alloc] initWithDictionary:[@{SDLNameNotification: - @{SDLNameParameters: + SDLRPCMessage* testMessage = [[SDLRPCMessage alloc] initWithDictionary:[@{SDLRPCParameterNameNotification: + @{SDLRPCParameterNameParameters: @{}}, - SDLNameBulkData:[NSData dataWithBytes:"ImageData" length:strlen("ImageData")]} mutableCopy]]; + SDLRPCParameterNameBulkData:[NSData dataWithBytes:"ImageData" length:strlen("ImageData")]} mutableCopy]]; expect(testMessage.bulkData).to(equal([NSData dataWithBytes:"ImageData" length:strlen("ImageData")])); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/SuperclassSpecs/SDLRPCResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/SuperclassSpecs/SDLRPCResponseSpec.m index 073135985..edb1a3cab 100644 --- a/SmartDeviceLinkTests/RPCSpecs/SuperclassSpecs/SDLRPCResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/SuperclassSpecs/SDLRPCResponseSpec.m @@ -8,7 +8,7 @@ #import <Quick/Quick.h> #import <Nimble/Nimble.h> -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" #import "SDLResult.h" #import "SDLRPCResponse.h" @@ -31,19 +31,19 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{SDLNameResponse: - @{SDLNameParameters: - @{SDLNameSuccess:@YES, - SDLNameResultCode:SDLNameSuccess, - SDLNameInfo:@"Test Info"}, - SDLNameCorrelationId:@1004, - SDLNameOperationName:SDLNameResponse}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLRPCParameterNameResponse: + @{SDLRPCParameterNameParameters: + @{SDLRPCParameterNameSuccess:@YES, + SDLRPCParameterNameResultCode:SDLRPCParameterNameSuccess, + SDLRPCParameterNameInfo:@"Test Info"}, + SDLRPCParameterNameCorrelationId:@1004, + SDLRPCParameterNameOperationName:SDLRPCParameterNameResponse}} mutableCopy]; SDLRPCResponse* testResponse = [[SDLRPCResponse alloc] initWithDictionary:dict]; - expect(testResponse.getFunctionName).to(equal(SDLNameResponse)); + expect(testResponse.getFunctionName).to(equal(SDLRPCParameterNameResponse)); expect(testResponse.correlationID).to(equal(@1004)); expect(testResponse.success).to(equal(@YES)); - expect(testResponse.resultCode).to(equal(SDLNameSuccess)); + expect(testResponse.resultCode).to(equal(SDLRPCParameterNameSuccess)); expect(testResponse.info).to(equal(@"Test Info")); }); diff --git a/SmartDeviceLinkTests/SDLAsynchronousRPCOperationSpec.m b/SmartDeviceLinkTests/SDLAsynchronousRPCOperationSpec.m new file mode 100644 index 000000000..40fff1d7a --- /dev/null +++ b/SmartDeviceLinkTests/SDLAsynchronousRPCOperationSpec.m @@ -0,0 +1,95 @@ +// +// SDLAsynchronousRPCOperationSpec.m +// SmartDeviceLinkTests +// +// Created by Nicole on 2/20/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import <Quick/Quick.h> +#import <Nimble/Nimble.h> + +#import "SDLAppServiceData.h" +#import "SDLGetAppServiceDataResponse.h" +#import "SDLAsynchronousRPCOperation.h" +#import "TestConnectionManager.h" + +QuickSpecBegin(SDLAsynchronousRPCOperationSpec) + +describe(@"sending responses and notifications", ^{ + __block TestConnectionManager *testConnectionManager = nil; + __block SDLAsynchronousRPCOperation *testOperation = nil; + __block NSOperationQueue *testOperationQueue = nil; + + beforeEach(^{ + testOperation = nil; + testConnectionManager = [[TestConnectionManager alloc] init]; + + testOperationQueue = [[NSOperationQueue alloc] init]; + testOperationQueue.name = @"com.sdl.RPCResponse.testqueue"; + testOperationQueue.maxConcurrentOperationCount = 3; + }); + + context(@"when a single request succeeds", ^{ + __block __kindof SDLRPCMessage *sendRPC = nil; + + beforeEach(^{ + sendRPC = [[SDLGetAppServiceDataResponse alloc] initWithAppServiceData:[[SDLAppServiceData alloc] init]]; + }); + + it(@"should correctly send the rpc", ^{ + testOperation = [[SDLAsynchronousRPCOperation alloc] initWithConnectionManager:testConnectionManager rpc:sendRPC]; + + [testOperationQueue addOperation:testOperation]; + [NSThread sleepForTimeInterval:0.1]; + + expect(testConnectionManager.receivedRequests).toEventually(contain(sendRPC)); + }); + }); + + context(@"when multiple request succeed", ^{ + __block NSMutableArray< __kindof SDLRPCMessage *> *sendRPCs = nil; + __block int rpcCount = (int)testOperationQueue.maxConcurrentOperationCount + 3; + + beforeEach(^{ + sendRPCs = [NSMutableArray array]; + for (int i = 0; i < rpcCount; i += 1) { + [sendRPCs addObject:[[SDLGetAppServiceDataResponse alloc] initWithAppServiceData:[[SDLAppServiceData alloc] init]]]; + } + }); + + it(@"should correctly send all of the rpcs", ^{ + for (int i = 0; i < rpcCount; i += 1) { + testOperation = [[SDLAsynchronousRPCOperation alloc] initWithConnectionManager:testConnectionManager rpc:sendRPCs[i]]; + [testOperationQueue addOperation:testOperation]; + } + + [NSThread sleepForTimeInterval:0.5]; + + expect(testConnectionManager.receivedRequests.count).toEventually(equal(rpcCount)); + expect(testConnectionManager.receivedRequests).toEventually(equal(sendRPCs)); + }); + }); + + context(@"when a requst is cancelled", ^{ + __block __kindof SDLRPCMessage *sendRPC = nil; + + beforeEach(^{ + sendRPC = [[SDLGetAppServiceDataResponse alloc] initWithAppServiceData:[[SDLAppServiceData alloc] init]]; + }); + + it(@"should not send the rpc", ^{ + testOperation = [[SDLAsynchronousRPCOperation alloc] initWithConnectionManager:testConnectionManager rpc:sendRPC]; + + [testOperationQueue addOperation:testOperation]; + [testOperationQueue cancelAllOperations]; + + [NSThread sleepForTimeInterval:0.1]; + + expect(testConnectionManager.receivedRequests).toEventually(beEmpty()); + }); + }); +}); + +QuickSpecEnd + diff --git a/SmartDeviceLinkTests/SDLRPCFunctionNamesSpec.m b/SmartDeviceLinkTests/SDLRPCFunctionNamesSpec.m new file mode 100644 index 000000000..dc28ebf28 --- /dev/null +++ b/SmartDeviceLinkTests/SDLRPCFunctionNamesSpec.m @@ -0,0 +1,97 @@ +// +// SDLRPCFunctionNamesSpec.m +// SmartDeviceLinkTests +// +// Created by Nicole on 3/5/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import <Quick/Quick.h> +#import <Nimble/Nimble.h> + +#import "SDLRPCFunctionNames.h" + +QuickSpecBegin(SDLRPCFunctionNamesSpec) + +describe(@"Individual Enum Value Tests", ^ { + it(@"Should match internal values", ^ { + expect(SDLRPCFunctionNameAddSubMenu).to(equal(@"AddSubMenu")); + expect(SDLRPCFunctionNameAlert).to(equal(@"Alert")); + expect(SDLRPCFunctionNameAlertManeuver).to(equal(@"AlertManeuver")); + expect(SDLRPCFunctionNameButtonPress).to(equal(@"ButtonPress")); + expect(SDLRPCFunctionNameChangeRegistration).to(equal(@"ChangeRegistration")); + expect(SDLRPCFunctionNameCreateInteractionChoiceSet).to(equal(@"CreateInteractionChoiceSet")); + expect(SDLRPCFunctionNameDeleteCommand).to(equal(@"DeleteCommand")); + expect(SDLRPCFunctionNameDeleteFile).to(equal(@"DeleteFile")); + expect(SDLRPCFunctionNameDeleteInteractionChoiceSet).to(equal(@"DeleteInteractionChoiceSet")); + expect(SDLRPCFunctionNameDeleteSubMenu).to(equal(@"DeleteSubMenu")); + expect(SDLRPCFunctionNameDiagnosticMessage).to(equal(@"DiagnosticMessage")); + expect(SDLRPCFunctionNameDialNumber).to(equal(@"DialNumber")); + expect(SDLRPCFunctionNameEncodedSyncPData).to(equal(@"EncodedSyncPData")); + expect(SDLRPCFunctionNameEndAudioPassThru).to(equal(@"EndAudioPassThru")); + expect(SDLRPCFunctionNameGenericResponse).to(equal(@"GenericResponse")); + expect(SDLRPCFunctionNameGetAppServiceData).to(equal(@"GetAppServiceData")); + expect(SDLRPCFunctionNameGetDTCs).to(equal(@"GetDTCs")); + expect(SDLRPCFunctionNameGetFile).to(equal(@"GetFile")); + expect(SDLRPCFunctionNameGetInteriorVehicleData).to(equal(@"GetInteriorVehicleData")); + expect(SDLRPCFunctionNameGetSystemCapability).to(equal(@"GetSystemCapability")); + expect(SDLRPCFunctionNameGetVehicleData).to(equal(@"GetVehicleData")); + expect(SDLRPCFunctionNameGetWayPoints).to(equal(@"GetWayPoints")); + expect(SDLRPCFunctionNameListFiles).to(equal(@"ListFiles")); + expect(SDLRPCFunctionNameOnAppInterfaceUnregistered).to(equal(@"OnAppInterfaceUnregistered")); + expect(SDLRPCFunctionNameOnAppServiceData).to(equal(@"OnAppServiceData")); + expect(SDLRPCFunctionNameOnAudioPassThru).to(equal(@"OnAudioPassThru")); + expect(SDLRPCFunctionNameOnButtonEvent).to(equal(@"OnButtonEvent")); + expect(SDLRPCFunctionNameOnButtonPress).to(equal(@"OnButtonPress")); + expect(SDLRPCFunctionNameOnCommand).to(equal(@"OnCommand")); + expect(SDLRPCFunctionNameOnDriverDistraction).to(equal(@"OnDriverDistraction")); + expect(SDLRPCFunctionNameOnEncodedSyncPData).to(equal(@"OnEncodedSyncPData")); + expect(SDLRPCFunctionNameOnHashChange).to(equal(@"OnHashChange")); + expect(SDLRPCFunctionNameOnHMIStatus).to(equal(@"OnHMIStatus")); + expect(SDLRPCFunctionNameOnInteriorVehicleData).to(equal(@"OnInteriorVehicleData")); + expect(SDLRPCFunctionNameOnKeyboardInput).to(equal(@"OnKeyboardInput")); + expect(SDLRPCFunctionNameOnLanguageChange).to(equal(@"OnLanguageChange")); + expect(SDLRPCFunctionNameOnPermissionsChange).to(equal(@"OnPermissionsChange")); + expect(SDLRPCFunctionNameOnRCStatus).to(equal(@"OnRCStatus")); + expect(SDLRPCFunctionNameOnSyncPData).to(equal(@"OnSyncPData")); + expect(SDLRPCFunctionNameOnSystemCapabilityUpdated).to(equal(@"OnSystemCapabilityUpdated")); + expect(SDLRPCFunctionNameOnSystemRequest).to(equal(@"OnSystemRequest")); + expect(SDLRPCFunctionNameOnTBTClientState).to(equal(@"OnTBTClientState")); + expect(SDLRPCFunctionNameOnTouchEvent).to(equal(@"OnTouchEvent")); + expect(SDLRPCFunctionNameOnVehicleData).to(equal(@"OnVehicleData")); + expect(SDLRPCFunctionNameOnWayPointChange).to(equal(@"OnWayPointChange")); + expect(SDLRPCFunctionNamePerformAppServiceInteraction).to(equal(@"PerformAppServiceInteraction")); + expect(SDLRPCFunctionNamePerformAudioPassThru).to(equal(@"PerformAudioPassThru")); + expect(SDLRPCFunctionNamePerformInteraction).to(equal(@"PerformInteraction")); + expect(SDLRPCFunctionNamePublishAppService).to(equal(@"PublishAppService")); + expect(SDLRPCFunctionNamePutFile).to(equal(@"PutFile")); + expect(SDLRPCFunctionNameReadDID).to(equal(@"ReadDID")); + expect(SDLRPCFunctionNameRegisterAppInterface).to(equal(@"RegisterAppInterface")); + expect(SDLRPCFunctionNameReserved).to(equal(@"reserved")); + expect(SDLRPCFunctionNameResetGlobalProperties).to(equal(@"ResetGlobalProperties")); + expect(SDLRPCFunctionNameScrollableMessage).to(equal(@"ScrollableMessage")); + expect(SDLRPCFunctionNameSendHapticData).to(equal(@"SendHapticData")); + expect(SDLRPCFunctionNameSendLocation).to(equal(@"SendLocation")); + expect(SDLRPCFunctionNameSetAppIcon).to(equal(@"SetAppIcon")); + expect(SDLRPCFunctionNameSetDisplayLayout).to(equal(@"SetDisplayLayout")); + expect(SDLRPCFunctionNameSetGlobalProperties).to(equal(@"SetGlobalProperties")); + expect(SDLRPCFunctionNameSetInteriorVehicleData).to(equal(@"SetInteriorVehicleData")); + expect(SDLRPCFunctionNameSetMediaClockTimer).to(equal(@"SetMediaClockTimer")); + expect(SDLRPCFunctionNameShow).to(equal(@"Show")); + expect(SDLRPCFunctionNameShowConstantTBT).to(equal(@"ShowConstantTBT")); + expect(SDLRPCFunctionNameSlider).to(equal(@"Slider")); + expect(SDLRPCFunctionNameSpeak).to(equal(@"Speak")); + expect(SDLRPCFunctionNameSubscribeButton).to(equal(@"SubscribeButton")); + expect(SDLRPCFunctionNameSubscribeVehicleData).to(equal(@"SubscribeVehicleData")); + expect(SDLRPCFunctionNameSubscribeWayPoints).to(equal(@"SubscribeWayPoints")); + expect(SDLRPCFunctionNameSyncPData).to(equal(@"SyncPData")); + expect(SDLRPCFunctionNameSystemRequest).to(equal(@"SystemRequest")); + expect(SDLRPCFunctionNameUnregisterAppInterface).to(equal(@"UnregisterAppInterface")); + expect(SDLRPCFunctionNameUnsubscribeButton).to(equal(@"UnsubscribeButton")); + expect(SDLRPCFunctionNameUnsubscribeVehicleData).to(equal(@"UnsubscribeVehicleData")); + expect(SDLRPCFunctionNameUnsubscribeWayPoints).to(equal(@"UnsubscribeWayPoints")); + expect(SDLRPCFunctionNameUpdateTurnList).to(equal(@"UpdateTurnList")); + }); +}); + +QuickSpecEnd diff --git a/SmartDeviceLinkTests/SDLSystemCapabilityManagerSpec.m b/SmartDeviceLinkTests/SDLSystemCapabilityManagerSpec.m index ee395a545..a3bb55c58 100644 --- a/SmartDeviceLinkTests/SDLSystemCapabilityManagerSpec.m +++ b/SmartDeviceLinkTests/SDLSystemCapabilityManagerSpec.m @@ -51,6 +51,7 @@ describe(@"System capability manager", ^{ expect(testSystemCapabilityManager.navigationCapability).to(beNil()); expect(testSystemCapabilityManager.videoStreamingCapability).to(beNil()); expect(testSystemCapabilityManager.remoteControlCapability).to(beNil()); + expect(testSystemCapabilityManager.appServicesCapabilities).to(beNil()); }); context(@"When notified of a register app interface response", ^{ @@ -169,6 +170,7 @@ describe(@"System capability manager", ^{ expect(testSystemCapabilityManager.navigationCapability).to(beNil()); expect(testSystemCapabilityManager.videoStreamingCapability).to(beNil()); expect(testSystemCapabilityManager.remoteControlCapability).to(beNil()); + expect(testSystemCapabilityManager.appServicesCapabilities).to(beNil()); }); }); @@ -250,6 +252,7 @@ describe(@"System capability manager", ^{ expect(testSystemCapabilityManager.navigationCapability).to(beNil()); expect(testSystemCapabilityManager.videoStreamingCapability).to(beNil()); expect(testSystemCapabilityManager.remoteControlCapability).to(beNil()); + expect(testSystemCapabilityManager.appServicesCapabilities).to(beNil()); }); }); @@ -349,6 +352,7 @@ describe(@"System capability manager", ^{ expect(testSystemCapabilityManager.navigationCapability).to(beNil()); expect(testSystemCapabilityManager.videoStreamingCapability).to(beNil()); expect(testSystemCapabilityManager.remoteControlCapability).to(beNil()); + expect(testSystemCapabilityManager.appServicesCapabilities).to(beNil()); }); }); @@ -388,6 +392,7 @@ describe(@"System capability manager", ^{ expect(testSystemCapabilityManager.navigationCapability).to(beNil()); expect(testSystemCapabilityManager.videoStreamingCapability).to(beNil()); expect(testSystemCapabilityManager.remoteControlCapability).to(beNil()); + expect(testSystemCapabilityManager.appServicesCapabilities).to(beNil()); }); }); }); diff --git a/SmartDeviceLinkTests/TestMultipleFilesConnectionManager.m b/SmartDeviceLinkTests/TestMultipleFilesConnectionManager.m index 7eb43733f..ef4756bda 100644 --- a/SmartDeviceLinkTests/TestMultipleFilesConnectionManager.m +++ b/SmartDeviceLinkTests/TestMultipleFilesConnectionManager.m @@ -11,7 +11,8 @@ #import "SDLRPCRequest.h" #import "SDLPutFile.h" #import "SDLPutFileResponse.h" -#import "SDLNames.h" +#import "SDLRPCParameterNames.h" +#import "SDLRPCFunctionNames.h" #import "TestResponse.h" NS_ASSUME_NONNULL_BEGIN @@ -21,13 +22,13 @@ NS_ASSUME_NONNULL_BEGIN - (void)sendConnectionRequest:(__kindof SDLRPCRequest *)request withResponseHandler:(nullable SDLResponseHandler)handler { [super sendConnectionRequest:request withResponseHandler:handler]; - if ([[request name] isEqualToString:SDLNamePutFile]) { + if ([[request name] isEqualToString:SDLRPCFunctionNamePutFile]) { SDLPutFile *putfileRequest = (SDLPutFile *)request; TestResponse *response = self.responses[putfileRequest.syncFileName]; if (response == nil || handler == nil) { return; } handler(request, response.testResponse, response.testError); - } else if ([[request name] isEqualToString:SDLNameDeleteFile]) { + } else if ([[request name] isEqualToString:SDLRPCFunctionNameDeleteFile]) { SDLDeleteFile *deleteFileRequest = (SDLDeleteFile *)request; TestResponse *response = self.responses[deleteFileRequest.syncFileName]; diff --git a/SmartDeviceLinkTests/TestUtilities/TestConnectionManager.h b/SmartDeviceLinkTests/TestUtilities/TestConnectionManager.h index e1a24418b..b538249b0 100644 --- a/SmartDeviceLinkTests/TestUtilities/TestConnectionManager.h +++ b/SmartDeviceLinkTests/TestUtilities/TestConnectionManager.h @@ -20,7 +20,7 @@ NS_ASSUME_NONNULL_BEGIN /** * All received requests. Chronological order. The 0th element will be the first request received; the nth request will be the n+1th request received. */ -@property (copy, nonatomic, readonly) NSMutableArray<__kindof SDLRPCRequest *> *receivedRequests; +@property (copy, nonatomic, readonly) NSMutableArray<__kindof SDLRPCMessage *> *receivedRequests; /** * The block passed for the last request send with sendRequest:withCompletionHandler: diff --git a/SmartDeviceLinkTests/TestUtilities/TestConnectionManager.m b/SmartDeviceLinkTests/TestUtilities/TestConnectionManager.m index 4c8ea3a50..5ba813171 100644 --- a/SmartDeviceLinkTests/TestUtilities/TestConnectionManager.m +++ b/SmartDeviceLinkTests/TestUtilities/TestConnectionManager.m @@ -21,15 +21,20 @@ NS_ASSUME_NONNULL_BEGIN return nil; } - _receivedRequests = [NSMutableArray<__kindof SDLRPCRequest *> array]; + _receivedRequests = [NSMutableArray<__kindof SDLRPCMessage *> array]; return self; } +- (void)sendConnectionRPC:(__kindof SDLRPCMessage *)rpc { + [self.receivedRequests addObject:rpc]; +} + - (void)sendConnectionRequest:(__kindof SDLRPCRequest *)request withResponseHandler:(nullable SDLResponseHandler)handler { self.lastRequestBlock = handler; - request.correlationID = [self test_nextCorrelationID]; - [self.receivedRequests addObject:request]; + SDLRPCRequest *requestRPC = (SDLRPCRequest *)request; + requestRPC.correlationID = [self test_nextCorrelationID]; + [self.receivedRequests addObject:requestRPC]; } - (void)sendConnectionManagerRequest:(__kindof SDLRPCRequest *)request withResponseHandler:(nullable SDLResponseHandler)handler { @@ -98,7 +103,7 @@ NS_ASSUME_NONNULL_BEGIN } - (void)reset { - _receivedRequests = [NSMutableArray<__kindof SDLRPCRequest *> array]; + _receivedRequests = [NSMutableArray<__kindof SDLRPCMessage *> array]; _lastRequestBlock = nil; } diff --git a/SmartDeviceLinkTests/TestUtilities/TestMultipleRequestsConnectionManager.m b/SmartDeviceLinkTests/TestUtilities/TestMultipleRequestsConnectionManager.m index 8c6cc8b06..b1935a8ab 100644 --- a/SmartDeviceLinkTests/TestUtilities/TestMultipleRequestsConnectionManager.m +++ b/SmartDeviceLinkTests/TestUtilities/TestMultipleRequestsConnectionManager.m @@ -10,7 +10,7 @@ #import "SDLAddCommand.h" #import "SDLAddCommandResponse.h" -#import "SDLNames.h" +#import "SDLRPCFunctionNames.h" #import "TestResponse.h" @implementation TestMultipleRequestsConnectionManager @@ -24,10 +24,14 @@ return self; } -- (void)sendConnectionRequest:(__kindof SDLRPCRequest *)request withResponseHandler:(SDLResponseHandler)handler { +- (void)sendConnectionRPC:(__kindof SDLRPCMessage *)rpc { + [super sendConnectionRPC:rpc]; +} + +- (void)sendConnectionRequest:(__kindof SDLRPCRequest *)request withResponseHandler:(nullable SDLResponseHandler)handler { [super sendConnectionRequest:request withResponseHandler:handler]; - NSAssert([request.name isEqualToString:SDLNameAddCommand], @"The TestMultipleRequestsConnectionManager is only setup for SDLAddCommand"); + NSAssert([request.name isEqualToString:SDLRPCFunctionNameAddCommand], @"The TestMultipleRequestsConnectionManager is only setup for SDLAddCommand"); SDLAddCommand *addCommand = (SDLAddCommand *)request; TestResponse *response = self.responses[addCommand.correlationID]; |