diff options
| author | Muller, Alexander (A.) <amulle19@ford.com> | 2016-10-13 14:45:23 -0700 |
|---|---|---|
| committer | Muller, Alexander (A.) <amulle19@ford.com> | 2016-10-13 14:45:23 -0700 |
| commit | 280b61d326ac0b46957ea81f80f5fb5fb54f879f (patch) | |
| tree | 2b88f1e4ca61badea0d18f6bd02e111fd1e15929 | |
| parent | 50bcf640523d356565e20d93690ed5d6c8e2bd56 (diff) | |
| parent | 6da602b5f5d8897834657c053727602aaa0e6fa9 (diff) | |
| download | sdl_ios-280b61d326ac0b46957ea81f80f5fb5fb54f879f.tar.gz | |
Merge remote-tracking branch 'origin/develop' into feature/issue_425_stringly_typed_enum
* origin/develop: (27 commits)
Revert "Changed deviceScale type to silence build warning"
Changed deviceScale type to silence build warning
Change SDLRPCStruct private method to be a class method
Fixed error reference.
reverting function renaming in SDLRPCMessage.
Removed SDLJsonEncoder/Decoder.
Initial removal of SDLSiphonServer
Fixed issue with not all instances for SDLRPCMessage function rename applied.
reverting function renaming in SDLRPCMessage.
Fixed accidental function renaming.
Update lock screen to work correctly on iOS 6 - 8
Fixed issue with not being able to support both Swift 3 and pre-iOS 10 Objective-C.
Fixed an issue with cocoapods not properly loading icons on pre-iOS 8 devices.
Updated SDLFunctionID to project instead of private.
Update version checking code to use what we already use
Updated assets and support for retrieving bundle images for iOS 6 & 7.
Touched SDL Example Images.xcassets
Remove `.xctool.args` and update README with current testing information
Migrated initWithDictionary to take non-mutable dictionary as parameter.
Updated SDLFunctionID to be private.
...
# Conflicts:
# SmartDeviceLink-iOS.xcodeproj/project.pbxproj
# SmartDeviceLink/SDLAirbagStatus.m
# SmartDeviceLink/SDLAudioPassThruCapabilities.m
# SmartDeviceLink/SDLBeltStatus.m
# SmartDeviceLink/SDLBodyInformation.m
# SmartDeviceLink/SDLButtonCapabilities.m
# SmartDeviceLink/SDLChangeRegistration.m
# SmartDeviceLink/SDLClusterModeStatus.m
# SmartDeviceLink/SDLDIDResult.m
# SmartDeviceLink/SDLDeviceStatus.m
# SmartDeviceLink/SDLDisplayCapabilities.m
# SmartDeviceLink/SDLECallInfo.m
# SmartDeviceLink/SDLEmergencyEvent.m
# SmartDeviceLink/SDLGPSData.m
# SmartDeviceLink/SDLGetVehicleDataResponse.m
# SmartDeviceLink/SDLHMIPermissions.m
# SmartDeviceLink/SDLHeadLampStatus.h
# SmartDeviceLink/SDLHeadLampStatus.m
# SmartDeviceLink/SDLImage.m
# SmartDeviceLink/SDLImageField.m
# SmartDeviceLink/SDLKeyboardProperties.m
# SmartDeviceLink/SDLMyKey.m
# SmartDeviceLink/SDLOnAppInterfaceUnregistered.m
# SmartDeviceLink/SDLOnButtonEvent.m
# SmartDeviceLink/SDLOnButtonPress.m
# SmartDeviceLink/SDLOnCommand.m
# SmartDeviceLink/SDLOnDriverDistraction.m
# SmartDeviceLink/SDLOnHMIStatus.m
# SmartDeviceLink/SDLOnKeyboardInput.m
# SmartDeviceLink/SDLOnLanguageChange.m
# SmartDeviceLink/SDLOnLockScreenStatus.m
# SmartDeviceLink/SDLOnSystemRequest.m
# SmartDeviceLink/SDLOnTBTClientState.m
# SmartDeviceLink/SDLOnTouchEvent.m
# SmartDeviceLink/SDLOnVehicleData.m
# SmartDeviceLink/SDLPerformAudioPassThru.m
# SmartDeviceLink/SDLPerformInteraction.m
# SmartDeviceLink/SDLPerformInteractionResponse.m
# SmartDeviceLink/SDLProxy.m
# SmartDeviceLink/SDLPutFile.m
# SmartDeviceLink/SDLRPCResponse.m
# SmartDeviceLink/SDLRegisterAppInterface.m
# SmartDeviceLink/SDLRegisterAppInterfaceResponse.m
# SmartDeviceLink/SDLResetGlobalProperties.m
# SmartDeviceLink/SDLSetMediaClockTimer.m
# SmartDeviceLink/SDLShow.m
# SmartDeviceLink/SDLSingleTireStatus.m
# SmartDeviceLink/SDLSoftButton.m
# SmartDeviceLink/SDLSubscribeButton.m
# SmartDeviceLink/SDLSystemRequest.m
# SmartDeviceLink/SDLTTSChunk.m
# SmartDeviceLink/SDLTextField.m
# SmartDeviceLink/SDLTireStatus.m
# SmartDeviceLink/SDLUnsubscribeButton.m
# SmartDeviceLink/SDLVehicleDataResult.m
# SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnAppInterfaceUnregisteredSpec.m
# SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnButtonEventSpec.m
# SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnButtonPressSpec.m
# SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnCommandSpec.m
# SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnDriverDistractionSpec.m
# SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnHMIStatusSpec.m
# SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnKeyboardInputSpec.m
# SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnLanguageChangeSpec.m
# SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnLockScreenStatusSpec.m
# SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnSystemRequestSpec.m
# SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnTBTClientStateSpec.m
# SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnTouchEventSpec.m
# SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnVehicleDataSpec.m
# SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPerformAudioPassThruSpec.m
# SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPerformInteractionSpec.m
# SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPutFileSpec.m
# SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLRegisterAppInterfaceSpec.m
# SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLResetGlobalPropertiesSpec.m
# SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetMediaClockTimerSpec.m
# SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLShowSpec.m
# SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeButtonSpec.m
# SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSystemRequestSpec.m
# SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeButtonSpec.m
# SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetVehicleDataResponseSpec.m
# SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLPerformInteractionResponseSpec.m
# SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLRegisterAppInterfaceResponseSpec.m
# SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAirbagStatusSpec.m
# SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAudioPassThruCapabilitiesSpec.m
# SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLBeltStatusSpec.m
# SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLBodyInformationSpec.m
# SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLButtonCapabilitiesSpec.m
# SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLClusterModeStatusSpec.m
# SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDIDResult.m
# SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDeviceStatusSpec.m
# SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDisplayCapabilitiesSpec.m
# SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLECallInfoSpec.m
# SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLEmergencyEventSpec.m
# SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLGPSDataSpec.m
# SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHMIPermissionsSpec.m
# SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHeadLampStatusSpec.m
# SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLImageFieldSpec.m
# SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLImageSpec.m
# SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLKeyboardPropertiesSpec.m
# SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLMyKeySpec.m
# SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLParameterPermissionsSpec.m
# SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSingleTireStatusSpec.m
# SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSoftButtonSpec.m
# SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTTSChunkSpec.m
# SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTextFieldSpec.m
# SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTireStatusSpec.m
# SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVehicleDataResultSpec.m
512 files changed, 4410 insertions, 6841 deletions
diff --git a/.xctool-args b/.xctool-args deleted file mode 100644 index 27942e3b9..000000000 --- a/.xctool-args +++ /dev/null @@ -1,7 +0,0 @@ -[ - "-project", "SmartDeviceLink-iOS.xcodeproj", - "-scheme", "SmartDeviceLink", - "-sdk", "iphonesimulator", - "ONLY_ACTIVE_ARCH=NO", - "RUN_CLANG_STATIC_ANALYZER=NO" -] @@ -67,12 +67,14 @@ carthage bootstrap --platform ios cd ../ ``` -At this point, you can run tests from Xcode, or, if you wish to run the tests exactly as they will be run on the CI server, [install xctool](https://github.com/facebook/xctool#installation) and run: +At this point, you can run tests from Xcode, or, if you wish to run the tests exactly as they will be run on the CI server, run: ```bash -xctool test +xcodebuild -project "SmartDeviceLink-iOS.xcodeproj" -scheme "SmartDeviceLink" -sdk "iphonesimulator10.0" -destination "OS=10.0,name=iPhone 7" -configuration Debug ONLY_ACTIVE_ARCH=NO RUN_CLANG_STATIC_ANALYZER=NO GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES ENABLE_TESTABILITY=YES test ``` +You can optionally pipe the result to [xcpretty](https://github.com/supermarin/xcpretty). + ### SDL iOS Getting Started #### Other Installation Requirements diff --git a/SmartDeviceLink-iOS.podspec b/SmartDeviceLink-iOS.podspec index d43e30913..24c9f8c17 100644 --- a/SmartDeviceLink-iOS.podspec +++ b/SmartDeviceLink-iOS.podspec @@ -10,6 +10,6 @@ s.platform = :ios, "6.0" s.source = { :git => "https://github.com/smartdevicelink/sdl_ios.git", :tag => s.version.to_s } s.source_files = "SmartDeviceLink/*.{h,m}" s.requires_arc = true -s.resource_bundles = { 'SmartDeviceLink' => ['SmartDeviceLink/Assets/**/*'] } +s.resource_bundles = { 'SmartDeviceLink' => ['SmartDeviceLink/Assets/**/*', 'SmartDeviceLink/iOS 7 Assets/*'] } end diff --git a/SmartDeviceLink-iOS.xcodeproj/project.pbxproj b/SmartDeviceLink-iOS.xcodeproj/project.pbxproj index 584849e4e..7b8536d06 100644 --- a/SmartDeviceLink-iOS.xcodeproj/project.pbxproj +++ b/SmartDeviceLink-iOS.xcodeproj/project.pbxproj @@ -362,7 +362,6 @@ 5D61FC6E1A84238C00846EE7 /* SDLCreateInteractionChoiceSetResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D61FA811A84238A00846EE7 /* SDLCreateInteractionChoiceSetResponse.m */; }; 5D61FC6F1A84238C00846EE7 /* SDLDebugTool.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D61FA821A84238A00846EE7 /* SDLDebugTool.h */; settings = {ATTRIBUTES = (Public, ); }; }; 5D61FC701A84238C00846EE7 /* SDLDebugTool.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D61FA831A84238A00846EE7 /* SDLDebugTool.m */; }; - 5D61FC711A84238C00846EE7 /* SDLDecoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D61FA841A84238A00846EE7 /* SDLDecoder.h */; }; 5D61FC721A84238C00846EE7 /* SDLDeleteCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D61FA851A84238A00846EE7 /* SDLDeleteCommand.h */; settings = {ATTRIBUTES = (Public, ); }; }; 5D61FC731A84238C00846EE7 /* SDLDeleteCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D61FA861A84238A00846EE7 /* SDLDeleteCommand.m */; }; 5D61FC741A84238C00846EE7 /* SDLDeleteCommandResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D61FA871A84238A00846EE7 /* SDLDeleteCommandResponse.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -411,7 +410,6 @@ 5D61FC9F1A84238C00846EE7 /* SDLEncodedSyncPData.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D61FAB21A84238A00846EE7 /* SDLEncodedSyncPData.m */; }; 5D61FCA01A84238C00846EE7 /* SDLEncodedSyncPDataResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D61FAB31A84238A00846EE7 /* SDLEncodedSyncPDataResponse.h */; settings = {ATTRIBUTES = (Public, ); }; }; 5D61FCA11A84238C00846EE7 /* SDLEncodedSyncPDataResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D61FAB41A84238A00846EE7 /* SDLEncodedSyncPDataResponse.m */; }; - 5D61FCA21A84238C00846EE7 /* SDLEncoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D61FAB51A84238A00846EE7 /* SDLEncoder.h */; }; 5D61FCA31A84238C00846EE7 /* SDLEndAudioPassThru.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D61FAB61A84238A00846EE7 /* SDLEndAudioPassThru.h */; settings = {ATTRIBUTES = (Public, ); }; }; 5D61FCA41A84238C00846EE7 /* SDLEndAudioPassThru.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D61FAB71A84238A00846EE7 /* SDLEndAudioPassThru.m */; }; 5D61FCA51A84238C00846EE7 /* SDLEndAudioPassThruResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D61FAB81A84238A00846EE7 /* SDLEndAudioPassThruResponse.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -465,10 +463,6 @@ 5D61FCD61A84238C00846EE7 /* SDLImageType.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D61FAE91A84238A00846EE7 /* SDLImageType.m */; }; 5D61FCD71A84238C00846EE7 /* SDLInteractionMode.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D61FAEA1A84238A00846EE7 /* SDLInteractionMode.h */; settings = {ATTRIBUTES = (Public, ); }; }; 5D61FCD81A84238C00846EE7 /* SDLInteractionMode.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D61FAEB1A84238A00846EE7 /* SDLInteractionMode.m */; }; - 5D61FCDC1A84238C00846EE7 /* SDLJsonDecoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D61FAEF1A84238A00846EE7 /* SDLJsonDecoder.h */; }; - 5D61FCDD1A84238C00846EE7 /* SDLJsonDecoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D61FAF01A84238A00846EE7 /* SDLJsonDecoder.m */; }; - 5D61FCDE1A84238C00846EE7 /* SDLJsonEncoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D61FAF11A84238A00846EE7 /* SDLJsonEncoder.h */; }; - 5D61FCDF1A84238C00846EE7 /* SDLJsonEncoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D61FAF21A84238A00846EE7 /* SDLJsonEncoder.m */; }; 5D61FCE01A84238C00846EE7 /* SDLKeyboardEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D61FAF31A84238A00846EE7 /* SDLKeyboardEvent.h */; settings = {ATTRIBUTES = (Public, ); }; }; 5D61FCE11A84238C00846EE7 /* SDLKeyboardEvent.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D61FAF41A84238A00846EE7 /* SDLKeyboardEvent.m */; }; 5D61FCE21A84238C00846EE7 /* SDLKeyboardLayout.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D61FAF51A84238A00846EE7 /* SDLKeyboardLayout.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -653,8 +647,6 @@ 5D61FD961A84238C00846EE7 /* SDLShowResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D61FBA91A84238B00846EE7 /* SDLShowResponse.m */; }; 5D61FD971A84238C00846EE7 /* SDLSingleTireStatus.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D61FBAA1A84238B00846EE7 /* SDLSingleTireStatus.h */; settings = {ATTRIBUTES = (Public, ); }; }; 5D61FD981A84238C00846EE7 /* SDLSingleTireStatus.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D61FBAB1A84238B00846EE7 /* SDLSingleTireStatus.m */; }; - 5D61FD991A84238C00846EE7 /* SDLSiphonServer.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D61FBAC1A84238B00846EE7 /* SDLSiphonServer.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 5D61FD9A1A84238C00846EE7 /* SDLSiphonServer.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D61FBAD1A84238B00846EE7 /* SDLSiphonServer.m */; }; 5D61FD9B1A84238C00846EE7 /* SDLSlider.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D61FBAE1A84238B00846EE7 /* SDLSlider.h */; settings = {ATTRIBUTES = (Public, ); }; }; 5D61FD9C1A84238C00846EE7 /* SDLSlider.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D61FBAF1A84238B00846EE7 /* SDLSlider.m */; }; 5D61FD9D1A84238C00846EE7 /* SDLSliderResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D61FBB01A84238B00846EE7 /* SDLSliderResponse.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -885,7 +877,26 @@ DA4353E91D2721680099B8C4 /* DispatchTimerSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = DA4353E61D2721680099B8C4 /* DispatchTimerSpec.m */; }; DA4353EA1D2721680099B8C4 /* SDLTouchManagerSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = DA4353E71D2721680099B8C4 /* SDLTouchManagerSpec.m */; }; DA4353EB1D2721680099B8C4 /* SDLTouchSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = DA4353E81D2721680099B8C4 /* SDLTouchSpec.m */; }; + DA7515B11D95FAA000F29323 /* lock_arrow_down_black.png in Resources */ = {isa = PBXBuildFile; fileRef = DA7515981D95FAA000F29323 /* lock_arrow_down_black.png */; }; + DA7515B21D95FAA000F29323 /* lock_arrow_down_black@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DA7515991D95FAA000F29323 /* lock_arrow_down_black@2x.png */; }; + DA7515B31D95FAA000F29323 /* lock_arrow_down_black@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = DA75159A1D95FAA000F29323 /* lock_arrow_down_black@3x.png */; }; + DA7515B41D95FAA000F29323 /* lock_arrow_down_white.png in Resources */ = {isa = PBXBuildFile; fileRef = DA75159C1D95FAA000F29323 /* lock_arrow_down_white.png */; }; + DA7515B51D95FAA000F29323 /* lock_arrow_down_white@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DA75159D1D95FAA000F29323 /* lock_arrow_down_white@2x.png */; }; + DA7515B61D95FAA000F29323 /* lock_arrow_down_white@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = DA75159E1D95FAA000F29323 /* lock_arrow_down_white@3x.png */; }; + DA7515B71D95FAA000F29323 /* lock_arrow_up_black.png in Resources */ = {isa = PBXBuildFile; fileRef = DA7515A11D95FAA000F29323 /* lock_arrow_up_black.png */; }; + DA7515B81D95FAA000F29323 /* lock_arrow_up_black@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DA7515A21D95FAA000F29323 /* lock_arrow_up_black@2x.png */; }; + DA7515B91D95FAA000F29323 /* lock_arrow_up_black@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = DA7515A31D95FAA000F29323 /* lock_arrow_up_black@3x.png */; }; + DA7515BA1D95FAA000F29323 /* lock_arrow_up_white.png in Resources */ = {isa = PBXBuildFile; fileRef = DA7515A51D95FAA000F29323 /* lock_arrow_up_white.png */; }; + DA7515BB1D95FAA000F29323 /* lock_arrow_up_white@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DA7515A61D95FAA000F29323 /* lock_arrow_up_white@2x.png */; }; + DA7515BC1D95FAA000F29323 /* lock_arrow_up_white@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = DA7515A71D95FAA000F29323 /* lock_arrow_up_white@3x.png */; }; + DA7515BD1D95FAA000F29323 /* sdl_logo_black.png in Resources */ = {isa = PBXBuildFile; fileRef = DA7515AA1D95FAA000F29323 /* sdl_logo_black.png */; }; + DA7515BE1D95FAA000F29323 /* sdl_logo_black@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DA7515AB1D95FAA000F29323 /* sdl_logo_black@2x.png */; }; + DA7515BF1D95FAA000F29323 /* sdl_logo_black@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = DA7515AC1D95FAA000F29323 /* sdl_logo_black@3x.png */; }; + DA7515C01D95FAA000F29323 /* sdl_logo_white.png in Resources */ = {isa = PBXBuildFile; fileRef = DA7515AE1D95FAA000F29323 /* sdl_logo_white.png */; }; + DA7515C11D95FAA000F29323 /* sdl_logo_white@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DA7515AF1D95FAA000F29323 /* sdl_logo_white@2x.png */; }; + DA7515C21D95FAA000F29323 /* sdl_logo_white@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = DA7515B01D95FAA000F29323 /* sdl_logo_white@3x.png */; }; DA96C0661D4D4F730022F520 /* SDLAppInfoSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = DA96C0651D4D4F730022F520 /* SDLAppInfoSpec.m */; }; + DAB5378A1D9319E8008EB556 /* SDLNames.m in Sources */ = {isa = PBXBuildFile; fileRef = DAB537891D9319E8008EB556 /* SDLNames.m */; }; DAC572571D1067270004288B /* SDLTouchManager.h in Headers */ = {isa = PBXBuildFile; fileRef = DAC572551D1067270004288B /* SDLTouchManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; DAC572581D1067270004288B /* SDLTouchManager.m in Sources */ = {isa = PBXBuildFile; fileRef = DAC572561D1067270004288B /* SDLTouchManager.m */; }; DAC5725B1D10B81E0004288B /* SDLTouch.m in Sources */ = {isa = PBXBuildFile; fileRef = DAC572591D10B81E0004288B /* SDLTouch.m */; }; @@ -1346,7 +1357,6 @@ 5D61FA811A84238A00846EE7 /* SDLCreateInteractionChoiceSetResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLCreateInteractionChoiceSetResponse.m; sourceTree = "<group>"; }; 5D61FA821A84238A00846EE7 /* SDLDebugTool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLDebugTool.h; sourceTree = "<group>"; }; 5D61FA831A84238A00846EE7 /* SDLDebugTool.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLDebugTool.m; sourceTree = "<group>"; }; - 5D61FA841A84238A00846EE7 /* SDLDecoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLDecoder.h; sourceTree = "<group>"; }; 5D61FA851A84238A00846EE7 /* SDLDeleteCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLDeleteCommand.h; sourceTree = "<group>"; }; 5D61FA861A84238A00846EE7 /* SDLDeleteCommand.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLDeleteCommand.m; sourceTree = "<group>"; }; 5D61FA871A84238A00846EE7 /* SDLDeleteCommandResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLDeleteCommandResponse.h; sourceTree = "<group>"; }; @@ -1395,7 +1405,6 @@ 5D61FAB21A84238A00846EE7 /* SDLEncodedSyncPData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLEncodedSyncPData.m; sourceTree = "<group>"; }; 5D61FAB31A84238A00846EE7 /* SDLEncodedSyncPDataResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLEncodedSyncPDataResponse.h; sourceTree = "<group>"; }; 5D61FAB41A84238A00846EE7 /* SDLEncodedSyncPDataResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLEncodedSyncPDataResponse.m; sourceTree = "<group>"; }; - 5D61FAB51A84238A00846EE7 /* SDLEncoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLEncoder.h; sourceTree = "<group>"; }; 5D61FAB61A84238A00846EE7 /* SDLEndAudioPassThru.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLEndAudioPassThru.h; sourceTree = "<group>"; }; 5D61FAB71A84238A00846EE7 /* SDLEndAudioPassThru.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLEndAudioPassThru.m; sourceTree = "<group>"; }; 5D61FAB81A84238A00846EE7 /* SDLEndAudioPassThruResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLEndAudioPassThruResponse.h; sourceTree = "<group>"; }; @@ -1449,10 +1458,6 @@ 5D61FAE91A84238A00846EE7 /* SDLImageType.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLImageType.m; sourceTree = "<group>"; }; 5D61FAEA1A84238A00846EE7 /* SDLInteractionMode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLInteractionMode.h; sourceTree = "<group>"; }; 5D61FAEB1A84238A00846EE7 /* SDLInteractionMode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLInteractionMode.m; sourceTree = "<group>"; }; - 5D61FAEF1A84238A00846EE7 /* SDLJsonDecoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLJsonDecoder.h; sourceTree = "<group>"; }; - 5D61FAF01A84238A00846EE7 /* SDLJsonDecoder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLJsonDecoder.m; sourceTree = "<group>"; }; - 5D61FAF11A84238A00846EE7 /* SDLJsonEncoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLJsonEncoder.h; sourceTree = "<group>"; }; - 5D61FAF21A84238A00846EE7 /* SDLJsonEncoder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLJsonEncoder.m; sourceTree = "<group>"; }; 5D61FAF31A84238A00846EE7 /* SDLKeyboardEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLKeyboardEvent.h; sourceTree = "<group>"; }; 5D61FAF41A84238A00846EE7 /* SDLKeyboardEvent.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLKeyboardEvent.m; sourceTree = "<group>"; }; 5D61FAF51A84238A00846EE7 /* SDLKeyboardLayout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLKeyboardLayout.h; sourceTree = "<group>"; }; @@ -1637,8 +1642,6 @@ 5D61FBA91A84238B00846EE7 /* SDLShowResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLShowResponse.m; sourceTree = "<group>"; }; 5D61FBAA1A84238B00846EE7 /* SDLSingleTireStatus.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLSingleTireStatus.h; sourceTree = "<group>"; }; 5D61FBAB1A84238B00846EE7 /* SDLSingleTireStatus.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLSingleTireStatus.m; sourceTree = "<group>"; }; - 5D61FBAC1A84238B00846EE7 /* SDLSiphonServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLSiphonServer.h; sourceTree = "<group>"; }; - 5D61FBAD1A84238B00846EE7 /* SDLSiphonServer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLSiphonServer.m; sourceTree = "<group>"; }; 5D61FBAE1A84238B00846EE7 /* SDLSlider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLSlider.h; sourceTree = "<group>"; }; 5D61FBAF1A84238B00846EE7 /* SDLSlider.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLSlider.m; sourceTree = "<group>"; }; 5D61FBB01A84238B00846EE7 /* SDLSliderResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLSliderResponse.h; sourceTree = "<group>"; }; @@ -1866,7 +1869,26 @@ DA4353E61D2721680099B8C4 /* DispatchTimerSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DispatchTimerSpec.m; path = UtilitiesSpecs/Touches/DispatchTimerSpec.m; sourceTree = "<group>"; }; DA4353E71D2721680099B8C4 /* SDLTouchManagerSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SDLTouchManagerSpec.m; path = UtilitiesSpecs/Touches/SDLTouchManagerSpec.m; sourceTree = "<group>"; }; DA4353E81D2721680099B8C4 /* SDLTouchSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SDLTouchSpec.m; path = UtilitiesSpecs/Touches/SDLTouchSpec.m; sourceTree = "<group>"; }; + DA7515981D95FAA000F29323 /* lock_arrow_down_black.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = lock_arrow_down_black.png; sourceTree = "<group>"; }; + DA7515991D95FAA000F29323 /* lock_arrow_down_black@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "lock_arrow_down_black@2x.png"; sourceTree = "<group>"; }; + DA75159A1D95FAA000F29323 /* lock_arrow_down_black@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "lock_arrow_down_black@3x.png"; sourceTree = "<group>"; }; + DA75159C1D95FAA000F29323 /* lock_arrow_down_white.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = lock_arrow_down_white.png; sourceTree = "<group>"; }; + DA75159D1D95FAA000F29323 /* lock_arrow_down_white@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "lock_arrow_down_white@2x.png"; sourceTree = "<group>"; }; + DA75159E1D95FAA000F29323 /* lock_arrow_down_white@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "lock_arrow_down_white@3x.png"; sourceTree = "<group>"; }; + DA7515A11D95FAA000F29323 /* lock_arrow_up_black.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = lock_arrow_up_black.png; sourceTree = "<group>"; }; + DA7515A21D95FAA000F29323 /* lock_arrow_up_black@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "lock_arrow_up_black@2x.png"; sourceTree = "<group>"; }; + DA7515A31D95FAA000F29323 /* lock_arrow_up_black@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "lock_arrow_up_black@3x.png"; sourceTree = "<group>"; }; + DA7515A51D95FAA000F29323 /* lock_arrow_up_white.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = lock_arrow_up_white.png; sourceTree = "<group>"; }; + DA7515A61D95FAA000F29323 /* lock_arrow_up_white@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "lock_arrow_up_white@2x.png"; sourceTree = "<group>"; }; + DA7515A71D95FAA000F29323 /* lock_arrow_up_white@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "lock_arrow_up_white@3x.png"; sourceTree = "<group>"; }; + DA7515AA1D95FAA000F29323 /* sdl_logo_black.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = sdl_logo_black.png; sourceTree = "<group>"; }; + DA7515AB1D95FAA000F29323 /* sdl_logo_black@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "sdl_logo_black@2x.png"; sourceTree = "<group>"; }; + DA7515AC1D95FAA000F29323 /* sdl_logo_black@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "sdl_logo_black@3x.png"; sourceTree = "<group>"; }; + DA7515AE1D95FAA000F29323 /* sdl_logo_white.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = sdl_logo_white.png; sourceTree = "<group>"; }; + DA7515AF1D95FAA000F29323 /* sdl_logo_white@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "sdl_logo_white@2x.png"; sourceTree = "<group>"; }; + DA7515B01D95FAA000F29323 /* sdl_logo_white@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "sdl_logo_white@3x.png"; sourceTree = "<group>"; }; DA96C0651D4D4F730022F520 /* SDLAppInfoSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLAppInfoSpec.m; sourceTree = "<group>"; }; + DAB537891D9319E8008EB556 /* SDLNames.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLNames.m; sourceTree = "<group>"; }; DAC572551D1067270004288B /* SDLTouchManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLTouchManager.h; sourceTree = "<group>"; }; DAC572561D1067270004288B /* SDLTouchManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLTouchManager.m; sourceTree = "<group>"; }; DAC572591D10B81E0004288B /* SDLTouch.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLTouch.m; sourceTree = "<group>"; }; @@ -2924,8 +2946,6 @@ 5D61FA7D1A84238A00846EE7 /* SDLConsoleController.m */, 5D61FA821A84238A00846EE7 /* SDLDebugTool.h */, 5D61FA831A84238A00846EE7 /* SDLDebugTool.m */, - 5D61FBAC1A84238B00846EE7 /* SDLSiphonServer.h */, - 5D61FBAD1A84238B00846EE7 /* SDLSiphonServer.m */, ); name = Debug; sourceTree = "<group>"; @@ -2936,31 +2956,19 @@ DAC5724C1D0FE3B60004288B /* Touches */, 5DCC199D1B8221D2004FFAD9 /* HTTP Connection */, E9C32B831AB20B2900F283AF /* @categories */, - 5D5934F71A8519A700687FB9 /* JSON */, 5D5934F91A851A8000687FB9 /* Prioritized Objects */, 5D61FAD21A84238A00846EE7 /* SDLHexUtility.h */, 5D61FAD31A84238A00846EE7 /* SDLHexUtility.m */, E9C32B8E1AB20BA200F283AF /* SDLTimer.h */, E9C32B8F1AB20BA200F283AF /* SDLTimer.m */, 5D61FB0F1A84238A00846EE7 /* SDLNames.h */, + DAB537891D9319E8008EB556 /* SDLNames.m */, 5D535DC31B72473800CF7760 /* SDLGlobals.h */, 5D535DC41B72473800CF7760 /* SDLGlobals.m */, ); name = Utilities; sourceTree = "<group>"; }; - 5D5934F71A8519A700687FB9 /* JSON */ = { - isa = PBXGroup; - children = ( - 5D5934FD1A851B1500687FB9 /* @protocols */, - 5D61FAEF1A84238A00846EE7 /* SDLJsonDecoder.h */, - 5D61FAF01A84238A00846EE7 /* SDLJsonDecoder.m */, - 5D61FAF11A84238A00846EE7 /* SDLJsonEncoder.h */, - 5D61FAF21A84238A00846EE7 /* SDLJsonEncoder.m */, - ); - name = JSON; - sourceTree = "<group>"; - }; 5D5934F81A8519C300687FB9 /* Notification */ = { isa = PBXGroup; children = ( @@ -3023,15 +3031,6 @@ name = "@protocols"; sourceTree = "<group>"; }; - 5D5934FD1A851B1500687FB9 /* @protocols */ = { - isa = PBXGroup; - children = ( - 5D61FA841A84238A00846EE7 /* SDLDecoder.h */, - 5D61FAB51A84238A00846EE7 /* SDLEncoder.h */, - ); - name = "@protocols"; - sourceTree = "<group>"; - }; 5D5934FE1A851B2500687FB9 /* @protocols */ = { isa = PBXGroup; children = ( @@ -3221,6 +3220,7 @@ 5D6F7A301BC5B7100070BF37 /* Lock Screen UI */ = { isa = PBXGroup; children = ( + DA7515951D95FAA000F29323 /* iOS 7 Assets */, 5D6F7A3D1BC811FC0070BF37 /* SDLAssets.xcassets */, 5D616B481D552F7A00553F6B /* SDLLockScreen.storyboard */, 5D6F7A331BC5B9B60070BF37 /* SDLLockScreenViewController.h */, @@ -3593,6 +3593,103 @@ name = Touches; sourceTree = "<group>"; }; + DA7515951D95FAA000F29323 /* iOS 7 Assets */ = { + isa = PBXGroup; + children = ( + DA7515961D95FAA000F29323 /* lock_arrow_down */, + DA75159F1D95FAA000F29323 /* lock_arrow_up */, + DA7515A81D95FAA000F29323 /* sdl_logo */, + ); + path = "iOS 7 Assets"; + sourceTree = "<group>"; + }; + DA7515961D95FAA000F29323 /* lock_arrow_down */ = { + isa = PBXGroup; + children = ( + DA7515971D95FAA000F29323 /* black */, + DA75159B1D95FAA000F29323 /* white */, + ); + path = lock_arrow_down; + sourceTree = "<group>"; + }; + DA7515971D95FAA000F29323 /* black */ = { + isa = PBXGroup; + children = ( + DA7515981D95FAA000F29323 /* lock_arrow_down_black.png */, + DA7515991D95FAA000F29323 /* lock_arrow_down_black@2x.png */, + DA75159A1D95FAA000F29323 /* lock_arrow_down_black@3x.png */, + ); + path = black; + sourceTree = "<group>"; + }; + DA75159B1D95FAA000F29323 /* white */ = { + isa = PBXGroup; + children = ( + DA75159C1D95FAA000F29323 /* lock_arrow_down_white.png */, + DA75159D1D95FAA000F29323 /* lock_arrow_down_white@2x.png */, + DA75159E1D95FAA000F29323 /* lock_arrow_down_white@3x.png */, + ); + path = white; + sourceTree = "<group>"; + }; + DA75159F1D95FAA000F29323 /* lock_arrow_up */ = { + isa = PBXGroup; + children = ( + DA7515A01D95FAA000F29323 /* black */, + DA7515A41D95FAA000F29323 /* white */, + ); + path = lock_arrow_up; + sourceTree = "<group>"; + }; + DA7515A01D95FAA000F29323 /* black */ = { + isa = PBXGroup; + children = ( + DA7515A11D95FAA000F29323 /* lock_arrow_up_black.png */, + DA7515A21D95FAA000F29323 /* lock_arrow_up_black@2x.png */, + DA7515A31D95FAA000F29323 /* lock_arrow_up_black@3x.png */, + ); + path = black; + sourceTree = "<group>"; + }; + DA7515A41D95FAA000F29323 /* white */ = { + isa = PBXGroup; + children = ( + DA7515A51D95FAA000F29323 /* lock_arrow_up_white.png */, + DA7515A61D95FAA000F29323 /* lock_arrow_up_white@2x.png */, + DA7515A71D95FAA000F29323 /* lock_arrow_up_white@3x.png */, + ); + path = white; + sourceTree = "<group>"; + }; + DA7515A81D95FAA000F29323 /* sdl_logo */ = { + isa = PBXGroup; + children = ( + DA7515A91D95FAA000F29323 /* black */, + DA7515AD1D95FAA000F29323 /* white */, + ); + path = sdl_logo; + sourceTree = "<group>"; + }; + DA7515A91D95FAA000F29323 /* black */ = { + isa = PBXGroup; + children = ( + DA7515AA1D95FAA000F29323 /* sdl_logo_black.png */, + DA7515AB1D95FAA000F29323 /* sdl_logo_black@2x.png */, + DA7515AC1D95FAA000F29323 /* sdl_logo_black@3x.png */, + ); + path = black; + sourceTree = "<group>"; + }; + DA7515AD1D95FAA000F29323 /* white */ = { + isa = PBXGroup; + children = ( + DA7515AE1D95FAA000F29323 /* sdl_logo_white.png */, + DA7515AF1D95FAA000F29323 /* sdl_logo_white@2x.png */, + DA7515B01D95FAA000F29323 /* sdl_logo_white@3x.png */, + ); + path = white; + sourceTree = "<group>"; + }; DAC5724C1D0FE3B60004288B /* Touches */ = { isa = PBXGroup; children = ( @@ -3804,7 +3901,6 @@ 5D2F58081D0717D5001085CE /* SDLManagerDelegate.h in Headers */, 5D61FC881A84238C00846EE7 /* SDLDiagnosticMessage.h in Headers */, 5D61FDB31A84238C00846EE7 /* SDLSubscribeVehicleDataResponse.h in Headers */, - 5D61FD991A84238C00846EE7 /* SDLSiphonServer.h in Headers */, 5D61FC961A84238C00846EE7 /* SDLECallConfirmationStatus.h in Headers */, 5D4D67AC1D2ED37A00468B4A /* SDLNotificationDispatcher.h in Headers */, 5D61FDA51A84238C00846EE7 /* SDLSpeak.h in Headers */, @@ -3934,10 +4030,6 @@ DAC5726C1D11B4840004288B /* SDLTouchManagerDelegate.h in Headers */, 5D61FD3F1A84238C00846EE7 /* SDLPrioritizedObjectCollection.h in Headers */, 5D61FCBF1A84238C00846EE7 /* SDLHexUtility.h in Headers */, - 5D61FCA21A84238C00846EE7 /* SDLEncoder.h in Headers */, - 5D61FCDE1A84238C00846EE7 /* SDLJsonEncoder.h in Headers */, - 5D61FCDC1A84238C00846EE7 /* SDLJsonDecoder.h in Headers */, - 5D61FC711A84238C00846EE7 /* SDLDecoder.h in Headers */, 5D61FD6F1A84238C00846EE7 /* SDLRPCPayload.h in Headers */, 5D61FCF01A84238C00846EE7 /* SDLLockScreenStatusManager.h in Headers */, 5D61FD311A84238C00846EE7 /* SDLPolicyDataParser.h in Headers */, @@ -4070,8 +4162,26 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + DA7515B51D95FAA000F29323 /* lock_arrow_down_white@2x.png in Resources */, + DA7515BE1D95FAA000F29323 /* sdl_logo_black@2x.png in Resources */, + DA7515B91D95FAA000F29323 /* lock_arrow_up_black@3x.png in Resources */, + DA7515B71D95FAA000F29323 /* lock_arrow_up_black.png in Resources */, + DA7515BC1D95FAA000F29323 /* lock_arrow_up_white@3x.png in Resources */, + DA7515B81D95FAA000F29323 /* lock_arrow_up_black@2x.png in Resources */, + DA7515C21D95FAA000F29323 /* sdl_logo_white@3x.png in Resources */, + DA7515C01D95FAA000F29323 /* sdl_logo_white.png in Resources */, + DA7515C11D95FAA000F29323 /* sdl_logo_white@2x.png in Resources */, + DA7515BD1D95FAA000F29323 /* sdl_logo_black.png in Resources */, + DA7515B11D95FAA000F29323 /* lock_arrow_down_black.png in Resources */, + DA7515BA1D95FAA000F29323 /* lock_arrow_up_white.png in Resources */, 5D6F7A3E1BC811FC0070BF37 /* SDLAssets.xcassets in Resources */, 5D616B451D552F7A00553F6B /* SDLLockScreen.storyboard in Resources */, + DA7515BB1D95FAA000F29323 /* lock_arrow_up_white@2x.png in Resources */, + DA7515B61D95FAA000F29323 /* lock_arrow_down_white@3x.png in Resources */, + DA7515B21D95FAA000F29323 /* lock_arrow_down_black@2x.png in Resources */, + DA7515B41D95FAA000F29323 /* lock_arrow_down_white.png in Resources */, + DA7515B31D95FAA000F29323 /* lock_arrow_down_black@3x.png in Resources */, + DA7515BF1D95FAA000F29323 /* sdl_logo_black@3x.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -4128,8 +4238,6 @@ 5D61FC871A84238C00846EE7 /* SDLDeviceStatus.m in Sources */, 5D61FD561A84238C00846EE7 /* SDLPutFile.m in Sources */, 5D61FCE71A84238C00846EE7 /* SDLKeypressMode.m in Sources */, - 5D61FD9A1A84238C00846EE7 /* SDLSiphonServer.m in Sources */, - 5D61FCDF1A84238C00846EE7 /* SDLJsonEncoder.m in Sources */, 5D7F87F41CE3C29E002DD7C4 /* SDLFileWrapper.m in Sources */, 5D61FD941A84238C00846EE7 /* SDLShowConstantTBTResponse.m in Sources */, 5D61FE0A1A84238C00846EE7 /* SDLVehicleDataType.m in Sources */, @@ -4302,13 +4410,13 @@ 5D61FD8C1A84238C00846EE7 /* SDLSetMediaClockTimer.m in Sources */, 5D2996EA1BFCC0E3006106BF /* (null) in Sources */, 5D61FE121A84238C00846EE7 /* SDLWarningLightStatus.m in Sources */, - 5D61FCDD1A84238C00846EE7 /* SDLJsonDecoder.m in Sources */, 5D61FCB81A84238C00846EE7 /* SDLGetVehicleDataResponse.m in Sources */, 5D61FC661A84238C00846EE7 /* SDLCompassDirection.m in Sources */, 5D61FD841A84238C00846EE7 /* SDLSetDisplayLayout.m in Sources */, 5D61FE001A84238C00846EE7 /* SDLVehicleDataEventStatus.m in Sources */, 5D61FDC41A84238C00846EE7 /* SDLTBTState.m in Sources */, 5D61FDA61A84238C00846EE7 /* SDLSpeak.m in Sources */, + DAB5378A1D9319E8008EB556 /* SDLNames.m in Sources */, 5D61FDDE1A84238C00846EE7 /* SDLTTSChunk.m in Sources */, 5D61FD9E1A84238C00846EE7 /* SDLSliderResponse.m in Sources */, 5D61FC5C1A84238C00846EE7 /* SDLChangeRegistration.m in Sources */, diff --git a/SmartDeviceLink/Assets/Base.lproj/SDLLockScreen.storyboard b/SmartDeviceLink/Assets/Base.lproj/SDLLockScreen.storyboard index bed60e2bc..4743ae983 100644 --- a/SmartDeviceLink/Assets/Base.lproj/SDLLockScreen.storyboard +++ b/SmartDeviceLink/Assets/Base.lproj/SDLLockScreen.storyboard @@ -1,9 +1,10 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15G31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="sao-xX-Ugl"> +<?xml version="1.0" encoding="UTF-8"?> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11201" systemVersion="16A323" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="sao-xX-Ugl"> <dependencies> - <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/> + <deployment version="1536" identifier="iOS"/> + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/> <capability name="Constraints to layout margins" minToolsVersion="6.0"/> + <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <scenes> <!--Lock Screen View Controller--> @@ -15,76 +16,59 @@ <viewControllerLayoutGuide type="bottom" id="wh4-r5-yql"/> </layoutGuides> <view key="view" contentMode="scaleToFill" id="daa-1b-9se"> - <rect key="frame" x="0.0" y="0.0" width="600" height="600"/> + <rect key="frame" x="0.0" y="0.0" width="320" height="480"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="fyC-E0-YKF"> - <rect key="frame" x="240" y="527" width="120" height="36"/> <constraints> <constraint firstAttribute="width" constant="120" id="Pm5-yr-PT3"/> <constraint firstAttribute="height" constant="36" id="yVy-ww-yMp"/> </constraints> - <variation key="widthClass=compact" fixedFrame="YES"> - <rect key="frame" x="140" y="531" width="120" height="36"/> - </variation> </imageView> <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="qlE-SZ-K9i"> - <rect key="frame" x="180" y="122" width="240" height="128"/> <constraints> <constraint firstAttribute="width" constant="240" id="Bk8-YV-DHy"/> <constraint firstAttribute="height" constant="128" id="boE-Tt-Ols"/> </constraints> </imageView> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Locked for your safety" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2GC-iG-Bjq"> - <rect key="frame" x="20" y="575" width="560" height="17"/> <fontDescription key="fontDescription" type="boldSystem" pointSize="14"/> - <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> + <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> - <variation key="widthClass=compact" fixedFrame="YES"> - <rect key="frame" x="20" y="575" width="360" height="17"/> - </variation> </label> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="lock_arrow_up_black" translatesAutoresizingMaskIntoConstraints="NO" id="bgC-hp-jto"> - <rect key="frame" x="261" y="266" width="30" height="68"/> <constraints> <constraint firstAttribute="height" constant="68" id="TX0-CV-jWt"/> <constraint firstAttribute="width" constant="30" id="qg1-7M-JOH"/> </constraints> </imageView> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="lock_arrow_down_black" translatesAutoresizingMaskIntoConstraints="NO" id="QwS-i6-nIR"> - <rect key="frame" x="309" y="266" width="30" height="68"/> <constraints> <constraint firstAttribute="width" constant="30" id="dH7-wX-ij9"/> <constraint firstAttribute="height" constant="68" id="hm6-eY-q7P"/> </constraints> </imageView> <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="M7Q-8D-weT"> - <rect key="frame" x="180" y="350" width="240" height="128"/> <constraints> <constraint firstAttribute="height" constant="128" id="1Px-le-yzw"/> <constraint firstAttribute="width" constant="240" id="eVl-bJ-3TM"/> </constraints> - <variation key="widthClass=compact" ambiguous="YES" misplaced="YES"> - <rect key="frame" x="80" y="309" width="240" height="126"/> - </variation> </imageView> <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="b2o-8D-i9T"> - <rect key="frame" x="208" y="262" width="185" height="76"/> <constraints> <constraint firstAttribute="width" constant="185" id="CE6-0z-Lmn"/> <constraint firstAttribute="height" constant="76" id="emS-mJ-Ryy"/> </constraints> </imageView> <view opaque="NO" alpha="0.0" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="yyo-mJ-82g" userLabel="Center Spacer View"> - <rect key="frame" x="299" y="299" width="2" height="2"/> - <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> + <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="height" constant="2" id="1D8-iN-cG4"/> <constraint firstAttribute="width" constant="2" id="BOG-80-2W5"/> </constraints> </view> </subviews> - <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> + <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstItem="bgC-hp-jto" firstAttribute="centerY" secondItem="daa-1b-9se" secondAttribute="centerY" id="3M5-ke-rxH"/> <constraint firstAttribute="trailingMargin" secondItem="2GC-iG-Bjq" secondAttribute="trailing" id="8ye-Ub-7tt"/> @@ -117,7 +101,7 @@ </viewController> <placeholder placeholderIdentifier="IBFirstResponder" id="Wfa-ZV-GKT" userLabel="First Responder" sceneMemberID="firstResponder"/> </objects> - <point key="canvasLocation" x="976" y="843"/> + <point key="canvasLocation" x="639" y="866"/> </scene> </scenes> <resources> diff --git a/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_down_black.imageset/Contents.json b/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_down_black.imageset/Contents.json index 8288dcde7..85553c22d 100644 --- a/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_down_black.imageset/Contents.json +++ b/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_down_black.imageset/Contents.json @@ -2,17 +2,17 @@ "images" : [ { "idiom" : "universal", - "filename" : "lock_arrow_down.png", + "filename" : "lock_arrow_down_black.png", "scale" : "1x" }, { "idiom" : "universal", - "filename" : "lock_arrow_down@2x.png", + "filename" : "lock_arrow_down_black@2x.png", "scale" : "2x" }, { "idiom" : "universal", - "filename" : "lock_arrow_down@3x.png", + "filename" : "lock_arrow_down_black@3x.png", "scale" : "3x" } ], diff --git a/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_down_black.imageset/lock_arrow_down.png b/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_down_black.imageset/lock_arrow_down_black.png Binary files differindex 68f1c3ca7..68f1c3ca7 100644 --- a/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_down_black.imageset/lock_arrow_down.png +++ b/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_down_black.imageset/lock_arrow_down_black.png diff --git a/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_down_black.imageset/lock_arrow_down@2x.png b/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_down_black.imageset/lock_arrow_down_black@2x.png Binary files differindex 85fbc3446..85fbc3446 100644 --- a/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_down_black.imageset/lock_arrow_down@2x.png +++ b/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_down_black.imageset/lock_arrow_down_black@2x.png diff --git a/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_down_black.imageset/lock_arrow_down@3x.png b/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_down_black.imageset/lock_arrow_down_black@3x.png Binary files differindex af14aa8bb..af14aa8bb 100644 --- a/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_down_black.imageset/lock_arrow_down@3x.png +++ b/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_down_black.imageset/lock_arrow_down_black@3x.png diff --git a/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_down_white.imageset/Contents.json b/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_down_white.imageset/Contents.json index 8288dcde7..765c60c66 100644 --- a/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_down_white.imageset/Contents.json +++ b/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_down_white.imageset/Contents.json @@ -2,17 +2,17 @@ "images" : [ { "idiom" : "universal", - "filename" : "lock_arrow_down.png", + "filename" : "lock_arrow_down_white.png", "scale" : "1x" }, { "idiom" : "universal", - "filename" : "lock_arrow_down@2x.png", + "filename" : "lock_arrow_down_white@2x.png", "scale" : "2x" }, { "idiom" : "universal", - "filename" : "lock_arrow_down@3x.png", + "filename" : "lock_arrow_down_white@3x.png", "scale" : "3x" } ], diff --git a/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_down_white.imageset/lock_arrow_down.png b/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_down_white.imageset/lock_arrow_down_white.png Binary files differindex 07e620d05..07e620d05 100644 --- a/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_down_white.imageset/lock_arrow_down.png +++ b/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_down_white.imageset/lock_arrow_down_white.png diff --git a/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_down_white.imageset/lock_arrow_down@2x.png b/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_down_white.imageset/lock_arrow_down_white@2x.png Binary files differindex 57fa8120f..57fa8120f 100644 --- a/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_down_white.imageset/lock_arrow_down@2x.png +++ b/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_down_white.imageset/lock_arrow_down_white@2x.png diff --git a/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_down_white.imageset/lock_arrow_down@3x.png b/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_down_white.imageset/lock_arrow_down_white@3x.png Binary files differindex b354c1a13..b354c1a13 100644 --- a/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_down_white.imageset/lock_arrow_down@3x.png +++ b/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_down_white.imageset/lock_arrow_down_white@3x.png diff --git a/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_up_black.imageset/Contents.json b/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_up_black.imageset/Contents.json index 5e604bca6..2a088dfef 100644 --- a/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_up_black.imageset/Contents.json +++ b/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_up_black.imageset/Contents.json @@ -2,17 +2,17 @@ "images" : [ { "idiom" : "universal", - "filename" : "lock_arrow_up.png", + "filename" : "lock_arrow_up_black.png", "scale" : "1x" }, { "idiom" : "universal", - "filename" : "lock_arrow_up@2x.png", + "filename" : "lock_arrow_up_black@2x.png", "scale" : "2x" }, { "idiom" : "universal", - "filename" : "lock_arrow_up@3x.png", + "filename" : "lock_arrow_up_black@3x.png", "scale" : "3x" } ], diff --git a/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_up_black.imageset/lock_arrow_up.png b/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_up_black.imageset/lock_arrow_up_black.png Binary files differindex ecc048331..ecc048331 100644 --- a/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_up_black.imageset/lock_arrow_up.png +++ b/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_up_black.imageset/lock_arrow_up_black.png diff --git a/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_up_black.imageset/lock_arrow_up@2x.png b/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_up_black.imageset/lock_arrow_up_black@2x.png Binary files differindex fa38a0772..fa38a0772 100644 --- a/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_up_black.imageset/lock_arrow_up@2x.png +++ b/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_up_black.imageset/lock_arrow_up_black@2x.png diff --git a/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_up_black.imageset/lock_arrow_up@3x.png b/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_up_black.imageset/lock_arrow_up_black@3x.png Binary files differindex b59bda372..b59bda372 100644 --- a/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_up_black.imageset/lock_arrow_up@3x.png +++ b/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_up_black.imageset/lock_arrow_up_black@3x.png diff --git a/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_up_white.imageset/Contents.json b/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_up_white.imageset/Contents.json index 5e604bca6..3140e0f82 100644 --- a/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_up_white.imageset/Contents.json +++ b/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_up_white.imageset/Contents.json @@ -2,17 +2,17 @@ "images" : [ { "idiom" : "universal", - "filename" : "lock_arrow_up.png", + "filename" : "lock_arrow_up_white.png", "scale" : "1x" }, { "idiom" : "universal", - "filename" : "lock_arrow_up@2x.png", + "filename" : "lock_arrow_up_white@2x.png", "scale" : "2x" }, { "idiom" : "universal", - "filename" : "lock_arrow_up@3x.png", + "filename" : "lock_arrow_up_white@3x.png", "scale" : "3x" } ], diff --git a/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_up_white.imageset/lock_arrow_up.png b/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_up_white.imageset/lock_arrow_up_white.png Binary files differindex bb0662fe5..bb0662fe5 100644 --- a/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_up_white.imageset/lock_arrow_up.png +++ b/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_up_white.imageset/lock_arrow_up_white.png diff --git a/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_up_white.imageset/lock_arrow_up@2x.png b/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_up_white.imageset/lock_arrow_up_white@2x.png Binary files differindex f45e6b299..f45e6b299 100644 --- a/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_up_white.imageset/lock_arrow_up@2x.png +++ b/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_up_white.imageset/lock_arrow_up_white@2x.png diff --git a/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_up_white.imageset/lock_arrow_up@3x.png b/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_up_white.imageset/lock_arrow_up_white@3x.png Binary files differindex d30fc404c..d30fc404c 100644 --- a/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_up_white.imageset/lock_arrow_up@3x.png +++ b/SmartDeviceLink/Assets/SDLAssets.xcassets/lock_arrow_up_white.imageset/lock_arrow_up_white@3x.png diff --git a/SmartDeviceLink/SDLAddCommand.h b/SmartDeviceLink/SDLAddCommand.h index fead3e2dc..fec0aa8be 100644 --- a/SmartDeviceLink/SDLAddCommand.h +++ b/SmartDeviceLink/SDLAddCommand.h @@ -37,11 +37,6 @@ @interface SDLAddCommand : SDLRPCRequest <SDLRequestHandler> /** - * Constructs a new SDLAddCommand object - */ -- (instancetype)init; - -/** * Construct a SDLAddCommand with a handler callback when an event occurs. * * @param handler A callback that will be called when a button event occurs for the command @@ -51,13 +46,6 @@ - (instancetype)initWithHandler:(SDLRPCNotificationHandler)handler; /** - * Constructs a new *SDLAddCommand* object indicated by the dictionary parameter - * - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; - -/** * A handler that will let you know when the button you created is subscribed. * * @warning This will only work if you use SDLManager. diff --git a/SmartDeviceLink/SDLAddCommand.m b/SmartDeviceLink/SDLAddCommand.m index a264d164a..9c1f7fb4e 100644 --- a/SmartDeviceLink/SDLAddCommand.m +++ b/SmartDeviceLink/SDLAddCommand.m @@ -8,11 +8,10 @@ #import "SDLMenuParams.h" #import "SDLNames.h" - @implementation SDLAddCommand - (instancetype)init { - if (self = [super initWithName:NAMES_AddCommand]) { + if (self = [super initWithName:SDLNameAddCommand]) { } return self; } @@ -28,67 +27,61 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setCmdID:(NSNumber *)cmdID { if (cmdID != nil) { - [parameters setObject:cmdID forKey:NAMES_cmdID]; + [parameters setObject:cmdID forKey:SDLNameCommandId]; } else { - [parameters removeObjectForKey:NAMES_cmdID]; + [parameters removeObjectForKey:SDLNameCommandId]; } } - (NSNumber *)cmdID { - return [parameters objectForKey:NAMES_cmdID]; + return [parameters objectForKey:SDLNameCommandId]; } - (void)setMenuParams:(SDLMenuParams *)menuParams { if (menuParams != nil) { - [parameters setObject:menuParams forKey:NAMES_menuParams]; + [parameters setObject:menuParams forKey:SDLNameMenuParams]; } else { - [parameters removeObjectForKey:NAMES_menuParams]; + [parameters removeObjectForKey:SDLNameMenuParams]; } } - (SDLMenuParams *)menuParams { - NSObject *obj = [parameters objectForKey:NAMES_menuParams]; + NSObject *obj = [parameters objectForKey:SDLNameMenuParams]; if (obj == nil || [obj isKindOfClass:SDLMenuParams.class]) { return (SDLMenuParams *)obj; } else { - return [[SDLMenuParams alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLMenuParams alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setVrCommands:(NSMutableArray *)vrCommands { if (vrCommands != nil) { - [parameters setObject:vrCommands forKey:NAMES_vrCommands]; + [parameters setObject:vrCommands forKey:SDLNameVRCommands]; } else { - [parameters removeObjectForKey:NAMES_vrCommands]; + [parameters removeObjectForKey:SDLNameVRCommands]; } } - (NSMutableArray *)vrCommands { - return [parameters objectForKey:NAMES_vrCommands]; + return [parameters objectForKey:SDLNameVRCommands]; } - (void)setCmdIcon:(SDLImage *)cmdIcon { if (cmdIcon != nil) { - [parameters setObject:cmdIcon forKey:NAMES_cmdIcon]; + [parameters setObject:cmdIcon forKey:SDLNameCommandIcon]; } else { - [parameters removeObjectForKey:NAMES_cmdIcon]; + [parameters removeObjectForKey:SDLNameCommandIcon]; } } - (SDLImage *)cmdIcon { - NSObject *obj = [parameters objectForKey:NAMES_cmdIcon]; + NSObject *obj = [parameters objectForKey:SDLNameCommandIcon]; if (obj == nil || [obj isKindOfClass:SDLImage.class]) { return (SDLImage *)obj; } else { - return [[SDLImage alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLImage alloc] initWithDictionary:(NSDictionary *)obj]; } } diff --git a/SmartDeviceLink/SDLAddCommandResponse.h b/SmartDeviceLink/SDLAddCommandResponse.h index dfa132f6d..ee037f281 100644 --- a/SmartDeviceLink/SDLAddCommandResponse.h +++ b/SmartDeviceLink/SDLAddCommandResponse.h @@ -9,10 +9,6 @@ * * Since <b>SmartDeviceLink 1.0</b> */ -@interface SDLAddCommandResponse : SDLRPCResponse { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLAddCommandResponse : SDLRPCResponse @end diff --git a/SmartDeviceLink/SDLAddCommandResponse.m b/SmartDeviceLink/SDLAddCommandResponse.m index 3beba9db6..f02a460a1 100644 --- a/SmartDeviceLink/SDLAddCommandResponse.m +++ b/SmartDeviceLink/SDLAddCommandResponse.m @@ -7,13 +7,7 @@ @implementation SDLAddCommandResponse - (instancetype)init { - if (self = [super initWithName:NAMES_AddCommand]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameAddCommand]) { } return self; } diff --git a/SmartDeviceLink/SDLAddSubMenu.h b/SmartDeviceLink/SDLAddSubMenu.h index 0a749b382..623757916 100644 --- a/SmartDeviceLink/SDLAddSubMenu.h +++ b/SmartDeviceLink/SDLAddSubMenu.h @@ -16,20 +16,7 @@ * Since <b>SmartDeviceLink 1.0</b><br> * see SDLDeleteSubMenu SDLAddCommand SDLDeleteCommand */ -@interface SDLAddSubMenu : SDLRPCRequest { -} - -/** - * Constructs a new SDLAddSubMenu object - */ -- (instancetype)init; -/** - * Constructs a new SDLAddSubMenu object indicated by the dictionary parameter - * <p> - * - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLAddSubMenu : SDLRPCRequest /** * @abstract a Menu ID that identifies a sub menu diff --git a/SmartDeviceLink/SDLAddSubMenu.m b/SmartDeviceLink/SDLAddSubMenu.m index f02192b00..0ddd4aa46 100644 --- a/SmartDeviceLink/SDLAddSubMenu.m +++ b/SmartDeviceLink/SDLAddSubMenu.m @@ -7,51 +7,45 @@ @implementation SDLAddSubMenu - (instancetype)init { - if (self = [super initWithName:NAMES_AddSubMenu]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameAddSubMenu]) { } return self; } - (void)setMenuID:(NSNumber *)menuID { if (menuID != nil) { - [parameters setObject:menuID forKey:NAMES_menuID]; + [parameters setObject:menuID forKey:SDLNameMenuId]; } else { - [parameters removeObjectForKey:NAMES_menuID]; + [parameters removeObjectForKey:SDLNameMenuId]; } } - (NSNumber *)menuID { - return [parameters objectForKey:NAMES_menuID]; + return [parameters objectForKey:SDLNameMenuId]; } - (void)setPosition:(NSNumber *)position { if (position != nil) { - [parameters setObject:position forKey:NAMES_position]; + [parameters setObject:position forKey:SDLNamePosition]; } else { - [parameters removeObjectForKey:NAMES_position]; + [parameters removeObjectForKey:SDLNamePosition]; } } - (NSNumber *)position { - return [parameters objectForKey:NAMES_position]; + return [parameters objectForKey:SDLNamePosition]; } - (void)setMenuName:(NSString *)menuName { if (menuName != nil) { - [parameters setObject:menuName forKey:NAMES_menuName]; + [parameters setObject:menuName forKey:SDLNameMenuName]; } else { - [parameters removeObjectForKey:NAMES_menuName]; + [parameters removeObjectForKey:SDLNameMenuName]; } } - (NSString *)menuName { - return [parameters objectForKey:NAMES_menuName]; + return [parameters objectForKey:SDLNameMenuName]; } @end diff --git a/SmartDeviceLink/SDLAddSubMenuResponse.h b/SmartDeviceLink/SDLAddSubMenuResponse.h index 2ea2157d7..b3124433b 100644 --- a/SmartDeviceLink/SDLAddSubMenuResponse.h +++ b/SmartDeviceLink/SDLAddSubMenuResponse.h @@ -7,10 +7,6 @@ * SDLAddSubMenuResponse is sent, when SDLAddSubMenu has been called * Since <b>SmartDeviceLink 1.0</b> */ -@interface SDLAddSubMenuResponse : SDLRPCResponse { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLAddSubMenuResponse : SDLRPCResponse @end diff --git a/SmartDeviceLink/SDLAddSubMenuResponse.m b/SmartDeviceLink/SDLAddSubMenuResponse.m index 5df2745b5..328a38401 100644 --- a/SmartDeviceLink/SDLAddSubMenuResponse.m +++ b/SmartDeviceLink/SDLAddSubMenuResponse.m @@ -7,13 +7,7 @@ @implementation SDLAddSubMenuResponse - (instancetype)init { - if (self = [super initWithName:NAMES_AddSubMenu]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameAddSubMenu]) { } return self; } diff --git a/SmartDeviceLink/SDLAirbagStatus.h b/SmartDeviceLink/SDLAirbagStatus.h index cb2c71ed7..a8d127f17 100644 --- a/SmartDeviceLink/SDLAirbagStatus.h +++ b/SmartDeviceLink/SDLAirbagStatus.h @@ -5,11 +5,7 @@ #import "SDLVehicleDataEventStatus.h" -@interface SDLAirbagStatus : SDLRPCStruct { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLAirbagStatus : SDLRPCStruct @property (strong) SDLVehicleDataEventStatus driverAirbagDeployed; @property (strong) SDLVehicleDataEventStatus driverSideAirbagDeployed; diff --git a/SmartDeviceLink/SDLAirbagStatus.m b/SmartDeviceLink/SDLAirbagStatus.m index 516977b6e..099bfe4f5 100644 --- a/SmartDeviceLink/SDLAirbagStatus.m +++ b/SmartDeviceLink/SDLAirbagStatus.m @@ -6,119 +6,107 @@ @implementation SDLAirbagStatus -- (instancetype)init { - if (self = [super init]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setDriverAirbagDeployed:(SDLVehicleDataEventStatus)driverAirbagDeployed { if (driverAirbagDeployed != nil) { - [store setObject:driverAirbagDeployed forKey:NAMES_driverAirbagDeployed]; + [store setObject:driverAirbagDeployed forKey:SDLNameDriverAirbagDeployed]; } else { - [store removeObjectForKey:NAMES_driverAirbagDeployed]; + [store removeObjectForKey:SDLNameDriverAirbagDeployed]; } } - (SDLVehicleDataEventStatus)driverAirbagDeployed { - NSObject *obj = [store objectForKey:NAMES_driverAirbagDeployed]; + NSObject *obj = [store objectForKey:SDLNameDriverAirbagDeployed]; return (SDLVehicleDataEventStatus)obj; } - (void)setDriverSideAirbagDeployed:(SDLVehicleDataEventStatus)driverSideAirbagDeployed { if (driverSideAirbagDeployed != nil) { - [store setObject:driverSideAirbagDeployed forKey:NAMES_driverSideAirbagDeployed]; + [store setObject:driverSideAirbagDeployed forKey:SDLNameDriverSideAirbagDeployed]; } else { - [store removeObjectForKey:NAMES_driverSideAirbagDeployed]; + [store removeObjectForKey:SDLNameDriverSideAirbagDeployed]; } } - (SDLVehicleDataEventStatus)driverSideAirbagDeployed { - NSObject *obj = [store objectForKey:NAMES_driverSideAirbagDeployed]; + NSObject *obj = [store objectForKey:SDLNameDriverSideAirbagDeployed]; return (SDLVehicleDataEventStatus)obj; } - (void)setDriverCurtainAirbagDeployed:(SDLVehicleDataEventStatus)driverCurtainAirbagDeployed { if (driverCurtainAirbagDeployed != nil) { - [store setObject:driverCurtainAirbagDeployed forKey:NAMES_driverCurtainAirbagDeployed]; + [store setObject:driverCurtainAirbagDeployed forKey:SDLNameDriverCurtainAirbagDeployed]; } else { - [store removeObjectForKey:NAMES_driverCurtainAirbagDeployed]; + [store removeObjectForKey:SDLNameDriverCurtainAirbagDeployed]; } } - (SDLVehicleDataEventStatus)driverCurtainAirbagDeployed { - NSObject *obj = [store objectForKey:NAMES_driverCurtainAirbagDeployed]; + NSObject *obj = [store objectForKey:SDLNameDriverCurtainAirbagDeployed]; return (SDLVehicleDataEventStatus)obj; } - (void)setPassengerAirbagDeployed:(SDLVehicleDataEventStatus)passengerAirbagDeployed { if (passengerAirbagDeployed != nil) { - [store setObject:passengerAirbagDeployed forKey:NAMES_passengerAirbagDeployed]; + [store setObject:passengerAirbagDeployed forKey:SDLNamePassengerAirbagDeployed]; } else { - [store removeObjectForKey:NAMES_passengerAirbagDeployed]; + [store removeObjectForKey:SDLNamePassengerAirbagDeployed]; } } - (SDLVehicleDataEventStatus)passengerAirbagDeployed { - NSObject *obj = [store objectForKey:NAMES_passengerAirbagDeployed]; + NSObject *obj = [store objectForKey:SDLNamePassengerAirbagDeployed]; return (SDLVehicleDataEventStatus)obj; } - (void)setPassengerCurtainAirbagDeployed:(SDLVehicleDataEventStatus)passengerCurtainAirbagDeployed { if (passengerCurtainAirbagDeployed != nil) { - [store setObject:passengerCurtainAirbagDeployed forKey:NAMES_passengerCurtainAirbagDeployed]; + [store setObject:passengerCurtainAirbagDeployed forKey:SDLNamePassengerCurtainAirbagDeployed]; } else { - [store removeObjectForKey:NAMES_passengerCurtainAirbagDeployed]; + [store removeObjectForKey:SDLNamePassengerCurtainAirbagDeployed]; } } - (SDLVehicleDataEventStatus)passengerCurtainAirbagDeployed { - NSObject *obj = [store objectForKey:NAMES_passengerCurtainAirbagDeployed]; + NSObject *obj = [store objectForKey:SDLNamePassengerCurtainAirbagDeployed]; return (SDLVehicleDataEventStatus)obj; } - (void)setDriverKneeAirbagDeployed:(SDLVehicleDataEventStatus)driverKneeAirbagDeployed { if (driverKneeAirbagDeployed != nil) { - [store setObject:driverKneeAirbagDeployed forKey:NAMES_driverKneeAirbagDeployed]; + [store setObject:driverKneeAirbagDeployed forKey:SDLNameDriverKneeAirbagDeployed]; } else { - [store removeObjectForKey:NAMES_driverKneeAirbagDeployed]; + [store removeObjectForKey:SDLNameDriverKneeAirbagDeployed]; } } - (SDLVehicleDataEventStatus)driverKneeAirbagDeployed { - NSObject *obj = [store objectForKey:NAMES_driverKneeAirbagDeployed]; + NSObject *obj = [store objectForKey:SDLNameDriverKneeAirbagDeployed]; return (SDLVehicleDataEventStatus)obj; } - (void)setPassengerSideAirbagDeployed:(SDLVehicleDataEventStatus)passengerSideAirbagDeployed { if (passengerSideAirbagDeployed != nil) { - [store setObject:passengerSideAirbagDeployed forKey:NAMES_passengerSideAirbagDeployed]; + [store setObject:passengerSideAirbagDeployed forKey:SDLNamePassengerSideAirbagDeployed]; } else { - [store removeObjectForKey:NAMES_passengerSideAirbagDeployed]; + [store removeObjectForKey:SDLNamePassengerSideAirbagDeployed]; } } - (SDLVehicleDataEventStatus)passengerSideAirbagDeployed { - NSObject *obj = [store objectForKey:NAMES_passengerSideAirbagDeployed]; + NSObject *obj = [store objectForKey:SDLNamePassengerSideAirbagDeployed]; return (SDLVehicleDataEventStatus)obj; } - (void)setPassengerKneeAirbagDeployed:(SDLVehicleDataEventStatus)passengerKneeAirbagDeployed { if (passengerKneeAirbagDeployed != nil) { - [store setObject:passengerKneeAirbagDeployed forKey:NAMES_passengerKneeAirbagDeployed]; + [store setObject:passengerKneeAirbagDeployed forKey:SDLNamePassengerKneeAirbagDeployed]; } else { - [store removeObjectForKey:NAMES_passengerKneeAirbagDeployed]; + [store removeObjectForKey:SDLNamePassengerKneeAirbagDeployed]; } } - (SDLVehicleDataEventStatus)passengerKneeAirbagDeployed { - NSObject *obj = [store objectForKey:NAMES_passengerKneeAirbagDeployed]; + NSObject *obj = [store objectForKey:SDLNamePassengerKneeAirbagDeployed]; return (SDLVehicleDataEventStatus)obj; } diff --git a/SmartDeviceLink/SDLAlert.h b/SmartDeviceLink/SDLAlert.h index 59f909caa..410a8e073 100644 --- a/SmartDeviceLink/SDLAlert.h +++ b/SmartDeviceLink/SDLAlert.h @@ -32,21 +32,7 @@ * * @since SDL 1.0 */ -@interface SDLAlert : SDLRPCRequest { -} - -/** - * Constructs a new SDLAlert object - */ -- (instancetype)init; - -/** - * Constructs a new SDLAlert object indicated by the dictionary parameter - * - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; - +@interface SDLAlert : SDLRPCRequest /** * @abstract The String to be displayed in the first field of the display during the Alert diff --git a/SmartDeviceLink/SDLAlert.m b/SmartDeviceLink/SDLAlert.m index ddc7fdc3a..33b6e47de 100644 --- a/SmartDeviceLink/SDLAlert.m +++ b/SmartDeviceLink/SDLAlert.m @@ -9,69 +9,63 @@ @implementation SDLAlert - (instancetype)init { - if (self = [super initWithName:NAMES_Alert]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameAlert]) { } return self; } - (void)setAlertText1:(NSString *)alertText1 { if (alertText1 != nil) { - [parameters setObject:alertText1 forKey:NAMES_alertText1]; + [parameters setObject:alertText1 forKey:SDLNameAlertText1]; } else { - [parameters removeObjectForKey:NAMES_alertText1]; + [parameters removeObjectForKey:SDLNameAlertText1]; } } - (NSString *)alertText1 { - return [parameters objectForKey:NAMES_alertText1]; + return [parameters objectForKey:SDLNameAlertText1]; } - (void)setAlertText2:(NSString *)alertText2 { if (alertText2 != nil) { - [parameters setObject:alertText2 forKey:NAMES_alertText2]; + [parameters setObject:alertText2 forKey:SDLNameAlertText2]; } else { - [parameters removeObjectForKey:NAMES_alertText2]; + [parameters removeObjectForKey:SDLNameAlertText2]; } } - (NSString *)alertText2 { - return [parameters objectForKey:NAMES_alertText2]; + return [parameters objectForKey:SDLNameAlertText2]; } - (void)setAlertText3:(NSString *)alertText3 { if (alertText3 != nil) { - [parameters setObject:alertText3 forKey:NAMES_alertText3]; + [parameters setObject:alertText3 forKey:SDLNameAlertText3]; } else { - [parameters removeObjectForKey:NAMES_alertText3]; + [parameters removeObjectForKey:SDLNameAlertText3]; } } - (NSString *)alertText3 { - return [parameters objectForKey:NAMES_alertText3]; + return [parameters objectForKey:SDLNameAlertText3]; } - (void)setTtsChunks:(NSMutableArray *)ttsChunks { if (ttsChunks != nil) { - [parameters setObject:ttsChunks forKey:NAMES_ttsChunks]; + [parameters setObject:ttsChunks forKey:SDLNameTTSChunks]; } else { - [parameters removeObjectForKey:NAMES_ttsChunks]; + [parameters removeObjectForKey:SDLNameTTSChunks]; } } - (NSMutableArray *)ttsChunks { - NSMutableArray *array = [parameters objectForKey:NAMES_ttsChunks]; + NSMutableArray *array = [parameters objectForKey:SDLNameTTSChunks]; if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLTTSChunk.class]) { return array; } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; for (NSDictionary *dict in array) { - [newList addObject:[[SDLTTSChunk alloc] initWithDictionary:(NSMutableDictionary *)dict]]; + [newList addObject:[[SDLTTSChunk alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; } @@ -79,56 +73,56 @@ - (void)setDuration:(NSNumber *)duration { if (duration != nil) { - [parameters setObject:duration forKey:NAMES_duration]; + [parameters setObject:duration forKey:SDLNameDuration]; } else { - [parameters removeObjectForKey:NAMES_duration]; + [parameters removeObjectForKey:SDLNameDuration]; } } - (NSNumber *)duration { - return [parameters objectForKey:NAMES_duration]; + return [parameters objectForKey:SDLNameDuration]; } - (void)setPlayTone:(NSNumber *)playTone { if (playTone != nil) { - [parameters setObject:playTone forKey:NAMES_playTone]; + [parameters setObject:playTone forKey:SDLNamePlayTone]; } else { - [parameters removeObjectForKey:NAMES_playTone]; + [parameters removeObjectForKey:SDLNamePlayTone]; } } - (NSNumber *)playTone { - return [parameters objectForKey:NAMES_playTone]; + return [parameters objectForKey:SDLNamePlayTone]; } - (void)setProgressIndicator:(NSNumber *)progressIndicator { if (progressIndicator != nil) { - [parameters setObject:progressIndicator forKey:NAMES_progressIndicator]; + [parameters setObject:progressIndicator forKey:SDLNameProgressIndicator]; } else { - [parameters removeObjectForKey:NAMES_progressIndicator]; + [parameters removeObjectForKey:SDLNameProgressIndicator]; } } - (NSNumber *)progressIndicator { - return [parameters objectForKey:NAMES_progressIndicator]; + return [parameters objectForKey:SDLNameProgressIndicator]; } - (void)setSoftButtons:(NSMutableArray *)softButtons { if (softButtons != nil) { - [parameters setObject:softButtons forKey:NAMES_softButtons]; + [parameters setObject:softButtons forKey:SDLNameSoftButtons]; } else { - [parameters removeObjectForKey:NAMES_softButtons]; + [parameters removeObjectForKey:SDLNameSoftButtons]; } } - (NSMutableArray *)softButtons { - NSMutableArray *array = [parameters objectForKey:NAMES_softButtons]; + NSMutableArray *array = [parameters objectForKey:SDLNameSoftButtons]; if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLSoftButton.class]) { return array; } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; for (NSDictionary *dict in array) { - [newList addObject:[[SDLSoftButton alloc] initWithDictionary:(NSMutableDictionary *)dict]]; + [newList addObject:[[SDLSoftButton alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; } diff --git a/SmartDeviceLink/SDLAlertManeuver.h b/SmartDeviceLink/SDLAlertManeuver.h index 2bb8e12ed..dffa8f21c 100644 --- a/SmartDeviceLink/SDLAlertManeuver.h +++ b/SmartDeviceLink/SDLAlertManeuver.h @@ -7,11 +7,7 @@ /** * @since SmartDeviceLink 1.0 */ -@interface SDLAlertManeuver : SDLRPCRequest { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLAlertManeuver : SDLRPCRequest @property (strong) NSMutableArray *ttsChunks; @property (strong) NSMutableArray *softButtons; diff --git a/SmartDeviceLink/SDLAlertManeuver.m b/SmartDeviceLink/SDLAlertManeuver.m index 81717506f..672fb5235 100644 --- a/SmartDeviceLink/SDLAlertManeuver.m +++ b/SmartDeviceLink/SDLAlertManeuver.m @@ -11,33 +11,27 @@ @implementation SDLAlertManeuver - (instancetype)init { - if (self = [super initWithName:NAMES_AlertManeuver]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameAlertManeuver]) { } return self; } - (void)setTtsChunks:(NSMutableArray *)ttsChunks { if (ttsChunks != nil) { - [parameters setObject:ttsChunks forKey:NAMES_ttsChunks]; + [parameters setObject:ttsChunks forKey:SDLNameTTSChunks]; } else { - [parameters removeObjectForKey:NAMES_ttsChunks]; + [parameters removeObjectForKey:SDLNameTTSChunks]; } } - (NSMutableArray *)ttsChunks { - NSMutableArray *array = [parameters objectForKey:NAMES_ttsChunks]; + NSMutableArray *array = [parameters objectForKey:SDLNameTTSChunks]; if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLTTSChunk.class]) { return array; } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; for (NSDictionary *dict in array) { - [newList addObject:[[SDLTTSChunk alloc] initWithDictionary:(NSMutableDictionary *)dict]]; + [newList addObject:[[SDLTTSChunk alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; } @@ -45,20 +39,20 @@ - (void)setSoftButtons:(NSMutableArray *)softButtons { if (softButtons != nil) { - [parameters setObject:softButtons forKey:NAMES_softButtons]; + [parameters setObject:softButtons forKey:SDLNameSoftButtons]; } else { - [parameters removeObjectForKey:NAMES_softButtons]; + [parameters removeObjectForKey:SDLNameSoftButtons]; } } - (NSMutableArray *)softButtons { - NSMutableArray *array = [parameters objectForKey:NAMES_softButtons]; + NSMutableArray *array = [parameters objectForKey:SDLNameSoftButtons]; if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLSoftButton.class]) { return array; } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; for (NSDictionary *dict in array) { - [newList addObject:[[SDLSoftButton alloc] initWithDictionary:(NSMutableDictionary *)dict]]; + [newList addObject:[[SDLSoftButton alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; } diff --git a/SmartDeviceLink/SDLAlertManeuverResponse.h b/SmartDeviceLink/SDLAlertManeuverResponse.h index b7d3d6c0a..41dcaaa5e 100644 --- a/SmartDeviceLink/SDLAlertManeuverResponse.h +++ b/SmartDeviceLink/SDLAlertManeuverResponse.h @@ -7,10 +7,6 @@ /** SDLAlertManeuverResponse is sent, when SDLAlertManeuver has been called. * @since SmartDeviceLink 1.0 */ -@interface SDLAlertManeuverResponse : SDLRPCResponse { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLAlertManeuverResponse : SDLRPCResponse @end diff --git a/SmartDeviceLink/SDLAlertManeuverResponse.m b/SmartDeviceLink/SDLAlertManeuverResponse.m index 5687d3117..60581be85 100644 --- a/SmartDeviceLink/SDLAlertManeuverResponse.m +++ b/SmartDeviceLink/SDLAlertManeuverResponse.m @@ -8,13 +8,7 @@ @implementation SDLAlertManeuverResponse - (instancetype)init { - if (self = [super initWithName:NAMES_AlertManeuver]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameAlertManeuver]) { } return self; } diff --git a/SmartDeviceLink/SDLAlertResponse.h b/SmartDeviceLink/SDLAlertResponse.h index 81228d34a..b2c4fb500 100644 --- a/SmartDeviceLink/SDLAlertResponse.h +++ b/SmartDeviceLink/SDLAlertResponse.h @@ -8,11 +8,7 @@ * Sent after SDLAlert has been sent * @since SDL 1.0 */ -@interface SDLAlertResponse : SDLRPCResponse { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLAlertResponse : SDLRPCResponse @property (strong) NSNumber *tryAgainTime; diff --git a/SmartDeviceLink/SDLAlertResponse.m b/SmartDeviceLink/SDLAlertResponse.m index f55982377..a7f76a9a9 100644 --- a/SmartDeviceLink/SDLAlertResponse.m +++ b/SmartDeviceLink/SDLAlertResponse.m @@ -8,27 +8,21 @@ @implementation SDLAlertResponse - (instancetype)init { - if (self = [super initWithName:NAMES_Alert]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameAlert]) { } return self; } - (void)setTryAgainTime:(NSNumber *)tryAgainTime { if (tryAgainTime != nil) { - [parameters setObject:tryAgainTime forKey:NAMES_tryAgainTime]; + [parameters setObject:tryAgainTime forKey:SDLNameTryAgainTime]; } else { - [parameters removeObjectForKey:NAMES_tryAgainTime]; + [parameters removeObjectForKey:SDLNameTryAgainTime]; } } - (NSNumber *)tryAgainTime { - return [parameters objectForKey:NAMES_tryAgainTime]; + return [parameters objectForKey:SDLNameTryAgainTime]; } @end diff --git a/SmartDeviceLink/SDLAppInfo.m b/SmartDeviceLink/SDLAppInfo.m index 7318187bf..00eca0d8d 100644 --- a/SmartDeviceLink/SDLAppInfo.m +++ b/SmartDeviceLink/SDLAppInfo.m @@ -2,44 +2,45 @@ // #import "SDLAppInfo.h" + #import "SDLNames.h" @implementation SDLAppInfo - (void)setAppDisplayName:(NSString *)appDisplayName { if (appDisplayName != nil) { - [store setObject:appDisplayName forKey:NAMES_appDisplayName]; + [store setObject:appDisplayName forKey:SDLNameAppDisplayName]; } else { - [store removeObjectForKey:NAMES_appDisplayName]; + [store removeObjectForKey:SDLNameAppDisplayName]; } } - (NSString *)appDisplayName { - return [store objectForKey:NAMES_appDisplayName]; + return [store objectForKey:SDLNameAppDisplayName]; } - (void)setAppBundleID:(NSString *)appBundleID { if (appBundleID != nil) { - [store setObject:appBundleID forKey:NAMES_appBundleID]; + [store setObject:appBundleID forKey:SDLNameAppBundleId]; } else { - [store removeObjectForKey:NAMES_appBundleID]; + [store removeObjectForKey:SDLNameAppBundleId]; } } - (NSString *)appBundleID { - return [store objectForKey:NAMES_appBundleID]; + return [store objectForKey:SDLNameAppBundleId]; } - (void)setAppVersion:(NSString *)appVersion { if (appVersion != nil) { - [store setObject:appVersion forKey:NAMES_appVersion]; + [store setObject:appVersion forKey:SDLNameAppVersion]; } else { - [store removeObjectForKey:NAMES_appVersion]; + [store removeObjectForKey:SDLNameAppVersion]; } } - (NSString *)appVersion { - return [store objectForKey:NAMES_appVersion]; + return [store objectForKey:SDLNameAppVersion]; } @end diff --git a/SmartDeviceLink/SDLAudioPassThruCapabilities.h b/SmartDeviceLink/SDLAudioPassThruCapabilities.h index af15629ca..1e8c8665e 100644 --- a/SmartDeviceLink/SDLAudioPassThruCapabilities.h +++ b/SmartDeviceLink/SDLAudioPassThruCapabilities.h @@ -42,18 +42,7 @@ * </table> * Since <b>SmartDeviceLink 2.0</b> */ -@interface SDLAudioPassThruCapabilities : SDLRPCStruct { -} - -/** - * Constructs a newly allocated SDLAudioPassThruCapabilities object - */ -- (instancetype)init; -/** - * Constructs a newly allocated SDLAudioPassThruCapabilities object indicated by the Hashtable parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLAudioPassThruCapabilities : SDLRPCStruct /** * @abstract The sampling rate for AudioPassThru<br> diff --git a/SmartDeviceLink/SDLAudioPassThruCapabilities.m b/SmartDeviceLink/SDLAudioPassThruCapabilities.m index 45493d933..875179a97 100644 --- a/SmartDeviceLink/SDLAudioPassThruCapabilities.m +++ b/SmartDeviceLink/SDLAudioPassThruCapabilities.m @@ -9,54 +9,42 @@ @implementation SDLAudioPassThruCapabilities -- (instancetype)init { - if (self = [super init]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setSamplingRate:(SDLSamplingRate)samplingRate { if (samplingRate != nil) { - [store setObject:samplingRate forKey:NAMES_samplingRate]; + [store setObject:samplingRate forKey:SDLNameSamplingRate]; } else { - [store removeObjectForKey:NAMES_samplingRate]; + [store removeObjectForKey:SDLNameSamplingRate]; } } - (SDLSamplingRate)samplingRate { - NSObject *obj = [store objectForKey:NAMES_samplingRate]; + NSObject *obj = [store objectForKey:SDLNameSamplingRate]; return (SDLSamplingRate)obj; } - (void)setBitsPerSample:(SDLBitsPerSample)bitsPerSample { if (bitsPerSample != nil) { - [store setObject:bitsPerSample forKey:NAMES_bitsPerSample]; + [store setObject:bitsPerSample forKey:SDLNameBitsPerSample]; } else { - [store removeObjectForKey:NAMES_bitsPerSample]; + [store removeObjectForKey:SDLNameBitsPerSample]; } } - (SDLBitsPerSample)bitsPerSample { - NSObject *obj = [store objectForKey:NAMES_bitsPerSample]; + NSObject *obj = [store objectForKey:SDLNameBitsPerSample]; return (SDLBitsPerSample)obj; } - (void)setAudioType:(SDLAudioType)audioType { if (audioType != nil) { - [store setObject:audioType forKey:NAMES_audioType]; + [store setObject:audioType forKey:SDLNameAudioType]; } else { - [store removeObjectForKey:NAMES_audioType]; + [store removeObjectForKey:SDLNameAudioType]; } } - (SDLAudioType)audioType { - NSObject *obj = [store objectForKey:NAMES_audioType]; + NSObject *obj = [store objectForKey:SDLNameAudioType]; return (SDLAudioType)obj; } diff --git a/SmartDeviceLink/SDLBeltStatus.h b/SmartDeviceLink/SDLBeltStatus.h index 7721c4cef..6fd565877 100644 --- a/SmartDeviceLink/SDLBeltStatus.h +++ b/SmartDeviceLink/SDLBeltStatus.h @@ -5,11 +5,7 @@ #import "SDLVehicleDataEventStatus.h" -@interface SDLBeltStatus : SDLRPCStruct { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLBeltStatus : SDLRPCStruct @property (strong) SDLVehicleDataEventStatus driverBeltDeployed; @property (strong) SDLVehicleDataEventStatus passengerBeltDeployed; diff --git a/SmartDeviceLink/SDLBeltStatus.m b/SmartDeviceLink/SDLBeltStatus.m index 90a012310..b4777519e 100644 --- a/SmartDeviceLink/SDLBeltStatus.m +++ b/SmartDeviceLink/SDLBeltStatus.m @@ -6,213 +6,200 @@ #import "SDLNames.h" #import "SDLVehicleDataEventStatus.h" - @implementation SDLBeltStatus -- (instancetype)init { - if (self = [super init]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setDriverBeltDeployed:(SDLVehicleDataEventStatus)driverBeltDeployed { if (driverBeltDeployed != nil) { - [store setObject:driverBeltDeployed forKey:NAMES_driverBeltDeployed]; + [store setObject:driverBeltDeployed forKey:SDLNameDriverBeltDeployed]; } else { - [store removeObjectForKey:NAMES_driverBeltDeployed]; + [store removeObjectForKey:SDLNameDriverBeltDeployed]; } } - (SDLVehicleDataEventStatus)driverBeltDeployed { - NSObject *obj = [store objectForKey:NAMES_driverBeltDeployed]; + NSObject *obj = [store objectForKey:SDLNameDriverBeltDeployed]; return (SDLVehicleDataEventStatus)obj; } - (void)setPassengerBeltDeployed:(SDLVehicleDataEventStatus)passengerBeltDeployed { if (passengerBeltDeployed != nil) { - [store setObject:passengerBeltDeployed forKey:NAMES_passengerBeltDeployed]; + [store setObject:passengerBeltDeployed forKey:SDLNamePassengerBeltDeployed]; } else { - [store removeObjectForKey:NAMES_passengerBeltDeployed]; + [store removeObjectForKey:SDLNamePassengerBeltDeployed]; } } - (SDLVehicleDataEventStatus)passengerBeltDeployed { - NSObject *obj = [store objectForKey:NAMES_passengerBeltDeployed]; + NSObject *obj = [store objectForKey:SDLNamePassengerBeltDeployed]; return (SDLVehicleDataEventStatus)obj; } - (void)setPassengerBuckleBelted:(SDLVehicleDataEventStatus)passengerBuckleBelted { if (passengerBuckleBelted != nil) { - [store setObject:passengerBuckleBelted forKey:NAMES_passengerBuckleBelted]; + [store setObject:passengerBuckleBelted forKey:SDLNamePassengerBuckleBelted]; } else { - [store removeObjectForKey:NAMES_passengerBuckleBelted]; + [store removeObjectForKey:SDLNamePassengerBuckleBelted]; } } - (SDLVehicleDataEventStatus)passengerBuckleBelted { - NSObject *obj = [store objectForKey:NAMES_passengerBuckleBelted]; + NSObject *obj = [store objectForKey:SDLNamePassengerBuckleBelted]; return (SDLVehicleDataEventStatus)obj; } - (void)setDriverBuckleBelted:(SDLVehicleDataEventStatus)driverBuckleBelted { if (driverBuckleBelted != nil) { - [store setObject:driverBuckleBelted forKey:NAMES_driverBuckleBelted]; + [store setObject:driverBuckleBelted forKey:SDLNameDriverBuckleBelted]; } else { - [store removeObjectForKey:NAMES_driverBuckleBelted]; + [store removeObjectForKey:SDLNameDriverBuckleBelted]; } } - (SDLVehicleDataEventStatus)driverBuckleBelted { - NSObject *obj = [store objectForKey:NAMES_driverBuckleBelted]; + NSObject *obj = [store objectForKey:SDLNameDriverBuckleBelted]; return (SDLVehicleDataEventStatus)obj; } - (void)setLeftRow2BuckleBelted:(SDLVehicleDataEventStatus)leftRow2BuckleBelted { if (leftRow2BuckleBelted != nil) { - [store setObject:leftRow2BuckleBelted forKey:NAMES_leftRow2BuckleBelted]; + [store setObject:leftRow2BuckleBelted forKey:SDLNameLeftRow2BuckleBelted]; } else { - [store removeObjectForKey:NAMES_leftRow2BuckleBelted]; + [store removeObjectForKey:SDLNameLeftRow2BuckleBelted]; } } - (SDLVehicleDataEventStatus)leftRow2BuckleBelted { - NSObject *obj = [store objectForKey:NAMES_leftRow2BuckleBelted]; + NSObject *obj = [store objectForKey:SDLNameLeftRow2BuckleBelted]; return (SDLVehicleDataEventStatus)obj; } - (void)setPassengerChildDetected:(SDLVehicleDataEventStatus)passengerChildDetected { if (passengerChildDetected != nil) { - [store setObject:passengerChildDetected forKey:NAMES_passengerChildDetected]; + [store setObject:passengerChildDetected forKey:SDLNamePassengerChildDetected]; } else { - [store removeObjectForKey:NAMES_passengerChildDetected]; + [store removeObjectForKey:SDLNamePassengerChildDetected]; } } - (SDLVehicleDataEventStatus)passengerChildDetected { - NSObject *obj = [store objectForKey:NAMES_passengerChildDetected]; + NSObject *obj = [store objectForKey:SDLNamePassengerChildDetected]; return (SDLVehicleDataEventStatus)obj; } - (void)setRightRow2BuckleBelted:(SDLVehicleDataEventStatus)rightRow2BuckleBelted { if (rightRow2BuckleBelted != nil) { - [store setObject:rightRow2BuckleBelted forKey:NAMES_rightRow2BuckleBelted]; + [store setObject:rightRow2BuckleBelted forKey:SDLNameRightRow2BuckleBelted]; } else { - [store removeObjectForKey:NAMES_rightRow2BuckleBelted]; + [store removeObjectForKey:SDLNameRightRow2BuckleBelted]; } } - (SDLVehicleDataEventStatus)rightRow2BuckleBelted { - NSObject *obj = [store objectForKey:NAMES_rightRow2BuckleBelted]; + NSObject *obj = [store objectForKey:SDLNameRightRow2BuckleBelted]; return (SDLVehicleDataEventStatus)obj; } - (void)setMiddleRow2BuckleBelted:(SDLVehicleDataEventStatus)middleRow2BuckleBelted { if (middleRow2BuckleBelted != nil) { - [store setObject:middleRow2BuckleBelted forKey:NAMES_middleRow2BuckleBelted]; + [store setObject:middleRow2BuckleBelted forKey:SDLNameMiddleRow2BuckleBelted]; } else { - [store removeObjectForKey:NAMES_middleRow2BuckleBelted]; + [store removeObjectForKey:SDLNameMiddleRow2BuckleBelted]; } } - (SDLVehicleDataEventStatus)middleRow2BuckleBelted { - NSObject *obj = [store objectForKey:NAMES_middleRow2BuckleBelted]; + NSObject *obj = [store objectForKey:SDLNameMiddleRow2BuckleBelted]; return (SDLVehicleDataEventStatus)obj; } - (void)setMiddleRow3BuckleBelted:(SDLVehicleDataEventStatus)middleRow3BuckleBelted { if (middleRow3BuckleBelted != nil) { - [store setObject:middleRow3BuckleBelted forKey:NAMES_middleRow3BuckleBelted]; + [store setObject:middleRow3BuckleBelted forKey:SDLNameMiddleRow3BuckleBelted]; } else { - [store removeObjectForKey:NAMES_middleRow3BuckleBelted]; + [store removeObjectForKey:SDLNameMiddleRow3BuckleBelted]; } } - (SDLVehicleDataEventStatus)middleRow3BuckleBelted { - NSObject *obj = [store objectForKey:NAMES_middleRow3BuckleBelted]; + NSObject *obj = [store objectForKey:SDLNameMiddleRow3BuckleBelted]; return (SDLVehicleDataEventStatus)obj; } - (void)setLeftRow3BuckleBelted:(SDLVehicleDataEventStatus)leftRow3BuckleBelted { if (leftRow3BuckleBelted != nil) { - [store setObject:leftRow3BuckleBelted forKey:NAMES_leftRow3BuckleBelted]; + [store setObject:leftRow3BuckleBelted forKey:SDLNameLeftRow3BuckleBelted]; } else { - [store removeObjectForKey:NAMES_leftRow3BuckleBelted]; + [store removeObjectForKey:SDLNameLeftRow3BuckleBelted]; } } - (SDLVehicleDataEventStatus)leftRow3BuckleBelted { - NSObject *obj = [store objectForKey:NAMES_leftRow3BuckleBelted]; + NSObject *obj = [store objectForKey:SDLNameLeftRow3BuckleBelted]; return (SDLVehicleDataEventStatus)obj; } - (void)setRightRow3BuckleBelted:(SDLVehicleDataEventStatus)rightRow3BuckleBelted { if (rightRow3BuckleBelted != nil) { - [store setObject:rightRow3BuckleBelted forKey:NAMES_rightRow3BuckleBelted]; + [store setObject:rightRow3BuckleBelted forKey:SDLNameRightRow3BuckleBelted]; } else { - [store removeObjectForKey:NAMES_rightRow3BuckleBelted]; + [store removeObjectForKey:SDLNameRightRow3BuckleBelted]; } } - (SDLVehicleDataEventStatus)rightRow3BuckleBelted { - NSObject *obj = [store objectForKey:NAMES_rightRow3BuckleBelted]; + NSObject *obj = [store objectForKey:SDLNameRightRow3BuckleBelted]; return (SDLVehicleDataEventStatus)obj; } - (void)setLeftRearInflatableBelted:(SDLVehicleDataEventStatus)leftRearInflatableBelted { if (leftRearInflatableBelted != nil) { - [store setObject:leftRearInflatableBelted forKey:NAMES_leftRearInflatableBelted]; + [store setObject:leftRearInflatableBelted forKey:SDLNameLeftRearInflatableBelted]; } else { - [store removeObjectForKey:NAMES_leftRearInflatableBelted]; + [store removeObjectForKey:SDLNameLeftRearInflatableBelted]; } } - (SDLVehicleDataEventStatus)leftRearInflatableBelted { - NSObject *obj = [store objectForKey:NAMES_leftRearInflatableBelted]; + NSObject *obj = [store objectForKey:SDLNameLeftRearInflatableBelted]; return (SDLVehicleDataEventStatus)obj; } - (void)setRightRearInflatableBelted:(SDLVehicleDataEventStatus)rightRearInflatableBelted { if (rightRearInflatableBelted != nil) { - [store setObject:rightRearInflatableBelted forKey:NAMES_rightRearInflatableBelted]; + [store setObject:rightRearInflatableBelted forKey:SDLNameRightRearInflatableBelted]; } else { - [store removeObjectForKey:NAMES_rightRearInflatableBelted]; + [store removeObjectForKey:SDLNameRightRearInflatableBelted]; } } - (SDLVehicleDataEventStatus)rightRearInflatableBelted { - NSObject *obj = [store objectForKey:NAMES_rightRearInflatableBelted]; + NSObject *obj = [store objectForKey:SDLNameRightRearInflatableBelted]; return (SDLVehicleDataEventStatus)obj; } - (void)setMiddleRow1BeltDeployed:(SDLVehicleDataEventStatus)middleRow1BeltDeployed { if (middleRow1BeltDeployed != nil) { - [store setObject:middleRow1BeltDeployed forKey:NAMES_middleRow1BeltDeployed]; + [store setObject:middleRow1BeltDeployed forKey:SDLNameMiddleRow1BeltDeployed]; } else { - [store removeObjectForKey:NAMES_middleRow1BeltDeployed]; + [store removeObjectForKey:SDLNameMiddleRow1BeltDeployed]; } } - (SDLVehicleDataEventStatus)middleRow1BeltDeployed { - NSObject *obj = [store objectForKey:NAMES_middleRow1BeltDeployed]; + NSObject *obj = [store objectForKey:SDLNameMiddleRow1BeltDeployed]; return (SDLVehicleDataEventStatus)obj; } - (void)setMiddleRow1BuckleBelted:(SDLVehicleDataEventStatus)middleRow1BuckleBelted { if (middleRow1BuckleBelted != nil) { - [store setObject:middleRow1BuckleBelted forKey:NAMES_middleRow1BuckleBelted]; + [store setObject:middleRow1BuckleBelted forKey:SDLNameMiddleRow1BuckleBelted]; } else { - [store removeObjectForKey:NAMES_middleRow1BuckleBelted]; + [store removeObjectForKey:SDLNameMiddleRow1BuckleBelted]; } } - (SDLVehicleDataEventStatus)middleRow1BuckleBelted { - NSObject *obj = [store objectForKey:NAMES_middleRow1BuckleBelted]; + NSObject *obj = [store objectForKey:SDLNameMiddleRow1BuckleBelted]; return (SDLVehicleDataEventStatus)obj; } diff --git a/SmartDeviceLink/SDLBodyInformation.h b/SmartDeviceLink/SDLBodyInformation.h index 63f4eb2fb..ad933e6ae 100644 --- a/SmartDeviceLink/SDLBodyInformation.h +++ b/SmartDeviceLink/SDLBodyInformation.h @@ -10,20 +10,7 @@ /** * The body information including power modes. */ -@interface SDLBodyInformation : SDLRPCStruct { -} - -/** - * @abstract Constructs a new SDLBodyInformation object - */ -- (instancetype)init; - -/** - * @abstract Constructs a new SDLBodyInformation object indicated by the NSMutableDictionary - * parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLBodyInformation : SDLRPCStruct /** * @abstract References signal "PrkBrkActv_B_Actl". diff --git a/SmartDeviceLink/SDLBodyInformation.m b/SmartDeviceLink/SDLBodyInformation.m index 810820336..b7e6702d4 100644 --- a/SmartDeviceLink/SDLBodyInformation.m +++ b/SmartDeviceLink/SDLBodyInformation.m @@ -8,105 +8,92 @@ #import "SDLIgnitionStatus.h" #import "SDLNames.h" - @implementation SDLBodyInformation -- (instancetype)init { - if (self = [super init]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setParkBrakeActive:(NSNumber *)parkBrakeActive { if (parkBrakeActive != nil) { - [store setObject:parkBrakeActive forKey:NAMES_parkBrakeActive]; + [store setObject:parkBrakeActive forKey:SDLNameParkBrakeActive]; } else { - [store removeObjectForKey:NAMES_parkBrakeActive]; + [store removeObjectForKey:SDLNameParkBrakeActive]; } } - (NSNumber *)parkBrakeActive { - return [store objectForKey:NAMES_parkBrakeActive]; + return [store objectForKey:SDLNameParkBrakeActive]; } - (void)setIgnitionStableStatus:(SDLIgnitionStableStatus)ignitionStableStatus { if (ignitionStableStatus != nil) { - [store setObject:ignitionStableStatus forKey:NAMES_ignitionStableStatus]; + [store setObject:ignitionStableStatus forKey:SDLNameIgnitionStableStatus]; } else { - [store removeObjectForKey:NAMES_ignitionStableStatus]; + [store removeObjectForKey:SDLNameIgnitionStableStatus]; } } - (SDLIgnitionStableStatus)ignitionStableStatus { - NSObject *obj = [store objectForKey:NAMES_ignitionStableStatus]; + NSObject *obj = [store objectForKey:SDLNameIgnitionStableStatus]; return (SDLIgnitionStableStatus)obj; } - (void)setIgnitionStatus:(SDLIgnitionStatus)ignitionStatus { if (ignitionStatus != nil) { - [store setObject:ignitionStatus forKey:NAMES_ignitionStatus]; + [store setObject:ignitionStatus forKey:SDLNameIgnitionStatus]; } else { - [store removeObjectForKey:NAMES_ignitionStatus]; + [store removeObjectForKey:SDLNameIgnitionStatus]; } } - (SDLIgnitionStatus)ignitionStatus { - NSObject *obj = [store objectForKey:NAMES_ignitionStatus]; + NSObject *obj = [store objectForKey:SDLNameIgnitionStatus]; return (SDLIgnitionStatus)obj; } - (void)setDriverDoorAjar:(NSNumber *)driverDoorAjar { if (driverDoorAjar != nil) { - [store setObject:driverDoorAjar forKey:NAMES_driverDoorAjar]; + [store setObject:driverDoorAjar forKey:SDLNameDriverDoorAjar]; } else { - [store removeObjectForKey:NAMES_driverDoorAjar]; + [store removeObjectForKey:SDLNameDriverDoorAjar]; } } - (NSNumber *)driverDoorAjar { - return [store objectForKey:NAMES_driverDoorAjar]; + return [store objectForKey:SDLNameDriverDoorAjar]; } - (void)setPassengerDoorAjar:(NSNumber *)passengerDoorAjar { if (passengerDoorAjar != nil) { - [store setObject:passengerDoorAjar forKey:NAMES_passengerDoorAjar]; + [store setObject:passengerDoorAjar forKey:SDLNamePassengerDoorAjar]; } else { - [store removeObjectForKey:NAMES_passengerDoorAjar]; + [store removeObjectForKey:SDLNamePassengerDoorAjar]; } } - (NSNumber *)passengerDoorAjar { - return [store objectForKey:NAMES_passengerDoorAjar]; + return [store objectForKey:SDLNamePassengerDoorAjar]; } - (void)setRearLeftDoorAjar:(NSNumber *)rearLeftDoorAjar { if (rearLeftDoorAjar != nil) { - [store setObject:rearLeftDoorAjar forKey:NAMES_rearLeftDoorAjar]; + [store setObject:rearLeftDoorAjar forKey:SDLNameRearLeftDoorAjar]; } else { - [store removeObjectForKey:NAMES_rearLeftDoorAjar]; + [store removeObjectForKey:SDLNameRearLeftDoorAjar]; } } - (NSNumber *)rearLeftDoorAjar { - return [store objectForKey:NAMES_rearLeftDoorAjar]; + return [store objectForKey:SDLNameRearLeftDoorAjar]; } - (void)setRearRightDoorAjar:(NSNumber *)rearRightDoorAjar { if (rearRightDoorAjar != nil) { - [store setObject:rearRightDoorAjar forKey:NAMES_rearRightDoorAjar]; + [store setObject:rearRightDoorAjar forKey:SDLNameRearRightDoorAjar]; } else { - [store removeObjectForKey:NAMES_rearRightDoorAjar]; + [store removeObjectForKey:SDLNameRearRightDoorAjar]; } } - (NSNumber *)rearRightDoorAjar { - return [store objectForKey:NAMES_rearRightDoorAjar]; + return [store objectForKey:SDLNameRearRightDoorAjar]; } @end diff --git a/SmartDeviceLink/SDLButtonCapabilities.h b/SmartDeviceLink/SDLButtonCapabilities.h index e794856d5..33e8e8dcb 100644 --- a/SmartDeviceLink/SDLButtonCapabilities.h +++ b/SmartDeviceLink/SDLButtonCapabilities.h @@ -11,19 +11,7 @@ * * @since SDL 1.0 */ -@interface SDLButtonCapabilities : SDLRPCStruct { -} - -/** - * Constructs a newly allocated SDLButtonCapabilities object - */ -- (instancetype)init; - -/** - * Constructs a newly allocated SDLButtonCapabilities object indicated by the Hashtable parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLButtonCapabilities : SDLRPCStruct /** * @abstract The name of the SDL HMI button. diff --git a/SmartDeviceLink/SDLButtonCapabilities.m b/SmartDeviceLink/SDLButtonCapabilities.m index 8d9e52e2f..3cd46f12f 100644 --- a/SmartDeviceLink/SDLButtonCapabilities.m +++ b/SmartDeviceLink/SDLButtonCapabilities.m @@ -5,68 +5,55 @@ #import "SDLNames.h" - @implementation SDLButtonCapabilities -- (instancetype)init { - if (self = [super init]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setName:(SDLButtonName)name { if (name != nil) { - [store setObject:name forKey:NAMES_name]; + [store setObject:name forKey:SDLNameName]; } else { - [store removeObjectForKey:NAMES_name]; + [store removeObjectForKey:SDLNameName]; } } - (SDLButtonName)name { - NSObject *obj = [store objectForKey:NAMES_name]; + NSObject *obj = [store objectForKey:SDLNameName]; return (SDLButtonName)obj; } - (void)setShortPressAvailable:(NSNumber *)shortPressAvailable { if (shortPressAvailable != nil) { - [store setObject:shortPressAvailable forKey:NAMES_shortPressAvailable]; + [store setObject:shortPressAvailable forKey:SDLNameShortPressAvailable]; } else { - [store removeObjectForKey:NAMES_shortPressAvailable]; + [store removeObjectForKey:SDLNameShortPressAvailable]; } } - (NSNumber *)shortPressAvailable { - return [store objectForKey:NAMES_shortPressAvailable]; + return [store objectForKey:SDLNameShortPressAvailable]; } - (void)setLongPressAvailable:(NSNumber *)longPressAvailable { if (longPressAvailable != nil) { - [store setObject:longPressAvailable forKey:NAMES_longPressAvailable]; + [store setObject:longPressAvailable forKey:SDLNameLongPressAvailable]; } else { - [store removeObjectForKey:NAMES_longPressAvailable]; + [store removeObjectForKey:SDLNameLongPressAvailable]; } } - (NSNumber *)longPressAvailable { - return [store objectForKey:NAMES_longPressAvailable]; + return [store objectForKey:SDLNameLongPressAvailable]; } - (void)setUpDownAvailable:(NSNumber *)upDownAvailable { if (upDownAvailable != nil) { - [store setObject:upDownAvailable forKey:NAMES_upDownAvailable]; + [store setObject:upDownAvailable forKey:SDLNameUpDownAvailable]; } else { - [store removeObjectForKey:NAMES_upDownAvailable]; + [store removeObjectForKey:SDLNameUpDownAvailable]; } } - (NSNumber *)upDownAvailable { - return [store objectForKey:NAMES_upDownAvailable]; + return [store objectForKey:SDLNameUpDownAvailable]; } @end diff --git a/SmartDeviceLink/SDLChangeRegistration.h b/SmartDeviceLink/SDLChangeRegistration.h index 90248c421..bdb084a1b 100644 --- a/SmartDeviceLink/SDLChangeRegistration.h +++ b/SmartDeviceLink/SDLChangeRegistration.h @@ -15,20 +15,7 @@ * * @since SDL 2.0 */ -@interface SDLChangeRegistration : SDLRPCRequest { -} - -/** - * Constructs a new SDLChangeRegistration object - */ -- (instancetype)init; - -/** - * Constructs a new SDLChangeRegistration object indicated by the dictionary parameter - * - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLChangeRegistration : SDLRPCRequest /** * @abstract The language the app wants to change to diff --git a/SmartDeviceLink/SDLChangeRegistration.m b/SmartDeviceLink/SDLChangeRegistration.m index 840d04142..bd6adc1e8 100644 --- a/SmartDeviceLink/SDLChangeRegistration.m +++ b/SmartDeviceLink/SDLChangeRegistration.m @@ -9,89 +9,83 @@ @implementation SDLChangeRegistration - (instancetype)init { - if (self = [super initWithName:NAMES_ChangeRegistration]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameChangeRegistration]) { } return self; } - (void)setLanguage:(SDLLanguage)language { if (language != nil) { - [parameters setObject:language forKey:NAMES_language]; + [parameters setObject:language forKey:SDLNameLanguage]; } else { - [parameters removeObjectForKey:NAMES_language]; + [parameters removeObjectForKey:SDLNameLanguage]; } } - (SDLLanguage)language { - NSObject *obj = [parameters objectForKey:NAMES_language]; + NSObject *obj = [parameters objectForKey:SDLNameLanguage]; return (SDLLanguage )obj; } - (void)setHmiDisplayLanguage:(SDLLanguage )hmiDisplayLanguage { if (hmiDisplayLanguage != nil) { - [parameters setObject:hmiDisplayLanguage forKey:NAMES_hmiDisplayLanguage]; + [parameters setObject:hmiDisplayLanguage forKey:SDLNameHMIDisplayLanguage]; } else { - [parameters removeObjectForKey:NAMES_hmiDisplayLanguage]; + [parameters removeObjectForKey:SDLNameHMIDisplayLanguage]; } } - (SDLLanguage )hmiDisplayLanguage { - NSObject *obj = [parameters objectForKey:NAMES_hmiDisplayLanguage]; + NSObject *obj = [parameters objectForKey:SDLNameHMIDisplayLanguage]; return (SDLLanguage )obj; } - (void)setAppName:(NSString *)appName { if (appName != nil) { - parameters[NAMES_appName] = [appName copy]; + parameters[SDLNameAppName] = [appName copy]; } else { - [parameters removeObjectForKey:NAMES_appName]; + [parameters removeObjectForKey:SDLNameAppName]; } } - (NSString *)appName { - return [parameters[NAMES_appName] copy]; + return [parameters[SDLNameAppName] copy]; } - (void)setTtsName:(NSArray *)ttsName { if (ttsName != nil) { - [parameters setObject:[ttsName copy] forKey:NAMES_ttsName]; + [parameters setObject:[ttsName copy] forKey:SDLNameTTSName]; } else { - [parameters removeObjectForKey:NAMES_ttsName]; + [parameters removeObjectForKey:SDLNameTTSName]; } } - (NSArray *)ttsName { - return [parameters[NAMES_ttsName] copy]; + return [parameters[SDLNameTTSName] copy]; } - (void)setNgnMediaScreenAppName:(NSString *)ngnMediaScreenAppName { if (ngnMediaScreenAppName != nil) { - parameters[NAMES_ngnMediaScreenAppName] = [ngnMediaScreenAppName copy]; + parameters[SDLNameNGNMediaScreenAppName] = [ngnMediaScreenAppName copy]; } else { - [parameters removeObjectForKey:NAMES_ngnMediaScreenAppName]; + [parameters removeObjectForKey:SDLNameNGNMediaScreenAppName]; } } - (NSString *)ngnMediaScreenAppName { - return [parameters[NAMES_ngnMediaScreenAppName] copy]; + return [parameters[SDLNameNGNMediaScreenAppName] copy]; } - (void)setVrSynonyms:(NSArray *)vrSynonyms { if (vrSynonyms != nil) { - [parameters setObject:[vrSynonyms copy] forKey:NAMES_vrSynonyms]; + [parameters setObject:[vrSynonyms copy] forKey:SDLNameVRSynonyms]; } else { - [parameters removeObjectForKey:NAMES_vrSynonyms]; + [parameters removeObjectForKey:SDLNameVRSynonyms]; } } - (NSArray *)vrSynonyms { - return [parameters[NAMES_vrSynonyms] copy]; + return [parameters[SDLNameVRSynonyms] copy]; } @end diff --git a/SmartDeviceLink/SDLChangeRegistrationResponse.h b/SmartDeviceLink/SDLChangeRegistrationResponse.h index 38709e235..20017d066 100644 --- a/SmartDeviceLink/SDLChangeRegistrationResponse.h +++ b/SmartDeviceLink/SDLChangeRegistrationResponse.h @@ -9,10 +9,6 @@ * * @since SDL 2.0 */ -@interface SDLChangeRegistrationResponse : SDLRPCResponse { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLChangeRegistrationResponse : SDLRPCResponse @end diff --git a/SmartDeviceLink/SDLChangeRegistrationResponse.m b/SmartDeviceLink/SDLChangeRegistrationResponse.m index 710495d2c..a4cab1c9b 100644 --- a/SmartDeviceLink/SDLChangeRegistrationResponse.m +++ b/SmartDeviceLink/SDLChangeRegistrationResponse.m @@ -9,13 +9,7 @@ @implementation SDLChangeRegistrationResponse - (instancetype)init { - if (self = [super initWithName:NAMES_ChangeRegistration]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameChangeRegistration]) { } return self; } diff --git a/SmartDeviceLink/SDLChoice.h b/SmartDeviceLink/SDLChoice.h index 478b33b5f..248d633ac 100644 --- a/SmartDeviceLink/SDLChoice.h +++ b/SmartDeviceLink/SDLChoice.h @@ -50,19 +50,7 @@ * * Since <b>SmartDeviceLink 1.0</b><br> */ -@interface SDLChoice : SDLRPCStruct { -} - -/** - * Constructs a newly allocated SDLChoice object - */ -- (instancetype)init; - -/** - * Constructs a newly allocated SDLChoice object indicated by the dictionary parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLChoice : SDLRPCStruct /** * @abstract the application-scoped identifier that uniquely identifies this choice diff --git a/SmartDeviceLink/SDLChoice.m b/SmartDeviceLink/SDLChoice.m index 83e1d56ae..cbd353c1e 100644 --- a/SmartDeviceLink/SDLChoice.m +++ b/SmartDeviceLink/SDLChoice.m @@ -6,112 +6,99 @@ #import "SDLImage.h" #import "SDLNames.h" - @implementation SDLChoice -- (instancetype)init { - if (self = [super init]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setChoiceID:(NSNumber *)choiceID { if (choiceID != nil) { - [store setObject:choiceID forKey:NAMES_choiceID]; + [store setObject:choiceID forKey:SDLNameChoiceId]; } else { - [store removeObjectForKey:NAMES_choiceID]; + [store removeObjectForKey:SDLNameChoiceId]; } } - (NSNumber *)choiceID { - return [store objectForKey:NAMES_choiceID]; + return [store objectForKey:SDLNameChoiceId]; } - (void)setMenuName:(NSString *)menuName { if (menuName != nil) { - [store setObject:menuName forKey:NAMES_menuName]; + [store setObject:menuName forKey:SDLNameMenuName]; } else { - [store removeObjectForKey:NAMES_menuName]; + [store removeObjectForKey:SDLNameMenuName]; } } - (NSString *)menuName { - return [store objectForKey:NAMES_menuName]; + return [store objectForKey:SDLNameMenuName]; } - (void)setVrCommands:(NSMutableArray *)vrCommands { if (vrCommands != nil) { - [store setObject:vrCommands forKey:NAMES_vrCommands]; + [store setObject:vrCommands forKey:SDLNameVRCommands]; } else { - [store removeObjectForKey:NAMES_vrCommands]; + [store removeObjectForKey:SDLNameVRCommands]; } } - (NSMutableArray *)vrCommands { - return [store objectForKey:NAMES_vrCommands]; + return [store objectForKey:SDLNameVRCommands]; } - (void)setImage:(SDLImage *)image { if (image != nil) { - [store setObject:image forKey:NAMES_image]; + [store setObject:image forKey:SDLNameImage]; } else { - [store removeObjectForKey:NAMES_image]; + [store removeObjectForKey:SDLNameImage]; } } - (SDLImage *)image { - NSObject *obj = [store objectForKey:NAMES_image]; + NSObject *obj = [store objectForKey:SDLNameImage]; if (obj == nil || [obj isKindOfClass:SDLImage.class]) { return (SDLImage *)obj; } else { - return [[SDLImage alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLImage alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setSecondaryText:(NSString *)secondaryText { if (secondaryText != nil) { - [store setObject:secondaryText forKey:NAMES_secondaryText]; + [store setObject:secondaryText forKey:SDLNameSecondaryText]; } else { - [store removeObjectForKey:NAMES_secondaryText]; + [store removeObjectForKey:SDLNameSecondaryText]; } } - (NSString *)secondaryText { - return [store objectForKey:NAMES_secondaryText]; + return [store objectForKey:SDLNameSecondaryText]; } - (void)setTertiaryText:(NSString *)tertiaryText { if (tertiaryText != nil) { - [store setObject:tertiaryText forKey:NAMES_tertiaryText]; + [store setObject:tertiaryText forKey:SDLNameTertiaryText]; } else { - [store removeObjectForKey:NAMES_tertiaryText]; + [store removeObjectForKey:SDLNameTertiaryText]; } } - (NSString *)tertiaryText { - return [store objectForKey:NAMES_tertiaryText]; + return [store objectForKey:SDLNameTertiaryText]; } - (void)setSecondaryImage:(SDLImage *)secondaryImage { if (secondaryImage != nil) { - [store setObject:secondaryImage forKey:NAMES_secondaryImage]; + [store setObject:secondaryImage forKey:SDLNameSecondaryImage]; } else { - [store removeObjectForKey:NAMES_secondaryImage]; + [store removeObjectForKey:SDLNameSecondaryImage]; } } - (SDLImage *)secondaryImage { - NSObject *obj = [store objectForKey:NAMES_secondaryImage]; + NSObject *obj = [store objectForKey:SDLNameSecondaryImage]; if (obj == nil || [obj isKindOfClass:SDLImage.class]) { return (SDLImage *)obj; } else { - return [[SDLImage alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLImage alloc] initWithDictionary:(NSDictionary *)obj]; } } diff --git a/SmartDeviceLink/SDLClusterModeStatus.h b/SmartDeviceLink/SDLClusterModeStatus.h index 93b5e5c50..b22370ec3 100644 --- a/SmartDeviceLink/SDLClusterModeStatus.h +++ b/SmartDeviceLink/SDLClusterModeStatus.h @@ -8,11 +8,7 @@ #import "SDLPowerModeStatus.h" -@interface SDLClusterModeStatus : SDLRPCStruct { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLClusterModeStatus : SDLRPCStruct @property (strong) NSNumber *powerModeActive; @property (strong) SDLPowerModeQualificationStatus powerModeQualificationStatus; diff --git a/SmartDeviceLink/SDLClusterModeStatus.m b/SmartDeviceLink/SDLClusterModeStatus.m index 8384f7bf7..499a6a21f 100644 --- a/SmartDeviceLink/SDLClusterModeStatus.m +++ b/SmartDeviceLink/SDLClusterModeStatus.m @@ -5,69 +5,56 @@ #import "SDLNames.h" - @implementation SDLClusterModeStatus -- (instancetype)init { - if (self = [super init]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setPowerModeActive:(NSNumber *)powerModeActive { if (powerModeActive != nil) { - [store setObject:powerModeActive forKey:NAMES_powerModeActive]; + [store setObject:powerModeActive forKey:SDLNamePowerModeActive]; } else { - [store removeObjectForKey:NAMES_powerModeActive]; + [store removeObjectForKey:SDLNamePowerModeActive]; } } - (NSNumber *)powerModeActive { - return [store objectForKey:NAMES_powerModeActive]; + return [store objectForKey:SDLNamePowerModeActive]; } - (void)setPowerModeQualificationStatus:(SDLPowerModeQualificationStatus)powerModeQualificationStatus { if (powerModeQualificationStatus != nil) { - [store setObject:powerModeQualificationStatus forKey:NAMES_powerModeQualificationStatus]; + [store setObject:powerModeQualificationStatus forKey:SDLNamePowerModeQualificationStatus]; } else { - [store removeObjectForKey:NAMES_powerModeQualificationStatus]; + [store removeObjectForKey:SDLNamePowerModeQualificationStatus]; } } - (SDLPowerModeQualificationStatus)powerModeQualificationStatus { - NSObject *obj = [store objectForKey:NAMES_powerModeQualificationStatus]; + NSObject *obj = [store objectForKey:SDLNamePowerModeQualificationStatus]; return (SDLPowerModeQualificationStatus)obj; } - (void)setCarModeStatus:(SDLCarModeStatus)carModeStatus { if (carModeStatus != nil) { - [store setObject:carModeStatus forKey:NAMES_carModeStatus]; + [store setObject:carModeStatus forKey:SDLNameCarModeStatus]; } else { - [store removeObjectForKey:NAMES_carModeStatus]; + [store removeObjectForKey:SDLNameCarModeStatus]; } } - (SDLCarModeStatus)carModeStatus { - NSObject *obj = [store objectForKey:NAMES_carModeStatus]; + NSObject *obj = [store objectForKey:SDLNameCarModeStatus]; return (SDLCarModeStatus)obj; } - (void)setPowerModeStatus:(SDLPowerModeStatus)powerModeStatus { if (powerModeStatus != nil) { - [store setObject:powerModeStatus forKey:NAMES_powerModeStatus]; + [store setObject:powerModeStatus forKey:SDLNamePowerModeStatus]; } else { - [store removeObjectForKey:NAMES_powerModeStatus]; + [store removeObjectForKey:SDLNamePowerModeStatus]; } } - (SDLPowerModeStatus)powerModeStatus { - NSObject *obj = [store objectForKey:NAMES_powerModeStatus]; + NSObject *obj = [store objectForKey:SDLNamePowerModeStatus]; return (SDLPowerModeStatus)obj; } diff --git a/SmartDeviceLink/SDLConsoleController.m b/SmartDeviceLink/SDLConsoleController.m index ade1c17df..9537e6532 100644 --- a/SmartDeviceLink/SDLConsoleController.m +++ b/SmartDeviceLink/SDLConsoleController.m @@ -3,7 +3,6 @@ #import "SDLConsoleController.h" -#import "SDLJSONEncoder.h" #import "SDLRPCResponse.h" diff --git a/SmartDeviceLink/SDLCreateInteractionChoiceSet.h b/SmartDeviceLink/SDLCreateInteractionChoiceSet.h index 721f505d7..4a54b1698 100644 --- a/SmartDeviceLink/SDLCreateInteractionChoiceSet.h +++ b/SmartDeviceLink/SDLCreateInteractionChoiceSet.h @@ -17,20 +17,7 @@ * * @see SDLDeleteInteractionChoiceSet SDLPerformInteraction */ -@interface SDLCreateInteractionChoiceSet : SDLRPCRequest { -} - -/** - * Constructs a new SDLCreateInteractionChoiceSet object - */ -- (instancetype)init; - -/** - * Constructs a new SDLCreateInteractionChoiceSet object indicated by the dictionary parameter - * - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLCreateInteractionChoiceSet : SDLRPCRequest /** * @abstract A unique ID that identifies the Choice Set diff --git a/SmartDeviceLink/SDLCreateInteractionChoiceSet.m b/SmartDeviceLink/SDLCreateInteractionChoiceSet.m index 32324d46e..dc9441f40 100644 --- a/SmartDeviceLink/SDLCreateInteractionChoiceSet.m +++ b/SmartDeviceLink/SDLCreateInteractionChoiceSet.m @@ -10,45 +10,39 @@ @implementation SDLCreateInteractionChoiceSet - (instancetype)init { - if (self = [super initWithName:NAMES_CreateInteractionChoiceSet]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameCreateInteractionChoiceSet]) { } return self; } - (void)setInteractionChoiceSetID:(NSNumber *)interactionChoiceSetID { if (interactionChoiceSetID != nil) { - [parameters setObject:interactionChoiceSetID forKey:NAMES_interactionChoiceSetID]; + [parameters setObject:interactionChoiceSetID forKey:SDLNameInteractionChoiceSetId]; } else { - [parameters removeObjectForKey:NAMES_interactionChoiceSetID]; + [parameters removeObjectForKey:SDLNameInteractionChoiceSetId]; } } - (NSNumber *)interactionChoiceSetID { - return [parameters objectForKey:NAMES_interactionChoiceSetID]; + return [parameters objectForKey:SDLNameInteractionChoiceSetId]; } - (void)setChoiceSet:(NSMutableArray *)choiceSet { if (choiceSet != nil) { - [parameters setObject:choiceSet forKey:NAMES_choiceSet]; + [parameters setObject:choiceSet forKey:SDLNameChoiceSet]; } else { - [parameters removeObjectForKey:NAMES_choiceSet]; + [parameters removeObjectForKey:SDLNameChoiceSet]; } } - (NSMutableArray *)choiceSet { - NSMutableArray *array = [parameters objectForKey:NAMES_choiceSet]; + NSMutableArray *array = [parameters objectForKey:SDLNameChoiceSet]; if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLChoice.class]) { return array; } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; for (NSDictionary *dict in array) { - [newList addObject:[[SDLChoice alloc] initWithDictionary:(NSMutableDictionary *)dict]]; + [newList addObject:[[SDLChoice alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; } diff --git a/SmartDeviceLink/SDLCreateInteractionChoiceSetResponse.h b/SmartDeviceLink/SDLCreateInteractionChoiceSetResponse.h index e2d3b76e5..0573dcc2f 100644 --- a/SmartDeviceLink/SDLCreateInteractionChoiceSetResponse.h +++ b/SmartDeviceLink/SDLCreateInteractionChoiceSetResponse.h @@ -10,10 +10,6 @@ * * Since <b>SmartDeviceLink 1.0</b> */ -@interface SDLCreateInteractionChoiceSetResponse : SDLRPCResponse { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLCreateInteractionChoiceSetResponse : SDLRPCResponse @end diff --git a/SmartDeviceLink/SDLCreateInteractionChoiceSetResponse.m b/SmartDeviceLink/SDLCreateInteractionChoiceSetResponse.m index 17c2bf3f9..11b055e82 100644 --- a/SmartDeviceLink/SDLCreateInteractionChoiceSetResponse.m +++ b/SmartDeviceLink/SDLCreateInteractionChoiceSetResponse.m @@ -9,13 +9,7 @@ @implementation SDLCreateInteractionChoiceSetResponse - (instancetype)init { - if (self = [super initWithName:NAMES_CreateInteractionChoiceSet]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameCreateInteractionChoiceSet]) { } return self; } diff --git a/SmartDeviceLink/SDLDIDResult.h b/SmartDeviceLink/SDLDIDResult.h index 3ec5435b0..ee0811e5b 100644 --- a/SmartDeviceLink/SDLDIDResult.h +++ b/SmartDeviceLink/SDLDIDResult.h @@ -6,11 +6,7 @@ #import "SDLVehicleDataResultCode.h" -@interface SDLDIDResult : SDLRPCStruct { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLDIDResult : SDLRPCStruct @property (strong) SDLVehicleDataResultCode resultCode; @property (strong) NSNumber *didLocation; diff --git a/SmartDeviceLink/SDLDIDResult.m b/SmartDeviceLink/SDLDIDResult.m index 97163b593..8c1a19b1c 100644 --- a/SmartDeviceLink/SDLDIDResult.m +++ b/SmartDeviceLink/SDLDIDResult.m @@ -7,53 +7,41 @@ @implementation SDLDIDResult -- (instancetype)init { - if (self = [super init]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setResultCode:(SDLVehicleDataResultCode)resultCode { if (resultCode != nil) { - [store setObject:resultCode forKey:NAMES_resultCode]; + [store setObject:resultCode forKey:SDLNameResultCode]; } else { - [store removeObjectForKey:NAMES_resultCode]; + [store removeObjectForKey:SDLNameResultCode]; } } - (SDLVehicleDataResultCode)resultCode { - NSObject *obj = [store objectForKey:NAMES_resultCode]; + NSObject *obj = [store objectForKey:SDLNameResultCode]; return (SDLVehicleDataResultCode)obj; } - (void)setDidLocation:(NSNumber *)didLocation { if (didLocation != nil) { - [store setObject:didLocation forKey:NAMES_didLocation]; + [store setObject:didLocation forKey:SDLNameDIDLocation]; } else { - [store removeObjectForKey:NAMES_didLocation]; + [store removeObjectForKey:SDLNameDIDLocation]; } } - (NSNumber *)didLocation { - return [store objectForKey:NAMES_didLocation]; + return [store objectForKey:SDLNameDIDLocation]; } - (void)setData:(NSString *)data { if (data != nil) { - [store setObject:data forKey:NAMES_data]; + [store setObject:data forKey:SDLNameData]; } else { - [store removeObjectForKey:NAMES_data]; + [store removeObjectForKey:SDLNameData]; } } - (NSString *)data { - return [store objectForKey:NAMES_data]; + return [store objectForKey:SDLNameData]; } @end diff --git a/SmartDeviceLink/SDLDebugTool.m b/SmartDeviceLink/SDLDebugTool.m index 8bf8c7bda..c696ac6b5 100644 --- a/SmartDeviceLink/SDLDebugTool.m +++ b/SmartDeviceLink/SDLDebugTool.m @@ -5,8 +5,6 @@ #import "NSThread+ThreadIndex.h" #import "SDLHexUtility.h" #import "SDLRPCMessage.h" -#import "SDLSiphonServer.h" - @interface SDLDebugTool () @@ -171,10 +169,6 @@ if ((output & SDLDebugOutput_File) == SDLDebugOutput_File) { [SDLDebugTool writeToLogFile:outputString]; } - - //Output To Siphon - [SDLSiphonServer init]; - [SDLSiphonServer _siphonNSLogData:outputString]; } diff --git a/SmartDeviceLink/SDLDecoder.h b/SmartDeviceLink/SDLDecoder.h deleted file mode 100644 index 6328ecf82..000000000 --- a/SmartDeviceLink/SDLDecoder.h +++ /dev/null @@ -1,11 +0,0 @@ -// SDLDecoder.h -// - - -#import <Foundation/Foundation.h> - -@protocol SDLDecoder <NSObject> - -- (NSDictionary *)decode:(NSData *)msgBytes; - -@end diff --git a/SmartDeviceLink/SDLDeleteCommand.h b/SmartDeviceLink/SDLDeleteCommand.h index 4f3b74d90..bf5e076dd 100644 --- a/SmartDeviceLink/SDLDeleteCommand.h +++ b/SmartDeviceLink/SDLDeleteCommand.h @@ -16,21 +16,7 @@ * Since <b>SmartDeviceLink 1.0</b><br> * see SDLAddCommand SDLAddSubMenu SDLDeleteSubMenu */ -@interface SDLDeleteCommand : SDLRPCRequest { -} - -/** - * Constructs a new SDLDeleteCommand object - */ -- (instancetype)init; -/** - * Constructs a new SDLDeleteCommand object indicated by the NSMutableDictionary - * parameter - * <p> - * - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLDeleteCommand : SDLRPCRequest /** * @abstract the Command ID that identifies the Command to be deleted from Command Menu diff --git a/SmartDeviceLink/SDLDeleteCommand.m b/SmartDeviceLink/SDLDeleteCommand.m index 13c51d7ed..ee80ee98c 100644 --- a/SmartDeviceLink/SDLDeleteCommand.m +++ b/SmartDeviceLink/SDLDeleteCommand.m @@ -9,27 +9,21 @@ @implementation SDLDeleteCommand - (instancetype)init { - if (self = [super initWithName:NAMES_DeleteCommand]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameDeleteCommand]) { } return self; } - (void)setCmdID:(NSNumber *)cmdID { if (cmdID != nil) { - [parameters setObject:cmdID forKey:NAMES_cmdID]; + [parameters setObject:cmdID forKey:SDLNameCommandId]; } else { - [parameters removeObjectForKey:NAMES_cmdID]; + [parameters removeObjectForKey:SDLNameCommandId]; } } - (NSNumber *)cmdID { - return [parameters objectForKey:NAMES_cmdID]; + return [parameters objectForKey:SDLNameCommandId]; } @end diff --git a/SmartDeviceLink/SDLDeleteCommandResponse.h b/SmartDeviceLink/SDLDeleteCommandResponse.h index 7f231c8e3..4c07a3c2f 100644 --- a/SmartDeviceLink/SDLDeleteCommandResponse.h +++ b/SmartDeviceLink/SDLDeleteCommandResponse.h @@ -9,10 +9,6 @@ * * Since <b>SmartDeviceLink 1.0</b><br> */ -@interface SDLDeleteCommandResponse : SDLRPCResponse { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLDeleteCommandResponse : SDLRPCResponse @end diff --git a/SmartDeviceLink/SDLDeleteCommandResponse.m b/SmartDeviceLink/SDLDeleteCommandResponse.m index 3c3d5b7a7..7f97574cb 100644 --- a/SmartDeviceLink/SDLDeleteCommandResponse.m +++ b/SmartDeviceLink/SDLDeleteCommandResponse.m @@ -9,13 +9,7 @@ @implementation SDLDeleteCommandResponse - (instancetype)init { - if (self = [super initWithName:NAMES_DeleteCommand]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameDeleteCommand]) { } return self; } diff --git a/SmartDeviceLink/SDLDeleteFile.h b/SmartDeviceLink/SDLDeleteFile.h index 325782673..196ff65d2 100644 --- a/SmartDeviceLink/SDLDeleteFile.h +++ b/SmartDeviceLink/SDLDeleteFile.h @@ -12,20 +12,7 @@ * Since <b>SmartDeviceLink 2.0</b><br> * see SDLPutFile SDLListFiles */ -@interface SDLDeleteFile : SDLRPCRequest { -} - -/** - * Constructs a new SDLDeleteFile object - */ -- (instancetype)init; -/** - * Constructs a new SDLDeleteFile object indicated by the dictionary parameter - * <p> - * - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLDeleteFile : SDLRPCRequest /** * @abstract a file reference name diff --git a/SmartDeviceLink/SDLDeleteFile.m b/SmartDeviceLink/SDLDeleteFile.m index d7a4c18b2..c6c7481f1 100644 --- a/SmartDeviceLink/SDLDeleteFile.m +++ b/SmartDeviceLink/SDLDeleteFile.m @@ -9,27 +9,21 @@ @implementation SDLDeleteFile - (instancetype)init { - if (self = [super initWithName:NAMES_DeleteFile]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameDeleteFile]) { } return self; } - (void)setSyncFileName:(NSString *)syncFileName { if (syncFileName != nil) { - [parameters setObject:syncFileName forKey:NAMES_syncFileName]; + [parameters setObject:syncFileName forKey:SDLNameSyncFileName]; } else { - [parameters removeObjectForKey:NAMES_syncFileName]; + [parameters removeObjectForKey:SDLNameSyncFileName]; } } - (NSString *)syncFileName { - return [parameters objectForKey:NAMES_syncFileName]; + return [parameters objectForKey:SDLNameSyncFileName]; } @end diff --git a/SmartDeviceLink/SDLDeleteFileResponse.h b/SmartDeviceLink/SDLDeleteFileResponse.h index ee61aa9d0..5fa17495f 100644 --- a/SmartDeviceLink/SDLDeleteFileResponse.h +++ b/SmartDeviceLink/SDLDeleteFileResponse.h @@ -9,11 +9,7 @@ * * Since <b>SmartDeviceLink 2.0</b><br> */ -@interface SDLDeleteFileResponse : SDLRPCResponse { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLDeleteFileResponse : SDLRPCResponse @property (strong) NSNumber *spaceAvailable; diff --git a/SmartDeviceLink/SDLDeleteFileResponse.m b/SmartDeviceLink/SDLDeleteFileResponse.m index b94075b39..0711ba7e2 100644 --- a/SmartDeviceLink/SDLDeleteFileResponse.m +++ b/SmartDeviceLink/SDLDeleteFileResponse.m @@ -9,27 +9,21 @@ @implementation SDLDeleteFileResponse - (instancetype)init { - if (self = [super initWithName:NAMES_DeleteFile]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameDeleteFile]) { } return self; } - (void)setSpaceAvailable:(NSNumber *)spaceAvailable { if (spaceAvailable != nil) { - [parameters setObject:spaceAvailable forKey:NAMES_spaceAvailable]; + [parameters setObject:spaceAvailable forKey:SDLNameSpaceAvailable]; } else { - [parameters removeObjectForKey:NAMES_spaceAvailable]; + [parameters removeObjectForKey:SDLNameSpaceAvailable]; } } - (NSNumber *)spaceAvailable { - return [parameters objectForKey:NAMES_spaceAvailable]; + return [parameters objectForKey:SDLNameSpaceAvailable]; } @end diff --git a/SmartDeviceLink/SDLDeleteInteractionChoiceSet.h b/SmartDeviceLink/SDLDeleteInteractionChoiceSet.h index 28058064b..4b7100a05 100644 --- a/SmartDeviceLink/SDLDeleteInteractionChoiceSet.h +++ b/SmartDeviceLink/SDLDeleteInteractionChoiceSet.h @@ -18,21 +18,7 @@ * Since <b>SmartDeviceLink 1.0</b><br> * see SDLCreateInteractionChoiceSet SDLPerformInteraction */ -@interface SDLDeleteInteractionChoiceSet : SDLRPCRequest { -} - -/** - * Constructs a new SDLDeleteInteractionChoiceSet object - */ -- (instancetype)init; -/** - * Constructs a new SDLDeleteInteractionChoiceSet object indicated by the - * NSMutableDictionary parameter - * <p> - * - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLDeleteInteractionChoiceSet : SDLRPCRequest /** * @abstract a unique ID that identifies the Choice Set diff --git a/SmartDeviceLink/SDLDeleteInteractionChoiceSet.m b/SmartDeviceLink/SDLDeleteInteractionChoiceSet.m index fd5d202b1..d278965f4 100644 --- a/SmartDeviceLink/SDLDeleteInteractionChoiceSet.m +++ b/SmartDeviceLink/SDLDeleteInteractionChoiceSet.m @@ -9,27 +9,21 @@ @implementation SDLDeleteInteractionChoiceSet - (instancetype)init { - if (self = [super initWithName:NAMES_DeleteInteractionChoiceSet]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameDeleteInteractionChoiceSet]) { } return self; } - (void)setInteractionChoiceSetID:(NSNumber *)interactionChoiceSetID { if (interactionChoiceSetID != nil) { - [parameters setObject:interactionChoiceSetID forKey:NAMES_interactionChoiceSetID]; + [parameters setObject:interactionChoiceSetID forKey:SDLNameInteractionChoiceSetId]; } else { - [parameters removeObjectForKey:NAMES_interactionChoiceSetID]; + [parameters removeObjectForKey:SDLNameInteractionChoiceSetId]; } } - (NSNumber *)interactionChoiceSetID { - return [parameters objectForKey:NAMES_interactionChoiceSetID]; + return [parameters objectForKey:SDLNameInteractionChoiceSetId]; } @end diff --git a/SmartDeviceLink/SDLDeleteInteractionChoiceSetResponse.h b/SmartDeviceLink/SDLDeleteInteractionChoiceSetResponse.h index 7a5cd4406..c67aef1d1 100644 --- a/SmartDeviceLink/SDLDeleteInteractionChoiceSetResponse.h +++ b/SmartDeviceLink/SDLDeleteInteractionChoiceSetResponse.h @@ -9,10 +9,6 @@ * * Since <b>SmartDeviceLink 1.0</b> */ -@interface SDLDeleteInteractionChoiceSetResponse : SDLRPCResponse { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLDeleteInteractionChoiceSetResponse : SDLRPCResponse @end diff --git a/SmartDeviceLink/SDLDeleteInteractionChoiceSetResponse.m b/SmartDeviceLink/SDLDeleteInteractionChoiceSetResponse.m index 666a758a1..bcca0be95 100644 --- a/SmartDeviceLink/SDLDeleteInteractionChoiceSetResponse.m +++ b/SmartDeviceLink/SDLDeleteInteractionChoiceSetResponse.m @@ -9,13 +9,7 @@ @implementation SDLDeleteInteractionChoiceSetResponse - (instancetype)init { - if (self = [super initWithName:NAMES_DeleteInteractionChoiceSet]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameDeleteInteractionChoiceSet]) { } return self; } diff --git a/SmartDeviceLink/SDLDeleteSubMenu.h b/SmartDeviceLink/SDLDeleteSubMenu.h index 37c2dc544..0cddf67bb 100644 --- a/SmartDeviceLink/SDLDeleteSubMenu.h +++ b/SmartDeviceLink/SDLDeleteSubMenu.h @@ -16,18 +16,7 @@ * Since <b>SmartDeviceLink 1.0</b><br> * see SDLAddCommand SDLAddSubMenu SDLDeleteCommand */ -@interface SDLDeleteSubMenu : SDLRPCRequest { -} - -/** - * Constructs a new SDLDeleteSubMenu object - */ -- (instancetype)init; -/** - * Constructs a new SDLDeleteSubMenu object indicated by the dictionary parameter<p> - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLDeleteSubMenu : SDLRPCRequest /** * @abstract the MenuID that identifies the SDLSubMenu to be delete diff --git a/SmartDeviceLink/SDLDeleteSubMenu.m b/SmartDeviceLink/SDLDeleteSubMenu.m index 8727f44d3..2c2320944 100644 --- a/SmartDeviceLink/SDLDeleteSubMenu.m +++ b/SmartDeviceLink/SDLDeleteSubMenu.m @@ -9,27 +9,21 @@ @implementation SDLDeleteSubMenu - (instancetype)init { - if (self = [super initWithName:NAMES_DeleteSubMenu]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameDeleteSubMenu]) { } return self; } - (void)setMenuID:(NSNumber *)menuID { if (menuID != nil) { - [parameters setObject:menuID forKey:NAMES_menuID]; + [parameters setObject:menuID forKey:SDLNameMenuId]; } else { - [parameters removeObjectForKey:NAMES_menuID]; + [parameters removeObjectForKey:SDLNameMenuId]; } } - (NSNumber *)menuID { - return [parameters objectForKey:NAMES_menuID]; + return [parameters objectForKey:SDLNameMenuId]; } @end diff --git a/SmartDeviceLink/SDLDeleteSubMenuResponse.h b/SmartDeviceLink/SDLDeleteSubMenuResponse.h index 3b32df8f3..5842a54be 100644 --- a/SmartDeviceLink/SDLDeleteSubMenuResponse.h +++ b/SmartDeviceLink/SDLDeleteSubMenuResponse.h @@ -9,10 +9,6 @@ * * Since <b>SmartDeviceLink 1.0</b> */ -@interface SDLDeleteSubMenuResponse : SDLRPCResponse { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLDeleteSubMenuResponse : SDLRPCResponse @end diff --git a/SmartDeviceLink/SDLDeleteSubMenuResponse.m b/SmartDeviceLink/SDLDeleteSubMenuResponse.m index b88d9b626..a9755f8a2 100644 --- a/SmartDeviceLink/SDLDeleteSubMenuResponse.m +++ b/SmartDeviceLink/SDLDeleteSubMenuResponse.m @@ -9,13 +9,7 @@ @implementation SDLDeleteSubMenuResponse - (instancetype)init { - if (self = [super initWithName:NAMES_DeleteSubMenu]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameDeleteSubMenu]) { } return self; } diff --git a/SmartDeviceLink/SDLDeviceInfo.h b/SmartDeviceLink/SDLDeviceInfo.h index 1bcbdaa27..f85c5666e 100644 --- a/SmartDeviceLink/SDLDeviceInfo.h +++ b/SmartDeviceLink/SDLDeviceInfo.h @@ -4,11 +4,7 @@ #import "SDLRPCMessage.h" -@interface SDLDeviceInfo : SDLRPCStruct { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLDeviceInfo : SDLRPCStruct @property (strong) NSString *hardware; @property (strong) NSString *firmwareRev; diff --git a/SmartDeviceLink/SDLDeviceInfo.m b/SmartDeviceLink/SDLDeviceInfo.m index 134aea629..861e8c209 100644 --- a/SmartDeviceLink/SDLDeviceInfo.m +++ b/SmartDeviceLink/SDLDeviceInfo.m @@ -5,91 +5,78 @@ #import "SDLNames.h" - @implementation SDLDeviceInfo -- (instancetype)init { - if (self = [super init]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setHardware:(NSString *)hardware { if (hardware != nil) { - [store setObject:hardware forKey:NAMES_hardware]; + [store setObject:hardware forKey:SDLNameHardware]; } else { - [store removeObjectForKey:NAMES_hardware]; + [store removeObjectForKey:SDLNameHardware]; } } - (NSString *)hardware { - return [store objectForKey:NAMES_hardware]; + return [store objectForKey:SDLNameHardware]; } - (void)setFirmwareRev:(NSString *)firmwareRev { if (firmwareRev != nil) { - [store setObject:firmwareRev forKey:NAMES_firmwareRev]; + [store setObject:firmwareRev forKey:SDLNameFirmwareRevision]; } else { - [store removeObjectForKey:NAMES_firmwareRev]; + [store removeObjectForKey:SDLNameFirmwareRevision]; } } - (NSString *)firmwareRev { - return [store objectForKey:NAMES_firmwareRev]; + return [store objectForKey:SDLNameFirmwareRevision]; } - (void)setOs:(NSString *)os { if (os != nil) { - [store setObject:os forKey:NAMES_os]; + [store setObject:os forKey:SDLNameOS]; } else { - [store removeObjectForKey:NAMES_os]; + [store removeObjectForKey:SDLNameOS]; } } - (NSString *)os { - return [store objectForKey:NAMES_os]; + return [store objectForKey:SDLNameOS]; } - (void)setOsVersion:(NSString *)osVersion { if (osVersion != nil) { - [store setObject:osVersion forKey:NAMES_osVersion]; + [store setObject:osVersion forKey:SDLNameOSVersion]; } else { - [store removeObjectForKey:NAMES_osVersion]; + [store removeObjectForKey:SDLNameOSVersion]; } } - (NSString *)osVersion { - return [store objectForKey:NAMES_osVersion]; + return [store objectForKey:SDLNameOSVersion]; } - (void)setCarrier:(NSString *)carrier { if (carrier != nil) { - [store setObject:carrier forKey:NAMES_carrier]; + [store setObject:carrier forKey:SDLNameCarrier]; } else { - [store removeObjectForKey:NAMES_carrier]; + [store removeObjectForKey:SDLNameCarrier]; } } - (NSString *)carrier { - return [store objectForKey:NAMES_carrier]; + return [store objectForKey:SDLNameCarrier]; } - (void)setMaxNumberRFCOMMPorts:(NSNumber *)maxNumberRFCOMMPorts { if (maxNumberRFCOMMPorts != nil) { - [store setObject:maxNumberRFCOMMPorts forKey:NAMES_maxNumberRFCOMMPorts]; + [store setObject:maxNumberRFCOMMPorts forKey:SDLNameMaxNumberRFCOMMPorts]; } else { - [store removeObjectForKey:NAMES_maxNumberRFCOMMPorts]; + [store removeObjectForKey:SDLNameMaxNumberRFCOMMPorts]; } } - (NSNumber *)maxNumberRFCOMMPorts { - return [store objectForKey:NAMES_maxNumberRFCOMMPorts]; + return [store objectForKey:SDLNameMaxNumberRFCOMMPorts]; } @end diff --git a/SmartDeviceLink/SDLDeviceStatus.h b/SmartDeviceLink/SDLDeviceStatus.h index 677848d4d..a2a589181 100644 --- a/SmartDeviceLink/SDLDeviceStatus.h +++ b/SmartDeviceLink/SDLDeviceStatus.h @@ -98,20 +98,7 @@ * </table> * @since SDL 2.0 */ -@interface SDLDeviceStatus : SDLRPCStruct { -} - -/** - * Constructs a newly allocated SDLDeviceStatus object - */ -- (instancetype)init; - -/** - * Constructs a newly allocated SDLDeviceStatus object indicated by the dictionary parameter - * - * @param dict The dictionary to use to construct the object - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLDeviceStatus : SDLRPCStruct /** * @abstract Indicates whether the voice recognition is on or off diff --git a/SmartDeviceLink/SDLDeviceStatus.m b/SmartDeviceLink/SDLDeviceStatus.m index 0c8bf9153..1041c22d7 100644 --- a/SmartDeviceLink/SDLDeviceStatus.m +++ b/SmartDeviceLink/SDLDeviceStatus.m @@ -7,154 +7,141 @@ #import "SDLNames.h" #import "SDLPrimaryAudioSource.h" - @implementation SDLDeviceStatus -- (instancetype)init { - if (self = [super init]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setVoiceRecOn:(NSNumber *)voiceRecOn { if (voiceRecOn != nil) { - [store setObject:voiceRecOn forKey:NAMES_voiceRecOn]; + [store setObject:voiceRecOn forKey:SDLNameVoiceRecognitionOn]; } else { - [store removeObjectForKey:NAMES_voiceRecOn]; + [store removeObjectForKey:SDLNameVoiceRecognitionOn]; } } - (NSNumber *)voiceRecOn { - return [store objectForKey:NAMES_voiceRecOn]; + return [store objectForKey:SDLNameVoiceRecognitionOn]; } - (void)setBtIconOn:(NSNumber *)btIconOn { if (btIconOn != nil) { - [store setObject:btIconOn forKey:NAMES_btIconOn]; + [store setObject:btIconOn forKey:SDLNameBluetoothIconOn]; } else { - [store removeObjectForKey:NAMES_btIconOn]; + [store removeObjectForKey:SDLNameBluetoothIconOn]; } } - (NSNumber *)btIconOn { - return [store objectForKey:NAMES_btIconOn]; + return [store objectForKey:SDLNameBluetoothIconOn]; } - (void)setCallActive:(NSNumber *)callActive { if (callActive != nil) { - [store setObject:callActive forKey:NAMES_callActive]; + [store setObject:callActive forKey:SDLNameCallActive]; } else { - [store removeObjectForKey:NAMES_callActive]; + [store removeObjectForKey:SDLNameCallActive]; } } - (NSNumber *)callActive { - return [store objectForKey:NAMES_callActive]; + return [store objectForKey:SDLNameCallActive]; } - (void)setPhoneRoaming:(NSNumber *)phoneRoaming { if (phoneRoaming != nil) { - [store setObject:phoneRoaming forKey:NAMES_phoneRoaming]; + [store setObject:phoneRoaming forKey:SDLNamePhoneRoaming]; } else { - [store removeObjectForKey:NAMES_phoneRoaming]; + [store removeObjectForKey:SDLNamePhoneRoaming]; } } - (NSNumber *)phoneRoaming { - return [store objectForKey:NAMES_phoneRoaming]; + return [store objectForKey:SDLNamePhoneRoaming]; } - (void)setTextMsgAvailable:(NSNumber *)textMsgAvailable { if (textMsgAvailable != nil) { - [store setObject:textMsgAvailable forKey:NAMES_textMsgAvailable]; + [store setObject:textMsgAvailable forKey:SDLNameTextMessageAvailable]; } else { - [store removeObjectForKey:NAMES_textMsgAvailable]; + [store removeObjectForKey:SDLNameTextMessageAvailable]; } } - (NSNumber *)textMsgAvailable { - return [store objectForKey:NAMES_textMsgAvailable]; + return [store objectForKey:SDLNameTextMessageAvailable]; } - (void)setBattLevelStatus:(SDLDeviceLevelStatus )battLevelStatus { if (battLevelStatus != nil) { - [store setObject:battLevelStatus forKey:NAMES_battLevelStatus]; + [store setObject:battLevelStatus forKey:SDLNameBatteryLevelStatus]; } else { - [store removeObjectForKey:NAMES_battLevelStatus]; + [store removeObjectForKey:SDLNameBatteryLevelStatus]; } } -- (SDLDeviceLevelStatus )battLevelStatus { - NSObject *obj = [store objectForKey:NAMES_battLevelStatus]; +- (SDLDeviceLevelStatus)battLevelStatus { + NSObject *obj = [store objectForKey:SDLNameBatteryLevelStatus]; return (SDLDeviceLevelStatus)obj; } - (void)setStereoAudioOutputMuted:(NSNumber *)stereoAudioOutputMuted { if (stereoAudioOutputMuted != nil) { - [store setObject:stereoAudioOutputMuted forKey:NAMES_stereoAudioOutputMuted]; + [store setObject:stereoAudioOutputMuted forKey:SDLNameStereoAudioOutputMuted]; } else { - [store removeObjectForKey:NAMES_stereoAudioOutputMuted]; + [store removeObjectForKey:SDLNameStereoAudioOutputMuted]; } } - (NSNumber *)stereoAudioOutputMuted { - return [store objectForKey:NAMES_stereoAudioOutputMuted]; + return [store objectForKey:SDLNameStereoAudioOutputMuted]; } - (void)setMonoAudioOutputMuted:(NSNumber *)monoAudioOutputMuted { if (monoAudioOutputMuted != nil) { - [store setObject:monoAudioOutputMuted forKey:NAMES_monoAudioOutputMuted]; + [store setObject:monoAudioOutputMuted forKey:SDLNameMonoAudioOutputMuted]; } else { - [store removeObjectForKey:NAMES_monoAudioOutputMuted]; + [store removeObjectForKey:SDLNameMonoAudioOutputMuted]; } } - (NSNumber *)monoAudioOutputMuted { - return [store objectForKey:NAMES_monoAudioOutputMuted]; + return [store objectForKey:SDLNameMonoAudioOutputMuted]; } - (void)setSignalLevelStatus:(SDLDeviceLevelStatus)signalLevelStatus { if (signalLevelStatus != nil) { - [store setObject:signalLevelStatus forKey:NAMES_signalLevelStatus]; + [store setObject:signalLevelStatus forKey:SDLNameSignalLevelStatus]; } else { - [store removeObjectForKey:NAMES_signalLevelStatus]; + [store removeObjectForKey:SDLNameSignalLevelStatus]; } } - (SDLDeviceLevelStatus)signalLevelStatus { - NSObject *obj = [store objectForKey:NAMES_signalLevelStatus]; + NSObject *obj = [store objectForKey:SDLNameSignalLevelStatus]; return (SDLDeviceLevelStatus)obj; } - (void)setPrimaryAudioSource:(SDLPrimaryAudioSource)primaryAudioSource { if (primaryAudioSource != nil) { - [store setObject:primaryAudioSource forKey:NAMES_primaryAudioSource]; + [store setObject:primaryAudioSource forKey:SDLNamePrimaryAudioSource]; } else { - [store removeObjectForKey:NAMES_primaryAudioSource]; + [store removeObjectForKey:SDLNamePrimaryAudioSource]; } } - (SDLPrimaryAudioSource)primaryAudioSource { - NSObject *obj = [store objectForKey:NAMES_primaryAudioSource]; + NSObject *obj = [store objectForKey:SDLNamePrimaryAudioSource]; return (SDLPrimaryAudioSource)obj; } - (void)setECallEventActive:(NSNumber *)eCallEventActive { if (eCallEventActive != nil) { - [store setObject:eCallEventActive forKey:NAMES_eCallEventActive]; + [store setObject:eCallEventActive forKey:SDLNameECallEventActive]; } else { - [store removeObjectForKey:NAMES_eCallEventActive]; + [store removeObjectForKey:SDLNameECallEventActive]; } } - (NSNumber *)eCallEventActive { - return [store objectForKey:NAMES_eCallEventActive]; + return [store objectForKey:SDLNameECallEventActive]; } @end diff --git a/SmartDeviceLink/SDLDiagnosticMessage.h b/SmartDeviceLink/SDLDiagnosticMessage.h index 40ca013f2..7339a3762 100644 --- a/SmartDeviceLink/SDLDiagnosticMessage.h +++ b/SmartDeviceLink/SDLDiagnosticMessage.h @@ -9,11 +9,7 @@ * * @since SDL 3.0 */ -@interface SDLDiagnosticMessage : SDLRPCRequest { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLDiagnosticMessage : SDLRPCRequest /** * Name of target ECU diff --git a/SmartDeviceLink/SDLDiagnosticMessage.m b/SmartDeviceLink/SDLDiagnosticMessage.m index 8a45a8650..010ddd93c 100644 --- a/SmartDeviceLink/SDLDiagnosticMessage.m +++ b/SmartDeviceLink/SDLDiagnosticMessage.m @@ -9,51 +9,45 @@ @implementation SDLDiagnosticMessage - (instancetype)init { - if (self = [super initWithName:NAMES_DiagnosticMessage]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameDiagnosticMessage]) { } return self; } - (void)setTargetID:(NSNumber *)targetID { if (targetID != nil) { - [parameters setObject:targetID forKey:NAMES_targetID]; + [parameters setObject:targetID forKey:SDLNameTargetId]; } else { - [parameters removeObjectForKey:NAMES_targetID]; + [parameters removeObjectForKey:SDLNameTargetId]; } } - (NSNumber *)targetID { - return [parameters objectForKey:NAMES_targetID]; + return [parameters objectForKey:SDLNameTargetId]; } - (void)setMessageLength:(NSNumber *)messageLength { if (messageLength != nil) { - [parameters setObject:messageLength forKey:NAMES_messageLength]; + [parameters setObject:messageLength forKey:SDLNameMessageLength]; } else { - [parameters removeObjectForKey:NAMES_messageLength]; + [parameters removeObjectForKey:SDLNameMessageLength]; } } - (NSNumber *)messageLength { - return [parameters objectForKey:NAMES_messageLength]; + return [parameters objectForKey:SDLNameMessageLength]; } - (void)setMessageData:(NSMutableArray *)messageData { if (messageData != nil) { - [parameters setObject:messageData forKey:NAMES_messageData]; + [parameters setObject:messageData forKey:SDLNameMessageData]; } else { - [parameters removeObjectForKey:NAMES_messageData]; + [parameters removeObjectForKey:SDLNameMessageData]; } } - (NSMutableArray *)messageData { - return [parameters objectForKey:NAMES_messageData]; + return [parameters objectForKey:SDLNameMessageData]; } @end diff --git a/SmartDeviceLink/SDLDiagnosticMessageResponse.h b/SmartDeviceLink/SDLDiagnosticMessageResponse.h index 4820b893f..c0d1a4901 100644 --- a/SmartDeviceLink/SDLDiagnosticMessageResponse.h +++ b/SmartDeviceLink/SDLDiagnosticMessageResponse.h @@ -7,11 +7,7 @@ /** SDLDiagnosticMessageResponse is sent, when SDLDiagnosticMessage has been called. * Since<b>SmartDeviceLink 3.0</b> */ -@interface SDLDiagnosticMessageResponse : SDLRPCResponse { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLDiagnosticMessageResponse : SDLRPCResponse @property (strong) NSMutableArray *messageDataResult; diff --git a/SmartDeviceLink/SDLDiagnosticMessageResponse.m b/SmartDeviceLink/SDLDiagnosticMessageResponse.m index f8215d977..d9c129fc1 100644 --- a/SmartDeviceLink/SDLDiagnosticMessageResponse.m +++ b/SmartDeviceLink/SDLDiagnosticMessageResponse.m @@ -8,27 +8,21 @@ @implementation SDLDiagnosticMessageResponse - (instancetype)init { - if (self = [super initWithName:NAMES_DiagnosticMessage]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameDiagnosticMessage]) { } return self; } - (void)setMessageDataResult:(NSMutableArray *)messageDataResult { if (messageDataResult != nil) { - [parameters setObject:messageDataResult forKey:NAMES_messageDataResult]; + [parameters setObject:messageDataResult forKey:SDLNameMessageDataResult]; } else { - [parameters removeObjectForKey:NAMES_messageDataResult]; + [parameters removeObjectForKey:SDLNameMessageDataResult]; } } - (NSMutableArray *)messageDataResult { - return [parameters objectForKey:NAMES_messageDataResult]; + return [parameters objectForKey:SDLNameMessageDataResult]; } @end diff --git a/SmartDeviceLink/SDLDialNumber.h b/SmartDeviceLink/SDLDialNumber.h index 48cca6a6d..f94750863 100644 --- a/SmartDeviceLink/SDLDialNumber.h +++ b/SmartDeviceLink/SDLDialNumber.h @@ -11,9 +11,6 @@ */ @interface SDLDialNumber : SDLRPCRequest -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; - /** * Up to 40 character string representing the phone number. All characters stripped except for '0'-'9', '*', '#', ',', ';', and '+' */ diff --git a/SmartDeviceLink/SDLDialNumber.m b/SmartDeviceLink/SDLDialNumber.m index 856f9ad75..10c1addd1 100644 --- a/SmartDeviceLink/SDLDialNumber.m +++ b/SmartDeviceLink/SDLDialNumber.m @@ -9,27 +9,21 @@ @implementation SDLDialNumber - (instancetype)init { - if (self = [super initWithName:NAMES_DialNumber]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameDialNumber]) { } return self; } - (void)setNumber:(NSString *)number { if (number != nil) { - parameters[NAMES_number] = number; + parameters[SDLNameNumber] = number; } else { - [parameters removeObjectForKey:NAMES_number]; + [parameters removeObjectForKey:SDLNameNumber]; } } - (NSString *)number { - return parameters[NAMES_number]; + return parameters[SDLNameNumber]; } @end diff --git a/SmartDeviceLink/SDLDialNumberResponse.h b/SmartDeviceLink/SDLDialNumberResponse.h index 454babcf3..1270751ac 100644 --- a/SmartDeviceLink/SDLDialNumberResponse.h +++ b/SmartDeviceLink/SDLDialNumberResponse.h @@ -11,7 +11,4 @@ */ @interface SDLDialNumberResponse : SDLRPCResponse -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; - @end diff --git a/SmartDeviceLink/SDLDialNumberResponse.m b/SmartDeviceLink/SDLDialNumberResponse.m index a0b6dd83e..3d16f2621 100644 --- a/SmartDeviceLink/SDLDialNumberResponse.m +++ b/SmartDeviceLink/SDLDialNumberResponse.m @@ -10,13 +10,7 @@ @implementation SDLDialNumberResponse - (instancetype)init { - if (self = [super initWithName:NAMES_DialNumber]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameDialNumber]) { } return self; } diff --git a/SmartDeviceLink/SDLDisplayCapabilities.h b/SmartDeviceLink/SDLDisplayCapabilities.h index 2b22139c2..61a533828 100644 --- a/SmartDeviceLink/SDLDisplayCapabilities.h +++ b/SmartDeviceLink/SDLDisplayCapabilities.h @@ -11,20 +11,7 @@ * * @since SDL 1.0 */ -@interface SDLDisplayCapabilities : SDLRPCStruct { -} - -/** - * Constructs a newly allocated SDLDisplayCapabilities object - */ -- (instancetype)init; - -/** - * Constructs a newly allocated SDLDisplayCapabilities object indicated by the dictionary parameter - * - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLDisplayCapabilities : SDLRPCStruct /** * @abstract The type of display diff --git a/SmartDeviceLink/SDLDisplayCapabilities.m b/SmartDeviceLink/SDLDisplayCapabilities.m index 8ba986a08..b499909c7 100644 --- a/SmartDeviceLink/SDLDisplayCapabilities.m +++ b/SmartDeviceLink/SDLDisplayCapabilities.m @@ -10,50 +10,37 @@ #import "SDLScreenParams.h" #import "SDLTextField.h" - @implementation SDLDisplayCapabilities -- (instancetype)init { - if (self = [super init]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setDisplayType:(SDLDisplayType)displayType { if (displayType != nil) { - [store setObject:displayType forKey:NAMES_displayType]; + [store setObject:displayType forKey:SDLNameDisplayType]; } else { - [store removeObjectForKey:NAMES_displayType]; + [store removeObjectForKey:SDLNameDisplayType]; } } - (SDLDisplayType)displayType { - NSObject *obj = [store objectForKey:NAMES_displayType]; + NSObject *obj = [store objectForKey:SDLNameDisplayType]; return (SDLDisplayType)obj; } - (void)setTextFields:(NSMutableArray *)textFields { if (textFields != nil) { - [store setObject:textFields forKey:NAMES_textFields]; + [store setObject:textFields forKey:SDLNameTextFields]; } else { - [store removeObjectForKey:NAMES_textFields]; + [store removeObjectForKey:SDLNameTextFields]; } } - (NSMutableArray *)textFields { - NSMutableArray *array = [store objectForKey:NAMES_textFields]; + NSMutableArray *array = [store objectForKey:SDLNameTextFields]; if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLTextField.class]) { return array; } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; for (NSDictionary *dict in array) { - [newList addObject:[[SDLTextField alloc] initWithDictionary:(NSMutableDictionary *)dict]]; + [newList addObject:[[SDLTextField alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; } @@ -61,20 +48,20 @@ - (void)setImageFields:(NSMutableArray *)imageFields { if (imageFields != nil) { - [store setObject:imageFields forKey:NAMES_imageFields]; + [store setObject:imageFields forKey:SDLNameImageFields]; } else { - [store removeObjectForKey:NAMES_imageFields]; + [store removeObjectForKey:SDLNameImageFields]; } } - (NSMutableArray *)imageFields { - NSMutableArray *array = [store objectForKey:NAMES_imageFields]; + NSMutableArray *array = [store objectForKey:SDLNameImageFields]; if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLImageField.class]) { return array; } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; for (NSDictionary *dict in array) { - [newList addObject:[[SDLImageField alloc] initWithDictionary:(NSMutableDictionary *)dict]]; + [newList addObject:[[SDLImageField alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; } @@ -82,14 +69,14 @@ - (void)setMediaClockFormats:(NSMutableArray *)mediaClockFormats { if (mediaClockFormats != nil) { - [store setObject:mediaClockFormats forKey:NAMES_mediaClockFormats]; + [store setObject:mediaClockFormats forKey:SDLNameMediaClockFormats]; } else { - [store removeObjectForKey:NAMES_mediaClockFormats]; + [store removeObjectForKey:SDLNameMediaClockFormats]; } } - (NSMutableArray *)mediaClockFormats { - NSMutableArray *array = [store objectForKey:NAMES_mediaClockFormats]; + NSMutableArray *array = [store objectForKey:SDLNameMediaClockFormats]; if ([array count] < 1) { return array; } else { @@ -103,55 +90,55 @@ - (void)setGraphicSupported:(NSNumber *)graphicSupported { if (graphicSupported != nil) { - [store setObject:graphicSupported forKey:NAMES_graphicSupported]; + [store setObject:graphicSupported forKey:SDLNameGraphicSupported]; } else { - [store removeObjectForKey:NAMES_graphicSupported]; + [store removeObjectForKey:SDLNameGraphicSupported]; } } - (NSNumber *)graphicSupported { - return [store objectForKey:NAMES_graphicSupported]; + return [store objectForKey:SDLNameGraphicSupported]; } - (void)setTemplatesAvailable:(NSMutableArray *)templatesAvailable { if (templatesAvailable != nil) { - [store setObject:templatesAvailable forKey:NAMES_templatesAvailable]; + [store setObject:templatesAvailable forKey:SDLNameTemplatesAvailable]; } else { - [store removeObjectForKey:NAMES_templatesAvailable]; + [store removeObjectForKey:SDLNameTemplatesAvailable]; } } - (NSMutableArray *)templatesAvailable { - return [store objectForKey:NAMES_templatesAvailable]; + return [store objectForKey:SDLNameTemplatesAvailable]; } - (void)setScreenParams:(SDLScreenParams *)screenParams { if (screenParams != nil) { - [store setObject:screenParams forKey:NAMES_screenParams]; + [store setObject:screenParams forKey:SDLNameScreenParams]; } else { - [store removeObjectForKey:NAMES_screenParams]; + [store removeObjectForKey:SDLNameScreenParams]; } } - (SDLScreenParams *)screenParams { - NSObject *obj = [store objectForKey:NAMES_screenParams]; + NSObject *obj = [store objectForKey:SDLNameScreenParams]; if (obj == nil || [obj isKindOfClass:SDLScreenParams.class]) { return (SDLScreenParams *)obj; } else { - return [[SDLScreenParams alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLScreenParams alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setNumCustomPresetsAvailable:(NSNumber *)numCustomPresetsAvailable { if (numCustomPresetsAvailable != nil) { - [store setObject:numCustomPresetsAvailable forKey:NAMES_numCustomPresetsAvailable]; + [store setObject:numCustomPresetsAvailable forKey:SDLNameNumberCustomPresetsAvailable]; } else { - [store removeObjectForKey:NAMES_numCustomPresetsAvailable]; + [store removeObjectForKey:SDLNameNumberCustomPresetsAvailable]; } } - (NSNumber *)numCustomPresetsAvailable { - return [store objectForKey:NAMES_numCustomPresetsAvailable]; + return [store objectForKey:SDLNameNumberCustomPresetsAvailable]; } @end diff --git a/SmartDeviceLink/SDLECallInfo.h b/SmartDeviceLink/SDLECallInfo.h index c7128075f..d0443d3dd 100644 --- a/SmartDeviceLink/SDLECallInfo.h +++ b/SmartDeviceLink/SDLECallInfo.h @@ -7,11 +7,7 @@ #import "SDLVehicleDataNotificationStatus.h" -@interface SDLECallInfo : SDLRPCStruct { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLECallInfo : SDLRPCStruct @property (strong) SDLVehicleDataNotificationStatus eCallNotificationStatus; @property (strong) SDLVehicleDataNotificationStatus auxECallNotificationStatus; diff --git a/SmartDeviceLink/SDLECallInfo.m b/SmartDeviceLink/SDLECallInfo.m index 0f679ba5e..62e7cb939 100644 --- a/SmartDeviceLink/SDLECallInfo.m +++ b/SmartDeviceLink/SDLECallInfo.m @@ -8,54 +8,42 @@ @implementation SDLECallInfo -- (instancetype)init { - if (self = [super init]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setECallNotificationStatus:(SDLVehicleDataNotificationStatus)eCallNotificationStatus { if (eCallNotificationStatus != nil) { - [store setObject:eCallNotificationStatus forKey:NAMES_eCallNotificationStatus]; + [store setObject:eCallNotificationStatus forKey:SDLNameECallNotificationStatus]; } else { - [store removeObjectForKey:NAMES_eCallNotificationStatus]; + [store removeObjectForKey:SDLNameECallNotificationStatus]; } } - (SDLVehicleDataNotificationStatus)eCallNotificationStatus { - NSObject *obj = [store objectForKey:NAMES_eCallNotificationStatus]; + NSObject *obj = [store objectForKey:SDLNameECallNotificationStatus]; return (SDLVehicleDataNotificationStatus)obj; } - (void)setAuxECallNotificationStatus:(SDLVehicleDataNotificationStatus)auxECallNotificationStatus { if (auxECallNotificationStatus != nil) { - [store setObject:auxECallNotificationStatus forKey:NAMES_auxECallNotificationStatus]; + [store setObject:auxECallNotificationStatus forKey:SDLNameAuxECallNotificationStatus]; } else { - [store removeObjectForKey:NAMES_auxECallNotificationStatus]; + [store removeObjectForKey:SDLNameAuxECallNotificationStatus]; } } - (SDLVehicleDataNotificationStatus)auxECallNotificationStatus { - NSObject *obj = [store objectForKey:NAMES_auxECallNotificationStatus]; + NSObject *obj = [store objectForKey:SDLNameAuxECallNotificationStatus]; return (SDLVehicleDataNotificationStatus)obj; } - (void)setECallConfirmationStatus:(SDLECallConfirmationStatus)eCallConfirmationStatus { if (eCallConfirmationStatus != nil) { - [store setObject:eCallConfirmationStatus forKey:NAMES_eCallConfirmationStatus]; + [store setObject:eCallConfirmationStatus forKey:SDLNameECallConfirmationStatus]; } else { - [store removeObjectForKey:NAMES_eCallConfirmationStatus]; + [store removeObjectForKey:SDLNameECallConfirmationStatus]; } } - (SDLECallConfirmationStatus)eCallConfirmationStatus { - NSObject *obj = [store objectForKey:NAMES_eCallConfirmationStatus]; + NSObject *obj = [store objectForKey:SDLNameECallConfirmationStatus]; return (SDLECallConfirmationStatus)obj; } diff --git a/SmartDeviceLink/SDLEmergencyEvent.h b/SmartDeviceLink/SDLEmergencyEvent.h index 6ee02f7ab..088abd774 100644 --- a/SmartDeviceLink/SDLEmergencyEvent.h +++ b/SmartDeviceLink/SDLEmergencyEvent.h @@ -8,11 +8,7 @@ #import "SDLVehicleDataEventStatus.h" -@interface SDLEmergencyEvent : SDLRPCStruct { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLEmergencyEvent : SDLRPCStruct @property (strong) SDLEmergencyEventType emergencyEventType; @property (strong) SDLFuelCutoffStatus fuelCutoffStatus; diff --git a/SmartDeviceLink/SDLEmergencyEvent.m b/SmartDeviceLink/SDLEmergencyEvent.m index ea58a2029..5a4eb3812 100644 --- a/SmartDeviceLink/SDLEmergencyEvent.m +++ b/SmartDeviceLink/SDLEmergencyEvent.m @@ -7,79 +7,67 @@ @implementation SDLEmergencyEvent -- (instancetype)init { - if (self = [super init]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setEmergencyEventType:(SDLEmergencyEventType)emergencyEventType { if (emergencyEventType != nil) { - [store setObject:emergencyEventType forKey:NAMES_emergencyEventType]; + [store setObject:emergencyEventType forKey:SDLNameEmergencyEventType]; } else { - [store removeObjectForKey:NAMES_emergencyEventType]; + [store removeObjectForKey:SDLNameEmergencyEventType]; } } - (SDLEmergencyEventType)emergencyEventType { - NSObject *obj = [store objectForKey:NAMES_emergencyEventType]; + NSObject *obj = [store objectForKey:SDLNameEmergencyEventType]; return (SDLEmergencyEventType)obj; } - (void)setFuelCutoffStatus:(SDLFuelCutoffStatus)fuelCutoffStatus { if (fuelCutoffStatus != nil) { - [store setObject:fuelCutoffStatus forKey:NAMES_fuelCutoffStatus]; + [store setObject:fuelCutoffStatus forKey:SDLNameFuelCutoffStatus]; } else { - [store removeObjectForKey:NAMES_fuelCutoffStatus]; + [store removeObjectForKey:SDLNameFuelCutoffStatus]; } } - (SDLFuelCutoffStatus)fuelCutoffStatus { - NSObject *obj = [store objectForKey:NAMES_fuelCutoffStatus]; + NSObject *obj = [store objectForKey:SDLNameFuelCutoffStatus]; return (SDLFuelCutoffStatus)obj; } - (void)setRolloverEvent:(SDLVehicleDataEventStatus)rolloverEvent { if (rolloverEvent != nil) { - [store setObject:rolloverEvent forKey:NAMES_rolloverEvent]; + [store setObject:rolloverEvent forKey:SDLNameRolloverEvent]; } else { - [store removeObjectForKey:NAMES_rolloverEvent]; + [store removeObjectForKey:SDLNameRolloverEvent]; } } - (SDLVehicleDataEventStatus)rolloverEvent { - NSObject *obj = [store objectForKey:NAMES_rolloverEvent]; + NSObject *obj = [store objectForKey:SDLNameRolloverEvent]; return (SDLVehicleDataEventStatus)obj; } - (void)setMaximumChangeVelocity:(NSNumber *)maximumChangeVelocity { if (maximumChangeVelocity != nil) { - [store setObject:maximumChangeVelocity forKey:NAMES_maximumChangeVelocity]; + [store setObject:maximumChangeVelocity forKey:SDLNameMaximumChangeVelocity]; } else { - [store removeObjectForKey:NAMES_maximumChangeVelocity]; + [store removeObjectForKey:SDLNameMaximumChangeVelocity]; } } - (NSNumber *)maximumChangeVelocity { - return [store objectForKey:NAMES_maximumChangeVelocity]; + return [store objectForKey:SDLNameMaximumChangeVelocity]; } - (void)setMultipleEvents:(SDLVehicleDataEventStatus)multipleEvents { if (multipleEvents != nil) { - [store setObject:multipleEvents forKey:NAMES_multipleEvents]; + [store setObject:multipleEvents forKey:SDLNameMultipleEvents]; } else { - [store removeObjectForKey:NAMES_multipleEvents]; + [store removeObjectForKey:SDLNameMultipleEvents]; } } - (SDLVehicleDataEventStatus)multipleEvents { - NSObject *obj = [store objectForKey:NAMES_multipleEvents]; + NSObject *obj = [store objectForKey:SDLNameMultipleEvents]; return (SDLVehicleDataEventStatus)obj; } diff --git a/SmartDeviceLink/SDLEncodedSyncPData.h b/SmartDeviceLink/SDLEncodedSyncPData.h index b3b0276b7..d239655c6 100644 --- a/SmartDeviceLink/SDLEncodedSyncPData.h +++ b/SmartDeviceLink/SDLEncodedSyncPData.h @@ -4,11 +4,7 @@ #import "SDLRPCRequest.h" -@interface SDLEncodedSyncPData : SDLRPCRequest { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLEncodedSyncPData : SDLRPCRequest @property (strong) NSMutableArray *data; diff --git a/SmartDeviceLink/SDLEncodedSyncPData.m b/SmartDeviceLink/SDLEncodedSyncPData.m index b44cb7b3e..df147f79f 100644 --- a/SmartDeviceLink/SDLEncodedSyncPData.m +++ b/SmartDeviceLink/SDLEncodedSyncPData.m @@ -9,27 +9,21 @@ @implementation SDLEncodedSyncPData - (instancetype)init { - if (self = [super initWithName:NAMES_EncodedSyncPData]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameEncodedSyncPData]) { } return self; } - (void)setData:(NSMutableArray *)data { if (data != nil) { - [parameters setObject:data forKey:NAMES_data]; + [parameters setObject:data forKey:SDLNameData]; } else { - [parameters removeObjectForKey:NAMES_data]; + [parameters removeObjectForKey:SDLNameData]; } } - (NSMutableArray *)data { - return [parameters objectForKey:NAMES_data]; + return [parameters objectForKey:SDLNameData]; } @end diff --git a/SmartDeviceLink/SDLEncodedSyncPDataResponse.h b/SmartDeviceLink/SDLEncodedSyncPDataResponse.h index 7d646ed23..ff1dec1ac 100644 --- a/SmartDeviceLink/SDLEncodedSyncPDataResponse.h +++ b/SmartDeviceLink/SDLEncodedSyncPDataResponse.h @@ -4,10 +4,6 @@ #import "SDLRPCResponse.h" -@interface SDLEncodedSyncPDataResponse : SDLRPCResponse { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLEncodedSyncPDataResponse : SDLRPCResponse @end diff --git a/SmartDeviceLink/SDLEncodedSyncPDataResponse.m b/SmartDeviceLink/SDLEncodedSyncPDataResponse.m index cf899a21b..d469e1bfa 100644 --- a/SmartDeviceLink/SDLEncodedSyncPDataResponse.m +++ b/SmartDeviceLink/SDLEncodedSyncPDataResponse.m @@ -9,13 +9,7 @@ @implementation SDLEncodedSyncPDataResponse - (instancetype)init { - if (self = [super initWithName:NAMES_EncodedSyncPData]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameEncodedSyncPData]) { } return self; } diff --git a/SmartDeviceLink/SDLEncoder.h b/SmartDeviceLink/SDLEncoder.h deleted file mode 100644 index 911eb95d8..000000000 --- a/SmartDeviceLink/SDLEncoder.h +++ /dev/null @@ -1,11 +0,0 @@ -// SDLEncoder.h -// - - -#import <Foundation/Foundation.h> - -@protocol SDLEncoder <NSObject> - -- (NSData *)encodeDictionary:(NSDictionary *)dict; - -@end diff --git a/SmartDeviceLink/SDLEndAudioPassThru.h b/SmartDeviceLink/SDLEndAudioPassThru.h index fddde6c13..6c5d82914 100644 --- a/SmartDeviceLink/SDLEndAudioPassThru.h +++ b/SmartDeviceLink/SDLEndAudioPassThru.h @@ -14,20 +14,6 @@ * Since <b>SmartDeviceLink 2.0</b><br> * see SDLPerformAudioPassThru */ -@interface SDLEndAudioPassThru : SDLRPCRequest { -} - -/** - * Constructs a new SDLEndAudioPassThru object - */ -- (instancetype)init; -/** - * Constructs a new SDLEndAudioPassThru object indicated by the NSMutableDictionary - * parameter - * <p> - * - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLEndAudioPassThru : SDLRPCRequest @end diff --git a/SmartDeviceLink/SDLEndAudioPassThru.m b/SmartDeviceLink/SDLEndAudioPassThru.m index 576287170..8045a6a98 100644 --- a/SmartDeviceLink/SDLEndAudioPassThru.m +++ b/SmartDeviceLink/SDLEndAudioPassThru.m @@ -9,13 +9,7 @@ @implementation SDLEndAudioPassThru - (instancetype)init { - if (self = [super initWithName:NAMES_EndAudioPassThru]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameEndAudioPassThru]) { } return self; } diff --git a/SmartDeviceLink/SDLEndAudioPassThruResponse.h b/SmartDeviceLink/SDLEndAudioPassThruResponse.h index e464f5d32..1e976a6f8 100644 --- a/SmartDeviceLink/SDLEndAudioPassThruResponse.h +++ b/SmartDeviceLink/SDLEndAudioPassThruResponse.h @@ -9,10 +9,6 @@ * * Since <b>SmartDeviceLink 2.0</b> */ -@interface SDLEndAudioPassThruResponse : SDLRPCResponse { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLEndAudioPassThruResponse : SDLRPCResponse @end diff --git a/SmartDeviceLink/SDLEndAudioPassThruResponse.m b/SmartDeviceLink/SDLEndAudioPassThruResponse.m index 73c3b6336..9cad307ec 100644 --- a/SmartDeviceLink/SDLEndAudioPassThruResponse.m +++ b/SmartDeviceLink/SDLEndAudioPassThruResponse.m @@ -9,13 +9,7 @@ @implementation SDLEndAudioPassThruResponse - (instancetype)init { - if (self = [super initWithName:NAMES_EndAudioPassThru]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameEndAudioPassThru]) { } return self; } diff --git a/SmartDeviceLink/SDLFunctionID.h b/SmartDeviceLink/SDLFunctionID.h index 8bbd1a52a..c9cd4afb7 100644 --- a/SmartDeviceLink/SDLFunctionID.h +++ b/SmartDeviceLink/SDLFunctionID.h @@ -4,12 +4,13 @@ #import <Foundation/Foundation.h> +#import "SDLNames.h" -@interface SDLFunctionID : NSObject { - NSDictionary *functionIDs; -} +@interface SDLFunctionID : NSObject -- (NSString *)getFunctionName:(int)functionID; -- (NSNumber *)getFunctionID:(NSString *)functionName; ++ (instancetype)sharedInstance; + +- (SDLName)functionNameForId:(int)functionID; +- (NSNumber *)functionIdForName:(SDLName)functionName; @end diff --git a/SmartDeviceLink/SDLFunctionID.m b/SmartDeviceLink/SDLFunctionID.m index 802ee3df3..f03826df4 100644 --- a/SmartDeviceLink/SDLFunctionID.m +++ b/SmartDeviceLink/SDLFunctionID.m @@ -4,36 +4,98 @@ #import "SDLFunctionID.h" -#import "SDLNames.h" +@interface SDLFunctionID () + +@property (nonatomic, strong, nonnull) NSDictionary* functionIds; + +@end @implementation SDLFunctionID ++ (instancetype)sharedInstance { + static SDLFunctionID* functionId = nil; + static dispatch_once_t onceToken; + dispatch_once(&onceToken, ^{ + functionId = [[SDLFunctionID alloc] init]; + }); + return functionId; +} + - (instancetype)init { if (self = [super init]) { - functionIDs = [NSDictionary dictionaryWithObjectsAndKeys: - NAMES_reserved, @"0", NAMES_RegisterAppInterface, @"1", NAMES_UnregisterAppInterface, @"2", NAMES_SetGlobalProperties, @"3", NAMES_ResetGlobalProperties, @"4", NAMES_AddCommand, @"5", NAMES_DeleteCommand, @"6", NAMES_AddSubMenu, @"7", NAMES_DeleteSubMenu, @"8", NAMES_CreateInteractionChoiceSet, @"9", NAMES_PerformInteraction, @"10", NAMES_DeleteInteractionChoiceSet, @"11", NAMES_Alert, @"12", NAMES_Show, @"13", NAMES_Speak, @"14", NAMES_SetMediaClockTimer, @"15", NAMES_PerformAudioPassThru, @"16", NAMES_EndAudioPassThru, @"17", NAMES_SubscribeButton, @"18", NAMES_UnsubscribeButton, @"19", NAMES_SubscribeVehicleData, @"20", NAMES_UnsubscribeVehicleData, @"21", NAMES_GetVehicleData, @"22", NAMES_ReadDID, @"23", NAMES_GetDTCs, @"24", NAMES_ScrollableMessage, @"25", NAMES_Slider, @"26", NAMES_ShowConstantTBT, @"27", NAMES_AlertManeuver, @"28", NAMES_UpdateTurnList, @"29", NAMES_ChangeRegistration, @"30", NAMES_GenericResponse, @"31", NAMES_PutFile, @"32", NAMES_DeleteFile, @"33", NAMES_ListFiles, @"34", NAMES_SetAppIcon, @"35", NAMES_SetDisplayLayout, @"36", NAMES_DiagnosticMessage, @"37", NAMES_SystemRequest, @"38", NAMES_SendLocation, @"39", NAMES_DialNumber, @"40", NAMES_OnHMIStatus, @"32768", NAMES_OnAppInterfaceUnregistered, @"32769", NAMES_OnButtonEvent, @"32770", NAMES_OnButtonPress, @"32771", NAMES_OnVehicleData, @"32772", NAMES_OnCommand, @"32773", NAMES_OnTBTClientState, @"32774", NAMES_OnDriverDistraction, @"32775", NAMES_OnPermissionsChange, @"32776", NAMES_OnAudioPassThru, @"32777", NAMES_OnLanguageChange, @"32778", NAMES_OnKeyboardInput, @"32779", NAMES_OnTouchEvent, @"32780", NAMES_OnSystemRequest, @"32781", NAMES_OnHashChange, @"32782", - - NAMES_EncodedSyncPData, - @"65536", - NAMES_SyncPData, - @"65537", - - NAMES_OnEncodedSyncPData, - @"98304", - NAMES_OnSyncPData, - @"98305", - nil]; + self.functionIds = @{ + @0: SDLNameReserved, + @1: SDLNameRegisterAppInterface, + @2: SDLNameUnregisterAppInterface, + @3: SDLNameSetGlobalProperties, + @4: SDLNameResetGlobalProperties, + @5: SDLNameAddCommand, + @6: SDLNameDeleteCommand, + @7: SDLNameAddSubMenu, + @8: SDLNameDeleteSubMenu, + @9: SDLNameCreateInteractionChoiceSet, + @10: SDLNamePerformInteraction, + @11: SDLNameDeleteInteractionChoiceSet, + @12: SDLNameAlert, + @13: SDLNameShow, + @14: SDLNameSpeak, + @15: SDLNameSetMediaClockTimer, + @16: SDLNamePerformAudioPassThru, + @17: SDLNameEndAudioPassThru, + @18: SDLNameSubscribeButton, + @19: SDLNameUnsubscribeButton, + @20: SDLNameSubscribeVehicleData, + @21: SDLNameUnsubscribeVehicleData, + @22: SDLNameGetVehicleData, + @23: SDLNameReadDID, + @24: SDLNameGetDTCs, + @25: SDLNameScrollableMessage, + @26: SDLNameSlider, + @27: SDLNameShowConstantTBT, + @28: SDLNameAlertManeuver, + @29: SDLNameUpdateTurnList, + @30: SDLNameChangeRegistration, + @31: SDLNameGenericResponse, + @32: SDLNamePutFile, + @33: SDLNameDeleteFile, + @34: SDLNameListFiles, + @35: SDLNameSetAppIcon, + @36: SDLNameSetDisplayLayout, + @37: SDLNameDiagnosticMessage, + @38: SDLNameSystemRequest, + @39: SDLNameSendLocation, + @40: SDLNameDialNumber, + @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, + @65536: SDLNameEncodedSyncPData, + @65537: SDLNameSyncPData, + @98304: SDLNameOnEncodedSyncPData, + @98305: SDLNameOnSyncPData + }; } return self; } -- (NSString *)getFunctionName:(int)functionID { - return [functionIDs objectForKey:[NSString stringWithFormat:@"%d", functionID]]; +- (SDLName)functionNameForId:(int)functionID { + return self.functionIds[@(functionID)]; } -- (NSNumber *)getFunctionID:(NSString *)functionName { - return [NSNumber numberWithInt:[[[functionIDs allKeysForObject:functionName] objectAtIndex:0] intValue]]; +- (NSNumber *)functionIdForName:(SDLName)functionName { + return [[self.functionIds allKeysForObject:functionName] firstObject]; } diff --git a/SmartDeviceLink/SDLGPSData.h b/SmartDeviceLink/SDLGPSData.h index 26ed06986..34d1d8c28 100644 --- a/SmartDeviceLink/SDLGPSData.h +++ b/SmartDeviceLink/SDLGPSData.h @@ -12,19 +12,7 @@ * * @since SDL 2.0 */ -@interface SDLGPSData : SDLRPCStruct { -} - -/** - * Constructs a newly allocated SDLGPSData object - */ -- (instancetype)init; - -/** - * Constructs a newly allocated SDLGPSData object indicated by the dictionary parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLGPSData : SDLRPCStruct /** * @abstract longitude degrees diff --git a/SmartDeviceLink/SDLGPSData.m b/SmartDeviceLink/SDLGPSData.m index d84ac9aa5..345df1695 100644 --- a/SmartDeviceLink/SDLGPSData.m +++ b/SmartDeviceLink/SDLGPSData.m @@ -5,237 +5,224 @@ #import "SDLNames.h" - @implementation SDLGPSData -- (instancetype)init { - if (self = [super init]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setLongitudeDegrees:(NSNumber *)longitudeDegrees { if (longitudeDegrees != nil) { - [store setObject:longitudeDegrees forKey:NAMES_longitudeDegrees]; + [store setObject:longitudeDegrees forKey:SDLNameLongitudeDegrees]; } else { - [store removeObjectForKey:NAMES_longitudeDegrees]; + [store removeObjectForKey:SDLNameLongitudeDegrees]; } } - (NSNumber *)longitudeDegrees { - return [store objectForKey:NAMES_longitudeDegrees]; + return [store objectForKey:SDLNameLongitudeDegrees]; } - (void)setLatitudeDegrees:(NSNumber *)latitudeDegrees { if (latitudeDegrees != nil) { - [store setObject:latitudeDegrees forKey:NAMES_latitudeDegrees]; + [store setObject:latitudeDegrees forKey:SDLNameLatitudeDegrees]; } else { - [store removeObjectForKey:NAMES_latitudeDegrees]; + [store removeObjectForKey:SDLNameLatitudeDegrees]; } } - (NSNumber *)latitudeDegrees { - return [store objectForKey:NAMES_latitudeDegrees]; + return [store objectForKey:SDLNameLatitudeDegrees]; } - (void)setUtcYear:(NSNumber *)utcYear { if (utcYear != nil) { - [store setObject:utcYear forKey:NAMES_utcYear]; + [store setObject:utcYear forKey:SDLNameUTCYear]; } else { - [store removeObjectForKey:NAMES_utcYear]; + [store removeObjectForKey:SDLNameUTCYear]; } } - (NSNumber *)utcYear { - return [store objectForKey:NAMES_utcYear]; + return [store objectForKey:SDLNameUTCYear]; } - (void)setUtcMonth:(NSNumber *)utcMonth { if (utcMonth != nil) { - [store setObject:utcMonth forKey:NAMES_utcMonth]; + [store setObject:utcMonth forKey:SDLNameUTCMonth]; } else { - [store removeObjectForKey:NAMES_utcMonth]; + [store removeObjectForKey:SDLNameUTCMonth]; } } - (NSNumber *)utcMonth { - return [store objectForKey:NAMES_utcMonth]; + return [store objectForKey:SDLNameUTCMonth]; } - (void)setUtcDay:(NSNumber *)utcDay { if (utcDay != nil) { - [store setObject:utcDay forKey:NAMES_utcDay]; + [store setObject:utcDay forKey:SDLNameUTCDay]; } else { - [store removeObjectForKey:NAMES_utcDay]; + [store removeObjectForKey:SDLNameUTCDay]; } } - (NSNumber *)utcDay { - return [store objectForKey:NAMES_utcDay]; + return [store objectForKey:SDLNameUTCDay]; } - (void)setUtcHours:(NSNumber *)utcHours { if (utcHours != nil) { - [store setObject:utcHours forKey:NAMES_utcHours]; + [store setObject:utcHours forKey:SDLNameUTCHours]; } else { - [store removeObjectForKey:NAMES_utcHours]; + [store removeObjectForKey:SDLNameUTCHours]; } } - (NSNumber *)utcHours { - return [store objectForKey:NAMES_utcHours]; + return [store objectForKey:SDLNameUTCHours]; } - (void)setUtcMinutes:(NSNumber *)utcMinutes { if (utcMinutes != nil) { - [store setObject:utcMinutes forKey:NAMES_utcMinutes]; + [store setObject:utcMinutes forKey:SDLNameUTCMinutes]; } else { - [store removeObjectForKey:NAMES_utcMinutes]; + [store removeObjectForKey:SDLNameUTCMinutes]; } } - (NSNumber *)utcMinutes { - return [store objectForKey:NAMES_utcMinutes]; + return [store objectForKey:SDLNameUTCMinutes]; } - (void)setUtcSeconds:(NSNumber *)utcSeconds { if (utcSeconds != nil) { - [store setObject:utcSeconds forKey:NAMES_utcSeconds]; + [store setObject:utcSeconds forKey:SDLNameUTCSeconds]; } else { - [store removeObjectForKey:NAMES_utcSeconds]; + [store removeObjectForKey:SDLNameUTCSeconds]; } } - (NSNumber *)utcSeconds { - return [store objectForKey:NAMES_utcSeconds]; + return [store objectForKey:SDLNameUTCSeconds]; } - (void)setCompassDirection:(SDLCompassDirection)compassDirection { if (compassDirection != nil) { - [store setObject:compassDirection forKey:NAMES_compassDirection]; + [store setObject:compassDirection forKey:SDLNameCompassDirection]; } else { - [store removeObjectForKey:NAMES_compassDirection]; + [store removeObjectForKey:SDLNameCompassDirection]; } } - (SDLCompassDirection)compassDirection { - NSObject *obj = [store objectForKey:NAMES_compassDirection]; + NSObject *obj = [store objectForKey:SDLNameCompassDirection]; return (SDLCompassDirection)obj; } - (void)setPdop:(NSNumber *)pdop { if (pdop != nil) { - [store setObject:pdop forKey:NAMES_pdop]; + [store setObject:pdop forKey:SDLNamePDOP]; } else { - [store removeObjectForKey:NAMES_pdop]; + [store removeObjectForKey:SDLNamePDOP]; } } - (NSNumber *)pdop { - return [store objectForKey:NAMES_pdop]; + return [store objectForKey:SDLNamePDOP]; } - (void)setHdop:(NSNumber *)hdop { if (hdop != nil) { - [store setObject:hdop forKey:NAMES_hdop]; + [store setObject:hdop forKey:SDLNameHDOP]; } else { - [store removeObjectForKey:NAMES_hdop]; + [store removeObjectForKey:SDLNameHDOP]; } } - (NSNumber *)hdop { - return [store objectForKey:NAMES_hdop]; + return [store objectForKey:SDLNameHDOP]; } - (void)setVdop:(NSNumber *)vdop { if (vdop != nil) { - [store setObject:vdop forKey:NAMES_vdop]; + [store setObject:vdop forKey:SDLNameVDOP]; } else { - [store removeObjectForKey:NAMES_vdop]; + [store removeObjectForKey:SDLNameVDOP]; } } - (NSNumber *)vdop { - return [store objectForKey:NAMES_vdop]; + return [store objectForKey:SDLNameVDOP]; } - (void)setActual:(NSNumber *)actual { if (actual != nil) { - [store setObject:actual forKey:NAMES_actual]; + [store setObject:actual forKey:SDLNameActual]; } else { - [store removeObjectForKey:NAMES_actual]; + [store removeObjectForKey:SDLNameActual]; } } - (NSNumber *)actual { - return [store objectForKey:NAMES_actual]; + return [store objectForKey:SDLNameActual]; } - (void)setSatellites:(NSNumber *)satellites { if (satellites != nil) { - [store setObject:satellites forKey:NAMES_satellites]; + [store setObject:satellites forKey:SDLNameSatellites]; } else { - [store removeObjectForKey:NAMES_satellites]; + [store removeObjectForKey:SDLNameSatellites]; } } - (NSNumber *)satellites { - return [store objectForKey:NAMES_satellites]; + return [store objectForKey:SDLNameSatellites]; } - (void)setDimension:(SDLDimension)dimension { if (dimension != nil) { - [store setObject:dimension forKey:NAMES_dimension]; + [store setObject:dimension forKey:SDLNameDimension]; } else { - [store removeObjectForKey:NAMES_dimension]; + [store removeObjectForKey:SDLNameDimension]; } } - (SDLDimension)dimension { - NSObject *obj = [store objectForKey:NAMES_dimension]; + NSObject *obj = [store objectForKey:SDLNameDimension]; return (SDLDimension)obj; } - (void)setAltitude:(NSNumber *)altitude { if (altitude != nil) { - [store setObject:altitude forKey:NAMES_altitude]; + [store setObject:altitude forKey:SDLNameAltitude]; } else { - [store removeObjectForKey:NAMES_altitude]; + [store removeObjectForKey:SDLNameAltitude]; } } - (NSNumber *)altitude { - return [store objectForKey:NAMES_altitude]; + return [store objectForKey:SDLNameAltitude]; } - (void)setHeading:(NSNumber *)heading { if (heading != nil) { - [store setObject:heading forKey:NAMES_heading]; + [store setObject:heading forKey:SDLNameHeading]; } else { - [store removeObjectForKey:NAMES_heading]; + [store removeObjectForKey:SDLNameHeading]; } } - (NSNumber *)heading { - return [store objectForKey:NAMES_heading]; + return [store objectForKey:SDLNameHeading]; } - (void)setSpeed:(NSNumber *)speed { if (speed != nil) { - [store setObject:speed forKey:NAMES_speed]; + [store setObject:speed forKey:SDLNameSpeed]; } else { - [store removeObjectForKey:NAMES_speed]; + [store removeObjectForKey:SDLNameSpeed]; } } - (NSNumber *)speed { - return [store objectForKey:NAMES_speed]; + return [store objectForKey:SDLNameSpeed]; } @end diff --git a/SmartDeviceLink/SDLGenericResponse.h b/SmartDeviceLink/SDLGenericResponse.h index 4d339fb64..61e1f2c8d 100644 --- a/SmartDeviceLink/SDLGenericResponse.h +++ b/SmartDeviceLink/SDLGenericResponse.h @@ -9,10 +9,6 @@ * retrieved. Only used in case of an error. Currently, only resultCode * INVALID_DATA is used. */ -@interface SDLGenericResponse : SDLRPCResponse { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLGenericResponse : SDLRPCResponse @end diff --git a/SmartDeviceLink/SDLGenericResponse.m b/SmartDeviceLink/SDLGenericResponse.m index aff982d8f..a6a0a8ee9 100644 --- a/SmartDeviceLink/SDLGenericResponse.m +++ b/SmartDeviceLink/SDLGenericResponse.m @@ -9,13 +9,7 @@ @implementation SDLGenericResponse - (instancetype)init { - if (self = [super initWithName:NAMES_GenericResponse]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameGenericResponse]) { } return self; } diff --git a/SmartDeviceLink/SDLGetDTCs.h b/SmartDeviceLink/SDLGetDTCs.h index 3d38a0079..67367dae2 100644 --- a/SmartDeviceLink/SDLGetDTCs.h +++ b/SmartDeviceLink/SDLGetDTCs.h @@ -13,19 +13,8 @@ * <b>HMILevel needs to be FULL, LIMITED or BACKGROUND</b> * <p> */ -@interface SDLGetDTCs : SDLRPCRequest { -} -/** - * Constructs a new SDLGetDTCs object - */ -- (instancetype)init; -/** - * Constructs a new SDLGetDTCs object indicated by the dictionary parameter - * <p> - * - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLGetDTCs : SDLRPCRequest + /** * @abstract a name of the module to receive the DTC form * @discussion an NSNumber value representing a name of the module to receive diff --git a/SmartDeviceLink/SDLGetDTCs.m b/SmartDeviceLink/SDLGetDTCs.m index cf7db88e5..58db2e529 100644 --- a/SmartDeviceLink/SDLGetDTCs.m +++ b/SmartDeviceLink/SDLGetDTCs.m @@ -9,39 +9,33 @@ @implementation SDLGetDTCs - (instancetype)init { - if (self = [super initWithName:NAMES_GetDTCs]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameGetDTCs]) { } return self; } - (void)setEcuName:(NSNumber *)ecuName { if (ecuName != nil) { - [parameters setObject:ecuName forKey:NAMES_ecuName]; + [parameters setObject:ecuName forKey:SDLNameECUName]; } else { - [parameters removeObjectForKey:NAMES_ecuName]; + [parameters removeObjectForKey:SDLNameECUName]; } } - (NSNumber *)ecuName { - return [parameters objectForKey:NAMES_ecuName]; + return [parameters objectForKey:SDLNameECUName]; } - (void)setDtcMask:(NSNumber *)dtcMask { if (dtcMask != nil) { - [parameters setObject:dtcMask forKey:NAMES_dtcMask]; + [parameters setObject:dtcMask forKey:SDLNameDTCMask]; } else { - [parameters removeObjectForKey:NAMES_dtcMask]; + [parameters removeObjectForKey:SDLNameDTCMask]; } } - (NSNumber *)dtcMask { - return [parameters objectForKey:NAMES_dtcMask]; + return [parameters objectForKey:SDLNameDTCMask]; } @end diff --git a/SmartDeviceLink/SDLGetDTCsResponse.h b/SmartDeviceLink/SDLGetDTCsResponse.h index 4e0af4a39..c31855228 100644 --- a/SmartDeviceLink/SDLGetDTCsResponse.h +++ b/SmartDeviceLink/SDLGetDTCsResponse.h @@ -9,11 +9,7 @@ * * Since <b>SmartDeviceLink 2.0</b> */ -@interface SDLGetDTCsResponse : SDLRPCResponse { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLGetDTCsResponse : SDLRPCResponse @property (strong) NSNumber *ecuHeader; @property (strong) NSMutableArray *dtc; diff --git a/SmartDeviceLink/SDLGetDTCsResponse.m b/SmartDeviceLink/SDLGetDTCsResponse.m index bbf678a78..17586560d 100644 --- a/SmartDeviceLink/SDLGetDTCsResponse.m +++ b/SmartDeviceLink/SDLGetDTCsResponse.m @@ -9,39 +9,33 @@ @implementation SDLGetDTCsResponse - (instancetype)init { - if (self = [super initWithName:NAMES_GetDTCs]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameGetDTCs]) { } return self; } - (void)setEcuHeader:(NSNumber *)ecuHeader { if (ecuHeader != nil) { - [parameters setObject:ecuHeader forKey:NAMES_ecuHeader]; + [parameters setObject:ecuHeader forKey:SDLNameECUHeader]; } else { - [parameters removeObjectForKey:NAMES_ecuHeader]; + [parameters removeObjectForKey:SDLNameECUHeader]; } } - (NSNumber *)ecuHeader { - return [parameters objectForKey:NAMES_ecuHeader]; + return [parameters objectForKey:SDLNameECUHeader]; } - (void)setDtc:(NSMutableArray *)dtc { if (dtc != nil) { - [parameters setObject:dtc forKey:NAMES_dtc]; + [parameters setObject:dtc forKey:SDLNameDTC]; } else { - [parameters removeObjectForKey:NAMES_dtc]; + [parameters removeObjectForKey:SDLNameDTC]; } } - (NSMutableArray *)dtc { - return [parameters objectForKey:NAMES_dtc]; + return [parameters objectForKey:SDLNameDTC]; } @end diff --git a/SmartDeviceLink/SDLGetVehicleData.h b/SmartDeviceLink/SDLGetVehicleData.h index df2c1923e..b73298e68 100644 --- a/SmartDeviceLink/SDLGetVehicleData.h +++ b/SmartDeviceLink/SDLGetVehicleData.h @@ -15,20 +15,7 @@ * Since SmartDeviceLink 2.0<br/> * See SDLSubscribeVehicleData SDLUnsubscribeVehicleData */ -@interface SDLGetVehicleData : SDLRPCRequest { -} - -/** - * @abstract Constructs a new SDLGetVehicleData object - */ -- (instancetype)init; - -/** - * @abstract Constructs a new SDLGetVehicleData object indicated by the NSMutableDictionary - * parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLGetVehicleData : SDLRPCRequest /** * @abstract A boolean value. If true, requests Gps data @@ -137,4 +124,4 @@ @property (strong) NSNumber *clusterModeStatus; @property (strong) NSNumber *myKey; -@end
\ No newline at end of file +@end diff --git a/SmartDeviceLink/SDLGetVehicleData.m b/SmartDeviceLink/SDLGetVehicleData.m index ab5d59a19..157fdd615 100644 --- a/SmartDeviceLink/SDLGetVehicleData.m +++ b/SmartDeviceLink/SDLGetVehicleData.m @@ -9,315 +9,309 @@ @implementation SDLGetVehicleData - (instancetype)init { - if (self = [super initWithName:NAMES_GetVehicleData]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameGetVehicleData]) { } return self; } - (void)setGps:(NSNumber *)gps { if (gps != nil) { - [parameters setObject:gps forKey:NAMES_gps]; + [parameters setObject:gps forKey:SDLNameGPS]; } else { - [parameters removeObjectForKey:NAMES_gps]; + [parameters removeObjectForKey:SDLNameGPS]; } } - (NSNumber *)gps { - return [parameters objectForKey:NAMES_gps]; + return [parameters objectForKey:SDLNameGPS]; } - (void)setSpeed:(NSNumber *)speed { if (speed != nil) { - [parameters setObject:speed forKey:NAMES_speed]; + [parameters setObject:speed forKey:SDLNameSpeed]; } else { - [parameters removeObjectForKey:NAMES_speed]; + [parameters removeObjectForKey:SDLNameSpeed]; } } - (NSNumber *)speed { - return [parameters objectForKey:NAMES_speed]; + return [parameters objectForKey:SDLNameSpeed]; } - (void)setRpm:(NSNumber *)rpm { if (rpm != nil) { - [parameters setObject:rpm forKey:NAMES_rpm]; + [parameters setObject:rpm forKey:SDLNameRPM]; } else { - [parameters removeObjectForKey:NAMES_rpm]; + [parameters removeObjectForKey:SDLNameRPM]; } } - (NSNumber *)rpm { - return [parameters objectForKey:NAMES_rpm]; + return [parameters objectForKey:SDLNameRPM]; } - (void)setFuelLevel:(NSNumber *)fuelLevel { if (fuelLevel != nil) { - [parameters setObject:fuelLevel forKey:NAMES_fuelLevel]; + [parameters setObject:fuelLevel forKey:SDLNameFuelLevel]; } else { - [parameters removeObjectForKey:NAMES_fuelLevel]; + [parameters removeObjectForKey:SDLNameFuelLevel]; } } - (NSNumber *)fuelLevel { - return [parameters objectForKey:NAMES_fuelLevel]; + return [parameters objectForKey:SDLNameFuelLevel]; } - (void)setFuelLevel_State:(NSNumber *)fuelLevel_State { if (fuelLevel_State != nil) { - [parameters setObject:fuelLevel_State forKey:NAMES_fuelLevel_State]; + [parameters setObject:fuelLevel_State forKey:SDLNameFuelLevelState]; } else { - [parameters removeObjectForKey:NAMES_fuelLevel_State]; + [parameters removeObjectForKey:SDLNameFuelLevelState]; } } - (NSNumber *)fuelLevel_State { - return [parameters objectForKey:NAMES_fuelLevel_State]; + return [parameters objectForKey:SDLNameFuelLevelState]; } - (void)setInstantFuelConsumption:(NSNumber *)instantFuelConsumption { if (instantFuelConsumption != nil) { - [parameters setObject:instantFuelConsumption forKey:NAMES_instantFuelConsumption]; + [parameters setObject:instantFuelConsumption forKey:SDLNameInstantFuelConsumption]; } else { - [parameters removeObjectForKey:NAMES_instantFuelConsumption]; + [parameters removeObjectForKey:SDLNameInstantFuelConsumption]; } } - (NSNumber *)instantFuelConsumption { - return [parameters objectForKey:NAMES_instantFuelConsumption]; + return [parameters objectForKey:SDLNameInstantFuelConsumption]; } - (void)setExternalTemperature:(NSNumber *)externalTemperature { if (externalTemperature != nil) { - [parameters setObject:externalTemperature forKey:NAMES_externalTemperature]; + [parameters setObject:externalTemperature forKey:SDLNameExternalTemperature]; } else { - [parameters removeObjectForKey:NAMES_externalTemperature]; + [parameters removeObjectForKey:SDLNameExternalTemperature]; } } - (NSNumber *)externalTemperature { - return [parameters objectForKey:NAMES_externalTemperature]; + return [parameters objectForKey:SDLNameExternalTemperature]; } - (void)setVin:(NSNumber *)vin { if (vin != nil) { - [parameters setObject:vin forKey:NAMES_vin]; + [parameters setObject:vin forKey:SDLNameVIN]; } else { - [parameters removeObjectForKey:NAMES_vin]; + [parameters removeObjectForKey:SDLNameVIN]; } } - (NSNumber *)vin { - return [parameters objectForKey:NAMES_vin]; + return [parameters objectForKey:SDLNameVIN]; } - (void)setPrndl:(NSNumber *)prndl { if (prndl != nil) { - [parameters setObject:prndl forKey:NAMES_prndl]; + [parameters setObject:prndl forKey:SDLNamePRNDL]; } else { - [parameters removeObjectForKey:NAMES_prndl]; + [parameters removeObjectForKey:SDLNamePRNDL]; } } - (NSNumber *)prndl { - return [parameters objectForKey:NAMES_prndl]; + return [parameters objectForKey:SDLNamePRNDL]; } - (void)setTirePressure:(NSNumber *)tirePressure { if (tirePressure != nil) { - [parameters setObject:tirePressure forKey:NAMES_tirePressure]; + [parameters setObject:tirePressure forKey:SDLNameTirePressure]; } else { - [parameters removeObjectForKey:NAMES_tirePressure]; + [parameters removeObjectForKey:SDLNameTirePressure]; } } - (NSNumber *)tirePressure { - return [parameters objectForKey:NAMES_tirePressure]; + return [parameters objectForKey:SDLNameTirePressure]; } - (void)setOdometer:(NSNumber *)odometer { if (odometer != nil) { - [parameters setObject:odometer forKey:NAMES_odometer]; + [parameters setObject:odometer forKey:SDLNameOdometer]; } else { - [parameters removeObjectForKey:NAMES_odometer]; + [parameters removeObjectForKey:SDLNameOdometer]; } } - (NSNumber *)odometer { - return [parameters objectForKey:NAMES_odometer]; + return [parameters objectForKey:SDLNameOdometer]; } - (void)setBeltStatus:(NSNumber *)beltStatus { if (beltStatus != nil) { - [parameters setObject:beltStatus forKey:NAMES_beltStatus]; + [parameters setObject:beltStatus forKey:SDLNameBeltStatus]; } else { - [parameters removeObjectForKey:NAMES_beltStatus]; + [parameters removeObjectForKey:SDLNameBeltStatus]; } } - (NSNumber *)beltStatus { - return [parameters objectForKey:NAMES_beltStatus]; + return [parameters objectForKey:SDLNameBeltStatus]; } - (void)setBodyInformation:(NSNumber *)bodyInformation { if (bodyInformation != nil) { - [parameters setObject:bodyInformation forKey:NAMES_bodyInformation]; + [parameters setObject:bodyInformation forKey:SDLNameBodyInformation]; } else { - [parameters removeObjectForKey:NAMES_bodyInformation]; + [parameters removeObjectForKey:SDLNameBodyInformation]; } } - (NSNumber *)bodyInformation { - return [parameters objectForKey:NAMES_bodyInformation]; + return [parameters objectForKey:SDLNameBodyInformation]; } - (void)setDeviceStatus:(NSNumber *)deviceStatus { if (deviceStatus != nil) { - [parameters setObject:deviceStatus forKey:NAMES_deviceStatus]; + [parameters setObject:deviceStatus forKey:SDLNameDeviceStatus]; } else { - [parameters removeObjectForKey:NAMES_deviceStatus]; + [parameters removeObjectForKey:SDLNameDeviceStatus]; } } - (NSNumber *)deviceStatus { - return [parameters objectForKey:NAMES_deviceStatus]; + return [parameters objectForKey:SDLNameDeviceStatus]; } - (void)setDriverBraking:(NSNumber *)driverBraking { if (driverBraking != nil) { - [parameters setObject:driverBraking forKey:NAMES_driverBraking]; + [parameters setObject:driverBraking forKey:SDLNameDriverBraking]; } else { - [parameters removeObjectForKey:NAMES_driverBraking]; + [parameters removeObjectForKey:SDLNameDriverBraking]; } } - (NSNumber *)driverBraking { - return [parameters objectForKey:NAMES_driverBraking]; + return [parameters objectForKey:SDLNameDriverBraking]; } - (void)setWiperStatus:(NSNumber *)wiperStatus { if (wiperStatus != nil) { - [parameters setObject:wiperStatus forKey:NAMES_wiperStatus]; + [parameters setObject:wiperStatus forKey:SDLNameWiperStatus]; } else { - [parameters removeObjectForKey:NAMES_wiperStatus]; + [parameters removeObjectForKey:SDLNameWiperStatus]; } } - (NSNumber *)wiperStatus { - return [parameters objectForKey:NAMES_wiperStatus]; + return [parameters objectForKey:SDLNameWiperStatus]; } - (void)setHeadLampStatus:(NSNumber *)headLampStatus { if (headLampStatus != nil) { - [parameters setObject:headLampStatus forKey:NAMES_headLampStatus]; + [parameters setObject:headLampStatus forKey:SDLNameHeadLampStatus]; } else { - [parameters removeObjectForKey:NAMES_headLampStatus]; + [parameters removeObjectForKey:SDLNameHeadLampStatus]; } } - (NSNumber *)headLampStatus { - return [parameters objectForKey:NAMES_headLampStatus]; + return [parameters objectForKey:SDLNameHeadLampStatus]; } - (void)setEngineTorque:(NSNumber *)engineTorque { if (engineTorque != nil) { - [parameters setObject:engineTorque forKey:NAMES_engineTorque]; + [parameters setObject:engineTorque forKey:SDLNameEngineTorque]; } else { - [parameters removeObjectForKey:NAMES_engineTorque]; + [parameters removeObjectForKey:SDLNameEngineTorque]; } } - (NSNumber *)engineTorque { - return [parameters objectForKey:NAMES_engineTorque]; + return [parameters objectForKey:SDLNameEngineTorque]; } - (void)setAccPedalPosition:(NSNumber *)accPedalPosition { if (accPedalPosition != nil) { - [parameters setObject:accPedalPosition forKey:NAMES_accPedalPosition]; + [parameters setObject:accPedalPosition forKey:SDLNameAccelerationPedalPosition]; } else { - [parameters removeObjectForKey:NAMES_accPedalPosition]; + [parameters removeObjectForKey:SDLNameAccelerationPedalPosition]; } } - (NSNumber *)accPedalPosition { - return [parameters objectForKey:NAMES_accPedalPosition]; + return [parameters objectForKey:SDLNameAccelerationPedalPosition]; } - (void)setSteeringWheelAngle:(NSNumber *)steeringWheelAngle { if (steeringWheelAngle != nil) { - [parameters setObject:steeringWheelAngle forKey:NAMES_steeringWheelAngle]; + [parameters setObject:steeringWheelAngle forKey:SDLNameSteeringWheelAngle]; } else { - [parameters removeObjectForKey:NAMES_steeringWheelAngle]; + [parameters removeObjectForKey:SDLNameSteeringWheelAngle]; } } - (NSNumber *)steeringWheelAngle { - return [parameters objectForKey:NAMES_steeringWheelAngle]; + return [parameters objectForKey:SDLNameSteeringWheelAngle]; } - (void)setECallInfo:(NSNumber *)eCallInfo { if (eCallInfo != nil) { - [parameters setObject:eCallInfo forKey:NAMES_eCallInfo]; + [parameters setObject:eCallInfo forKey:SDLNameECallInfo]; } else { - [parameters removeObjectForKey:NAMES_eCallInfo]; + [parameters removeObjectForKey:SDLNameECallInfo]; } } - (NSNumber *)eCallInfo { - return [parameters objectForKey:NAMES_eCallInfo]; + return [parameters objectForKey:SDLNameECallInfo]; } - (void)setAirbagStatus:(NSNumber *)airbagStatus { if (airbagStatus != nil) { - [parameters setObject:airbagStatus forKey:NAMES_airbagStatus]; + [parameters setObject:airbagStatus forKey:SDLNameAirbagStatus]; } else { - [parameters removeObjectForKey:NAMES_airbagStatus]; + [parameters removeObjectForKey:SDLNameAirbagStatus]; } } - (NSNumber *)airbagStatus { - return [parameters objectForKey:NAMES_airbagStatus]; + return [parameters objectForKey:SDLNameAirbagStatus]; } - (void)setEmergencyEvent:(NSNumber *)emergencyEvent { if (emergencyEvent != nil) { - [parameters setObject:emergencyEvent forKey:NAMES_emergencyEvent]; + [parameters setObject:emergencyEvent forKey:SDLNameEmergencyEvent]; } else { - [parameters removeObjectForKey:NAMES_emergencyEvent]; + [parameters removeObjectForKey:SDLNameEmergencyEvent]; } } - (NSNumber *)emergencyEvent { - return [parameters objectForKey:NAMES_emergencyEvent]; + return [parameters objectForKey:SDLNameEmergencyEvent]; } - (void)setClusterModeStatus:(NSNumber *)clusterModeStatus { if (clusterModeStatus != nil) { - [parameters setObject:clusterModeStatus forKey:NAMES_clusterModeStatus]; + [parameters setObject:clusterModeStatus forKey:SDLNameClusterModeStatus]; } else { - [parameters removeObjectForKey:NAMES_clusterModeStatus]; + [parameters removeObjectForKey:SDLNameClusterModeStatus]; } } - (NSNumber *)clusterModeStatus { - return [parameters objectForKey:NAMES_clusterModeStatus]; + return [parameters objectForKey:SDLNameClusterModeStatus]; } - (void)setMyKey:(NSNumber *)myKey { if (myKey != nil) { - [parameters setObject:myKey forKey:NAMES_myKey]; + [parameters setObject:myKey forKey:SDLNameMyKey]; } else { - [parameters removeObjectForKey:NAMES_myKey]; + [parameters removeObjectForKey:SDLNameMyKey]; } } - (NSNumber *)myKey { - return [parameters objectForKey:NAMES_myKey]; + return [parameters objectForKey:SDLNameMyKey]; } @end diff --git a/SmartDeviceLink/SDLGetVehicleDataResponse.h b/SmartDeviceLink/SDLGetVehicleDataResponse.h index 9a890a54c..5c4a3e62c 100644 --- a/SmartDeviceLink/SDLGetVehicleDataResponse.h +++ b/SmartDeviceLink/SDLGetVehicleDataResponse.h @@ -27,22 +27,7 @@ * * Since SmartDeviceLink 2.0 */ -@interface SDLGetVehicleDataResponse : SDLRPCResponse { -} - - -/** - * @abstract Constructs a new SDLGetVehicleDataResponse object - */ -- (instancetype)init; - -/** - * @abstract Constructs a new SDLGetVehicleDataResponse object indicated by the NSMutableDictionary - * parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; - +@interface SDLGetVehicleDataResponse : SDLRPCResponse /** * @abstract A SDLGPSData* value. See GPSData. diff --git a/SmartDeviceLink/SDLGetVehicleDataResponse.m b/SmartDeviceLink/SDLGetVehicleDataResponse.m index 854d6a602..4b9732b20 100644 --- a/SmartDeviceLink/SDLGetVehicleDataResponse.m +++ b/SmartDeviceLink/SDLGetVehicleDataResponse.m @@ -21,373 +21,367 @@ @implementation SDLGetVehicleDataResponse - (instancetype)init { - if (self = [super initWithName:NAMES_GetVehicleData]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameGetVehicleData]) { } return self; } - (void)setGps:(SDLGPSData *)gps { if (gps != nil) { - [parameters setObject:gps forKey:NAMES_gps]; + [parameters setObject:gps forKey:SDLNameGPS]; } else { - [parameters removeObjectForKey:NAMES_gps]; + [parameters removeObjectForKey:SDLNameGPS]; } } - (SDLGPSData *)gps { - NSObject *obj = [parameters objectForKey:NAMES_gps]; + NSObject *obj = [parameters objectForKey:SDLNameGPS]; if (obj == nil || [obj isKindOfClass:SDLGPSData.class]) { return (SDLGPSData *)obj; } else { - return [[SDLGPSData alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLGPSData alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setSpeed:(NSNumber *)speed { if (speed != nil) { - [parameters setObject:speed forKey:NAMES_speed]; + [parameters setObject:speed forKey:SDLNameSpeed]; } else { - [parameters removeObjectForKey:NAMES_speed]; + [parameters removeObjectForKey:SDLNameSpeed]; } } - (NSNumber *)speed { - return [parameters objectForKey:NAMES_speed]; + return [parameters objectForKey:SDLNameSpeed]; } - (void)setRpm:(NSNumber *)rpm { if (rpm != nil) { - [parameters setObject:rpm forKey:NAMES_rpm]; + [parameters setObject:rpm forKey:SDLNameRPM]; } else { - [parameters removeObjectForKey:NAMES_rpm]; + [parameters removeObjectForKey:SDLNameRPM]; } } - (NSNumber *)rpm { - return [parameters objectForKey:NAMES_rpm]; + return [parameters objectForKey:SDLNameRPM]; } - (void)setFuelLevel:(NSNumber *)fuelLevel { if (fuelLevel != nil) { - [parameters setObject:fuelLevel forKey:NAMES_fuelLevel]; + [parameters setObject:fuelLevel forKey:SDLNameFuelLevel]; } else { - [parameters removeObjectForKey:NAMES_fuelLevel]; + [parameters removeObjectForKey:SDLNameFuelLevel]; } } - (NSNumber *)fuelLevel { - return [parameters objectForKey:NAMES_fuelLevel]; + return [parameters objectForKey:SDLNameFuelLevel]; } - (void)setFuelLevel_State:(SDLComponentVolumeStatus)fuelLevel_State { if (fuelLevel_State != nil) { - [parameters setObject:fuelLevel_State forKey:NAMES_fuelLevel_State]; + [parameters setObject:fuelLevel_State forKey:SDLNameFuelLevelState]; } else { - [parameters removeObjectForKey:NAMES_fuelLevel_State]; + [parameters removeObjectForKey:SDLNameFuelLevelState]; } } - (SDLComponentVolumeStatus)fuelLevel_State { - NSObject *obj = [parameters objectForKey:NAMES_fuelLevel_State]; + NSObject *obj = [parameters objectForKey:SDLNameFuelLevelState]; return (SDLComponentVolumeStatus)obj; } - (void)setInstantFuelConsumption:(NSNumber *)instantFuelConsumption { if (instantFuelConsumption != nil) { - [parameters setObject:instantFuelConsumption forKey:NAMES_instantFuelConsumption]; + [parameters setObject:instantFuelConsumption forKey:SDLNameInstantFuelConsumption]; } else { - [parameters removeObjectForKey:NAMES_instantFuelConsumption]; + [parameters removeObjectForKey:SDLNameInstantFuelConsumption]; } } - (NSNumber *)instantFuelConsumption { - return [parameters objectForKey:NAMES_instantFuelConsumption]; + return [parameters objectForKey:SDLNameInstantFuelConsumption]; } - (void)setExternalTemperature:(NSNumber *)externalTemperature { if (externalTemperature != nil) { - [parameters setObject:externalTemperature forKey:NAMES_externalTemperature]; + [parameters setObject:externalTemperature forKey:SDLNameExternalTemperature]; } else { - [parameters removeObjectForKey:NAMES_externalTemperature]; + [parameters removeObjectForKey:SDLNameExternalTemperature]; } } - (NSNumber *)externalTemperature { - return [parameters objectForKey:NAMES_externalTemperature]; + return [parameters objectForKey:SDLNameExternalTemperature]; } - (void)setVin:(NSString *)vin { if (vin != nil) { - [parameters setObject:vin forKey:NAMES_vin]; + [parameters setObject:vin forKey:SDLNameVIN]; } else { - [parameters removeObjectForKey:NAMES_vin]; + [parameters removeObjectForKey:SDLNameVIN]; } } - (NSString *)vin { - return [parameters objectForKey:NAMES_vin]; + return [parameters objectForKey:SDLNameVIN]; } - (void)setPrndl:(SDLPRNDL)prndl { if (prndl != nil) { - [parameters setObject:prndl forKey:NAMES_prndl]; + [parameters setObject:prndl forKey:SDLNamePRNDL]; } else { - [parameters removeObjectForKey:NAMES_prndl]; + [parameters removeObjectForKey:SDLNamePRNDL]; } } - (SDLPRNDL)prndl { - NSObject *obj = [parameters objectForKey:NAMES_prndl]; + NSObject *obj = [parameters objectForKey:SDLNamePRNDL]; return (SDLPRNDL)obj; } - (void)setTirePressure:(SDLTireStatus *)tirePressure { if (tirePressure != nil) { - [parameters setObject:tirePressure forKey:NAMES_tirePressure]; + [parameters setObject:tirePressure forKey:SDLNameTirePressure]; } else { - [parameters removeObjectForKey:NAMES_tirePressure]; + [parameters removeObjectForKey:SDLNameTirePressure]; } } - (SDLTireStatus *)tirePressure { - NSObject *obj = [parameters objectForKey:NAMES_tirePressure]; + NSObject *obj = [parameters objectForKey:SDLNameTirePressure]; if (obj == nil || [obj isKindOfClass:SDLTireStatus.class]) { return (SDLTireStatus *)obj; } else { - return [[SDLTireStatus alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLTireStatus alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setOdometer:(NSNumber *)odometer { if (odometer != nil) { - [parameters setObject:odometer forKey:NAMES_odometer]; + [parameters setObject:odometer forKey:SDLNameOdometer]; } else { - [parameters removeObjectForKey:NAMES_odometer]; + [parameters removeObjectForKey:SDLNameOdometer]; } } - (NSNumber *)odometer { - return [parameters objectForKey:NAMES_odometer]; + return [parameters objectForKey:SDLNameOdometer]; } - (void)setBeltStatus:(SDLBeltStatus *)beltStatus { if (beltStatus != nil) { - [parameters setObject:beltStatus forKey:NAMES_beltStatus]; + [parameters setObject:beltStatus forKey:SDLNameBeltStatus]; } else { - [parameters removeObjectForKey:NAMES_beltStatus]; + [parameters removeObjectForKey:SDLNameBeltStatus]; } } - (SDLBeltStatus *)beltStatus { - NSObject *obj = [parameters objectForKey:NAMES_beltStatus]; + NSObject *obj = [parameters objectForKey:SDLNameBeltStatus]; if (obj == nil || [obj isKindOfClass:SDLBeltStatus.class]) { return (SDLBeltStatus *)obj; } else { - return [[SDLBeltStatus alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLBeltStatus alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setBodyInformation:(SDLBodyInformation *)bodyInformation { if (bodyInformation != nil) { - [parameters setObject:bodyInformation forKey:NAMES_bodyInformation]; + [parameters setObject:bodyInformation forKey:SDLNameBodyInformation]; } else { - [parameters removeObjectForKey:NAMES_bodyInformation]; + [parameters removeObjectForKey:SDLNameBodyInformation]; } } - (SDLBodyInformation *)bodyInformation { - NSObject *obj = [parameters objectForKey:NAMES_bodyInformation]; + NSObject *obj = [parameters objectForKey:SDLNameBodyInformation]; if (obj == nil || [obj isKindOfClass:SDLBodyInformation.class]) { return (SDLBodyInformation *)obj; } else { - return [[SDLBodyInformation alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLBodyInformation alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setDeviceStatus:(SDLDeviceStatus *)deviceStatus { if (deviceStatus != nil) { - [parameters setObject:deviceStatus forKey:NAMES_deviceStatus]; + [parameters setObject:deviceStatus forKey:SDLNameDeviceStatus]; } else { - [parameters removeObjectForKey:NAMES_deviceStatus]; + [parameters removeObjectForKey:SDLNameDeviceStatus]; } } - (SDLDeviceStatus *)deviceStatus { - NSObject *obj = [parameters objectForKey:NAMES_deviceStatus]; + NSObject *obj = [parameters objectForKey:SDLNameDeviceStatus]; if (obj == nil || [obj isKindOfClass:SDLDeviceStatus.class]) { return (SDLDeviceStatus *)obj; } else { - return [[SDLDeviceStatus alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLDeviceStatus alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setDriverBraking:(SDLVehicleDataEventStatus)driverBraking { if (driverBraking != nil) { - [parameters setObject:driverBraking forKey:NAMES_driverBraking]; + [parameters setObject:driverBraking forKey:SDLNameDriverBraking]; } else { - [parameters removeObjectForKey:NAMES_driverBraking]; + [parameters removeObjectForKey:SDLNameDriverBraking]; } } - (SDLVehicleDataEventStatus)driverBraking { - NSObject *obj = [parameters objectForKey:NAMES_driverBraking]; + NSObject *obj = [parameters objectForKey:SDLNameDriverBraking]; return (SDLVehicleDataEventStatus)obj; } - (void)setWiperStatus:(SDLWiperStatus)wiperStatus { if (wiperStatus != nil) { - [parameters setObject:wiperStatus forKey:NAMES_wiperStatus]; + [parameters setObject:wiperStatus forKey:SDLNameWiperStatus]; } else { - [parameters removeObjectForKey:NAMES_wiperStatus]; + [parameters removeObjectForKey:SDLNameWiperStatus]; } } - (SDLWiperStatus)wiperStatus { - NSObject *obj = [parameters objectForKey:NAMES_wiperStatus]; + NSObject *obj = [parameters objectForKey:SDLNameWiperStatus]; return (SDLWiperStatus)obj; } - (void)setHeadLampStatus:(SDLHeadLampStatus *)headLampStatus { if (headLampStatus != nil) { - [parameters setObject:headLampStatus forKey:NAMES_headLampStatus]; + [parameters setObject:headLampStatus forKey:SDLNameHeadLampStatus]; } else { - [parameters removeObjectForKey:NAMES_headLampStatus]; + [parameters removeObjectForKey:SDLNameHeadLampStatus]; } } - (SDLHeadLampStatus *)headLampStatus { - NSObject *obj = [parameters objectForKey:NAMES_headLampStatus]; + NSObject *obj = [parameters objectForKey:SDLNameHeadLampStatus]; if (obj == nil || [obj isKindOfClass:SDLHeadLampStatus.class]) { return (SDLHeadLampStatus *)obj; } else { - return [[SDLHeadLampStatus alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLHeadLampStatus alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setEngineTorque:(NSNumber *)engineTorque { if (engineTorque != nil) { - [parameters setObject:engineTorque forKey:NAMES_engineTorque]; + [parameters setObject:engineTorque forKey:SDLNameEngineTorque]; } else { - [parameters removeObjectForKey:NAMES_engineTorque]; + [parameters removeObjectForKey:SDLNameEngineTorque]; } } - (NSNumber *)engineTorque { - return [parameters objectForKey:NAMES_engineTorque]; + return [parameters objectForKey:SDLNameEngineTorque]; } - (void)setAccPedalPosition:(NSNumber *)accPedalPosition { if (accPedalPosition != nil) { - [parameters setObject:accPedalPosition forKey:NAMES_accPedalPosition]; + [parameters setObject:accPedalPosition forKey:SDLNameAccelerationPedalPosition]; } else { - [parameters removeObjectForKey:NAMES_accPedalPosition]; + [parameters removeObjectForKey:SDLNameAccelerationPedalPosition]; } } - (NSNumber *)accPedalPosition { - return [parameters objectForKey:NAMES_accPedalPosition]; + return [parameters objectForKey:SDLNameAccelerationPedalPosition]; } - (void)setSteeringWheelAngle:(NSNumber *)steeringWheelAngle { if (steeringWheelAngle != nil) { - [parameters setObject:steeringWheelAngle forKey:NAMES_steeringWheelAngle]; + [parameters setObject:steeringWheelAngle forKey:SDLNameSteeringWheelAngle]; } else { - [parameters removeObjectForKey:NAMES_steeringWheelAngle]; + [parameters removeObjectForKey:SDLNameSteeringWheelAngle]; } } - (NSNumber *)steeringWheelAngle { - return [parameters objectForKey:NAMES_steeringWheelAngle]; + return [parameters objectForKey:SDLNameSteeringWheelAngle]; } - (void)setECallInfo:(SDLECallInfo *)eCallInfo { if (eCallInfo != nil) { - [parameters setObject:eCallInfo forKey:NAMES_eCallInfo]; + [parameters setObject:eCallInfo forKey:SDLNameECallInfo]; } else { - [parameters removeObjectForKey:NAMES_eCallInfo]; + [parameters removeObjectForKey:SDLNameECallInfo]; } } - (SDLECallInfo *)eCallInfo { - NSObject *obj = [parameters objectForKey:NAMES_eCallInfo]; + NSObject *obj = [parameters objectForKey:SDLNameECallInfo]; if (obj == nil || [obj isKindOfClass:SDLECallInfo.class]) { return (SDLECallInfo *)obj; } else { - return [[SDLECallInfo alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLECallInfo alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setAirbagStatus:(SDLAirbagStatus *)airbagStatus { if (airbagStatus != nil) { - [parameters setObject:airbagStatus forKey:NAMES_airbagStatus]; + [parameters setObject:airbagStatus forKey:SDLNameAirbagStatus]; } else { - [parameters removeObjectForKey:NAMES_airbagStatus]; + [parameters removeObjectForKey:SDLNameAirbagStatus]; } } - (SDLAirbagStatus *)airbagStatus { - NSObject *obj = [parameters objectForKey:NAMES_airbagStatus]; + NSObject *obj = [parameters objectForKey:SDLNameAirbagStatus]; if (obj == nil || [obj isKindOfClass:SDLAirbagStatus.class]) { return (SDLAirbagStatus *)obj; } else { - return [[SDLAirbagStatus alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLAirbagStatus alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setEmergencyEvent:(SDLEmergencyEvent *)emergencyEvent { if (emergencyEvent != nil) { - [parameters setObject:emergencyEvent forKey:NAMES_emergencyEvent]; + [parameters setObject:emergencyEvent forKey:SDLNameEmergencyEvent]; } else { - [parameters removeObjectForKey:NAMES_emergencyEvent]; + [parameters removeObjectForKey:SDLNameEmergencyEvent]; } } - (SDLEmergencyEvent *)emergencyEvent { - NSObject *obj = [parameters objectForKey:NAMES_emergencyEvent]; + NSObject *obj = [parameters objectForKey:SDLNameEmergencyEvent]; if (obj == nil || [obj isKindOfClass:SDLEmergencyEvent.class]) { return (SDLEmergencyEvent *)obj; } else { - return [[SDLEmergencyEvent alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLEmergencyEvent alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setClusterModeStatus:(SDLClusterModeStatus *)clusterModeStatus { if (clusterModeStatus != nil) { - [parameters setObject:clusterModeStatus forKey:NAMES_clusterModeStatus]; + [parameters setObject:clusterModeStatus forKey:SDLNameClusterModeStatus]; } else { - [parameters removeObjectForKey:NAMES_clusterModeStatus]; + [parameters removeObjectForKey:SDLNameClusterModeStatus]; } } - (SDLClusterModeStatus *)clusterModeStatus { - NSObject *obj = [parameters objectForKey:NAMES_clusterModeStatus]; + NSObject *obj = [parameters objectForKey:SDLNameClusterModeStatus]; if (obj == nil || [obj isKindOfClass:SDLClusterModeStatus.class]) { return (SDLClusterModeStatus *)obj; } else { - return [[SDLClusterModeStatus alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLClusterModeStatus alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setMyKey:(SDLMyKey *)myKey { if (myKey != nil) { - [parameters setObject:myKey forKey:NAMES_myKey]; + [parameters setObject:myKey forKey:SDLNameMyKey]; } else { - [parameters removeObjectForKey:NAMES_myKey]; + [parameters removeObjectForKey:SDLNameMyKey]; } } - (SDLMyKey *)myKey { - NSObject *obj = [parameters objectForKey:NAMES_myKey]; + NSObject *obj = [parameters objectForKey:SDLNameMyKey]; if (obj == nil || [obj isKindOfClass:SDLMyKey.class]) { return (SDLMyKey *)obj; } else { - return [[SDLMyKey alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLMyKey alloc] initWithDictionary:(NSDictionary *)obj]; } } diff --git a/SmartDeviceLink/SDLHMICapabilities.h b/SmartDeviceLink/SDLHMICapabilities.h index 6a84cec2c..3680dbec4 100644 --- a/SmartDeviceLink/SDLHMICapabilities.h +++ b/SmartDeviceLink/SDLHMICapabilities.h @@ -6,9 +6,6 @@ @interface SDLHMICapabilities : SDLRPCStruct -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; - /** Availability of build in Nav. True: Available, False: Not Available diff --git a/SmartDeviceLink/SDLHMICapabilities.m b/SmartDeviceLink/SDLHMICapabilities.m index 24b35be25..5b9eff46f 100644 --- a/SmartDeviceLink/SDLHMICapabilities.m +++ b/SmartDeviceLink/SDLHMICapabilities.m @@ -6,49 +6,30 @@ #import "SDLNames.h" - @implementation SDLHMICapabilities -- (instancetype)init { - self = [super init]; - if (!self) { - return nil; - } - - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - self = [super initWithDictionary:dict]; - if (!self) { - return nil; - } - - return self; -} - - (void)setNavigation:(NSNumber *)navigation { if (navigation != nil) { - store[NAMES_navigation] = navigation; + store[SDLNameNavigation] = navigation; } else { - [store removeObjectForKey:NAMES_navigation]; + [store removeObjectForKey:SDLNameNavigation]; } } - (NSNumber *)navigation { - return store[NAMES_navigation]; + return store[SDLNameNavigation]; } - (void)setPhoneCall:(NSNumber *)phoneCall { if (phoneCall != nil) { - store[NAMES_phoneCall] = phoneCall; + store[SDLNamePhoneCall] = phoneCall; } else { - [store removeObjectForKey:NAMES_phoneCall]; + [store removeObjectForKey:SDLNamePhoneCall]; } } - (NSNumber *)phoneCall { - return store[NAMES_phoneCall]; + return store[SDLNamePhoneCall]; } @end diff --git a/SmartDeviceLink/SDLHMIPermissions.h b/SmartDeviceLink/SDLHMIPermissions.h index 49a7025a7..0aec4718f 100644 --- a/SmartDeviceLink/SDLHMIPermissions.h +++ b/SmartDeviceLink/SDLHMIPermissions.h @@ -9,19 +9,7 @@ * * @since SDL 2.0 */ -@interface SDLHMIPermissions : SDLRPCStruct { -} - -/** - * Constructs a newly allocated SDLHMIPermissions object - */ -- (instancetype)init; - -/** - * Constructs a newly allocated SDLHMIPermissions object indicated by the dictionary parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLHMIPermissions : SDLRPCStruct /** * @abstract a set of all HMI levels that are permitted for this given RPC diff --git a/SmartDeviceLink/SDLHMIPermissions.m b/SmartDeviceLink/SDLHMIPermissions.m index 7c9e59789..1bd01a646 100644 --- a/SmartDeviceLink/SDLHMIPermissions.m +++ b/SmartDeviceLink/SDLHMIPermissions.m @@ -9,28 +9,16 @@ @implementation SDLHMIPermissions -- (instancetype)init { - if (self = [super init]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setAllowed:(NSMutableArray *)allowed { if (allowed != nil) { - [store setObject:allowed forKey:NAMES_allowed]; + [store setObject:allowed forKey:SDLNameAllowed]; } else { - [store removeObjectForKey:NAMES_allowed]; + [store removeObjectForKey:SDLNameAllowed]; } } - (NSMutableArray *)allowed { - NSMutableArray *array = [store objectForKey:NAMES_allowed]; + NSMutableArray *array = [store objectForKey:SDLNameAllowed]; if ([array count] < 1) { return array; } else { @@ -44,14 +32,14 @@ - (void)setUserDisallowed:(NSMutableArray *)userDisallowed { if (userDisallowed != nil) { - [store setObject:userDisallowed forKey:NAMES_userDisallowed]; + [store setObject:userDisallowed forKey:SDLNameUserDisallowed]; } else { - [store removeObjectForKey:NAMES_userDisallowed]; + [store removeObjectForKey:SDLNameUserDisallowed]; } } - (NSMutableArray *)userDisallowed { - NSMutableArray *array = [store objectForKey:NAMES_userDisallowed]; + NSMutableArray *array = [store objectForKey:SDLNameUserDisallowed]; if ([array count] < 1) { return array; } else { diff --git a/SmartDeviceLink/SDLHeadLampStatus.h b/SmartDeviceLink/SDLHeadLampStatus.h index 05d9beaa6..4664259f1 100644 --- a/SmartDeviceLink/SDLHeadLampStatus.h +++ b/SmartDeviceLink/SDLHeadLampStatus.h @@ -9,18 +9,8 @@ /** * Status of the head lamps */ -@interface SDLHeadLampStatus : SDLRPCStruct { -} -/** - * @abstract Constructs a new SDLHeadLampStatus object - */ -- (instancetype)init; -/** - * @abstract Constructs a new SDLHeadLampStatus object indicated by the NSMutableDictionary - * parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLHeadLampStatus : SDLRPCStruct + /** * @abstract A boolean value. Status of the low beam lamps. */ @@ -29,5 +19,7 @@ * @abstract A boolean value. Status of the high beam lamps. */ @property (strong) NSNumber *highBeamsOn; + @property (strong) SDLAmbientLightStatus ambientLightSensorStatus; + @end diff --git a/SmartDeviceLink/SDLHeadLampStatus.m b/SmartDeviceLink/SDLHeadLampStatus.m index 4141c1529..26ed9ae35 100644 --- a/SmartDeviceLink/SDLHeadLampStatus.m +++ b/SmartDeviceLink/SDLHeadLampStatus.m @@ -6,55 +6,42 @@ #import "SDLAmbientLightStatus.h" #import "SDLNames.h" - @implementation SDLHeadLampStatus -- (instancetype)init { - if (self = [super init]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setLowBeamsOn:(NSNumber *)lowBeamsOn { if (lowBeamsOn != nil) { - [store setObject:lowBeamsOn forKey:NAMES_lowBeamsOn]; + [store setObject:lowBeamsOn forKey:SDLNameLowBeamsOn]; } else { - [store removeObjectForKey:NAMES_lowBeamsOn]; + [store removeObjectForKey:SDLNameLowBeamsOn]; } } - (NSNumber *)lowBeamsOn { - return [store objectForKey:NAMES_lowBeamsOn]; + return [store objectForKey:SDLNameLowBeamsOn]; } - (void)setHighBeamsOn:(NSNumber *)highBeamsOn { if (highBeamsOn != nil) { - [store setObject:highBeamsOn forKey:NAMES_highBeamsOn]; + [store setObject:highBeamsOn forKey:SDLNameHighBeamsOn]; } else { - [store removeObjectForKey:NAMES_highBeamsOn]; + [store removeObjectForKey:SDLNameHighBeamsOn]; } } - (NSNumber *)highBeamsOn { - return [store objectForKey:NAMES_highBeamsOn]; + return [store objectForKey:SDLNameHighBeamsOn]; } - (void)setAmbientLightSensorStatus:(SDLAmbientLightStatus)ambientLightSensorStatus { if (ambientLightSensorStatus != nil) { - [store setObject:ambientLightSensorStatus forKey:NAMES_ambientLightSensorStatus]; + [store setObject:ambientLightSensorStatus forKey:SDLNameAmbientLightSensorStatus]; } else { - [store removeObjectForKey:NAMES_ambientLightSensorStatus]; + [store removeObjectForKey:SDLNameAmbientLightSensorStatus]; } } - (SDLAmbientLightStatus)ambientLightSensorStatus { - NSObject *obj = [store objectForKey:NAMES_ambientLightSensorStatus]; + NSObject *obj = [store objectForKey:SDLNameAmbientLightSensorStatus]; return (SDLAmbientLightStatus)obj; } diff --git a/SmartDeviceLink/SDLIAPTransport.m b/SmartDeviceLink/SDLIAPTransport.m index 5cf4ceb21..a55fccf0b 100644 --- a/SmartDeviceLink/SDLIAPTransport.m +++ b/SmartDeviceLink/SDLIAPTransport.m @@ -11,7 +11,6 @@ #import "SDLIAPSession.h" #import "SDLIAPTransport.h" #import "SDLIAPTransport.h" -#import "SDLSiphonServer.h" #import "SDLStreamDelegate.h" #import "SDLTimer.h" #import <CommonCrypto/CommonDigest.h> @@ -51,7 +50,6 @@ int const streamOpenTimeoutSeconds = 2; _transmit_queue = dispatch_queue_create("com.sdl.transport.iap.transmit", DISPATCH_QUEUE_SERIAL); [self sdl_startEventListening]; - [SDLSiphonServer init]; } [SDLDebugTool logInfo:@"SDLIAPTransport Init"]; diff --git a/SmartDeviceLink/SDLImage.h b/SmartDeviceLink/SDLImage.h index 748a443ca..77c738719 100644 --- a/SmartDeviceLink/SDLImage.h +++ b/SmartDeviceLink/SDLImage.h @@ -10,19 +10,7 @@ * * @since SDL 2.0 */ -@interface SDLImage : SDLRPCStruct { -} - -/** - * Constructs a newly allocated SDLImage object - */ -- (instancetype)init; - -/** - * Constructs a newly allocated SDLImage object indicated by the dictionary parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLImage : SDLRPCStruct /** * @abstract The static hex icon value or the binary image file name identifier (sent by SDLPutFile) diff --git a/SmartDeviceLink/SDLImage.m b/SmartDeviceLink/SDLImage.m index f6d47a97b..d606fcc3c 100644 --- a/SmartDeviceLink/SDLImage.m +++ b/SmartDeviceLink/SDLImage.m @@ -8,40 +8,28 @@ @implementation SDLImage -- (instancetype)init { - if (self = [super init]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setValue:(NSString *)value { if (value != nil) { - [store setObject:value forKey:NAMES_value]; + [store setObject:value forKey:SDLNameValue]; } else { - [store removeObjectForKey:NAMES_value]; + [store removeObjectForKey:SDLNameValue]; } } - (NSString *)value { - return [store objectForKey:NAMES_value]; + return [store objectForKey:SDLNameValue]; } - (void)setImageType:(SDLImageType)imageType { if (imageType != nil) { - [store setObject:imageType forKey:NAMES_imageType]; + [store setObject:imageType forKey:SDLNameImageType]; } else { - [store removeObjectForKey:NAMES_imageType]; + [store removeObjectForKey:SDLNameImageType]; } } - (SDLImageType)imageType { - NSObject *obj = [store objectForKey:NAMES_imageType]; + NSObject *obj = [store objectForKey:SDLNameImageType]; return (SDLImageType)obj; } diff --git a/SmartDeviceLink/SDLImageField.h b/SmartDeviceLink/SDLImageField.h index 9e52fd705..c680828c2 100644 --- a/SmartDeviceLink/SDLImageField.h +++ b/SmartDeviceLink/SDLImageField.h @@ -8,11 +8,7 @@ @class SDLImageResolution; -@interface SDLImageField : SDLRPCStruct { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLImageField : SDLRPCStruct @property (strong) SDLImageFieldName name; @property (strong) NSMutableArray *imageTypeSupported; diff --git a/SmartDeviceLink/SDLImageField.m b/SmartDeviceLink/SDLImageField.m index b495e310f..46e6ca92c 100644 --- a/SmartDeviceLink/SDLImageField.m +++ b/SmartDeviceLink/SDLImageField.m @@ -7,44 +7,31 @@ #import "SDLFileType.h" #import "SDLNames.h" - @implementation SDLImageField -- (instancetype)init { - if (self = [super init]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setName:(SDLImageFieldName)name { if (name != nil) { - [store setObject:name forKey:NAMES_name]; + [store setObject:name forKey:SDLNameName]; } else { - [store removeObjectForKey:NAMES_name]; + [store removeObjectForKey:SDLNameName]; } } - (SDLImageFieldName)name { - NSObject *obj = [store objectForKey:NAMES_name]; + NSObject *obj = [store objectForKey:SDLNameName]; return (SDLImageFieldName)obj; } - (void)setImageTypeSupported:(NSMutableArray *)imageTypeSupported { if (imageTypeSupported != nil) { - [store setObject:imageTypeSupported forKey:NAMES_imageTypeSupported]; + [store setObject:imageTypeSupported forKey:SDLNameImageTypeSupported]; } else { - [store removeObjectForKey:NAMES_imageTypeSupported]; + [store removeObjectForKey:SDLNameImageTypeSupported]; } } - (NSMutableArray *)imageTypeSupported { - NSMutableArray *array = [store objectForKey:NAMES_imageTypeSupported]; + NSMutableArray *array = [store objectForKey:SDLNameImageTypeSupported]; if ([array count] < 1) { return array; } else { @@ -58,18 +45,18 @@ - (void)setImageResolution:(SDLImageResolution *)imageResolution { if (imageResolution != nil) { - [store setObject:imageResolution forKey:NAMES_imageResolution]; + [store setObject:imageResolution forKey:SDLNameImageResolution]; } else { - [store removeObjectForKey:NAMES_imageResolution]; + [store removeObjectForKey:SDLNameImageResolution]; } } - (SDLImageResolution *)imageResolution { - NSObject *obj = [store objectForKey:NAMES_imageResolution]; + NSObject *obj = [store objectForKey:SDLNameImageResolution]; if (obj == nil || [obj isKindOfClass:SDLImageResolution.class]) { return (SDLImageResolution *)obj; } else { - return [[SDLImageResolution alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLImageResolution alloc] initWithDictionary:(NSDictionary *)obj]; } } diff --git a/SmartDeviceLink/SDLImageResolution.h b/SmartDeviceLink/SDLImageResolution.h index bae946ab2..884f9fe76 100644 --- a/SmartDeviceLink/SDLImageResolution.h +++ b/SmartDeviceLink/SDLImageResolution.h @@ -4,11 +4,7 @@ #import "SDLRPCMessage.h" -@interface SDLImageResolution : SDLRPCStruct { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLImageResolution : SDLRPCStruct @property (strong) NSNumber *resolutionWidth; @property (strong) NSNumber *resolutionHeight; diff --git a/SmartDeviceLink/SDLImageResolution.m b/SmartDeviceLink/SDLImageResolution.m index 7f10116de..0e87c5248 100644 --- a/SmartDeviceLink/SDLImageResolution.m +++ b/SmartDeviceLink/SDLImageResolution.m @@ -8,40 +8,28 @@ @implementation SDLImageResolution -- (instancetype)init { - if (self = [super init]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setResolutionWidth:(NSNumber *)resolutionWidth { if (resolutionWidth != nil) { - [store setObject:resolutionWidth forKey:NAMES_resolutionWidth]; + [store setObject:resolutionWidth forKey:SDLNameResolutionWidth]; } else { - [store removeObjectForKey:NAMES_resolutionWidth]; + [store removeObjectForKey:SDLNameResolutionWidth]; } } - (NSNumber *)resolutionWidth { - return [store objectForKey:NAMES_resolutionWidth]; + return [store objectForKey:SDLNameResolutionWidth]; } - (void)setResolutionHeight:(NSNumber *)resolutionHeight { if (resolutionHeight != nil) { - [store setObject:resolutionHeight forKey:NAMES_resolutionHeight]; + [store setObject:resolutionHeight forKey:SDLNameResolutionHeight]; } else { - [store removeObjectForKey:NAMES_resolutionHeight]; + [store removeObjectForKey:SDLNameResolutionHeight]; } } - (NSNumber *)resolutionHeight { - return [store objectForKey:NAMES_resolutionHeight]; + return [store objectForKey:SDLNameResolutionHeight]; } @end diff --git a/SmartDeviceLink/SDLJsonDecoder.h b/SmartDeviceLink/SDLJsonDecoder.h deleted file mode 100644 index 4723989db..000000000 --- a/SmartDeviceLink/SDLJsonDecoder.h +++ /dev/null @@ -1,14 +0,0 @@ -// SDLJsonDecoder.h -// - -#import <Foundation/Foundation.h> - -#import "SDLDecoder.h" - - -@interface SDLJsonDecoder : NSObject <SDLDecoder> { -} - -+ (NSObject<SDLDecoder> *)instance; - -@end diff --git a/SmartDeviceLink/SDLJsonDecoder.m b/SmartDeviceLink/SDLJsonDecoder.m deleted file mode 100644 index 0ff561df8..000000000 --- a/SmartDeviceLink/SDLJsonDecoder.m +++ /dev/null @@ -1,38 +0,0 @@ -// SDLJsonDecoder.m -// - -#import "SDLJsonDecoder.h" - -#import "SDLDebugTool.h" -#import "SDLNames.h" - - -@implementation SDLJsonDecoder - -static NSObject<SDLDecoder> *jsonDecoderInstance; - -+ (NSObject<SDLDecoder> *)instance { - if (jsonDecoderInstance == nil) { - jsonDecoderInstance = [[SDLJsonDecoder alloc] init]; - } - return jsonDecoderInstance; -} - -- (NSDictionary *)decode:(NSData *)data { - if (data.length == 0) { - [SDLDebugTool logInfo:@"Warning: Decoding JSON data, no JSON to decode" withType:SDLDebugType_Protocol]; - return nil; - } - - NSError *error = nil; - NSDictionary *jsonObject = [NSJSONSerialization JSONObjectWithData:data options:kNilOptions error:&error]; - - if (error != nil) { - [SDLDebugTool logInfo:[NSString stringWithFormat:@"Error decoding JSON data: %@", error] withType:SDLDebugType_Protocol]; - return nil; - } - - return jsonObject; -} - -@end diff --git a/SmartDeviceLink/SDLJsonEncoder.h b/SmartDeviceLink/SDLJsonEncoder.h deleted file mode 100644 index 680fe5da6..000000000 --- a/SmartDeviceLink/SDLJsonEncoder.h +++ /dev/null @@ -1,14 +0,0 @@ -// SDLJsonEncoder.h -// - -#import <Foundation/Foundation.h> - -#import "SDLEncoder.h" - - -@interface SDLJsonEncoder : NSObject <SDLEncoder> { -} - -+ (NSObject<SDLEncoder> *)instance; - -@end diff --git a/SmartDeviceLink/SDLJsonEncoder.m b/SmartDeviceLink/SDLJsonEncoder.m deleted file mode 100644 index dbb2374d9..000000000 --- a/SmartDeviceLink/SDLJsonEncoder.m +++ /dev/null @@ -1,38 +0,0 @@ -// SDLJsonEncoder.m -// - -#import "SDLJsonEncoder.h" - -#import "SDLDebugTool.h" -#import "SDLNames.h" - - -@implementation SDLJsonEncoder - -static NSObject<SDLEncoder> *jsonEncoderInstance; - -+ (NSObject<SDLEncoder> *)instance { - if (jsonEncoderInstance == nil) { - jsonEncoderInstance = [[SDLJsonEncoder alloc] init]; - } - return jsonEncoderInstance; -} - -- (NSData *)encodeDictionary:(NSDictionary *)dict { - if (dict == nil) { - [SDLDebugTool logInfo:@"Warning: Encoding dictionary to JSON, no dictionary passed" withType:SDLDebugType_Protocol]; - return nil; - } - - NSError *error = nil; - NSData *jsonData = [NSJSONSerialization dataWithJSONObject:dict options:kNilOptions error:&error]; - - if (error != nil) { - [SDLDebugTool logInfo:[NSString stringWithFormat:@"Error encoding JSON data: %@", error] withType:SDLDebugType_Protocol]; - return nil; - } - - return jsonData; -} - -@end diff --git a/SmartDeviceLink/SDLKeyboardProperties.h b/SmartDeviceLink/SDLKeyboardProperties.h index b9532e9bf..c9d0ffe33 100644 --- a/SmartDeviceLink/SDLKeyboardProperties.h +++ b/SmartDeviceLink/SDLKeyboardProperties.h @@ -8,11 +8,7 @@ #import "SDLKeypressMode.h" -@interface SDLKeyboardProperties : SDLRPCStruct { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLKeyboardProperties : SDLRPCStruct @property (strong) SDLLanguage language; @property (strong) SDLKeyboardLayout keyboardLayout; diff --git a/SmartDeviceLink/SDLKeyboardProperties.m b/SmartDeviceLink/SDLKeyboardProperties.m index c9a18180f..3bfc31d20 100644 --- a/SmartDeviceLink/SDLKeyboardProperties.m +++ b/SmartDeviceLink/SDLKeyboardProperties.m @@ -7,79 +7,67 @@ @implementation SDLKeyboardProperties -- (instancetype)init { - if (self = [super init]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setLanguage:(SDLLanguage)language { if (language != nil) { - [store setObject:language forKey:NAMES_language]; + [store setObject:language forKey:SDLNameLanguage]; } else { - [store removeObjectForKey:NAMES_language]; + [store removeObjectForKey:SDLNameLanguage]; } } - (SDLLanguage)language { - NSObject *obj = [store objectForKey:NAMES_language]; + NSObject *obj = [store objectForKey:SDLNameLanguage]; return (SDLLanguage )obj; } - (void)setKeyboardLayout:(SDLKeyboardLayout)keyboardLayout { if (keyboardLayout != nil) { - [store setObject:keyboardLayout forKey:NAMES_keyboardLayout]; + [store setObject:keyboardLayout forKey:SDLNameKeyboardLayout]; } else { - [store removeObjectForKey:NAMES_keyboardLayout]; + [store removeObjectForKey:SDLNameKeyboardLayout]; } } - (SDLKeyboardLayout)keyboardLayout { - NSObject *obj = [store objectForKey:NAMES_keyboardLayout]; + NSObject *obj = [store objectForKey:SDLNameKeyboardLayout]; return (SDLKeyboardLayout)obj; } - (void)setKeypressMode:(SDLKeypressMode)keypressMode { if (keypressMode != nil) { - [store setObject:keypressMode forKey:NAMES_keypressMode]; + [store setObject:keypressMode forKey:SDLNameKeypressMode]; } else { - [store removeObjectForKey:NAMES_keypressMode]; + [store removeObjectForKey:SDLNameKeypressMode]; } } - (SDLKeypressMode)keypressMode { - NSObject *obj = [store objectForKey:NAMES_keypressMode]; + NSObject *obj = [store objectForKey:SDLNameKeypressMode]; return (SDLKeypressMode)obj; } - (void)setLimitedCharacterList:(NSMutableArray *)limitedCharacterList { if (limitedCharacterList != nil) { - [store setObject:limitedCharacterList forKey:NAMES_limitedCharacterList]; + [store setObject:limitedCharacterList forKey:SDLNameLimitedCharacterList]; } else { - [store removeObjectForKey:NAMES_limitedCharacterList]; + [store removeObjectForKey:SDLNameLimitedCharacterList]; } } - (NSMutableArray *)limitedCharacterList { - return [store objectForKey:NAMES_limitedCharacterList]; + return [store objectForKey:SDLNameLimitedCharacterList]; } - (void)setAutoCompleteText:(NSString *)autoCompleteText { if (autoCompleteText != nil) { - [store setObject:autoCompleteText forKey:NAMES_autoCompleteText]; + [store setObject:autoCompleteText forKey:SDLNameAutoCompleteText]; } else { - [store removeObjectForKey:NAMES_autoCompleteText]; + [store removeObjectForKey:SDLNameAutoCompleteText]; } } - (NSString *)autoCompleteText { - return [store objectForKey:NAMES_autoCompleteText]; + return [store objectForKey:SDLNameAutoCompleteText]; } @end diff --git a/SmartDeviceLink/SDLLifecycleConfiguration.h b/SmartDeviceLink/SDLLifecycleConfiguration.h index 803d46bfc..dfa8d6a7f 100644 --- a/SmartDeviceLink/SDLLifecycleConfiguration.h +++ b/SmartDeviceLink/SDLLifecycleConfiguration.h @@ -23,7 +23,6 @@ typedef NS_OPTIONS(NSUInteger, SDLLogOutput) { SDLLogOutputNone = 0, SDLLogOutputConsole = 1 << 0, SDLLogOutputFile = 1 << 1, - SDLLogOutputSiphon = 1 << 2 }; diff --git a/SmartDeviceLink/SDLLifecycleManager.m b/SmartDeviceLink/SDLLifecycleManager.m index eef752799..c792d6d2c 100644 --- a/SmartDeviceLink/SDLLifecycleManager.m +++ b/SmartDeviceLink/SDLLifecycleManager.m @@ -420,7 +420,7 @@ SDLLifecycleState *const SDLLifecycleStateReady = @"Ready"; return YES; } - + (void)sdl_updateLoggingWithFlags : (SDLLogOutput)logFlags { ++ (void)sdl_updateLoggingWithFlags:(SDLLogOutput)logFlags { [SDLDebugTool disable]; if ((logFlags & SDLLogOutputConsole) == SDLLogOutputConsole) { @@ -432,15 +432,6 @@ SDLLifecycleState *const SDLLifecycleStateReady = @"Ready"; } else { [SDLDebugTool disableDebugToLogFile]; } - -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wdeprecated-declarations" - if ((logFlags & SDLLogOutputSiphon) == SDLLogOutputSiphon) { - [SDLProxy enableSiphonDebug]; - } else { - [SDLProxy disableSiphonDebug]; - } -#pragma clang diagnostic pop } diff --git a/SmartDeviceLink/SDLListFiles.h b/SmartDeviceLink/SDLListFiles.h index 8a58d8639..61ae4c03b 100644 --- a/SmartDeviceLink/SDLListFiles.h +++ b/SmartDeviceLink/SDLListFiles.h @@ -11,17 +11,6 @@ * * Since <b>SmartDeviceLink 2.0</b> */ -@interface SDLListFiles : SDLRPCRequest { -} -/** - * Constructs a new SDLListFiles object - */ -- (instancetype)init; -/** - * Constructs a new SDLListFiles object indicated by the dictionary parameter - * <p> - * - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLListFiles : SDLRPCRequest + @end diff --git a/SmartDeviceLink/SDLListFiles.m b/SmartDeviceLink/SDLListFiles.m index a1110df1b..e2beb0a08 100644 --- a/SmartDeviceLink/SDLListFiles.m +++ b/SmartDeviceLink/SDLListFiles.m @@ -9,13 +9,7 @@ @implementation SDLListFiles - (instancetype)init { - if (self = [super initWithName:NAMES_ListFiles]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameListFiles]) { } return self; } diff --git a/SmartDeviceLink/SDLListFilesResponse.h b/SmartDeviceLink/SDLListFilesResponse.h index fd309770c..ddd9eb03a 100644 --- a/SmartDeviceLink/SDLListFilesResponse.h +++ b/SmartDeviceLink/SDLListFilesResponse.h @@ -9,11 +9,7 @@ * * Since <b>SmartDeviceLink 2.0</b> */ -@interface SDLListFilesResponse : SDLRPCResponse { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLListFilesResponse : SDLRPCResponse @property (strong) NSMutableArray *filenames; @property (strong) NSNumber *spaceAvailable; diff --git a/SmartDeviceLink/SDLListFilesResponse.m b/SmartDeviceLink/SDLListFilesResponse.m index 2d58371d8..481e9f342 100644 --- a/SmartDeviceLink/SDLListFilesResponse.m +++ b/SmartDeviceLink/SDLListFilesResponse.m @@ -9,39 +9,33 @@ @implementation SDLListFilesResponse - (instancetype)init { - if (self = [super initWithName:NAMES_ListFiles]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameListFiles]) { } return self; } - (void)setFilenames:(NSMutableArray *)filenames { if (filenames != nil) { - [parameters setObject:filenames forKey:NAMES_filenames]; + [parameters setObject:filenames forKey:SDLNameFilenames]; } else { - [parameters removeObjectForKey:NAMES_filenames]; + [parameters removeObjectForKey:SDLNameFilenames]; } } - (NSMutableArray *)filenames { - return [parameters objectForKey:NAMES_filenames]; + return [parameters objectForKey:SDLNameFilenames]; } - (void)setSpaceAvailable:(NSNumber *)spaceAvailable { if (spaceAvailable != nil) { - [parameters setObject:spaceAvailable forKey:NAMES_spaceAvailable]; + [parameters setObject:spaceAvailable forKey:SDLNameSpaceAvailable]; } else { - [parameters removeObjectForKey:NAMES_spaceAvailable]; + [parameters removeObjectForKey:SDLNameSpaceAvailable]; } } - (NSNumber *)spaceAvailable { - return [parameters objectForKey:NAMES_spaceAvailable]; + return [parameters objectForKey:SDLNameSpaceAvailable]; } @end diff --git a/SmartDeviceLink/SDLLockScreenViewController.m b/SmartDeviceLink/SDLLockScreenViewController.m index d7028b4c9..eb2722207 100644 --- a/SmartDeviceLink/SDLLockScreenViewController.m +++ b/SmartDeviceLink/SDLLockScreenViewController.m @@ -9,6 +9,7 @@ #import "SDLLockScreenViewController.h" #import "NSBundle+SDLBundle.h" +#import "SDLGlobals.h" NS_ASSUME_NONNULL_BEGIN @@ -90,6 +91,13 @@ NS_ASSUME_NONNULL_BEGIN [self sdl_setNoIconsLayout]; } + // HAX: The autolayout doesn't scale for 4s, so hide a view so it doesn't look like garbage. + if (CGRectGetHeight([UIScreen mainScreen].bounds) == 480) { + self.sdlIconImageView.hidden = YES; + } else { + self.sdlIconImageView.hidden = NO; + } + [self.view layoutIfNeeded]; } @@ -146,26 +154,28 @@ NS_ASSUME_NONNULL_BEGIN // TODO: (Joel F.)[2016-08-22] When moved to iOS 7+, use `imageWithRenderingMode:` + (UIImage *)sdl_logoImageWithColor:(BOOL)white { - if (white) { - return [UIImage imageNamed:@"sdl_logo_white" inBundle:[NSBundle sdlBundle] compatibleWithTraitCollection:nil]; - } else { - return [UIImage imageNamed:@"sdl_logo_black" inBundle:[NSBundle sdlBundle] compatibleWithTraitCollection:nil]; - } + return [self sdl_imageWithName:[NSString stringWithFormat:@"sdl_logo_%@", white ? @"white" : @"black"]]; } + (UIImage *)sdl_arrowUpImageWithColor:(BOOL)white { - if (white) { - return [UIImage imageNamed:@"lock_arrow_up_white" inBundle:[NSBundle sdlBundle] compatibleWithTraitCollection:nil]; - } else { - return [UIImage imageNamed:@"lock_arrow_up_black" inBundle:[NSBundle sdlBundle] compatibleWithTraitCollection:nil]; - } + return [self sdl_imageWithName:[NSString stringWithFormat:@"lock_arrow_up_%@", white ? @"white" : @"black"]]; } + (UIImage *)sdl_arrowDownImageWithColor:(BOOL)white { - if (white) { - return [UIImage imageNamed:@"lock_arrow_down_white" inBundle:[NSBundle sdlBundle] compatibleWithTraitCollection:nil]; + return [self sdl_imageWithName:[NSString stringWithFormat:@"lock_arrow_down_%@", white ? @"white" : @"black"]]; +} + ++ (UIImage*)sdl_imageWithName:(NSString*)name { + if (SDL_SYSTEM_VERSION_LESS_THAN(@"8.0")) { + NSString* bundlePath = [[NSBundle sdlBundle] bundlePath]; + NSInteger deviceScale = [[UIScreen mainScreen] scale]; + // We assume we are only dealing with PNGs. + NSString* fileName = [NSString stringWithFormat:@"%@%i.png", name, deviceScale]; + NSString* fullPath = [NSString stringWithFormat:@"%@/%@", bundlePath, fileName]; + NSData* imageData = [NSData dataWithContentsOfFile:fullPath]; + return [UIImage imageWithData:imageData]; } else { - return [UIImage imageNamed:@"lock_arrow_down_black" inBundle:[NSBundle sdlBundle] compatibleWithTraitCollection:nil]; + return [UIImage imageNamed:name inBundle:[NSBundle sdlBundle] compatibleWithTraitCollection:nil]; } } @@ -185,4 +195,4 @@ NS_ASSUME_NONNULL_BEGIN @end -NS_ASSUME_NONNULL_END
\ No newline at end of file +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLMenuParams.h b/SmartDeviceLink/SDLMenuParams.h index 14f51e390..df7e394af 100644 --- a/SmartDeviceLink/SDLMenuParams.h +++ b/SmartDeviceLink/SDLMenuParams.h @@ -9,20 +9,7 @@ * * @since SDL 1.0 */ -@interface SDLMenuParams : SDLRPCStruct { -} - -/** - * Constructs a newly allocated SDLMenuParams object - */ -- (instancetype)init; - -/** - * Constructs a newly allocated SDLMenuParams object indicated by the dictionary parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; - +@interface SDLMenuParams : SDLRPCStruct /** * @abstract the unique ID of an existing submenu to which a command will be added diff --git a/SmartDeviceLink/SDLMenuParams.m b/SmartDeviceLink/SDLMenuParams.m index 84fb595a8..bfebfdb76 100644 --- a/SmartDeviceLink/SDLMenuParams.m +++ b/SmartDeviceLink/SDLMenuParams.m @@ -8,52 +8,40 @@ @implementation SDLMenuParams -- (instancetype)init { - if (self = [super init]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setParentID:(NSNumber *)parentID { if (parentID != nil) { - [store setObject:parentID forKey:NAMES_parentID]; + [store setObject:parentID forKey:SDLNameParentId]; } else { - [store removeObjectForKey:NAMES_parentID]; + [store removeObjectForKey:SDLNameParentId]; } } - (NSNumber *)parentID { - return [store objectForKey:NAMES_parentID]; + return [store objectForKey:SDLNameParentId]; } - (void)setPosition:(NSNumber *)position { if (position != nil) { - [store setObject:position forKey:NAMES_position]; + [store setObject:position forKey:SDLNamePosition]; } else { - [store removeObjectForKey:NAMES_position]; + [store removeObjectForKey:SDLNamePosition]; } } - (NSNumber *)position { - return [store objectForKey:NAMES_position]; + return [store objectForKey:SDLNamePosition]; } - (void)setMenuName:(NSString *)menuName { if (menuName != nil) { - [store setObject:menuName forKey:NAMES_menuName]; + [store setObject:menuName forKey:SDLNameMenuName]; } else { - [store removeObjectForKey:NAMES_menuName]; + [store removeObjectForKey:SDLNameMenuName]; } } - (NSString *)menuName { - return [store objectForKey:NAMES_menuName]; + return [store objectForKey:SDLNameMenuName]; } @end diff --git a/SmartDeviceLink/SDLMyKey.h b/SmartDeviceLink/SDLMyKey.h index 5fcce7668..30c1d490a 100644 --- a/SmartDeviceLink/SDLMyKey.h +++ b/SmartDeviceLink/SDLMyKey.h @@ -6,11 +6,7 @@ #import "SDLVehicleDataStatus.h" -@interface SDLMyKey : SDLRPCStruct { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLMyKey : SDLRPCStruct @property (strong) SDLVehicleDataStatus e911Override; diff --git a/SmartDeviceLink/SDLMyKey.m b/SmartDeviceLink/SDLMyKey.m index baa7c74c7..a271a063e 100644 --- a/SmartDeviceLink/SDLMyKey.m +++ b/SmartDeviceLink/SDLMyKey.m @@ -6,31 +6,18 @@ #import "SDLNames.h" #import "SDLVehicleDataStatus.h" - @implementation SDLMyKey -- (instancetype)init { - if (self = [super init]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setE911Override:(SDLVehicleDataStatus)e911Override { if (e911Override != nil) { - [store setObject:e911Override forKey:NAMES_e911Override]; + [store setObject:e911Override forKey:SDLNameE911Override]; } else { - [store removeObjectForKey:NAMES_e911Override]; + [store removeObjectForKey:SDLNameE911Override]; } } - (SDLVehicleDataStatus)e911Override { - NSObject *obj = [store objectForKey:NAMES_e911Override]; + NSObject *obj = [store objectForKey:SDLNameE911Override]; return (SDLVehicleDataStatus)obj; } diff --git a/SmartDeviceLink/SDLNames.h b/SmartDeviceLink/SDLNames.h index d4adb7dc6..9ae9173b9 100644 --- a/SmartDeviceLink/SDLNames.h +++ b/SmartDeviceLink/SDLNames.h @@ -1,410 +1,413 @@ // SDLNames.h // +#import <Foundation/Foundation.h> -#define NAMES_accPedalPosition @"accPedalPosition" -#define NAMES_actual @"actual" -#define NAMES_AddCommand @"AddCommand" -#define NAMES_addressLines @"addressLines" -#define NAMES_AddSubMenu @"AddSubMenu" -#define NAMES_airbagStatus @"airbagStatus" -#define NAMES_Alert @"Alert" -#define NAMES_AlertManeuver @"AlertManeuver" -#define NAMES_alertText1 @"alertText1" -#define NAMES_alertText2 @"alertText2" -#define NAMES_alertText3 @"alertText3" -#define NAMES_alignment @"alignment" -#define NAMES_allowed @"allowed" -#define NAMES_altitude @"altitude" -#define NAMES_ambientLightSensorStatus @"ambientLightSensorStatus" -#define NAMES_ambientLightStatus @"ambientLightStatus" -#define NAMES_appBundleID @"appBundleID" -#define NAMES_appHMIType @"appHMIType" -#define NAMES_appID @"appID" -#define NAMES_appInfo @"appInfo" -#define NAMES_appName @"appName" -#define NAMES_appDisplayName @"appDisplayName" -#define NAMES_appVersion @"appVersion" -#define NAMES_audioPassThruCapabilities @"audioPassThruCapabilities" -#define NAMES_audioPassThruDisplayText1 @"audioPassThruDisplayText1" -#define NAMES_audioPassThruDisplayText2 @"audioPassThruDisplayText2" -#define NAMES_audioStreamingState @"audioStreamingState" -#define NAMES_audioType @"audioType" -#define NAMES_autoCompleteText @"autoCompleteText" -#define NAMES_auxECallNotificationStatus @"auxECallNotificationStatus" -#define NAMES_battLevelStatus @"battLevelStatus" -#define NAMES_beltStatus @"beltStatus" -#define NAMES_bitsPerSample @"bitsPerSample" -#define NAMES_bodyInformation @"bodyInformation" -#define NAMES_btIconOn @"btIconOn" -#define NAMES_bulkData @"bulkData" -#define NAMES_buttonCapabilities @"buttonCapabilities" -#define NAMES_buttonEventMode @"buttonEventMode" -#define NAMES_buttonName @"buttonName" -#define NAMES_buttonPressMode @"buttonPressMode" -#define NAMES_c @"c" -#define NAMES_callActive @"callActive" -#define NAMES_carModeStatus @"carModeStatus" -#define NAMES_carrier @"carrier" -#define NAMES_ChangeRegistration @"ChangeRegistration" -#define NAMES_characterSet @"characterSet" -#define NAMES_choiceID @"choiceID" -#define NAMES_choiceSet @"choiceSet" -#define NAMES_clusterModes @"clusterModes" -#define NAMES_clusterModeStatus @"clusterModeStatus" -#define NAMES_cmdIcon @"cmdIcon" -#define NAMES_cmdID @"cmdID" -#define NAMES_compassDirection @"compassDirection" -#define NAMES_correlationID @"correlationID" -#define NAMES_CreateInteractionChoiceSet @"CreateInteractionChoiceSet" -#define NAMES_customButtonID @"customButtonID" -#define NAMES_customPresets @"customPresets" -#define NAMES_data @"data" -#define NAMES_dataResult @"dataResult" -#define NAMES_dataType @"dataType" -#define NAMES_DeleteCommand @"DeleteCommand" -#define NAMES_DeleteFile @"DeleteFile" -#define NAMES_DeleteInteractionChoiceSet @"DeleteInteractionChoiceSet" -#define NAMES_DeleteSubMenu @"DeleteSubMenu" -#define NAMES_deviceInfo @"deviceInfo" -#define NAMES_deviceStatus @"deviceStatus" -#define NAMES_DiagnosticMessage @"DiagnosticMessage" -#define NAMES_didLocation @"didLocation" -#define NAMES_didResult @"didResult" -#define NAMES_dimension @"dimension" -#define NAMES_displayCapabilities @"displayCapabilities" -#define NAMES_displayLayout @"displayLayout" -#define NAMES_displayType @"displayType" -#define NAMES_distanceToEmpty @"distanceToEmpty" -#define NAMES_distanceToManeuver @"distanceToManeuver" -#define NAMES_distanceToManeuverScale @"distanceToManeuverScale" -#define NAMES_doublePressAvailable @"doublePressAvailable" -#define NAMES_driverAirbagDeployed @"driverAirbagDeployed" -#define NAMES_driverBeltDeployed @"driverBeltDeployed" -#define NAMES_driverBraking @"driverBraking" -#define NAMES_driverBuckleBelted @"driverBuckleBelted" -#define NAMES_driverCurtainAirbagDeployed @"driverCurtainAirbagDeployed" -#define NAMES_driverDoorAjar @"driverDoorAjar" -#define NAMES_driverKneeAirbagDeployed @"driverKneeAirbagDeployed" -#define NAMES_driverSideAirbagDeployed @"driverSideAirbagDeployed" -#define NAMES_dtc @"dtc" -#define NAMES_dtcMask @"dtcMask" -#define NAMES_duration @"duration" -#define NAMES_e911Override @"e911Override" -#define NAMES_eCallConfirmationStatus @"eCallConfirmationStatus" -#define NAMES_eCallEventActive @"eCallEventActive" -#define NAMES_eCallInfo @"eCallInfo" -#define NAMES_eCallNotificationStatus @"eCallNotificationStatus" -#define NAMES_ecuHeader @"ecuHeader" -#define NAMES_ecuName @"ecuName" -#define NAMES_emergencyEvent @"emergencyEvent" -#define NAMES_emergencyEventType @"emergencyEventType" -#define NAMES_EncodedSyncPData @"EncodedSyncPData" -#define NAMES_EndAudioPassThru @"EndAudioPassThru" -#define NAMES_endTime @"endTime" -#define NAMES_engineTorque @"engineTorque" -#define NAMES_eta @"eta" -#define NAMES_event @"event" -#define NAMES_externalTemperature @"externalTemperature" -#define NAMES_fileName @"fileName" -#define NAMES_filenames @"filenames" -#define NAMES_fileType @"fileType" -#define NAMES_firmwareRev @"firmwareRev" -#define NAMES_fuelCutoffStatus @"fuelCutoffStatus" -#define NAMES_fuelLevel @"fuelLevel" -#define NAMES_fuelLevel_State @"fuelLevel_State" -#define NAMES_fuelMaintenanceMode @"fuelMaintenanceMode" -#define NAMES_GenericResponse @"GenericResponse" -#define NAMES_GetDTCs @"GetDTCs" -#define NAMES_GetVehicleData @"GetVehicleData" -#define NAMES_gps @"gps" -#define NAMES_graphic @"graphic" -#define NAMES_graphicSupported @"graphicSupported" -#define NAMES_hardware @"hardware" -#define NAMES_hashID @"hashID" -#define NAMES_hdop @"hdop" -#define NAMES_heading @"heading" -#define NAMES_headLampStatus @"headLampStatus" -#define NAMES_helpPrompt @"helpPrompt" -#define NAMES_highBeamsOn @"highBeamsOn" -#define NAMES_hmiDisplayLanguage @"hmiDisplayLanguage" -#define NAMES_hmiDisplayLanguageDesired @"hmiDisplayLanguageDesired" -#define NAMES_hmiLevel @"hmiLevel" -#define NAMES_hmiPermissions @"hmiPermissions" -#define NAMES_hmiCapabilities @"hmiCapabilities" -#define NAMES_hmiZoneCapabilities @"hmiZoneCapabilities" -#define NAMES_hours @"hours" -#define NAMES_id @"id" -#define NAMES_ignitionStableStatus @"ignitionStableStatus" -#define NAMES_ignitionStatus @"ignitionStatus" -#define NAMES_image @"image" -#define NAMES_imageFields @"imageFields" -#define NAMES_imageResolution @"imageResolution" -#define NAMES_imageSupported @"imageSupported" -#define NAMES_imageType @"imageType" -#define NAMES_imageTypeSupported @"imageTypeSupported" -#define NAMES_info @"info" -#define NAMES_initialPrompt @"initialPrompt" -#define NAMES_initialText @"initialText" -#define NAMES_innerLeftRear @"innerLeftRear" -#define NAMES_innerRightRear @"innerRightRear" -#define NAMES_instantFuelConsumption @"instantFuelConsumption" -#define NAMES_interactionChoiceSetID @"interactionChoiceSetID" -#define NAMES_interactionChoiceSetIDList @"interactionChoiceSetIDList" -#define NAMES_interactionLayout @"interactionLayout" -#define NAMES_interactionMode @"interactionMode" -#define NAMES_isHighlighted @"isHighlighted" -#define NAMES_isMediaApplication @"isMediaApplication" -#define NAMES_keyboardLayout @"keyboardLayout" -#define NAMES_keyboardProperties @"keyboardProperties" -#define NAMES_keypressMode @"keypressMode" -#define NAMES_language @"language" -#define NAMES_languageDesired @"languageDesired" -#define NAMES_latitudeDegrees @"latitudeDegrees" -#define NAMES_leftFront @"leftFront" -#define NAMES_leftRear @"leftRear" -#define NAMES_leftRearInflatableBelted @"leftRearInflatableBelted" -#define NAMES_leftRow2BuckleBelted @"leftRow2BuckleBelted" -#define NAMES_leftRow3BuckleBelted @"leftRow3BuckleBelted" -#define NAMES_length @"length" -#define NAMES_limitedCharacterList @"limitedCharacterList" -#define NAMES_ListFiles @"ListFiles" -#define NAMES_locationDescription @"locationDescription" -#define NAMES_locationImage @"locationImage" -#define NAMES_locationName @"locationName" -#define NAMES_longitudeDegrees @"longitudeDegrees" -#define NAMES_longPress @"longPress" -#define NAMES_longPressAvailable @"longPressAvailable" -#define NAMES_lowBeamsOn @"lowBeamsOn" -#define NAMES_mainField1 @"mainField1" -#define NAMES_mainField2 @"mainField2" -#define NAMES_mainField3 @"mainField3" -#define NAMES_mainField4 @"mainField4" -#define NAMES_majorVersion @"majorVersion" -#define NAMES_make @"make" -#define NAMES_maneuverComplete @"maneuverComplete" -#define NAMES_manualTextEntry @"manualTextEntry" -#define NAMES_maxDuration @"maxDuration" -#define NAMES_maximumChangeVelocity @"maximumChangeVelocity" -#define NAMES_maxNumberRFCOMMPorts @"maxNumberRFCOMMPorts" -#define NAMES_mediaClock @"mediaClock" -#define NAMES_mediaClockFormats @"mediaClockFormats" -#define NAMES_mediaTrack @"mediaTrack" -#define NAMES_menuIcon @"menuIcon" -#define NAMES_menuID @"menuID" -#define NAMES_menuName @"menuName" -#define NAMES_menuParams @"menuParams" -#define NAMES_menuTitle @"menuTitle" -#define NAMES_messageData @"messageData" -#define NAMES_messageDataResult @"messageDataResult" -#define NAMES_messageLength @"messageLength" -#define NAMES_middleRow1BeltDeployed @"middleRow1BeltDeployed" -#define NAMES_middleRow1BuckleBelted @"middleRow1BuckleBelted" -#define NAMES_middleRow2BuckleBelted @"middleRow2BuckleBelted" -#define NAMES_middleRow3BuckleBelted @"middleRow3BuckleBelted" -#define NAMES_minorVersion @"minorVersion" -#define NAMES_minutes @"minutes" -#define NAMES_model @"model" -#define NAMES_modelYear @"modelYear" -#define NAMES_monoAudioOutputMuted @"monoAudioOutputMuted" -#define NAMES_multipleEvents @"multipleEvents" -#define NAMES_multiTouchAvailable @"multiTouchAvailable" -#define NAMES_muteAudio @"muteAudio" -#define NAMES_myKey @"myKey" -#define NAMES_name @"name" -#define NAMES_navigation @"navigation" -#define NAMES_navigationText @"navigationText" -#define NAMES_navigationText1 @"navigationText1" -#define NAMES_navigationText2 @"navigationText2" -#define NAMES_nextTurnIcon @"nextTurnIcon" -#define NAMES_ngnMediaScreenAppName @"ngnMediaScreenAppName" -#define NAMES_notification @"notification" -#define NAMES_number @"number" -#define NAMES_numCustomPresetsAvailable @"numCustomPresetsAvailable" -#define NAMES_numTicks @"numTicks" -#define NAMES_odometer @"odometer" -#define NAMES_offset @"offset" -#define NAMES_OnAppInterfaceUnregistered @"OnAppInterfaceUnregistered" -#define NAMES_OnAudioPassThru @"OnAudioPassThru" -#define NAMES_OnButtonEvent @"OnButtonEvent" -#define NAMES_OnButtonPress @"OnButtonPress" -#define NAMES_OnCommand @"OnCommand" -#define NAMES_OnDriverDistraction @"OnDriverDistraction" -#define NAMES_OnEncodedSyncPData @"OnEncodedSyncPData" -#define NAMES_OnHashChange @"OnHashChange" -#define NAMES_OnHMIStatus @"OnHMIStatus" -#define NAMES_OnKeyboardInput @"OnKeyboardInput" -#define NAMES_OnLanguageChange @"OnLanguageChange" -#define NAMES_OnPermissionsChange @"OnPermissionsChange" -#define NAMES_onScreenPresetsAvailable @"onScreenPresetsAvailable" -#define NAMES_OnSyncPData @"OnSyncPData" -#define NAMES_OnSystemRequest @"OnSystemRequest" -#define NAMES_OnTBTClientState @"OnTBTClientState" -#define NAMES_OnTouchEvent @"OnTouchEvent" -#define NAMES_OnVehicleData @"OnVehicleData" -#define NAMES_operation_name @"name" -#define NAMES_os @"os" -#define NAMES_osVersion @"osVersion" -#define NAMES_parameterPermissions @"parameterPermissions" -#define NAMES_parameters @"parameters" -#define NAMES_parentID @"parentID" -#define NAMES_parkBrakeActive @"parkBrakeActive" -#define NAMES_passengerAirbagDeployed @"passengerAirbagDeployed" -#define NAMES_passengerBeltDeployed @"passengerBeltDeployed" -#define NAMES_passengerBuckleBelted @"passengerBuckleBelted" -#define NAMES_passengerChildDetected @"passengerChildDetected" -#define NAMES_passengerCurtainAirbagDeployed @"passengerCurtainAirbagDeployed" -#define NAMES_passengerDoorAjar @"passengerDoorAjar" -#define NAMES_passengerKneeAirbagDeployed @"passengerKneeAirbagDeployed" -#define NAMES_passengerSideAirbagDeployed @"passengerSideAirbagDeployed" -#define NAMES_pdop @"pdop" -#define NAMES_PerformAudioPassThru @"PerformAudioPassThru" -#define NAMES_PerformInteraction @"PerformInteraction" -#define NAMES_permissionItem @"permissionItem" -#define NAMES_persistentFile @"persistentFile" -#define NAMES_phoneCall @"phoneCall" -#define NAMES_phoneNumber @"phoneNumber" -#define NAMES_phoneRoaming @"phoneRoaming" -#define NAMES_playTone @"playTone" -#define NAMES_position @"position" -#define NAMES_powerModeActive @"powerModeActive" -#define NAMES_powerModeQualificationStatus @"powerModeQualificationStatus" -#define NAMES_powerModeStatus @"powerModeStatus" -#define NAMES_prerecordedSpeech @"prerecordedSpeech" -#define NAMES_presetBankCapabilities @"presetBankCapabilities" -#define NAMES_pressAvailable @"pressAvailable" -#define NAMES_pressure @"pressure" -#define NAMES_pressureTelltale @"pressureTelltale" -#define NAMES_primaryAudioSource @"primaryAudioSource" -#define NAMES_prndl @"prndl" -#define NAMES_progressIndicator @"progressIndicator" -#define NAMES_properties @"properties" -#define NAMES_PutFile @"PutFile" -#define NAMES_ReadDID @"ReadDID" -#define NAMES_rearLeftDoorAjar @"rearLeftDoorAjar" -#define NAMES_rearRightDoorAjar @"rearRightDoorAjar" -#define NAMES_reason @"reason" -#define NAMES_RegisterAppInterface @"RegisterAppInterface" -#define NAMES_request @"request" -#define NAMES_requestType @"requestType" -#define NAMES_reserved @"reserved" -#define NAMES_ResetGlobalProperties @"ResetGlobalProperties" -#define NAMES_resolution @"resolution" -#define NAMES_resolutionHeight @"resolutionHeight" -#define NAMES_resolutionWidth @"resolutionWidth" -#define NAMES_response @"response" -#define NAMES_result @"result" -#define NAMES_resultCode @"resultCode" -#define NAMES_rightFront @"rightFront" -#define NAMES_rightRear @"rightRear" -#define NAMES_rightRearInflatableBelted @"rightRearInflatableBelted" -#define NAMES_rightRow2BuckleBelted @"rightRow2BuckleBelted" -#define NAMES_rightRow3BuckleBelted @"rightRow3BuckleBelted" -#define NAMES_rolloverEvent @"rolloverEvent" -#define NAMES_rows @"rows" -#define NAMES_rpcName @"rpcName" -#define NAMES_rpm @"rpm" -#define NAMES_samplingRate @"samplingRate" -#define NAMES_satellites @"satellites" -#define NAMES_screenParams @"screenParams" -#define NAMES_ScrollableMessage @"ScrollableMessage" -#define NAMES_scrollableMessageBody @"scrollableMessageBody" -#define NAMES_sdlVersion @"sdlVersion" -#define NAMES_secondaryGraphic @"secondaryGraphic" -#define NAMES_secondaryImage @"secondaryImage" -#define NAMES_secondaryText @"secondaryText" -#define NAMES_seconds @"seconds" -#define NAMES_SendLocation @"SendLocation" -#define NAMES_SetAppIcon @"SetAppIcon" -#define NAMES_SetDisplayLayout @"SetDisplayLayout" -#define NAMES_SetGlobalProperties @"SetGlobalProperties" -#define NAMES_SetMediaClockTimer @"SetMediaClockTimer" -#define NAMES_shortPress @"shortPress" -#define NAMES_shortPressAvailable @"shortPressAvailable" -#define NAMES_Show @"Show" -#define NAMES_ShowConstantTBT @"ShowConstantTBT" -#define NAMES_signalLevelStatus @"signalLevelStatus" -#define NAMES_Slider @"Slider" -#define NAMES_sliderFooter @"sliderFooter" -#define NAMES_sliderHeader @"sliderHeader" -#define NAMES_sliderPosition @"sliderPosition" -#define NAMES_softButtonCapabilities @"softButtonCapabilities" -#define NAMES_softButtonID @"softButtonID" -#define NAMES_softButtons @"softButtons" -#define NAMES_spaceAvailable @"spaceAvailable" -#define NAMES_Speak @"Speak" -#define NAMES_speechCapabilities @"speechCapabilities" -#define NAMES_speed @"speed" -#define NAMES_startTime @"startTime" -#define NAMES_state @"state" -#define NAMES_stateOfCharge @"stateOfCharge" -#define NAMES_status @"status" -#define NAMES_statusBar @"statusBar" -#define NAMES_steeringWheelAngle @"steeringWheelAngle" -#define NAMES_stereoAudioOutputMuted @"stereoAudioOutputMuted" -#define NAMES_Subscribe @"Subscribe" -#define NAMES_SubscribeButton @"SubscribeButton" -#define NAMES_SubscribeVehicleData @"SubscribeVehicleData" -#define NAMES_success @"success" -#define NAMES_supportedDiagModes @"supportedDiagModes" -#define NAMES_syncFileName @"syncFileName" -#define NAMES_syncMsgVersion @"syncMsgVersion" -#define NAMES_SyncPData @"SyncPData" -#define NAMES_systemAction @"systemAction" -#define NAMES_systemContext @"systemContext" -#define NAMES_systemFile @"systemFile" -#define NAMES_SystemRequest @"SystemRequest" -#define NAMES_systemSoftwareVersion @"systemSoftwareVersion" -#define NAMES_DialNumber @"DialNumber" -#define NAMES_targetID @"targetID" -#define NAMES_templatesAvailable @"templatesAvailable" -#define NAMES_tertiaryText @"tertiaryText" -#define NAMES_text @"text" -#define NAMES_textFields @"textFields" -#define NAMES_textMsgAvailable @"textMsgAvailable" -#define NAMES_timeout @"timeout" -#define NAMES_Timeout @"Timeout" -#define NAMES_timeoutPrompt @"timeoutPrompt" -#define NAMES_timeToDestination @"timeToDestination" -#define NAMES_tirePressure @"tirePressure" -#define NAMES_totalDistance @"totalDistance" -#define NAMES_touchEventAvailable @"touchEventAvailable" -#define NAMES_triggerSource @"triggerSource" -#define NAMES_trim @"trim" -#define NAMES_tryAgainTime @"tryAgainTime" -#define NAMES_ts @"ts" -#define NAMES_ttsChunks @"ttsChunks" -#define NAMES_ttsName @"ttsName" -#define NAMES_turnIcon @"turnIcon" -#define NAMES_turnList @"turnList" -#define NAMES_type @"type" -#define NAMES_UnregisterAppInterface @"UnregisterAppInterface" -#define NAMES_Unsubscribe @"Unsubscribe" -#define NAMES_UnsubscribeButton @"UnsubscribeButton" -#define NAMES_UnsubscribeVehicleData @"UnsubscribeVehicleData" -#define NAMES_updateMode @"updateMode" -#define NAMES_UpdateTurnList @"UpdateTurnList" -#define NAMES_upDownAvailable @"upDownAvailable" -#define NAMES_url @"url" -#define NAMES_URL @"URL" -#define NAMES_userDisallowed @"userDisallowed" -#define NAMES_utcDay @"utcDay" -#define NAMES_utcHours @"utcHours" -#define NAMES_utcMinutes @"utcMinutes" -#define NAMES_utcMonth @"utcMonth" -#define NAMES_utcSeconds @"utcSeconds" -#define NAMES_utcYear @"utcYear" -#define NAMES_value @"value" -#define NAMES_vdop @"vdop" -#define NAMES_vehicleType @"vehicleType" -#define NAMES_vin @"vin" -#define NAMES_voiceRecOn @"voiceRecOn" -#define NAMES_vrCapabilities @"vrCapabilities" -#define NAMES_vrCommands @"vrCommands" -#define NAMES_vrHelp @"vrHelp" -#define NAMES_vrHelpTitle @"vrHelpTitle" -#define NAMES_vrSynonyms @"vrSynonyms" -#define NAMES_width @"width" -#define NAMES_wiperStatus @"wiperStatus" -#define NAMES_x @"x" -#define NAMES_y @"y" +typedef NSString* SDLName NS_STRING_ENUM; + +extern SDLName const SDLNameAccelerationPedalPosition; +extern SDLName const SDLNameActual; +extern SDLName const SDLNameAddCommand; +extern SDLName const SDLNameAddressLines; +extern SDLName const SDLNameAddSubMenu; +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 SDLNameAllowed; +extern SDLName const SDLNameAltitude; +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 SDLNameAudioPassThruCapabilities; +extern SDLName const SDLNameAudioPassThruDisplayText1; +extern SDLName const SDLNameAudioPassThruDisplayText2; +extern SDLName const SDLNameAudioStreamingState; +extern SDLName const SDLNameAudioType; +extern SDLName const SDLNameAutoCompleteText; +extern SDLName const SDLNameAuxECallNotificationStatus; +extern SDLName const SDLNameBatteryLevelStatus; +extern SDLName const SDLNameBeltStatus; +extern SDLName const SDLNameBitsPerSample; +extern SDLName const SDLNameBodyInformation; +extern SDLName const SDLNameBluetoothIconOn; +extern SDLName const SDLNameBulkData; +extern SDLName const SDLNameButtonCapabilities; +extern SDLName const SDLNameButtonEventMode; +extern SDLName const SDLNameButtonName; +extern SDLName const SDLNameButtonPressMode; +extern SDLName const SDLNameCoordinate; +extern SDLName const SDLNameCallActive; +extern SDLName const SDLNameCarModeStatus; +extern SDLName const SDLNameCarrier; +extern SDLName const SDLNameChangeRegistration; +extern SDLName const SDLNameCharacterSet; +extern SDLName const SDLNameChoiceId; +extern SDLName const SDLNameChoiceSet; +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 SDLNameCreateInteractionChoiceSet; +extern SDLName const SDLNameCustomButtonId; +extern SDLName const SDLNameCustomPresets; +extern SDLName const SDLNameData; +extern SDLName const SDLNameDataResult; +extern SDLName const SDLNameDataType; +extern SDLName const SDLNameDeleteCommand; +extern SDLName const SDLNameDeleteFile; +extern SDLName const SDLNameDeleteInteractionChoiceSet; +extern SDLName const SDLNameDeleteSubMenu; +extern SDLName const SDLNameDeviceInfo; +extern SDLName const SDLNameDeviceStatus; +extern SDLName const SDLNameDiagnosticMessage; +extern SDLName const SDLNameDIDLocation; +extern SDLName const SDLNameDIDResult; +extern SDLName const SDLNameDimension; +extern SDLName const SDLNameDisplayCapabilities; +extern SDLName const SDLNameDisplayLayout; +extern SDLName const SDLNameDisplayType; +extern SDLName const SDLNameDistanceToEmpty; +extern SDLName const SDLNameDistanceToManeuver; +extern SDLName const SDLNameDistanceToManeuverScale; +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 SDLNameDriverDoorAjar; +extern SDLName const SDLNameDriverKneeAirbagDeployed; +extern SDLName const SDLNameDriverSideAirbagDeployed; +extern SDLName const SDLNameDTC; +extern SDLName const SDLNameDTCMask; +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 SDLNameEmergencyEvent; +extern SDLName const SDLNameEmergencyEventType; +extern SDLName const SDLNameEncodedSyncPData; +extern SDLName const SDLNameEndAudioPassThru; +extern SDLName const SDLNameEndTime; +extern SDLName const SDLNameEngineTorque; +extern SDLName const SDLNameETA; +extern SDLName const SDLNameEvent; +extern SDLName const SDLNameExternalTemperature; +extern SDLName const SDLNameFilename; +extern SDLName const SDLNameFilenames; +extern SDLName const SDLNameFileType; +extern SDLName const SDLNameFirmwareRevision; +extern SDLName const SDLNameFuelCutoffStatus; +extern SDLName const SDLNameFuelLevel; +extern SDLName const SDLNameFuelLevelState; +extern SDLName const SDLNameFuelMaintenanceMode; +extern SDLName const SDLNameGenericResponse; +extern SDLName const SDLNameGetDTCs; +extern SDLName const SDLNameGetVehicleData; +extern SDLName const SDLNameGPS; +extern SDLName const SDLNameGraphic; +extern SDLName const SDLNameGraphicSupported; +extern SDLName const SDLNameHardware; +extern SDLName const SDLNameHashId; +extern SDLName const SDLNameHDOP; +extern SDLName const SDLNameHeading; +extern SDLName const SDLNameHeadLampStatus; +extern SDLName const SDLNameHelpPrompt; +extern SDLName const SDLNameHighBeamsOn; +extern SDLName const SDLNameHMIDisplayLanguage; +extern SDLName const SDLNameHMIDisplayLanguageDesired; +extern SDLName const SDLNameHMILevel; +extern SDLName const SDLNameHMIPermissions; +extern SDLName const SDLNameHMICapabilities; +extern SDLName const SDLNameHMIZoneCapabilities; +extern SDLName const SDLNameHours; +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 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 SDLNameKeyboardLayout; +extern SDLName const SDLNameKeyboardProperties; +extern SDLName const SDLNameKeypressMode; +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 SDLNameLimitedCharacterList; +extern SDLName const SDLNameListFiles; +extern SDLName const SDLNameLocationDescription; +extern SDLName const SDLNameLocationImage; +extern SDLName const SDLNameLocationName; +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 SDLNameMajorVersion; +extern SDLName const SDLNameMake; +extern SDLName const SDLNameManeuverComplete; +extern SDLName const SDLNameManualTextEntry; +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 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 SDLNameMiddleRow1BeltDeployed; +extern SDLName const SDLNameMiddleRow1BuckleBelted; +extern SDLName const SDLNameMiddleRow2BuckleBelted; +extern SDLName const SDLNameMiddleRow3BuckleBelted; +extern SDLName const SDLNameMinorVersion; +extern SDLName const SDLNameMinutes; +extern SDLName const SDLNameModel; +extern SDLName const SDLNameModelYear; +extern SDLName const SDLNameMonoAudioOutputMuted; +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 SDLNameNavigationText; +extern SDLName const SDLNameNavigationText1; +extern SDLName const SDLNameNavigationText2; +extern SDLName const SDLNameNextTurnIcon; +extern SDLName const SDLNameNGNMediaScreenAppName; +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 SDLNameOnKeyboardInput; +extern SDLName const SDLNameOnLanguageChange; +extern SDLName const SDLNameOnPermissionsChange; +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 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 SDLNamePDOP; +extern SDLName const SDLNamePerformAudioPassThru; +extern SDLName const SDLNamePerformInteraction; +extern SDLName const SDLNamePermissionItem; +extern SDLName const SDLNamePersistentFile; +extern SDLName const SDLNamePhoneCall; +extern SDLName const SDLNamePhoneNumber; +extern SDLName const SDLNamePhoneRoaming; +extern SDLName const SDLNamePlayTone; +extern SDLName const SDLNamePosition; +extern SDLName const SDLNamePowerModeActive; +extern SDLName const SDLNamePowerModeQualificationStatus; +extern SDLName const SDLNamePowerModeStatus; +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 SDLNamePRNDL; +extern SDLName const SDLNameProgressIndicator; +extern SDLName const SDLNameProperties; +extern SDLName const SDLNamePutFile; +extern SDLName const SDLNameReadDID; +extern SDLName const SDLNameRearLeftDoorAjar; +extern SDLName const SDLNameRearRightDoorAjar; +extern SDLName const SDLNameReason; +extern SDLName const SDLNameRegisterAppInterface; +extern SDLName const SDLNameRequest; +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 SDLNameSamplingRate; +extern SDLName const SDLNameSatellites; +extern SDLName const SDLNameScreenParams; +extern SDLName const SDLNameScrollableMessage; +extern SDLName const SDLNameScrollableMessageBody; +extern SDLName const SDLNameSDLVersion; +extern SDLName const SDLNameSecondaryGraphic; +extern SDLName const SDLNameSecondaryImage; +extern SDLName const SDLNameSecondaryText; +extern SDLName const SDLNameSeconds; +extern SDLName const SDLNameSendLocation; +extern SDLName const SDLNameSetAppIcon; +extern SDLName const SDLNameSetDisplayLayout; +extern SDLName const SDLNameSetGlobalProperties; +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 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 SDLNameSpaceAvailable; +extern SDLName const SDLNameSpeak; +extern SDLName const SDLNameSpeechCapabilities; +extern SDLName const SDLNameSpeed; +extern SDLName const SDLNameStartTime; +extern SDLName const SDLNameState; +extern SDLName const SDLNameStateOfCharge; +extern SDLName const SDLNameStatus; +extern SDLName const SDLNameStatusBar; +extern SDLName const SDLNameSteeringWheelAngle; +extern SDLName const SDLNameStereoAudioOutputMuted; +extern SDLName const SDLNameSubscribe; +extern SDLName const SDLNameSubscribeButton; +extern SDLName const SDLNameSubscribeVehicleData; +extern SDLName const SDLNameSuccess; +extern SDLName const SDLNameSupportedDiagnosticModes; +extern SDLName const SDLNameSyncFileName; +extern SDLName const SDLNameSyncMessageVersion; +extern SDLName const SDLNameSyncPData; +extern SDLName const SDLNameSystemAction; +extern SDLName const SDLNameSystemContext; +extern SDLName const SDLNameSystemFile; +extern SDLName const SDLNameSystemRequest; +extern SDLName const SDLNameSystemSoftwareVersion; +extern SDLName const SDLNameDialNumber; +extern SDLName const SDLNameTargetId; +extern SDLName const SDLNameTemplatesAvailable; +extern SDLName const SDLNameTertiaryText; +extern SDLName const SDLNameText; +extern SDLName const SDLNameTextFields; +extern SDLName const SDLNameTextMessageAvailable; +extern SDLName const SDLNameTimeout; +extern SDLName const SDLNameTimeoutCapitalized; +extern SDLName const SDLNameTimeoutPrompt; +extern SDLName const SDLNameTimeToDestination; +extern SDLName const SDLNameTirePressure; +extern SDLName const SDLNameTotalDistance; +extern SDLName const SDLNameTouchEventAvailable; +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 SDLNameType; +extern SDLName const SDLNameUnregisterAppInterface; +extern SDLName const SDLNameUnsubscribe; +extern SDLName const SDLNameUnsubscribeButton; +extern SDLName const SDLNameUnsubscribeVehicleData; +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 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 SDLNameVIN; +extern SDLName const SDLNameVoiceRecognitionOn; +extern SDLName const SDLNameVRCapabilities; +extern SDLName const SDLNameVRCommands; +extern SDLName const SDLNameVRHelp; +extern SDLName const SDLNameVRHelpTitle; +extern SDLName const SDLNameVRSynonyms; +extern SDLName const SDLNameWidth; +extern SDLName const SDLNameWiperStatus; +extern SDLName const SDLNameX; +extern SDLName const SDLNameY; diff --git a/SmartDeviceLink/SDLNames.m b/SmartDeviceLink/SDLNames.m new file mode 100644 index 000000000..a3314d1bd --- /dev/null +++ b/SmartDeviceLink/SDLNames.m @@ -0,0 +1,411 @@ +// SDLNames.h +// + +#import "SDLNames.h" + +SDLName const SDLNameAccelerationPedalPosition = @"accPedalPosition"; +SDLName const SDLNameActual = @"actual"; +SDLName const SDLNameAddCommand = @"AddCommand"; +SDLName const SDLNameAddressLines = @"addressLines"; +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 SDLNameAltitude = @"altitude"; +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 SDLNameAudioPassThruCapabilities = @"audioPassThruCapabilities"; +SDLName const SDLNameAudioPassThruDisplayText1 = @"audioPassThruDisplayText1"; +SDLName const SDLNameAudioPassThruDisplayText2 = @"audioPassThruDisplayText2"; +SDLName const SDLNameAudioStreamingState = @"audioStreamingState"; +SDLName const SDLNameAudioType = @"audioType"; +SDLName const SDLNameAutoCompleteText = @"autoCompleteText"; +SDLName const SDLNameAuxECallNotificationStatus = @"auxECallNotificationStatus"; +SDLName const SDLNameBatteryLevelStatus = @"battLevelStatus"; +SDLName const SDLNameBeltStatus = @"beltStatus"; +SDLName const SDLNameBitsPerSample = @"bitsPerSample"; +SDLName const SDLNameBodyInformation = @"bodyInformation"; +SDLName const SDLNameBluetoothIconOn = @"btIconOn"; +SDLName const SDLNameBulkData = @"bulkData"; +SDLName const SDLNameButtonCapabilities = @"buttonCapabilities"; +SDLName const SDLNameButtonEventMode = @"buttonEventMode"; +SDLName const SDLNameButtonName = @"buttonName"; +SDLName const SDLNameButtonPressMode = @"buttonPressMode"; +SDLName const SDLNameCoordinate = @"c"; +SDLName const SDLNameCallActive = @"callActive"; +SDLName const SDLNameCarModeStatus = @"carModeStatus"; +SDLName const SDLNameCarrier = @"carrier"; +SDLName const SDLNameChangeRegistration = @"ChangeRegistration"; +SDLName const SDLNameCharacterSet = @"characterSet"; +SDLName const SDLNameChoiceId = @"choiceID"; +SDLName const SDLNameChoiceSet = @"choiceSet"; +SDLName const SDLNameClusterModes = @"clusterModes"; +SDLName const SDLNameClusterModeStatus = @"clusterModeStatus"; +SDLName const SDLNameCommandIcon = @"cmdIcon"; +SDLName const SDLNameCommandId = @"cmdID"; +SDLName const SDLNameCompassDirection = @"compassDirection"; +SDLName const SDLNameCorrelationId = @"correlationID"; +SDLName const SDLNameCreateInteractionChoiceSet = @"CreateInteractionChoiceSet"; +SDLName const SDLNameCustomButtonId = @"customButtonID"; +SDLName const SDLNameCustomPresets = @"customPresets"; +SDLName const SDLNameData = @"data"; +SDLName const SDLNameDataResult = @"dataResult"; +SDLName const SDLNameDataType = @"dataType"; +SDLName const SDLNameDeleteCommand = @"DeleteCommand"; +SDLName const SDLNameDeleteFile = @"DeleteFile"; +SDLName const SDLNameDeleteInteractionChoiceSet = @"DeleteInteractionChoiceSet"; +SDLName const SDLNameDeleteSubMenu = @"DeleteSubMenu"; +SDLName const SDLNameDeviceInfo = @"deviceInfo"; +SDLName const SDLNameDeviceStatus = @"deviceStatus"; +SDLName const SDLNameDiagnosticMessage = @"DiagnosticMessage"; +SDLName const SDLNameDIDLocation = @"didLocation"; +SDLName const SDLNameDIDResult = @"didResult"; +SDLName const SDLNameDimension = @"dimension"; +SDLName const SDLNameDisplayCapabilities = @"displayCapabilities"; +SDLName const SDLNameDisplayLayout = @"displayLayout"; +SDLName const SDLNameDisplayType = @"displayType"; +SDLName const SDLNameDistanceToEmpty = @"distanceToEmpty"; +SDLName const SDLNameDistanceToManeuver = @"distanceToManeuver"; +SDLName const SDLNameDistanceToManeuverScale = @"distanceToManeuverScale"; +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 SDLNameDriverDoorAjar = @"driverDoorAjar"; +SDLName const SDLNameDriverKneeAirbagDeployed = @"driverKneeAirbagDeployed"; +SDLName const SDLNameDriverSideAirbagDeployed = @"driverSideAirbagDeployed"; +SDLName const SDLNameDTC = @"dtc"; +SDLName const SDLNameDTCMask = @"dtcMask"; +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 SDLNameEmergencyEvent = @"emergencyEvent"; +SDLName const SDLNameEmergencyEventType = @"emergencyEventType"; +SDLName const SDLNameEncodedSyncPData = @"EncodedSyncPData"; +SDLName const SDLNameEndAudioPassThru = @"EndAudioPassThru"; +SDLName const SDLNameEndTime = @"endTime"; +SDLName const SDLNameEngineTorque = @"engineTorque"; +SDLName const SDLNameETA = @"eta"; +SDLName const SDLNameEvent = @"event"; +SDLName const SDLNameExternalTemperature = @"externalTemperature"; +SDLName const SDLNameFilename = @"fileName"; +SDLName const SDLNameFilenames = @"filenames"; +SDLName const SDLNameFileType = @"fileType"; +SDLName const SDLNameFirmwareRevision = @"firmwareRev"; +SDLName const SDLNameFuelCutoffStatus = @"fuelCutoffStatus"; +SDLName const SDLNameFuelLevel = @"fuelLevel"; +SDLName const SDLNameFuelLevelState = @"fuelLevel_State"; +SDLName const SDLNameFuelMaintenanceMode = @"fuelMaintenanceMode"; +SDLName const SDLNameGenericResponse = @"GenericResponse"; +SDLName const SDLNameGetDTCs = @"GetDTCs"; +SDLName const SDLNameGetVehicleData = @"GetVehicleData"; +SDLName const SDLNameGPS = @"gps"; +SDLName const SDLNameGraphic = @"graphic"; +SDLName const SDLNameGraphicSupported = @"graphicSupported"; +SDLName const SDLNameHardware = @"hardware"; +SDLName const SDLNameHashId = @"hashID"; +SDLName const SDLNameHDOP = @"hdop"; +SDLName const SDLNameHeading = @"heading"; +SDLName const SDLNameHeadLampStatus = @"headLampStatus"; +SDLName const SDLNameHelpPrompt = @"helpPrompt"; +SDLName const SDLNameHighBeamsOn = @"highBeamsOn"; +SDLName const SDLNameHMIDisplayLanguage = @"hmiDisplayLanguage"; +SDLName const SDLNameHMIDisplayLanguageDesired = @"hmiDisplayLanguageDesired"; +SDLName const SDLNameHMILevel = @"hmiLevel"; +SDLName const SDLNameHMIPermissions = @"hmiPermissions"; +SDLName const SDLNameHMICapabilities = @"hmiCapabilities"; +SDLName const SDLNameHMIZoneCapabilities = @"hmiZoneCapabilities"; +SDLName const SDLNameHours = @"hours"; +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 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 SDLNameKeyboardLayout = @"keyboardLayout"; +SDLName const SDLNameKeyboardProperties = @"keyboardProperties"; +SDLName const SDLNameKeypressMode = @"keypressMode"; +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 SDLNameLimitedCharacterList = @"limitedCharacterList"; +SDLName const SDLNameListFiles = @"ListFiles"; +SDLName const SDLNameLocationDescription = @"locationDescription"; +SDLName const SDLNameLocationImage = @"locationImage"; +SDLName const SDLNameLocationName = @"locationName"; +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 SDLNameMaxDuration = @"maxDuration"; +SDLName const SDLNameMaximumChangeVelocity = @"maximumChangeVelocity"; +SDLName const SDLNameMaxNumberRFCOMMPorts = @"maxNumberRFCOMMPorts"; +SDLName const SDLNameMediaClock = @"mediaClock"; +SDLName const SDLNameMediaClockFormats = @"mediaClockFormats"; +SDLName const SDLNameMediaTrack = @"mediaTrack"; +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 SDLNameMiddleRow1BeltDeployed = @"middleRow1BeltDeployed"; +SDLName const SDLNameMiddleRow1BuckleBelted = @"middleRow1BuckleBelted"; +SDLName const SDLNameMiddleRow2BuckleBelted = @"middleRow2BuckleBelted"; +SDLName const SDLNameMiddleRow3BuckleBelted = @"middleRow3BuckleBelted"; +SDLName const SDLNameMinorVersion = @"minorVersion"; +SDLName const SDLNameMinutes = @"minutes"; +SDLName const SDLNameModel = @"model"; +SDLName const SDLNameModelYear = @"modelYear"; +SDLName const SDLNameMonoAudioOutputMuted = @"monoAudioOutputMuted"; +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 SDLNameNavigationText = @"navigationText"; +SDLName const SDLNameNavigationText1 = @"navigationText1"; +SDLName const SDLNameNavigationText2 = @"navigationText2"; +SDLName const SDLNameNextTurnIcon = @"nextTurnIcon"; +SDLName const SDLNameNGNMediaScreenAppName = @"ngnMediaScreenAppName"; +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 SDLNameOnKeyboardInput = @"OnKeyboardInput"; +SDLName const SDLNameOnLanguageChange = @"OnLanguageChange"; +SDLName const SDLNameOnPermissionsChange = @"OnPermissionsChange"; +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 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 SDLNamePDOP = @"pdop"; +SDLName const SDLNamePerformAudioPassThru = @"PerformAudioPassThru"; +SDLName const SDLNamePerformInteraction = @"PerformInteraction"; +SDLName const SDLNamePermissionItem = @"permissionItem"; +SDLName const SDLNamePersistentFile = @"persistentFile"; +SDLName const SDLNamePhoneCall = @"phoneCall"; +SDLName const SDLNamePhoneNumber = @"phoneNumber"; +SDLName const SDLNamePhoneRoaming = @"phoneRoaming"; +SDLName const SDLNamePlayTone = @"playTone"; +SDLName const SDLNamePosition = @"position"; +SDLName const SDLNamePowerModeActive = @"powerModeActive"; +SDLName const SDLNamePowerModeQualificationStatus = @"powerModeQualificationStatus"; +SDLName const SDLNamePowerModeStatus = @"powerModeStatus"; +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 SDLNamePutFile = @"PutFile"; +SDLName const SDLNameReadDID = @"ReadDID"; +SDLName const SDLNameRearLeftDoorAjar = @"rearLeftDoorAjar"; +SDLName const SDLNameRearRightDoorAjar = @"rearRightDoorAjar"; +SDLName const SDLNameReason = @"reason"; +SDLName const SDLNameRegisterAppInterface = @"RegisterAppInterface"; +SDLName const SDLNameRequest = @"request"; +SDLName const SDLNameRequestType = @"requestType"; +SDLName const SDLNameReserved = @"reserved"; +SDLName const SDLNameResetGlobalProperties = @"ResetGlobalProperties"; +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 SDLNameSamplingRate = @"samplingRate"; +SDLName const SDLNameSatellites = @"satellites"; +SDLName const SDLNameScreenParams = @"screenParams"; +SDLName const SDLNameScrollableMessage = @"ScrollableMessage"; +SDLName const SDLNameScrollableMessageBody = @"scrollableMessageBody"; +SDLName const SDLNameSDLVersion = @"sdlVersion"; +SDLName const SDLNameSecondaryGraphic = @"secondaryGraphic"; +SDLName const SDLNameSecondaryImage = @"secondaryImage"; +SDLName const SDLNameSecondaryText = @"secondaryText"; +SDLName const SDLNameSeconds = @"seconds"; +SDLName const SDLNameSendLocation = @"SendLocation"; +SDLName const SDLNameSetAppIcon = @"SetAppIcon"; +SDLName const SDLNameSetDisplayLayout = @"SetDisplayLayout"; +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 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 SDLNameSpaceAvailable = @"spaceAvailable"; +SDLName const SDLNameSpeak = @"Speak"; +SDLName const SDLNameSpeechCapabilities = @"speechCapabilities"; +SDLName const SDLNameSpeed = @"speed"; +SDLName const SDLNameStartTime = @"startTime"; +SDLName const SDLNameState = @"state"; +SDLName const SDLNameStateOfCharge = @"stateOfCharge"; +SDLName const SDLNameStatus = @"status"; +SDLName const SDLNameStatusBar = @"statusBar"; +SDLName const SDLNameSteeringWheelAngle = @"steeringWheelAngle"; +SDLName const SDLNameStereoAudioOutputMuted = @"stereoAudioOutputMuted"; +SDLName const SDLNameSubscribe = @"Subscribe"; +SDLName const SDLNameSubscribeButton = @"SubscribeButton"; +SDLName const SDLNameSubscribeVehicleData = @"SubscribeVehicleData"; +SDLName const SDLNameSuccess = @"success"; +SDLName const SDLNameSupportedDiagnosticModes = @"supportedDiagModes"; +SDLName const SDLNameSyncFileName = @"syncFileName"; +SDLName const SDLNameSyncMessageVersion = @"syncMessageVersion"; +SDLName const SDLNameSyncPData = @"SyncPData"; +SDLName const SDLNameSystemAction = @"systemAction"; +SDLName const SDLNameSystemContext = @"systemContext"; +SDLName const SDLNameSystemFile = @"systemFile"; +SDLName const SDLNameSystemRequest = @"SystemRequest"; +SDLName const SDLNameSystemSoftwareVersion = @"systemSoftwareVersion"; +SDLName const SDLNameDialNumber = @"DialNumber"; +SDLName const SDLNameTargetId = @"targetID"; +SDLName const SDLNameTemplatesAvailable = @"templatesAvailable"; +SDLName const SDLNameTertiaryText = @"tertiaryText"; +SDLName const SDLNameText = @"text"; +SDLName const SDLNameTextFields = @"textFields"; +SDLName const SDLNameTextMessageAvailable = @"textMessageAvailable"; +SDLName const SDLNameTimeout = @"timeout"; +SDLName const SDLNameTimeoutCapitalized = @"Timeout"; +SDLName const SDLNameTimeoutPrompt = @"timeoutPrompt"; +SDLName const SDLNameTimeToDestination = @"timeToDestination"; +SDLName const SDLNameTirePressure = @"tirePressure"; +SDLName const SDLNameTotalDistance = @"totalDistance"; +SDLName const SDLNameTouchEventAvailable = @"touchEventAvailable"; +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 SDLNameType = @"type"; +SDLName const SDLNameUnregisterAppInterface = @"UnregisterAppInterface"; +SDLName const SDLNameUnsubscribe = @"Unsubscribe"; +SDLName const SDLNameUnsubscribeButton = @"UnsubscribeButton"; +SDLName const SDLNameUnsubscribeVehicleData = @"UnsubscribeVehicleData"; +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 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 SDLNameVIN = @"vin"; +SDLName const SDLNameVoiceRecognitionOn = @"voiceRecOn"; +SDLName const SDLNameVRCapabilities = @"vrCapabilities"; +SDLName const SDLNameVRCommands = @"vrCommands"; +SDLName const SDLNameVRHelp = @"vrHelp"; +SDLName const SDLNameVRHelpTitle = @"vrHelpTitle"; +SDLName const SDLNameVRSynonyms = @"vrSynonyms"; +SDLName const SDLNameWidth = @"width"; +SDLName const SDLNameWiperStatus = @"wiperStatus"; +SDLName const SDLNameX = @"x"; +SDLName const SDLNameY = @"y"; diff --git a/SmartDeviceLink/SDLNotificationConstants.h b/SmartDeviceLink/SDLNotificationConstants.h index fa367124c..29aaf5528 100644 --- a/SmartDeviceLink/SDLNotificationConstants.h +++ b/SmartDeviceLink/SDLNotificationConstants.h @@ -14,7 +14,15 @@ NS_ASSUME_NONNULL_BEGIN -typedef NSNotificationName SDLNotificationName; +// Resolves issue of using Swift 3 and pre-iOS 10 versions due to NSNotificationName unavailability. +#if __IPHONE_OS_VERSION_MAX_ALLOWED <= __IPHONE_9_3 + #define NOTIFICATION_TYPEDEF NSString* +#else + #define NOTIFICATION_TYPEDEF NSNotificationName +#endif + +typedef NOTIFICATION_TYPEDEF SDLNotificationName; + typedef NSString *SDLNotificationUserInfoKey; #pragma mark - Blocks diff --git a/SmartDeviceLink/SDLOnAppInterfaceUnregistered.h b/SmartDeviceLink/SDLOnAppInterfaceUnregistered.h index 0550ef70b..5da94fb56 100644 --- a/SmartDeviceLink/SDLOnAppInterfaceUnregistered.h +++ b/SmartDeviceLink/SDLOnAppInterfaceUnregistered.h @@ -14,18 +14,7 @@ * @since SDL 1.0 * @see SDLRegisterAppInterface */ -@interface SDLOnAppInterfaceUnregistered : SDLRPCNotification { -} - -/** - * Constructs a newly allocated SDLOnAppInterfaceUnregistered object - */ -- (instancetype)init; -/** - * Constructs a newly allocated SDLOnAppInterfaceUnregistered object indicated by the dictionary parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLOnAppInterfaceUnregistered : SDLRPCNotification /** * @abstract The reason application's interface was terminated diff --git a/SmartDeviceLink/SDLOnAppInterfaceUnregistered.m b/SmartDeviceLink/SDLOnAppInterfaceUnregistered.m index f09034988..60ae29be8 100644 --- a/SmartDeviceLink/SDLOnAppInterfaceUnregistered.m +++ b/SmartDeviceLink/SDLOnAppInterfaceUnregistered.m @@ -8,27 +8,21 @@ @implementation SDLOnAppInterfaceUnregistered - (instancetype)init { - if (self = [super initWithName:NAMES_OnAppInterfaceUnregistered]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameOnAppInterfaceUnregistered]) { } return self; } - (void)setReason:(SDLAppInterfaceUnregisteredReason)reason { if (reason != nil) { - [parameters setObject:reason forKey:NAMES_reason]; + [parameters setObject:reason forKey:SDLNameReason]; } else { - [parameters removeObjectForKey:NAMES_reason]; + [parameters removeObjectForKey:SDLNameReason]; } } - (SDLAppInterfaceUnregisteredReason)reason { - NSObject *obj = [parameters objectForKey:NAMES_reason]; + NSObject *obj = [parameters objectForKey:SDLNameReason]; return (SDLAppInterfaceUnregisteredReason)obj; } diff --git a/SmartDeviceLink/SDLOnAudioPassThru.h b/SmartDeviceLink/SDLOnAudioPassThru.h index f37d4067e..1f9c5d74b 100644 --- a/SmartDeviceLink/SDLOnAudioPassThru.h +++ b/SmartDeviceLink/SDLOnAudioPassThru.h @@ -23,17 +23,6 @@ * </ul> * </ul> */ -@interface SDLOnAudioPassThru : SDLRPCNotification { -} +@interface SDLOnAudioPassThru : SDLRPCNotification -/** - *Constructs a newly allocated SDLOnAudioPassThru object - */ -- (instancetype)init; - -/** - * Constructs a newly allocated SDLOnAudioPassThru object indicated by the dictionary parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; @end diff --git a/SmartDeviceLink/SDLOnAudioPassThru.m b/SmartDeviceLink/SDLOnAudioPassThru.m index e0360e3e4..72f23e5ef 100644 --- a/SmartDeviceLink/SDLOnAudioPassThru.m +++ b/SmartDeviceLink/SDLOnAudioPassThru.m @@ -9,13 +9,7 @@ @implementation SDLOnAudioPassThru - (instancetype)init { - if (self = [super initWithName:NAMES_OnAudioPassThru]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameOnAudioPassThru]) { } return self; } diff --git a/SmartDeviceLink/SDLOnButtonEvent.h b/SmartDeviceLink/SDLOnButtonEvent.h index 736b5ebc8..498412ab0 100644 --- a/SmartDeviceLink/SDLOnButtonEvent.h +++ b/SmartDeviceLink/SDLOnButtonEvent.h @@ -43,20 +43,7 @@ * * @since SDL 1.0 */ -@interface SDLOnButtonEvent : SDLRPCNotification { -} - -/** - * Constructs a newly allocated SDLOnButtonEvent object - */ -- (instancetype)init; - -/** - * @abstract Constructs a newly allocated SDLOnButtonEvent object indicated by the dictionary parameter - * - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLOnButtonEvent : SDLRPCNotification /** * @abstract The name of the button diff --git a/SmartDeviceLink/SDLOnButtonEvent.m b/SmartDeviceLink/SDLOnButtonEvent.m index de0ab511a..89237fb53 100644 --- a/SmartDeviceLink/SDLOnButtonEvent.m +++ b/SmartDeviceLink/SDLOnButtonEvent.m @@ -5,57 +5,50 @@ #import "SDLNames.h" - @implementation SDLOnButtonEvent - (instancetype)init { - if (self = [super initWithName:NAMES_OnButtonEvent]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameOnButtonEvent]) { } return self; } - (void)setButtonName:(SDLButtonName)buttonName { if (buttonName != nil) { - [parameters setObject:buttonName forKey:NAMES_buttonName]; + [parameters setObject:buttonName forKey:SDLNameButtonName]; } else { - [parameters removeObjectForKey:NAMES_buttonName]; + [parameters removeObjectForKey:SDLNameButtonName]; } } - (SDLButtonName)buttonName { - NSObject *obj = [parameters objectForKey:NAMES_buttonName]; + NSObject *obj = [parameters objectForKey:SDLNameButtonName]; return (SDLButtonName)obj; } - (void)setButtonEventMode:(SDLButtonEventMode)buttonEventMode { if (buttonEventMode != nil) { - [parameters setObject:buttonEventMode forKey:NAMES_buttonEventMode]; + [parameters setObject:buttonEventMode forKey:SDLNameButtonEventMode]; } else { - [parameters removeObjectForKey:NAMES_buttonEventMode]; + [parameters removeObjectForKey:SDLNameButtonEventMode]; } } - (SDLButtonEventMode)buttonEventMode { - NSObject *obj = [parameters objectForKey:NAMES_buttonEventMode]; + NSObject *obj = [parameters objectForKey:SDLNameButtonEventMode]; return (SDLButtonEventMode)obj; } - (void)setCustomButtonID:(NSNumber *)customButtonID { if (customButtonID != nil) { - [parameters setObject:customButtonID forKey:NAMES_customButtonID]; + [parameters setObject:customButtonID forKey:SDLNameCustomButtonId]; } else { - [parameters removeObjectForKey:NAMES_customButtonID]; + [parameters removeObjectForKey:SDLNameCustomButtonId]; } } - (NSNumber *)customButtonID { - return [parameters objectForKey:NAMES_customButtonID]; + return [parameters objectForKey:SDLNameCustomButtonId]; } @end diff --git a/SmartDeviceLink/SDLOnButtonPress.h b/SmartDeviceLink/SDLOnButtonPress.h index 58c320ca1..75da2cb65 100644 --- a/SmartDeviceLink/SDLOnButtonPress.h +++ b/SmartDeviceLink/SDLOnButtonPress.h @@ -48,20 +48,7 @@ * * @since SDL 1.0 */ -@interface SDLOnButtonPress : SDLRPCNotification { -} - -/** - * Constructs a newly allocated SDLOnButtonPress object - */ -- (instancetype)init; - -/** - * Constructs a newly allocated SDLOnButtonPress object indicated by the dictionary parameter - * - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLOnButtonPress : SDLRPCNotification /** * @abstract the button's name diff --git a/SmartDeviceLink/SDLOnButtonPress.m b/SmartDeviceLink/SDLOnButtonPress.m index 29db5d0b1..dca2d6e17 100644 --- a/SmartDeviceLink/SDLOnButtonPress.m +++ b/SmartDeviceLink/SDLOnButtonPress.m @@ -3,61 +3,52 @@ #import "SDLOnButtonPress.h" -#import "SDLButtonName.h" -#import "SDLButtonPressMode.h" #import "SDLNames.h" - @implementation SDLOnButtonPress - (instancetype)init { - if (self = [super initWithName:NAMES_OnButtonPress]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameOnButtonPress]) { } return self; } - (void)setButtonName:(SDLButtonName)buttonName { if (buttonName != nil) { - [parameters setObject:buttonName forKey:NAMES_buttonName]; + [parameters setObject:buttonName forKey:SDLNameButtonName]; } else { - [parameters removeObjectForKey:NAMES_buttonName]; + [parameters removeObjectForKey:SDLNameButtonName]; } } - (SDLButtonName)buttonName { - NSObject *obj = [parameters objectForKey:NAMES_buttonName]; + NSObject *obj = [parameters objectForKey:SDLNameButtonName]; return (SDLButtonName)obj; } - (void)setButtonPressMode:(SDLButtonPressMode)buttonPressMode { if (buttonPressMode != nil) { - [parameters setObject:buttonPressMode forKey:NAMES_buttonPressMode]; + [parameters setObject:buttonPressMode forKey:SDLNameButtonPressMode]; } else { - [parameters removeObjectForKey:NAMES_buttonPressMode]; + [parameters removeObjectForKey:SDLNameButtonPressMode]; } } - (SDLButtonPressMode)buttonPressMode { - NSObject *obj = [parameters objectForKey:NAMES_buttonPressMode]; + NSObject *obj = [parameters objectForKey:SDLNameButtonPressMode]; return (SDLButtonPressMode)obj; } - (void)setCustomButtonID:(NSNumber *)customButtonID { if (customButtonID != nil) { - [parameters setObject:customButtonID forKey:NAMES_customButtonID]; + [parameters setObject:customButtonID forKey:SDLNameCustomButtonId]; } else { - [parameters removeObjectForKey:NAMES_customButtonID]; + [parameters removeObjectForKey:SDLNameCustomButtonId]; } } - (NSNumber *)customButtonID { - return [parameters objectForKey:NAMES_customButtonID]; + return [parameters objectForKey:SDLNameCustomButtonId]; } @end diff --git a/SmartDeviceLink/SDLOnCommand.h b/SmartDeviceLink/SDLOnCommand.h index 040f14ab6..a421dac80 100644 --- a/SmartDeviceLink/SDLOnCommand.h +++ b/SmartDeviceLink/SDLOnCommand.h @@ -14,19 +14,7 @@ * @since SDL 1.0 * @see SDLAddCommand SDLDeleteCommand SDLDeleteSubMenu */ -@interface SDLOnCommand : SDLRPCNotification { -} - -/** - *Constructs a newly allocated SDLRPCNotification object - */ -- (instancetype)init; - -/** - * Constructs a newly allocated SDLRPCNotification object indicated by the dictionary parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLOnCommand : SDLRPCNotification /** * @abstract The command ID of the command the user selected. This is the command ID value provided by the application in the <i>SDLAddCommand</i> operation that created the command. diff --git a/SmartDeviceLink/SDLOnCommand.m b/SmartDeviceLink/SDLOnCommand.m index e2a5e71f1..b354b08be 100644 --- a/SmartDeviceLink/SDLOnCommand.m +++ b/SmartDeviceLink/SDLOnCommand.m @@ -8,39 +8,33 @@ @implementation SDLOnCommand - (instancetype)init { - if (self = [super initWithName:NAMES_OnCommand]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameOnCommand]) { } return self; } - (void)setCmdID:(NSNumber *)cmdID { if (cmdID != nil) { - [parameters setObject:cmdID forKey:NAMES_cmdID]; + [parameters setObject:cmdID forKey:SDLNameCommandId]; } else { - [parameters removeObjectForKey:NAMES_cmdID]; + [parameters removeObjectForKey:SDLNameCommandId]; } } - (NSNumber *)cmdID { - return [parameters objectForKey:NAMES_cmdID]; + return [parameters objectForKey:SDLNameCommandId]; } - (void)setTriggerSource:(SDLTriggerSource)triggerSource { if (triggerSource != nil) { - [parameters setObject:triggerSource forKey:NAMES_triggerSource]; + [parameters setObject:triggerSource forKey:SDLNameTriggerSource]; } else { - [parameters removeObjectForKey:NAMES_triggerSource]; + [parameters removeObjectForKey:SDLNameTriggerSource]; } } - (SDLTriggerSource)triggerSource { - NSObject *obj = [parameters objectForKey:NAMES_triggerSource]; + NSObject *obj = [parameters objectForKey:SDLNameTriggerSource]; return (SDLTriggerSource)obj; } diff --git a/SmartDeviceLink/SDLOnDriverDistraction.h b/SmartDeviceLink/SDLOnDriverDistraction.h index 0f5cd1955..ef6d0ab2f 100644 --- a/SmartDeviceLink/SDLOnDriverDistraction.h +++ b/SmartDeviceLink/SDLOnDriverDistraction.h @@ -22,20 +22,7 @@ * * @since SDL 1.0 */ -@interface SDLOnDriverDistraction : SDLRPCNotification { -} - -/** - * Constructs a newly allocated SDLOnDriverDistraction object - */ -- (instancetype)init; - -/** - * Constructs a newly allocated SDLOnDriverDistraction object indicated by the dictionary parameter - * - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLOnDriverDistraction : SDLRPCNotification /** * @abstract The driver distraction state (i.e. whether driver distraction rules are in effect, or not) diff --git a/SmartDeviceLink/SDLOnDriverDistraction.m b/SmartDeviceLink/SDLOnDriverDistraction.m index 2a5db6185..bd366dd50 100644 --- a/SmartDeviceLink/SDLOnDriverDistraction.m +++ b/SmartDeviceLink/SDLOnDriverDistraction.m @@ -3,34 +3,27 @@ #import "SDLOnDriverDistraction.h" -#import "SDLDriverDistractionState.h" #import "SDLNames.h" - +#import "SDLDriverDistractionState.h" @implementation SDLOnDriverDistraction - (instancetype)init { - if (self = [super initWithName:NAMES_OnDriverDistraction]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameOnDriverDistraction]) { } return self; } - (void)setState:(SDLDriverDistractionState)state { if (state != nil) { - [parameters setObject:state forKey:NAMES_state]; + [parameters setObject:state forKey:SDLNameState]; } else { - [parameters removeObjectForKey:NAMES_state]; + [parameters removeObjectForKey:SDLNameState]; } } - (SDLDriverDistractionState)state { - NSObject *obj = [parameters objectForKey:NAMES_state]; + NSObject *obj = [parameters objectForKey:SDLNameState]; return (SDLDriverDistractionState)obj; } diff --git a/SmartDeviceLink/SDLOnEncodedSyncPData.h b/SmartDeviceLink/SDLOnEncodedSyncPData.h index 618aaf7d2..f5ed29722 100644 --- a/SmartDeviceLink/SDLOnEncodedSyncPData.h +++ b/SmartDeviceLink/SDLOnEncodedSyncPData.h @@ -4,11 +4,7 @@ #import "SDLRPCNotification.h" -@interface SDLOnEncodedSyncPData : SDLRPCNotification { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLOnEncodedSyncPData : SDLRPCNotification @property (strong) NSMutableArray *data; @property (strong) NSString *URL; diff --git a/SmartDeviceLink/SDLOnEncodedSyncPData.m b/SmartDeviceLink/SDLOnEncodedSyncPData.m index f4aca251a..b4369661c 100644 --- a/SmartDeviceLink/SDLOnEncodedSyncPData.m +++ b/SmartDeviceLink/SDLOnEncodedSyncPData.m @@ -5,55 +5,48 @@ #import "SDLNames.h" - @implementation SDLOnEncodedSyncPData - (instancetype)init { - if (self = [super initWithName:NAMES_OnEncodedSyncPData]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameOnEncodedSyncPData]) { } return self; } - (void)setData:(NSMutableArray *)data { if (data != nil) { - [parameters setObject:data forKey:NAMES_data]; + [parameters setObject:data forKey:SDLNameData]; } else { - [parameters removeObjectForKey:NAMES_data]; + [parameters removeObjectForKey:SDLNameData]; } } - (NSMutableArray *)data { - return [parameters objectForKey:NAMES_data]; + return [parameters objectForKey:SDLNameData]; } - (void)setURL:(NSString *)URL { if (URL != nil) { - [parameters setObject:URL forKey:NAMES_URL]; + [parameters setObject:URL forKey:SDLNameURLUppercase]; } else { - [parameters removeObjectForKey:NAMES_URL]; + [parameters removeObjectForKey:SDLNameURLUppercase]; } } - (NSString *)URL { - return [parameters objectForKey:NAMES_URL]; + return [parameters objectForKey:SDLNameURLUppercase]; } - (void)setTimeout:(NSNumber *)Timeout { if (Timeout != nil) { - [parameters setObject:Timeout forKey:NAMES_Timeout]; + [parameters setObject:Timeout forKey:SDLNameTimeoutCapitalized]; } else { - [parameters removeObjectForKey:NAMES_Timeout]; + [parameters removeObjectForKey:SDLNameTimeoutCapitalized]; } } - (NSNumber *)Timeout { - return [parameters objectForKey:NAMES_Timeout]; + return [parameters objectForKey:SDLNameTimeoutCapitalized]; } @end diff --git a/SmartDeviceLink/SDLOnHMIStatus.h b/SmartDeviceLink/SDLOnHMIStatus.h index 8a8f03def..e7dbe6241 100644 --- a/SmartDeviceLink/SDLOnHMIStatus.h +++ b/SmartDeviceLink/SDLOnHMIStatus.h @@ -22,19 +22,7 @@ * * @since SDL 1.0 */ -@interface SDLOnHMIStatus : SDLRPCNotification { -} - -/** - *Constructs a newly allocated SDLOnHMIStatus object - */ -- (instancetype)init; - -/** - *<p>Constructs a newly allocated SDLOnHMIStatus object indicated by the dictionary parameter</p> - *@param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLOnHMIStatus : SDLRPCNotification /** * @abstract SDLHMILevel in effect for the application diff --git a/SmartDeviceLink/SDLOnHMIStatus.m b/SmartDeviceLink/SDLOnHMIStatus.m index 32da9716b..f95c63a5b 100644 --- a/SmartDeviceLink/SDLOnHMIStatus.m +++ b/SmartDeviceLink/SDLOnHMIStatus.m @@ -8,57 +8,50 @@ #import "SDLNames.h" #import "SDLSystemContext.h" - @implementation SDLOnHMIStatus - (instancetype)init { - if (self = [super initWithName:NAMES_OnHMIStatus]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameOnHMIStatus]) { } return self; } - (void)setHmiLevel:(SDLHMILevel)hmiLevel { if (hmiLevel != nil) { - [parameters setObject:hmiLevel forKey:NAMES_hmiLevel]; + [parameters setObject:hmiLevel forKey:SDLNameHMILevel]; } else { - [parameters removeObjectForKey:NAMES_hmiLevel]; + [parameters removeObjectForKey:SDLNameHMILevel]; } } - (SDLHMILevel)hmiLevel { - NSObject *obj = [parameters objectForKey:NAMES_hmiLevel]; + NSObject *obj = [parameters objectForKey:SDLNameHMILevel]; return (SDLHMILevel)obj; } - (void)setAudioStreamingState:(SDLAudioStreamingState)audioStreamingState { if (audioStreamingState != nil) { - [parameters setObject:audioStreamingState forKey:NAMES_audioStreamingState]; + [parameters setObject:audioStreamingState forKey:SDLNameAudioStreamingState]; } else { - [parameters removeObjectForKey:NAMES_audioStreamingState]; + [parameters removeObjectForKey:SDLNameAudioStreamingState]; } } - (SDLAudioStreamingState)audioStreamingState { - NSObject *obj = [parameters objectForKey:NAMES_audioStreamingState]; + NSObject *obj = [parameters objectForKey:SDLNameAudioStreamingState]; return (SDLAudioStreamingState)obj; } - (void)setSystemContext:(SDLSystemContext)systemContext { if (systemContext != nil) { - [parameters setObject:systemContext forKey:NAMES_systemContext]; + [parameters setObject:systemContext forKey:SDLNameSystemContext]; } else { - [parameters removeObjectForKey:NAMES_systemContext]; + [parameters removeObjectForKey:SDLNameSystemContext]; } } - (SDLSystemContext)systemContext { - NSObject *obj = [parameters objectForKey:NAMES_systemContext]; + NSObject *obj = [parameters objectForKey:SDLNameSystemContext]; return (SDLSystemContext)obj; } diff --git a/SmartDeviceLink/SDLOnHashChange.h b/SmartDeviceLink/SDLOnHashChange.h index 4facf1f15..e339444e9 100644 --- a/SmartDeviceLink/SDLOnHashChange.h +++ b/SmartDeviceLink/SDLOnHashChange.h @@ -4,11 +4,7 @@ #import "SDLRPCNotification.h" -@interface SDLOnHashChange : SDLRPCNotification { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLOnHashChange : SDLRPCNotification @property (strong) NSString *hashID; diff --git a/SmartDeviceLink/SDLOnHashChange.m b/SmartDeviceLink/SDLOnHashChange.m index b1bfd8c6a..a89fb23a2 100644 --- a/SmartDeviceLink/SDLOnHashChange.m +++ b/SmartDeviceLink/SDLOnHashChange.m @@ -9,27 +9,21 @@ @implementation SDLOnHashChange - (instancetype)init { - if (self = [super initWithName:NAMES_OnHashChange]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameOnHashChange]) { } return self; } - (void)setHashID:(NSString *)hashID { if (hashID != nil) { - [parameters setObject:hashID forKey:NAMES_hashID]; + [parameters setObject:hashID forKey:SDLNameHashId]; } else { - [parameters removeObjectForKey:NAMES_hashID]; + [parameters removeObjectForKey:SDLNameHashId]; } } - (NSString *)hashID { - return [parameters objectForKey:NAMES_hashID]; + return [parameters objectForKey:SDLNameHashId]; } @end diff --git a/SmartDeviceLink/SDLOnKeyboardInput.h b/SmartDeviceLink/SDLOnKeyboardInput.h index 9c8dfb9e9..d3c49a85d 100644 --- a/SmartDeviceLink/SDLOnKeyboardInput.h +++ b/SmartDeviceLink/SDLOnKeyboardInput.h @@ -6,11 +6,7 @@ #import "SDLKeyboardEvent.h" -@interface SDLOnKeyboardInput : SDLRPCNotification { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLOnKeyboardInput : SDLRPCNotification @property (strong) SDLKeyboardEvent event; @property (strong) NSString *data; diff --git a/SmartDeviceLink/SDLOnKeyboardInput.m b/SmartDeviceLink/SDLOnKeyboardInput.m index 42857840d..16848f5b7 100644 --- a/SmartDeviceLink/SDLOnKeyboardInput.m +++ b/SmartDeviceLink/SDLOnKeyboardInput.m @@ -5,44 +5,37 @@ #import "SDLNames.h" - @implementation SDLOnKeyboardInput - (instancetype)init { - if (self = [super initWithName:NAMES_OnKeyboardInput]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameOnKeyboardInput]) { } return self; } - (void)setEvent:(SDLKeyboardEvent)event { if (event != nil) { - [parameters setObject:event forKey:NAMES_event]; + [parameters setObject:event forKey:SDLNameEvent]; } else { - [parameters removeObjectForKey:NAMES_event]; + [parameters removeObjectForKey:SDLNameEvent]; } } - (SDLKeyboardEvent)event { - NSObject *obj = [parameters objectForKey:NAMES_event]; + NSObject *obj = [parameters objectForKey:SDLNameEvent]; return (SDLKeyboardEvent)obj; } - (void)setData:(NSString *)data { if (data != nil) { - [parameters setObject:data forKey:NAMES_data]; + [parameters setObject:data forKey:SDLNameData]; } else { - [parameters removeObjectForKey:NAMES_data]; + [parameters removeObjectForKey:SDLNameData]; } } - (NSString *)data { - return [parameters objectForKey:NAMES_data]; + return [parameters objectForKey:SDLNameData]; } @end diff --git a/SmartDeviceLink/SDLOnLanguageChange.h b/SmartDeviceLink/SDLOnLanguageChange.h index 2aca93d1d..f5bae80d1 100644 --- a/SmartDeviceLink/SDLOnLanguageChange.h +++ b/SmartDeviceLink/SDLOnLanguageChange.h @@ -11,19 +11,7 @@ * * @since SDL 2.0 */ -@interface SDLOnLanguageChange : SDLRPCNotification { -} - -/** - *Constructs a newly allocated SDLOnLanguageChange object - */ -- (instancetype)init; - -/** - * Constructs a newly allocated SDLOnLanguageChange object indicated by the dictionary parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLOnLanguageChange : SDLRPCNotification /** * @abstract Current SDL voice engine (VR+TTS) language diff --git a/SmartDeviceLink/SDLOnLanguageChange.m b/SmartDeviceLink/SDLOnLanguageChange.m index c344fd2a5..12e287fe8 100644 --- a/SmartDeviceLink/SDLOnLanguageChange.m +++ b/SmartDeviceLink/SDLOnLanguageChange.m @@ -6,44 +6,37 @@ #import "SDLLanguage.h" #import "SDLNames.h" - @implementation SDLOnLanguageChange - (instancetype)init { - if (self = [super initWithName:NAMES_OnLanguageChange]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameOnLanguageChange]) { } return self; } - (void)setLanguage:(SDLLanguage)language { if (language != nil) { - [parameters setObject:language forKey:NAMES_language]; + [parameters setObject:language forKey:SDLNameLanguage]; } else { - [parameters removeObjectForKey:NAMES_language]; + [parameters removeObjectForKey:SDLNameLanguage]; } } - (SDLLanguage)language { - NSObject *obj = [parameters objectForKey:NAMES_language]; + NSObject *obj = [parameters objectForKey:SDLNameLanguage]; return (SDLLanguage)obj; } - (void)setHmiDisplayLanguage:(SDLLanguage)hmiDisplayLanguage { if (hmiDisplayLanguage != nil) { - [parameters setObject:hmiDisplayLanguage forKey:NAMES_hmiDisplayLanguage]; + [parameters setObject:hmiDisplayLanguage forKey:SDLNameHMIDisplayLanguage]; } else { - [parameters removeObjectForKey:NAMES_hmiDisplayLanguage]; + [parameters removeObjectForKey:SDLNameHMIDisplayLanguage]; } } - (SDLLanguage)hmiDisplayLanguage { - NSObject *obj = [parameters objectForKey:NAMES_hmiDisplayLanguage]; + NSObject *obj = [parameters objectForKey:SDLNameHMIDisplayLanguage]; return (SDLLanguage)obj; } diff --git a/SmartDeviceLink/SDLOnLockScreenStatus.h b/SmartDeviceLink/SDLOnLockScreenStatus.h index f63c8eb38..3a867ba81 100644 --- a/SmartDeviceLink/SDLOnLockScreenStatus.h +++ b/SmartDeviceLink/SDLOnLockScreenStatus.h @@ -19,9 +19,6 @@ */ @interface SDLOnLockScreenStatus : SDLRPCNotification -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; - /** * <p>Get the current driver distraction status(i.e. whether driver distraction rules are in effect, or not)</p> * @return String diff --git a/SmartDeviceLink/SDLOnLockScreenStatus.m b/SmartDeviceLink/SDLOnLockScreenStatus.m index 6d44efd7c..9d2260a0b 100644 --- a/SmartDeviceLink/SDLOnLockScreenStatus.m +++ b/SmartDeviceLink/SDLOnLockScreenStatus.m @@ -17,12 +17,6 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setLockScreenStatus:(SDLLockScreenStatus)lockScreenStatus { if (lockScreenStatus != nil) { [parameters setObject:lockScreenStatus forKey:@"OnLockScreenStatus"]; diff --git a/SmartDeviceLink/SDLOnPermissionsChange.h b/SmartDeviceLink/SDLOnPermissionsChange.h index 267a63a10..7ec871117 100644 --- a/SmartDeviceLink/SDLOnPermissionsChange.h +++ b/SmartDeviceLink/SDLOnPermissionsChange.h @@ -9,19 +9,7 @@ * * @since SDL 2.0 */ -@interface SDLOnPermissionsChange : SDLRPCNotification { -} - -/** - * Constructs a newly allocated SDLOnPermissionsChange object - */ -- (instancetype)init; - -/** - * Constructs a newly allocated SDLOnPermissionsChange object indicated by the dictionary parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLOnPermissionsChange : SDLRPCNotification /** * @abstract Describes change in permissions for a given set of RPCs diff --git a/SmartDeviceLink/SDLOnPermissionsChange.m b/SmartDeviceLink/SDLOnPermissionsChange.m index e80df88c4..7d82a3927 100644 --- a/SmartDeviceLink/SDLOnPermissionsChange.m +++ b/SmartDeviceLink/SDLOnPermissionsChange.m @@ -6,37 +6,30 @@ #import "SDLNames.h" #import "SDLPermissionItem.h" - @implementation SDLOnPermissionsChange - (instancetype)init { - if (self = [super initWithName:NAMES_OnPermissionsChange]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameOnPermissionsChange]) { } return self; } - (void)setPermissionItem:(NSMutableArray *)permissionItem { if (permissionItem != nil) { - [parameters setObject:permissionItem forKey:NAMES_permissionItem]; + [parameters setObject:permissionItem forKey:SDLNamePermissionItem]; } else { - [parameters removeObjectForKey:NAMES_permissionItem]; + [parameters removeObjectForKey:SDLNamePermissionItem]; } } - (NSMutableArray *)permissionItem { - NSMutableArray *array = [parameters objectForKey:NAMES_permissionItem]; + NSMutableArray *array = [parameters objectForKey:SDLNamePermissionItem]; if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLPermissionItem.class]) { return array; } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; for (NSDictionary *dict in array) { - [newList addObject:[[SDLPermissionItem alloc] initWithDictionary:(NSMutableDictionary *)dict]]; + [newList addObject:[[SDLPermissionItem alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; } diff --git a/SmartDeviceLink/SDLOnSyncPData.h b/SmartDeviceLink/SDLOnSyncPData.h index 8729a881a..86d3c466d 100644 --- a/SmartDeviceLink/SDLOnSyncPData.h +++ b/SmartDeviceLink/SDLOnSyncPData.h @@ -4,11 +4,7 @@ #import "SDLRPCNotification.h" -@interface SDLOnSyncPData : SDLRPCNotification { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLOnSyncPData : SDLRPCNotification @property (strong) NSString *URL; @property (strong) NSNumber *Timeout; diff --git a/SmartDeviceLink/SDLOnSyncPData.m b/SmartDeviceLink/SDLOnSyncPData.m index 11fe8a3ac..8e58ab144 100644 --- a/SmartDeviceLink/SDLOnSyncPData.m +++ b/SmartDeviceLink/SDLOnSyncPData.m @@ -9,39 +9,33 @@ @implementation SDLOnSyncPData - (instancetype)init { - if (self = [super initWithName:NAMES_OnSyncPData]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameOnSyncPData]) { } return self; } - (void)setURL:(NSString *)URL { if (URL != nil) { - [parameters setObject:URL forKey:NAMES_URL]; + [parameters setObject:URL forKey:SDLNameURLUppercase]; } else { - [parameters removeObjectForKey:NAMES_URL]; + [parameters removeObjectForKey:SDLNameURLUppercase]; } } - (NSString *)URL { - return [parameters objectForKey:NAMES_URL]; + return [parameters objectForKey:SDLNameURLUppercase]; } - (void)setTimeout:(NSNumber *)Timeout { if (Timeout != nil) { - [parameters setObject:Timeout forKey:NAMES_Timeout]; + [parameters setObject:Timeout forKey:SDLNameTimeoutCapitalized]; } else { - [parameters removeObjectForKey:NAMES_Timeout]; + [parameters removeObjectForKey:SDLNameTimeoutCapitalized]; } } - (NSNumber *)Timeout { - return [parameters objectForKey:NAMES_Timeout]; + return [parameters objectForKey:SDLNameTimeoutCapitalized]; } @end diff --git a/SmartDeviceLink/SDLOnSystemRequest.h b/SmartDeviceLink/SDLOnSystemRequest.h index c200c0bf5..37b81fb8e 100644 --- a/SmartDeviceLink/SDLOnSystemRequest.h +++ b/SmartDeviceLink/SDLOnSystemRequest.h @@ -7,11 +7,7 @@ #import "SDLRequestType.h" -@interface SDLOnSystemRequest : SDLRPCNotification { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLOnSystemRequest : SDLRPCNotification @property (strong) SDLRequestType requestType; @property (strong) NSString *url; diff --git a/SmartDeviceLink/SDLOnSystemRequest.m b/SmartDeviceLink/SDLOnSystemRequest.m index 1777057cd..1ddb24f5d 100644 --- a/SmartDeviceLink/SDLOnSystemRequest.m +++ b/SmartDeviceLink/SDLOnSystemRequest.m @@ -8,89 +8,83 @@ @implementation SDLOnSystemRequest - (instancetype)init { - if (self = [super initWithName:NAMES_OnSystemRequest]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameOnSystemRequest]) { } return self; } - (void)setRequestType:(SDLRequestType)requestType { if (requestType != nil) { - [parameters setObject:requestType forKey:NAMES_requestType]; + [parameters setObject:requestType forKey:SDLNameRequestType]; } else { - [parameters removeObjectForKey:NAMES_requestType]; + [parameters removeObjectForKey:SDLNameRequestType]; } } - (SDLRequestType)requestType { - NSObject *obj = [parameters objectForKey:NAMES_requestType]; + NSObject *obj = [parameters objectForKey:SDLNameRequestType]; return (SDLRequestType)obj; } - (void)setUrl:(NSString *)url { if (url != nil) { - [parameters setObject:url forKey:NAMES_url]; + [parameters setObject:url forKey:SDLNameURL]; } else { - [parameters removeObjectForKey:NAMES_url]; + [parameters removeObjectForKey:SDLNameURL]; } } - (NSString *)url { - return [parameters objectForKey:NAMES_url]; + return [parameters objectForKey:SDLNameURL]; } - (void)setTimeout:(NSNumber *)timeout { if (timeout != nil) { - [parameters setObject:timeout forKey:NAMES_timeout]; + [parameters setObject:timeout forKey:SDLNameTimeout]; } else { - [parameters removeObjectForKey:NAMES_timeout]; + [parameters removeObjectForKey:SDLNameTimeout]; } } - (NSNumber *)timeout { - return [parameters objectForKey:NAMES_timeout]; + return [parameters objectForKey:SDLNameTimeout]; } - (void)setFileType:(SDLFileType)fileType { if (fileType != nil) { - [parameters setObject:fileType forKey:NAMES_fileType]; + [parameters setObject:fileType forKey:SDLNameFileType]; } else { - [parameters removeObjectForKey:NAMES_fileType]; + [parameters removeObjectForKey:SDLNameFileType]; } } - (SDLFileType)fileType { - NSObject *obj = [parameters objectForKey:NAMES_fileType]; + NSObject *obj = [parameters objectForKey:SDLNameFileType]; return (SDLFileType)obj; } - (void)setOffset:(NSNumber *)offset { if (offset != nil) { - [parameters setObject:offset forKey:NAMES_offset]; + [parameters setObject:offset forKey:SDLNameOffset]; } else { - [parameters removeObjectForKey:NAMES_offset]; + [parameters removeObjectForKey:SDLNameOffset]; } } - (NSNumber *)offset { - return [parameters objectForKey:NAMES_offset]; + return [parameters objectForKey:SDLNameOffset]; } - (void)setLength:(NSNumber *)length { if (length != nil) { - [parameters setObject:length forKey:NAMES_length]; + [parameters setObject:length forKey:SDLNameLength]; } else { - [parameters removeObjectForKey:NAMES_length]; + [parameters removeObjectForKey:SDLNameLength]; } } - (NSNumber *)length { - return [parameters objectForKey:NAMES_length]; + return [parameters objectForKey:SDLNameLength]; } @end diff --git a/SmartDeviceLink/SDLOnTBTClientState.h b/SmartDeviceLink/SDLOnTBTClientState.h index 7c337c681..29d8a50a6 100644 --- a/SmartDeviceLink/SDLOnTBTClientState.h +++ b/SmartDeviceLink/SDLOnTBTClientState.h @@ -5,11 +5,7 @@ #import "SDLTBTState.h" -@interface SDLOnTBTClientState : SDLRPCNotification { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLOnTBTClientState : SDLRPCNotification @property (strong) SDLTBTState state; diff --git a/SmartDeviceLink/SDLOnTBTClientState.m b/SmartDeviceLink/SDLOnTBTClientState.m index 84a0081d0..5fe83a23c 100644 --- a/SmartDeviceLink/SDLOnTBTClientState.m +++ b/SmartDeviceLink/SDLOnTBTClientState.m @@ -8,27 +8,21 @@ @implementation SDLOnTBTClientState - (instancetype)init { - if (self = [super initWithName:NAMES_OnTBTClientState]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameOnTBTClientState]) { } return self; } - (void)setState:(SDLTBTState)state { if (state != nil) { - [parameters setObject:state forKey:NAMES_state]; + [parameters setObject:state forKey:SDLNameState]; } else { - [parameters removeObjectForKey:NAMES_state]; + [parameters removeObjectForKey:SDLNameState]; } } - (SDLTBTState)state { - NSObject *obj = [parameters objectForKey:NAMES_state]; + NSObject *obj = [parameters objectForKey:SDLNameState]; return (SDLTBTState)obj; } diff --git a/SmartDeviceLink/SDLOnTouchEvent.h b/SmartDeviceLink/SDLOnTouchEvent.h index 05a77e9c7..21ffadcbf 100644 --- a/SmartDeviceLink/SDLOnTouchEvent.h +++ b/SmartDeviceLink/SDLOnTouchEvent.h @@ -5,11 +5,7 @@ #import "SDLTouchType.h" -@interface SDLOnTouchEvent : SDLRPCNotification { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLOnTouchEvent : SDLRPCNotification @property (strong) SDLTouchType type; @property (strong) NSMutableArray *event; diff --git a/SmartDeviceLink/SDLOnTouchEvent.m b/SmartDeviceLink/SDLOnTouchEvent.m index 45e7ae5eb..ae76760e6 100644 --- a/SmartDeviceLink/SDLOnTouchEvent.m +++ b/SmartDeviceLink/SDLOnTouchEvent.m @@ -6,50 +6,43 @@ #import "SDLNames.h" #import "SDLTouchEvent.h" - @implementation SDLOnTouchEvent - (instancetype)init { - if (self = [super initWithName:NAMES_OnTouchEvent]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameOnTouchEvent]) { } return self; } - (void)setType:(SDLTouchType)type { if (type != nil) { - [parameters setObject:type forKey:NAMES_type]; + [parameters setObject:type forKey:SDLNameType]; } else { - [parameters removeObjectForKey:NAMES_type]; + [parameters removeObjectForKey:SDLNameType]; } } - (SDLTouchType)type { - NSObject *obj = [parameters objectForKey:NAMES_type]; + NSObject *obj = [parameters objectForKey:SDLNameType]; return (SDLTouchType)obj; } - (void)setEvent:(NSMutableArray *)event { if (event != nil) { - [parameters setObject:event forKey:NAMES_event]; + [parameters setObject:event forKey:SDLNameEvent]; } else { - [parameters removeObjectForKey:NAMES_event]; + [parameters removeObjectForKey:SDLNameEvent]; } } - (NSMutableArray *)event { - NSMutableArray *array = [parameters objectForKey:NAMES_event]; + NSMutableArray *array = [parameters objectForKey:SDLNameEvent]; if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLTouchEvent.class]) { return array; } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; for (NSDictionary *dict in array) { - [newList addObject:[[SDLTouchEvent alloc] initWithDictionary:(NSMutableDictionary *)dict]]; + [newList addObject:[[SDLTouchEvent alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; } diff --git a/SmartDeviceLink/SDLOnVehicleData.h b/SmartDeviceLink/SDLOnVehicleData.h index 889fec647..19be2f79b 100644 --- a/SmartDeviceLink/SDLOnVehicleData.h +++ b/SmartDeviceLink/SDLOnVehicleData.h @@ -26,21 +26,7 @@ * * Since SmartDeviceLink 2.0 */ -@interface SDLOnVehicleData : SDLRPCNotification { -} - - -/** - * @abstract Constructs a new SDLOnVehicleData object - */ -- (instancetype)init; - -/** - * @abstract Constructs a new SDLOnVehicleData object indicated by the NSMutableDictionary - * parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLOnVehicleData : SDLRPCNotification /** * @abstract A SDLGPSData* value. See GPSData. diff --git a/SmartDeviceLink/SDLOnVehicleData.m b/SmartDeviceLink/SDLOnVehicleData.m index 146be4280..2f1c78fdb 100644 --- a/SmartDeviceLink/SDLOnVehicleData.m +++ b/SmartDeviceLink/SDLOnVehicleData.m @@ -20,373 +20,367 @@ @implementation SDLOnVehicleData - (instancetype)init { - if (self = [super initWithName:NAMES_OnVehicleData]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameOnVehicleData]) { } return self; } - (void)setGps:(SDLGPSData *)gps { if (gps != nil) { - [parameters setObject:gps forKey:NAMES_gps]; + [parameters setObject:gps forKey:SDLNameGPS]; } else { - [parameters removeObjectForKey:NAMES_gps]; + [parameters removeObjectForKey:SDLNameGPS]; } } - (SDLGPSData *)gps { - NSObject *obj = [parameters objectForKey:NAMES_gps]; + NSObject *obj = [parameters objectForKey:SDLNameGPS]; if (obj == nil || [obj isKindOfClass:SDLGPSData.class]) { return (SDLGPSData *)obj; } else { - return [[SDLGPSData alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLGPSData alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setSpeed:(NSNumber *)speed { if (speed != nil) { - [parameters setObject:speed forKey:NAMES_speed]; + [parameters setObject:speed forKey:SDLNameSpeed]; } else { - [parameters removeObjectForKey:NAMES_speed]; + [parameters removeObjectForKey:SDLNameSpeed]; } } - (NSNumber *)speed { - return [parameters objectForKey:NAMES_speed]; + return [parameters objectForKey:SDLNameSpeed]; } - (void)setRpm:(NSNumber *)rpm { if (rpm != nil) { - [parameters setObject:rpm forKey:NAMES_rpm]; + [parameters setObject:rpm forKey:SDLNameRPM]; } else { - [parameters removeObjectForKey:NAMES_rpm]; + [parameters removeObjectForKey:SDLNameRPM]; } } - (NSNumber *)rpm { - return [parameters objectForKey:NAMES_rpm]; + return [parameters objectForKey:SDLNameRPM]; } - (void)setFuelLevel:(NSNumber *)fuelLevel { if (fuelLevel != nil) { - [parameters setObject:fuelLevel forKey:NAMES_fuelLevel]; + [parameters setObject:fuelLevel forKey:SDLNameFuelLevel]; } else { - [parameters removeObjectForKey:NAMES_fuelLevel]; + [parameters removeObjectForKey:SDLNameFuelLevel]; } } - (NSNumber *)fuelLevel { - return [parameters objectForKey:NAMES_fuelLevel]; + return [parameters objectForKey:SDLNameFuelLevel]; } - (void)setFuelLevel_State:(SDLComponentVolumeStatus)fuelLevel_State { if (fuelLevel_State != nil) { - [parameters setObject:fuelLevel_State forKey:NAMES_fuelLevel_State]; + [parameters setObject:fuelLevel_State forKey:SDLNameFuelLevelState]; } else { - [parameters removeObjectForKey:NAMES_fuelLevel_State]; + [parameters removeObjectForKey:SDLNameFuelLevelState]; } } - (SDLComponentVolumeStatus)fuelLevel_State { - NSObject *obj = [parameters objectForKey:NAMES_fuelLevel_State]; + NSObject *obj = [parameters objectForKey:SDLNameFuelLevelState]; return (SDLComponentVolumeStatus)obj; } - (void)setInstantFuelConsumption:(NSNumber *)instantFuelConsumption { if (instantFuelConsumption != nil) { - [parameters setObject:instantFuelConsumption forKey:NAMES_instantFuelConsumption]; + [parameters setObject:instantFuelConsumption forKey:SDLNameInstantFuelConsumption]; } else { - [parameters removeObjectForKey:NAMES_instantFuelConsumption]; + [parameters removeObjectForKey:SDLNameInstantFuelConsumption]; } } - (NSNumber *)instantFuelConsumption { - return [parameters objectForKey:NAMES_instantFuelConsumption]; + return [parameters objectForKey:SDLNameInstantFuelConsumption]; } - (void)setExternalTemperature:(NSNumber *)externalTemperature { if (externalTemperature != nil) { - [parameters setObject:externalTemperature forKey:NAMES_externalTemperature]; + [parameters setObject:externalTemperature forKey:SDLNameExternalTemperature]; } else { - [parameters removeObjectForKey:NAMES_externalTemperature]; + [parameters removeObjectForKey:SDLNameExternalTemperature]; } } - (NSNumber *)externalTemperature { - return [parameters objectForKey:NAMES_externalTemperature]; + return [parameters objectForKey:SDLNameExternalTemperature]; } - (void)setVin:(NSString *)vin { if (vin != nil) { - [parameters setObject:vin forKey:NAMES_vin]; + [parameters setObject:vin forKey:SDLNameVIN]; } else { - [parameters removeObjectForKey:NAMES_vin]; + [parameters removeObjectForKey:SDLNameVIN]; } } - (NSString *)vin { - return [parameters objectForKey:NAMES_vin]; + return [parameters objectForKey:SDLNameVIN]; } - (void)setPrndl:(SDLPRNDL)prndl { if (prndl != nil) { - [parameters setObject:prndl forKey:NAMES_prndl]; + [parameters setObject:prndl forKey:SDLNamePRNDL]; } else { - [parameters removeObjectForKey:NAMES_prndl]; + [parameters removeObjectForKey:SDLNamePRNDL]; } } - (SDLPRNDL)prndl { - NSObject *obj = [parameters objectForKey:NAMES_prndl]; + NSObject *obj = [parameters objectForKey:SDLNamePRNDL]; return (SDLPRNDL)obj; } - (void)setTirePressure:(SDLTireStatus *)tirePressure { if (tirePressure != nil) { - [parameters setObject:tirePressure forKey:NAMES_tirePressure]; + [parameters setObject:tirePressure forKey:SDLNameTirePressure]; } else { - [parameters removeObjectForKey:NAMES_tirePressure]; + [parameters removeObjectForKey:SDLNameTirePressure]; } } - (SDLTireStatus *)tirePressure { - NSObject *obj = [parameters objectForKey:NAMES_tirePressure]; + NSObject *obj = [parameters objectForKey:SDLNameTirePressure]; if (obj == nil || [obj isKindOfClass:SDLTireStatus.class]) { return (SDLTireStatus *)obj; } else { - return [[SDLTireStatus alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLTireStatus alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setOdometer:(NSNumber *)odometer { if (odometer != nil) { - [parameters setObject:odometer forKey:NAMES_odometer]; + [parameters setObject:odometer forKey:SDLNameOdometer]; } else { - [parameters removeObjectForKey:NAMES_odometer]; + [parameters removeObjectForKey:SDLNameOdometer]; } } - (NSNumber *)odometer { - return [parameters objectForKey:NAMES_odometer]; + return [parameters objectForKey:SDLNameOdometer]; } - (void)setBeltStatus:(SDLBeltStatus *)beltStatus { if (beltStatus != nil) { - [parameters setObject:beltStatus forKey:NAMES_beltStatus]; + [parameters setObject:beltStatus forKey:SDLNameBeltStatus]; } else { - [parameters removeObjectForKey:NAMES_beltStatus]; + [parameters removeObjectForKey:SDLNameBeltStatus]; } } - (SDLBeltStatus *)beltStatus { - NSObject *obj = [parameters objectForKey:NAMES_beltStatus]; + NSObject *obj = [parameters objectForKey:SDLNameBeltStatus]; if (obj == nil || [obj isKindOfClass:SDLBeltStatus.class]) { return (SDLBeltStatus *)obj; } else { - return [[SDLBeltStatus alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLBeltStatus alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setBodyInformation:(SDLBodyInformation *)bodyInformation { if (bodyInformation != nil) { - [parameters setObject:bodyInformation forKey:NAMES_bodyInformation]; + [parameters setObject:bodyInformation forKey:SDLNameBodyInformation]; } else { - [parameters removeObjectForKey:NAMES_bodyInformation]; + [parameters removeObjectForKey:SDLNameBodyInformation]; } } - (SDLBodyInformation *)bodyInformation { - NSObject *obj = [parameters objectForKey:NAMES_bodyInformation]; + NSObject *obj = [parameters objectForKey:SDLNameBodyInformation]; if (obj == nil || [obj isKindOfClass:SDLBodyInformation.class]) { return (SDLBodyInformation *)obj; } else { - return [[SDLBodyInformation alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLBodyInformation alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setDeviceStatus:(SDLDeviceStatus *)deviceStatus { if (deviceStatus != nil) { - [parameters setObject:deviceStatus forKey:NAMES_deviceStatus]; + [parameters setObject:deviceStatus forKey:SDLNameDeviceStatus]; } else { - [parameters removeObjectForKey:NAMES_deviceStatus]; + [parameters removeObjectForKey:SDLNameDeviceStatus]; } } - (SDLDeviceStatus *)deviceStatus { - NSObject *obj = [parameters objectForKey:NAMES_deviceStatus]; + NSObject *obj = [parameters objectForKey:SDLNameDeviceStatus]; if (obj == nil || [obj isKindOfClass:SDLDeviceStatus.class]) { return (SDLDeviceStatus *)obj; } else { - return [[SDLDeviceStatus alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLDeviceStatus alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setDriverBraking:(SDLVehicleDataEventStatus)driverBraking { if (driverBraking != nil) { - [parameters setObject:driverBraking forKey:NAMES_driverBraking]; + [parameters setObject:driverBraking forKey:SDLNameDriverBraking]; } else { - [parameters removeObjectForKey:NAMES_driverBraking]; + [parameters removeObjectForKey:SDLNameDriverBraking]; } } - (SDLVehicleDataEventStatus)driverBraking { - NSObject *obj = [parameters objectForKey:NAMES_driverBraking]; + NSObject *obj = [parameters objectForKey:SDLNameDriverBraking]; return (SDLVehicleDataEventStatus)obj; } - (void)setWiperStatus:(SDLWiperStatus)wiperStatus { if (wiperStatus != nil) { - [parameters setObject:wiperStatus forKey:NAMES_wiperStatus]; + [parameters setObject:wiperStatus forKey:SDLNameWiperStatus]; } else { - [parameters removeObjectForKey:NAMES_wiperStatus]; + [parameters removeObjectForKey:SDLNameWiperStatus]; } } - (SDLWiperStatus)wiperStatus { - NSObject *obj = [parameters objectForKey:NAMES_wiperStatus]; + NSObject *obj = [parameters objectForKey:SDLNameWiperStatus]; return (SDLWiperStatus)obj; } - (void)setHeadLampStatus:(SDLHeadLampStatus *)headLampStatus { if (headLampStatus != nil) { - [parameters setObject:headLampStatus forKey:NAMES_headLampStatus]; + [parameters setObject:headLampStatus forKey:SDLNameHeadLampStatus]; } else { - [parameters removeObjectForKey:NAMES_headLampStatus]; + [parameters removeObjectForKey:SDLNameHeadLampStatus]; } } - (SDLHeadLampStatus *)headLampStatus { - NSObject *obj = [parameters objectForKey:NAMES_headLampStatus]; + NSObject *obj = [parameters objectForKey:SDLNameHeadLampStatus]; if (obj == nil || [obj isKindOfClass:SDLHeadLampStatus.class]) { return (SDLHeadLampStatus *)obj; } else { - return [[SDLHeadLampStatus alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLHeadLampStatus alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setEngineTorque:(NSNumber *)engineTorque { if (engineTorque != nil) { - [parameters setObject:engineTorque forKey:NAMES_engineTorque]; + [parameters setObject:engineTorque forKey:SDLNameEngineTorque]; } else { - [parameters removeObjectForKey:NAMES_engineTorque]; + [parameters removeObjectForKey:SDLNameEngineTorque]; } } - (NSNumber *)engineTorque { - return [parameters objectForKey:NAMES_engineTorque]; + return [parameters objectForKey:SDLNameEngineTorque]; } - (void)setAccPedalPosition:(NSNumber *)accPedalPosition { if (accPedalPosition != nil) { - [parameters setObject:accPedalPosition forKey:NAMES_accPedalPosition]; + [parameters setObject:accPedalPosition forKey:SDLNameAccelerationPedalPosition]; } else { - [parameters removeObjectForKey:NAMES_accPedalPosition]; + [parameters removeObjectForKey:SDLNameAccelerationPedalPosition]; } } - (NSNumber *)accPedalPosition { - return [parameters objectForKey:NAMES_accPedalPosition]; + return [parameters objectForKey:SDLNameAccelerationPedalPosition]; } - (void)setSteeringWheelAngle:(NSNumber *)steeringWheelAngle { if (steeringWheelAngle != nil) { - [parameters setObject:steeringWheelAngle forKey:NAMES_steeringWheelAngle]; + [parameters setObject:steeringWheelAngle forKey:SDLNameSteeringWheelAngle]; } else { - [parameters removeObjectForKey:NAMES_steeringWheelAngle]; + [parameters removeObjectForKey:SDLNameSteeringWheelAngle]; } } - (NSNumber *)steeringWheelAngle { - return [parameters objectForKey:NAMES_steeringWheelAngle]; + return [parameters objectForKey:SDLNameSteeringWheelAngle]; } - (void)setECallInfo:(SDLECallInfo *)eCallInfo { if (eCallInfo != nil) { - [parameters setObject:eCallInfo forKey:NAMES_eCallInfo]; + [parameters setObject:eCallInfo forKey:SDLNameECallInfo]; } else { - [parameters removeObjectForKey:NAMES_eCallInfo]; + [parameters removeObjectForKey:SDLNameECallInfo]; } } - (SDLECallInfo *)eCallInfo { - NSObject *obj = [parameters objectForKey:NAMES_eCallInfo]; + NSObject *obj = [parameters objectForKey:SDLNameECallInfo]; if (obj == nil || [obj isKindOfClass:SDLECallInfo.class]) { return (SDLECallInfo *)obj; } else { - return [[SDLECallInfo alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLECallInfo alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setAirbagStatus:(SDLAirbagStatus *)airbagStatus { if (airbagStatus != nil) { - [parameters setObject:airbagStatus forKey:NAMES_airbagStatus]; + [parameters setObject:airbagStatus forKey:SDLNameAirbagStatus]; } else { - [parameters removeObjectForKey:NAMES_airbagStatus]; + [parameters removeObjectForKey:SDLNameAirbagStatus]; } } - (SDLAirbagStatus *)airbagStatus { - NSObject *obj = [parameters objectForKey:NAMES_airbagStatus]; + NSObject *obj = [parameters objectForKey:SDLNameAirbagStatus]; if (obj == nil || [obj isKindOfClass:SDLAirbagStatus.class]) { return (SDLAirbagStatus *)obj; } else { - return [[SDLAirbagStatus alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLAirbagStatus alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setEmergencyEvent:(SDLEmergencyEvent *)emergencyEvent { if (emergencyEvent != nil) { - [parameters setObject:emergencyEvent forKey:NAMES_emergencyEvent]; + [parameters setObject:emergencyEvent forKey:SDLNameEmergencyEvent]; } else { - [parameters removeObjectForKey:NAMES_emergencyEvent]; + [parameters removeObjectForKey:SDLNameEmergencyEvent]; } } - (SDLEmergencyEvent *)emergencyEvent { - NSObject *obj = [parameters objectForKey:NAMES_emergencyEvent]; + NSObject *obj = [parameters objectForKey:SDLNameEmergencyEvent]; if (obj == nil || [obj isKindOfClass:SDLEmergencyEvent.class]) { return (SDLEmergencyEvent *)obj; } else { - return [[SDLEmergencyEvent alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLEmergencyEvent alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setClusterModeStatus:(SDLClusterModeStatus *)clusterModeStatus { if (clusterModeStatus != nil) { - [parameters setObject:clusterModeStatus forKey:NAMES_clusterModeStatus]; + [parameters setObject:clusterModeStatus forKey:SDLNameClusterModeStatus]; } else { - [parameters removeObjectForKey:NAMES_clusterModeStatus]; + [parameters removeObjectForKey:SDLNameClusterModeStatus]; } } - (SDLClusterModeStatus *)clusterModeStatus { - NSObject *obj = [parameters objectForKey:NAMES_clusterModeStatus]; + NSObject *obj = [parameters objectForKey:SDLNameClusterModeStatus]; if (obj == nil || [obj isKindOfClass:SDLClusterModeStatus.class]) { return (SDLClusterModeStatus *)obj; } else { - return [[SDLClusterModeStatus alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLClusterModeStatus alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setMyKey:(SDLMyKey *)myKey { if (myKey != nil) { - [parameters setObject:myKey forKey:NAMES_myKey]; + [parameters setObject:myKey forKey:SDLNameMyKey]; } else { - [parameters removeObjectForKey:NAMES_myKey]; + [parameters removeObjectForKey:SDLNameMyKey]; } } - (SDLMyKey *)myKey { - NSObject *obj = [parameters objectForKey:NAMES_myKey]; + NSObject *obj = [parameters objectForKey:SDLNameMyKey]; if (obj == nil || [obj isKindOfClass:SDLMyKey.class]) { return (SDLMyKey *)obj; } else { - return [[SDLMyKey alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLMyKey alloc] initWithDictionary:(NSDictionary *)obj]; } } diff --git a/SmartDeviceLink/SDLParameterPermissions.h b/SmartDeviceLink/SDLParameterPermissions.h index af724d53f..71b49ad0a 100644 --- a/SmartDeviceLink/SDLParameterPermissions.h +++ b/SmartDeviceLink/SDLParameterPermissions.h @@ -9,19 +9,7 @@ * * @since SDL 2.0 */ -@interface SDLParameterPermissions : SDLRPCStruct { -} - -/** - * @abstract Constructs a newly allocated SDLParameterPermissions object - */ -- (instancetype)init; -/** - * @abstract Constructs a newly allocated SDLParameterPermissions object indicated by the dictionary parameter - * - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLParameterPermissions : SDLRPCStruct /** * @abstract A set of all parameters that are permitted for this given RPC. diff --git a/SmartDeviceLink/SDLParameterPermissions.m b/SmartDeviceLink/SDLParameterPermissions.m index e18d1ec12..190d003df 100644 --- a/SmartDeviceLink/SDLParameterPermissions.m +++ b/SmartDeviceLink/SDLParameterPermissions.m @@ -8,40 +8,28 @@ @implementation SDLParameterPermissions -- (instancetype)init { - if (self = [super init]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setAllowed:(NSMutableArray *)allowed { if (allowed != nil) { - [store setObject:allowed forKey:NAMES_allowed]; + [store setObject:allowed forKey:SDLNameAllowed]; } else { - [store removeObjectForKey:NAMES_allowed]; + [store removeObjectForKey:SDLNameAllowed]; } } - (NSMutableArray *)allowed { - return [store objectForKey:NAMES_allowed]; + return [store objectForKey:SDLNameAllowed]; } - (void)setUserDisallowed:(NSMutableArray *)userDisallowed { if (userDisallowed != nil) { - [store setObject:userDisallowed forKey:NAMES_userDisallowed]; + [store setObject:userDisallowed forKey:SDLNameUserDisallowed]; } else { - [store removeObjectForKey:NAMES_userDisallowed]; + [store removeObjectForKey:SDLNameUserDisallowed]; } } - (NSMutableArray *)userDisallowed { - return [store objectForKey:NAMES_userDisallowed]; + return [store objectForKey:SDLNameUserDisallowed]; } @end diff --git a/SmartDeviceLink/SDLPerformAudioPassThru.h b/SmartDeviceLink/SDLPerformAudioPassThru.h index 955eb9853..4bc606b80 100644 --- a/SmartDeviceLink/SDLPerformAudioPassThru.h +++ b/SmartDeviceLink/SDLPerformAudioPassThru.h @@ -19,18 +19,7 @@ * <p>Since SmartDeviceLink 2.0</p> * <p>See SDLEndAudioPassThru</p> */ -@interface SDLPerformAudioPassThru : SDLRPCRequest { -} - -/** - * @abstract Constructs a new SDLPerformAudioPassThru object - */ -- (instancetype)init; -/** - * @abstract Constructs a new SDLPerformAudioPassThru object indicated by the NSMutableDictionary - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLPerformAudioPassThru : SDLRPCRequest /** * @abstract initial prompt which will be spoken before opening the audio pass diff --git a/SmartDeviceLink/SDLPerformAudioPassThru.m b/SmartDeviceLink/SDLPerformAudioPassThru.m index bbd42725a..08b7d793d 100644 --- a/SmartDeviceLink/SDLPerformAudioPassThru.m +++ b/SmartDeviceLink/SDLPerformAudioPassThru.m @@ -7,37 +7,30 @@ #import "SDLNames.h" #import "SDLTTSChunk.h" - @implementation SDLPerformAudioPassThru - (instancetype)init { - if (self = [super initWithName:NAMES_PerformAudioPassThru]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNamePerformAudioPassThru]) { } return self; } - (void)setInitialPrompt:(NSMutableArray *)initialPrompt { if (initialPrompt != nil) { - [parameters setObject:initialPrompt forKey:NAMES_initialPrompt]; + [parameters setObject:initialPrompt forKey:SDLNameInitialPrompt]; } else { - [parameters removeObjectForKey:NAMES_initialPrompt]; + [parameters removeObjectForKey:SDLNameInitialPrompt]; } } - (NSMutableArray *)initialPrompt { - NSMutableArray *array = [parameters objectForKey:NAMES_initialPrompt]; + NSMutableArray *array = [parameters objectForKey:SDLNameInitialPrompt]; if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLTTSChunk.class]) { return array; } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; for (NSDictionary *dict in array) { - [newList addObject:[[SDLTTSChunk alloc] initWithDictionary:(NSMutableDictionary *)dict]]; + [newList addObject:[[SDLTTSChunk alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; } @@ -45,89 +38,89 @@ - (void)setAudioPassThruDisplayText1:(NSString *)audioPassThruDisplayText1 { if (audioPassThruDisplayText1 != nil) { - [parameters setObject:audioPassThruDisplayText1 forKey:NAMES_audioPassThruDisplayText1]; + [parameters setObject:audioPassThruDisplayText1 forKey:SDLNameAudioPassThruDisplayText1]; } else { - [parameters removeObjectForKey:NAMES_audioPassThruDisplayText1]; + [parameters removeObjectForKey:SDLNameAudioPassThruDisplayText1]; } } - (NSString *)audioPassThruDisplayText1 { - return [parameters objectForKey:NAMES_audioPassThruDisplayText1]; + return [parameters objectForKey:SDLNameAudioPassThruDisplayText1]; } - (void)setAudioPassThruDisplayText2:(NSString *)audioPassThruDisplayText2 { if (audioPassThruDisplayText2 != nil) { - [parameters setObject:audioPassThruDisplayText2 forKey:NAMES_audioPassThruDisplayText2]; + [parameters setObject:audioPassThruDisplayText2 forKey:SDLNameAudioPassThruDisplayText2]; } else { - [parameters removeObjectForKey:NAMES_audioPassThruDisplayText2]; + [parameters removeObjectForKey:SDLNameAudioPassThruDisplayText2]; } } - (NSString *)audioPassThruDisplayText2 { - return [parameters objectForKey:NAMES_audioPassThruDisplayText2]; + return [parameters objectForKey:SDLNameAudioPassThruDisplayText2]; } - (void)setSamplingRate:(SDLSamplingRate)samplingRate { if (samplingRate != nil) { - [parameters setObject:samplingRate forKey:NAMES_samplingRate]; + [parameters setObject:samplingRate forKey:SDLNameSamplingRate]; } else { - [parameters removeObjectForKey:NAMES_samplingRate]; + [parameters removeObjectForKey:SDLNameSamplingRate]; } } - (SDLSamplingRate)samplingRate { - NSObject *obj = [parameters objectForKey:NAMES_samplingRate]; + NSObject *obj = [parameters objectForKey:SDLNameSamplingRate]; return (SDLSamplingRate )obj; } - (void)setMaxDuration:(NSNumber *)maxDuration { if (maxDuration != nil) { - [parameters setObject:maxDuration forKey:NAMES_maxDuration]; + [parameters setObject:maxDuration forKey:SDLNameMaxDuration]; } else { - [parameters removeObjectForKey:NAMES_maxDuration]; + [parameters removeObjectForKey:SDLNameMaxDuration]; } } - (NSNumber *)maxDuration { - return [parameters objectForKey:NAMES_maxDuration]; + return [parameters objectForKey:SDLNameMaxDuration]; } - (void)setBitsPerSample:(SDLBitsPerSample)bitsPerSample { if (bitsPerSample != nil) { - [parameters setObject:bitsPerSample forKey:NAMES_bitsPerSample]; + [parameters setObject:bitsPerSample forKey:SDLNameBitsPerSample]; } else { - [parameters removeObjectForKey:NAMES_bitsPerSample]; + [parameters removeObjectForKey:SDLNameBitsPerSample]; } } - (SDLBitsPerSample)bitsPerSample { - NSObject *obj = [parameters objectForKey:NAMES_bitsPerSample]; + NSObject *obj = [parameters objectForKey:SDLNameBitsPerSample]; return (SDLBitsPerSample)obj; } - (void)setAudioType:(SDLAudioType)audioType { if (audioType != nil) { - [parameters setObject:audioType forKey:NAMES_audioType]; + [parameters setObject:audioType forKey:SDLNameAudioType]; } else { - [parameters removeObjectForKey:NAMES_audioType]; + [parameters removeObjectForKey:SDLNameAudioType]; } } - (SDLAudioType)audioType { - NSObject *obj = [parameters objectForKey:NAMES_audioType]; + NSObject *obj = [parameters objectForKey:SDLNameAudioType]; return (SDLAudioType)obj; } - (void)setMuteAudio:(NSNumber *)muteAudio { if (muteAudio != nil) { - [parameters setObject:muteAudio forKey:NAMES_muteAudio]; + [parameters setObject:muteAudio forKey:SDLNameMuteAudio]; } else { - [parameters removeObjectForKey:NAMES_muteAudio]; + [parameters removeObjectForKey:SDLNameMuteAudio]; } } - (NSNumber *)muteAudio { - return [parameters objectForKey:NAMES_muteAudio]; + return [parameters objectForKey:SDLNameMuteAudio]; } @end diff --git a/SmartDeviceLink/SDLPerformAudioPassThruResponse.h b/SmartDeviceLink/SDLPerformAudioPassThruResponse.h index 3d2835114..c187f0c78 100644 --- a/SmartDeviceLink/SDLPerformAudioPassThruResponse.h +++ b/SmartDeviceLink/SDLPerformAudioPassThruResponse.h @@ -9,17 +9,6 @@ * * Since SmartDeviceLink 2.0 */ -@interface SDLPerformAudioPassThruResponse : SDLRPCResponse { -} - -/** - * @abstract Constructs a new SDLPerformAudioPassThruResponse object - */ -- (instancetype)init; -/** - * @abstract Constructs a new SDLPerformAudioPassThruResponse object indicated by the dictionary parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLPerformAudioPassThruResponse : SDLRPCResponse @end diff --git a/SmartDeviceLink/SDLPerformAudioPassThruResponse.m b/SmartDeviceLink/SDLPerformAudioPassThruResponse.m index ed8a1e614..386b91c50 100644 --- a/SmartDeviceLink/SDLPerformAudioPassThruResponse.m +++ b/SmartDeviceLink/SDLPerformAudioPassThruResponse.m @@ -9,13 +9,7 @@ @implementation SDLPerformAudioPassThruResponse - (instancetype)init { - if (self = [super initWithName:NAMES_PerformAudioPassThru]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNamePerformAudioPassThru]) { } return self; } diff --git a/SmartDeviceLink/SDLPerformInteraction.h b/SmartDeviceLink/SDLPerformInteraction.h index 126e91d2a..4ed8ea914 100644 --- a/SmartDeviceLink/SDLPerformInteraction.h +++ b/SmartDeviceLink/SDLPerformInteraction.h @@ -23,18 +23,7 @@ * Since SmartDeviceLink 1.0<br/> * See SDLCreateInteractionChoiceSet SDLDeleteInteractionChoiceSet */ -@interface SDLPerformInteraction : SDLRPCRequest { -} - -/** - * @abstract Constructs a new SDLPerformInteraction object - */ -- (instancetype)init; -/** - * @abstract Constructs a new SDLPerformInteraction object indicated by the NSMutableDictionary - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLPerformInteraction : SDLRPCRequest /** * @abstract The Text that Displayed when the interaction begins. This text may diff --git a/SmartDeviceLink/SDLPerformInteraction.m b/SmartDeviceLink/SDLPerformInteraction.m index 784d4c5e2..878e1d425 100644 --- a/SmartDeviceLink/SDLPerformInteraction.m +++ b/SmartDeviceLink/SDLPerformInteraction.m @@ -11,45 +11,39 @@ @implementation SDLPerformInteraction - (instancetype)init { - if (self = [super initWithName:NAMES_PerformInteraction]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNamePerformInteraction]) { } return self; } - (void)setInitialText:(NSString *)initialText { if (initialText != nil) { - [parameters setObject:initialText forKey:NAMES_initialText]; + [parameters setObject:initialText forKey:SDLNameInitialText]; } else { - [parameters removeObjectForKey:NAMES_initialText]; + [parameters removeObjectForKey:SDLNameInitialText]; } } - (NSString *)initialText { - return [parameters objectForKey:NAMES_initialText]; + return [parameters objectForKey:SDLNameInitialText]; } - (void)setInitialPrompt:(NSMutableArray *)initialPrompt { if (initialPrompt != nil) { - [parameters setObject:initialPrompt forKey:NAMES_initialPrompt]; + [parameters setObject:initialPrompt forKey:SDLNameInitialPrompt]; } else { - [parameters removeObjectForKey:NAMES_initialPrompt]; + [parameters removeObjectForKey:SDLNameInitialPrompt]; } } - (NSMutableArray *)initialPrompt { - NSMutableArray *array = [parameters objectForKey:NAMES_initialPrompt]; + NSMutableArray *array = [parameters objectForKey:SDLNameInitialPrompt]; if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLTTSChunk.class]) { return array; } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; for (NSDictionary *dict in array) { - [newList addObject:[[SDLTTSChunk alloc] initWithDictionary:(NSMutableDictionary *)dict]]; + [newList addObject:[[SDLTTSChunk alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; } @@ -57,45 +51,45 @@ - (void)setInteractionMode:(SDLInteractionMode)interactionMode { if (interactionMode != nil) { - [parameters setObject:interactionMode forKey:NAMES_interactionMode]; + [parameters setObject:interactionMode forKey:SDLNameInteractionMode]; } else { - [parameters removeObjectForKey:NAMES_interactionMode]; + [parameters removeObjectForKey:SDLNameInteractionMode]; } } - (SDLInteractionMode)interactionMode { - NSObject *obj = [parameters objectForKey:NAMES_interactionMode]; + NSObject *obj = [parameters objectForKey:SDLNameInteractionMode]; return (SDLInteractionMode)obj; } - (void)setInteractionChoiceSetIDList:(NSMutableArray *)interactionChoiceSetIDList { if (interactionChoiceSetIDList != nil) { - [parameters setObject:interactionChoiceSetIDList forKey:NAMES_interactionChoiceSetIDList]; + [parameters setObject:interactionChoiceSetIDList forKey:SDLNameInteractionChoiceSetIdList]; } else { - [parameters removeObjectForKey:NAMES_interactionChoiceSetIDList]; + [parameters removeObjectForKey:SDLNameInteractionChoiceSetIdList]; } } - (NSMutableArray *)interactionChoiceSetIDList { - return [parameters objectForKey:NAMES_interactionChoiceSetIDList]; + return [parameters objectForKey:SDLNameInteractionChoiceSetIdList]; } - (void)setHelpPrompt:(NSMutableArray *)helpPrompt { if (helpPrompt != nil) { - [parameters setObject:helpPrompt forKey:NAMES_helpPrompt]; + [parameters setObject:helpPrompt forKey:SDLNameHelpPrompt]; } else { - [parameters removeObjectForKey:NAMES_helpPrompt]; + [parameters removeObjectForKey:SDLNameHelpPrompt]; } } - (NSMutableArray *)helpPrompt { - NSMutableArray *array = [parameters objectForKey:NAMES_helpPrompt]; + NSMutableArray *array = [parameters objectForKey:SDLNameHelpPrompt]; if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLTTSChunk.class]) { return array; } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; for (NSDictionary *dict in array) { - [newList addObject:[[SDLTTSChunk alloc] initWithDictionary:(NSMutableDictionary *)dict]]; + [newList addObject:[[SDLTTSChunk alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; } @@ -103,20 +97,20 @@ - (void)setTimeoutPrompt:(NSMutableArray *)timeoutPrompt { if (timeoutPrompt != nil) { - [parameters setObject:timeoutPrompt forKey:NAMES_timeoutPrompt]; + [parameters setObject:timeoutPrompt forKey:SDLNameTimeoutPrompt]; } else { - [parameters removeObjectForKey:NAMES_timeoutPrompt]; + [parameters removeObjectForKey:SDLNameTimeoutPrompt]; } } - (NSMutableArray *)timeoutPrompt { - NSMutableArray *array = [parameters objectForKey:NAMES_timeoutPrompt]; + NSMutableArray *array = [parameters objectForKey:SDLNameTimeoutPrompt]; if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLTTSChunk.class]) { return array; } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; for (NSDictionary *dict in array) { - [newList addObject:[[SDLTTSChunk alloc] initWithDictionary:(NSMutableDictionary *)dict]]; + [newList addObject:[[SDLTTSChunk alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; } @@ -124,32 +118,32 @@ - (void)setTimeout:(NSNumber *)timeout { if (timeout != nil) { - [parameters setObject:timeout forKey:NAMES_timeout]; + [parameters setObject:timeout forKey:SDLNameTimeout]; } else { - [parameters removeObjectForKey:NAMES_timeout]; + [parameters removeObjectForKey:SDLNameTimeout]; } } - (NSNumber *)timeout { - return [parameters objectForKey:NAMES_timeout]; + return [parameters objectForKey:SDLNameTimeout]; } - (void)setVrHelp:(NSMutableArray *)vrHelp { if (vrHelp != nil) { - [parameters setObject:vrHelp forKey:NAMES_vrHelp]; + [parameters setObject:vrHelp forKey:SDLNameVRHelp]; } else { - [parameters removeObjectForKey:NAMES_vrHelp]; + [parameters removeObjectForKey:SDLNameVRHelp]; } } - (NSMutableArray *)vrHelp { - NSMutableArray *array = [parameters objectForKey:NAMES_vrHelp]; + NSMutableArray *array = [parameters objectForKey:SDLNameVRHelp]; if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLVRHelpItem.class]) { return array; } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; for (NSDictionary *dict in array) { - [newList addObject:[[SDLVRHelpItem alloc] initWithDictionary:(NSMutableDictionary *)dict]]; + [newList addObject:[[SDLVRHelpItem alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; } @@ -157,14 +151,14 @@ - (void)setInteractionLayout:(SDLLayoutMode)interactionLayout { if (interactionLayout != nil) { - [parameters setObject:interactionLayout forKey:NAMES_interactionLayout]; + [parameters setObject:interactionLayout forKey:SDLNameInteractionLayout]; } else { - [parameters removeObjectForKey:NAMES_interactionLayout]; + [parameters removeObjectForKey:SDLNameInteractionLayout]; } } - (SDLLayoutMode)interactionLayout { - NSObject *obj = [parameters objectForKey:NAMES_interactionLayout]; + NSObject *obj = [parameters objectForKey:SDLNameInteractionLayout]; return (SDLLayoutMode)obj; } diff --git a/SmartDeviceLink/SDLPerformInteractionResponse.h b/SmartDeviceLink/SDLPerformInteractionResponse.h index 4f279501f..6f9b40459 100644 --- a/SmartDeviceLink/SDLPerformInteractionResponse.h +++ b/SmartDeviceLink/SDLPerformInteractionResponse.h @@ -11,19 +11,7 @@ * * @since SDL 1.0 */ -@interface SDLPerformInteractionResponse : SDLRPCResponse { -} - -/** - * @abstract Constructs a new SDLPerformInteractionResponse object - */ -- (instancetype)init; - -/** - * @abstract Constructs a new SDLPerformInteractionResponse object indicated by the dictionary parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLPerformInteractionResponse : SDLRPCResponse /** * @abstract ID of the choice that was selected in response to PerformInteraction. diff --git a/SmartDeviceLink/SDLPerformInteractionResponse.m b/SmartDeviceLink/SDLPerformInteractionResponse.m index 9cec15612..84eb12fb5 100644 --- a/SmartDeviceLink/SDLPerformInteractionResponse.m +++ b/SmartDeviceLink/SDLPerformInteractionResponse.m @@ -9,51 +9,45 @@ @implementation SDLPerformInteractionResponse - (instancetype)init { - if (self = [super initWithName:NAMES_PerformInteraction]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNamePerformInteraction]) { } return self; } - (void)setChoiceID:(NSNumber *)choiceID { if (choiceID != nil) { - [parameters setObject:choiceID forKey:NAMES_choiceID]; + [parameters setObject:choiceID forKey:SDLNameChoiceId]; } else { - [parameters removeObjectForKey:NAMES_choiceID]; + [parameters removeObjectForKey:SDLNameChoiceId]; } } - (NSNumber *)choiceID { - return [parameters objectForKey:NAMES_choiceID]; + return [parameters objectForKey:SDLNameChoiceId]; } - (void)setManualTextEntry:(NSString *)manualTextEntry { if (manualTextEntry != nil) { - [parameters setObject:manualTextEntry forKey:NAMES_manualTextEntry]; + [parameters setObject:manualTextEntry forKey:SDLNameManualTextEntry]; } else { - [parameters removeObjectForKey:NAMES_manualTextEntry]; + [parameters removeObjectForKey:SDLNameManualTextEntry]; } } - (NSString *)manualTextEntry { - return [parameters objectForKey:NAMES_manualTextEntry]; + return [parameters objectForKey:SDLNameManualTextEntry]; } - (void)setTriggerSource:(SDLTriggerSource)triggerSource { if (triggerSource != nil) { - [parameters setObject:triggerSource forKey:NAMES_triggerSource]; + [parameters setObject:triggerSource forKey:SDLNameTriggerSource]; } else { - [parameters removeObjectForKey:NAMES_triggerSource]; + [parameters removeObjectForKey:SDLNameTriggerSource]; } } - (SDLTriggerSource)triggerSource { - NSObject *obj = [parameters objectForKey:NAMES_triggerSource]; + NSObject *obj = [parameters objectForKey:SDLNameTriggerSource]; return (SDLTriggerSource)obj; } diff --git a/SmartDeviceLink/SDLPermissionItem.h b/SmartDeviceLink/SDLPermissionItem.h index a0fe0d580..a64c11aa2 100644 --- a/SmartDeviceLink/SDLPermissionItem.h +++ b/SmartDeviceLink/SDLPermissionItem.h @@ -7,11 +7,7 @@ @class SDLParameterPermissions; -@interface SDLPermissionItem : SDLRPCStruct { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLPermissionItem : SDLRPCStruct @property (strong) NSString *rpcName; @property (strong) SDLHMIPermissions *hmiPermissions; diff --git a/SmartDeviceLink/SDLPermissionItem.m b/SmartDeviceLink/SDLPermissionItem.m index 560094c2e..ccd7bca6a 100644 --- a/SmartDeviceLink/SDLPermissionItem.m +++ b/SmartDeviceLink/SDLPermissionItem.m @@ -7,64 +7,51 @@ #import "SDLNames.h" #import "SDLParameterPermissions.h" - @implementation SDLPermissionItem -- (instancetype)init { - if (self = [super init]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setRpcName:(NSString *)rpcName { if (rpcName != nil) { - [store setObject:rpcName forKey:NAMES_rpcName]; + [store setObject:rpcName forKey:SDLNameRPCName]; } else { - [store removeObjectForKey:NAMES_rpcName]; + [store removeObjectForKey:SDLNameRPCName]; } } - (NSString *)rpcName { - return [store objectForKey:NAMES_rpcName]; + return [store objectForKey:SDLNameRPCName]; } - (void)setHmiPermissions:(SDLHMIPermissions *)hmiPermissions { if (hmiPermissions != nil) { - [store setObject:hmiPermissions forKey:NAMES_hmiPermissions]; + [store setObject:hmiPermissions forKey:SDLNameHMIPermissions]; } else { - [store removeObjectForKey:NAMES_hmiPermissions]; + [store removeObjectForKey:SDLNameHMIPermissions]; } } - (SDLHMIPermissions *)hmiPermissions { - NSObject *obj = [store objectForKey:NAMES_hmiPermissions]; + NSObject *obj = [store objectForKey:SDLNameHMIPermissions]; if (obj == nil || [obj isKindOfClass:SDLHMIPermissions.class]) { return (SDLHMIPermissions *)obj; } else { - return [[SDLHMIPermissions alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLHMIPermissions alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setParameterPermissions:(SDLParameterPermissions *)parameterPermissions { if (parameterPermissions != nil) { - [store setObject:parameterPermissions forKey:NAMES_parameterPermissions]; + [store setObject:parameterPermissions forKey:SDLNameParameterPermissions]; } else { - [store removeObjectForKey:NAMES_parameterPermissions]; + [store removeObjectForKey:SDLNameParameterPermissions]; } } - (SDLParameterPermissions *)parameterPermissions { - NSObject *obj = [store objectForKey:NAMES_parameterPermissions]; + NSObject *obj = [store objectForKey:SDLNameParameterPermissions]; if (obj == nil || [obj isKindOfClass:SDLParameterPermissions.class]) { return (SDLParameterPermissions *)obj; } else { - return [[SDLParameterPermissions alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLParameterPermissions alloc] initWithDictionary:(NSDictionary *)obj]; } } diff --git a/SmartDeviceLink/SDLPresetBankCapabilities.h b/SmartDeviceLink/SDLPresetBankCapabilities.h index edf544f8b..4bc582191 100644 --- a/SmartDeviceLink/SDLPresetBankCapabilities.h +++ b/SmartDeviceLink/SDLPresetBankCapabilities.h @@ -9,19 +9,7 @@ * * @since SDL 2.0 */ -@interface SDLPresetBankCapabilities : SDLRPCStruct { -} - -/** - * @abstract Constructs a newly allocated SDLPresetBankCapabilities object - */ -- (instancetype)init; - -/** - * @abstract Constructs a newly allocated SDLPresetBankCapabilities object indicated by the dictionary parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLPresetBankCapabilities : SDLRPCStruct /** * @abstract If Onscreen custom presets are available. diff --git a/SmartDeviceLink/SDLPresetBankCapabilities.m b/SmartDeviceLink/SDLPresetBankCapabilities.m index 7654aa61d..4e9490a4c 100644 --- a/SmartDeviceLink/SDLPresetBankCapabilities.m +++ b/SmartDeviceLink/SDLPresetBankCapabilities.m @@ -8,28 +8,16 @@ @implementation SDLPresetBankCapabilities -- (instancetype)init { - if (self = [super init]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setOnScreenPresetsAvailable:(NSNumber *)onScreenPresetsAvailable { if (onScreenPresetsAvailable != nil) { - [store setObject:onScreenPresetsAvailable forKey:NAMES_onScreenPresetsAvailable]; + [store setObject:onScreenPresetsAvailable forKey:SDLNameOnScreenPresetsAvailable]; } else { - [store removeObjectForKey:NAMES_onScreenPresetsAvailable]; + [store removeObjectForKey:SDLNameOnScreenPresetsAvailable]; } } - (NSNumber *)onScreenPresetsAvailable { - return [store objectForKey:NAMES_onScreenPresetsAvailable]; + return [store objectForKey:SDLNameOnScreenPresetsAvailable]; } @end diff --git a/SmartDeviceLink/SDLProtocol.m b/SmartDeviceLink/SDLProtocol.m index 6261e02ee..a1224dd34 100644 --- a/SmartDeviceLink/SDLProtocol.m +++ b/SmartDeviceLink/SDLProtocol.m @@ -3,7 +3,6 @@ #import "SDLFunctionID.h" -#import "SDLJsonEncoder.h" #import "SDLAbstractTransport.h" #import "SDLDebugTool.h" @@ -184,7 +183,12 @@ typedef NSNumber SDLServiceTypeBox; - (BOOL)sendRPC:(SDLRPCMessage *)message encrypted:(BOOL)encryption error:(NSError *__autoreleasing *)error { NSParameterAssert(message != nil); - NSData *jsonData = [[SDLJsonEncoder instance] encodeDictionary:[message serializeAsDictionary:[SDLGlobals globals].protocolVersion]]; + NSData *jsonData = [NSJSONSerialization dataWithJSONObject:[message serializeAsDictionary:[SDLGlobals globals].protocolVersion] options:kNilOptions error:error]; + + if (error != nil) { + [SDLDebugTool logInfo:[NSString stringWithFormat:@"Error encoding JSON data: %@", *error] withType:SDLDebugType_Protocol]; + } + NSData *messagePayload = nil; NSString *logMessage = [NSString stringWithFormat:@"%@", message]; @@ -203,7 +207,7 @@ typedef NSNumber SDLServiceTypeBox; // Build a binary header // Serialize the RPC data into an NSData SDLRPCPayload *rpcPayload = [[SDLRPCPayload alloc] init]; - rpcPayload.functionID = [[[[SDLFunctionID alloc] init] getFunctionID:[message getFunctionName]] intValue]; + rpcPayload.functionID = [[[SDLFunctionID sharedInstance] functionIdForName:[message getFunctionName]] intValue]; rpcPayload.jsonData = jsonData; rpcPayload.binaryData = message.bulkData; diff --git a/SmartDeviceLink/SDLProtocolMessage.h b/SmartDeviceLink/SDLProtocolMessage.h index 62abd6226..782618f3e 100644 --- a/SmartDeviceLink/SDLProtocolMessage.h +++ b/SmartDeviceLink/SDLProtocolMessage.h @@ -2,8 +2,8 @@ // #import <Foundation/Foundation.h> -@class SDLProtocolHeader; +@class SDLProtocolHeader; @interface SDLProtocolMessage : NSObject diff --git a/SmartDeviceLink/SDLProtocolMessage.m b/SmartDeviceLink/SDLProtocolMessage.m index bfc33c4d7..2d1007dbf 100644 --- a/SmartDeviceLink/SDLProtocolMessage.m +++ b/SmartDeviceLink/SDLProtocolMessage.m @@ -4,6 +4,7 @@ #import "SDLProtocolMessage.h" #import "SDLFunctionID.h" +#import "SDLNames.h" #import "SDLProtocolHeader.h" #import "SDLRPCPayload.h" #import "SDLV1ProtocolMessage.h" @@ -60,7 +61,7 @@ if (self.header.version >= 2) { SDLRPCPayload *rpcPayload = [SDLRPCPayload rpcPayloadWithData:self.payload]; if (rpcPayload) { - NSString *functionName = [[[SDLFunctionID alloc] init] getFunctionName:rpcPayload.functionID]; + SDLName functionName = [[SDLFunctionID sharedInstance] functionNameForId:rpcPayload.functionID]; UInt8 rpcType = rpcPayload.rpcType; NSArray *rpcTypeNames = @[@"Request", @"Response", @"Notification"]; diff --git a/SmartDeviceLink/SDLProxy.h b/SmartDeviceLink/SDLProxy.h index 05da1c2b5..ed9ae4052 100644 --- a/SmartDeviceLink/SDLProxy.h +++ b/SmartDeviceLink/SDLProxy.h @@ -48,9 +48,6 @@ __deprecated_msg("Use SDLManager instead") - (void)addSecurityManagers:(NSArray<Class> *)securityManagerClasses forAppId:(NSString *)appId; -+ (void)enableSiphonDebug; -+ (void)disableSiphonDebug; - /** * Puts data into a file on the module * @abstract Performs a putFile for a given input stream, performed in chunks, for handling very large files. diff --git a/SmartDeviceLink/SDLProxy.m b/SmartDeviceLink/SDLProxy.m index 3c6fdc0d8..bec23a9ae 100644 --- a/SmartDeviceLink/SDLProxy.m +++ b/SmartDeviceLink/SDLProxy.m @@ -14,12 +14,10 @@ #import "SDLFunctionID.h" #import "SDLGlobals.h" #import "SDLHMILevel.h" -#import "SDLJsonDecoder.h" -#import "SDLJsonEncoder.h" #import "SDLLanguage.h" #import "SDLLayoutMode.h" #import "SDLLockScreenStatusManager.h" -#import "SDLNames.h" + #import "SDLOnHMIStatus.h" #import "SDLOnSystemRequest.h" #import "SDLPolicyDataParser.h" @@ -37,7 +35,6 @@ #import "SDLRPCResponse.h" #import "SDLRegisterAppInterfaceResponse.h" #import "SDLRequestType.h" -#import "SDLSiphonServer.h" #import "SDLStreamingMediaManager.h" #import "SDLSystemContext.h" #import "SDLSystemRequest.h" @@ -308,7 +305,7 @@ const int POLICIES_CORRELATION_ID = 65535; NSString *messageType = [message messageType]; // If it's a response, append response - if ([messageType isEqualToString:NAMES_response]) { + if ([messageType isEqualToString:SDLNameResponse]) { BOOL notGenericResponseMessage = ![functionName isEqualToString:@"GenericResponse"]; if (notGenericResponseMessage) { functionName = [NSString stringWithFormat:@"%@Response", functionName]; @@ -324,7 +321,7 @@ const int POLICIES_CORRELATION_ID = 65535; [SDLDebugTool logInfo:logMessage withType:SDLDebugType_RPC toOutput:SDLDebugOutput_All toGroup:self.debugConsoleGroupName]; // Intercept and handle several messages ourselves - if ([functionName isEqualToString:NAMES_OnAppInterfaceUnregistered] || [functionName isEqualToString:NAMES_UnregisterAppInterface]) { + if ([functionName isEqualToString:SDLNameOnAppInterfaceUnregistered] || [functionName isEqualToString:SDLNameUnregisterAppInterface]) { [self handleRPCUnregistered:dict]; } @@ -436,7 +433,7 @@ const int POLICIES_CORRELATION_ID = 65535; #pragma mark Handle Post-Invoke of Delegate Methods - (void)handleAfterHMIStatus:(SDLRPCMessage *)message { - SDLHMILevel hmiLevel = (SDLHMILevel)[message getParameters:NAMES_hmiLevel]; + SDLHMILevel hmiLevel = (SDLHMILevel)[message getParameters:SDLNameHMILevel]; _lsm.hmiLevel = hmiLevel; SEL callbackSelector = NSSelectorFromString(@"onOnLockScreenNotification:"); @@ -444,7 +441,7 @@ const int POLICIES_CORRELATION_ID = 65535; } - (void)handleAfterDriverDistraction:(SDLRPCMessage *)message { - NSString *stateString = (NSString *)[message getParameters:NAMES_state]; + NSString *stateString = (NSString *)[message getParameters:SDLNameState]; BOOL state = [stateString isEqualToString:@"DD_ON"] ? YES : NO; _lsm.driverDistracted = state; @@ -810,14 +807,4 @@ const int POLICIES_CORRELATION_ID = 65535; } } - -#pragma mark - Siphon management -+ (void)enableSiphonDebug { - [SDLSiphonServer enableSiphonDebug]; -} - -+ (void)disableSiphonDebug { - [SDLSiphonServer disableSiphonDebug]; -} - @end diff --git a/SmartDeviceLink/SDLPutFile.h b/SmartDeviceLink/SDLPutFile.h index 4f2ed90e0..a0d6eb364 100644 --- a/SmartDeviceLink/SDLPutFile.h +++ b/SmartDeviceLink/SDLPutFile.h @@ -13,20 +13,7 @@ * @see SDLDeleteFile * @see SDLListFiles */ -@interface SDLPutFile : SDLRPCRequest { -} - -/** - * Constructs a new SDLPutFile object - */ -- (instancetype)init; - -/** - * Constructs a new SDLPutFile object indicated by the dictionary parameter - * - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLPutFile : SDLRPCRequest /** * A file reference name diff --git a/SmartDeviceLink/SDLPutFile.m b/SmartDeviceLink/SDLPutFile.m index b44671063..32b88a08c 100644 --- a/SmartDeviceLink/SDLPutFile.m +++ b/SmartDeviceLink/SDLPutFile.m @@ -5,92 +5,85 @@ #import "SDLNames.h" - @implementation SDLPutFile - (instancetype)init { - if (self = [super initWithName:NAMES_PutFile]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNamePutFile]) { } return self; } - (void)setSyncFileName:(NSString *)syncFileName { if (syncFileName != nil) { - [parameters setObject:syncFileName forKey:NAMES_syncFileName]; + [parameters setObject:syncFileName forKey:SDLNameSyncFileName]; } else { - [parameters removeObjectForKey:NAMES_syncFileName]; + [parameters removeObjectForKey:SDLNameSyncFileName]; } } - (NSString *)syncFileName { - return [parameters objectForKey:NAMES_syncFileName]; + return [parameters objectForKey:SDLNameSyncFileName]; } - (void)setFileType:(SDLFileType)fileType { if (fileType != nil) { - [parameters setObject:fileType forKey:NAMES_fileType]; + [parameters setObject:fileType forKey:SDLNameFileType]; } else { - [parameters removeObjectForKey:NAMES_fileType]; + [parameters removeObjectForKey:SDLNameFileType]; } } - (SDLFileType)fileType { - NSObject *obj = [parameters objectForKey:NAMES_fileType]; + NSObject *obj = [parameters objectForKey:SDLNameFileType]; return (SDLFileType)obj; } - (void)setPersistentFile:(NSNumber *)persistentFile { if (persistentFile != nil) { - [parameters setObject:persistentFile forKey:NAMES_persistentFile]; + [parameters setObject:persistentFile forKey:SDLNamePersistentFile]; } else { - [parameters removeObjectForKey:NAMES_persistentFile]; + [parameters removeObjectForKey:SDLNamePersistentFile]; } } - (NSNumber *)persistentFile { - return [parameters objectForKey:NAMES_persistentFile]; + return [parameters objectForKey:SDLNamePersistentFile]; } - (void)setSystemFile:(NSNumber *)systemFile { if (systemFile != nil) { - [parameters setObject:systemFile forKey:NAMES_systemFile]; + [parameters setObject:systemFile forKey:SDLNameSystemFile]; } else { - [parameters removeObjectForKey:NAMES_systemFile]; + [parameters removeObjectForKey:SDLNameSystemFile]; } } - (NSNumber *)systemFile { - return [parameters objectForKey:NAMES_systemFile]; + return [parameters objectForKey:SDLNameSystemFile]; } - (void)setOffset:(NSNumber *)offset { if (offset != nil) { - [parameters setObject:offset forKey:NAMES_offset]; + [parameters setObject:offset forKey:SDLNameOffset]; } else { - [parameters removeObjectForKey:NAMES_offset]; + [parameters removeObjectForKey:SDLNameOffset]; } } - (NSNumber *)offset { - return [parameters objectForKey:NAMES_offset]; + return [parameters objectForKey:SDLNameOffset]; } - (void)setLength:(NSNumber *)length { if (length != nil) { - [parameters setObject:length forKey:NAMES_length]; + [parameters setObject:length forKey:SDLNameLength]; } else { - [parameters removeObjectForKey:NAMES_length]; + [parameters removeObjectForKey:SDLNameLength]; } } - (NSNumber *)length { - return [parameters objectForKey:NAMES_length]; + return [parameters objectForKey:SDLNameLength]; } @end diff --git a/SmartDeviceLink/SDLPutFileResponse.h b/SmartDeviceLink/SDLPutFileResponse.h index 9857607ca..2140a0e2d 100644 --- a/SmartDeviceLink/SDLPutFileResponse.h +++ b/SmartDeviceLink/SDLPutFileResponse.h @@ -9,16 +9,7 @@ * * Since SmartDeviceLink 2.0 */ -@interface SDLPutFileResponse : SDLRPCResponse { -} -/** - * @abstract Constructs a new SDLPutFileResponse object - */ -- (instancetype)init; -/** - * @abstract Constructs a new SDLPutFileResponse object indicated by the dictionary parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLPutFileResponse : SDLRPCResponse + @property (strong) NSNumber *spaceAvailable; @end diff --git a/SmartDeviceLink/SDLPutFileResponse.m b/SmartDeviceLink/SDLPutFileResponse.m index 4a956cfbd..1b2e7a4f0 100644 --- a/SmartDeviceLink/SDLPutFileResponse.m +++ b/SmartDeviceLink/SDLPutFileResponse.m @@ -9,27 +9,21 @@ @implementation SDLPutFileResponse - (instancetype)init { - if (self = [super initWithName:NAMES_PutFile]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNamePutFile]) { } return self; } - (void)setSpaceAvailable:(NSNumber *)spaceAvailable { if (spaceAvailable != nil) { - [parameters setObject:spaceAvailable forKey:NAMES_spaceAvailable]; + [parameters setObject:spaceAvailable forKey:SDLNameSpaceAvailable]; } else { - [parameters removeObjectForKey:NAMES_spaceAvailable]; + [parameters removeObjectForKey:SDLNameSpaceAvailable]; } } - (NSNumber *)spaceAvailable { - return [parameters objectForKey:NAMES_spaceAvailable]; + return [parameters objectForKey:SDLNameSpaceAvailable]; } @end diff --git a/SmartDeviceLink/SDLRPCMessage.h b/SmartDeviceLink/SDLRPCMessage.h index fc5f577ef..febfa406d 100644 --- a/SmartDeviceLink/SDLRPCMessage.h +++ b/SmartDeviceLink/SDLRPCMessage.h @@ -12,7 +12,7 @@ } - (instancetype)initWithName:(NSString *)name; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +- (instancetype)initWithDictionary:(NSDictionary *)dict; - (NSString *)getFunctionName; - (void)setFunctionName:(NSString *)functionName; - (NSObject *)getParameters:(NSString *)functionName; diff --git a/SmartDeviceLink/SDLRPCMessage.m b/SmartDeviceLink/SDLRPCMessage.m index be5f95334..3f943252c 100644 --- a/SmartDeviceLink/SDLRPCMessage.m +++ b/SmartDeviceLink/SDLRPCMessage.m @@ -6,7 +6,6 @@ #import "SDLNames.h" - @implementation SDLRPCMessage @synthesize messageType; @@ -15,39 +14,39 @@ if (self = [super init]) { function = [[NSMutableDictionary alloc] initWithCapacity:3]; parameters = [[NSMutableDictionary alloc] init]; - messageType = NAMES_request; + messageType = SDLNameRequest; [store setObject:function forKey:messageType]; - [function setObject:parameters forKey:NAMES_parameters]; - [function setObject:name forKey:NAMES_operation_name]; + [function setObject:parameters forKey:SDLNameParameters]; + [function setObject:name forKey:SDLNameOperationName]; } return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { +- (instancetype)initWithDictionary:(NSDictionary *)dict { if (self = [super initWithDictionary:dict]) { NSEnumerator *enumerator = [store keyEnumerator]; while (messageType = [enumerator nextObject]) { - if ([messageType isEqualToString:@"bulkData"] == FALSE) { + if ([messageType isEqualToString:SDLNameBulkData] == FALSE) { break; } } function = [store objectForKey:messageType]; - parameters = [function objectForKey:NAMES_parameters]; - self.bulkData = [dict objectForKey:@"bulkData"]; + parameters = [function objectForKey:SDLNameParameters]; + self.bulkData = [dict objectForKey:SDLNameBulkData]; } return self; } - (NSString *)getFunctionName { - return [function objectForKey:NAMES_operation_name]; + return [function objectForKey:SDLNameOperationName]; } - (void)setFunctionName:(NSString *)functionName { if (functionName != nil) { - [function setObject:functionName forKey:NAMES_operation_name]; + [function setObject:functionName forKey:SDLNameOperationName]; } else { - [function removeObjectForKey:NAMES_operation_name]; + [function removeObjectForKey:SDLNameOperationName]; } } @@ -69,7 +68,7 @@ } - (NSString *)name { - return [function objectForKey:NAMES_operation_name]; + return [function objectForKey:SDLNameOperationName]; } - (NSString *)description { diff --git a/SmartDeviceLink/SDLRPCNotification.h b/SmartDeviceLink/SDLRPCNotification.h index 05f182b9b..06f5ac52f 100644 --- a/SmartDeviceLink/SDLRPCNotification.h +++ b/SmartDeviceLink/SDLRPCNotification.h @@ -4,10 +4,6 @@ #import "SDLRPCMessage.h" -@interface SDLRPCNotification : SDLRPCMessage { -} - -- (instancetype)initWithName:(NSString *)name; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLRPCNotification : SDLRPCMessage @end diff --git a/SmartDeviceLink/SDLRPCNotification.m b/SmartDeviceLink/SDLRPCNotification.m index 5c2a063dd..22f53b7d3 100644 --- a/SmartDeviceLink/SDLRPCNotification.m +++ b/SmartDeviceLink/SDLRPCNotification.m @@ -14,19 +14,19 @@ return nil; } - messageType = NAMES_notification; + messageType = SDLNameNotification; [store setObject:function forKey:messageType]; return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { +- (instancetype)initWithDictionary:(NSDictionary *)dict { self = [super initWithDictionary:dict]; if (!self) { return nil; } - messageType = NAMES_notification; + messageType = SDLNameNotification; [store setObject:function forKey:messageType]; return self; diff --git a/SmartDeviceLink/SDLRPCPayload.m b/SmartDeviceLink/SDLRPCPayload.m index 2d47b6d1f..90c09175b 100644 --- a/SmartDeviceLink/SDLRPCPayload.m +++ b/SmartDeviceLink/SDLRPCPayload.m @@ -10,12 +10,6 @@ const NSUInteger RPC_HEADER_SIZE = 12; @implementation SDLRPCPayload -- (instancetype)init { - if (self = [super init]) { - } - return self; -} - - (instancetype)initWithData:(NSData *)data { unsigned long dataLength = data.length; diff --git a/SmartDeviceLink/SDLRPCRequest.h b/SmartDeviceLink/SDLRPCRequest.h index e637eb4bc..cbac10ab8 100644 --- a/SmartDeviceLink/SDLRPCRequest.h +++ b/SmartDeviceLink/SDLRPCRequest.h @@ -4,8 +4,7 @@ #import "SDLRPCMessage.h" -@interface SDLRPCRequest : SDLRPCMessage { -} +@interface SDLRPCRequest : SDLRPCMessage @property (strong) NSNumber *correlationID; diff --git a/SmartDeviceLink/SDLRPCRequest.m b/SmartDeviceLink/SDLRPCRequest.m index 48c568c9d..7f4f10c76 100644 --- a/SmartDeviceLink/SDLRPCRequest.m +++ b/SmartDeviceLink/SDLRPCRequest.m @@ -9,14 +9,14 @@ @implementation SDLRPCRequest - (NSNumber *)correlationID { - return [function objectForKey:NAMES_correlationID]; + return [function objectForKey:SDLNameCorrelationId]; } - (void)setCorrelationID:(NSNumber *)corrID { if (corrID != nil) { - [function setObject:corrID forKey:NAMES_correlationID]; + [function setObject:corrID forKey:SDLNameCorrelationId]; } else { - [function removeObjectForKey:NAMES_correlationID]; + [function removeObjectForKey:SDLNameCorrelationId]; } } diff --git a/SmartDeviceLink/SDLRPCResponse.h b/SmartDeviceLink/SDLRPCResponse.h index 13d995042..d6bc4ba4f 100644 --- a/SmartDeviceLink/SDLRPCResponse.h +++ b/SmartDeviceLink/SDLRPCResponse.h @@ -6,8 +6,7 @@ #import "SDLResult.h" -@interface SDLRPCResponse : SDLRPCMessage { -} +@interface SDLRPCResponse : SDLRPCMessage @property (strong) NSNumber *correlationID; @property (strong) NSNumber *success; diff --git a/SmartDeviceLink/SDLRPCResponse.m b/SmartDeviceLink/SDLRPCResponse.m index 334c3191b..b1529b10f 100644 --- a/SmartDeviceLink/SDLRPCResponse.m +++ b/SmartDeviceLink/SDLRPCResponse.m @@ -15,7 +15,7 @@ return nil; } - messageType = NAMES_response; + messageType = SDLNameResponse; [store setObject:function forKey:messageType]; return self; @@ -27,59 +27,59 @@ return nil; } - messageType = NAMES_response; + messageType = SDLNameResponse; [store setObject:function forKey:messageType]; return self; } - (NSNumber *)correlationID { - return [function objectForKey:NAMES_correlationID]; + return [function objectForKey:SDLNameCorrelationId]; } - (void)setCorrelationID:(NSNumber *)corrID { if (corrID != nil) { - [function setObject:corrID forKey:NAMES_correlationID]; + [function setObject:corrID forKey:SDLNameCorrelationId]; } else { - [function removeObjectForKey:NAMES_correlationID]; + [function removeObjectForKey:SDLNameCorrelationId]; } } - (void)setSuccess:(NSNumber *)success { if (success != nil) { - [parameters setObject:success forKey:NAMES_success]; + [parameters setObject:success forKey:SDLNameSuccess]; } else { - [parameters removeObjectForKey:NAMES_success]; + [parameters removeObjectForKey:SDLNameSuccess]; } } - (NSNumber *)success { - return [parameters objectForKey:NAMES_success]; + return [parameters objectForKey:SDLNameSuccess]; } - (void)setResultCode:(SDLResult)resultCode { if (resultCode != nil) { - [parameters setObject:resultCode forKey:NAMES_resultCode]; + [parameters setObject:resultCode forKey:SDLNameResultCode]; } else { - [parameters removeObjectForKey:NAMES_resultCode]; + [parameters removeObjectForKey:SDLNameResultCode]; } } - (SDLResult)resultCode { - NSObject *obj = [parameters objectForKey:NAMES_resultCode]; + NSObject *obj = [parameters objectForKey:SDLNameResultCode]; return (SDLResult)obj; } - (void)setInfo:(NSString *)info { if (info != nil) { - [parameters setObject:info forKey:NAMES_info]; + [parameters setObject:info forKey:SDLNameInfo]; } else { - [parameters removeObjectForKey:NAMES_info]; + [parameters removeObjectForKey:SDLNameInfo]; } } - (NSString *)info { - return [parameters objectForKey:NAMES_info]; + return [parameters objectForKey:SDLNameInfo]; } @end diff --git a/SmartDeviceLink/SDLRPCStruct.h b/SmartDeviceLink/SDLRPCStruct.h index e6b3bcccb..6ff942bd0 100644 --- a/SmartDeviceLink/SDLRPCStruct.h +++ b/SmartDeviceLink/SDLRPCStruct.h @@ -8,9 +8,9 @@ NSMutableDictionary *store; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +- (instancetype)initWithDictionary:(NSDictionary *)dict; - (instancetype)init; -- (NSMutableDictionary *)serializeAsDictionary:(Byte)version; +- (NSDictionary *)serializeAsDictionary:(Byte)version; @end diff --git a/SmartDeviceLink/SDLRPCStruct.m b/SmartDeviceLink/SDLRPCStruct.m index 1efe96de7..0e67ddc03 100644 --- a/SmartDeviceLink/SDLRPCStruct.m +++ b/SmartDeviceLink/SDLRPCStruct.m @@ -7,15 +7,14 @@ #import "SDLEnum.h" #import "SDLNames.h" - @implementation SDLRPCStruct -- (id)initWithDictionary:(NSMutableDictionary *)dict { +- (id)initWithDictionary:(NSDictionary *)dict { if (self = [super init]) { if (dict != nil) { - store = dict; + store = [dict mutableCopy]; } else { - store = [[NSMutableDictionary alloc] init]; + store = [NSMutableDictionary dictionary]; } } return self; @@ -23,22 +22,41 @@ - (id)init { if (self = [super init]) { - store = [[NSMutableDictionary alloc] init]; + store = [NSMutableDictionary dictionary]; } return self; } -- (NSMutableDictionary *)serializeDictionary:(NSDictionary *)dict version:(Byte)version { +- (NSDictionary *)serializeAsDictionary:(Byte)version { + if (version >= 2) { + NSString *messageType = [[store keyEnumerator] nextObject]; + NSMutableDictionary *function = [store objectForKey:messageType]; + if ([function isKindOfClass:NSMutableDictionary.class]) { + NSMutableDictionary *parameters = [function objectForKey:SDLNameParameters]; + return [self.class sdl_serializeDictionary:parameters version:version]; + } else { + return [self.class sdl_serializeDictionary:store version:version]; + } + } else { + return [self.class sdl_serializeDictionary:store version:version]; + } +} + +- (NSString *)description { + return [store description]; +} + ++ (NSDictionary *)sdl_serializeDictionary:(NSDictionary *)dict version:(Byte)version { NSMutableDictionary *ret = [NSMutableDictionary dictionaryWithCapacity:dict.count]; for (NSString *key in [dict keyEnumerator]) { NSObject *value = [dict objectForKey:key]; if ([value isKindOfClass:SDLRPCStruct.class]) { [ret setObject:[(SDLRPCStruct *)value serializeAsDictionary:version] forKey:key]; } else if ([value isKindOfClass:NSDictionary.class]) { - [ret setObject:[self serializeDictionary:(NSDictionary *)value version:version] forKey:key]; + [ret setObject:[self sdl_serializeDictionary:(NSDictionary *)value version:version] forKey:key]; } else if ([value isKindOfClass:NSArray.class]) { NSArray *arrayVal = (NSArray *)value; - + if (arrayVal.count > 0 && ([[arrayVal objectAtIndex:0] isKindOfClass:SDLRPCStruct.class])) { NSMutableArray *serializedList = [NSMutableArray arrayWithCapacity:arrayVal.count]; for (SDLRPCStruct *serializeable in arrayVal) { @@ -55,27 +73,4 @@ return ret; } -- (NSMutableDictionary *)serializeAsDictionary:(Byte)version { - if (version >= 2) { - NSString *messageType = [[store keyEnumerator] nextObject]; - NSMutableDictionary *function = [store objectForKey:messageType]; - if ([function isKindOfClass:NSMutableDictionary.class]) { - NSMutableDictionary *parameters = [function objectForKey:NAMES_parameters]; - return [self serializeDictionary:parameters version:version]; - } else { - return [self serializeDictionary:store version:version]; - } - } else { - return [self serializeDictionary:store version:version]; - } -} - -- (NSString *)description { - return [store description]; -} - -- (void)dealloc { - store = nil; -} - @end diff --git a/SmartDeviceLink/SDLReadDID.h b/SmartDeviceLink/SDLReadDID.h index 76df4a592..0da0c7dfb 100644 --- a/SmartDeviceLink/SDLReadDID.h +++ b/SmartDeviceLink/SDLReadDID.h @@ -16,19 +16,7 @@ * * Since SmartDeviceLink 2.0 */ -@interface SDLReadDID : SDLRPCRequest { -} - -/** - * @abstract Constructs a new SDLReadDID object - */ -- (instancetype)init; - -/** - * @abstract Constructs a new SDLReadDID object indicated by the dictionary parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLReadDID : SDLRPCRequest /** * @abstract An ID of the vehicle module diff --git a/SmartDeviceLink/SDLReadDID.m b/SmartDeviceLink/SDLReadDID.m index 198d992e0..2f12f8977 100644 --- a/SmartDeviceLink/SDLReadDID.m +++ b/SmartDeviceLink/SDLReadDID.m @@ -9,39 +9,33 @@ @implementation SDLReadDID - (instancetype)init { - if (self = [super initWithName:NAMES_ReadDID]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameReadDID]) { } return self; } - (void)setEcuName:(NSNumber *)ecuName { if (ecuName != nil) { - [parameters setObject:ecuName forKey:NAMES_ecuName]; + [parameters setObject:ecuName forKey:SDLNameECUName]; } else { - [parameters removeObjectForKey:NAMES_ecuName]; + [parameters removeObjectForKey:SDLNameECUName]; } } - (NSNumber *)ecuName { - return [parameters objectForKey:NAMES_ecuName]; + return [parameters objectForKey:SDLNameECUName]; } - (void)setDidLocation:(NSMutableArray *)didLocation { if (didLocation != nil) { - [parameters setObject:didLocation forKey:NAMES_didLocation]; + [parameters setObject:didLocation forKey:SDLNameDIDLocation]; } else { - [parameters removeObjectForKey:NAMES_didLocation]; + [parameters removeObjectForKey:SDLNameDIDLocation]; } } - (NSMutableArray *)didLocation { - return [parameters objectForKey:NAMES_didLocation]; + return [parameters objectForKey:SDLNameDIDLocation]; } @end diff --git a/SmartDeviceLink/SDLReadDIDResponse.h b/SmartDeviceLink/SDLReadDIDResponse.h index da1c81573..4c1a1de81 100644 --- a/SmartDeviceLink/SDLReadDIDResponse.h +++ b/SmartDeviceLink/SDLReadDIDResponse.h @@ -9,11 +9,7 @@ * * Since SmartDeviceLink 2.0 */ -@interface SDLReadDIDResponse : SDLRPCResponse { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLReadDIDResponse : SDLRPCResponse @property (strong) NSMutableArray *didResult; diff --git a/SmartDeviceLink/SDLReadDIDResponse.m b/SmartDeviceLink/SDLReadDIDResponse.m index 08c5477f6..89c8b0807 100644 --- a/SmartDeviceLink/SDLReadDIDResponse.m +++ b/SmartDeviceLink/SDLReadDIDResponse.m @@ -10,33 +10,27 @@ @implementation SDLReadDIDResponse - (instancetype)init { - if (self = [super initWithName:NAMES_ReadDID]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameReadDID]) { } return self; } - (void)setDidResult:(NSMutableArray *)didResult { if (didResult != nil) { - [parameters setObject:didResult forKey:NAMES_didResult]; + [parameters setObject:didResult forKey:SDLNameDIDResult]; } else { - [parameters removeObjectForKey:NAMES_didResult]; + [parameters removeObjectForKey:SDLNameDIDResult]; } } - (NSMutableArray *)didResult { - NSMutableArray *array = [parameters objectForKey:NAMES_didResult]; + NSMutableArray *array = [parameters objectForKey:SDLNameDIDResult]; if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLDIDResult.class]) { return array; } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; for (NSDictionary *dict in array) { - [newList addObject:[[SDLDIDResult alloc] initWithDictionary:(NSMutableDictionary *)dict]]; + [newList addObject:[[SDLDIDResult alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; } diff --git a/SmartDeviceLink/SDLRegisterAppInterface.h b/SmartDeviceLink/SDLRegisterAppInterface.h index 2a6ab340b..b21073d9c 100644 --- a/SmartDeviceLink/SDLRegisterAppInterface.h +++ b/SmartDeviceLink/SDLRegisterAppInterface.h @@ -80,20 +80,7 @@ * * @see SDLUnregisterAppInterface SDLOnAppInterfaceUnregistered */ -@interface SDLRegisterAppInterface : SDLRPCRequest { -} - -/** - * @abstract Constructs a new SDLRegisterAppInterface object - */ -- (instancetype)init; - -/** - * @abstract Constructs a new SDLRegisterAppInterface object indicated by the dictionary parameter - * - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLRegisterAppInterface : SDLRPCRequest /** * @abstract The version of the SDL interface diff --git a/SmartDeviceLink/SDLRegisterAppInterface.m b/SmartDeviceLink/SDLRegisterAppInterface.m index ee09d0864..59fe0d44d 100644 --- a/SmartDeviceLink/SDLRegisterAppInterface.m +++ b/SmartDeviceLink/SDLRegisterAppInterface.m @@ -15,62 +15,56 @@ @implementation SDLRegisterAppInterface - (instancetype)init { - if (self = [super initWithName:NAMES_RegisterAppInterface]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameRegisterAppInterface]) { } return self; } - (void)setSyncMsgVersion:(SDLSyncMsgVersion *)syncMsgVersion { if (syncMsgVersion != nil) { - [parameters setObject:syncMsgVersion forKey:NAMES_syncMsgVersion]; + [parameters setObject:syncMsgVersion forKey:SDLNameSyncMessageVersion]; } else { - [parameters removeObjectForKey:NAMES_syncMsgVersion]; + [parameters removeObjectForKey:SDLNameSyncMessageVersion]; } } - (SDLSyncMsgVersion *)syncMsgVersion { - NSObject *obj = [parameters objectForKey:NAMES_syncMsgVersion]; + NSObject *obj = [parameters objectForKey:SDLNameSyncMessageVersion]; if (obj == nil || [obj isKindOfClass:SDLSyncMsgVersion.class]) { return (SDLSyncMsgVersion *)obj; } else { - return [[SDLSyncMsgVersion alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLSyncMsgVersion alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setAppName:(NSString *)appName { if (appName != nil) { - [parameters setObject:appName forKey:NAMES_appName]; + [parameters setObject:appName forKey:SDLNameAppName]; } else { - [parameters removeObjectForKey:NAMES_appName]; + [parameters removeObjectForKey:SDLNameAppName]; } } - (NSString *)appName { - return [parameters objectForKey:NAMES_appName]; + return [parameters objectForKey:SDLNameAppName]; } - (void)setTtsName:(NSMutableArray *)ttsName { if (ttsName != nil) { - [parameters setObject:ttsName forKey:NAMES_ttsName]; + [parameters setObject:ttsName forKey:SDLNameTTSName]; } else { - [parameters removeObjectForKey:NAMES_ttsName]; + [parameters removeObjectForKey:SDLNameTTSName]; } } - (NSMutableArray *)ttsName { - NSMutableArray *array = [parameters objectForKey:NAMES_ttsName]; + NSMutableArray *array = [parameters objectForKey:SDLNameTTSName]; if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLTTSChunk.class]) { return array; } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; for (NSDictionary *dict in array) { - [newList addObject:[[SDLTTSChunk alloc] initWithDictionary:(NSMutableDictionary *)dict]]; + [newList addObject:[[SDLTTSChunk alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; } @@ -78,76 +72,76 @@ - (void)setNgnMediaScreenAppName:(NSString *)ngnMediaScreenAppName { if (ngnMediaScreenAppName != nil) { - [parameters setObject:ngnMediaScreenAppName forKey:NAMES_ngnMediaScreenAppName]; + [parameters setObject:ngnMediaScreenAppName forKey:SDLNameNGNMediaScreenAppName]; } else { - [parameters removeObjectForKey:NAMES_ngnMediaScreenAppName]; + [parameters removeObjectForKey:SDLNameNGNMediaScreenAppName]; } } - (NSString *)ngnMediaScreenAppName { - return [parameters objectForKey:NAMES_ngnMediaScreenAppName]; + return [parameters objectForKey:SDLNameNGNMediaScreenAppName]; } - (void)setVrSynonyms:(NSMutableArray *)vrSynonyms { if (vrSynonyms != nil) { - [parameters setObject:vrSynonyms forKey:NAMES_vrSynonyms]; + [parameters setObject:vrSynonyms forKey:SDLNameVRSynonyms]; } else { - [parameters removeObjectForKey:NAMES_vrSynonyms]; + [parameters removeObjectForKey:SDLNameVRSynonyms]; } } - (NSMutableArray *)vrSynonyms { - return [parameters objectForKey:NAMES_vrSynonyms]; + return [parameters objectForKey:SDLNameVRSynonyms]; } - (void)setIsMediaApplication:(NSNumber *)isMediaApplication { if (isMediaApplication != nil) { - [parameters setObject:isMediaApplication forKey:NAMES_isMediaApplication]; + [parameters setObject:isMediaApplication forKey:SDLNameIsMediaApplication]; } else { - [parameters removeObjectForKey:NAMES_isMediaApplication]; + [parameters removeObjectForKey:SDLNameIsMediaApplication]; } } - (NSNumber *)isMediaApplication { - return [parameters objectForKey:NAMES_isMediaApplication]; + return [parameters objectForKey:SDLNameIsMediaApplication]; } - (void)setLanguageDesired:(SDLLanguage)languageDesired { if (languageDesired != nil) { - [parameters setObject:languageDesired forKey:NAMES_languageDesired]; + [parameters setObject:languageDesired forKey:SDLNameLanguageDesired]; } else { - [parameters removeObjectForKey:NAMES_languageDesired]; + [parameters removeObjectForKey:SDLNameLanguageDesired]; } } - (SDLLanguage)languageDesired { - NSObject *obj = [parameters objectForKey:NAMES_languageDesired]; + NSObject *obj = [parameters objectForKey:SDLNameLanguageDesired]; return (SDLLanguage)obj; } - (void)setHmiDisplayLanguageDesired:(SDLLanguage)hmiDisplayLanguageDesired { if (hmiDisplayLanguageDesired != nil) { - [parameters setObject:hmiDisplayLanguageDesired forKey:NAMES_hmiDisplayLanguageDesired]; + [parameters setObject:hmiDisplayLanguageDesired forKey:SDLNameHMIDisplayLanguageDesired]; } else { - [parameters removeObjectForKey:NAMES_hmiDisplayLanguageDesired]; + [parameters removeObjectForKey:SDLNameHMIDisplayLanguageDesired]; } } - (SDLLanguage)hmiDisplayLanguageDesired { - NSObject *obj = [parameters objectForKey:NAMES_hmiDisplayLanguageDesired]; + NSObject *obj = [parameters objectForKey:SDLNameHMIDisplayLanguageDesired]; return (SDLLanguage)obj; } - (void)setAppHMIType:(NSMutableArray *)appHMIType { if (appHMIType != nil) { - [parameters setObject:appHMIType forKey:NAMES_appHMIType]; + [parameters setObject:appHMIType forKey:SDLNameAppHMIType]; } else { - [parameters removeObjectForKey:NAMES_appHMIType]; + [parameters removeObjectForKey:SDLNameAppHMIType]; } } - (NSMutableArray *)appHMIType { - NSMutableArray *array = [parameters objectForKey:NAMES_appHMIType]; + NSMutableArray *array = [parameters objectForKey:SDLNameAppHMIType]; if ([array count] < 1) { return array; } else { @@ -161,59 +155,59 @@ - (void)setHashID:(NSString *)hashID { if (hashID != nil) { - [parameters setObject:hashID forKey:NAMES_hashID]; + [parameters setObject:hashID forKey:SDLNameHashId]; } else { - [parameters removeObjectForKey:NAMES_hashID]; + [parameters removeObjectForKey:SDLNameHashId]; } } - (NSString *)hashID { - return [parameters objectForKey:NAMES_hashID]; + return [parameters objectForKey:SDLNameHashId]; } - (void)setDeviceInfo:(SDLDeviceInfo *)deviceInfo { if (deviceInfo != nil) { - [parameters setObject:deviceInfo forKey:NAMES_deviceInfo]; + [parameters setObject:deviceInfo forKey:SDLNameDeviceInfo]; } else { - [parameters removeObjectForKey:NAMES_deviceInfo]; + [parameters removeObjectForKey:SDLNameDeviceInfo]; } } - (SDLDeviceInfo *)deviceInfo { - NSObject *obj = [parameters objectForKey:NAMES_deviceInfo]; + NSObject *obj = [parameters objectForKey:SDLNameDeviceInfo]; if (obj == nil || [obj isKindOfClass:SDLDeviceInfo.class]) { return (SDLDeviceInfo *)obj; } else { - return [[SDLDeviceInfo alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLDeviceInfo alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setAppID:(NSString *)appID { if (appID != nil) { - [parameters setObject:appID forKey:NAMES_appID]; + [parameters setObject:appID forKey:SDLNameAppId]; } else { - [parameters removeObjectForKey:NAMES_appID]; + [parameters removeObjectForKey:SDLNameAppId]; } } - (NSString *)appID { - return [parameters objectForKey:NAMES_appID]; + return [parameters objectForKey:SDLNameAppId]; } - (void)setAppInfo:(SDLAppInfo *)appInfo { if (appInfo != nil) { - [parameters setObject:appInfo forKey:NAMES_appInfo]; + [parameters setObject:appInfo forKey:SDLNameAppInfo]; } else { - [parameters removeObjectForKey:NAMES_appInfo]; + [parameters removeObjectForKey:SDLNameAppInfo]; } } - (SDLAppInfo *)appInfo { - NSObject *obj = [parameters objectForKey:NAMES_appInfo]; + NSObject *obj = [parameters objectForKey:SDLNameAppInfo]; if (obj == nil || [obj isKindOfClass:SDLAppInfo.class]) { return (SDLAppInfo *)obj; } else { - return [[SDLAppInfo alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLAppInfo alloc] initWithDictionary:(NSDictionary *)obj]; } } diff --git a/SmartDeviceLink/SDLRegisterAppInterfaceResponse.h b/SmartDeviceLink/SDLRegisterAppInterfaceResponse.h index f5b3c0ed0..47ca96771 100644 --- a/SmartDeviceLink/SDLRegisterAppInterfaceResponse.h +++ b/SmartDeviceLink/SDLRegisterAppInterfaceResponse.h @@ -17,20 +17,7 @@ * * Since SmartDeviceLink 1.0 */ -@interface SDLRegisterAppInterfaceResponse : SDLRPCResponse { -} - -/** - * @abstract Constructs a new SDLRegisterAppInterfaceResponse object - */ -- (instancetype)init; - -/** - * Constructs a new SDLRegisterAppInterfaceResponse object indicated by the NSMutableDictionary - * parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLRegisterAppInterfaceResponse : SDLRPCResponse /** * @see SDLSyncMsgVersion diff --git a/SmartDeviceLink/SDLRegisterAppInterfaceResponse.m b/SmartDeviceLink/SDLRegisterAppInterfaceResponse.m index 48f338adc..f62630b73 100644 --- a/SmartDeviceLink/SDLRegisterAppInterfaceResponse.m +++ b/SmartDeviceLink/SDLRegisterAppInterfaceResponse.m @@ -16,93 +16,83 @@ @implementation SDLRegisterAppInterfaceResponse - (instancetype)init { - if (self = [super initWithName:NAMES_RegisterAppInterface]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameRegisterAppInterface]) { } return self; } - (void)setSyncMsgVersion:(SDLSyncMsgVersion *)syncMsgVersion { if (syncMsgVersion != nil) { - [parameters setObject:syncMsgVersion forKey:NAMES_syncMsgVersion]; + [parameters setObject:syncMsgVersion forKey:SDLNameSyncMessageVersion]; } else { - [parameters removeObjectForKey:NAMES_syncMsgVersion]; + [parameters removeObjectForKey:SDLNameSyncMessageVersion]; } } - (SDLSyncMsgVersion *)syncMsgVersion { - NSObject *obj = [parameters objectForKey:NAMES_syncMsgVersion]; + NSObject *obj = [parameters objectForKey:SDLNameSyncMessageVersion]; if (obj == nil || [obj isKindOfClass:SDLSyncMsgVersion.class]) { return (SDLSyncMsgVersion *)obj; } else { - return [[SDLSyncMsgVersion alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLSyncMsgVersion alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setLanguage:(SDLLanguage)language { if (language != nil) { - [parameters setObject:language forKey:NAMES_language]; + [parameters setObject:language forKey:SDLNameLanguage]; } else { - [parameters removeObjectForKey:NAMES_language]; + [parameters removeObjectForKey:SDLNameLanguage]; } } - (SDLLanguage)language { - NSObject *obj = [parameters objectForKey:NAMES_language]; + NSObject *obj = [parameters objectForKey:SDLNameLanguage]; return (SDLLanguage)obj; } - (void)setHmiDisplayLanguage:(SDLLanguage)hmiDisplayLanguage { if (hmiDisplayLanguage != nil) { - [parameters setObject:hmiDisplayLanguage forKey:NAMES_hmiDisplayLanguage]; + [parameters setObject:hmiDisplayLanguage forKey:SDLNameHMIDisplayLanguage]; } else { - [parameters removeObjectForKey:NAMES_hmiDisplayLanguage]; + [parameters removeObjectForKey:SDLNameHMIDisplayLanguage]; } } - (SDLLanguage)hmiDisplayLanguage { - NSObject *obj = [parameters objectForKey:NAMES_hmiDisplayLanguage]; + NSObject *obj = [parameters objectForKey:SDLNameHMIDisplayLanguage]; return (SDLLanguage)obj; } - (void)setDisplayCapabilities:(SDLDisplayCapabilities*)displayCapabilities { if (displayCapabilities != nil) { - [parameters setObject:displayCapabilities forKey:NAMES_displayCapabilities]; + [parameters setObject:displayCapabilities forKey:SDLNameDisplayCapabilities]; } else { - [parameters removeObjectForKey:NAMES_displayCapabilities]; + [parameters removeObjectForKey:SDLNameDisplayCapabilities]; } } - (SDLDisplayCapabilities*)displayCapabilities { - NSObject *obj = [parameters objectForKey:NAMES_displayCapabilities]; - if (obj == nil || [obj isKindOfClass:SDLDisplayCapabilities.class]) { - return (SDLDisplayCapabilities *)obj; - } else { - return [[SDLDisplayCapabilities alloc] initWithDictionary:(NSMutableDictionary *)obj]; - } + NSObject *obj = [parameters objectForKey:SDLNameDisplayCapabilities]; + return (SDLDisplayCapabilities*)obj; } - (void)setButtonCapabilities:(NSMutableArray *)buttonCapabilities { if (buttonCapabilities != nil) { - [parameters setObject:buttonCapabilities forKey:NAMES_buttonCapabilities]; + [parameters setObject:buttonCapabilities forKey:SDLNameButtonCapabilities]; } else { - [parameters removeObjectForKey:NAMES_buttonCapabilities]; + [parameters removeObjectForKey:SDLNameButtonCapabilities]; } } - (NSMutableArray *)buttonCapabilities { - NSMutableArray *array = [parameters objectForKey:NAMES_buttonCapabilities]; + NSMutableArray *array = [parameters objectForKey:SDLNameButtonCapabilities]; if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLButtonCapabilities.class]) { return array; } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; for (NSDictionary *dict in array) { - [newList addObject:[[SDLButtonCapabilities alloc] initWithDictionary:(NSMutableDictionary *)dict]]; + [newList addObject:[[SDLButtonCapabilities alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; } @@ -110,20 +100,20 @@ - (void)setSoftButtonCapabilities:(NSMutableArray *)softButtonCapabilities { if (softButtonCapabilities != nil) { - [parameters setObject:softButtonCapabilities forKey:NAMES_softButtonCapabilities]; + [parameters setObject:softButtonCapabilities forKey:SDLNameSoftButtonCapabilities]; } else { - [parameters removeObjectForKey:NAMES_softButtonCapabilities]; + [parameters removeObjectForKey:SDLNameSoftButtonCapabilities]; } } - (NSMutableArray *)softButtonCapabilities { - NSMutableArray *array = [parameters objectForKey:NAMES_softButtonCapabilities]; + NSMutableArray *array = [parameters objectForKey:SDLNameSoftButtonCapabilities]; if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLSoftButtonCapabilities.class]) { return array; } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; for (NSDictionary *dict in array) { - [newList addObject:[[SDLSoftButtonCapabilities alloc] initWithDictionary:(NSMutableDictionary *)dict]]; + [newList addObject:[[SDLSoftButtonCapabilities alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; } @@ -131,30 +121,31 @@ - (void)setPresetBankCapabilities:(SDLPresetBankCapabilities *)presetBankCapabilities { if (presetBankCapabilities != nil) { - [parameters setObject:presetBankCapabilities forKey:NAMES_presetBankCapabilities]; + [parameters setObject:presetBankCapabilities forKey:SDLNamePresetBankCapabilities]; } else { - [parameters removeObjectForKey:NAMES_presetBankCapabilities]; + [parameters removeObjectForKey:SDLNamePresetBankCapabilities]; } } - (SDLPresetBankCapabilities *)presetBankCapabilities { - NSObject *obj = [parameters objectForKey:NAMES_presetBankCapabilities]; + NSObject *obj = [parameters objectForKey:SDLNamePresetBankCapabilities]; if (obj == nil || [obj isKindOfClass:SDLPresetBankCapabilities.class]) { return (SDLPresetBankCapabilities *)obj; } else { - return [[SDLPresetBankCapabilities alloc] initWithDictionary:(NSMutableDictionary *)obj]; - }} + return [[SDLPresetBankCapabilities alloc] initWithDictionary:(NSDictionary *)obj]; + } +} - (void)setHmiZoneCapabilities:(NSMutableArray *)hmiZoneCapabilities { if (hmiZoneCapabilities != nil) { - [parameters setObject:hmiZoneCapabilities forKey:NAMES_hmiZoneCapabilities]; + [parameters setObject:hmiZoneCapabilities forKey:SDLNameHMIZoneCapabilities]; } else { - [parameters removeObjectForKey:NAMES_hmiZoneCapabilities]; + [parameters removeObjectForKey:SDLNameHMIZoneCapabilities]; } } - (NSMutableArray *)hmiZoneCapabilities { - NSMutableArray *array = [parameters objectForKey:NAMES_hmiZoneCapabilities]; + NSMutableArray *array = [parameters objectForKey:SDLNameHMIZoneCapabilities]; if ([array count] < 1) { return array; } else { @@ -168,14 +159,14 @@ - (void)setSpeechCapabilities:(NSMutableArray *)speechCapabilities { if (speechCapabilities != nil) { - [parameters setObject:speechCapabilities forKey:NAMES_speechCapabilities]; + [parameters setObject:speechCapabilities forKey:SDLNameSpeechCapabilities]; } else { - [parameters removeObjectForKey:NAMES_speechCapabilities]; + [parameters removeObjectForKey:SDLNameSpeechCapabilities]; } } - (NSMutableArray *)speechCapabilities { - NSMutableArray *array = [parameters objectForKey:NAMES_speechCapabilities]; + NSMutableArray *array = [parameters objectForKey:SDLNameSpeechCapabilities]; if ([array count] < 1) { return array; } else { @@ -189,14 +180,14 @@ - (void)setPrerecordedSpeech:(NSMutableArray *)prerecordedSpeech { if (prerecordedSpeech != nil) { - [parameters setObject:prerecordedSpeech forKey:NAMES_prerecordedSpeech]; + [parameters setObject:prerecordedSpeech forKey:SDLNamePrerecordedSpeech]; } else { - [parameters removeObjectForKey:NAMES_prerecordedSpeech]; + [parameters removeObjectForKey:SDLNamePrerecordedSpeech]; } } - (NSMutableArray *)prerecordedSpeech { - NSMutableArray *array = [parameters objectForKey:NAMES_prerecordedSpeech]; + NSMutableArray *array = [parameters objectForKey:SDLNamePrerecordedSpeech]; if ([array count] < 1) { return array; } else { @@ -210,14 +201,14 @@ - (void)setVrCapabilities:(NSMutableArray *)vrCapabilities { if (vrCapabilities != nil) { - [parameters setObject:vrCapabilities forKey:NAMES_vrCapabilities]; + [parameters setObject:vrCapabilities forKey:SDLNameVRCapabilities]; } else { - [parameters removeObjectForKey:NAMES_vrCapabilities]; + [parameters removeObjectForKey:SDLNameVRCapabilities]; } } - (NSMutableArray *)vrCapabilities { - NSMutableArray *array = [parameters objectForKey:NAMES_vrCapabilities]; + NSMutableArray *array = [parameters objectForKey:SDLNameVRCapabilities]; if ([array count] < 1) { return array; } else { @@ -233,20 +224,20 @@ - (void)setAudioPassThruCapabilities:(NSMutableArray *)audioPassThruCapabilities { if (audioPassThruCapabilities != nil) { - [parameters setObject:audioPassThruCapabilities forKey:NAMES_audioPassThruCapabilities]; + [parameters setObject:audioPassThruCapabilities forKey:SDLNameAudioPassThruCapabilities]; } else { - [parameters removeObjectForKey:NAMES_audioPassThruCapabilities]; + [parameters removeObjectForKey:SDLNameAudioPassThruCapabilities]; } } - (NSMutableArray *)audioPassThruCapabilities { - NSMutableArray *array = [parameters objectForKey:NAMES_audioPassThruCapabilities]; + NSMutableArray *array = [parameters objectForKey:SDLNameAudioPassThruCapabilities]; if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLAudioPassThruCapabilities.class]) { return array; } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; for (NSDictionary *dict in array) { - [newList addObject:[[SDLAudioPassThruCapabilities alloc] initWithDictionary:(NSMutableDictionary *)dict]]; + [newList addObject:[[SDLAudioPassThruCapabilities alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; } @@ -254,72 +245,72 @@ - (void)setVehicleType:(SDLVehicleType *)vehicleType { if (vehicleType != nil) { - [parameters setObject:vehicleType forKey:NAMES_vehicleType]; + [parameters setObject:vehicleType forKey:SDLNameVehicleType]; } else { - [parameters removeObjectForKey:NAMES_vehicleType]; + [parameters removeObjectForKey:SDLNameVehicleType]; } } - (SDLVehicleType *)vehicleType { - NSObject *obj = [parameters objectForKey:NAMES_vehicleType]; + NSObject *obj = [parameters objectForKey:SDLNameVehicleType]; if (obj == nil || [obj isKindOfClass:SDLVehicleType.class]) { return (SDLVehicleType *)obj; } else { - return [[SDLVehicleType alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleType alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setSupportedDiagModes:(NSMutableArray *)supportedDiagModes { if (supportedDiagModes != nil) { - [parameters setObject:supportedDiagModes forKey:NAMES_supportedDiagModes]; + [parameters setObject:supportedDiagModes forKey:SDLNameSupportedDiagnosticModes]; } else { - [parameters removeObjectForKey:NAMES_supportedDiagModes]; + [parameters removeObjectForKey:SDLNameSupportedDiagnosticModes]; } } - (NSMutableArray *)supportedDiagModes { - return [parameters objectForKey:NAMES_supportedDiagModes]; + return [parameters objectForKey:SDLNameSupportedDiagnosticModes]; } - (void)setHmiCapabilities:(SDLHMICapabilities *)hmiCapabilities { if (hmiCapabilities != nil) { - [parameters setObject:hmiCapabilities forKey:NAMES_hmiCapabilities]; + [parameters setObject:hmiCapabilities forKey:SDLNameHMICapabilities]; } else { - [parameters removeObjectForKey:NAMES_hmiCapabilities]; + [parameters removeObjectForKey:SDLNameHMICapabilities]; } } - (SDLHMICapabilities *)hmiCapabilities { - NSObject *obj = [parameters objectForKey:NAMES_hmiCapabilities]; + NSObject *obj = [parameters objectForKey:SDLNameHMICapabilities]; if (obj == nil || [obj isKindOfClass:[SDLHMICapabilities class]]) { return (SDLHMICapabilities *)obj; } else { - return [[SDLHMICapabilities alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLHMICapabilities alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setSdlVersion:(NSString *)sdlVersion { if (sdlVersion != nil) { - parameters[NAMES_sdlVersion] = sdlVersion; + parameters[SDLNameSDLVersion] = sdlVersion; } else { - [parameters removeObjectForKey:NAMES_sdlVersion]; + [parameters removeObjectForKey:SDLNameSDLVersion]; } } - (NSString *)sdlVersion { - return parameters[NAMES_sdlVersion]; + return parameters[SDLNameSDLVersion]; } - (void)setSystemSoftwareVersion:(NSString *)systemSoftwareVersion { if (systemSoftwareVersion != nil) { - parameters[NAMES_systemSoftwareVersion] = systemSoftwareVersion; + parameters[SDLNameSystemSoftwareVersion] = systemSoftwareVersion; } else { - [parameters removeObjectForKey:NAMES_systemSoftwareVersion]; + [parameters removeObjectForKey:SDLNameSystemSoftwareVersion]; } } - (NSString *)systemSoftwareVersion { - return parameters[NAMES_systemSoftwareVersion]; + return parameters[SDLNameSystemSoftwareVersion]; } @end diff --git a/SmartDeviceLink/SDLResetGlobalProperties.h b/SmartDeviceLink/SDLResetGlobalProperties.h index f30b59a41..ec4e37f1b 100644 --- a/SmartDeviceLink/SDLResetGlobalProperties.h +++ b/SmartDeviceLink/SDLResetGlobalProperties.h @@ -20,19 +20,7 @@ * Since SmartDeviceLink 1.0 * See SetGlobalProperties */ -@interface SDLResetGlobalProperties : SDLRPCRequest { -} - -/** - * @abstract Constructs a new SDLResetGlobalProperties object - */ -- (instancetype)init; -/** - * @abstract Constructs a new SDLResetGlobalProperties object indicated by the NSMutableDictionary - * parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLResetGlobalProperties : SDLRPCRequest /** * @abstract An array of one or more GlobalProperty enumeration elements diff --git a/SmartDeviceLink/SDLResetGlobalProperties.m b/SmartDeviceLink/SDLResetGlobalProperties.m index daeb532f2..76b70bd6c 100644 --- a/SmartDeviceLink/SDLResetGlobalProperties.m +++ b/SmartDeviceLink/SDLResetGlobalProperties.m @@ -10,27 +10,21 @@ @implementation SDLResetGlobalProperties - (instancetype)init { - if (self = [super initWithName:NAMES_ResetGlobalProperties]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameResetGlobalProperties]) { } return self; } - (void)setProperties:(NSMutableArray *)properties { if (properties != nil) { - [parameters setObject:properties forKey:NAMES_properties]; + [parameters setObject:properties forKey:SDLNameProperties]; } else { - [parameters removeObjectForKey:NAMES_properties]; + [parameters removeObjectForKey:SDLNameProperties]; } } - (NSMutableArray *)properties { - NSMutableArray *array = [parameters objectForKey:NAMES_properties]; + NSMutableArray *array = [parameters objectForKey:SDLNameProperties]; if ([array count] < 1) { return array; } else { diff --git a/SmartDeviceLink/SDLResetGlobalPropertiesResponse.h b/SmartDeviceLink/SDLResetGlobalPropertiesResponse.h index 5e576445a..eda1b2628 100644 --- a/SmartDeviceLink/SDLResetGlobalPropertiesResponse.h +++ b/SmartDeviceLink/SDLResetGlobalPropertiesResponse.h @@ -9,18 +9,6 @@ * * Since SmartDeviceLink 1.0 */ -@interface SDLResetGlobalPropertiesResponse : SDLRPCResponse { -} - -/** - * @abstract Constructs a new SDLResetGlobalPropertiesResponse object - */ -- (instancetype)init; -/** - * @abstract Constructs a new SDLResetGlobalPropertiesResponse object indicated by the NSMutableDictionary - * parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLResetGlobalPropertiesResponse : SDLRPCResponse @end diff --git a/SmartDeviceLink/SDLResetGlobalPropertiesResponse.m b/SmartDeviceLink/SDLResetGlobalPropertiesResponse.m index e43b61a40..0ae8c079d 100644 --- a/SmartDeviceLink/SDLResetGlobalPropertiesResponse.m +++ b/SmartDeviceLink/SDLResetGlobalPropertiesResponse.m @@ -9,13 +9,7 @@ @implementation SDLResetGlobalPropertiesResponse - (instancetype)init { - if (self = [super initWithName:NAMES_ResetGlobalProperties]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameResetGlobalProperties]) { } return self; } diff --git a/SmartDeviceLink/SDLSamplingRate.h b/SmartDeviceLink/SDLSamplingRate.h index fefd175bf..b6256489d 100644 --- a/SmartDeviceLink/SDLSamplingRate.h +++ b/SmartDeviceLink/SDLSamplingRate.h @@ -14,19 +14,19 @@ typedef SDLEnum SDLSamplingRate NS_STRING_ENUM; /** * @abstract Sampling rate of 8 kHz */ -extern SDLSamplingRate const SDLSamplingRate8kHz; +extern SDLSamplingRate const SDLSamplingRate8KHZ; /** * @abstract Sampling rate of 16 kHz */ -extern SDLSamplingRate const SDLSamplingRate16kHz; +extern SDLSamplingRate const SDLSamplingRate16KHZ; /** * @abstract Sampling rate of 22 kHz */ -extern SDLSamplingRate const SDLSamplingRate22kHz; +extern SDLSamplingRate const SDLSamplingRate22KHZ; /** * @abstract Sampling rate of 44 kHz */ -extern SDLSamplingRate const SDLSamplingRate44kHz; +extern SDLSamplingRate const SDLSamplingRate44KHZ; diff --git a/SmartDeviceLink/SDLSamplingRate.m b/SmartDeviceLink/SDLSamplingRate.m index b96431f04..6858e6e77 100644 --- a/SmartDeviceLink/SDLSamplingRate.m +++ b/SmartDeviceLink/SDLSamplingRate.m @@ -4,7 +4,7 @@ #import "SDLSamplingRate.h" -SDLSamplingRate const SDLSamplingRate8kHz = @"8KHZ"; -SDLSamplingRate const SDLSamplingRate16kHz = @"16KHZ"; -SDLSamplingRate const SDLSamplingRate22kHz = @"22KHZ"; -SDLSamplingRate const SDLSamplingRate44kHz = @"44KHZ"; +SDLSamplingRate const SDLSamplingRate8KHZ = @"8KHZ"; +SDLSamplingRate const SDLSamplingRate16KHZ = @"16KHZ"; +SDLSamplingRate const SDLSamplingRate22KHZ = @"22KHZ"; +SDLSamplingRate const SDLSamplingRate44KHZ = @"44KHZ"; diff --git a/SmartDeviceLink/SDLScreenParams.h b/SmartDeviceLink/SDLScreenParams.h index c60f6f1d6..6236181cf 100644 --- a/SmartDeviceLink/SDLScreenParams.h +++ b/SmartDeviceLink/SDLScreenParams.h @@ -7,11 +7,7 @@ @class SDLTouchEventCapabilities; -@interface SDLScreenParams : SDLRPCStruct { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLScreenParams : SDLRPCStruct @property (strong) SDLImageResolution *resolution; @property (strong) SDLTouchEventCapabilities *touchEventAvailable; diff --git a/SmartDeviceLink/SDLScreenParams.m b/SmartDeviceLink/SDLScreenParams.m index 1debff302..01e966435 100644 --- a/SmartDeviceLink/SDLScreenParams.m +++ b/SmartDeviceLink/SDLScreenParams.m @@ -7,52 +7,39 @@ #import "SDLNames.h" #import "SDLTouchEventCapabilities.h" - @implementation SDLScreenParams -- (instancetype)init { - if (self = [super init]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setResolution:(SDLImageResolution *)resolution { if (resolution != nil) { - [store setObject:resolution forKey:NAMES_resolution]; + [store setObject:resolution forKey:SDLNameResolution]; } else { - [store removeObjectForKey:NAMES_resolution]; + [store removeObjectForKey:SDLNameResolution]; } } - (SDLImageResolution *)resolution { - NSObject *obj = [store objectForKey:NAMES_resolution]; + NSObject *obj = [store objectForKey:SDLNameResolution]; if (obj == nil || [obj isKindOfClass:SDLImageResolution.class]) { return (SDLImageResolution *)obj; } else { - return [[SDLImageResolution alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLImageResolution alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setTouchEventAvailable:(SDLTouchEventCapabilities *)touchEventAvailable { if (touchEventAvailable != nil) { - [store setObject:touchEventAvailable forKey:NAMES_touchEventAvailable]; + [store setObject:touchEventAvailable forKey:SDLNameTouchEventAvailable]; } else { - [store removeObjectForKey:NAMES_touchEventAvailable]; + [store removeObjectForKey:SDLNameTouchEventAvailable]; } } - (SDLTouchEventCapabilities *)touchEventAvailable { - NSObject *obj = [store objectForKey:NAMES_touchEventAvailable]; + NSObject *obj = [store objectForKey:SDLNameTouchEventAvailable]; if (obj == nil || [obj isKindOfClass:SDLTouchEventCapabilities.class]) { return (SDLTouchEventCapabilities *)obj; } else { - return [[SDLTouchEventCapabilities alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLTouchEventCapabilities alloc] initWithDictionary:(NSDictionary *)obj]; } } diff --git a/SmartDeviceLink/SDLScrollableMessage.h b/SmartDeviceLink/SDLScrollableMessage.h index 27e894221..e64332890 100644 --- a/SmartDeviceLink/SDLScrollableMessage.h +++ b/SmartDeviceLink/SDLScrollableMessage.h @@ -13,19 +13,7 @@ * <b>HMILevel needs to be FULL</b> * <p> */ -@interface SDLScrollableMessage : SDLRPCRequest { -} - -/** - * @abstract Constructs a new SDLScrollableMessage object - */ -- (instancetype)init; -/** - * @abstract Constructs a new SDLScrollableMessage object indicated by the NSMutableDictionary - * parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLScrollableMessage : SDLRPCRequest /** * @abstract A Body of text that can include newlines and tabs diff --git a/SmartDeviceLink/SDLScrollableMessage.m b/SmartDeviceLink/SDLScrollableMessage.m index 5995e7874..4ea18ca08 100644 --- a/SmartDeviceLink/SDLScrollableMessage.m +++ b/SmartDeviceLink/SDLScrollableMessage.m @@ -10,57 +10,51 @@ @implementation SDLScrollableMessage - (instancetype)init { - if (self = [super initWithName:NAMES_ScrollableMessage]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameScrollableMessage]) { } return self; } - (void)setScrollableMessageBody:(NSString *)scrollableMessageBody { if (scrollableMessageBody != nil) { - [parameters setObject:scrollableMessageBody forKey:NAMES_scrollableMessageBody]; + [parameters setObject:scrollableMessageBody forKey:SDLNameScrollableMessageBody]; } else { - [parameters removeObjectForKey:NAMES_scrollableMessageBody]; + [parameters removeObjectForKey:SDLNameScrollableMessageBody]; } } - (NSString *)scrollableMessageBody { - return [parameters objectForKey:NAMES_scrollableMessageBody]; + return [parameters objectForKey:SDLNameScrollableMessageBody]; } - (void)setTimeout:(NSNumber *)timeout { if (timeout != nil) { - [parameters setObject:timeout forKey:NAMES_timeout]; + [parameters setObject:timeout forKey:SDLNameTimeout]; } else { - [parameters removeObjectForKey:NAMES_timeout]; + [parameters removeObjectForKey:SDLNameTimeout]; } } - (NSNumber *)timeout { - return [parameters objectForKey:NAMES_timeout]; + return [parameters objectForKey:SDLNameTimeout]; } - (void)setSoftButtons:(NSMutableArray *)softButtons { if (softButtons != nil) { - [parameters setObject:softButtons forKey:NAMES_softButtons]; + [parameters setObject:softButtons forKey:SDLNameSoftButtons]; } else { - [parameters removeObjectForKey:NAMES_softButtons]; + [parameters removeObjectForKey:SDLNameSoftButtons]; } } - (NSMutableArray *)softButtons { - NSMutableArray *array = [parameters objectForKey:NAMES_softButtons]; + NSMutableArray *array = [parameters objectForKey:SDLNameSoftButtons]; if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLSoftButton.class]) { return array; } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; for (NSDictionary *dict in array) { - [newList addObject:[[SDLSoftButton alloc] initWithDictionary:(NSMutableDictionary *)dict]]; + [newList addObject:[[SDLSoftButton alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; } diff --git a/SmartDeviceLink/SDLScrollableMessageResponse.h b/SmartDeviceLink/SDLScrollableMessageResponse.h index e75b157ec..516415468 100644 --- a/SmartDeviceLink/SDLScrollableMessageResponse.h +++ b/SmartDeviceLink/SDLScrollableMessageResponse.h @@ -9,18 +9,6 @@ * * Since SmartDeviceLink 2.0 */ -@interface SDLScrollableMessageResponse : SDLRPCResponse { -} - -/** - * @abstract Constructs a new SDLScrollableMessageResponse object - */ -- (instancetype)init; -/** - * @abstract Constructs a new SDLScrollableMessageResponse object indicated by the NSMutableDictionary - * parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLScrollableMessageResponse : SDLRPCResponse @end diff --git a/SmartDeviceLink/SDLScrollableMessageResponse.m b/SmartDeviceLink/SDLScrollableMessageResponse.m index 77473f07e..f9b00e33b 100644 --- a/SmartDeviceLink/SDLScrollableMessageResponse.m +++ b/SmartDeviceLink/SDLScrollableMessageResponse.m @@ -9,13 +9,7 @@ @implementation SDLScrollableMessageResponse - (instancetype)init { - if (self = [super initWithName:NAMES_ScrollableMessage]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameScrollableMessage]) { } return self; } diff --git a/SmartDeviceLink/SDLSendLocation.h b/SmartDeviceLink/SDLSendLocation.h index cec60c422..235caec28 100644 --- a/SmartDeviceLink/SDLSendLocation.h +++ b/SmartDeviceLink/SDLSendLocation.h @@ -10,9 +10,6 @@ @interface SDLSendLocation : SDLRPCRequest -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; - /** * The longitudinal coordinate of the location. * diff --git a/SmartDeviceLink/SDLSendLocation.m b/SmartDeviceLink/SDLSendLocation.m index 7bf1c5c70..52fecc62e 100644 --- a/SmartDeviceLink/SDLSendLocation.m +++ b/SmartDeviceLink/SDLSendLocation.m @@ -6,20 +6,10 @@ #import "SDLNames.h" - @implementation SDLSendLocation - (instancetype)init { - self = [super initWithName:NAMES_SendLocation]; - if (!self) { - return nil; - } - - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - self = [super initWithDictionary:dict]; + self = [super initWithName:SDLNameSendLocation]; if (!self) { return nil; } @@ -29,86 +19,86 @@ - (void)setLongitudeDegrees:(NSNumber *)longitudeDegrees { if (longitudeDegrees != nil) { - parameters[NAMES_longitudeDegrees] = longitudeDegrees; + parameters[SDLNameLongitudeDegrees] = longitudeDegrees; } else { - [parameters removeObjectForKey:NAMES_longitudeDegrees]; + [parameters removeObjectForKey:SDLNameLongitudeDegrees]; } } - (NSNumber *)longitudeDegrees { - return parameters[NAMES_longitudeDegrees]; + return parameters[SDLNameLongitudeDegrees]; } - (void)setLatitudeDegrees:(NSNumber *)latitudeDegrees { if (latitudeDegrees != nil) { - parameters[NAMES_latitudeDegrees] = latitudeDegrees; + parameters[SDLNameLatitudeDegrees] = latitudeDegrees; } else { - [parameters removeObjectForKey:NAMES_latitudeDegrees]; + [parameters removeObjectForKey:SDLNameLatitudeDegrees]; } } - (NSNumber *)latitudeDegrees { - return parameters[NAMES_latitudeDegrees]; + return parameters[SDLNameLatitudeDegrees]; } - (void)setLocationName:(NSString *)locationName { if (locationName != nil) { - parameters[NAMES_locationName] = locationName; + parameters[SDLNameLocationName] = locationName; } else { - [parameters removeObjectForKey:NAMES_locationName]; + [parameters removeObjectForKey:SDLNameLocationName]; } } - (NSString *)locationName { - return parameters[NAMES_locationName]; + return parameters[SDLNameLocationName]; } - (void)setAddressLines:(NSArray *)addressLines { if (addressLines != nil) { - parameters[NAMES_addressLines] = addressLines; + parameters[SDLNameAddressLines] = addressLines; } else { - [parameters removeObjectForKey:NAMES_addressLines]; + [parameters removeObjectForKey:SDLNameAddressLines]; } } - (NSString *)locationDescription { - return parameters[NAMES_locationDescription]; + return parameters[SDLNameLocationDescription]; } - (void)setLocationDescription:(NSString *)locationDescription { if (locationDescription != nil) { - parameters[NAMES_locationDescription] = locationDescription; + parameters[SDLNameLocationDescription] = locationDescription; } else { - [parameters removeObjectForKey:NAMES_locationDescription]; + [parameters removeObjectForKey:SDLNameLocationDescription]; } } - (NSArray *)addressLines { - return parameters[NAMES_addressLines]; + return parameters[SDLNameAddressLines]; } - (void)setPhoneNumber:(NSString *)phoneNumber { if (phoneNumber != nil) { - parameters[NAMES_phoneNumber] = phoneNumber; + parameters[SDLNamePhoneNumber] = phoneNumber; } else { - [parameters removeObjectForKey:NAMES_phoneNumber]; + [parameters removeObjectForKey:SDLNamePhoneNumber]; } } - (NSString *)phoneNumber { - return parameters[NAMES_phoneNumber]; + return parameters[SDLNamePhoneNumber]; } - (void)setLocationImage:(SDLImage *)locationImage { if (locationImage != nil) { - parameters[NAMES_locationImage] = locationImage; + parameters[SDLNameLocationImage] = locationImage; } else { - [parameters removeObjectForKey:NAMES_locationImage]; + [parameters removeObjectForKey:SDLNameLocationImage]; } } - (SDLImage *)locationImage { - id obj = parameters[NAMES_locationImage]; + id obj = parameters[SDLNameLocationImage]; if (obj == nil || [obj isKindOfClass:[SDLImage class]]) { return (SDLImage *)obj; } else { diff --git a/SmartDeviceLink/SDLSendLocationResponse.h b/SmartDeviceLink/SDLSendLocationResponse.h index 39d8a4ba2..35fc2eca1 100644 --- a/SmartDeviceLink/SDLSendLocationResponse.h +++ b/SmartDeviceLink/SDLSendLocationResponse.h @@ -6,7 +6,4 @@ @interface SDLSendLocationResponse : SDLRPCResponse -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; - @end diff --git a/SmartDeviceLink/SDLSendLocationResponse.m b/SmartDeviceLink/SDLSendLocationResponse.m index 83cde8118..08e47b71f 100644 --- a/SmartDeviceLink/SDLSendLocationResponse.m +++ b/SmartDeviceLink/SDLSendLocationResponse.m @@ -6,20 +6,10 @@ #import "SDLNames.h" - @implementation SDLSendLocationResponse - (instancetype)init { - self = [super initWithName:NAMES_SendLocation]; - if (!self) { - return nil; - } - - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - self = [super initWithDictionary:dict]; + self = [super initWithName:SDLNameSendLocation]; if (!self) { return nil; } diff --git a/SmartDeviceLink/SDLSetAppIcon.h b/SmartDeviceLink/SDLSetAppIcon.h index eee61deb5..10a10abec 100644 --- a/SmartDeviceLink/SDLSetAppIcon.h +++ b/SmartDeviceLink/SDLSetAppIcon.h @@ -11,18 +11,7 @@ * * Since SmartDeviceLink 2.0 */ -@interface SDLSetAppIcon : SDLRPCRequest { -} - -/** - * @abstract Constructs a new SDLSetAppIcon object - */ -- (instancetype)init; -/** - * @abstract Constructs a new SDLSetAppIcon object indicated by the dictionary parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLSetAppIcon : SDLRPCRequest /** * @abstract A file reference name diff --git a/SmartDeviceLink/SDLSetAppIcon.m b/SmartDeviceLink/SDLSetAppIcon.m index 717eeb023..94246b584 100644 --- a/SmartDeviceLink/SDLSetAppIcon.m +++ b/SmartDeviceLink/SDLSetAppIcon.m @@ -9,27 +9,21 @@ @implementation SDLSetAppIcon - (instancetype)init { - if (self = [super initWithName:NAMES_SetAppIcon]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameSetAppIcon]) { } return self; } - (void)setSyncFileName:(NSString *)syncFileName { if (syncFileName != nil) { - [parameters setObject:syncFileName forKey:NAMES_syncFileName]; + [parameters setObject:syncFileName forKey:SDLNameSyncFileName]; } else { - [parameters removeObjectForKey:NAMES_syncFileName]; + [parameters removeObjectForKey:SDLNameSyncFileName]; } } - (NSString *)syncFileName { - return [parameters objectForKey:NAMES_syncFileName]; + return [parameters objectForKey:SDLNameSyncFileName]; } @end diff --git a/SmartDeviceLink/SDLSetAppIconResponse.h b/SmartDeviceLink/SDLSetAppIconResponse.h index 31dd1e6c9..28c818782 100644 --- a/SmartDeviceLink/SDLSetAppIconResponse.h +++ b/SmartDeviceLink/SDLSetAppIconResponse.h @@ -7,10 +7,6 @@ /** SDLSetAppIconResponse is sent, when SDLSetAppIcon has been called. * Since<b>SmartDeviceLink 2.0</b> */ -@interface SDLSetAppIconResponse : SDLRPCResponse { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLSetAppIconResponse : SDLRPCResponse @end diff --git a/SmartDeviceLink/SDLSetAppIconResponse.m b/SmartDeviceLink/SDLSetAppIconResponse.m index 64c10600f..9469b3b99 100644 --- a/SmartDeviceLink/SDLSetAppIconResponse.m +++ b/SmartDeviceLink/SDLSetAppIconResponse.m @@ -9,13 +9,7 @@ @implementation SDLSetAppIconResponse - (instancetype)init { - if (self = [super initWithName:NAMES_SetAppIcon]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameSetAppIcon]) { } return self; } diff --git a/SmartDeviceLink/SDLSetDisplayLayout.h b/SmartDeviceLink/SDLSetDisplayLayout.h index 15226a821..74ef9837e 100644 --- a/SmartDeviceLink/SDLSetDisplayLayout.h +++ b/SmartDeviceLink/SDLSetDisplayLayout.h @@ -10,19 +10,7 @@ * * Since SmartDeviceLink 2.0 */ -@interface SDLSetDisplayLayout : SDLRPCRequest { -} - -/** - * @abstract Constructs a new SDLSetDisplayLayout object - */ -- (instancetype)init; -/** - * @abstract Constructs a new SDLSetDisplayLayout object indicated by the NSMutableDictionary - * parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLSetDisplayLayout : SDLRPCRequest /** * @abstract A display layout. Predefined or dynamically created screen layout. diff --git a/SmartDeviceLink/SDLSetDisplayLayout.m b/SmartDeviceLink/SDLSetDisplayLayout.m index ed812f647..2653b19c0 100644 --- a/SmartDeviceLink/SDLSetDisplayLayout.m +++ b/SmartDeviceLink/SDLSetDisplayLayout.m @@ -9,27 +9,21 @@ @implementation SDLSetDisplayLayout - (instancetype)init { - if (self = [super initWithName:NAMES_SetDisplayLayout]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameSetDisplayLayout]) { } return self; } - (void)setDisplayLayout:(NSString *)displayLayout { if (displayLayout != nil) { - [parameters setObject:displayLayout forKey:NAMES_displayLayout]; + [parameters setObject:displayLayout forKey:SDLNameDisplayLayout]; } else { - [parameters removeObjectForKey:NAMES_displayLayout]; + [parameters removeObjectForKey:SDLNameDisplayLayout]; } } - (NSString *)displayLayout { - return [parameters objectForKey:NAMES_displayLayout]; + return [parameters objectForKey:SDLNameDisplayLayout]; } @end diff --git a/SmartDeviceLink/SDLSetDisplayLayoutResponse.h b/SmartDeviceLink/SDLSetDisplayLayoutResponse.h index 7838ae0a6..2c64cba74 100644 --- a/SmartDeviceLink/SDLSetDisplayLayoutResponse.h +++ b/SmartDeviceLink/SDLSetDisplayLayoutResponse.h @@ -12,14 +12,7 @@ * * Since SmartDeviceLink 2.0 */ -@interface SDLSetDisplayLayoutResponse : SDLRPCResponse { -} - -/** - * @abstract Constructs a new SDLSetDisplayLayoutResponse object - */ -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLSetDisplayLayoutResponse : SDLRPCResponse @property (strong) SDLDisplayCapabilities *displayCapabilities; @property (strong) NSMutableArray *buttonCapabilities; diff --git a/SmartDeviceLink/SDLSetDisplayLayoutResponse.m b/SmartDeviceLink/SDLSetDisplayLayoutResponse.m index fde37062e..7b4692cf2 100644 --- a/SmartDeviceLink/SDLSetDisplayLayoutResponse.m +++ b/SmartDeviceLink/SDLSetDisplayLayoutResponse.m @@ -10,54 +10,47 @@ #import "SDLPresetBankCapabilities.h" #import "SDLSoftButtonCapabilities.h" - @implementation SDLSetDisplayLayoutResponse - (instancetype)init { - if (self = [super initWithName:NAMES_SetDisplayLayout]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameSetDisplayLayout]) { } return self; } - (void)setDisplayCapabilities:(SDLDisplayCapabilities *)displayCapabilities { if (displayCapabilities != nil) { - [parameters setObject:displayCapabilities forKey:NAMES_displayCapabilities]; + [parameters setObject:displayCapabilities forKey:SDLNameDisplayCapabilities]; } else { - [parameters removeObjectForKey:NAMES_displayCapabilities]; + [parameters removeObjectForKey:SDLNameDisplayCapabilities]; } } - (SDLDisplayCapabilities *)displayCapabilities { - NSObject *obj = [parameters objectForKey:NAMES_displayCapabilities]; + NSObject *obj = [parameters objectForKey:SDLNameDisplayCapabilities]; if (obj == nil || [obj isKindOfClass:SDLDisplayCapabilities.class]) { return (SDLDisplayCapabilities *)obj; } else { - return [[SDLDisplayCapabilities alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLDisplayCapabilities alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setButtonCapabilities:(NSMutableArray *)buttonCapabilities { if (buttonCapabilities != nil) { - [parameters setObject:buttonCapabilities forKey:NAMES_buttonCapabilities]; + [parameters setObject:buttonCapabilities forKey:SDLNameButtonCapabilities]; } else { - [parameters removeObjectForKey:NAMES_buttonCapabilities]; + [parameters removeObjectForKey:SDLNameButtonCapabilities]; } } - (NSMutableArray *)buttonCapabilities { - NSMutableArray *array = [parameters objectForKey:NAMES_buttonCapabilities]; + NSMutableArray *array = [parameters objectForKey:SDLNameButtonCapabilities]; if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLButtonCapabilities.class]) { return array; } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; for (NSDictionary *dict in array) { - [newList addObject:[[SDLButtonCapabilities alloc] initWithDictionary:(NSMutableDictionary *)dict]]; + [newList addObject:[[SDLButtonCapabilities alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; } @@ -65,20 +58,20 @@ - (void)setSoftButtonCapabilities:(NSMutableArray *)softButtonCapabilities { if (softButtonCapabilities != nil) { - [parameters setObject:softButtonCapabilities forKey:NAMES_softButtonCapabilities]; + [parameters setObject:softButtonCapabilities forKey:SDLNameSoftButtonCapabilities]; } else { - [parameters removeObjectForKey:NAMES_softButtonCapabilities]; + [parameters removeObjectForKey:SDLNameSoftButtonCapabilities]; } } - (NSMutableArray *)softButtonCapabilities { - NSMutableArray *array = [parameters objectForKey:NAMES_softButtonCapabilities]; + NSMutableArray *array = [parameters objectForKey:SDLNameSoftButtonCapabilities]; if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLSoftButtonCapabilities.class]) { return array; } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; for (NSDictionary *dict in array) { - [newList addObject:[[SDLSoftButtonCapabilities alloc] initWithDictionary:(NSMutableDictionary *)dict]]; + [newList addObject:[[SDLSoftButtonCapabilities alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; } @@ -86,18 +79,18 @@ - (void)setPresetBankCapabilities:(SDLPresetBankCapabilities *)presetBankCapabilities { if (presetBankCapabilities != nil) { - [parameters setObject:presetBankCapabilities forKey:NAMES_presetBankCapabilities]; + [parameters setObject:presetBankCapabilities forKey:SDLNamePresetBankCapabilities]; } else { - [parameters removeObjectForKey:NAMES_presetBankCapabilities]; + [parameters removeObjectForKey:SDLNamePresetBankCapabilities]; } } - (SDLPresetBankCapabilities *)presetBankCapabilities { - NSObject *obj = [parameters objectForKey:NAMES_presetBankCapabilities]; + NSObject *obj = [parameters objectForKey:SDLNamePresetBankCapabilities]; if (obj == nil || [obj isKindOfClass:SDLPresetBankCapabilities.class]) { return (SDLPresetBankCapabilities *)obj; } else { - return [[SDLPresetBankCapabilities alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLPresetBankCapabilities alloc] initWithDictionary:(NSDictionary *)obj]; } } diff --git a/SmartDeviceLink/SDLSetGlobalProperties.h b/SmartDeviceLink/SDLSetGlobalProperties.h index 7ad36e8d5..ba15798a4 100644 --- a/SmartDeviceLink/SDLSetGlobalProperties.h +++ b/SmartDeviceLink/SDLSetGlobalProperties.h @@ -17,19 +17,7 @@ * Since SmartDeviceLink 1.0 * See SDLResetGlobalProperties */ -@interface SDLSetGlobalProperties : SDLRPCRequest { -} - -/** - * @abstract Constructs a new SDLSetGlobalProperties object - */ -- (instancetype)init; -/** - * @abstract Constructs a new SDLSetGlobalProperties object indicated by the NSMutableDictionary - * parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLSetGlobalProperties : SDLRPCRequest /** * @abstract Sets a Vector<TTSChunk> for Help Prompt that Array of one or more diff --git a/SmartDeviceLink/SDLSetGlobalProperties.m b/SmartDeviceLink/SDLSetGlobalProperties.m index ba9749e3e..9c1850b4c 100644 --- a/SmartDeviceLink/SDLSetGlobalProperties.m +++ b/SmartDeviceLink/SDLSetGlobalProperties.m @@ -14,33 +14,27 @@ @implementation SDLSetGlobalProperties - (instancetype)init { - if (self = [super initWithName:NAMES_SetGlobalProperties]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameSetGlobalProperties]) { } return self; } - (void)setHelpPrompt:(NSMutableArray *)helpPrompt { if (helpPrompt != nil) { - [parameters setObject:helpPrompt forKey:NAMES_helpPrompt]; + [parameters setObject:helpPrompt forKey:SDLNameHelpPrompt]; } else { - [parameters removeObjectForKey:NAMES_helpPrompt]; + [parameters removeObjectForKey:SDLNameHelpPrompt]; } } - (NSMutableArray *)helpPrompt { - NSMutableArray *array = [parameters objectForKey:NAMES_helpPrompt]; + NSMutableArray *array = [parameters objectForKey:SDLNameHelpPrompt]; if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLTTSChunk.class]) { return array; } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; for (NSDictionary *dict in array) { - [newList addObject:[[SDLTTSChunk alloc] initWithDictionary:(NSMutableDictionary *)dict]]; + [newList addObject:[[SDLTTSChunk alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; } @@ -48,20 +42,20 @@ - (void)setTimeoutPrompt:(NSMutableArray *)timeoutPrompt { if (timeoutPrompt != nil) { - [parameters setObject:timeoutPrompt forKey:NAMES_timeoutPrompt]; + [parameters setObject:timeoutPrompt forKey:SDLNameTimeoutPrompt]; } else { - [parameters removeObjectForKey:NAMES_timeoutPrompt]; + [parameters removeObjectForKey:SDLNameTimeoutPrompt]; } } - (NSMutableArray *)timeoutPrompt { - NSMutableArray *array = [parameters objectForKey:NAMES_timeoutPrompt]; + NSMutableArray *array = [parameters objectForKey:SDLNameTimeoutPrompt]; if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLTTSChunk.class]) { return array; } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; for (NSDictionary *dict in array) { - [newList addObject:[[SDLTTSChunk alloc] initWithDictionary:(NSMutableDictionary *)dict]]; + [newList addObject:[[SDLTTSChunk alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; } @@ -69,32 +63,32 @@ - (void)setVrHelpTitle:(NSString *)vrHelpTitle { if (vrHelpTitle != nil) { - [parameters setObject:vrHelpTitle forKey:NAMES_vrHelpTitle]; + [parameters setObject:vrHelpTitle forKey:SDLNameVRHelpTitle]; } else { - [parameters removeObjectForKey:NAMES_vrHelpTitle]; + [parameters removeObjectForKey:SDLNameVRHelpTitle]; } } - (NSString *)vrHelpTitle { - return [parameters objectForKey:NAMES_vrHelpTitle]; + return [parameters objectForKey:SDLNameVRHelpTitle]; } - (void)setVrHelp:(NSMutableArray *)vrHelp { if (vrHelp != nil) { - [parameters setObject:vrHelp forKey:NAMES_vrHelp]; + [parameters setObject:vrHelp forKey:SDLNameVRHelp]; } else { - [parameters removeObjectForKey:NAMES_vrHelp]; + [parameters removeObjectForKey:SDLNameVRHelp]; } } - (NSMutableArray *)vrHelp { - NSMutableArray *array = [parameters objectForKey:NAMES_vrHelp]; + NSMutableArray *array = [parameters objectForKey:SDLNameVRHelp]; if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLVRHelpItem.class]) { return array; } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; for (NSDictionary *dict in array) { - [newList addObject:[[SDLVRHelpItem alloc] initWithDictionary:(NSMutableDictionary *)dict]]; + [newList addObject:[[SDLVRHelpItem alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; } @@ -102,47 +96,47 @@ - (void)setMenuTitle:(NSString *)menuTitle { if (menuTitle != nil) { - [parameters setObject:menuTitle forKey:NAMES_menuTitle]; + [parameters setObject:menuTitle forKey:SDLNameMenuTitle]; } else { - [parameters removeObjectForKey:NAMES_menuTitle]; + [parameters removeObjectForKey:SDLNameMenuTitle]; } } - (NSString *)menuTitle { - return [parameters objectForKey:NAMES_menuTitle]; + return [parameters objectForKey:SDLNameMenuTitle]; } - (void)setMenuIcon:(SDLImage *)menuIcon { if (menuIcon != nil) { - [parameters setObject:menuIcon forKey:NAMES_menuIcon]; + [parameters setObject:menuIcon forKey:SDLNameMenuIcon]; } else { - [parameters removeObjectForKey:NAMES_menuIcon]; + [parameters removeObjectForKey:SDLNameMenuIcon]; } } - (SDLImage *)menuIcon { - NSObject *obj = [parameters objectForKey:NAMES_menuIcon]; + NSObject *obj = [parameters objectForKey:SDLNameMenuIcon]; if (obj == nil || [obj isKindOfClass:SDLImage.class]) { return (SDLImage *)obj; } else { - return [[SDLImage alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLImage alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setKeyboardProperties:(SDLKeyboardProperties *)keyboardProperties { if (keyboardProperties != nil) { - [parameters setObject:keyboardProperties forKey:NAMES_keyboardProperties]; + [parameters setObject:keyboardProperties forKey:SDLNameKeyboardProperties]; } else { - [parameters removeObjectForKey:NAMES_keyboardProperties]; + [parameters removeObjectForKey:SDLNameKeyboardProperties]; } } - (SDLKeyboardProperties *)keyboardProperties { - NSObject *obj = [parameters objectForKey:NAMES_keyboardProperties]; + NSObject *obj = [parameters objectForKey:SDLNameKeyboardProperties]; if (obj == nil || [obj isKindOfClass:SDLKeyboardProperties.class]) { return (SDLKeyboardProperties *)obj; } else { - return [[SDLKeyboardProperties alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLKeyboardProperties alloc] initWithDictionary:(NSDictionary *)obj]; } } diff --git a/SmartDeviceLink/SDLSetGlobalPropertiesResponse.h b/SmartDeviceLink/SDLSetGlobalPropertiesResponse.h index 131700137..a5dd82139 100644 --- a/SmartDeviceLink/SDLSetGlobalPropertiesResponse.h +++ b/SmartDeviceLink/SDLSetGlobalPropertiesResponse.h @@ -9,18 +9,6 @@ * * Since SmartDeviceLink 1.0 */ -@interface SDLSetGlobalPropertiesResponse : SDLRPCResponse { -} - -/** - * @abstract Constructs a new SDLSetGlobalPropertiesResponse object - */ -- (instancetype)init; -/** - * @abstract Constructs a new SDLSetGlobalPropertiesResponse object indicated by the NSMutableDictionary - * parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLSetGlobalPropertiesResponse : SDLRPCResponse @end diff --git a/SmartDeviceLink/SDLSetGlobalPropertiesResponse.m b/SmartDeviceLink/SDLSetGlobalPropertiesResponse.m index ff4db22c8..4b56322ac 100644 --- a/SmartDeviceLink/SDLSetGlobalPropertiesResponse.m +++ b/SmartDeviceLink/SDLSetGlobalPropertiesResponse.m @@ -9,13 +9,7 @@ @implementation SDLSetGlobalPropertiesResponse - (instancetype)init { - if (self = [super initWithName:NAMES_SetGlobalProperties]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameSetGlobalProperties]) { } return self; } diff --git a/SmartDeviceLink/SDLSetMediaClockTimer.h b/SmartDeviceLink/SDLSetMediaClockTimer.h index 7b85a1ea1..5eaa3f34a 100644 --- a/SmartDeviceLink/SDLSetMediaClockTimer.h +++ b/SmartDeviceLink/SDLSetMediaClockTimer.h @@ -17,19 +17,7 @@ * * Since SmartDeviceLink 1.0 */ -@interface SDLSetMediaClockTimer : SDLRPCRequest { -} - -/** - * @abstract Constructs a new SDLSetMediaClockTimer object - */ -- (instancetype)init; -/** - * @abstract Constructs a new SDLSetMediaClockTimer object indicated by the NSMutableDictionary - * parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLSetMediaClockTimer : SDLRPCRequest /** * @abstract A Start Time with specifying hour, minute, second values diff --git a/SmartDeviceLink/SDLSetMediaClockTimer.m b/SmartDeviceLink/SDLSetMediaClockTimer.m index 3eb77bf8c..b93062b21 100644 --- a/SmartDeviceLink/SDLSetMediaClockTimer.m +++ b/SmartDeviceLink/SDLSetMediaClockTimer.m @@ -10,61 +10,55 @@ @implementation SDLSetMediaClockTimer - (instancetype)init { - if (self = [super initWithName:NAMES_SetMediaClockTimer]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameSetMediaClockTimer]) { } return self; } - (void)setStartTime:(SDLStartTime *)startTime { if (startTime != nil) { - [parameters setObject:startTime forKey:NAMES_startTime]; + [parameters setObject:startTime forKey:SDLNameStartTime]; } else { - [parameters removeObjectForKey:NAMES_startTime]; + [parameters removeObjectForKey:SDLNameStartTime]; } } - (SDLStartTime *)startTime { - NSObject *obj = [parameters objectForKey:NAMES_startTime]; + NSObject *obj = [parameters objectForKey:SDLNameStartTime]; if (obj == nil || [obj isKindOfClass:SDLStartTime.class]) { return (SDLStartTime *)obj; } else { - return [[SDLStartTime alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLStartTime alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setEndTime:(SDLStartTime *)endTime { if (endTime != nil) { - [parameters setObject:endTime forKey:NAMES_endTime]; + [parameters setObject:endTime forKey:SDLNameEndTime]; } else { - [parameters removeObjectForKey:NAMES_endTime]; + [parameters removeObjectForKey:SDLNameEndTime]; } } - (SDLStartTime *)endTime { - NSObject *obj = [parameters objectForKey:NAMES_endTime]; + NSObject *obj = [parameters objectForKey:SDLNameEndTime]; if (obj == nil || [obj isKindOfClass:SDLStartTime.class]) { return (SDLStartTime *)obj; } else { - return [[SDLStartTime alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLStartTime alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setUpdateMode:(SDLUpdateMode)updateMode { if (updateMode != nil) { - [parameters setObject:updateMode forKey:NAMES_updateMode]; + [parameters setObject:updateMode forKey:SDLNameUpdateMode]; } else { - [parameters removeObjectForKey:NAMES_updateMode]; + [parameters removeObjectForKey:SDLNameUpdateMode]; } } - (SDLUpdateMode)updateMode { - NSObject *obj = [parameters objectForKey:NAMES_updateMode]; + NSObject *obj = [parameters objectForKey:SDLNameUpdateMode]; return (SDLUpdateMode)obj; } diff --git a/SmartDeviceLink/SDLSetMediaClockTimerResponse.h b/SmartDeviceLink/SDLSetMediaClockTimerResponse.h index ffa6a77ae..d1adbda4d 100644 --- a/SmartDeviceLink/SDLSetMediaClockTimerResponse.h +++ b/SmartDeviceLink/SDLSetMediaClockTimerResponse.h @@ -9,20 +9,6 @@ * * Since SmartDeviceLink 1.0 */ -@interface SDLSetMediaClockTimerResponse : SDLRPCResponse { -} - -/** - * @abstract Constructs a new SDLSetMediaClockTimerResponse object - */ -- (instancetype)init; -/** - * @abstract Constructs a new SDLSetMediaClockTimerResponse object indicated by the NSMutableDictionary - * parameter - * <p> - * - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLSetMediaClockTimerResponse : SDLRPCResponse @end diff --git a/SmartDeviceLink/SDLSetMediaClockTimerResponse.m b/SmartDeviceLink/SDLSetMediaClockTimerResponse.m index 098522fbd..899fc4926 100644 --- a/SmartDeviceLink/SDLSetMediaClockTimerResponse.m +++ b/SmartDeviceLink/SDLSetMediaClockTimerResponse.m @@ -9,13 +9,7 @@ @implementation SDLSetMediaClockTimerResponse - (instancetype)init { - if (self = [super initWithName:NAMES_SetMediaClockTimer]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameSetMediaClockTimer]) { } return self; } diff --git a/SmartDeviceLink/SDLShow.h b/SmartDeviceLink/SDLShow.h index fa600c2a6..485440b3b 100644 --- a/SmartDeviceLink/SDLShow.h +++ b/SmartDeviceLink/SDLShow.h @@ -30,18 +30,7 @@ * Since SmartDeviceLink 1.0 * See SDLAlert SDLSetMediaClockTimer */ -@interface SDLShow : SDLRPCRequest { -} - -/** - * @abstract Constructs a new SDLShow object - */ -- (instancetype)init; -/** - * @abstract Constructs a new SDLShow object indicated by the dictionary parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLShow : SDLRPCRequest /** * @abstract The text displayed in a single-line display, or in the upper display diff --git a/SmartDeviceLink/SDLShow.m b/SmartDeviceLink/SDLShow.m index 1f5ab3b8c..03de05bea 100644 --- a/SmartDeviceLink/SDLShow.m +++ b/SmartDeviceLink/SDLShow.m @@ -12,164 +12,158 @@ @implementation SDLShow - (instancetype)init { - if (self = [super initWithName:NAMES_Show]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameShow]) { } return self; } - (void)setMainField1:(NSString *)mainField1 { if (mainField1 != nil) { - [parameters setObject:mainField1 forKey:NAMES_mainField1]; + [parameters setObject:mainField1 forKey:SDLNameMainField1]; } else { - [parameters removeObjectForKey:NAMES_mainField1]; + [parameters removeObjectForKey:SDLNameMainField1]; } } - (NSString *)mainField1 { - return [parameters objectForKey:NAMES_mainField1]; + return [parameters objectForKey:SDLNameMainField1]; } - (void)setMainField2:(NSString *)mainField2 { if (mainField2 != nil) { - [parameters setObject:mainField2 forKey:NAMES_mainField2]; + [parameters setObject:mainField2 forKey:SDLNameMainField2]; } else { - [parameters removeObjectForKey:NAMES_mainField2]; + [parameters removeObjectForKey:SDLNameMainField2]; } } - (NSString *)mainField2 { - return [parameters objectForKey:NAMES_mainField2]; + return [parameters objectForKey:SDLNameMainField2]; } - (void)setMainField3:(NSString *)mainField3 { if (mainField3 != nil) { - [parameters setObject:mainField3 forKey:NAMES_mainField3]; + [parameters setObject:mainField3 forKey:SDLNameMainField3]; } else { - [parameters removeObjectForKey:NAMES_mainField3]; + [parameters removeObjectForKey:SDLNameMainField3]; } } - (NSString *)mainField3 { - return [parameters objectForKey:NAMES_mainField3]; + return [parameters objectForKey:SDLNameMainField3]; } - (void)setMainField4:(NSString *)mainField4 { if (mainField4 != nil) { - [parameters setObject:mainField4 forKey:NAMES_mainField4]; + [parameters setObject:mainField4 forKey:SDLNameMainField4]; } else { - [parameters removeObjectForKey:NAMES_mainField4]; + [parameters removeObjectForKey:SDLNameMainField4]; } } - (NSString *)mainField4 { - return [parameters objectForKey:NAMES_mainField4]; + return [parameters objectForKey:SDLNameMainField4]; } - (void)setAlignment:(SDLTextAlignment)alignment { if (alignment != nil) { - [parameters setObject:alignment forKey:NAMES_alignment]; + [parameters setObject:alignment forKey:SDLNameAlignment]; } else { - [parameters removeObjectForKey:NAMES_alignment]; + [parameters removeObjectForKey:SDLNameAlignment]; } } - (SDLTextAlignment)alignment { - NSObject *obj = [parameters objectForKey:NAMES_alignment]; + NSObject *obj = [parameters objectForKey:SDLNameAlignment]; return (SDLTextAlignment)obj; } - (void)setStatusBar:(NSString *)statusBar { if (statusBar != nil) { - [parameters setObject:statusBar forKey:NAMES_statusBar]; + [parameters setObject:statusBar forKey:SDLNameStatusBar]; } else { - [parameters removeObjectForKey:NAMES_statusBar]; + [parameters removeObjectForKey:SDLNameStatusBar]; } } - (NSString *)statusBar { - return [parameters objectForKey:NAMES_statusBar]; + return [parameters objectForKey:SDLNameStatusBar]; } - (void)setMediaClock:(NSString *)mediaClock { if (mediaClock != nil) { - [parameters setObject:mediaClock forKey:NAMES_mediaClock]; + [parameters setObject:mediaClock forKey:SDLNameMediaClock]; } else { - [parameters removeObjectForKey:NAMES_mediaClock]; + [parameters removeObjectForKey:SDLNameMediaClock]; } } - (NSString *)mediaClock { - return [parameters objectForKey:NAMES_mediaClock]; + return [parameters objectForKey:SDLNameMediaClock]; } - (void)setMediaTrack:(NSString *)mediaTrack { if (mediaTrack != nil) { - [parameters setObject:mediaTrack forKey:NAMES_mediaTrack]; + [parameters setObject:mediaTrack forKey:SDLNameMediaTrack]; } else { - [parameters removeObjectForKey:NAMES_mediaTrack]; + [parameters removeObjectForKey:SDLNameMediaTrack]; } } - (NSString *)mediaTrack { - return [parameters objectForKey:NAMES_mediaTrack]; + return [parameters objectForKey:SDLNameMediaTrack]; } - (void)setGraphic:(SDLImage *)graphic { if (graphic != nil) { - [parameters setObject:graphic forKey:NAMES_graphic]; + [parameters setObject:graphic forKey:SDLNameGraphic]; } else { - [parameters removeObjectForKey:NAMES_graphic]; + [parameters removeObjectForKey:SDLNameGraphic]; } } - (SDLImage *)graphic { - NSObject *obj = [parameters objectForKey:NAMES_graphic]; + NSObject *obj = [parameters objectForKey:SDLNameGraphic]; if (obj == nil || [obj isKindOfClass:SDLImage.class]) { return (SDLImage *)obj; } else { - return [[SDLImage alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLImage alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setSecondaryGraphic:(SDLImage *)secondaryGraphic { if (secondaryGraphic != nil) { - [parameters setObject:secondaryGraphic forKey:NAMES_secondaryGraphic]; + [parameters setObject:secondaryGraphic forKey:SDLNameSecondaryGraphic]; } else { - [parameters removeObjectForKey:NAMES_secondaryGraphic]; + [parameters removeObjectForKey:SDLNameSecondaryGraphic]; } } - (SDLImage *)secondaryGraphic { - NSObject *obj = [parameters objectForKey:NAMES_secondaryGraphic]; + NSObject *obj = [parameters objectForKey:SDLNameSecondaryGraphic]; if (obj == nil || [obj isKindOfClass:SDLImage.class]) { return (SDLImage *)obj; } else { - return [[SDLImage alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLImage alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setSoftButtons:(NSMutableArray *)softButtons { if (softButtons != nil) { - [parameters setObject:softButtons forKey:NAMES_softButtons]; + [parameters setObject:softButtons forKey:SDLNameSoftButtons]; } else { - [parameters removeObjectForKey:NAMES_softButtons]; + [parameters removeObjectForKey:SDLNameSoftButtons]; } } - (NSMutableArray *)softButtons { - NSMutableArray *array = [parameters objectForKey:NAMES_softButtons]; + NSMutableArray *array = [parameters objectForKey:SDLNameSoftButtons]; if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLSoftButton.class]) { return array; } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; for (NSDictionary *dict in array) { - [newList addObject:[[SDLSoftButton alloc] initWithDictionary:(NSMutableDictionary *)dict]]; + [newList addObject:[[SDLSoftButton alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; } @@ -177,14 +171,14 @@ - (void)setCustomPresets:(NSMutableArray *)customPresets { if (customPresets != nil) { - [parameters setObject:customPresets forKey:NAMES_customPresets]; + [parameters setObject:customPresets forKey:SDLNameCustomPresets]; } else { - [parameters removeObjectForKey:NAMES_customPresets]; + [parameters removeObjectForKey:SDLNameCustomPresets]; } } - (NSMutableArray *)customPresets { - return [parameters objectForKey:NAMES_customPresets]; + return [parameters objectForKey:SDLNameCustomPresets]; } @end diff --git a/SmartDeviceLink/SDLShowConstantTBT.h b/SmartDeviceLink/SDLShowConstantTBT.h index ae5dda108..28dfe3adf 100644 --- a/SmartDeviceLink/SDLShowConstantTBT.h +++ b/SmartDeviceLink/SDLShowConstantTBT.h @@ -12,11 +12,7 @@ *<p> * @since SmartDeviceLink 2.0 */ -@interface SDLShowConstantTBT : SDLRPCRequest { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLShowConstantTBT : SDLRPCRequest @property (strong) NSString *navigationText1; @property (strong) NSString *navigationText2; diff --git a/SmartDeviceLink/SDLShowConstantTBT.m b/SmartDeviceLink/SDLShowConstantTBT.m index c3f87f071..8bd0c610c 100644 --- a/SmartDeviceLink/SDLShowConstantTBT.m +++ b/SmartDeviceLink/SDLShowConstantTBT.m @@ -8,167 +8,160 @@ #import "SDLNames.h" #import "SDLSoftButton.h" - @implementation SDLShowConstantTBT - (instancetype)init { - if (self = [super initWithName:NAMES_ShowConstantTBT]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameShowConstantTBT]) { } return self; } - (void)setNavigationText1:(NSString *)navigationText1 { if (navigationText1 != nil) { - [parameters setObject:navigationText1 forKey:NAMES_navigationText1]; + [parameters setObject:navigationText1 forKey:SDLNameNavigationText1]; } else { - [parameters removeObjectForKey:NAMES_navigationText1]; + [parameters removeObjectForKey:SDLNameNavigationText1]; } } - (NSString *)navigationText1 { - return [parameters objectForKey:NAMES_navigationText1]; + return [parameters objectForKey:SDLNameNavigationText1]; } - (void)setNavigationText2:(NSString *)navigationText2 { if (navigationText2 != nil) { - [parameters setObject:navigationText2 forKey:NAMES_navigationText2]; + [parameters setObject:navigationText2 forKey:SDLNameNavigationText2]; } else { - [parameters removeObjectForKey:NAMES_navigationText2]; + [parameters removeObjectForKey:SDLNameNavigationText2]; } } - (NSString *)navigationText2 { - return [parameters objectForKey:NAMES_navigationText2]; + return [parameters objectForKey:SDLNameNavigationText2]; } - (void)setEta:(NSString *)eta { if (eta != nil) { - [parameters setObject:eta forKey:NAMES_eta]; + [parameters setObject:eta forKey:SDLNameETA]; } else { - [parameters removeObjectForKey:NAMES_eta]; + [parameters removeObjectForKey:SDLNameETA]; } } - (NSString *)eta { - return [parameters objectForKey:NAMES_eta]; + return [parameters objectForKey:SDLNameETA]; } - (void)setTimeToDestination:(NSString *)timeToDestination { if (timeToDestination != nil) { - [parameters setObject:timeToDestination forKey:NAMES_timeToDestination]; + [parameters setObject:timeToDestination forKey:SDLNameTimeToDestination]; } else { - [parameters removeObjectForKey:NAMES_timeToDestination]; + [parameters removeObjectForKey:SDLNameTimeToDestination]; } } - (NSString *)timeToDestination { - return [parameters objectForKey:NAMES_timeToDestination]; + return [parameters objectForKey:SDLNameTimeToDestination]; } - (void)setTotalDistance:(NSString *)totalDistance { if (totalDistance != nil) { - [parameters setObject:totalDistance forKey:NAMES_totalDistance]; + [parameters setObject:totalDistance forKey:SDLNameTotalDistance]; } else { - [parameters removeObjectForKey:NAMES_totalDistance]; + [parameters removeObjectForKey:SDLNameTotalDistance]; } } - (NSString *)totalDistance { - return [parameters objectForKey:NAMES_totalDistance]; + return [parameters objectForKey:SDLNameTotalDistance]; } - (void)setTurnIcon:(SDLImage *)turnIcon { if (turnIcon != nil) { - [parameters setObject:turnIcon forKey:NAMES_turnIcon]; + [parameters setObject:turnIcon forKey:SDLNameTurnIcon]; } else { - [parameters removeObjectForKey:NAMES_turnIcon]; + [parameters removeObjectForKey:SDLNameTurnIcon]; } } - (SDLImage *)turnIcon { - NSObject *obj = [parameters objectForKey:NAMES_turnIcon]; + NSObject *obj = [parameters objectForKey:SDLNameTurnIcon]; if (obj == nil || [obj isKindOfClass:SDLImage.class]) { return (SDLImage *)obj; } else { - return [[SDLImage alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLImage alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setNextTurnIcon:(SDLImage *)nextTurnIcon { if (nextTurnIcon != nil) { - [parameters setObject:nextTurnIcon forKey:NAMES_nextTurnIcon]; + [parameters setObject:nextTurnIcon forKey:SDLNameNextTurnIcon]; } else { - [parameters removeObjectForKey:NAMES_nextTurnIcon]; + [parameters removeObjectForKey:SDLNameNextTurnIcon]; } } - (SDLImage *)nextTurnIcon { - NSObject *obj = [parameters objectForKey:NAMES_nextTurnIcon]; + NSObject *obj = [parameters objectForKey:SDLNameNextTurnIcon]; if (obj == nil || [obj isKindOfClass:SDLImage.class]) { return (SDLImage *)obj; } else { - return [[SDLImage alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLImage alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setDistanceToManeuver:(NSNumber *)distanceToManeuver { if (distanceToManeuver != nil) { - [parameters setObject:distanceToManeuver forKey:NAMES_distanceToManeuver]; + [parameters setObject:distanceToManeuver forKey:SDLNameDistanceToManeuver]; } else { - [parameters removeObjectForKey:NAMES_distanceToManeuver]; + [parameters removeObjectForKey:SDLNameDistanceToManeuver]; } } - (NSNumber *)distanceToManeuver { - return [parameters objectForKey:NAMES_distanceToManeuver]; + return [parameters objectForKey:SDLNameDistanceToManeuver]; } - (void)setDistanceToManeuverScale:(NSNumber *)distanceToManeuverScale { if (distanceToManeuverScale != nil) { - [parameters setObject:distanceToManeuverScale forKey:NAMES_distanceToManeuverScale]; + [parameters setObject:distanceToManeuverScale forKey:SDLNameDistanceToManeuverScale]; } else { - [parameters removeObjectForKey:NAMES_distanceToManeuverScale]; + [parameters removeObjectForKey:SDLNameDistanceToManeuverScale]; } } - (NSNumber *)distanceToManeuverScale { - return [parameters objectForKey:NAMES_distanceToManeuverScale]; + return [parameters objectForKey:SDLNameDistanceToManeuverScale]; } - (void)setManeuverComplete:(NSNumber *)maneuverComplete { if (maneuverComplete != nil) { - [parameters setObject:maneuverComplete forKey:NAMES_maneuverComplete]; + [parameters setObject:maneuverComplete forKey:SDLNameManeuverComplete]; } else { - [parameters removeObjectForKey:NAMES_maneuverComplete]; + [parameters removeObjectForKey:SDLNameManeuverComplete]; } } - (NSNumber *)maneuverComplete { - return [parameters objectForKey:NAMES_maneuverComplete]; + return [parameters objectForKey:SDLNameManeuverComplete]; } - (void)setSoftButtons:(NSMutableArray *)softButtons { if (softButtons != nil) { - [parameters setObject:softButtons forKey:NAMES_softButtons]; + [parameters setObject:softButtons forKey:SDLNameSoftButtons]; } else { - [parameters removeObjectForKey:NAMES_softButtons]; + [parameters removeObjectForKey:SDLNameSoftButtons]; } } - (NSMutableArray *)softButtons { - NSMutableArray *array = [parameters objectForKey:NAMES_softButtons]; + NSMutableArray *array = [parameters objectForKey:SDLNameSoftButtons]; if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLSoftButton.class]) { return array; } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; for (NSDictionary *dict in array) { - [newList addObject:[[SDLSoftButton alloc] initWithDictionary:(NSMutableDictionary *)dict]]; + [newList addObject:[[SDLSoftButton alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; } diff --git a/SmartDeviceLink/SDLShowConstantTBTResponse.h b/SmartDeviceLink/SDLShowConstantTBTResponse.h index 8396f17a1..8af3a9f23 100644 --- a/SmartDeviceLink/SDLShowConstantTBTResponse.h +++ b/SmartDeviceLink/SDLShowConstantTBTResponse.h @@ -7,10 +7,6 @@ /** SDLShowConstantTBTResponse is sent, when SDLShowConstantTBT has been called. * Since<b>SmartDeviceLink 2.0</b> */ -@interface SDLShowConstantTBTResponse : SDLRPCResponse { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLShowConstantTBTResponse : SDLRPCResponse @end diff --git a/SmartDeviceLink/SDLShowConstantTBTResponse.m b/SmartDeviceLink/SDLShowConstantTBTResponse.m index 995b16e1c..ee0d4f36e 100644 --- a/SmartDeviceLink/SDLShowConstantTBTResponse.m +++ b/SmartDeviceLink/SDLShowConstantTBTResponse.m @@ -3,19 +3,12 @@ #import "SDLShowConstantTBTResponse.h" - #import "SDLNames.h" @implementation SDLShowConstantTBTResponse - (instancetype)init { - if (self = [super initWithName:NAMES_ShowConstantTBT]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameShowConstantTBT]) { } return self; } diff --git a/SmartDeviceLink/SDLShowResponse.h b/SmartDeviceLink/SDLShowResponse.h index b0d558633..1963390ec 100644 --- a/SmartDeviceLink/SDLShowResponse.h +++ b/SmartDeviceLink/SDLShowResponse.h @@ -9,18 +9,6 @@ * * Since SmartDeviceLink 1.0 */ -@interface SDLShowResponse : SDLRPCResponse { -} - -/** - * @abstract Constructs a new SDLShowResponse object - */ -- (instancetype)init; -/** - * @abstract Constructs a new SDLShowResponse object indicated by the NSMutableDictionary - * parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLShowResponse : SDLRPCResponse @end diff --git a/SmartDeviceLink/SDLShowResponse.m b/SmartDeviceLink/SDLShowResponse.m index 1ebb5dea9..40912b163 100644 --- a/SmartDeviceLink/SDLShowResponse.m +++ b/SmartDeviceLink/SDLShowResponse.m @@ -9,13 +9,7 @@ @implementation SDLShowResponse - (instancetype)init { - if (self = [super initWithName:NAMES_Show]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameShow]) { } return self; } diff --git a/SmartDeviceLink/SDLSingleTireStatus.h b/SmartDeviceLink/SDLSingleTireStatus.h index bff0add38..e57e04230 100644 --- a/SmartDeviceLink/SDLSingleTireStatus.h +++ b/SmartDeviceLink/SDLSingleTireStatus.h @@ -10,19 +10,7 @@ * * @since SmartDeviceLink 2.0 */ -@interface SDLSingleTireStatus : SDLRPCStruct { -} - -/** - * @abstract Constructs a newly allocated SDLSingleTireStatus object - */ -- (instancetype)init; - -/** - * @abstract Constructs a newly allocated SDLSingleTireStatus object indicated by the dictionary parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLSingleTireStatus : SDLRPCStruct /** * @abstract The volume status of a single tire diff --git a/SmartDeviceLink/SDLSingleTireStatus.m b/SmartDeviceLink/SDLSingleTireStatus.m index 44d30f867..fff301ee0 100644 --- a/SmartDeviceLink/SDLSingleTireStatus.m +++ b/SmartDeviceLink/SDLSingleTireStatus.m @@ -5,31 +5,18 @@ #import "SDLNames.h" - @implementation SDLSingleTireStatus -- (instancetype)init { - if (self = [super init]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setStatus:(SDLComponentVolumeStatus)status { if (status != nil) { - [store setObject:status forKey:NAMES_status]; + [store setObject:status forKey:SDLNameStatus]; } else { - [store removeObjectForKey:NAMES_status]; + [store removeObjectForKey:SDLNameStatus]; } } - (SDLComponentVolumeStatus)status { - NSObject *obj = [store objectForKey:NAMES_status]; + NSObject *obj = [store objectForKey:SDLNameStatus]; return (SDLComponentVolumeStatus)obj; } diff --git a/SmartDeviceLink/SDLSiphonServer.h b/SmartDeviceLink/SDLSiphonServer.h deleted file mode 100644 index 31033e7eb..000000000 --- a/SmartDeviceLink/SDLSiphonServer.h +++ /dev/null @@ -1,20 +0,0 @@ -// SDLSiphonServer.h -// - - -#import <Foundation/Foundation.h> - -@interface SDLSiphonServer : NSObject <NSStreamDelegate, NSNetServiceDelegate> { -} - -+ (void)enableSiphonDebug; -+ (void)disableSiphonDebug; -+ (bool)_siphonRawTransportDataFromApp:(const void *)msgBytes msgBytesLength:(int)msgBytesLength; -+ (bool)_siphonRawTransportDataFromSDL:(const void *)msgBytes msgBytesLength:(int)msgBytesLength; -+ (bool)_siphonNSLogData:(NSString *)textToLog; -+ (bool)_siphonFormattedTraceData:(NSString *)traceData; -+ (bool)_siphonIsActive; -+ (void)init; -+ (void)dealloc; - -@end diff --git a/SmartDeviceLink/SDLSiphonServer.m b/SmartDeviceLink/SDLSiphonServer.m deleted file mode 100644 index 15367be41..000000000 --- a/SmartDeviceLink/SDLSiphonServer.m +++ /dev/null @@ -1,452 +0,0 @@ -// SDLSiphonServer.m -// - - -/******************************* - * Description: - * This class opens a socket on port 7474. - * The 'sendSiphonData' Function will - * write to the socket that the SDL Relay Sniffer is - * listening on. - ******************************/ - -//#define ZERO_CONFIG //Uncomment when implementing zero-config. -//#define DEBUG_SIPHON //Uncomment to have output to SDLDebugTool. - -#import "SDLSiphonServer.h" -#import "SDLDebugTool.h" -#include <CFNetwork/CFNetwork.h> -#include <netinet/in.h> -#include <string.h> -#include <sys/socket.h> -#include <sys/types.h> -#include <unistd.h> - -typedef enum { - fromApp = 0x01, - fromSDL = 0x00, - appLog = 0x02, - formattedTrace = 0x03 -} SiphonDataType; - -const Byte siphonMsgVersionNumber = 1; -volatile int siphonSocket = 0; -NSObject *siphonLock = nil; -CFSocketRef _listeningSocket; -NSNetService *netService = nil; -volatile bool initStarted = false; -bool siphonServerEnabled = false; -bool sendingFormattedTrace = false; -NSDate *startTimeStamp; -int FIRST_PORT_TO_ATTEMPT_CONNECTION = 7474; - -void _closeSiphonSocket(); -bool _sendDataToSiphonSocket(int soc, const void *pData, int dataLength); -bool _sendSiphonData(const void *dataBytes, int dataBytesLength, SiphonDataType siphonDataType); -void _startServerOnPort(int port); -void _stopServer(NSString *reason); - - -@implementation SDLSiphonServer - -// Model currently counts on init being called before any apps call _siphonNSLogData() -// The following is not thread safe (i.e. two threads could create siphon lock), -// but will assume for now that we won't have two transports created in the same proxy. -+ (void)init { - if (initStarted) { - return; - } // end-if - - if (!siphonLock) { - siphonLock = [NSData alloc]; - } // end-if - - @synchronized(siphonLock) { - if (initStarted) { - return; - } - - initStarted = true; - - startTimeStamp = [NSDate date]; - - _closeSiphonSocket(); - - _startServerOnPort(FIRST_PORT_TO_ATTEMPT_CONNECTION); - } -} - -+ (void)enableSiphonDebug { - siphonServerEnabled = true; -} - -+ (void)disableSiphonDebug { - siphonServerEnabled = false; -} - -void _closeSiphonSocket() { -#ifdef DEBUG_SIPHON - [SDLDebugTool logInfo:@"siphon: Resetting siphon socket ..."]; -#endif - if (siphonLock) { - @synchronized(siphonLock) { - if (siphonSocket) { - close(siphonSocket); - siphonSocket = 0; - } // end-if - } // end-lock - } // end-if -#ifdef DEBUG_SIPHON - [SDLDebugTool logInfo:@"siphon: siphon socket reset complete"]; -#endif -} // end-method - -+ (void)dealloc { -#ifdef ZERO_CONFIG - _stopServer(@"Shutting Down"); -#endif -} - -+ (bool)_siphonIsActive { - if (siphonSocket == 0) { - return NO; - } - return YES; -} - - -+ (bool)_siphonFormattedTraceData:(NSString *)traceData { - if ((traceData == NULL) || (traceData.length == 0)) { - return NO; - } // end-if - - NSData *traceBytes = [traceData dataUsingEncoding:NSUTF8StringEncoding]; - - if (traceBytes == nil) { - return NO; - } // end-if - - bool dataSent = NO; - - sendingFormattedTrace = true; - - dataSent = _sendSiphonData(traceBytes.bytes, (int)traceBytes.length, formattedTrace); - - return dataSent; -} // end-method - -+ (bool)_siphonNSLogData:(NSString *)textToLog { - if ((textToLog == NULL) || (textToLog.length == 0)) { - return NO; - } // end-if - - NSData *textBytes = [textToLog dataUsingEncoding:NSUTF8StringEncoding]; - - if (textBytes == nil) { - return NO; - } // end-if - - bool dataSent = NO; - - dataSent = _sendSiphonData(textBytes.bytes, (int)textBytes.length, appLog); - - return dataSent; -} // end-method - -+ (bool)_siphonRawTransportDataFromApp:(const void *)msgBytes msgBytesLength:(int)msgBytesLength { - if (sendingFormattedTrace) { - return false; - } // end-if - - if (msgBytes == NULL || msgBytesLength == 0) { - return false; - } // end-if - - return _sendSiphonData(msgBytes, msgBytesLength, fromApp); -} - -+ (bool)_siphonRawTransportDataFromSDL:(const void *)msgBytes msgBytesLength:(int)msgBytesLength { - if (sendingFormattedTrace) { - return false; - } // end-if - - if (msgBytes == NULL || msgBytesLength == 0) { - return false; - } // end-if - - return _sendSiphonData(msgBytes, msgBytesLength, fromSDL); -} - -bool _sendSiphonData(const void *dataBytes, int dataBytesLength, SiphonDataType siphonDataType) { - bool wasSent = NO; - - if (dataBytes == NULL || dataBytesLength == 0 || !siphonServerEnabled) { - return false; - } // end-if - - NSDate *currentTime = [NSDate date]; - NSTimeInterval deltaTimeMillis = ([currentTime timeIntervalSinceDate:startTimeStamp] * 1000.0); - uint32_t integerDeltaTimeMillis = ((uint32_t)deltaTimeMillis); - - integerDeltaTimeMillis = htonl(integerDeltaTimeMillis); - - if (siphonLock) { - @synchronized(siphonLock) { - if (siphonSocket) { - Byte sdt = (Byte)siphonDataType; - sdt = (Byte)0x80 | sdt; - uint32_t sizeBytes = htonl(dataBytesLength + sizeof(sdt) + sizeof(integerDeltaTimeMillis) + sizeof(siphonMsgVersionNumber)); - - wasSent = _sendDataToSiphonSocket(siphonSocket, &sizeBytes, sizeof(sizeBytes)); - - if (wasSent) { - wasSent = _sendDataToSiphonSocket(siphonSocket, &sdt, sizeof(sdt)); - } - - if (wasSent) { - wasSent = _sendDataToSiphonSocket(siphonSocket, &siphonMsgVersionNumber, sizeof(siphonMsgVersionNumber)); - } - - if (wasSent) { - wasSent = _sendDataToSiphonSocket(siphonSocket, &integerDeltaTimeMillis, sizeof(integerDeltaTimeMillis)); - } - - if (wasSent) { - wasSent = _sendDataToSiphonSocket(siphonSocket, dataBytes, dataBytesLength); - } - - if (wasSent) { - return YES; - } else { -#ifdef DEBUG_SIPHON - [SDLDebugTool logInfo:@"siphon: failure sending to siphon socket"]; -#endif - _closeSiphonSocket(); - return NO; - } // end-if - } else { -#ifdef DEBUG_SIPHON - [SDLDebugTool logInfo:@"siphon: siphon socket is NULL"]; -#endif - } // end-if - } //end Synchronized - } // end-if - return NO; - -} // end-method - -bool _sendDataToSiphonSocket(int soc, const void *pData, int dataLength) { - int bytesRemainingToSend = dataLength; - ssize_t bytesSent = 0; - const UInt8 *pd = pData; - - if (pData == NULL || dataLength == 0) { - return false; - } // end-if - - while (bytesRemainingToSend > 0) { - if (soc) { - bytesSent = send(soc, pd, bytesRemainingToSend, 0); - - if (bytesSent == -1) { -#ifdef DEBUG_SIPHON - [SDLDebugTool logInfo:@"siphon: got bytesSent==-1 on send(siphonSocket)"]; -#endif - return NO; - } // end-if - - bytesRemainingToSend -= bytesSent; - pd += bytesSent; - } // end-if - - } // end-while - - return YES; - -} // end-method - - -void _serverDidStartOnPort(int port) { -#ifdef DEBUG_SIPHON - [SDLDebugTool logInfo:@"siphon: server started on port: %d", port]; -#endif -} - -#ifdef ZERO_CONFIG - -#pragma mark -#pragma mark Server - -- (void)_didSendData:(NSData *)data { -} - -void _serverDidStopWithReason(NSString *reason) { -} - -- (void)_updateStatus:(NSString *)statusString { - [SDLDebugTool logFormat:@"siphon: %@", statusString]; -} - -- (void)_SendDidStopWithStatus:(NSString *)statusString { - [SDLDebugTool logInfo:@"siphon: server configured for output"]; -} - -- (BOOL)isStarted { - return (netService != nil); -} -#endif - - -void _acceptConnection(int fd) { - if (siphonLock) { - @synchronized(siphonLock) { - int socketOps = 1; - - _closeSiphonSocket(); -#ifdef DEBUG_SIPHON - [SDLDebugTool logFormat:@"siphon: storing newly accepted siphon socket handle %08x ...", fd]; -#endif - siphonSocket = fd; - - setsockopt(siphonSocket, SOL_SOCKET, SO_NOSIGPIPE, (void *)&socketOps, sizeof(int)); - [SDLDebugTool logInfo:@"Siphon connected." withType:SDLDebugType_Debug]; - - } // end-lock - } // end-if - return; -} - -static void AcceptCallback(CFSocketRef s, CFSocketCallBackType type, CFDataRef address, const void *data, void *info) { -#ifdef DEBUG_SIPHON - [SDLDebugTool logInfo:@"siphon: accepted siphon connection ..."]; -#endif - -#pragma unused(type) - assert(type == kCFSocketAcceptCallBack); -#pragma unused(address) - assert(data != NULL); - -#pragma unused(s) - assert(s == _listeningSocket); - - _acceptConnection(*(int *)data); -} - - -#ifdef ZERO_CONFIG -- (void)netService:(NSNetService *)sender didNotPublish:(NSDictionary *)errorDict { -#pragma unused(sender) - assert(sender == netService); -#pragma unused(errorDict) - - _stopServer(@"Registration failed"); -} -#endif - -void _startServerOnPort(int port) { - BOOL success; - int err; - int fd; - struct sockaddr_in addr; - int const retryLimit = 1000; - - fd = socket(AF_INET, SOCK_STREAM, 0); - success = (fd != -1); - - if (success) { - memset(&addr, 0, sizeof(addr)); - addr.sin_len = sizeof(addr); - addr.sin_family = AF_INET; - - addr.sin_addr.s_addr = INADDR_ANY; - - bool openPortFound = false; - short bindPort = (short)port; - success = false; - for (int retryCount = 0; retryCount < retryLimit && !openPortFound; retryCount++) { - addr.sin_port = htons(bindPort); - err = bind(fd, (const struct sockaddr *)&addr, sizeof(addr)); - if (err == 0) { - openPortFound = true; - success = (err == 0); - // port = bindPort; - } else { - bindPort++; - } - } // end-for - } - if (success) { - err = listen(fd, 5); - success = (err == 0); - } - if (success) { - socklen_t addrLen; - - addrLen = sizeof(addr); - err = getsockname(fd, (struct sockaddr *)&addr, &addrLen); - success = (err == 0); - - if (success) { - assert(addrLen == sizeof(addr)); - // port = ntohs(addr.sin_port); - } -#ifdef DEBUG_SIPHON - [SDLDebugTool logFormat:@"siphon: my port is %d ", port]; -#endif - } - if (success) { - _listeningSocket = CFSocketCreateWithNative( - NULL, - fd, - kCFSocketAcceptCallBack, - AcceptCallback, - NULL); - success = (_listeningSocket != NULL); - - if (success) { - CFRunLoopSourceRef rls; - // fd = -1; - rls = CFSocketCreateRunLoopSource(NULL, _listeningSocket, 0); - assert(rls != NULL); - CFRunLoopAddSource(CFRunLoopGetCurrent(), rls, kCFRunLoopDefaultMode); - CFRelease(rls); - } - } - -#ifdef ZERO_CONFIG - - if (success) { - UIDevice *device = [UIDevice currentDevice]; - ; - NSString *serviceName = [NSString stringWithFormat:@"%@_%d ", device.name, port]; - netService = [[[NSNetService alloc] initWithDomain:@"local." type:@"_sync._tcp." name:serviceName port:port] autorelease]; - success = (netService != nil); - } - if (success) { - [netService publishWithOptions:NSNetServiceNoAutoRename]; - } - - if (success) { - assert(port != 0); - _serverDidStartOnPort(port); - } else { - _stopServer(@"Start failed"); - if (fd != -1) { - assert(startFailed == 0); - } - } - -#endif -} - -void _stopServer(NSString *reason) { -#ifdef ZERO_CONFIG - if (netService != nil) { - [netService stop]; - netService = nil; - } - _serverDidStopWithReason(reason); -#endif -} - -@end diff --git a/SmartDeviceLink/SDLSlider.h b/SmartDeviceLink/SDLSlider.h index 04724d780..a4ffbeb13 100644 --- a/SmartDeviceLink/SDLSlider.h +++ b/SmartDeviceLink/SDLSlider.h @@ -11,19 +11,7 @@ * * Since SmartDeviceLink 2.0 */ -@interface SDLSlider : SDLRPCRequest { -} - -/** - * @abstract Constructs a new SDLSlider object - */ -- (instancetype)init; - -/** - * @abstract Constructs a new SDLSlider object indicated by the dictionary parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLSlider : SDLRPCRequest /** * @abstract Represents a number of selectable items on a horizontal axis diff --git a/SmartDeviceLink/SDLSlider.m b/SmartDeviceLink/SDLSlider.m index 80a56d1aa..0aabd019e 100644 --- a/SmartDeviceLink/SDLSlider.m +++ b/SmartDeviceLink/SDLSlider.m @@ -9,75 +9,69 @@ @implementation SDLSlider - (instancetype)init { - if (self = [super initWithName:NAMES_Slider]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameSlider]) { } return self; } - (void)setNumTicks:(NSNumber *)numTicks { if (numTicks != nil) { - [parameters setObject:numTicks forKey:NAMES_numTicks]; + [parameters setObject:numTicks forKey:SDLNameNumberTicks]; } else { - [parameters removeObjectForKey:NAMES_numTicks]; + [parameters removeObjectForKey:SDLNameNumberTicks]; } } - (NSNumber *)numTicks { - return [parameters objectForKey:NAMES_numTicks]; + return [parameters objectForKey:SDLNameNumberTicks]; } - (void)setPosition:(NSNumber *)position { if (position != nil) { - [parameters setObject:position forKey:NAMES_position]; + [parameters setObject:position forKey:SDLNamePosition]; } else { - [parameters removeObjectForKey:NAMES_position]; + [parameters removeObjectForKey:SDLNamePosition]; } } - (NSNumber *)position { - return [parameters objectForKey:NAMES_position]; + return [parameters objectForKey:SDLNamePosition]; } - (void)setSliderHeader:(NSString *)sliderHeader { if (sliderHeader != nil) { - [parameters setObject:sliderHeader forKey:NAMES_sliderHeader]; + [parameters setObject:sliderHeader forKey:SDLNameSliderHeader]; } else { - [parameters removeObjectForKey:NAMES_sliderHeader]; + [parameters removeObjectForKey:SDLNameSliderHeader]; } } - (NSString *)sliderHeader { - return [parameters objectForKey:NAMES_sliderHeader]; + return [parameters objectForKey:SDLNameSliderHeader]; } - (void)setSliderFooter:(NSMutableArray *)sliderFooter { if (sliderFooter != nil) { - [parameters setObject:sliderFooter forKey:NAMES_sliderFooter]; + [parameters setObject:sliderFooter forKey:SDLNameSliderFooter]; } else { - [parameters removeObjectForKey:NAMES_sliderFooter]; + [parameters removeObjectForKey:SDLNameSliderFooter]; } } - (NSMutableArray *)sliderFooter { - return [parameters objectForKey:NAMES_sliderFooter]; + return [parameters objectForKey:SDLNameSliderFooter]; } - (void)setTimeout:(NSNumber *)timeout { if (timeout != nil) { - [parameters setObject:timeout forKey:NAMES_timeout]; + [parameters setObject:timeout forKey:SDLNameTimeout]; } else { - [parameters removeObjectForKey:NAMES_timeout]; + [parameters removeObjectForKey:SDLNameTimeout]; } } - (NSNumber *)timeout { - return [parameters objectForKey:NAMES_timeout]; + return [parameters objectForKey:SDLNameTimeout]; } @end diff --git a/SmartDeviceLink/SDLSliderResponse.h b/SmartDeviceLink/SDLSliderResponse.h index 5b38b7f0f..74baba292 100644 --- a/SmartDeviceLink/SDLSliderResponse.h +++ b/SmartDeviceLink/SDLSliderResponse.h @@ -9,19 +9,7 @@ * * Since SmartDeviceLink 2.0 */ -@interface SDLSliderResponse : SDLRPCResponse { -} - -/** - * @abstract Constructs a new SDLSliderResponse object - */ -- (instancetype)init; -/** - * @abstract Constructs a new SDLSliderResponse object indicated by the NSMutableDictionary - * parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLSliderResponse : SDLRPCResponse /** * @abstract The selected position of the slider. diff --git a/SmartDeviceLink/SDLSliderResponse.m b/SmartDeviceLink/SDLSliderResponse.m index 927ad569d..681b0f8c9 100644 --- a/SmartDeviceLink/SDLSliderResponse.m +++ b/SmartDeviceLink/SDLSliderResponse.m @@ -9,27 +9,21 @@ @implementation SDLSliderResponse - (instancetype)init { - if (self = [super initWithName:NAMES_Slider]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameSlider]) { } return self; } - (void)setSliderPosition:(NSNumber *)sliderPosition { if (sliderPosition != nil) { - [parameters setObject:sliderPosition forKey:NAMES_sliderPosition]; + [parameters setObject:sliderPosition forKey:SDLNameSliderPosition]; } else { - [parameters removeObjectForKey:NAMES_sliderPosition]; + [parameters removeObjectForKey:SDLNameSliderPosition]; } } - (NSNumber *)sliderPosition { - return [parameters objectForKey:NAMES_sliderPosition]; + return [parameters objectForKey:SDLNameSliderPosition]; } @end diff --git a/SmartDeviceLink/SDLSoftButton.h b/SmartDeviceLink/SDLSoftButton.h index 89b859b46..f7cfcca25 100644 --- a/SmartDeviceLink/SDLSoftButton.h +++ b/SmartDeviceLink/SDLSoftButton.h @@ -11,12 +11,9 @@ @class SDLImage; -@interface SDLSoftButton : SDLRPCStruct <SDLRequestHandler> { -} +@interface SDLSoftButton : SDLRPCStruct <SDLRequestHandler> -- (instancetype)init; - (instancetype)initWithHandler:(SDLRPCNotificationHandler)handler; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; @property (copy, nonatomic) SDLRPCNotificationHandler handler; diff --git a/SmartDeviceLink/SDLSoftButton.m b/SmartDeviceLink/SDLSoftButton.m index 974e2c23c..b66464d36 100644 --- a/SmartDeviceLink/SDLSoftButton.m +++ b/SmartDeviceLink/SDLSoftButton.m @@ -6,15 +6,8 @@ #import "SDLImage.h" #import "SDLNames.h" - @implementation SDLSoftButton -- (instancetype)init { - if (self = [super init]) { - } - return self; -} - - (instancetype)initWithHandler:(SDLRPCNotificationHandler)handler { self = [self init]; if (!self) { @@ -26,88 +19,82 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setType:(SDLSoftButtonType)type { if (type != nil) { - [store setObject:type forKey:NAMES_type]; + [store setObject:type forKey:SDLNameType]; } else { - [store removeObjectForKey:NAMES_type]; + [store removeObjectForKey:SDLNameType]; } } - (SDLSoftButtonType)type { - NSObject *obj = [store objectForKey:NAMES_type]; + NSObject *obj = [store objectForKey:SDLNameType]; return (SDLSoftButtonType)obj; } - (void)setText:(NSString *)text { if (text != nil) { - [store setObject:text forKey:NAMES_text]; + [store setObject:text forKey:SDLNameText]; } else { - [store removeObjectForKey:NAMES_text]; + [store removeObjectForKey:SDLNameText]; } } - (NSString *)text { - return [store objectForKey:NAMES_text]; + return [store objectForKey:SDLNameText]; } - (void)setImage:(SDLImage *)image { if (image != nil) { - [store setObject:image forKey:NAMES_image]; + [store setObject:image forKey:SDLNameImage]; } else { - [store removeObjectForKey:NAMES_image]; + [store removeObjectForKey:SDLNameImage]; } } - (SDLImage *)image { - NSObject *obj = [store objectForKey:NAMES_image]; + NSObject *obj = [store objectForKey:SDLNameImage]; if (obj == nil || [obj isKindOfClass:SDLImage.class]) { return (SDLImage *)obj; } else { - return [[SDLImage alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLImage alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setIsHighlighted:(NSNumber *)isHighlighted { if (isHighlighted != nil) { - [store setObject:isHighlighted forKey:NAMES_isHighlighted]; + [store setObject:isHighlighted forKey:SDLNameIsHighlighted]; } else { - [store removeObjectForKey:NAMES_isHighlighted]; + [store removeObjectForKey:SDLNameIsHighlighted]; } } - (NSNumber *)isHighlighted { - return [store objectForKey:NAMES_isHighlighted]; + return [store objectForKey:SDLNameIsHighlighted]; } - (void)setSoftButtonID:(NSNumber *)softButtonID { if (softButtonID != nil) { - [store setObject:softButtonID forKey:NAMES_softButtonID]; + [store setObject:softButtonID forKey:SDLNameSoftButtonId]; } else { - [store removeObjectForKey:NAMES_softButtonID]; + [store removeObjectForKey:SDLNameSoftButtonId]; } } - (NSNumber *)softButtonID { - return [store objectForKey:NAMES_softButtonID]; + return [store objectForKey:SDLNameSoftButtonId]; } - (void)setSystemAction:(SDLSystemAction)systemAction { if (systemAction != nil) { - [store setObject:systemAction forKey:NAMES_systemAction]; + [store setObject:systemAction forKey:SDLNameSystemAction]; } else { - [store removeObjectForKey:NAMES_systemAction]; + [store removeObjectForKey:SDLNameSystemAction]; } } - (SDLSystemAction)systemAction { - NSObject *obj = [store objectForKey:NAMES_systemAction]; + NSObject *obj = [store objectForKey:SDLNameSystemAction]; return (SDLSystemAction)obj; } diff --git a/SmartDeviceLink/SDLSoftButtonCapabilities.h b/SmartDeviceLink/SDLSoftButtonCapabilities.h index ca9eeb2bf..c699ba17e 100644 --- a/SmartDeviceLink/SDLSoftButtonCapabilities.h +++ b/SmartDeviceLink/SDLSoftButtonCapabilities.h @@ -9,19 +9,7 @@ * * @since SDL 2.0 */ -@interface SDLSoftButtonCapabilities : SDLRPCStruct { -} - -/** - * @abstract Constructs a newly allocated SDLSoftButtonCapabilities object - */ -- (instancetype)init; - -/** - * @abstract Constructs a newly allocated SDLSoftButtonCapabilities object indicated by the dictionary parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLSoftButtonCapabilities : SDLRPCStruct /** * @abstract The button supports a short press. diff --git a/SmartDeviceLink/SDLSoftButtonCapabilities.m b/SmartDeviceLink/SDLSoftButtonCapabilities.m index d9a502db1..c64c6fa86 100644 --- a/SmartDeviceLink/SDLSoftButtonCapabilities.m +++ b/SmartDeviceLink/SDLSoftButtonCapabilities.m @@ -8,64 +8,52 @@ @implementation SDLSoftButtonCapabilities -- (instancetype)init { - if (self = [super init]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setShortPressAvailable:(NSNumber *)shortPressAvailable { if (shortPressAvailable != nil) { - [store setObject:shortPressAvailable forKey:NAMES_shortPressAvailable]; + [store setObject:shortPressAvailable forKey:SDLNameShortPressAvailable]; } else { - [store removeObjectForKey:NAMES_shortPressAvailable]; + [store removeObjectForKey:SDLNameShortPressAvailable]; } } - (NSNumber *)shortPressAvailable { - return [store objectForKey:NAMES_shortPressAvailable]; + return [store objectForKey:SDLNameShortPressAvailable]; } - (void)setLongPressAvailable:(NSNumber *)longPressAvailable { if (longPressAvailable != nil) { - [store setObject:longPressAvailable forKey:NAMES_longPressAvailable]; + [store setObject:longPressAvailable forKey:SDLNameLongPressAvailable]; } else { - [store removeObjectForKey:NAMES_longPressAvailable]; + [store removeObjectForKey:SDLNameLongPressAvailable]; } } - (NSNumber *)longPressAvailable { - return [store objectForKey:NAMES_longPressAvailable]; + return [store objectForKey:SDLNameLongPressAvailable]; } - (void)setUpDownAvailable:(NSNumber *)upDownAvailable { if (upDownAvailable != nil) { - [store setObject:upDownAvailable forKey:NAMES_upDownAvailable]; + [store setObject:upDownAvailable forKey:SDLNameUpDownAvailable]; } else { - [store removeObjectForKey:NAMES_upDownAvailable]; + [store removeObjectForKey:SDLNameUpDownAvailable]; } } - (NSNumber *)upDownAvailable { - return [store objectForKey:NAMES_upDownAvailable]; + return [store objectForKey:SDLNameUpDownAvailable]; } - (void)setImageSupported:(NSNumber *)imageSupported { if (imageSupported != nil) { - [store setObject:imageSupported forKey:NAMES_imageSupported]; + [store setObject:imageSupported forKey:SDLNameImageSupported]; } else { - [store removeObjectForKey:NAMES_imageSupported]; + [store removeObjectForKey:SDLNameImageSupported]; } } - (NSNumber *)imageSupported { - return [store objectForKey:NAMES_imageSupported]; + return [store objectForKey:SDLNameImageSupported]; } @end diff --git a/SmartDeviceLink/SDLSpeak.h b/SmartDeviceLink/SDLSpeak.h index 8e6eb8e7e..61c605357 100644 --- a/SmartDeviceLink/SDLSpeak.h +++ b/SmartDeviceLink/SDLSpeak.h @@ -36,19 +36,7 @@ * @since SmartDeviceLink 1.0 * @see SDLAlert */ -@interface SDLSpeak : SDLRPCRequest { -} - -/** - * @abstract Constructs a new SDLSpeak object - */ -- (instancetype)init; - -/** - * @abstract Constructs a new SDLSpeak object indicated by the dictionary parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLSpeak : SDLRPCRequest /** * @abstract An array of TTSChunk structs which, taken together, specify the phrase to be spoken diff --git a/SmartDeviceLink/SDLSpeak.m b/SmartDeviceLink/SDLSpeak.m index 8f19b925b..782223c5f 100644 --- a/SmartDeviceLink/SDLSpeak.m +++ b/SmartDeviceLink/SDLSpeak.m @@ -10,33 +10,27 @@ @implementation SDLSpeak - (instancetype)init { - if (self = [super initWithName:NAMES_Speak]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameSpeak]) { } return self; } - (void)setTtsChunks:(NSMutableArray *)ttsChunks { if (ttsChunks != nil) { - [parameters setObject:ttsChunks forKey:NAMES_ttsChunks]; + [parameters setObject:ttsChunks forKey:SDLNameTTSChunks]; } else { - [parameters removeObjectForKey:NAMES_ttsChunks]; + [parameters removeObjectForKey:SDLNameTTSChunks]; } } - (NSMutableArray *)ttsChunks { - NSMutableArray *array = [parameters objectForKey:NAMES_ttsChunks]; + NSMutableArray *array = [parameters objectForKey:SDLNameTTSChunks]; if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLTTSChunk.class]) { return array; } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; for (NSDictionary *dict in array) { - [newList addObject:[[SDLTTSChunk alloc] initWithDictionary:(NSMutableDictionary *)dict]]; + [newList addObject:[[SDLTTSChunk alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; } diff --git a/SmartDeviceLink/SDLSpeakResponse.h b/SmartDeviceLink/SDLSpeakResponse.h index 2a7eef046..c241e7d37 100644 --- a/SmartDeviceLink/SDLSpeakResponse.h +++ b/SmartDeviceLink/SDLSpeakResponse.h @@ -9,18 +9,6 @@ * * Since SmartDeviceLink 1.0 */ -@interface SDLSpeakResponse : SDLRPCResponse { -} - -/** - * @abstract Constructs a new SDLSpeakResponse object - */ -- (instancetype)init; -/** - * @abstract Constructs a new SDLSpeakResponse object indicated by the NSMutableDictionary - * parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLSpeakResponse : SDLRPCResponse @end diff --git a/SmartDeviceLink/SDLSpeakResponse.m b/SmartDeviceLink/SDLSpeakResponse.m index dfb8dff33..fd9899636 100644 --- a/SmartDeviceLink/SDLSpeakResponse.m +++ b/SmartDeviceLink/SDLSpeakResponse.m @@ -9,13 +9,7 @@ @implementation SDLSpeakResponse - (instancetype)init { - if (self = [super initWithName:NAMES_Speak]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameSpeak]) { } return self; } diff --git a/SmartDeviceLink/SDLStartTime.h b/SmartDeviceLink/SDLStartTime.h index 55eb147d6..47c10674e 100644 --- a/SmartDeviceLink/SDLStartTime.h +++ b/SmartDeviceLink/SDLStartTime.h @@ -9,19 +9,7 @@ * * @since SDL 1.0 */ -@interface SDLStartTime : SDLRPCStruct { -} - -/** - * @abstract Constructs a newly allocated SDLStartTime object - */ -- (instancetype)init; - -/** - * @abstract Constructs a newly allocated SDLStartTime object indicated by the dictionary parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLStartTime : SDLRPCStruct /** * @abstract The hour of the media clock diff --git a/SmartDeviceLink/SDLStartTime.m b/SmartDeviceLink/SDLStartTime.m index 4745bf712..d0de254ec 100644 --- a/SmartDeviceLink/SDLStartTime.m +++ b/SmartDeviceLink/SDLStartTime.m @@ -8,52 +8,40 @@ @implementation SDLStartTime -- (instancetype)init { - if (self = [super init]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setHours:(NSNumber *)hours { if (hours != nil) { - [store setObject:hours forKey:NAMES_hours]; + [store setObject:hours forKey:SDLNameHours]; } else { - [store removeObjectForKey:NAMES_hours]; + [store removeObjectForKey:SDLNameHours]; } } - (NSNumber *)hours { - return [store objectForKey:NAMES_hours]; + return [store objectForKey:SDLNameHours]; } - (void)setMinutes:(NSNumber *)minutes { if (minutes != nil) { - [store setObject:minutes forKey:NAMES_minutes]; + [store setObject:minutes forKey:SDLNameMinutes]; } else { - [store removeObjectForKey:NAMES_minutes]; + [store removeObjectForKey:SDLNameMinutes]; } } - (NSNumber *)minutes { - return [store objectForKey:NAMES_minutes]; + return [store objectForKey:SDLNameMinutes]; } - (void)setSeconds:(NSNumber *)seconds { if (seconds != nil) { - [store setObject:seconds forKey:NAMES_seconds]; + [store setObject:seconds forKey:SDLNameSeconds]; } else { - [store removeObjectForKey:NAMES_seconds]; + [store removeObjectForKey:SDLNameSeconds]; } } - (NSNumber *)seconds { - return [store objectForKey:NAMES_seconds]; + return [store objectForKey:SDLNameSeconds]; } @end diff --git a/SmartDeviceLink/SDLSubscribeButton.h b/SmartDeviceLink/SDLSubscribeButton.h index 48dc7b994..4f3386cc6 100644 --- a/SmartDeviceLink/SDLSubscribeButton.h +++ b/SmartDeviceLink/SDLSubscribeButton.h @@ -61,13 +61,6 @@ @interface SDLSubscribeButton : SDLRPCRequest <SDLRequestHandler> /** - * Construct an SDLSubscribeButton - * - * @return An SDLSubscribeButton object - */ -- (instancetype)init; - -/** * Construct a SDLSubscribeButton with a handler callback when an event occurs. * * @param handler A callback that will be called when a button event occurs for the subscribed button. @@ -77,13 +70,6 @@ - (instancetype)initWithHandler:(SDLRPCNotificationHandler)handler; /** - * @abstract Constructs a new SDLSubscribeButton object indicated by the NSMutableDictionary - * parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; - -/** * A handler that will let you know when the button you subscribed to is selected. * * @warning This will only work if you use SDLManager. diff --git a/SmartDeviceLink/SDLSubscribeButton.m b/SmartDeviceLink/SDLSubscribeButton.m index 5f131ba18..2d4275a0e 100644 --- a/SmartDeviceLink/SDLSubscribeButton.m +++ b/SmartDeviceLink/SDLSubscribeButton.m @@ -7,11 +7,10 @@ #import "SDLButtonName.h" #import "SDLNames.h" - @implementation SDLSubscribeButton - (instancetype)init { - if (self = [super initWithName:NAMES_SubscribeButton]) { + if (self = [super initWithName:SDLNameSubscribeButton]) { } return self; } @@ -27,22 +26,16 @@ return self; } -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setButtonName:(SDLButtonName)buttonName { if (buttonName != nil) { - [parameters setObject:buttonName forKey:NAMES_buttonName]; + [parameters setObject:buttonName forKey:SDLNameButtonName]; } else { - [parameters removeObjectForKey:NAMES_buttonName]; + [parameters removeObjectForKey:SDLNameButtonName]; } } - (SDLButtonName)buttonName { - NSObject *obj = [parameters objectForKey:NAMES_buttonName]; + NSObject *obj = [parameters objectForKey:SDLNameButtonName]; return (SDLButtonName)obj; } diff --git a/SmartDeviceLink/SDLSubscribeButtonResponse.h b/SmartDeviceLink/SDLSubscribeButtonResponse.h index b38eb5a27..bf9c22604 100644 --- a/SmartDeviceLink/SDLSubscribeButtonResponse.h +++ b/SmartDeviceLink/SDLSubscribeButtonResponse.h @@ -9,18 +9,6 @@ * * Since SmartDeviceLink 1.0 */ -@interface SDLSubscribeButtonResponse : SDLRPCResponse { -} - -/** - * @abstract Constructs a new SDLSubscribeButtonResponse object - */ -- (instancetype)init; -/** - * @abstract Constructs a new SDLSubscribeButtonResponse object indicated by the NSMutableDictionary - * parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLSubscribeButtonResponse : SDLRPCResponse @end diff --git a/SmartDeviceLink/SDLSubscribeButtonResponse.m b/SmartDeviceLink/SDLSubscribeButtonResponse.m index a70d58ede..80a9b3a85 100644 --- a/SmartDeviceLink/SDLSubscribeButtonResponse.m +++ b/SmartDeviceLink/SDLSubscribeButtonResponse.m @@ -9,13 +9,7 @@ @implementation SDLSubscribeButtonResponse - (instancetype)init { - if (self = [super initWithName:NAMES_SubscribeButton]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameSubscribeButton]) { } return self; } diff --git a/SmartDeviceLink/SDLSubscribeVehicleData.h b/SmartDeviceLink/SDLSubscribeVehicleData.h index e357cd484..0e978329c 100644 --- a/SmartDeviceLink/SDLSubscribeVehicleData.h +++ b/SmartDeviceLink/SDLSubscribeVehicleData.h @@ -19,20 +19,7 @@ * Since SmartDeviceLink 2.0<br/> * See SDLUnsubscribeVehicleData SDLGetVehicleData */ -@interface SDLSubscribeVehicleData : SDLRPCRequest { -} - -/** - * @abstract Constructs a new SDLSubscribeVehicleData object - */ -- (instancetype)init; - -/** - * @abstract Constructs a new SDLSubscribeVehicleData object indicated by the NSMutableDictionary - * parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLSubscribeVehicleData : SDLRPCRequest /** * @abstract A boolean value. If true, subscribes Gps data diff --git a/SmartDeviceLink/SDLSubscribeVehicleData.m b/SmartDeviceLink/SDLSubscribeVehicleData.m index 55ec5e9d0..616540c0e 100644 --- a/SmartDeviceLink/SDLSubscribeVehicleData.m +++ b/SmartDeviceLink/SDLSubscribeVehicleData.m @@ -9,303 +9,297 @@ @implementation SDLSubscribeVehicleData - (instancetype)init { - if (self = [super initWithName:NAMES_SubscribeVehicleData]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameSubscribeVehicleData]) { } return self; } - (void)setGps:(NSNumber *)gps { if (gps != nil) { - [parameters setObject:gps forKey:NAMES_gps]; + [parameters setObject:gps forKey:SDLNameGPS]; } else { - [parameters removeObjectForKey:NAMES_gps]; + [parameters removeObjectForKey:SDLNameGPS]; } } - (NSNumber *)gps { - return [parameters objectForKey:NAMES_gps]; + return [parameters objectForKey:SDLNameGPS]; } - (void)setSpeed:(NSNumber *)speed { if (speed != nil) { - [parameters setObject:speed forKey:NAMES_speed]; + [parameters setObject:speed forKey:SDLNameSpeed]; } else { - [parameters removeObjectForKey:NAMES_speed]; + [parameters removeObjectForKey:SDLNameSpeed]; } } - (NSNumber *)speed { - return [parameters objectForKey:NAMES_speed]; + return [parameters objectForKey:SDLNameSpeed]; } - (void)setRpm:(NSNumber *)rpm { if (rpm != nil) { - [parameters setObject:rpm forKey:NAMES_rpm]; + [parameters setObject:rpm forKey:SDLNameRPM]; } else { - [parameters removeObjectForKey:NAMES_rpm]; + [parameters removeObjectForKey:SDLNameRPM]; } } - (NSNumber *)rpm { - return [parameters objectForKey:NAMES_rpm]; + return [parameters objectForKey:SDLNameRPM]; } - (void)setFuelLevel:(NSNumber *)fuelLevel { if (fuelLevel != nil) { - [parameters setObject:fuelLevel forKey:NAMES_fuelLevel]; + [parameters setObject:fuelLevel forKey:SDLNameFuelLevel]; } else { - [parameters removeObjectForKey:NAMES_fuelLevel]; + [parameters removeObjectForKey:SDLNameFuelLevel]; } } - (NSNumber *)fuelLevel { - return [parameters objectForKey:NAMES_fuelLevel]; + return [parameters objectForKey:SDLNameFuelLevel]; } - (void)setFuelLevel_State:(NSNumber *)fuelLevel_State { if (fuelLevel_State != nil) { - [parameters setObject:fuelLevel_State forKey:NAMES_fuelLevel_State]; + [parameters setObject:fuelLevel_State forKey:SDLNameFuelLevelState]; } else { - [parameters removeObjectForKey:NAMES_fuelLevel_State]; + [parameters removeObjectForKey:SDLNameFuelLevelState]; } } - (NSNumber *)fuelLevel_State { - return [parameters objectForKey:NAMES_fuelLevel_State]; + return [parameters objectForKey:SDLNameFuelLevelState]; } - (void)setInstantFuelConsumption:(NSNumber *)instantFuelConsumption { if (instantFuelConsumption != nil) { - [parameters setObject:instantFuelConsumption forKey:NAMES_instantFuelConsumption]; + [parameters setObject:instantFuelConsumption forKey:SDLNameInstantFuelConsumption]; } else { - [parameters removeObjectForKey:NAMES_instantFuelConsumption]; + [parameters removeObjectForKey:SDLNameInstantFuelConsumption]; } } - (NSNumber *)instantFuelConsumption { - return [parameters objectForKey:NAMES_instantFuelConsumption]; + return [parameters objectForKey:SDLNameInstantFuelConsumption]; } - (void)setExternalTemperature:(NSNumber *)externalTemperature { if (externalTemperature != nil) { - [parameters setObject:externalTemperature forKey:NAMES_externalTemperature]; + [parameters setObject:externalTemperature forKey:SDLNameExternalTemperature]; } else { - [parameters removeObjectForKey:NAMES_externalTemperature]; + [parameters removeObjectForKey:SDLNameExternalTemperature]; } } - (NSNumber *)externalTemperature { - return [parameters objectForKey:NAMES_externalTemperature]; + return [parameters objectForKey:SDLNameExternalTemperature]; } - (void)setPrndl:(NSNumber *)prndl { if (prndl != nil) { - [parameters setObject:prndl forKey:NAMES_prndl]; + [parameters setObject:prndl forKey:SDLNamePRNDL]; } else { - [parameters removeObjectForKey:NAMES_prndl]; + [parameters removeObjectForKey:SDLNamePRNDL]; } } - (NSNumber *)prndl { - return [parameters objectForKey:NAMES_prndl]; + return [parameters objectForKey:SDLNamePRNDL]; } - (void)setTirePressure:(NSNumber *)tirePressure { if (tirePressure != nil) { - [parameters setObject:tirePressure forKey:NAMES_tirePressure]; + [parameters setObject:tirePressure forKey:SDLNameTirePressure]; } else { - [parameters removeObjectForKey:NAMES_tirePressure]; + [parameters removeObjectForKey:SDLNameTirePressure]; } } - (NSNumber *)tirePressure { - return [parameters objectForKey:NAMES_tirePressure]; + return [parameters objectForKey:SDLNameTirePressure]; } - (void)setOdometer:(NSNumber *)odometer { if (odometer != nil) { - [parameters setObject:odometer forKey:NAMES_odometer]; + [parameters setObject:odometer forKey:SDLNameOdometer]; } else { - [parameters removeObjectForKey:NAMES_odometer]; + [parameters removeObjectForKey:SDLNameOdometer]; } } - (NSNumber *)odometer { - return [parameters objectForKey:NAMES_odometer]; + return [parameters objectForKey:SDLNameOdometer]; } - (void)setBeltStatus:(NSNumber *)beltStatus { if (beltStatus != nil) { - [parameters setObject:beltStatus forKey:NAMES_beltStatus]; + [parameters setObject:beltStatus forKey:SDLNameBeltStatus]; } else { - [parameters removeObjectForKey:NAMES_beltStatus]; + [parameters removeObjectForKey:SDLNameBeltStatus]; } } - (NSNumber *)beltStatus { - return [parameters objectForKey:NAMES_beltStatus]; + return [parameters objectForKey:SDLNameBeltStatus]; } - (void)setBodyInformation:(NSNumber *)bodyInformation { if (bodyInformation != nil) { - [parameters setObject:bodyInformation forKey:NAMES_bodyInformation]; + [parameters setObject:bodyInformation forKey:SDLNameBodyInformation]; } else { - [parameters removeObjectForKey:NAMES_bodyInformation]; + [parameters removeObjectForKey:SDLNameBodyInformation]; } } - (NSNumber *)bodyInformation { - return [parameters objectForKey:NAMES_bodyInformation]; + return [parameters objectForKey:SDLNameBodyInformation]; } - (void)setDeviceStatus:(NSNumber *)deviceStatus { if (deviceStatus != nil) { - [parameters setObject:deviceStatus forKey:NAMES_deviceStatus]; + [parameters setObject:deviceStatus forKey:SDLNameDeviceStatus]; } else { - [parameters removeObjectForKey:NAMES_deviceStatus]; + [parameters removeObjectForKey:SDLNameDeviceStatus]; } } - (NSNumber *)deviceStatus { - return [parameters objectForKey:NAMES_deviceStatus]; + return [parameters objectForKey:SDLNameDeviceStatus]; } - (void)setDriverBraking:(NSNumber *)driverBraking { if (driverBraking != nil) { - [parameters setObject:driverBraking forKey:NAMES_driverBraking]; + [parameters setObject:driverBraking forKey:SDLNameDriverBraking]; } else { - [parameters removeObjectForKey:NAMES_driverBraking]; + [parameters removeObjectForKey:SDLNameDriverBraking]; } } - (NSNumber *)driverBraking { - return [parameters objectForKey:NAMES_driverBraking]; + return [parameters objectForKey:SDLNameDriverBraking]; } - (void)setWiperStatus:(NSNumber *)wiperStatus { if (wiperStatus != nil) { - [parameters setObject:wiperStatus forKey:NAMES_wiperStatus]; + [parameters setObject:wiperStatus forKey:SDLNameWiperStatus]; } else { - [parameters removeObjectForKey:NAMES_wiperStatus]; + [parameters removeObjectForKey:SDLNameWiperStatus]; } } - (NSNumber *)wiperStatus { - return [parameters objectForKey:NAMES_wiperStatus]; + return [parameters objectForKey:SDLNameWiperStatus]; } - (void)setHeadLampStatus:(NSNumber *)headLampStatus { if (headLampStatus != nil) { - [parameters setObject:headLampStatus forKey:NAMES_headLampStatus]; + [parameters setObject:headLampStatus forKey:SDLNameHeadLampStatus]; } else { - [parameters removeObjectForKey:NAMES_headLampStatus]; + [parameters removeObjectForKey:SDLNameHeadLampStatus]; } } - (NSNumber *)headLampStatus { - return [parameters objectForKey:NAMES_headLampStatus]; + return [parameters objectForKey:SDLNameHeadLampStatus]; } - (void)setEngineTorque:(NSNumber *)engineTorque { if (engineTorque != nil) { - [parameters setObject:engineTorque forKey:NAMES_engineTorque]; + [parameters setObject:engineTorque forKey:SDLNameEngineTorque]; } else { - [parameters removeObjectForKey:NAMES_engineTorque]; + [parameters removeObjectForKey:SDLNameEngineTorque]; } } - (NSNumber *)engineTorque { - return [parameters objectForKey:NAMES_engineTorque]; + return [parameters objectForKey:SDLNameEngineTorque]; } - (void)setAccPedalPosition:(NSNumber *)accPedalPosition { if (accPedalPosition != nil) { - [parameters setObject:accPedalPosition forKey:NAMES_accPedalPosition]; + [parameters setObject:accPedalPosition forKey:SDLNameAccelerationPedalPosition]; } else { - [parameters removeObjectForKey:NAMES_accPedalPosition]; + [parameters removeObjectForKey:SDLNameAccelerationPedalPosition]; } } - (NSNumber *)accPedalPosition { - return [parameters objectForKey:NAMES_accPedalPosition]; + return [parameters objectForKey:SDLNameAccelerationPedalPosition]; } - (void)setSteeringWheelAngle:(NSNumber *)steeringWheelAngle { if (steeringWheelAngle != nil) { - [parameters setObject:steeringWheelAngle forKey:NAMES_steeringWheelAngle]; + [parameters setObject:steeringWheelAngle forKey:SDLNameSteeringWheelAngle]; } else { - [parameters removeObjectForKey:NAMES_steeringWheelAngle]; + [parameters removeObjectForKey:SDLNameSteeringWheelAngle]; } } - (NSNumber *)steeringWheelAngle { - return [parameters objectForKey:NAMES_steeringWheelAngle]; + return [parameters objectForKey:SDLNameSteeringWheelAngle]; } - (void)setECallInfo:(NSNumber *)eCallInfo { if (eCallInfo != nil) { - [parameters setObject:eCallInfo forKey:NAMES_eCallInfo]; + [parameters setObject:eCallInfo forKey:SDLNameECallInfo]; } else { - [parameters removeObjectForKey:NAMES_eCallInfo]; + [parameters removeObjectForKey:SDLNameECallInfo]; } } - (NSNumber *)eCallInfo { - return [parameters objectForKey:NAMES_eCallInfo]; + return [parameters objectForKey:SDLNameECallInfo]; } - (void)setAirbagStatus:(NSNumber *)airbagStatus { if (airbagStatus != nil) { - [parameters setObject:airbagStatus forKey:NAMES_airbagStatus]; + [parameters setObject:airbagStatus forKey:SDLNameAirbagStatus]; } else { - [parameters removeObjectForKey:NAMES_airbagStatus]; + [parameters removeObjectForKey:SDLNameAirbagStatus]; } } - (NSNumber *)airbagStatus { - return [parameters objectForKey:NAMES_airbagStatus]; + return [parameters objectForKey:SDLNameAirbagStatus]; } - (void)setEmergencyEvent:(NSNumber *)emergencyEvent { if (emergencyEvent != nil) { - [parameters setObject:emergencyEvent forKey:NAMES_emergencyEvent]; + [parameters setObject:emergencyEvent forKey:SDLNameEmergencyEvent]; } else { - [parameters removeObjectForKey:NAMES_emergencyEvent]; + [parameters removeObjectForKey:SDLNameEmergencyEvent]; } } - (NSNumber *)emergencyEvent { - return [parameters objectForKey:NAMES_emergencyEvent]; + return [parameters objectForKey:SDLNameEmergencyEvent]; } - (void)setClusterModeStatus:(NSNumber *)clusterModeStatus { if (clusterModeStatus != nil) { - [parameters setObject:clusterModeStatus forKey:NAMES_clusterModeStatus]; + [parameters setObject:clusterModeStatus forKey:SDLNameClusterModeStatus]; } else { - [parameters removeObjectForKey:NAMES_clusterModeStatus]; + [parameters removeObjectForKey:SDLNameClusterModeStatus]; } } - (NSNumber *)clusterModeStatus { - return [parameters objectForKey:NAMES_clusterModeStatus]; + return [parameters objectForKey:SDLNameClusterModeStatus]; } - (void)setMyKey:(NSNumber *)myKey { if (myKey != nil) { - [parameters setObject:myKey forKey:NAMES_myKey]; + [parameters setObject:myKey forKey:SDLNameMyKey]; } else { - [parameters removeObjectForKey:NAMES_myKey]; + [parameters removeObjectForKey:SDLNameMyKey]; } } - (NSNumber *)myKey { - return [parameters objectForKey:NAMES_myKey]; + return [parameters objectForKey:SDLNameMyKey]; } @end diff --git a/SmartDeviceLink/SDLSubscribeVehicleDataResponse.h b/SmartDeviceLink/SDLSubscribeVehicleDataResponse.h index 0b4f15ca7..ca7d9917f 100644 --- a/SmartDeviceLink/SDLSubscribeVehicleDataResponse.h +++ b/SmartDeviceLink/SDLSubscribeVehicleDataResponse.h @@ -11,21 +11,7 @@ * * Since SmartDeviceLink 2.0 */ -@interface SDLSubscribeVehicleDataResponse : SDLRPCResponse { -} - -/** - * @abstract Constructs a new SDLSubscribeVehicleDataResponse object - */ -- (instancetype)init; - -/** - * @abstract Constructs a new SDLSubscribeVehicleDataResponse object indicated by the NSMutableDictionary - * parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; - +@interface SDLSubscribeVehicleDataResponse : SDLRPCResponse /** * @abstract A SDLVehicleDataResult* value. See GPSData. diff --git a/SmartDeviceLink/SDLSubscribeVehicleDataResponse.m b/SmartDeviceLink/SDLSubscribeVehicleDataResponse.m index 5afa5f1be..c251fb60f 100644 --- a/SmartDeviceLink/SDLSubscribeVehicleDataResponse.m +++ b/SmartDeviceLink/SDLSubscribeVehicleDataResponse.m @@ -7,426 +7,419 @@ #import "SDLNames.h" #import "SDLVehicleDataResult.h" - @implementation SDLSubscribeVehicleDataResponse - (instancetype)init { - if (self = [super initWithName:NAMES_SubscribeVehicleData]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameSubscribeVehicleData]) { } return self; } - (void)setGps:(SDLVehicleDataResult *)gps { if (gps != nil) { - [parameters setObject:gps forKey:NAMES_gps]; + [parameters setObject:gps forKey:SDLNameGPS]; } else { - [parameters removeObjectForKey:NAMES_gps]; + [parameters removeObjectForKey:SDLNameGPS]; } } - (SDLVehicleDataResult *)gps { - NSObject *obj = [parameters objectForKey:NAMES_gps]; + NSObject *obj = [parameters objectForKey:SDLNameGPS]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setSpeed:(SDLVehicleDataResult *)speed { if (speed != nil) { - [parameters setObject:speed forKey:NAMES_speed]; + [parameters setObject:speed forKey:SDLNameSpeed]; } else { - [parameters removeObjectForKey:NAMES_speed]; + [parameters removeObjectForKey:SDLNameSpeed]; } } - (SDLVehicleDataResult *)speed { - NSObject *obj = [parameters objectForKey:NAMES_speed]; + NSObject *obj = [parameters objectForKey:SDLNameSpeed]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setRpm:(SDLVehicleDataResult *)rpm { if (rpm != nil) { - [parameters setObject:rpm forKey:NAMES_rpm]; + [parameters setObject:rpm forKey:SDLNameRPM]; } else { - [parameters removeObjectForKey:NAMES_rpm]; + [parameters removeObjectForKey:SDLNameRPM]; } } - (SDLVehicleDataResult *)rpm { - NSObject *obj = [parameters objectForKey:NAMES_rpm]; + NSObject *obj = [parameters objectForKey:SDLNameRPM]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setFuelLevel:(SDLVehicleDataResult *)fuelLevel { if (fuelLevel != nil) { - [parameters setObject:fuelLevel forKey:NAMES_fuelLevel]; + [parameters setObject:fuelLevel forKey:SDLNameFuelLevel]; } else { - [parameters removeObjectForKey:NAMES_fuelLevel]; + [parameters removeObjectForKey:SDLNameFuelLevel]; } } - (SDLVehicleDataResult *)fuelLevel { - NSObject *obj = [parameters objectForKey:NAMES_fuelLevel]; + NSObject *obj = [parameters objectForKey:SDLNameFuelLevel]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setFuelLevel_State:(SDLVehicleDataResult *)fuelLevel_State { if (fuelLevel_State != nil) { - [parameters setObject:fuelLevel_State forKey:NAMES_fuelLevel_State]; + [parameters setObject:fuelLevel_State forKey:SDLNameFuelLevelState]; } else { - [parameters removeObjectForKey:NAMES_fuelLevel_State]; + [parameters removeObjectForKey:SDLNameFuelLevelState]; } } - (SDLVehicleDataResult *)fuelLevel_State { - NSObject *obj = [parameters objectForKey:NAMES_fuelLevel_State]; + NSObject *obj = [parameters objectForKey:SDLNameFuelLevelState]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setInstantFuelConsumption:(SDLVehicleDataResult *)instantFuelConsumption { if (instantFuelConsumption != nil) { - [parameters setObject:instantFuelConsumption forKey:NAMES_instantFuelConsumption]; + [parameters setObject:instantFuelConsumption forKey:SDLNameInstantFuelConsumption]; } else { - [parameters removeObjectForKey:NAMES_instantFuelConsumption]; + [parameters removeObjectForKey:SDLNameInstantFuelConsumption]; } } - (SDLVehicleDataResult *)instantFuelConsumption { - NSObject *obj = [parameters objectForKey:NAMES_instantFuelConsumption]; + NSObject *obj = [parameters objectForKey:SDLNameInstantFuelConsumption]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setExternalTemperature:(SDLVehicleDataResult *)externalTemperature { if (externalTemperature != nil) { - [parameters setObject:externalTemperature forKey:NAMES_externalTemperature]; + [parameters setObject:externalTemperature forKey:SDLNameExternalTemperature]; } else { - [parameters removeObjectForKey:NAMES_externalTemperature]; + [parameters removeObjectForKey:SDLNameExternalTemperature]; } } - (SDLVehicleDataResult *)externalTemperature { - NSObject *obj = [parameters objectForKey:NAMES_externalTemperature]; + NSObject *obj = [parameters objectForKey:SDLNameExternalTemperature]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setPrndl:(SDLVehicleDataResult *)prndl { if (prndl != nil) { - [parameters setObject:prndl forKey:NAMES_prndl]; + [parameters setObject:prndl forKey:SDLNamePRNDL]; } else { - [parameters removeObjectForKey:NAMES_prndl]; + [parameters removeObjectForKey:SDLNamePRNDL]; } } - (SDLVehicleDataResult *)prndl { - NSObject *obj = [parameters objectForKey:NAMES_prndl]; + NSObject *obj = [parameters objectForKey:SDLNamePRNDL]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setTirePressure:(SDLVehicleDataResult *)tirePressure { if (tirePressure != nil) { - [parameters setObject:tirePressure forKey:NAMES_tirePressure]; + [parameters setObject:tirePressure forKey:SDLNameTirePressure]; } else { - [parameters removeObjectForKey:NAMES_tirePressure]; + [parameters removeObjectForKey:SDLNameTirePressure]; } } - (SDLVehicleDataResult *)tirePressure { - NSObject *obj = [parameters objectForKey:NAMES_tirePressure]; + NSObject *obj = [parameters objectForKey:SDLNameTirePressure]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setOdometer:(SDLVehicleDataResult *)odometer { if (odometer != nil) { - [parameters setObject:odometer forKey:NAMES_odometer]; + [parameters setObject:odometer forKey:SDLNameOdometer]; } else { - [parameters removeObjectForKey:NAMES_odometer]; + [parameters removeObjectForKey:SDLNameOdometer]; } } - (SDLVehicleDataResult *)odometer { - NSObject *obj = [parameters objectForKey:NAMES_odometer]; + NSObject *obj = [parameters objectForKey:SDLNameOdometer]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setBeltStatus:(SDLVehicleDataResult *)beltStatus { if (beltStatus != nil) { - [parameters setObject:beltStatus forKey:NAMES_beltStatus]; + [parameters setObject:beltStatus forKey:SDLNameBeltStatus]; } else { - [parameters removeObjectForKey:NAMES_beltStatus]; + [parameters removeObjectForKey:SDLNameBeltStatus]; } } - (SDLVehicleDataResult *)beltStatus { - NSObject *obj = [parameters objectForKey:NAMES_beltStatus]; + NSObject *obj = [parameters objectForKey:SDLNameBeltStatus]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setBodyInformation:(SDLVehicleDataResult *)bodyInformation { if (bodyInformation != nil) { - [parameters setObject:bodyInformation forKey:NAMES_bodyInformation]; + [parameters setObject:bodyInformation forKey:SDLNameBodyInformation]; } else { - [parameters removeObjectForKey:NAMES_bodyInformation]; + [parameters removeObjectForKey:SDLNameBodyInformation]; } } - (SDLVehicleDataResult *)bodyInformation { - NSObject *obj = [parameters objectForKey:NAMES_bodyInformation]; + NSObject *obj = [parameters objectForKey:SDLNameBodyInformation]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setDeviceStatus:(SDLVehicleDataResult *)deviceStatus { if (deviceStatus != nil) { - [parameters setObject:deviceStatus forKey:NAMES_deviceStatus]; + [parameters setObject:deviceStatus forKey:SDLNameDeviceStatus]; } else { - [parameters removeObjectForKey:NAMES_deviceStatus]; + [parameters removeObjectForKey:SDLNameDeviceStatus]; } } - (SDLVehicleDataResult *)deviceStatus { - NSObject *obj = [parameters objectForKey:NAMES_deviceStatus]; + NSObject *obj = [parameters objectForKey:SDLNameDeviceStatus]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setDriverBraking:(SDLVehicleDataResult *)driverBraking { if (driverBraking != nil) { - [parameters setObject:driverBraking forKey:NAMES_driverBraking]; + [parameters setObject:driverBraking forKey:SDLNameDriverBraking]; } else { - [parameters removeObjectForKey:NAMES_driverBraking]; + [parameters removeObjectForKey:SDLNameDriverBraking]; } } - (SDLVehicleDataResult *)driverBraking { - NSObject *obj = [parameters objectForKey:NAMES_driverBraking]; + NSObject *obj = [parameters objectForKey:SDLNameDriverBraking]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setWiperStatus:(SDLVehicleDataResult *)wiperStatus { if (wiperStatus != nil) { - [parameters setObject:wiperStatus forKey:NAMES_wiperStatus]; + [parameters setObject:wiperStatus forKey:SDLNameWiperStatus]; } else { - [parameters removeObjectForKey:NAMES_wiperStatus]; + [parameters removeObjectForKey:SDLNameWiperStatus]; } } - (SDLVehicleDataResult *)wiperStatus { - NSObject *obj = [parameters objectForKey:NAMES_wiperStatus]; + NSObject *obj = [parameters objectForKey:SDLNameWiperStatus]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setHeadLampStatus:(SDLVehicleDataResult *)headLampStatus { if (headLampStatus != nil) { - [parameters setObject:headLampStatus forKey:NAMES_headLampStatus]; + [parameters setObject:headLampStatus forKey:SDLNameHeadLampStatus]; } else { - [parameters removeObjectForKey:NAMES_headLampStatus]; + [parameters removeObjectForKey:SDLNameHeadLampStatus]; } } - (SDLVehicleDataResult *)headLampStatus { - NSObject *obj = [parameters objectForKey:NAMES_headLampStatus]; + NSObject *obj = [parameters objectForKey:SDLNameHeadLampStatus]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setEngineTorque:(SDLVehicleDataResult *)engineTorque { if (engineTorque != nil) { - [parameters setObject:engineTorque forKey:NAMES_engineTorque]; + [parameters setObject:engineTorque forKey:SDLNameEngineTorque]; } else { - [parameters removeObjectForKey:NAMES_engineTorque]; + [parameters removeObjectForKey:SDLNameEngineTorque]; } } - (SDLVehicleDataResult *)engineTorque { - NSObject *obj = [parameters objectForKey:NAMES_engineTorque]; + NSObject *obj = [parameters objectForKey:SDLNameEngineTorque]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setAccPedalPosition:(SDLVehicleDataResult *)accPedalPosition { if (accPedalPosition != nil) { - [parameters setObject:accPedalPosition forKey:NAMES_accPedalPosition]; + [parameters setObject:accPedalPosition forKey:SDLNameAccelerationPedalPosition]; } else { - [parameters removeObjectForKey:NAMES_accPedalPosition]; + [parameters removeObjectForKey:SDLNameAccelerationPedalPosition]; } } - (SDLVehicleDataResult *)accPedalPosition { - NSObject *obj = [parameters objectForKey:NAMES_accPedalPosition]; + NSObject *obj = [parameters objectForKey:SDLNameAccelerationPedalPosition]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setSteeringWheelAngle:(SDLVehicleDataResult *)steeringWheelAngle { if (steeringWheelAngle != nil) { - [parameters setObject:steeringWheelAngle forKey:NAMES_steeringWheelAngle]; + [parameters setObject:steeringWheelAngle forKey:SDLNameSteeringWheelAngle]; } else { - [parameters removeObjectForKey:NAMES_steeringWheelAngle]; + [parameters removeObjectForKey:SDLNameSteeringWheelAngle]; } } - (SDLVehicleDataResult *)steeringWheelAngle { - NSObject *obj = [parameters objectForKey:NAMES_steeringWheelAngle]; + NSObject *obj = [parameters objectForKey:SDLNameSteeringWheelAngle]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setECallInfo:(SDLVehicleDataResult *)eCallInfo { if (eCallInfo != nil) { - [parameters setObject:eCallInfo forKey:NAMES_eCallInfo]; + [parameters setObject:eCallInfo forKey:SDLNameECallInfo]; } else { - [parameters removeObjectForKey:NAMES_eCallInfo]; + [parameters removeObjectForKey:SDLNameECallInfo]; } } - (SDLVehicleDataResult *)eCallInfo { - NSObject *obj = [parameters objectForKey:NAMES_eCallInfo]; + NSObject *obj = [parameters objectForKey:SDLNameECallInfo]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setAirbagStatus:(SDLVehicleDataResult *)airbagStatus { if (airbagStatus != nil) { - [parameters setObject:airbagStatus forKey:NAMES_airbagStatus]; + [parameters setObject:airbagStatus forKey:SDLNameAirbagStatus]; } else { - [parameters removeObjectForKey:NAMES_airbagStatus]; + [parameters removeObjectForKey:SDLNameAirbagStatus]; } } - (SDLVehicleDataResult *)airbagStatus { - NSObject *obj = [parameters objectForKey:NAMES_airbagStatus]; + NSObject *obj = [parameters objectForKey:SDLNameAirbagStatus]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setEmergencyEvent:(SDLVehicleDataResult *)emergencyEvent { if (emergencyEvent != nil) { - [parameters setObject:emergencyEvent forKey:NAMES_emergencyEvent]; + [parameters setObject:emergencyEvent forKey:SDLNameEmergencyEvent]; } else { - [parameters removeObjectForKey:NAMES_emergencyEvent]; + [parameters removeObjectForKey:SDLNameEmergencyEvent]; } } - (SDLVehicleDataResult *)emergencyEvent { - NSObject *obj = [parameters objectForKey:NAMES_emergencyEvent]; + NSObject *obj = [parameters objectForKey:SDLNameEmergencyEvent]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setClusterModes:(SDLVehicleDataResult *)clusterModes { if (clusterModes != nil) { - [parameters setObject:clusterModes forKey:NAMES_clusterModes]; + [parameters setObject:clusterModes forKey:SDLNameClusterModes]; } else { - [parameters removeObjectForKey:NAMES_clusterModes]; + [parameters removeObjectForKey:SDLNameClusterModes]; } } - (SDLVehicleDataResult *)clusterModes { - NSObject *obj = [parameters objectForKey:NAMES_clusterModes]; + NSObject *obj = [parameters objectForKey:SDLNameClusterModes]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setMyKey:(SDLVehicleDataResult *)myKey { if (myKey != nil) { - [parameters setObject:myKey forKey:NAMES_myKey]; + [parameters setObject:myKey forKey:SDLNameMyKey]; } else { - [parameters removeObjectForKey:NAMES_myKey]; + [parameters removeObjectForKey:SDLNameMyKey]; } } - (SDLVehicleDataResult *)myKey { - NSObject *obj = [parameters objectForKey:NAMES_myKey]; + NSObject *obj = [parameters objectForKey:SDLNameMyKey]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } diff --git a/SmartDeviceLink/SDLSyncMsgVersion.h b/SmartDeviceLink/SDLSyncMsgVersion.h index 98b573eec..92973daf7 100644 --- a/SmartDeviceLink/SDLSyncMsgVersion.h +++ b/SmartDeviceLink/SDLSyncMsgVersion.h @@ -9,19 +9,7 @@ * * @since SDL 1.0 */ -@interface SDLSyncMsgVersion : SDLRPCStruct { -} - -/** - * @abstract Constructs a newly allocated SDLSyncMsgVersion object - */ -- (instancetype)init; - -/** - * @abstract Constructs a newly allocated SDLSyncMsgVersion object indicated by the dictionary parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLSyncMsgVersion : SDLRPCStruct /** * @abstract The major version indicates versions that is not-compatible to previous versions diff --git a/SmartDeviceLink/SDLSyncMsgVersion.m b/SmartDeviceLink/SDLSyncMsgVersion.m index 2d516539e..8bc6cfd1c 100644 --- a/SmartDeviceLink/SDLSyncMsgVersion.m +++ b/SmartDeviceLink/SDLSyncMsgVersion.m @@ -8,40 +8,28 @@ @implementation SDLSyncMsgVersion -- (instancetype)init { - if (self = [super init]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setMajorVersion:(NSNumber *)majorVersion { if (majorVersion != nil) { - [store setObject:majorVersion forKey:NAMES_majorVersion]; + [store setObject:majorVersion forKey:SDLNameMajorVersion]; } else { - [store removeObjectForKey:NAMES_majorVersion]; + [store removeObjectForKey:SDLNameMajorVersion]; } } - (NSNumber *)majorVersion { - return [store objectForKey:NAMES_majorVersion]; + return [store objectForKey:SDLNameMajorVersion]; } - (void)setMinorVersion:(NSNumber *)minorVersion { if (minorVersion != nil) { - [store setObject:minorVersion forKey:NAMES_minorVersion]; + [store setObject:minorVersion forKey:SDLNameMinorVersion]; } else { - [store removeObjectForKey:NAMES_minorVersion]; + [store removeObjectForKey:SDLNameMinorVersion]; } } - (NSNumber *)minorVersion { - return [store objectForKey:NAMES_minorVersion]; + return [store objectForKey:SDLNameMinorVersion]; } - (NSString *)description { diff --git a/SmartDeviceLink/SDLSyncPData.h b/SmartDeviceLink/SDLSyncPData.h index e71ea600d..33b1b9ab9 100644 --- a/SmartDeviceLink/SDLSyncPData.h +++ b/SmartDeviceLink/SDLSyncPData.h @@ -4,10 +4,6 @@ #import "SDLRPCRequest.h" -@interface SDLSyncPData : SDLRPCRequest { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLSyncPData : SDLRPCRequest @end diff --git a/SmartDeviceLink/SDLSyncPData.m b/SmartDeviceLink/SDLSyncPData.m index c8730a2f1..a618ab424 100644 --- a/SmartDeviceLink/SDLSyncPData.m +++ b/SmartDeviceLink/SDLSyncPData.m @@ -9,13 +9,7 @@ @implementation SDLSyncPData - (instancetype)init { - if (self = [super initWithName:NAMES_SyncPData]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameSyncPData]) { } return self; } diff --git a/SmartDeviceLink/SDLSyncPDataResponse.h b/SmartDeviceLink/SDLSyncPDataResponse.h index 25a12b74a..be1905ba1 100644 --- a/SmartDeviceLink/SDLSyncPDataResponse.h +++ b/SmartDeviceLink/SDLSyncPDataResponse.h @@ -4,10 +4,6 @@ #import "SDLRPCResponse.h" -@interface SDLSyncPDataResponse : SDLRPCResponse { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLSyncPDataResponse : SDLRPCResponse @end diff --git a/SmartDeviceLink/SDLSyncPDataResponse.m b/SmartDeviceLink/SDLSyncPDataResponse.m index 00edf14b1..95dbbf905 100644 --- a/SmartDeviceLink/SDLSyncPDataResponse.m +++ b/SmartDeviceLink/SDLSyncPDataResponse.m @@ -9,13 +9,7 @@ @implementation SDLSyncPDataResponse - (instancetype)init { - if (self = [super initWithName:NAMES_SyncPData]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameSyncPData]) { } return self; } diff --git a/SmartDeviceLink/SDLSystemRequest.h b/SmartDeviceLink/SDLSystemRequest.h index dd2811768..eae2fcd8f 100644 --- a/SmartDeviceLink/SDLSystemRequest.h +++ b/SmartDeviceLink/SDLSystemRequest.h @@ -10,11 +10,7 @@ * @since SmartDeviceLink 3.0 * */ -@interface SDLSystemRequest : SDLRPCRequest { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLSystemRequest : SDLRPCRequest @property (strong) SDLRequestType requestType; @property (strong) NSString *fileName; diff --git a/SmartDeviceLink/SDLSystemRequest.m b/SmartDeviceLink/SDLSystemRequest.m index 6144e1a9b..f56619980 100644 --- a/SmartDeviceLink/SDLSystemRequest.m +++ b/SmartDeviceLink/SDLSystemRequest.m @@ -9,40 +9,34 @@ @implementation SDLSystemRequest - (instancetype)init { - if (self = [super initWithName:NAMES_SystemRequest]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameSystemRequest]) { } return self; } - (void)setRequestType:(SDLRequestType)requestType { if (requestType != nil) { - [parameters setObject:requestType forKey:NAMES_requestType]; + [parameters setObject:requestType forKey:SDLNameRequestType]; } else { - [parameters removeObjectForKey:NAMES_requestType]; + [parameters removeObjectForKey:SDLNameRequestType]; } } - (SDLRequestType)requestType { - NSObject *obj = [parameters objectForKey:NAMES_requestType]; + NSObject *obj = [parameters objectForKey:SDLNameRequestType]; return (SDLRequestType)obj; } - (void)setFileName:(NSString *)fileName { if (fileName != nil) { - [parameters setObject:fileName forKey:NAMES_fileName]; + [parameters setObject:fileName forKey:SDLNameFilename]; } else { - [parameters removeObjectForKey:NAMES_fileName]; + [parameters removeObjectForKey:SDLNameFilename]; } } - (NSString *)fileName { - return [parameters objectForKey:NAMES_fileName]; + return [parameters objectForKey:SDLNameFilename]; } @end diff --git a/SmartDeviceLink/SDLSystemRequestResponse.h b/SmartDeviceLink/SDLSystemRequestResponse.h index 4c99d605f..805962d3c 100644 --- a/SmartDeviceLink/SDLSystemRequestResponse.h +++ b/SmartDeviceLink/SDLSystemRequestResponse.h @@ -7,10 +7,6 @@ /** SDLSystemRequestResponse is sent, when SDLSystemRequest has been called. * Since<b>SmartDeviceLink 3.0</b> */ -@interface SDLSystemRequestResponse : SDLRPCResponse { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLSystemRequestResponse : SDLRPCResponse @end diff --git a/SmartDeviceLink/SDLSystemRequestResponse.m b/SmartDeviceLink/SDLSystemRequestResponse.m index ba563e561..8d12fe6a8 100644 --- a/SmartDeviceLink/SDLSystemRequestResponse.m +++ b/SmartDeviceLink/SDLSystemRequestResponse.m @@ -9,13 +9,7 @@ @implementation SDLSystemRequestResponse - (instancetype)init { - if (self = [super initWithName:NAMES_SystemRequest]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameSystemRequest]) { } return self; } diff --git a/SmartDeviceLink/SDLTTSChunk.h b/SmartDeviceLink/SDLTTSChunk.h index 6740a74c3..0679b01c8 100644 --- a/SmartDeviceLink/SDLTTSChunk.h +++ b/SmartDeviceLink/SDLTTSChunk.h @@ -36,20 +36,7 @@ * * @since SmartDeviceLink 1.0 */ -@interface SDLTTSChunk : SDLRPCStruct { -} - -/** - * @abstract Constructs a newly allocated SDLTTSChunk object - */ -- (instancetype)init; - -/** - * @abstract Constructs a newly allocated SDLTTSChunk object indicated by the dictionary parameter - * - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLTTSChunk : SDLRPCStruct /** * @abstract Text to be spoken, or a phoneme specification, or the name of a pre-recorded sound. The contents of this field are indicated by the "type" field. diff --git a/SmartDeviceLink/SDLTTSChunk.m b/SmartDeviceLink/SDLTTSChunk.m index 1ac2e0b66..c81080025 100644 --- a/SmartDeviceLink/SDLTTSChunk.m +++ b/SmartDeviceLink/SDLTTSChunk.m @@ -5,43 +5,30 @@ #import "SDLNames.h" - @implementation SDLTTSChunk -- (instancetype)init { - if (self = [super init]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setText:(NSString *)text { if (text != nil) { - [store setObject:text forKey:NAMES_text]; + [store setObject:text forKey:SDLNameText]; } else { - [store removeObjectForKey:NAMES_text]; + [store removeObjectForKey:SDLNameText]; } } - (NSString *)text { - return [store objectForKey:NAMES_text]; + return [store objectForKey:SDLNameText]; } - (void)setType:(SDLSpeechCapabilities)type { if (type != nil) { - [store setObject:type forKey:NAMES_type]; + [store setObject:type forKey:SDLNameType]; } else { - [store removeObjectForKey:NAMES_type]; + [store removeObjectForKey:SDLNameType]; } } - (SDLSpeechCapabilities)type { - NSObject *obj = [store objectForKey:NAMES_type]; + NSObject *obj = [store objectForKey:SDLNameType]; return (SDLSpeechCapabilities)obj; } diff --git a/SmartDeviceLink/SDLTextField.h b/SmartDeviceLink/SDLTextField.h index 65c672053..efa61184a 100644 --- a/SmartDeviceLink/SDLTextField.h +++ b/SmartDeviceLink/SDLTextField.h @@ -56,20 +56,7 @@ * * @since SDL 1.0 */ -@interface SDLTextField : SDLRPCStruct { -} - -/** - * @abstract Constructs a newly allocated SDLTextField object - */ -- (instancetype)init; - -/** - * @abstract Constructs a newly allocated SDLTextField object indicated by the dictionary parameter - * - * @param dict The dictionary to use to construct the object - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLTextField : SDLRPCStruct /** * @abstract The enumeration identifying the field. diff --git a/SmartDeviceLink/SDLTextField.m b/SmartDeviceLink/SDLTextField.m index 9e4a875b2..3e12369d0 100644 --- a/SmartDeviceLink/SDLTextField.m +++ b/SmartDeviceLink/SDLTextField.m @@ -10,66 +10,54 @@ @implementation SDLTextField -- (instancetype)init { - if (self = [super init]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setName:(SDLTextFieldName)name { if (name != nil) { - [store setObject:name forKey:NAMES_name]; + [store setObject:name forKey:SDLNameName]; } else { - [store removeObjectForKey:NAMES_name]; + [store removeObjectForKey:SDLNameName]; } } - (SDLTextFieldName)name { - NSObject *obj = [store objectForKey:NAMES_name]; + NSObject *obj = [store objectForKey:SDLNameName]; return (SDLTextFieldName)obj; } - (void)setCharacterSet:(SDLCharacterSet)characterSet { if (characterSet != nil) { - [store setObject:characterSet forKey:NAMES_characterSet]; + [store setObject:characterSet forKey:SDLNameCharacterSet]; } else { - [store removeObjectForKey:NAMES_characterSet]; + [store removeObjectForKey:SDLNameCharacterSet]; } } - (SDLCharacterSet)characterSet { - NSObject *obj = [store objectForKey:NAMES_characterSet]; + NSObject *obj = [store objectForKey:SDLNameCharacterSet]; return (SDLCharacterSet)obj; } - (void)setWidth:(NSNumber *)width { if (width != nil) { - [store setObject:width forKey:NAMES_width]; + [store setObject:width forKey:SDLNameWidth]; } else { - [store removeObjectForKey:NAMES_width]; + [store removeObjectForKey:SDLNameWidth]; } } - (NSNumber *)width { - return [store objectForKey:NAMES_width]; + return [store objectForKey:SDLNameWidth]; } - (void)setRows:(NSNumber *)rows { if (rows != nil) { - [store setObject:rows forKey:NAMES_rows]; + [store setObject:rows forKey:SDLNameRows]; } else { - [store removeObjectForKey:NAMES_rows]; + [store removeObjectForKey:SDLNameRows]; } } - (NSNumber *)rows { - return [store objectForKey:NAMES_rows]; + return [store objectForKey:SDLNameRows]; } @end diff --git a/SmartDeviceLink/SDLTireStatus.h b/SmartDeviceLink/SDLTireStatus.h index 339b6a546..c65850303 100644 --- a/SmartDeviceLink/SDLTireStatus.h +++ b/SmartDeviceLink/SDLTireStatus.h @@ -6,11 +6,7 @@ @class SDLSingleTireStatus; #import "SDLWarningLightStatus.h" -@interface SDLTireStatus : SDLRPCStruct { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLTireStatus : SDLRPCStruct @property (strong) SDLWarningLightStatus pressureTelltale; @property (strong) SDLSingleTireStatus *leftFront; diff --git a/SmartDeviceLink/SDLTireStatus.m b/SmartDeviceLink/SDLTireStatus.m index a925706ea..495c0d3d3 100644 --- a/SmartDeviceLink/SDLTireStatus.m +++ b/SmartDeviceLink/SDLTireStatus.m @@ -7,133 +7,120 @@ #import "SDLSingleTireStatus.h" #import "SDLWarningLightStatus.h" - @implementation SDLTireStatus -- (instancetype)init { - if (self = [super init]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setPressureTelltale:(SDLWarningLightStatus)pressureTelltale { if (pressureTelltale != nil) { - [store setObject:pressureTelltale forKey:NAMES_pressureTelltale]; + [store setObject:pressureTelltale forKey:SDLNamePressureTelltale]; } else { - [store removeObjectForKey:NAMES_pressureTelltale]; + [store removeObjectForKey:SDLNamePressureTelltale]; } } - (SDLWarningLightStatus)pressureTelltale { - NSObject *obj = [store objectForKey:NAMES_pressureTelltale]; + NSObject *obj = [store objectForKey:SDLNamePressureTelltale]; return (SDLWarningLightStatus)obj; } - (void)setLeftFront:(SDLSingleTireStatus *)leftFront { if (leftFront != nil) { - [store setObject:leftFront forKey:NAMES_leftFront]; + [store setObject:leftFront forKey:SDLNameLeftFront]; } else { - [store removeObjectForKey:NAMES_leftFront]; + [store removeObjectForKey:SDLNameLeftFront]; } } - (SDLSingleTireStatus *)leftFront { - NSObject *obj = [store objectForKey:NAMES_leftFront]; + NSObject *obj = [store objectForKey:SDLNameLeftFront]; if (obj == nil || [obj isKindOfClass:SDLSingleTireStatus.class]) { return (SDLSingleTireStatus *)obj; } else { - return [[SDLSingleTireStatus alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLSingleTireStatus alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setRightFront:(SDLSingleTireStatus *)rightFront { if (rightFront != nil) { - [store setObject:rightFront forKey:NAMES_rightFront]; + [store setObject:rightFront forKey:SDLNameRightFront]; } else { - [store removeObjectForKey:NAMES_rightFront]; + [store removeObjectForKey:SDLNameRightFront]; } } - (SDLSingleTireStatus *)rightFront { - NSObject *obj = [store objectForKey:NAMES_rightFront]; + NSObject *obj = [store objectForKey:SDLNameRightFront]; if (obj == nil || [obj isKindOfClass:SDLSingleTireStatus.class]) { return (SDLSingleTireStatus *)obj; } else { - return [[SDLSingleTireStatus alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLSingleTireStatus alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setLeftRear:(SDLSingleTireStatus *)leftRear { if (leftRear != nil) { - [store setObject:leftRear forKey:NAMES_leftRear]; + [store setObject:leftRear forKey:SDLNameLeftRear]; } else { - [store removeObjectForKey:NAMES_leftRear]; + [store removeObjectForKey:SDLNameLeftRear]; } } - (SDLSingleTireStatus *)leftRear { - NSObject *obj = [store objectForKey:NAMES_leftRear]; + NSObject *obj = [store objectForKey:SDLNameLeftRear]; if (obj == nil || [obj isKindOfClass:SDLSingleTireStatus.class]) { return (SDLSingleTireStatus *)obj; } else { - return [[SDLSingleTireStatus alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLSingleTireStatus alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setRightRear:(SDLSingleTireStatus *)rightRear { if (rightRear != nil) { - [store setObject:rightRear forKey:NAMES_rightRear]; + [store setObject:rightRear forKey:SDLNameRightRear]; } else { - [store removeObjectForKey:NAMES_rightRear]; + [store removeObjectForKey:SDLNameRightRear]; } } - (SDLSingleTireStatus *)rightRear { - NSObject *obj = [store objectForKey:NAMES_rightRear]; + NSObject *obj = [store objectForKey:SDLNameRightRear]; if (obj == nil || [obj isKindOfClass:SDLSingleTireStatus.class]) { return (SDLSingleTireStatus *)obj; } else { - return [[SDLSingleTireStatus alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLSingleTireStatus alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setInnerLeftRear:(SDLSingleTireStatus *)innerLeftRear { if (innerLeftRear != nil) { - [store setObject:innerLeftRear forKey:NAMES_innerLeftRear]; + [store setObject:innerLeftRear forKey:SDLNameInnerLeftRear]; } else { - [store removeObjectForKey:NAMES_innerLeftRear]; + [store removeObjectForKey:SDLNameInnerLeftRear]; } } - (SDLSingleTireStatus *)innerLeftRear { - NSObject *obj = [store objectForKey:NAMES_innerLeftRear]; + NSObject *obj = [store objectForKey:SDLNameInnerLeftRear]; if (obj == nil || [obj isKindOfClass:SDLSingleTireStatus.class]) { return (SDLSingleTireStatus *)obj; } else { - return [[SDLSingleTireStatus alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLSingleTireStatus alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setInnerRightRear:(SDLSingleTireStatus *)innerRightRear { if (innerRightRear != nil) { - [store setObject:innerRightRear forKey:NAMES_innerRightRear]; + [store setObject:innerRightRear forKey:SDLNameInnerRightRear]; } else { - [store removeObjectForKey:NAMES_innerRightRear]; + [store removeObjectForKey:SDLNameInnerRightRear]; } } - (SDLSingleTireStatus *)innerRightRear { - NSObject *obj = [store objectForKey:NAMES_innerRightRear]; + NSObject *obj = [store objectForKey:SDLNameInnerRightRear]; if (obj == nil || [obj isKindOfClass:SDLSingleTireStatus.class]) { return (SDLSingleTireStatus *)obj; } else { - return [[SDLSingleTireStatus alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLSingleTireStatus alloc] initWithDictionary:(NSDictionary *)obj]; } } diff --git a/SmartDeviceLink/SDLTouchCoord.h b/SmartDeviceLink/SDLTouchCoord.h index 63515811f..f3dbda487 100644 --- a/SmartDeviceLink/SDLTouchCoord.h +++ b/SmartDeviceLink/SDLTouchCoord.h @@ -4,11 +4,7 @@ #import "SDLRPCMessage.h" -@interface SDLTouchCoord : SDLRPCStruct { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLTouchCoord : SDLRPCStruct @property (strong) NSNumber *x; @property (strong) NSNumber *y; diff --git a/SmartDeviceLink/SDLTouchCoord.m b/SmartDeviceLink/SDLTouchCoord.m index 78895696f..7a788582a 100644 --- a/SmartDeviceLink/SDLTouchCoord.m +++ b/SmartDeviceLink/SDLTouchCoord.m @@ -8,40 +8,28 @@ @implementation SDLTouchCoord -- (instancetype)init { - if (self = [super init]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setX:(NSNumber *)x { if (x != nil) { - [store setObject:x forKey:NAMES_x]; + [store setObject:x forKey:SDLNameX]; } else { - [store removeObjectForKey:NAMES_x]; + [store removeObjectForKey:SDLNameX]; } } - (NSNumber *)x { - return [store objectForKey:NAMES_x]; + return [store objectForKey:SDLNameX]; } - (void)setY:(NSNumber *)y { if (y != nil) { - [store setObject:y forKey:NAMES_y]; + [store setObject:y forKey:SDLNameY]; } else { - [store removeObjectForKey:NAMES_y]; + [store removeObjectForKey:SDLNameY]; } } - (NSNumber *)y { - return [store objectForKey:NAMES_y]; + return [store objectForKey:SDLNameY]; } @end diff --git a/SmartDeviceLink/SDLTouchEvent.h b/SmartDeviceLink/SDLTouchEvent.h index 01af99b98..05e7953be 100644 --- a/SmartDeviceLink/SDLTouchEvent.h +++ b/SmartDeviceLink/SDLTouchEvent.h @@ -4,11 +4,7 @@ #import "SDLRPCMessage.h" -@interface SDLTouchEvent : SDLRPCStruct { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLTouchEvent : SDLRPCStruct /** A touch's unique identifier. The application can track the current touch events by id. diff --git a/SmartDeviceLink/SDLTouchEvent.m b/SmartDeviceLink/SDLTouchEvent.m index e54e8b79e..082b9755b 100644 --- a/SmartDeviceLink/SDLTouchEvent.m +++ b/SmartDeviceLink/SDLTouchEvent.m @@ -9,58 +9,46 @@ @implementation SDLTouchEvent -- (instancetype)init { - if (self = [super init]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setTouchEventId:(NSNumber *)touchEventId { if (touchEventId != nil) { - [store setObject:touchEventId forKey:NAMES_id]; + [store setObject:touchEventId forKey:SDLNameId]; } else { - [store removeObjectForKey:NAMES_id]; + [store removeObjectForKey:SDLNameId]; } } - (NSNumber *)touchEventId { - return [store objectForKey:NAMES_id]; + return [store objectForKey:SDLNameId]; } - (void)setTimeStamp:(NSMutableArray *)timeStamp { if (timeStamp != nil) { - [store setObject:timeStamp forKey:NAMES_ts]; + [store setObject:timeStamp forKey:SDLNameTimestamp]; } else { - [store removeObjectForKey:NAMES_ts]; + [store removeObjectForKey:SDLNameTimestamp]; } } - (NSMutableArray *)timeStamp { - return [store objectForKey:NAMES_ts]; + return [store objectForKey:SDLNameTimestamp]; } - (void)setCoord:(NSMutableArray *)coord { if (coord != nil) { - [store setObject:coord forKey:NAMES_c]; + [store setObject:coord forKey:SDLNameCoordinate]; } else { - [store removeObjectForKey:NAMES_c]; + [store removeObjectForKey:SDLNameCoordinate]; } } - (NSMutableArray *)coord { - NSMutableArray *array = [store objectForKey:NAMES_c]; + NSMutableArray *array = [store objectForKey:SDLNameCoordinate]; if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLTouchCoord.class]) { return array; } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; for (NSDictionary *dict in array) { - [newList addObject:[[SDLTouchCoord alloc] initWithDictionary:(NSMutableDictionary *)dict]]; + [newList addObject:[[SDLTouchCoord alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; } diff --git a/SmartDeviceLink/SDLTouchEventCapabilities.h b/SmartDeviceLink/SDLTouchEventCapabilities.h index 6d346d874..e8aadf97f 100644 --- a/SmartDeviceLink/SDLTouchEventCapabilities.h +++ b/SmartDeviceLink/SDLTouchEventCapabilities.h @@ -4,11 +4,7 @@ #import "SDLRPCMessage.h" -@interface SDLTouchEventCapabilities : SDLRPCStruct { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLTouchEventCapabilities : SDLRPCStruct @property (strong) NSNumber *pressAvailable; @property (strong) NSNumber *multiTouchAvailable; diff --git a/SmartDeviceLink/SDLTouchEventCapabilities.m b/SmartDeviceLink/SDLTouchEventCapabilities.m index 4fc71cfec..3d3869332 100644 --- a/SmartDeviceLink/SDLTouchEventCapabilities.m +++ b/SmartDeviceLink/SDLTouchEventCapabilities.m @@ -8,52 +8,40 @@ @implementation SDLTouchEventCapabilities -- (instancetype)init { - if (self = [super init]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setPressAvailable:(NSNumber *)pressAvailable { if (pressAvailable != nil) { - [store setObject:pressAvailable forKey:NAMES_pressAvailable]; + [store setObject:pressAvailable forKey:SDLNamePressAvailable]; } else { - [store removeObjectForKey:NAMES_pressAvailable]; + [store removeObjectForKey:SDLNamePressAvailable]; } } - (NSNumber *)pressAvailable { - return [store objectForKey:NAMES_pressAvailable]; + return [store objectForKey:SDLNamePressAvailable]; } - (void)setMultiTouchAvailable:(NSNumber *)multiTouchAvailable { if (multiTouchAvailable != nil) { - [store setObject:multiTouchAvailable forKey:NAMES_multiTouchAvailable]; + [store setObject:multiTouchAvailable forKey:SDLNameMultiTouchAvailable]; } else { - [store removeObjectForKey:NAMES_multiTouchAvailable]; + [store removeObjectForKey:SDLNameMultiTouchAvailable]; } } - (NSNumber *)multiTouchAvailable { - return [store objectForKey:NAMES_multiTouchAvailable]; + return [store objectForKey:SDLNameMultiTouchAvailable]; } - (void)setDoublePressAvailable:(NSNumber *)doublePressAvailable { if (doublePressAvailable != nil) { - [store setObject:doublePressAvailable forKey:NAMES_doublePressAvailable]; + [store setObject:doublePressAvailable forKey:SDLNameDoublePressAvailable]; } else { - [store removeObjectForKey:NAMES_doublePressAvailable]; + [store removeObjectForKey:SDLNameDoublePressAvailable]; } } - (NSNumber *)doublePressAvailable { - return [store objectForKey:NAMES_doublePressAvailable]; + return [store objectForKey:SDLNameDoublePressAvailable]; } @end diff --git a/SmartDeviceLink/SDLTurn.h b/SmartDeviceLink/SDLTurn.h index ef2cf9ebe..ddd43b04f 100644 --- a/SmartDeviceLink/SDLTurn.h +++ b/SmartDeviceLink/SDLTurn.h @@ -6,11 +6,7 @@ @class SDLImage; -@interface SDLTurn : SDLRPCStruct { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLTurn : SDLRPCStruct @property (strong) NSString *navigationText; @property (strong) SDLImage *turnIcon; diff --git a/SmartDeviceLink/SDLTurn.m b/SmartDeviceLink/SDLTurn.m index 875fa2e73..12ad90060 100644 --- a/SmartDeviceLink/SDLTurn.m +++ b/SmartDeviceLink/SDLTurn.m @@ -6,47 +6,34 @@ #import "SDLImage.h" #import "SDLNames.h" - @implementation SDLTurn -- (instancetype)init { - if (self = [super init]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setNavigationText:(NSString *)navigationText { if (navigationText != nil) { - [store setObject:navigationText forKey:NAMES_navigationText]; + [store setObject:navigationText forKey:SDLNameNavigationText]; } else { - [store removeObjectForKey:NAMES_navigationText]; + [store removeObjectForKey:SDLNameNavigationText]; } } - (NSString *)navigationText { - return [store objectForKey:NAMES_navigationText]; + return [store objectForKey:SDLNameNavigationText]; } - (void)setTurnIcon:(SDLImage *)turnIcon { if (turnIcon != nil) { - [store setObject:turnIcon forKey:NAMES_turnIcon]; + [store setObject:turnIcon forKey:SDLNameTurnIcon]; } else { - [store removeObjectForKey:NAMES_turnIcon]; + [store removeObjectForKey:SDLNameTurnIcon]; } } - (SDLImage *)turnIcon { - NSObject *obj = [store objectForKey:NAMES_turnIcon]; + NSObject *obj = [store objectForKey:SDLNameTurnIcon]; if (obj == nil || [obj isKindOfClass:SDLImage.class]) { return (SDLImage *)obj; } else { - return [[SDLImage alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLImage alloc] initWithDictionary:(NSDictionary *)obj]; } } diff --git a/SmartDeviceLink/SDLUnregisterAppInterface.h b/SmartDeviceLink/SDLUnregisterAppInterface.h index d35d40193..21c006127 100644 --- a/SmartDeviceLink/SDLUnregisterAppInterface.h +++ b/SmartDeviceLink/SDLUnregisterAppInterface.h @@ -19,18 +19,6 @@ * * See SDLRegisterAppInterface SDLOnAppInterfaceUnregistered */ -@interface SDLUnregisterAppInterface : SDLRPCRequest { -} - -/** - * @abstract Constructs a new SDLUnregisterAppInterface object - */ -- (instancetype)init; -/** - * @abstract Constructs a new SDLUnregisterAppInterface object indicated by the NSMutableDictionary - * parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLUnregisterAppInterface : SDLRPCRequest @end diff --git a/SmartDeviceLink/SDLUnregisterAppInterface.m b/SmartDeviceLink/SDLUnregisterAppInterface.m index 88039631d..5a19dc885 100644 --- a/SmartDeviceLink/SDLUnregisterAppInterface.m +++ b/SmartDeviceLink/SDLUnregisterAppInterface.m @@ -9,13 +9,7 @@ @implementation SDLUnregisterAppInterface - (instancetype)init { - if (self = [super initWithName:NAMES_UnregisterAppInterface]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameUnregisterAppInterface]) { } return self; } diff --git a/SmartDeviceLink/SDLUnregisterAppInterfaceResponse.h b/SmartDeviceLink/SDLUnregisterAppInterfaceResponse.h index 8ebbb46af..1c6420f8e 100644 --- a/SmartDeviceLink/SDLUnregisterAppInterfaceResponse.h +++ b/SmartDeviceLink/SDLUnregisterAppInterfaceResponse.h @@ -9,18 +9,6 @@ * * @since SmartDeviceLink 1.0 */ -@interface SDLUnregisterAppInterfaceResponse : SDLRPCResponse { -} - -/** - * @abstract Constructs a new SDLUnregisterAppInterfaceResponse object - */ -- (instancetype)init; -/** - * @abstract Constructs a new SDLUnregisterAppInterfaceResponse object indicated by the NSMutableDictionary - * parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLUnregisterAppInterfaceResponse : SDLRPCResponse @end diff --git a/SmartDeviceLink/SDLUnregisterAppInterfaceResponse.m b/SmartDeviceLink/SDLUnregisterAppInterfaceResponse.m index 6bebbe83d..ca1b8953c 100644 --- a/SmartDeviceLink/SDLUnregisterAppInterfaceResponse.m +++ b/SmartDeviceLink/SDLUnregisterAppInterfaceResponse.m @@ -9,13 +9,7 @@ @implementation SDLUnregisterAppInterfaceResponse - (instancetype)init { - if (self = [super initWithName:NAMES_UnregisterAppInterface]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameUnregisterAppInterface]) { } return self; } diff --git a/SmartDeviceLink/SDLUnsubscribeButton.h b/SmartDeviceLink/SDLUnsubscribeButton.h index c5f7301bb..6d4590732 100644 --- a/SmartDeviceLink/SDLUnsubscribeButton.h +++ b/SmartDeviceLink/SDLUnsubscribeButton.h @@ -19,19 +19,7 @@ * @since SmartDeviceLink 1.0<br/> * See SDLSubscribeButton */ -@interface SDLUnsubscribeButton : SDLRPCRequest { -} - -/** - * @abstract Constructs a new SDLUnsubscribeButton object - */ -- (instancetype)init; -/** - * @abstract Constructs a new SDLUnsubscribeButton object indicated by the NSMutableDictionary - * parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLUnsubscribeButton : SDLRPCRequest /** * @abstract A name of the button to unsubscribe from diff --git a/SmartDeviceLink/SDLUnsubscribeButton.m b/SmartDeviceLink/SDLUnsubscribeButton.m index 3147ec5de..65ecad24e 100644 --- a/SmartDeviceLink/SDLUnsubscribeButton.m +++ b/SmartDeviceLink/SDLUnsubscribeButton.m @@ -7,31 +7,24 @@ #import "SDLButtonName.h" #import "SDLNames.h" - @implementation SDLUnsubscribeButton - (instancetype)init { - if (self = [super initWithName:NAMES_UnsubscribeButton]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameUnsubscribeButton]) { } return self; } - (void)setButtonName:(SDLButtonName)buttonName { if (buttonName != nil) { - [parameters setObject:buttonName forKey:NAMES_buttonName]; + [parameters setObject:buttonName forKey:SDLNameButtonName]; } else { - [parameters removeObjectForKey:NAMES_buttonName]; + [parameters removeObjectForKey:SDLNameButtonName]; } } - (SDLButtonName)buttonName { - NSObject *obj = [parameters objectForKey:NAMES_buttonName]; + NSObject *obj = [parameters objectForKey:SDLNameButtonName]; return (SDLButtonName)obj; } diff --git a/SmartDeviceLink/SDLUnsubscribeButtonResponse.h b/SmartDeviceLink/SDLUnsubscribeButtonResponse.h index 62011539f..8dc43fad7 100644 --- a/SmartDeviceLink/SDLUnsubscribeButtonResponse.h +++ b/SmartDeviceLink/SDLUnsubscribeButtonResponse.h @@ -9,18 +9,6 @@ * * @since SmartDeviceLink 1.0 */ -@interface SDLUnsubscribeButtonResponse : SDLRPCResponse { -} - -/** - * @abstract Constructs a new SDLUnsubscribeButtonResponse object - */ -- (instancetype)init; -/** - * @abstract Constructs a new SDLUnsubscribeButtonResponse object indicated by the NSMutableDictionary - * parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLUnsubscribeButtonResponse : SDLRPCResponse @end diff --git a/SmartDeviceLink/SDLUnsubscribeButtonResponse.m b/SmartDeviceLink/SDLUnsubscribeButtonResponse.m index a28cf2768..2f45d790e 100644 --- a/SmartDeviceLink/SDLUnsubscribeButtonResponse.m +++ b/SmartDeviceLink/SDLUnsubscribeButtonResponse.m @@ -9,13 +9,7 @@ @implementation SDLUnsubscribeButtonResponse - (instancetype)init { - if (self = [super initWithName:NAMES_UnsubscribeButton]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameUnsubscribeButton]) { } return self; } diff --git a/SmartDeviceLink/SDLUnsubscribeVehicleData.h b/SmartDeviceLink/SDLUnsubscribeVehicleData.h index 389173256..2b6d2ee8b 100644 --- a/SmartDeviceLink/SDLUnsubscribeVehicleData.h +++ b/SmartDeviceLink/SDLUnsubscribeVehicleData.h @@ -16,20 +16,7 @@ * @since SmartDeviceLink 2.0<br/> * See SDLSubscribeVehicleData SDLGetVehicleData */ -@interface SDLUnsubscribeVehicleData : SDLRPCRequest { -} - -/** - * @abstract Constructs a new SDLUnsubscribeVehicleData object - */ -- (instancetype)init; - -/** - * @abstract Constructs a new SDLUnsubscribeVehicleData object indicated by the NSMutableDictionary - * parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLUnsubscribeVehicleData : SDLRPCRequest /** * @abstract A boolean value. If true, unsubscribes Gps data diff --git a/SmartDeviceLink/SDLUnsubscribeVehicleData.m b/SmartDeviceLink/SDLUnsubscribeVehicleData.m index 11aa044e1..ed0e0d407 100644 --- a/SmartDeviceLink/SDLUnsubscribeVehicleData.m +++ b/SmartDeviceLink/SDLUnsubscribeVehicleData.m @@ -9,303 +9,297 @@ @implementation SDLUnsubscribeVehicleData - (instancetype)init { - if (self = [super initWithName:NAMES_UnsubscribeVehicleData]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameUnsubscribeVehicleData]) { } return self; } - (void)setGps:(NSNumber *)gps { if (gps != nil) { - [parameters setObject:gps forKey:NAMES_gps]; + [parameters setObject:gps forKey:SDLNameGPS]; } else { - [parameters removeObjectForKey:NAMES_gps]; + [parameters removeObjectForKey:SDLNameGPS]; } } - (NSNumber *)gps { - return [parameters objectForKey:NAMES_gps]; + return [parameters objectForKey:SDLNameGPS]; } - (void)setSpeed:(NSNumber *)speed { if (speed != nil) { - [parameters setObject:speed forKey:NAMES_speed]; + [parameters setObject:speed forKey:SDLNameSpeed]; } else { - [parameters removeObjectForKey:NAMES_speed]; + [parameters removeObjectForKey:SDLNameSpeed]; } } - (NSNumber *)speed { - return [parameters objectForKey:NAMES_speed]; + return [parameters objectForKey:SDLNameSpeed]; } - (void)setRpm:(NSNumber *)rpm { if (rpm != nil) { - [parameters setObject:rpm forKey:NAMES_rpm]; + [parameters setObject:rpm forKey:SDLNameRPM]; } else { - [parameters removeObjectForKey:NAMES_rpm]; + [parameters removeObjectForKey:SDLNameRPM]; } } - (NSNumber *)rpm { - return [parameters objectForKey:NAMES_rpm]; + return [parameters objectForKey:SDLNameRPM]; } - (void)setFuelLevel:(NSNumber *)fuelLevel { if (fuelLevel != nil) { - [parameters setObject:fuelLevel forKey:NAMES_fuelLevel]; + [parameters setObject:fuelLevel forKey:SDLNameFuelLevel]; } else { - [parameters removeObjectForKey:NAMES_fuelLevel]; + [parameters removeObjectForKey:SDLNameFuelLevel]; } } - (NSNumber *)fuelLevel { - return [parameters objectForKey:NAMES_fuelLevel]; + return [parameters objectForKey:SDLNameFuelLevel]; } - (void)setFuelLevel_State:(NSNumber *)fuelLevel_State { if (fuelLevel_State != nil) { - [parameters setObject:fuelLevel_State forKey:NAMES_fuelLevel_State]; + [parameters setObject:fuelLevel_State forKey:SDLNameFuelLevelState]; } else { - [parameters removeObjectForKey:NAMES_fuelLevel_State]; + [parameters removeObjectForKey:SDLNameFuelLevelState]; } } - (NSNumber *)fuelLevel_State { - return [parameters objectForKey:NAMES_fuelLevel_State]; + return [parameters objectForKey:SDLNameFuelLevelState]; } - (void)setInstantFuelConsumption:(NSNumber *)instantFuelConsumption { if (instantFuelConsumption != nil) { - [parameters setObject:instantFuelConsumption forKey:NAMES_instantFuelConsumption]; + [parameters setObject:instantFuelConsumption forKey:SDLNameInstantFuelConsumption]; } else { - [parameters removeObjectForKey:NAMES_instantFuelConsumption]; + [parameters removeObjectForKey:SDLNameInstantFuelConsumption]; } } - (NSNumber *)instantFuelConsumption { - return [parameters objectForKey:NAMES_instantFuelConsumption]; + return [parameters objectForKey:SDLNameInstantFuelConsumption]; } - (void)setExternalTemperature:(NSNumber *)externalTemperature { if (externalTemperature != nil) { - [parameters setObject:externalTemperature forKey:NAMES_externalTemperature]; + [parameters setObject:externalTemperature forKey:SDLNameExternalTemperature]; } else { - [parameters removeObjectForKey:NAMES_externalTemperature]; + [parameters removeObjectForKey:SDLNameExternalTemperature]; } } - (NSNumber *)externalTemperature { - return [parameters objectForKey:NAMES_externalTemperature]; + return [parameters objectForKey:SDLNameExternalTemperature]; } - (void)setPrndl:(NSNumber *)prndl { if (prndl != nil) { - [parameters setObject:prndl forKey:NAMES_prndl]; + [parameters setObject:prndl forKey:SDLNamePRNDL]; } else { - [parameters removeObjectForKey:NAMES_prndl]; + [parameters removeObjectForKey:SDLNamePRNDL]; } } - (NSNumber *)prndl { - return [parameters objectForKey:NAMES_prndl]; + return [parameters objectForKey:SDLNamePRNDL]; } - (void)setTirePressure:(NSNumber *)tirePressure { if (tirePressure != nil) { - [parameters setObject:tirePressure forKey:NAMES_tirePressure]; + [parameters setObject:tirePressure forKey:SDLNameTirePressure]; } else { - [parameters removeObjectForKey:NAMES_tirePressure]; + [parameters removeObjectForKey:SDLNameTirePressure]; } } - (NSNumber *)tirePressure { - return [parameters objectForKey:NAMES_tirePressure]; + return [parameters objectForKey:SDLNameTirePressure]; } - (void)setOdometer:(NSNumber *)odometer { if (odometer != nil) { - [parameters setObject:odometer forKey:NAMES_odometer]; + [parameters setObject:odometer forKey:SDLNameOdometer]; } else { - [parameters removeObjectForKey:NAMES_odometer]; + [parameters removeObjectForKey:SDLNameOdometer]; } } - (NSNumber *)odometer { - return [parameters objectForKey:NAMES_odometer]; + return [parameters objectForKey:SDLNameOdometer]; } - (void)setBeltStatus:(NSNumber *)beltStatus { if (beltStatus != nil) { - [parameters setObject:beltStatus forKey:NAMES_beltStatus]; + [parameters setObject:beltStatus forKey:SDLNameBeltStatus]; } else { - [parameters removeObjectForKey:NAMES_beltStatus]; + [parameters removeObjectForKey:SDLNameBeltStatus]; } } - (NSNumber *)beltStatus { - return [parameters objectForKey:NAMES_beltStatus]; + return [parameters objectForKey:SDLNameBeltStatus]; } - (void)setBodyInformation:(NSNumber *)bodyInformation { if (bodyInformation != nil) { - [parameters setObject:bodyInformation forKey:NAMES_bodyInformation]; + [parameters setObject:bodyInformation forKey:SDLNameBodyInformation]; } else { - [parameters removeObjectForKey:NAMES_bodyInformation]; + [parameters removeObjectForKey:SDLNameBodyInformation]; } } - (NSNumber *)bodyInformation { - return [parameters objectForKey:NAMES_bodyInformation]; + return [parameters objectForKey:SDLNameBodyInformation]; } - (void)setDeviceStatus:(NSNumber *)deviceStatus { if (deviceStatus != nil) { - [parameters setObject:deviceStatus forKey:NAMES_deviceStatus]; + [parameters setObject:deviceStatus forKey:SDLNameDeviceStatus]; } else { - [parameters removeObjectForKey:NAMES_deviceStatus]; + [parameters removeObjectForKey:SDLNameDeviceStatus]; } } - (NSNumber *)deviceStatus { - return [parameters objectForKey:NAMES_deviceStatus]; + return [parameters objectForKey:SDLNameDeviceStatus]; } - (void)setDriverBraking:(NSNumber *)driverBraking { if (driverBraking != nil) { - [parameters setObject:driverBraking forKey:NAMES_driverBraking]; + [parameters setObject:driverBraking forKey:SDLNameDriverBraking]; } else { - [parameters removeObjectForKey:NAMES_driverBraking]; + [parameters removeObjectForKey:SDLNameDriverBraking]; } } - (NSNumber *)driverBraking { - return [parameters objectForKey:NAMES_driverBraking]; + return [parameters objectForKey:SDLNameDriverBraking]; } - (void)setWiperStatus:(NSNumber *)wiperStatus { if (wiperStatus != nil) { - [parameters setObject:wiperStatus forKey:NAMES_wiperStatus]; + [parameters setObject:wiperStatus forKey:SDLNameWiperStatus]; } else { - [parameters removeObjectForKey:NAMES_wiperStatus]; + [parameters removeObjectForKey:SDLNameWiperStatus]; } } - (NSNumber *)wiperStatus { - return [parameters objectForKey:NAMES_wiperStatus]; + return [parameters objectForKey:SDLNameWiperStatus]; } - (void)setHeadLampStatus:(NSNumber *)headLampStatus { if (headLampStatus != nil) { - [parameters setObject:headLampStatus forKey:NAMES_headLampStatus]; + [parameters setObject:headLampStatus forKey:SDLNameHeadLampStatus]; } else { - [parameters removeObjectForKey:NAMES_headLampStatus]; + [parameters removeObjectForKey:SDLNameHeadLampStatus]; } } - (NSNumber *)headLampStatus { - return [parameters objectForKey:NAMES_headLampStatus]; + return [parameters objectForKey:SDLNameHeadLampStatus]; } - (void)setEngineTorque:(NSNumber *)engineTorque { if (engineTorque != nil) { - [parameters setObject:engineTorque forKey:NAMES_engineTorque]; + [parameters setObject:engineTorque forKey:SDLNameEngineTorque]; } else { - [parameters removeObjectForKey:NAMES_engineTorque]; + [parameters removeObjectForKey:SDLNameEngineTorque]; } } - (NSNumber *)engineTorque { - return [parameters objectForKey:NAMES_engineTorque]; + return [parameters objectForKey:SDLNameEngineTorque]; } - (void)setAccPedalPosition:(NSNumber *)accPedalPosition { if (accPedalPosition != nil) { - [parameters setObject:accPedalPosition forKey:NAMES_accPedalPosition]; + [parameters setObject:accPedalPosition forKey:SDLNameAccelerationPedalPosition]; } else { - [parameters removeObjectForKey:NAMES_accPedalPosition]; + [parameters removeObjectForKey:SDLNameAccelerationPedalPosition]; } } - (NSNumber *)accPedalPosition { - return [parameters objectForKey:NAMES_accPedalPosition]; + return [parameters objectForKey:SDLNameAccelerationPedalPosition]; } - (void)setSteeringWheelAngle:(NSNumber *)steeringWheelAngle { if (steeringWheelAngle != nil) { - [parameters setObject:steeringWheelAngle forKey:NAMES_steeringWheelAngle]; + [parameters setObject:steeringWheelAngle forKey:SDLNameSteeringWheelAngle]; } else { - [parameters removeObjectForKey:NAMES_steeringWheelAngle]; + [parameters removeObjectForKey:SDLNameSteeringWheelAngle]; } } - (NSNumber *)steeringWheelAngle { - return [parameters objectForKey:NAMES_steeringWheelAngle]; + return [parameters objectForKey:SDLNameSteeringWheelAngle]; } - (void)setECallInfo:(NSNumber *)eCallInfo { if (eCallInfo != nil) { - [parameters setObject:eCallInfo forKey:NAMES_eCallInfo]; + [parameters setObject:eCallInfo forKey:SDLNameECallInfo]; } else { - [parameters removeObjectForKey:NAMES_eCallInfo]; + [parameters removeObjectForKey:SDLNameECallInfo]; } } - (NSNumber *)eCallInfo { - return [parameters objectForKey:NAMES_eCallInfo]; + return [parameters objectForKey:SDLNameECallInfo]; } - (void)setAirbagStatus:(NSNumber *)airbagStatus { if (airbagStatus != nil) { - [parameters setObject:airbagStatus forKey:NAMES_airbagStatus]; + [parameters setObject:airbagStatus forKey:SDLNameAirbagStatus]; } else { - [parameters removeObjectForKey:NAMES_airbagStatus]; + [parameters removeObjectForKey:SDLNameAirbagStatus]; } } - (NSNumber *)airbagStatus { - return [parameters objectForKey:NAMES_airbagStatus]; + return [parameters objectForKey:SDLNameAirbagStatus]; } - (void)setEmergencyEvent:(NSNumber *)emergencyEvent { if (emergencyEvent != nil) { - [parameters setObject:emergencyEvent forKey:NAMES_emergencyEvent]; + [parameters setObject:emergencyEvent forKey:SDLNameEmergencyEvent]; } else { - [parameters removeObjectForKey:NAMES_emergencyEvent]; + [parameters removeObjectForKey:SDLNameEmergencyEvent]; } } - (NSNumber *)emergencyEvent { - return [parameters objectForKey:NAMES_emergencyEvent]; + return [parameters objectForKey:SDLNameEmergencyEvent]; } - (void)setClusterModeStatus:(NSNumber *)clusterModeStatus { if (clusterModeStatus != nil) { - [parameters setObject:clusterModeStatus forKey:NAMES_clusterModeStatus]; + [parameters setObject:clusterModeStatus forKey:SDLNameClusterModeStatus]; } else { - [parameters removeObjectForKey:NAMES_clusterModeStatus]; + [parameters removeObjectForKey:SDLNameClusterModeStatus]; } } - (NSNumber *)clusterModeStatus { - return [parameters objectForKey:NAMES_clusterModeStatus]; + return [parameters objectForKey:SDLNameClusterModeStatus]; } - (void)setMyKey:(NSNumber *)myKey { if (myKey != nil) { - [parameters setObject:myKey forKey:NAMES_myKey]; + [parameters setObject:myKey forKey:SDLNameMyKey]; } else { - [parameters removeObjectForKey:NAMES_myKey]; + [parameters removeObjectForKey:SDLNameMyKey]; } } - (NSNumber *)myKey { - return [parameters objectForKey:NAMES_myKey]; + return [parameters objectForKey:SDLNameMyKey]; } @end diff --git a/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h b/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h index beb1b93e2..eecce7b75 100644 --- a/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h +++ b/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h @@ -11,20 +11,7 @@ * * @since SmartDeviceLink 2.0 */ -@interface SDLUnsubscribeVehicleDataResponse : SDLRPCResponse { -} - -/** - * @abstract Constructs a new SDLUnsubscribeVehicleDataResponse object - */ -- (instancetype)init; - -/** - * @abstract Constructs a new SDLUnsubscribeVehicleDataResponse object indicated by the NSMutableDictionary - * parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLUnsubscribeVehicleDataResponse : SDLRPCResponse /** * @abstract A SDLVehicleDataResult* value. See GPSData. diff --git a/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m b/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m index ec4916447..5fd117563 100644 --- a/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m +++ b/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.m @@ -7,426 +7,419 @@ #import "SDLNames.h" #import "SDLVehicleDataResult.h" - @implementation SDLUnsubscribeVehicleDataResponse - (instancetype)init { - if (self = [super initWithName:NAMES_UnsubscribeVehicleData]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameUnsubscribeVehicleData]) { } return self; } - (void)setGps:(SDLVehicleDataResult *)gps { if (gps != nil) { - [parameters setObject:gps forKey:NAMES_gps]; + [parameters setObject:gps forKey:SDLNameGPS]; } else { - [parameters removeObjectForKey:NAMES_gps]; + [parameters removeObjectForKey:SDLNameGPS]; } } - (SDLVehicleDataResult *)gps { - NSObject *obj = [parameters objectForKey:NAMES_gps]; + NSObject *obj = [parameters objectForKey:SDLNameGPS]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setSpeed:(SDLVehicleDataResult *)speed { if (speed != nil) { - [parameters setObject:speed forKey:NAMES_speed]; + [parameters setObject:speed forKey:SDLNameSpeed]; } else { - [parameters removeObjectForKey:NAMES_speed]; + [parameters removeObjectForKey:SDLNameSpeed]; } } - (SDLVehicleDataResult *)speed { - NSObject *obj = [parameters objectForKey:NAMES_speed]; + NSObject *obj = [parameters objectForKey:SDLNameSpeed]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setRpm:(SDLVehicleDataResult *)rpm { if (rpm != nil) { - [parameters setObject:rpm forKey:NAMES_rpm]; + [parameters setObject:rpm forKey:SDLNameRPM]; } else { - [parameters removeObjectForKey:NAMES_rpm]; + [parameters removeObjectForKey:SDLNameRPM]; } } - (SDLVehicleDataResult *)rpm { - NSObject *obj = [parameters objectForKey:NAMES_rpm]; + NSObject *obj = [parameters objectForKey:SDLNameRPM]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setFuelLevel:(SDLVehicleDataResult *)fuelLevel { if (fuelLevel != nil) { - [parameters setObject:fuelLevel forKey:NAMES_fuelLevel]; + [parameters setObject:fuelLevel forKey:SDLNameFuelLevel]; } else { - [parameters removeObjectForKey:NAMES_fuelLevel]; + [parameters removeObjectForKey:SDLNameFuelLevel]; } } - (SDLVehicleDataResult *)fuelLevel { - NSObject *obj = [parameters objectForKey:NAMES_fuelLevel]; + NSObject *obj = [parameters objectForKey:SDLNameFuelLevel]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setFuelLevel_State:(SDLVehicleDataResult *)fuelLevel_State { if (fuelLevel_State != nil) { - [parameters setObject:fuelLevel_State forKey:NAMES_fuelLevel_State]; + [parameters setObject:fuelLevel_State forKey:SDLNameFuelLevelState]; } else { - [parameters removeObjectForKey:NAMES_fuelLevel_State]; + [parameters removeObjectForKey:SDLNameFuelLevelState]; } } - (SDLVehicleDataResult *)fuelLevel_State { - NSObject *obj = [parameters objectForKey:NAMES_fuelLevel_State]; + NSObject *obj = [parameters objectForKey:SDLNameFuelLevelState]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setInstantFuelConsumption:(SDLVehicleDataResult *)instantFuelConsumption { if (instantFuelConsumption != nil) { - [parameters setObject:instantFuelConsumption forKey:NAMES_instantFuelConsumption]; + [parameters setObject:instantFuelConsumption forKey:SDLNameInstantFuelConsumption]; } else { - [parameters removeObjectForKey:NAMES_instantFuelConsumption]; + [parameters removeObjectForKey:SDLNameInstantFuelConsumption]; } } - (SDLVehicleDataResult *)instantFuelConsumption { - NSObject *obj = [parameters objectForKey:NAMES_instantFuelConsumption]; + NSObject *obj = [parameters objectForKey:SDLNameInstantFuelConsumption]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setExternalTemperature:(SDLVehicleDataResult *)externalTemperature { if (externalTemperature != nil) { - [parameters setObject:externalTemperature forKey:NAMES_externalTemperature]; + [parameters setObject:externalTemperature forKey:SDLNameExternalTemperature]; } else { - [parameters removeObjectForKey:NAMES_externalTemperature]; + [parameters removeObjectForKey:SDLNameExternalTemperature]; } } - (SDLVehicleDataResult *)externalTemperature { - NSObject *obj = [parameters objectForKey:NAMES_externalTemperature]; + NSObject *obj = [parameters objectForKey:SDLNameExternalTemperature]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setPrndl:(SDLVehicleDataResult *)prndl { if (prndl != nil) { - [parameters setObject:prndl forKey:NAMES_prndl]; + [parameters setObject:prndl forKey:SDLNamePRNDL]; } else { - [parameters removeObjectForKey:NAMES_prndl]; + [parameters removeObjectForKey:SDLNamePRNDL]; } } - (SDLVehicleDataResult *)prndl { - NSObject *obj = [parameters objectForKey:NAMES_prndl]; + NSObject *obj = [parameters objectForKey:SDLNamePRNDL]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setTirePressure:(SDLVehicleDataResult *)tirePressure { if (tirePressure != nil) { - [parameters setObject:tirePressure forKey:NAMES_tirePressure]; + [parameters setObject:tirePressure forKey:SDLNameTirePressure]; } else { - [parameters removeObjectForKey:NAMES_tirePressure]; + [parameters removeObjectForKey:SDLNameTirePressure]; } } - (SDLVehicleDataResult *)tirePressure { - NSObject *obj = [parameters objectForKey:NAMES_tirePressure]; + NSObject *obj = [parameters objectForKey:SDLNameTirePressure]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setOdometer:(SDLVehicleDataResult *)odometer { if (odometer != nil) { - [parameters setObject:odometer forKey:NAMES_odometer]; + [parameters setObject:odometer forKey:SDLNameOdometer]; } else { - [parameters removeObjectForKey:NAMES_odometer]; + [parameters removeObjectForKey:SDLNameOdometer]; } } - (SDLVehicleDataResult *)odometer { - NSObject *obj = [parameters objectForKey:NAMES_odometer]; + NSObject *obj = [parameters objectForKey:SDLNameOdometer]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setBeltStatus:(SDLVehicleDataResult *)beltStatus { if (beltStatus != nil) { - [parameters setObject:beltStatus forKey:NAMES_beltStatus]; + [parameters setObject:beltStatus forKey:SDLNameBeltStatus]; } else { - [parameters removeObjectForKey:NAMES_beltStatus]; + [parameters removeObjectForKey:SDLNameBeltStatus]; } } - (SDLVehicleDataResult *)beltStatus { - NSObject *obj = [parameters objectForKey:NAMES_beltStatus]; + NSObject *obj = [parameters objectForKey:SDLNameBeltStatus]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setBodyInformation:(SDLVehicleDataResult *)bodyInformation { if (bodyInformation != nil) { - [parameters setObject:bodyInformation forKey:NAMES_bodyInformation]; + [parameters setObject:bodyInformation forKey:SDLNameBodyInformation]; } else { - [parameters removeObjectForKey:NAMES_bodyInformation]; + [parameters removeObjectForKey:SDLNameBodyInformation]; } } - (SDLVehicleDataResult *)bodyInformation { - NSObject *obj = [parameters objectForKey:NAMES_bodyInformation]; + NSObject *obj = [parameters objectForKey:SDLNameBodyInformation]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setDeviceStatus:(SDLVehicleDataResult *)deviceStatus { if (deviceStatus != nil) { - [parameters setObject:deviceStatus forKey:NAMES_deviceStatus]; + [parameters setObject:deviceStatus forKey:SDLNameDeviceStatus]; } else { - [parameters removeObjectForKey:NAMES_deviceStatus]; + [parameters removeObjectForKey:SDLNameDeviceStatus]; } } - (SDLVehicleDataResult *)deviceStatus { - NSObject *obj = [parameters objectForKey:NAMES_deviceStatus]; + NSObject *obj = [parameters objectForKey:SDLNameDeviceStatus]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setDriverBraking:(SDLVehicleDataResult *)driverBraking { if (driverBraking != nil) { - [parameters setObject:driverBraking forKey:NAMES_driverBraking]; + [parameters setObject:driverBraking forKey:SDLNameDriverBraking]; } else { - [parameters removeObjectForKey:NAMES_driverBraking]; + [parameters removeObjectForKey:SDLNameDriverBraking]; } } - (SDLVehicleDataResult *)driverBraking { - NSObject *obj = [parameters objectForKey:NAMES_driverBraking]; + NSObject *obj = [parameters objectForKey:SDLNameDriverBraking]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setWiperStatus:(SDLVehicleDataResult *)wiperStatus { if (wiperStatus != nil) { - [parameters setObject:wiperStatus forKey:NAMES_wiperStatus]; + [parameters setObject:wiperStatus forKey:SDLNameWiperStatus]; } else { - [parameters removeObjectForKey:NAMES_wiperStatus]; + [parameters removeObjectForKey:SDLNameWiperStatus]; } } - (SDLVehicleDataResult *)wiperStatus { - NSObject *obj = [parameters objectForKey:NAMES_wiperStatus]; + NSObject *obj = [parameters objectForKey:SDLNameWiperStatus]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setHeadLampStatus:(SDLVehicleDataResult *)headLampStatus { if (headLampStatus != nil) { - [parameters setObject:headLampStatus forKey:NAMES_headLampStatus]; + [parameters setObject:headLampStatus forKey:SDLNameHeadLampStatus]; } else { - [parameters removeObjectForKey:NAMES_headLampStatus]; + [parameters removeObjectForKey:SDLNameHeadLampStatus]; } } - (SDLVehicleDataResult *)headLampStatus { - NSObject *obj = [parameters objectForKey:NAMES_headLampStatus]; + NSObject *obj = [parameters objectForKey:SDLNameHeadLampStatus]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setEngineTorque:(SDLVehicleDataResult *)engineTorque { if (engineTorque != nil) { - [parameters setObject:engineTorque forKey:NAMES_engineTorque]; + [parameters setObject:engineTorque forKey:SDLNameEngineTorque]; } else { - [parameters removeObjectForKey:NAMES_engineTorque]; + [parameters removeObjectForKey:SDLNameEngineTorque]; } } - (SDLVehicleDataResult *)engineTorque { - NSObject *obj = [parameters objectForKey:NAMES_engineTorque]; + NSObject *obj = [parameters objectForKey:SDLNameEngineTorque]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setAccPedalPosition:(SDLVehicleDataResult *)accPedalPosition { if (accPedalPosition != nil) { - [parameters setObject:accPedalPosition forKey:NAMES_accPedalPosition]; + [parameters setObject:accPedalPosition forKey:SDLNameAccelerationPedalPosition]; } else { - [parameters removeObjectForKey:NAMES_accPedalPosition]; + [parameters removeObjectForKey:SDLNameAccelerationPedalPosition]; } } - (SDLVehicleDataResult *)accPedalPosition { - NSObject *obj = [parameters objectForKey:NAMES_accPedalPosition]; + NSObject *obj = [parameters objectForKey:SDLNameAccelerationPedalPosition]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setSteeringWheelAngle:(SDLVehicleDataResult *)steeringWheelAngle { if (steeringWheelAngle != nil) { - [parameters setObject:steeringWheelAngle forKey:NAMES_steeringWheelAngle]; + [parameters setObject:steeringWheelAngle forKey:SDLNameSteeringWheelAngle]; } else { - [parameters removeObjectForKey:NAMES_steeringWheelAngle]; + [parameters removeObjectForKey:SDLNameSteeringWheelAngle]; } } - (SDLVehicleDataResult *)steeringWheelAngle { - NSObject *obj = [parameters objectForKey:NAMES_steeringWheelAngle]; + NSObject *obj = [parameters objectForKey:SDLNameSteeringWheelAngle]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setECallInfo:(SDLVehicleDataResult *)eCallInfo { if (eCallInfo != nil) { - [parameters setObject:eCallInfo forKey:NAMES_eCallInfo]; + [parameters setObject:eCallInfo forKey:SDLNameECallInfo]; } else { - [parameters removeObjectForKey:NAMES_eCallInfo]; + [parameters removeObjectForKey:SDLNameECallInfo]; } } - (SDLVehicleDataResult *)eCallInfo { - NSObject *obj = [parameters objectForKey:NAMES_eCallInfo]; + NSObject *obj = [parameters objectForKey:SDLNameECallInfo]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setAirbagStatus:(SDLVehicleDataResult *)airbagStatus { if (airbagStatus != nil) { - [parameters setObject:airbagStatus forKey:NAMES_airbagStatus]; + [parameters setObject:airbagStatus forKey:SDLNameAirbagStatus]; } else { - [parameters removeObjectForKey:NAMES_airbagStatus]; + [parameters removeObjectForKey:SDLNameAirbagStatus]; } } - (SDLVehicleDataResult *)airbagStatus { - NSObject *obj = [parameters objectForKey:NAMES_airbagStatus]; + NSObject *obj = [parameters objectForKey:SDLNameAirbagStatus]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setEmergencyEvent:(SDLVehicleDataResult *)emergencyEvent { if (emergencyEvent != nil) { - [parameters setObject:emergencyEvent forKey:NAMES_emergencyEvent]; + [parameters setObject:emergencyEvent forKey:SDLNameEmergencyEvent]; } else { - [parameters removeObjectForKey:NAMES_emergencyEvent]; + [parameters removeObjectForKey:SDLNameEmergencyEvent]; } } - (SDLVehicleDataResult *)emergencyEvent { - NSObject *obj = [parameters objectForKey:NAMES_emergencyEvent]; + NSObject *obj = [parameters objectForKey:SDLNameEmergencyEvent]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setClusterModes:(SDLVehicleDataResult *)clusterModes { if (clusterModes != nil) { - [parameters setObject:clusterModes forKey:NAMES_clusterModes]; + [parameters setObject:clusterModes forKey:SDLNameClusterModes]; } else { - [parameters removeObjectForKey:NAMES_clusterModes]; + [parameters removeObjectForKey:SDLNameClusterModes]; } } - (SDLVehicleDataResult *)clusterModes { - NSObject *obj = [parameters objectForKey:NAMES_clusterModes]; + NSObject *obj = [parameters objectForKey:SDLNameClusterModes]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setMyKey:(SDLVehicleDataResult *)myKey { if (myKey != nil) { - [parameters setObject:myKey forKey:NAMES_myKey]; + [parameters setObject:myKey forKey:SDLNameMyKey]; } else { - [parameters removeObjectForKey:NAMES_myKey]; + [parameters removeObjectForKey:SDLNameMyKey]; } } - (SDLVehicleDataResult *)myKey { - NSObject *obj = [parameters objectForKey:NAMES_myKey]; + NSObject *obj = [parameters objectForKey:SDLNameMyKey]; if (obj == nil || [obj isKindOfClass:SDLVehicleDataResult.class]) { return (SDLVehicleDataResult *)obj; } else { - return [[SDLVehicleDataResult alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLVehicleDataResult alloc] initWithDictionary:(NSDictionary *)obj]; } } diff --git a/SmartDeviceLink/SDLUpdateTurnList.h b/SmartDeviceLink/SDLUpdateTurnList.h index d5d9daf6a..a0038e019 100644 --- a/SmartDeviceLink/SDLUpdateTurnList.h +++ b/SmartDeviceLink/SDLUpdateTurnList.h @@ -9,11 +9,7 @@ *<p> * @since SmartDeviceLink 2.0 */ -@interface SDLUpdateTurnList : SDLRPCRequest { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLUpdateTurnList : SDLRPCRequest /** * Optional, SDLTurn, 1 - 100 entries diff --git a/SmartDeviceLink/SDLUpdateTurnList.m b/SmartDeviceLink/SDLUpdateTurnList.m index 7063c9c29..f995264c4 100644 --- a/SmartDeviceLink/SDLUpdateTurnList.m +++ b/SmartDeviceLink/SDLUpdateTurnList.m @@ -11,33 +11,27 @@ @implementation SDLUpdateTurnList - (instancetype)init { - if (self = [super initWithName:NAMES_UpdateTurnList]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameUpdateTurnList]) { } return self; } - (void)setTurnList:(NSMutableArray *)turnList { if (turnList != nil) { - [parameters setObject:turnList forKey:NAMES_turnList]; + [parameters setObject:turnList forKey:SDLNameTurnList]; } else { - [parameters removeObjectForKey:NAMES_turnList]; + [parameters removeObjectForKey:SDLNameTurnList]; } } - (NSMutableArray *)turnList { - NSMutableArray *array = [parameters objectForKey:NAMES_turnList]; + NSMutableArray *array = [parameters objectForKey:SDLNameTurnList]; if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLTurn.class]) { return array; } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; for (NSDictionary *dict in array) { - [newList addObject:[[SDLTurn alloc] initWithDictionary:(NSMutableDictionary *)dict]]; + [newList addObject:[[SDLTurn alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; } @@ -45,20 +39,20 @@ - (void)setSoftButtons:(NSMutableArray *)softButtons { if (softButtons != nil) { - [parameters setObject:softButtons forKey:NAMES_softButtons]; + [parameters setObject:softButtons forKey:SDLNameSoftButtons]; } else { - [parameters removeObjectForKey:NAMES_softButtons]; + [parameters removeObjectForKey:SDLNameSoftButtons]; } } - (NSMutableArray *)softButtons { - NSMutableArray *array = [parameters objectForKey:NAMES_softButtons]; + NSMutableArray *array = [parameters objectForKey:SDLNameSoftButtons]; if ([array count] < 1 || [[array objectAtIndex:0] isKindOfClass:SDLSoftButton.class]) { return array; } else { NSMutableArray *newList = [NSMutableArray arrayWithCapacity:[array count]]; for (NSDictionary *dict in array) { - [newList addObject:[[SDLSoftButton alloc] initWithDictionary:(NSMutableDictionary *)dict]]; + [newList addObject:[[SDLSoftButton alloc] initWithDictionary:(NSDictionary *)dict]]; } return newList; } diff --git a/SmartDeviceLink/SDLUpdateTurnListResponse.h b/SmartDeviceLink/SDLUpdateTurnListResponse.h index c02c912e9..ab2d87231 100644 --- a/SmartDeviceLink/SDLUpdateTurnListResponse.h +++ b/SmartDeviceLink/SDLUpdateTurnListResponse.h @@ -7,10 +7,6 @@ /** SDLUpdateTurnListResponse is sent, when SDLUpdateTurnList has been called. * Since<b>SmartDeviceLink 2.0</b> */ -@interface SDLUpdateTurnListResponse : SDLRPCResponse { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLUpdateTurnListResponse : SDLRPCResponse @end diff --git a/SmartDeviceLink/SDLUpdateTurnListResponse.m b/SmartDeviceLink/SDLUpdateTurnListResponse.m index 18e04082b..681e9c38c 100644 --- a/SmartDeviceLink/SDLUpdateTurnListResponse.m +++ b/SmartDeviceLink/SDLUpdateTurnListResponse.m @@ -9,13 +9,7 @@ @implementation SDLUpdateTurnListResponse - (instancetype)init { - if (self = [super initWithName:NAMES_UpdateTurnList]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { + if (self = [super initWithName:SDLNameUpdateTurnList]) { } return self; } diff --git a/SmartDeviceLink/SDLV1ProtocolMessage.m b/SmartDeviceLink/SDLV1ProtocolMessage.m index 736dd0b13..8083b198f 100644 --- a/SmartDeviceLink/SDLV1ProtocolMessage.m +++ b/SmartDeviceLink/SDLV1ProtocolMessage.m @@ -2,10 +2,9 @@ // #import "SDLV1ProtocolMessage.h" -#import "SDLJsonDecoder.h" +#import "SDLDebugTool.h" #import "SDLProtocolHeader.h" - @implementation SDLV1ProtocolMessage - (instancetype)initWithHeader:(SDLProtocolHeader *)header andPayload:(NSData *)payload { @@ -17,7 +16,17 @@ } - (NSDictionary *)rpcDictionary { - NSDictionary *rpcMessageAsDictionary = [[SDLJsonDecoder instance] decode:self.payload]; + if (self.payload.length == 0) { + return nil; + } + + NSError *error = nil; + NSDictionary * rpcMessageAsDictionary = [NSJSONSerialization JSONObjectWithData:self.payload options:kNilOptions error:&error]; + if (error != nil) { + [SDLDebugTool logInfo:[NSString stringWithFormat:@"Error decoding JSON data: %@", error] withType:SDLDebugType_Protocol]; + return nil; + } + return rpcMessageAsDictionary; } diff --git a/SmartDeviceLink/SDLV2ProtocolMessage.m b/SmartDeviceLink/SDLV2ProtocolMessage.m index 5b033b7f3..c9d17a199 100644 --- a/SmartDeviceLink/SDLV2ProtocolMessage.m +++ b/SmartDeviceLink/SDLV2ProtocolMessage.m @@ -3,8 +3,7 @@ #import "SDLV2ProtocolMessage.h" #import "SDLFunctionID.h" -#import "SDLJsonDecoder.h" -#import "SDLNames.h" +#import "SDLDebugTool.h" #import "SDLProtocolHeader.h" #import "SDLRPCPayload.h" @@ -33,26 +32,29 @@ // Create the inner dictionary with the RPC properties NSMutableDictionary *innerDictionary = [[NSMutableDictionary alloc] init]; - NSString *functionName = [[[SDLFunctionID alloc] init] getFunctionName:rpcPayload.functionID]; - [innerDictionary setObject:functionName forKey:NAMES_operation_name]; - [innerDictionary setObject:[NSNumber numberWithInt:rpcPayload.correlationID] forKey:NAMES_correlationID]; + NSString *functionName = [[SDLFunctionID sharedInstance] functionNameForId:rpcPayload.functionID]; + [innerDictionary setObject:functionName forKey:SDLNameOperationName]; + [innerDictionary setObject:[NSNumber numberWithInt:rpcPayload.correlationID] forKey:SDLNameCorrelationId]; // Get the json data from the struct if (rpcPayload.jsonData) { - NSDictionary *jsonDictionary = [[SDLJsonDecoder instance] decode:rpcPayload.jsonData]; - if (jsonDictionary) { - [innerDictionary setObject:jsonDictionary forKey:NAMES_parameters]; + NSError *error = nil; + NSDictionary * jsonDictionary = [NSJSONSerialization JSONObjectWithData:rpcPayload.jsonData options:kNilOptions error:&error]; + if (error != nil) { + [SDLDebugTool logInfo:[NSString stringWithFormat:@"Error decoding JSON data: %@", error] withType:SDLDebugType_Protocol]; + } else if (jsonDictionary) { + [innerDictionary setObject:jsonDictionary forKey:SDLNameParameters]; } } // Store it in the containing dictionary UInt8 rpcType = rpcPayload.rpcType; - NSArray *rpcTypeNames = @[NAMES_request, NAMES_response, NAMES_notification]; + NSArray *rpcTypeNames = @[SDLNameRequest, SDLNameResponse, SDLNameNotification]; [rpcMessageAsDictionary setObject:innerDictionary forKey:rpcTypeNames[rpcType]]; // The bulk data also goes in the dictionary if (rpcPayload.binaryData) { - [rpcMessageAsDictionary setObject:rpcPayload.binaryData forKey:NAMES_bulkData]; + [rpcMessageAsDictionary setObject:rpcPayload.binaryData forKey:SDLNameBulkData]; } return rpcMessageAsDictionary; diff --git a/SmartDeviceLink/SDLVehicleDataResult.h b/SmartDeviceLink/SDLVehicleDataResult.h index 14e1d81e3..b586542d6 100644 --- a/SmartDeviceLink/SDLVehicleDataResult.h +++ b/SmartDeviceLink/SDLVehicleDataResult.h @@ -6,11 +6,7 @@ #import "SDLVehicleDataType.h" #import "SDLVehicleDataResultCode.h" -@interface SDLVehicleDataResult : SDLRPCStruct { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLVehicleDataResult : SDLRPCStruct @property (strong) SDLVehicleDataType dataType; @property (strong) SDLVehicleDataResultCode resultCode; diff --git a/SmartDeviceLink/SDLVehicleDataResult.m b/SmartDeviceLink/SDLVehicleDataResult.m index b4b2a3608..80d81fc32 100644 --- a/SmartDeviceLink/SDLVehicleDataResult.m +++ b/SmartDeviceLink/SDLVehicleDataResult.m @@ -7,41 +7,29 @@ @implementation SDLVehicleDataResult -- (instancetype)init { - if (self = [super init]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setDataType:(SDLVehicleDataType)dataType { if (dataType != nil) { - [store setObject:dataType forKey:NAMES_dataType]; + [store setObject:dataType forKey:SDLNameDataType]; } else { - [store removeObjectForKey:NAMES_dataType]; + [store removeObjectForKey:SDLNameDataType]; } } - (SDLVehicleDataType)dataType { - NSObject *obj = [store objectForKey:NAMES_dataType]; + NSObject *obj = [store objectForKey:SDLNameDataType]; return (SDLVehicleDataType)obj; } - (void)setResultCode:(SDLVehicleDataResultCode)resultCode { if (resultCode != nil) { - [store setObject:resultCode forKey:NAMES_resultCode]; + [store setObject:resultCode forKey:SDLNameResultCode]; } else { - [store removeObjectForKey:NAMES_resultCode]; + [store removeObjectForKey:SDLNameResultCode]; } } - (SDLVehicleDataResultCode)resultCode { - NSObject *obj = [store objectForKey:NAMES_resultCode]; + NSObject *obj = [store objectForKey:SDLNameResultCode]; return (SDLVehicleDataResultCode)obj; } diff --git a/SmartDeviceLink/SDLVehicleType.h b/SmartDeviceLink/SDLVehicleType.h index 1a934b5eb..aceb40b72 100644 --- a/SmartDeviceLink/SDLVehicleType.h +++ b/SmartDeviceLink/SDLVehicleType.h @@ -9,19 +9,7 @@ * * @since SDL 2.0 */ -@interface SDLVehicleType : SDLRPCStruct { -} - -/** - * @abstract Constructs a newly allocated SDLVehicleType object - */ -- (instancetype)init; - -/** - * @abstract Constructs a newly allocated SDLVehicleType object indicated by the dictionary parameter - * @param dict The dictionary to use - */ -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLVehicleType : SDLRPCStruct /** * @abstract The make of the vehicle diff --git a/SmartDeviceLink/SDLVehicleType.m b/SmartDeviceLink/SDLVehicleType.m index ebee2de7f..aec889c34 100644 --- a/SmartDeviceLink/SDLVehicleType.m +++ b/SmartDeviceLink/SDLVehicleType.m @@ -8,64 +8,52 @@ @implementation SDLVehicleType -- (instancetype)init { - if (self = [super init]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setMake:(NSString *)make { if (make != nil) { - [store setObject:make forKey:NAMES_make]; + [store setObject:make forKey:SDLNameMake]; } else { - [store removeObjectForKey:NAMES_make]; + [store removeObjectForKey:SDLNameMake]; } } - (NSString *)make { - return [store objectForKey:NAMES_make]; + return [store objectForKey:SDLNameMake]; } - (void)setModel:(NSString *)model { if (model != nil) { - [store setObject:model forKey:NAMES_model]; + [store setObject:model forKey:SDLNameModel]; } else { - [store removeObjectForKey:NAMES_model]; + [store removeObjectForKey:SDLNameModel]; } } - (NSString *)model { - return [store objectForKey:NAMES_model]; + return [store objectForKey:SDLNameModel]; } - (void)setModelYear:(NSString *)modelYear { if (modelYear != nil) { - [store setObject:modelYear forKey:NAMES_modelYear]; + [store setObject:modelYear forKey:SDLNameModelYear]; } else { - [store removeObjectForKey:NAMES_modelYear]; + [store removeObjectForKey:SDLNameModelYear]; } } - (NSString *)modelYear { - return [store objectForKey:NAMES_modelYear]; + return [store objectForKey:SDLNameModelYear]; } - (void)setTrim:(NSString *)trim { if (trim != nil) { - [store setObject:trim forKey:NAMES_trim]; + [store setObject:trim forKey:SDLNameTrim]; } else { - [store removeObjectForKey:NAMES_trim]; + [store removeObjectForKey:SDLNameTrim]; } } - (NSString *)trim { - return [store objectForKey:NAMES_trim]; + return [store objectForKey:SDLNameTrim]; } @end diff --git a/SmartDeviceLink/SDLVrHelpItem.h b/SmartDeviceLink/SDLVrHelpItem.h index a46c1301b..de4fb6088 100644 --- a/SmartDeviceLink/SDLVrHelpItem.h +++ b/SmartDeviceLink/SDLVrHelpItem.h @@ -6,11 +6,7 @@ @class SDLImage; -@interface SDLVRHelpItem : SDLRPCStruct { -} - -- (instancetype)init; -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict; +@interface SDLVRHelpItem : SDLRPCStruct @property (strong) NSString *text; @property (strong) SDLImage *image; diff --git a/SmartDeviceLink/SDLVrHelpItem.m b/SmartDeviceLink/SDLVrHelpItem.m index 4ed2c1409..e47067f16 100644 --- a/SmartDeviceLink/SDLVrHelpItem.m +++ b/SmartDeviceLink/SDLVrHelpItem.m @@ -9,57 +9,45 @@ @implementation SDLVRHelpItem -- (instancetype)init { - if (self = [super init]) { - } - return self; -} - -- (instancetype)initWithDictionary:(NSMutableDictionary *)dict { - if (self = [super initWithDictionary:dict]) { - } - return self; -} - - (void)setText:(NSString *)text { if (text != nil) { - [store setObject:text forKey:NAMES_text]; + [store setObject:text forKey:SDLNameText]; } else { - [store removeObjectForKey:NAMES_text]; + [store removeObjectForKey:SDLNameText]; } } - (NSString *)text { - return [store objectForKey:NAMES_text]; + return [store objectForKey:SDLNameText]; } - (void)setImage:(SDLImage *)image { if (image != nil) { - [store setObject:image forKey:NAMES_image]; + [store setObject:image forKey:SDLNameImage]; } else { - [store removeObjectForKey:NAMES_image]; + [store removeObjectForKey:SDLNameImage]; } } - (SDLImage *)image { - NSObject *obj = [store objectForKey:NAMES_image]; + NSObject *obj = [store objectForKey:SDLNameImage]; if (obj == nil || [obj isKindOfClass:SDLImage.class]) { return (SDLImage *)obj; } else { - return [[SDLImage alloc] initWithDictionary:(NSMutableDictionary *)obj]; + return [[SDLImage alloc] initWithDictionary:(NSDictionary *)obj]; } } - (void)setPosition:(NSNumber *)position { if (position != nil) { - [store setObject:position forKey:NAMES_position]; + [store setObject:position forKey:SDLNamePosition]; } else { - [store removeObjectForKey:NAMES_position]; + [store removeObjectForKey:SDLNamePosition]; } } - (NSNumber *)position { - return [store objectForKey:NAMES_position]; + return [store objectForKey:SDLNamePosition]; } @end diff --git a/SmartDeviceLink/SDLWiperStatus.m b/SmartDeviceLink/SDLWiperStatus.m index 9b4e20e9f..8f62e0563 100644 --- a/SmartDeviceLink/SDLWiperStatus.m +++ b/SmartDeviceLink/SDLWiperStatus.m @@ -7,8 +7,8 @@ SDLWiperStatus const SDLWiperStatusOff = @"OFF"; SDLWiperStatus const SDLWiperStatusAutomaticOff = @"AUTO_OFF"; SDLWiperStatus const SDLWiperStatusOffMoving = @"OFF_MOVING"; -SDLWiperStatus const SDLWiperStatusManualualIntervalOff = @"MAN_INT_OFF"; -SDLWiperStatus const SDLWiperStatusManualualIntervalOn = @"MAN_INT_ON"; +SDLWiperStatus const SDLWiperStatusManualIntervalOff = @"MAN_INT_OFF"; +SDLWiperStatus const SDLWiperStatusManualIntervalOn = @"MAN_INT_ON"; SDLWiperStatus const SDLWiperStatusManualLow = @"MAN_LOW"; SDLWiperStatus const SDLWiperStatusManualHigh = @"MAN_HIGH"; SDLWiperStatus const SDLWiperStatusManualFlick = @"MAN_FLICK"; diff --git a/SmartDeviceLink/SmartDeviceLink.h b/SmartDeviceLink/SmartDeviceLink.h index 946374804..9706c090b 100644 --- a/SmartDeviceLink/SmartDeviceLink.h +++ b/SmartDeviceLink/SmartDeviceLink.h @@ -23,7 +23,6 @@ FOUNDATION_EXPORT const unsigned char SmartDeviceLinkVersionString[]; #import "SDLConsoleController.h" #import "SDLDebugTool.h" #import "SDLDebugToolConsole.h" -#import "SDLSiphonServer.h" /***** Transport *****/ #import "SDLAbstractTransport.h" diff --git a/SmartDeviceLink/iOS 7 Assets/lock_arrow_down/black/lock_arrow_down_black.png b/SmartDeviceLink/iOS 7 Assets/lock_arrow_down/black/lock_arrow_down_black.png Binary files differnew file mode 100644 index 000000000..68f1c3ca7 --- /dev/null +++ b/SmartDeviceLink/iOS 7 Assets/lock_arrow_down/black/lock_arrow_down_black.png diff --git a/SmartDeviceLink/iOS 7 Assets/lock_arrow_down/black/lock_arrow_down_black@2x.png b/SmartDeviceLink/iOS 7 Assets/lock_arrow_down/black/lock_arrow_down_black@2x.png Binary files differnew file mode 100644 index 000000000..85fbc3446 --- /dev/null +++ b/SmartDeviceLink/iOS 7 Assets/lock_arrow_down/black/lock_arrow_down_black@2x.png diff --git a/SmartDeviceLink/iOS 7 Assets/lock_arrow_down/black/lock_arrow_down_black@3x.png b/SmartDeviceLink/iOS 7 Assets/lock_arrow_down/black/lock_arrow_down_black@3x.png Binary files differnew file mode 100644 index 000000000..af14aa8bb --- /dev/null +++ b/SmartDeviceLink/iOS 7 Assets/lock_arrow_down/black/lock_arrow_down_black@3x.png diff --git a/SmartDeviceLink/iOS 7 Assets/lock_arrow_down/white/lock_arrow_down_white.png b/SmartDeviceLink/iOS 7 Assets/lock_arrow_down/white/lock_arrow_down_white.png Binary files differnew file mode 100644 index 000000000..07e620d05 --- /dev/null +++ b/SmartDeviceLink/iOS 7 Assets/lock_arrow_down/white/lock_arrow_down_white.png diff --git a/SmartDeviceLink/iOS 7 Assets/lock_arrow_down/white/lock_arrow_down_white@2x.png b/SmartDeviceLink/iOS 7 Assets/lock_arrow_down/white/lock_arrow_down_white@2x.png Binary files differnew file mode 100644 index 000000000..57fa8120f --- /dev/null +++ b/SmartDeviceLink/iOS 7 Assets/lock_arrow_down/white/lock_arrow_down_white@2x.png diff --git a/SmartDeviceLink/iOS 7 Assets/lock_arrow_down/white/lock_arrow_down_white@3x.png b/SmartDeviceLink/iOS 7 Assets/lock_arrow_down/white/lock_arrow_down_white@3x.png Binary files differnew file mode 100644 index 000000000..b354c1a13 --- /dev/null +++ b/SmartDeviceLink/iOS 7 Assets/lock_arrow_down/white/lock_arrow_down_white@3x.png diff --git a/SmartDeviceLink/iOS 7 Assets/lock_arrow_up/black/lock_arrow_up_black.png b/SmartDeviceLink/iOS 7 Assets/lock_arrow_up/black/lock_arrow_up_black.png Binary files differnew file mode 100644 index 000000000..ecc048331 --- /dev/null +++ b/SmartDeviceLink/iOS 7 Assets/lock_arrow_up/black/lock_arrow_up_black.png diff --git a/SmartDeviceLink/iOS 7 Assets/lock_arrow_up/black/lock_arrow_up_black@2x.png b/SmartDeviceLink/iOS 7 Assets/lock_arrow_up/black/lock_arrow_up_black@2x.png Binary files differnew file mode 100644 index 000000000..fa38a0772 --- /dev/null +++ b/SmartDeviceLink/iOS 7 Assets/lock_arrow_up/black/lock_arrow_up_black@2x.png diff --git a/SmartDeviceLink/iOS 7 Assets/lock_arrow_up/black/lock_arrow_up_black@3x.png b/SmartDeviceLink/iOS 7 Assets/lock_arrow_up/black/lock_arrow_up_black@3x.png Binary files differnew file mode 100644 index 000000000..b59bda372 --- /dev/null +++ b/SmartDeviceLink/iOS 7 Assets/lock_arrow_up/black/lock_arrow_up_black@3x.png diff --git a/SmartDeviceLink/iOS 7 Assets/lock_arrow_up/white/lock_arrow_up_white.png b/SmartDeviceLink/iOS 7 Assets/lock_arrow_up/white/lock_arrow_up_white.png Binary files differnew file mode 100644 index 000000000..bb0662fe5 --- /dev/null +++ b/SmartDeviceLink/iOS 7 Assets/lock_arrow_up/white/lock_arrow_up_white.png diff --git a/SmartDeviceLink/iOS 7 Assets/lock_arrow_up/white/lock_arrow_up_white@2x.png b/SmartDeviceLink/iOS 7 Assets/lock_arrow_up/white/lock_arrow_up_white@2x.png Binary files differnew file mode 100644 index 000000000..f45e6b299 --- /dev/null +++ b/SmartDeviceLink/iOS 7 Assets/lock_arrow_up/white/lock_arrow_up_white@2x.png diff --git a/SmartDeviceLink/iOS 7 Assets/lock_arrow_up/white/lock_arrow_up_white@3x.png b/SmartDeviceLink/iOS 7 Assets/lock_arrow_up/white/lock_arrow_up_white@3x.png Binary files differnew file mode 100644 index 000000000..d30fc404c --- /dev/null +++ b/SmartDeviceLink/iOS 7 Assets/lock_arrow_up/white/lock_arrow_up_white@3x.png diff --git a/SmartDeviceLink/iOS 7 Assets/sdl_logo/black/sdl_logo_black.png b/SmartDeviceLink/iOS 7 Assets/sdl_logo/black/sdl_logo_black.png Binary files differnew file mode 100644 index 000000000..68cf3a52d --- /dev/null +++ b/SmartDeviceLink/iOS 7 Assets/sdl_logo/black/sdl_logo_black.png diff --git a/SmartDeviceLink/iOS 7 Assets/sdl_logo/black/sdl_logo_black@2x.png b/SmartDeviceLink/iOS 7 Assets/sdl_logo/black/sdl_logo_black@2x.png Binary files differnew file mode 100644 index 000000000..1427721a7 --- /dev/null +++ b/SmartDeviceLink/iOS 7 Assets/sdl_logo/black/sdl_logo_black@2x.png diff --git a/SmartDeviceLink/iOS 7 Assets/sdl_logo/black/sdl_logo_black@3x.png b/SmartDeviceLink/iOS 7 Assets/sdl_logo/black/sdl_logo_black@3x.png Binary files differnew file mode 100644 index 000000000..dfe0ab3f8 --- /dev/null +++ b/SmartDeviceLink/iOS 7 Assets/sdl_logo/black/sdl_logo_black@3x.png diff --git a/SmartDeviceLink/iOS 7 Assets/sdl_logo/white/sdl_logo_white.png b/SmartDeviceLink/iOS 7 Assets/sdl_logo/white/sdl_logo_white.png Binary files differnew file mode 100644 index 000000000..1c35ef9b3 --- /dev/null +++ b/SmartDeviceLink/iOS 7 Assets/sdl_logo/white/sdl_logo_white.png diff --git a/SmartDeviceLink/iOS 7 Assets/sdl_logo/white/sdl_logo_white@2x.png b/SmartDeviceLink/iOS 7 Assets/sdl_logo/white/sdl_logo_white@2x.png Binary files differnew file mode 100644 index 000000000..b7d0bd92a --- /dev/null +++ b/SmartDeviceLink/iOS 7 Assets/sdl_logo/white/sdl_logo_white@2x.png diff --git a/SmartDeviceLink/iOS 7 Assets/sdl_logo/white/sdl_logo_white@3x.png b/SmartDeviceLink/iOS 7 Assets/sdl_logo/white/sdl_logo_white@3x.png Binary files differnew file mode 100644 index 000000000..b8b9ef757 --- /dev/null +++ b/SmartDeviceLink/iOS 7 Assets/sdl_logo/white/sdl_logo_white@3x.png diff --git a/SmartDeviceLinkTests/DevAPISpecs/SDLArtworkSpec.m b/SmartDeviceLinkTests/DevAPISpecs/SDLArtworkSpec.m index c7e3d2399..16ffa8b2a 100644 --- a/SmartDeviceLinkTests/DevAPISpecs/SDLArtworkSpec.m +++ b/SmartDeviceLinkTests/DevAPISpecs/SDLArtworkSpec.m @@ -32,7 +32,7 @@ describe(@"SDLArtwork", ^{ }); it(@"should correctly store format", ^{ - expect(testArtwork.fileType).to(equal(SDLFileTypeGraphicPng)); + expect(testArtwork.fileType).to(equal(SDLFileTypeGraphicPNG)); }); it(@"should correctly store persistence", ^{ @@ -62,7 +62,7 @@ describe(@"SDLArtwork", ^{ }); it(@"should correctly store format", ^{ - expect(testArtwork.fileType).to(equal(SDLFileTypeGraphicJpeg)); + expect(testArtwork.fileType).to(equal(SDLFileTypeGraphicJPEG)); }); it(@"should correctly store persistence", ^{ diff --git a/SmartDeviceLinkTests/DevAPISpecs/SDLFileSpec.m b/SmartDeviceLinkTests/DevAPISpecs/SDLFileSpec.m index 9bed8c4c4..cb50dba36 100644 --- a/SmartDeviceLinkTests/DevAPISpecs/SDLFileSpec.m +++ b/SmartDeviceLinkTests/DevAPISpecs/SDLFileSpec.m @@ -40,7 +40,7 @@ describe(@"SDLFile", ^{ }); it(@"should correctly store file type", ^{ - expect(testFile.fileType).to(equal(SDLFileTypeAudioMp3)); + expect(testFile.fileType).to(equal(SDLFileTypeAudioMP3)); }); it(@"should correctly start as non-overwrite", ^{ @@ -86,7 +86,7 @@ describe(@"SDLFile", ^{ }); it(@"should correctly store file type", ^{ - expect(testFile.fileType).to(equal(SDLFileTypeGraphicJpeg)); + expect(testFile.fileType).to(equal(SDLFileTypeGraphicJPEG)); }); it(@"should correctly store persistence", ^{ @@ -116,7 +116,7 @@ describe(@"SDLFile", ^{ }); it(@"should correctly store file type", ^{ - expect(testFile.fileType).to(equal(SDLFileTypeGraphicJpeg)); + expect(testFile.fileType).to(equal(SDLFileTypeGraphicJPEG)); }); it(@"should correctly store persistence", ^{ @@ -140,7 +140,7 @@ describe(@"SDLFile", ^{ }); it(@"should properly interpret file type", ^{ - expect(testFile.fileType).to(equal(SDLFileTypeGraphicJpeg)); + expect(testFile.fileType).to(equal(SDLFileTypeGraphicJPEG)); }); }); @@ -154,7 +154,7 @@ describe(@"SDLFile", ^{ }); it(@"should properly interpret file type", ^{ - expect(testFile.fileType).to(equal(SDLFileTypeGraphicJpeg)); + expect(testFile.fileType).to(equal(SDLFileTypeGraphicJPEG)); }); }); @@ -168,7 +168,7 @@ describe(@"SDLFile", ^{ }); it(@"should properly interpret file type", ^{ - expect(testFile.fileType).to(equal(SDLFileTypeGraphicPng)); + expect(testFile.fileType).to(equal(SDLFileTypeGraphicPNG)); }); }); @@ -182,7 +182,7 @@ describe(@"SDLFile", ^{ }); it(@"should properly interpret file type", ^{ - expect(testFile.fileType).to(equal(SDLFileTypeGraphicBmp)); + expect(testFile.fileType).to(equal(SDLFileTypeGraphicBMP)); }); }); @@ -196,7 +196,7 @@ describe(@"SDLFile", ^{ }); it(@"should properly interpret file type", ^{ - expect(testFile.fileType).to(equal(SDLFileTypeJson)); + expect(testFile.fileType).to(equal(SDLFileTypeJSON)); }); }); diff --git a/SmartDeviceLinkTests/ProtocolSpecs/MessageSpecs/SDLProtocolSpec.m b/SmartDeviceLinkTests/ProtocolSpecs/MessageSpecs/SDLProtocolSpec.m index 10efc2554..f95d26b78 100644 --- a/SmartDeviceLinkTests/ProtocolSpecs/MessageSpecs/SDLProtocolSpec.m +++ b/SmartDeviceLinkTests/ProtocolSpecs/MessageSpecs/SDLProtocolSpec.m @@ -25,12 +25,12 @@ QuickSpecBegin(SDLProtocolSpec) //Test dictionaries -NSDictionary* dictionaryV1 = @{NAMES_request: - @{NAMES_operation_name:@"DeleteCommand", - NAMES_correlationID:@0x98765, - NAMES_parameters: - @{NAMES_cmdID:@55}}}; -NSDictionary* dictionaryV2 = @{NAMES_cmdID:@55}; +NSDictionary* dictionaryV1 = @{SDLNameRequest: + @{SDLNameOperationName:@"DeleteCommand", + SDLNameCorrelationId:@0x98765, + SDLNameParameters: + @{SDLNameCommandId:@55}}}; +NSDictionary* dictionaryV2 = @{SDLNameCommandId:@55}; describe(@"Send StartService Tests", ^ { context(@"Unsecure", ^{ diff --git a/SmartDeviceLinkTests/ProtocolSpecs/MessageSpecs/SDLV2ProtocolMessageSpec.m b/SmartDeviceLinkTests/ProtocolSpecs/MessageSpecs/SDLV2ProtocolMessageSpec.m index facf8fcdc..8722dea1e 100644 --- a/SmartDeviceLinkTests/ProtocolSpecs/MessageSpecs/SDLV2ProtocolMessageSpec.m +++ b/SmartDeviceLinkTests/ProtocolSpecs/MessageSpecs/SDLV2ProtocolMessageSpec.m @@ -46,11 +46,11 @@ describe(@"RPCDictionary Tests", ^ { SDLV2ProtocolMessage* testMessage = [[SDLV2ProtocolMessage alloc] initWithHeader:testHeader andPayload:[[NSMutableData alloc] initWithCapacity:0]]; - expect([testMessage rpcDictionary]).to(equal(@{NAMES_request: - @{NAMES_operation_name:NAMES_Slider, - NAMES_correlationID:@99, - NAMES_parameters:dictionary}, - NAMES_bulkData:[NSData dataWithBytes:"Database" length:strlen("Database")]})); + expect([testMessage rpcDictionary]).to(equal(@{SDLNameRequest: + @{SDLNameOperationName:SDLNameSlider, + SDLNameCorrelationId:@99, + SDLNameParameters:dictionary}, + SDLNameBulkData:[NSData dataWithBytes:"Database" length:strlen("Database")]})); }); }); diff --git a/SmartDeviceLinkTests/ProtocolSpecs/SDLFunctionIDSpec.m b/SmartDeviceLinkTests/ProtocolSpecs/SDLFunctionIDSpec.m index eff1ae3b2..724b0dc7e 100644 --- a/SmartDeviceLinkTests/ProtocolSpecs/SDLFunctionIDSpec.m +++ b/SmartDeviceLinkTests/ProtocolSpecs/SDLFunctionIDSpec.m @@ -13,139 +13,139 @@ QuickSpecBegin(SDLFunctionIDSpec) -SDLFunctionID* functionID = [[SDLFunctionID alloc] init]; +SDLFunctionID* functionID = [SDLFunctionID sharedInstance]; describe(@"GetFunctionName Tests", ^ { it(@"Should return the correct function name", ^ { - expect([functionID getFunctionName:1]).to(equal(NAMES_RegisterAppInterface)); - expect([functionID getFunctionName:2]).to(equal(NAMES_UnregisterAppInterface)); - expect([functionID getFunctionName:3]).to(equal(NAMES_SetGlobalProperties)); - expect([functionID getFunctionName:4]).to(equal(NAMES_ResetGlobalProperties)); - expect([functionID getFunctionName:5]).to(equal(NAMES_AddCommand)); - expect([functionID getFunctionName:6]).to(equal(NAMES_DeleteCommand)); - expect([functionID getFunctionName:7]).to(equal(NAMES_AddSubMenu)); - expect([functionID getFunctionName:8]).to(equal(NAMES_DeleteSubMenu)); - expect([functionID getFunctionName:9]).to(equal(NAMES_CreateInteractionChoiceSet)); - expect([functionID getFunctionName:10]).to(equal(NAMES_PerformInteraction)); - expect([functionID getFunctionName:11]).to(equal(NAMES_DeleteInteractionChoiceSet)); - expect([functionID getFunctionName:12]).to(equal(NAMES_Alert)); - expect([functionID getFunctionName:13]).to(equal(NAMES_Show)); - expect([functionID getFunctionName:14]).to(equal(NAMES_Speak)); - expect([functionID getFunctionName:15]).to(equal(NAMES_SetMediaClockTimer)); - expect([functionID getFunctionName:16]).to(equal(NAMES_PerformAudioPassThru)); - expect([functionID getFunctionName:17]).to(equal(NAMES_EndAudioPassThru)); - expect([functionID getFunctionName:18]).to(equal(NAMES_SubscribeButton)); - expect([functionID getFunctionName:19]).to(equal(NAMES_UnsubscribeButton)); - expect([functionID getFunctionName:20]).to(equal(NAMES_SubscribeVehicleData)); - expect([functionID getFunctionName:21]).to(equal(NAMES_UnsubscribeVehicleData)); - expect([functionID getFunctionName:22]).to(equal(NAMES_GetVehicleData)); - expect([functionID getFunctionName:23]).to(equal(NAMES_ReadDID)); - expect([functionID getFunctionName:24]).to(equal(NAMES_GetDTCs)); - expect([functionID getFunctionName:25]).to(equal(NAMES_ScrollableMessage)); - expect([functionID getFunctionName:26]).to(equal(NAMES_Slider)); - expect([functionID getFunctionName:27]).to(equal(NAMES_ShowConstantTBT)); - expect([functionID getFunctionName:28]).to(equal(NAMES_AlertManeuver)); - expect([functionID getFunctionName:29]).to(equal(NAMES_UpdateTurnList)); - expect([functionID getFunctionName:30]).to(equal(NAMES_ChangeRegistration)); - expect([functionID getFunctionName:31]).to(equal(NAMES_GenericResponse)); - expect([functionID getFunctionName:32]).to(equal(NAMES_PutFile)); - expect([functionID getFunctionName:33]).to(equal(NAMES_DeleteFile)); - expect([functionID getFunctionName:34]).to(equal(NAMES_ListFiles)); - expect([functionID getFunctionName:35]).to(equal(NAMES_SetAppIcon)); - expect([functionID getFunctionName:36]).to(equal(NAMES_SetDisplayLayout)); - expect([functionID getFunctionName:37]).to(equal(NAMES_DiagnosticMessage)); - expect([functionID getFunctionName:38]).to(equal(NAMES_SystemRequest)); - expect([functionID getFunctionName:39]).to(equal(NAMES_SendLocation)); - expect([functionID getFunctionName:40]).to(equal(NAMES_DialNumber)); - expect([functionID getFunctionName:32768]).to(equal(NAMES_OnHMIStatus)); - expect([functionID getFunctionName:32769]).to(equal(NAMES_OnAppInterfaceUnregistered)); - expect([functionID getFunctionName:32770]).to(equal(NAMES_OnButtonEvent)); - expect([functionID getFunctionName:32771]).to(equal(NAMES_OnButtonPress)); - expect([functionID getFunctionName:32772]).to(equal(NAMES_OnVehicleData)); - expect([functionID getFunctionName:32773]).to(equal(NAMES_OnCommand)); - expect([functionID getFunctionName:32774]).to(equal(NAMES_OnTBTClientState)); - expect([functionID getFunctionName:32775]).to(equal(NAMES_OnDriverDistraction)); - expect([functionID getFunctionName:32776]).to(equal(NAMES_OnPermissionsChange)); - expect([functionID getFunctionName:32777]).to(equal(NAMES_OnAudioPassThru)); - expect([functionID getFunctionName:32778]).to(equal(NAMES_OnLanguageChange)); - expect([functionID getFunctionName:32779]).to(equal(NAMES_OnKeyboardInput)); - expect([functionID getFunctionName:32780]).to(equal(NAMES_OnTouchEvent)); - expect([functionID getFunctionName:32781]).to(equal(NAMES_OnSystemRequest)); - expect([functionID getFunctionName:32782]).to(equal(NAMES_OnHashChange)); + 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: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)); //Not listed in Spec - expect([functionID getFunctionName:65536]).to(equal(NAMES_EncodedSyncPData)); - expect([functionID getFunctionName:65537]).to(equal(NAMES_SyncPData)); + expect([functionID functionNameForId:65536]).to(equal(SDLNameEncodedSyncPData)); + expect([functionID functionNameForId:65537]).to(equal(SDLNameSyncPData)); - expect([functionID getFunctionName:98304]).to(equal(NAMES_OnEncodedSyncPData)); - expect([functionID getFunctionName:98305]).to(equal(NAMES_OnSyncPData)); + expect([functionID functionNameForId:98304]).to(equal(SDLNameOnEncodedSyncPData)); + expect([functionID functionNameForId:98305]).to(equal(SDLNameOnSyncPData)); }); }); describe(@"GetFunctionID Tests", ^ { it(@"Should return the correct function ID", ^ { - expect([functionID getFunctionID:NAMES_RegisterAppInterface]).to(equal(@1)); - expect([functionID getFunctionID:NAMES_UnregisterAppInterface]).to(equal(@2)); - expect([functionID getFunctionID:NAMES_SetGlobalProperties]).to(equal(@3)); - expect([functionID getFunctionID:NAMES_ResetGlobalProperties]).to(equal(@4)); - expect([functionID getFunctionID:NAMES_AddCommand]).to(equal(@5)); - expect([functionID getFunctionID:NAMES_DeleteCommand]).to(equal(@6)); - expect([functionID getFunctionID:NAMES_AddSubMenu]).to(equal(@7)); - expect([functionID getFunctionID:NAMES_DeleteSubMenu]).to(equal(@8)); - expect([functionID getFunctionID:NAMES_CreateInteractionChoiceSet]).to(equal(@9)); - expect([functionID getFunctionID:NAMES_PerformInteraction]).to(equal(@10)); - expect([functionID getFunctionID:NAMES_DeleteInteractionChoiceSet]).to(equal(@11)); - expect([functionID getFunctionID:NAMES_Alert]).to(equal(@12)); - expect([functionID getFunctionID:NAMES_Show]).to(equal(@13)); - expect([functionID getFunctionID:NAMES_Speak]).to(equal(@14)); - expect([functionID getFunctionID:NAMES_SetMediaClockTimer]).to(equal(@15)); - expect([functionID getFunctionID:NAMES_PerformAudioPassThru]).to(equal(@16)); - expect([functionID getFunctionID:NAMES_EndAudioPassThru]).to(equal(@17)); - expect([functionID getFunctionID:NAMES_SubscribeButton]).to(equal(@18)); - expect([functionID getFunctionID:NAMES_UnsubscribeButton]).to(equal(@19)); - expect([functionID getFunctionID:NAMES_SubscribeVehicleData]).to(equal(@20)); - expect([functionID getFunctionID:NAMES_UnsubscribeVehicleData]).to(equal(@21)); - expect([functionID getFunctionID:NAMES_GetVehicleData]).to(equal(@22)); - expect([functionID getFunctionID:NAMES_ReadDID]).to(equal(@23)); - expect([functionID getFunctionID:NAMES_GetDTCs]).to(equal(@24)); - expect([functionID getFunctionID:NAMES_ScrollableMessage]).to(equal(@25)); - expect([functionID getFunctionID:NAMES_Slider]).to(equal(@26)); - expect([functionID getFunctionID:NAMES_ShowConstantTBT]).to(equal(@27)); - expect([functionID getFunctionID:NAMES_AlertManeuver]).to(equal(@28)); - expect([functionID getFunctionID:NAMES_UpdateTurnList]).to(equal(@29)); - expect([functionID getFunctionID:NAMES_ChangeRegistration]).to(equal(@30)); - expect([functionID getFunctionID:NAMES_GenericResponse]).to(equal(@31)); - expect([functionID getFunctionID:NAMES_PutFile]).to(equal(@32)); - expect([functionID getFunctionID:NAMES_DeleteFile]).to(equal(@33)); - expect([functionID getFunctionID:NAMES_ListFiles]).to(equal(@34)); - expect([functionID getFunctionID:NAMES_SetAppIcon]).to(equal(@35)); - expect([functionID getFunctionID:NAMES_SetDisplayLayout]).to(equal(@36)); - expect([functionID getFunctionID:NAMES_DiagnosticMessage]).to(equal(@37)); - expect([functionID getFunctionID:NAMES_SystemRequest]).to(equal(@38)); - expect([functionID getFunctionID:NAMES_SendLocation]).to(equal(@39)); - expect([functionID getFunctionID:NAMES_DialNumber]).to(equal(@40)); - expect([functionID getFunctionID:NAMES_OnHMIStatus]).to(equal(@32768)); - expect([functionID getFunctionID:NAMES_OnAppInterfaceUnregistered]).to(equal(@32769)); - expect([functionID getFunctionID:NAMES_OnButtonEvent]).to(equal(@32770)); - expect([functionID getFunctionID:NAMES_OnButtonPress]).to(equal(@32771)); - expect([functionID getFunctionID:NAMES_OnVehicleData]).to(equal(@32772)); - expect([functionID getFunctionID:NAMES_OnCommand]).to(equal(@32773)); - expect([functionID getFunctionID:NAMES_OnTBTClientState]).to(equal(@32774)); - expect([functionID getFunctionID:NAMES_OnDriverDistraction]).to(equal(@32775)); - expect([functionID getFunctionID:NAMES_OnPermissionsChange]).to(equal(@32776)); - expect([functionID getFunctionID:NAMES_OnAudioPassThru]).to(equal(@32777)); - expect([functionID getFunctionID:NAMES_OnLanguageChange]).to(equal(@32778)); - expect([functionID getFunctionID:NAMES_OnKeyboardInput]).to(equal(@32779)); - expect([functionID getFunctionID:NAMES_OnTouchEvent]).to(equal(@32780)); - expect([functionID getFunctionID:NAMES_OnSystemRequest]).to(equal(@32781)); - expect([functionID getFunctionID:NAMES_OnHashChange]).to(equal(@32782)); + 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: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)); //Not listed in Spec - expect([functionID getFunctionID:NAMES_EncodedSyncPData]).to(equal(@65536)); - expect([functionID getFunctionID:NAMES_SyncPData]).to(equal(@65537)); + expect([functionID functionIdForName:SDLNameEncodedSyncPData]).to(equal(@65536)); + expect([functionID functionIdForName:SDLNameSyncPData]).to(equal(@65537)); - expect([functionID getFunctionID:NAMES_OnEncodedSyncPData]).to(equal(@98304)); - expect([functionID getFunctionID:NAMES_OnSyncPData]).to(equal(@98305)); + expect([functionID functionIdForName:SDLNameOnEncodedSyncPData]).to(equal(@98304)); + expect([functionID functionIdForName:SDLNameOnSyncPData]).to(equal(@98305)); }); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLAppInterfaceUnregisteredReasonSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLAppInterfaceUnregisteredReasonSpec.m index 3f67655a3..f26e01fdd 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLAppInterfaceUnregisteredReasonSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLAppInterfaceUnregisteredReasonSpec.m @@ -19,8 +19,8 @@ describe(@"Individual Enum Value Tests", ^ { //expect(SDLAppInterfaceUnregisteredReason USER_EXIT).to(equal(@"USER_EXIT")); expect(SDLAppInterfaceUnregisteredReasonIgnitionOff).to(equal(@"IGNITION_OFF")); expect(SDLAppInterfaceUnregisteredReasonBluetoothOff).to(equal(@"BLUETOOTH_OFF")); - expect(SDLAppInterfaceUnregisteredReasonUsbDisconnected).to(equal(@"USB_DISCONNECTED")); - expect(SDLAppInterfaceUnregisteredReasonRequestWhileInNoneHmiLevel).to(equal(@"REQUEST_WHILE_IN_NONE_HMI_LEVEL")); + expect(SDLAppInterfaceUnregisteredReasonUSBDisconnected).to(equal(@"USB_DISCONNECTED")); + expect(SDLAppInterfaceUnregisteredReasonRequestWhileInNoneHMILevel).to(equal(@"REQUEST_WHILE_IN_NONE_HMI_LEVEL")); expect(SDLAppInterfaceUnregisteredReasonTooManyRequests).to(equal(@"TOO_MANY_REQUESTS")); expect(SDLAppInterfaceUnregisteredReasonDriverDistractionViolation).to(equal(@"DRIVER_DISTRACTION_VIOLATION")); expect(SDLAppInterfaceUnregisteredReasonLanguageChange).to(equal(@"LANGUAGE_CHANGE")); diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLAudioTypeSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLAudioTypeSpec.m index b75ce9480..1b3b1069f 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLAudioTypeSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLAudioTypeSpec.m @@ -14,7 +14,7 @@ QuickSpecBegin(SDLAudioTypeSpec) describe(@"Individual Enum Value Tests", ^ { it(@"Should match internal values", ^ { - expect(SDLAudioTypePcm).to(equal(@"PCM")); + expect(SDLAudioTypePCM).to(equal(@"PCM")); }); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLCharacterSetSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLCharacterSetSpec.m index 384e8eede..219c44437 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLCharacterSetSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLCharacterSetSpec.m @@ -16,8 +16,8 @@ describe(@"Individual Enum Value Tests", ^ { it(@"Should match internal values", ^ { expect(SDLCharacterSetType2Set).to(equal(@"TYPE2SET")); expect(SDLCharacterSetType5Set).to(equal(@"TYPE5SET")); - expect(SDLCharacterSetCid1Set).to(equal(@"CID1SET")); - expect(SDLCharacterSetCid2Set).to(equal(@"CID2SET")); + expect(SDLCharacterSetCID1Set).to(equal(@"CID1SET")); + expect(SDLCharacterSetCID2Set).to(equal(@"CID2SET")); }); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLDeviceLevelStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLDeviceLevelStatusSpec.m index 318a086a3..09e010fd7 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLDeviceLevelStatusSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLDeviceLevelStatusSpec.m @@ -14,11 +14,11 @@ QuickSpecBegin(SDLDeviceLevelStatusSpec) describe(@"Individual Enum Value Tests", ^ { it(@"Should match internal values", ^ { - expect(SDLDeviceLevelStatusZeroLevelBars).to(equal(@"ZERO_LEVEL_BARS")); - expect(SDLDeviceLevelStatusOneLevelBars).to(equal(@"ONE_LEVEL_BARS")); - expect(SDLDeviceLevelStatusTwoLevelBars).to(equal(@"TWO_LEVEL_BARS")); - expect(SDLDeviceLevelStatusThreeLevelBars).to(equal(@"THREE_LEVEL_BARS")); - expect(SDLDeviceLevelStatusFourLevelBars).to(equal(@"FOUR_LEVEL_BARS")); + expect(SDLDeviceLevelStatusZeroBars).to(equal(@"ZERO_LEVEL_BARS")); + expect(SDLDeviceLevelStatusOneBar).to(equal(@"ONE_LEVEL_BARS")); + expect(SDLDeviceLevelStatusTwoBars).to(equal(@"TWO_LEVEL_BARS")); + expect(SDLDeviceLevelStatusThreeBars).to(equal(@"THREE_LEVEL_BARS")); + expect(SDLDeviceLevelStatusFourBars).to(equal(@"FOUR_LEVEL_BARS")); expect(SDLDeviceLevelStatusNotProvided).to(equal(@"NOT_PROVIDED")); }); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLDimensionSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLDimensionSpec.m index fe525d5c6..42e774e23 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLDimensionSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLDimensionSpec.m @@ -15,8 +15,8 @@ QuickSpecBegin(SDLDimensionSpec) describe(@"Individual Enum Value Tests", ^ { it(@"Should match internal values", ^ { expect(SDLDimensionNoFix).to(equal(@"NO_FIX")); - expect(SDLDimension2d).to(equal(@"2D")); - expect(SDLDimension3d).to(equal(@"3D")); + expect(SDLDimension2D).to(equal(@"2D")); + expect(SDLDimension3D).to(equal(@"3D")); }); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLDisplayTypeSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLDisplayTypeSpec.m index ac70e2bfe..41a5f30bb 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLDisplayTypeSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLDisplayTypeSpec.m @@ -14,15 +14,15 @@ QuickSpecBegin(SDLDisplayTypeSpec) describe(@"Individual Enum Value Tests", ^ { it(@"Should match internal values", ^ { - expect(SDLDisplayTypeCid).to(equal(@"CID")); + expect(SDLDisplayTypeCID).to(equal(@"CID")); expect(SDLDisplayTypeType2).to(equal(@"TYPE2")); expect(SDLDisplayTypeType5).to(equal(@"TYPE5")); - expect(SDLDisplayTypeNgn).to(equal(@"NGN")); - expect(SDLDisplayTypeGen26Dma).to(equal(@"GEN2_6_DMA")); - expect(SDLDisplayTypeGen28Dma).to(equal(@"GEN2_8_DMA")); - expect(SDLDisplayTypeMfd3).to(equal(@"MFD3")); - expect(SDLDisplayTypeMfd4).to(equal(@"MFD4")); - expect(SDLDisplayTypeMfd5).to(equal(@"MFD5")); + expect(SDLDisplayTypeNGN).to(equal(@"NGN")); + expect(SDLDisplayTypeGen26DMA).to(equal(@"GEN2_6_DMA")); + expect(SDLDisplayTypeGen28DMA).to(equal(@"GEN2_8_DMA")); + expect(SDLDisplayTypeMFD3).to(equal(@"MFD3")); + expect(SDLDisplayTypeMFD4).to(equal(@"MFD4")); + expect(SDLDisplayTypeMFD5).to(equal(@"MFD5")); //NOT DEFINED IN SPEC expect(SDLDisplayTypeGen38Inch).to(equal(@"GEN3_8-INCH")); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLECallConfirmationStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLECallConfirmationStatusSpec.m index c453c5d3b..64addedf1 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLECallConfirmationStatusSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLECallConfirmationStatusSpec.m @@ -20,7 +20,7 @@ describe(@"Individual Enum Value Tests", ^ { expect(SDLECallConfirmationStatusCompleted).to(equal(@"CALL_COMPLETED")); expect(SDLECallConfirmationStatusUnsuccessful).to(equal(@"CALL_UNSUCCESSFUL")); expect(SDLECallConfirmationStatusConfiguredOff).to(equal(@"ECALL_CONFIGURED_OFF")); - expect(SDLECallConfirmationStatusCompleteDtmfTimeout).to(equal(@"CALL_COMPLETE_DTMF_TIMEOUT")); + expect(SDLECallConfirmationStatusCompleteDTMFTimeout).to(equal(@"CALL_COMPLETE_DTMF_TIMEOUT")); }); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLFileTypeSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLFileTypeSpec.m index 3667f0a7c..7b36a863e 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLFileTypeSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLFileTypeSpec.m @@ -14,14 +14,14 @@ QuickSpecBegin(SDLFileTypeSpec) describe(@"Individual Enum Value Tests", ^ { it(@"Should match internal values", ^ { - expect(SDLFileTypeGraphicBmp).to(equal(@"GRAPHIC_BMP")); - expect(SDLFileTypeGraphicJpeg).to(equal(@"GRAPHIC_JPEG")); - expect(SDLFileTypeGraphicPng).to(equal(@"GRAPHIC_PNG")); - expect(SDLFileTypeAudioWave).to(equal(@"AUDIO_WAVE")); - expect(SDLFileTypeAudioMp3).to(equal(@"AUDIO_MP3")); - expect(SDLFileTypeAudioAac).to(equal(@"AUDIO_AAC")); + expect(SDLFileTypeGraphicBMP).to(equal(@"GRAPHIC_BMP")); + expect(SDLFileTypeGraphicJPEG).to(equal(@"GRAPHIC_JPEG")); + expect(SDLFileTypeGraphicPNG).to(equal(@"GRAPHIC_PNG")); + expect(SDLFileTypeAudioWAV).to(equal(@"AUDIO_WAVE")); + expect(SDLFileTypeAudioMP3).to(equal(@"AUDIO_MP3")); + expect(SDLFileTypeAudioAAC).to(equal(@"AUDIO_AAC")); expect(SDLFileTypeBinary).to(equal(@"BINARY")); - expect(SDLFileTypeJson).to(equal(@"JSON")); + expect(SDLFileTypeJSON).to(equal(@"JSON")); }); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLGlobalProperySpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLGlobalProperySpec.m index 03032c968..98fad5735 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLGlobalProperySpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLGlobalProperySpec.m @@ -16,8 +16,8 @@ describe(@"Individual Enum Value Tests", ^ { it(@"Should match internal values", ^ { expect(SDLGlobalPropertyHelpPrompt).to(equal(@"HELPPROMPT")); expect(SDLGlobalPropertyTimeoutPrompt).to(equal(@"TIMEOUTPROMPT")); - expect(SDLGlobalPropertyVrHelpTitle).to(equal(@"VRHELPTITLE")); - expect(SDLGlobalPropertyVrHelpItems).to(equal(@"VRHELPITEMS")); + expect(SDLGlobalPropertyVRHelpTitle).to(equal(@"VRHELPTITLE")); + expect(SDLGlobalPropertyVRHelpItems).to(equal(@"VRHELPITEMS")); expect(SDLGlobalPropertyMenuName).to(equal(@"MENUNAME")); expect(SDLGlobalPropertyMenuIcon).to(equal(@"MENUICON")); expect(SDLGlobalPropertyKeyboard).to(equal(@"KEYBOARDPROPERTIES")); diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLHMIZoneCapabilitiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLHMIZoneCapabilitiesSpec.m index 1f1cdf39a..71b8a8c2c 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLHMIZoneCapabilitiesSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLHMIZoneCapabilitiesSpec.m @@ -10,7 +10,7 @@ #import "SDLHMIZoneCapabilities.h" -QuickSpecBegin(SDLHmiZoneCapabilitiesSpec) +QuickSpecBegin(SDLHMIZoneCapabilitiesSpec) describe(@"Individual Enum Value Tests", ^ { it(@"Should match internal values", ^ { diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLImageFieldNameSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLImageFieldNameSpec.m index 81d5360c3..6841858fe 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLImageFieldNameSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLImageFieldNameSpec.m @@ -20,11 +20,11 @@ describe(@"Individual Enum Value Tests", ^ { expect(SDLImageFieldNameVrHelpItem).to(equal(@"vrHelpItem")); expect(SDLImageFieldNameTurnIcon).to(equal(@"turnIcon")); expect(SDLImageFieldNameMenuIcon).to(equal(@"menuIcon")); - expect(SDLImageFieldNameCmdIcon).to(equal(@"cmdIcon")); + expect(SDLImageFieldNameCommandIcon).to(equal(@"cmdIcon")); expect(SDLImageFieldNameAppIcon).to(equal(@"appIcon")); expect(SDLImageFieldNameGraphic).to(equal(@"graphic")); - expect(SDLImageFieldNameShowConstantTbtIcon).to(equal(@"showConstantTBTIcon")); - expect(SDLImageFieldNameShowConstantTbtNextTurnIcon).to(equal(@"showConstantTBTNextTurnIcon")); + expect(SDLImageFieldNameShowConstantTBTIcon).to(equal(@"showConstantTBTIcon")); + expect(SDLImageFieldNameShowConstantTBTNextTurnIcon).to(equal(@"showConstantTBTNextTurnIcon")); expect(SDLImageFieldNameLocationImage).to(equal(@"locationImage")); }); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLInteractionModeSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLInteractionModeSpec.m index 10b0aa58b..d13d920b9 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLInteractionModeSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLInteractionModeSpec.m @@ -15,7 +15,7 @@ QuickSpecBegin(SDLInteractionModeSpec) describe(@"Individual Enum Value Tests", ^ { it(@"Should match internal values", ^ { expect(SDLInteractionModeManualOnly).to(equal(@"MANUAL_ONLY")); - expect(SDLInteractionModeVrOnly).to(equal(@"VR_ONLY")); + expect(SDLInteractionModeVROnly).to(equal(@"VR_ONLY")); expect(SDLInteractionModeBoth).to(equal(@"BOTH")); }); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLKeyboardLayoutSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLKeyboardLayoutSpec.m index 749d17924..ec0298852 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLKeyboardLayoutSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLKeyboardLayoutSpec.m @@ -14,9 +14,9 @@ QuickSpecBegin(SDLKeyboardLayoutSpec) describe(@"Individual Enum Value Tests", ^ { it(@"Should match internal values", ^ { - expect(SDLKeyboardLayoutQwerty).to(equal(@"QWERTY")); - expect(SDLKeyboardLayoutQwertz).to(equal(@"QWERTZ")); - expect(SDLKeyboardLayoutAzerty).to(equal(@"AZERTY")); + expect(SDLKeyboardLayoutQWERTY).to(equal(@"QWERTY")); + expect(SDLKeyboardLayoutQWERTZ).to(equal(@"QWERTZ")); + expect(SDLKeyboardLayoutAZERTY).to(equal(@"AZERTY")); }); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLPowerModeQualificationStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLPowerModeQualificationStatusSpec.m index d34b6fa97..45fa5ba6f 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLPowerModeQualificationStatusSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLPowerModeQualificationStatusSpec.m @@ -14,10 +14,10 @@ QuickSpecBegin(SDLPowerModeQualificationStatusSpec) describe(@"Individual Enum Value Tests", ^ { it(@"Should match internal values", ^ { - expect(SDLPowerModeQualificationStatusPowerModeUndefined).to(equal(@"POWER_MODE_UNDEFINED")); - expect(SDLPowerModeQualificationStatusPowerModeEvaluationInProgress).to(equal(@"POWER_MODE_EVALUATION_IN_PROGRESS")); + expect(SDLPowerModeQualificationStatusUndefined).to(equal(@"POWER_MODE_UNDEFINED")); + expect(SDLPowerModeQualificationStatusEvaluationInProgress).to(equal(@"POWER_MODE_EVALUATION_IN_PROGRESS")); expect(SDLPowerModeQualificationStatusNotDefined).to(equal(@"NOT_DEFINED")); - expect(SDLPowerModeQualificationStatusPowerModeOk).to(equal(@"POWER_MODE_OK")); + expect(SDLPowerModeQualificationStatusOk).to(equal(@"POWER_MODE_OK")); }); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLPredefinedLayoutSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLPredefinedLayoutSpec.m index 51289069f..1635f7741 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLPredefinedLayoutSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLPredefinedLayoutSpec.m @@ -18,9 +18,9 @@ describe(@"Individual Enum Value Tests", ^ { expect(SDLPredefinedLayoutMedia).to(equal(@"MEDIA")); expect(SDLPredefinedLayoutNonMedia).to(equal(@"NON-MEDIA")); expect(SDLPredefinedLayoutOnscreenPresets).to(equal(@"ONSCREEN_PRESETS")); - expect(SDLPredefinedLayoutNavFullscreenMap).to(equal(@"NAV_FULLSCREEN_MAP")); - expect(SDLPredefinedLayoutNavList).to(equal(@"NAV_LIST")); - expect(SDLPredefinedLayoutNavKeyboard).to(equal(@"NAV_KEYBOARD")); + expect(SDLPredefinedLayoutNavigationFullscreenMap).to(equal(@"NAV_FULLSCREEN_MAP")); + expect(SDLPredefinedLayoutNavigationList).to(equal(@"NAV_LIST")); + expect(SDLPredefinedLayoutNavigationKeyboard).to(equal(@"NAV_KEYBOARD")); expect(SDLPredefinedLayoutGraphicWithText).to(equal(@"GRAPHIC_WITH_TEXT")); expect(SDLPredefinedLayoutTextWithGraphic).to(equal(@"TEXT_WITH_GRAPHIC")); expect(SDLPredefinedLayoutTilesOnly).to(equal(@"TILES_ONLY")); diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLPrerecordedSpeechSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLPrerecordedSpeechSpec.m index 14af82632..657821a6f 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLPrerecordedSpeechSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLPrerecordedSpeechSpec.m @@ -14,11 +14,11 @@ QuickSpecBegin(SDLPrerecordedSpeechSpec) describe(@"Individual Enum Value Tests", ^ { it(@"Should match internal values", ^ { - expect(SDLPrerecordedSpeechHelpJingle).to(equal(@"HELP_JINGLE")); - expect(SDLPrerecordedSpeechInitialJingle).to(equal(@"INITIAL_JINGLE")); - expect(SDLPrerecordedSpeechListenJingle).to(equal(@"LISTEN_JINGLE")); - expect(SDLPrerecordedSpeechPositiveJingle).to(equal(@"POSITIVE_JINGLE")); - expect(SDLPrerecordedSpeechNegativeJingle).to(equal(@"NEGATIVE_JINGLE")); + expect(SDLPrerecordedSpeechHelp).to(equal(@"HELP_JINGLE")); + expect(SDLPrerecordedSpeechInitial).to(equal(@"INITIAL_JINGLE")); + expect(SDLPrerecordedSpeechListen).to(equal(@"LISTEN_JINGLE")); + expect(SDLPrerecordedSpeechPositive).to(equal(@"POSITIVE_JINGLE")); + expect(SDLPrerecordedSpeechNegative).to(equal(@"NEGATIVE_JINGLE")); }); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLPrimaryAudioSource.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLPrimaryAudioSource.m index 1bd0a97b7..712dfd8d1 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLPrimaryAudioSource.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLPrimaryAudioSource.m @@ -15,8 +15,8 @@ QuickSpecBegin(SDLPrimaryAudioSourceSpec) describe(@"Individual Enum Value Tests", ^ { it(@"Should match internal values", ^ { expect(SDLPrimaryAudioSourceNoSourceSelected).to(equal(@"NO_SOURCE_SELECTED")); - expect(SDLPrimaryAudioSourceUsb).to(equal(@"USB")); - expect(SDLPrimaryAudioSourceUsb2).to(equal(@"USB2")); + expect(SDLPrimaryAudioSourceUSB).to(equal(@"USB")); + expect(SDLPrimaryAudioSourceUSB2).to(equal(@"USB2")); expect(SDLPrimaryAudioSourceBluetoothStereo).to(equal(@"BLUETOOTH_STEREO_BTST")); expect(SDLPrimaryAudioSourceLineIn).to(equal(@"LINE_IN")); expect(SDLPrimaryAudioSourceIpod).to(equal(@"IPOD")); diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLRequestTypeSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLRequestTypeSpec.m index 4ad81f6a0..9b6b74279 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLRequestTypeSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLRequestTypeSpec.m @@ -14,15 +14,15 @@ QuickSpecBegin(SDLRequestTypeSpec) describe(@"Individual Enum Value Tests", ^ { it(@"Should match internal values", ^ { - expect(SDLRequestTypeHttp).to(equal(@"HTTP")); + expect(SDLRequestTypeHTTP).to(equal(@"HTTP")); expect(SDLRequestTypeFileResume).to(equal(@"FILE_RESUME")); - expect(SDLRequestTypeAuthRequest).to(equal(@"AUTH_REQUEST")); - expect(SDLRequestTypeAuthChallenge).to(equal(@"AUTH_CHALLENGE")); - expect(SDLRequestTypeAuthAck).to(equal(@"AUTH_ACK")); + expect(SDLRequestTypeAuthenticationRequest).to(equal(@"AUTH_REQUEST")); + expect(SDLRequestTypeAuthenticationChallenge).to(equal(@"AUTH_CHALLENGE")); + expect(SDLRequestTypeAuthenticationAck).to(equal(@"AUTH_ACK")); expect(SDLRequestTypeProprietary).to(equal(@"PROPRIETARY")); expect(SDLRequestTypeQueryApps).to(equal(@"QUERY_APPS")); expect(SDLRequestTypeLaunchApp).to(equal(@"LAUNCH_APP")); - expect(SDLRequestTypeLockScreenIconUrl).to(equal(@"LOCK_SCREEN_ICON_URL")); + expect(SDLRequestTypeLockScreenIconURL).to(equal(@"LOCK_SCREEN_ICON_URL")); expect(SDLRequestTypeTrafficMessageChannel).to(equal(@"TRAFFIC_MESSAGE_CHANNEL")); expect(SDLRequestTypeDriverProfile).to(equal(@"DRIVER_PROFILE")); expect(SDLRequestTypeVoiceSearch).to(equal(@"VOICE_SEARCH")); @@ -33,7 +33,7 @@ describe(@"Individual Enum Value Tests", ^ { expect(SDLRequestTypeVehicleDiagnostics).to(equal(@"VEHICLE_DIAGNOSTICS")); expect(SDLRequestTypeEmergency).to(equal(@"EMERGENCY")); expect(SDLRequestTypeMedia).to(equal(@"MEDIA")); - expect(SDLRequestTypeFota).to(equal(@"FOTA")); + expect(SDLRequestTypeFOTA).to(equal(@"FOTA")); }); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLResultSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLResultSpec.m index a1788e499..81b9c9b57 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLResultSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLResultSpec.m @@ -44,8 +44,8 @@ describe(@"Individual Enum Value Tests", ^ { expect(SDLResultCancelRoute).to(equal(@"CANCEL_ROUTE")); expect(SDLResultTruncatedData).to(equal(@"TRUNCATED_DATA")); expect(SDLResultSaved).to(equal(@"SAVED")); - expect(SDLResultInvalidCert).to(equal(@"INVALID_CERT")); - expect(SDLResultExpiredCert).to(equal(@"EXPIRED_CERT")); + expect(SDLResultInvalidCertificate).to(equal(@"INVALID_CERT")); + expect(SDLResultExpiredCertificate).to(equal(@"EXPIRED_CERT")); expect(SDLResultResumeFailed).to(equal(@"RESUME_FAILED")); }); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLSamplingRateSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLSamplingRateSpec.m index 2185d62c7..a8fa116f8 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLSamplingRateSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLSamplingRateSpec.m @@ -14,10 +14,10 @@ QuickSpecBegin(SDLSamplingRateSpec) describe(@"Individual Enum Value Tests", ^ { it(@"Should match internal values", ^ { - expect(SDLSamplingRate8Khz).to(equal(@"8KHZ")); - expect(SDLSamplingRate16Khz).to(equal(@"16KHZ")); - expect(SDLSamplingRate22Khz).to(equal(@"22KHZ")); - expect(SDLSamplingRate44Khz).to(equal(@"44KHZ")); + expect(SDLSamplingRate8KHZ).to(equal(@"8KHZ")); + expect(SDLSamplingRate16KHZ).to(equal(@"16KHZ")); + expect(SDLSamplingRate22KHZ).to(equal(@"22KHZ")); + expect(SDLSamplingRate44KHZ).to(equal(@"44KHZ")); }); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLSpeechCapabilitiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLSpeechCapabilitiesSpec.m index 43704a368..b21c5b578 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLSpeechCapabilitiesSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLSpeechCapabilitiesSpec.m @@ -15,9 +15,9 @@ QuickSpecBegin(SDLSpeechCapabilitiesSpec) describe(@"Individual Enum Value Tests", ^ { it(@"Should match internal values", ^ { expect(SDLSpeechCapabilitiesText).to(equal(@"TEXT")); - expect(SDLSpeechCapabilitiesSapiPhonemes).to(equal(@"SAPI_PHONEMES")); - expect(SDLSpeechCapabilitiesLhplusPhonemes).to(equal(@"LHPLUS_PHONEMES")); - expect(SDLSpeechCapabilitiesPreRecorded).to(equal(@"PRE_RECORDED")); + expect(SDLSpeechCapabilitiesSAPIPhonemes).to(equal(@"SAPI_PHONEMES")); + expect(SDLSpeechCapabilitiesLHPlusPhonemes).to(equal(@"LHPLUS_PHONEMES")); + expect(SDLSpeechCapabilitiesPrerecorded).to(equal(@"PRE_RECORDED")); expect(SDLSpeechCapabilitiesSilence).to(equal(@"SILENCE")); }); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLSystemContextSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLSystemContextSpec.m index 6cbe402d2..0136c4cb5 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLSystemContextSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLSystemContextSpec.m @@ -15,9 +15,9 @@ QuickSpecBegin(SDLSystemContextSpec) describe(@"Individual Enum Value Tests", ^ { it(@"Should match internal values", ^ { expect(SDLSystemContextMain).to(equal(@"MAIN")); - expect(SDLSystemContextVrSession).to(equal(@"VRSESSION")); + expect(SDLSystemContextVRSession).to(equal(@"VRSESSION")); expect(SDLSystemContextMenu).to(equal(@"MENU")); - expect(SDLSystemContextHmiObscured).to(equal(@"HMI_OBSCURED")); + expect(SDLSystemContextHMIObscured).to(equal(@"HMI_OBSCURED")); expect(SDLSystemContextAlert).to(equal(@"ALERT")); }); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLTBTStateSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLTBTStateSpec.m index 7d4f13e88..8684e1549 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLTBTStateSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLTBTStateSpec.m @@ -18,7 +18,7 @@ describe(@"Individual Enum Value Tests", ^ { expect(SDLTBTStateRouteAccepted).to(equal(@"ROUTE_ACCEPTED")); expect(SDLTBTStateRouteRefused).to(equal(@"ROUTE_REFUSED")); expect(SDLTBTStateRouteCancelled).to(equal(@"ROUTE_CANCELLED")); - expect(SDLTBTStateEtaRequest).to(equal(@"ETA_REQUEST")); + expect(SDLTBTStateETARequest).to(equal(@"ETA_REQUEST")); expect(SDLTBTStateNextTurnRequest).to(equal(@"NEXT_TURN_REQUEST")); expect(SDLTBTStateRouteStatusRequest).to(equal(@"ROUTE_STATUS_REQUEST")); expect(SDLTBTStateRouteSummaryRequest).to(equal(@"ROUTE_SUMMARY_REQUEST")); diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLTextFieldNameSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLTextFieldNameSpec.m index 11e2496ec..6d29ff29e 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLTextFieldNameSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLTextFieldNameSpec.m @@ -28,7 +28,7 @@ describe(@"Individual Enum Value Tests", ^ { expect(SDLTextFieldNameInitialInteractionText).to(equal(@"initialInteractionText")); expect(SDLTextFieldNameNavigationText1).to(equal(@"navigationText1")); expect(SDLTextFieldNameNavigationText2).to(equal(@"navigationText2")); - expect(SDLTextFieldNameEta).to(equal(@"ETA")); + expect(SDLTextFieldNameETA).to(equal(@"ETA")); expect(SDLTextFieldNameTotalDistance).to(equal(@"totalDistance")); expect(SDLTextFieldNameAudioPassThruDisplayText1).to(equal(@"audioPassThruDisplayText1")); expect(SDLTextFieldNameAudioPassThruDisplayText2).to(equal(@"audioPassThruDisplayText2")); diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLTriggerSource.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLTriggerSource.m index ae0c043f2..76610183c 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLTriggerSource.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLTriggerSource.m @@ -15,7 +15,7 @@ QuickSpecBegin(SDLTriggerSourceSpec) describe(@"Individual Enum Value Tests", ^ { it(@"Should match internal values", ^ { expect(SDLTriggerSourceMenu).to(equal(@"MENU")); - expect(SDLTriggerSourceVr).to(equal(@"VR")); + expect(SDLTriggerSourceVR).to(equal(@"VR")); expect(SDLTriggerSourceKeyboard).to(equal(@"KEYBOARD")); }); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLVehicleDataTypeSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLVehicleDataTypeSpec.m index ac8e2ee06..2e6df2174 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLVehicleDataTypeSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLVehicleDataTypeSpec.m @@ -14,21 +14,21 @@ QuickSpecBegin(SDLVehicleDataTypeSpec) describe(@"Individual Enum Value Tests", ^ { it(@"Should match internal values", ^ { - expect(SDLVehicleDataTypeGps).to(equal(@"VEHICLEDATA_GPS")); + expect(SDLVehicleDataTypeGPS).to(equal(@"VEHICLEDATA_GPS")); expect(SDLVehicleDataTypeSpeed).to(equal(@"VEHICLEDATA_SPEED")); - expect(SDLVehicleDataTypeRpm).to(equal(@"VEHICLEDATA_RPM")); + expect(SDLVehicleDataTypeRPM).to(equal(@"VEHICLEDATA_RPM")); expect(SDLVehicleDataTypeFuelLevel).to(equal(@"VEHICLEDATA_FUELLEVEL")); expect(SDLVehicleDataTypeFuelLevelState).to(equal(@"VEHICLEDATA_FUELLEVEL_STATE")); expect(SDLVehicleDataTypeFuelConsumption).to(equal(@"VEHICLEDATA_FUELCONSUMPTION")); - expect(SDLVehicleDataTypeExternalTemp).to(equal(@"VEHICLEDATA_EXTERNTEMP")); - expect(SDLVehicleDataTypeVin).to(equal(@"VEHICLEDATA_VIN")); - expect(SDLVehicleDataTypePrndl).to(equal(@"VEHICLEDATA_PRNDL")); + expect(SDLVehicleDataTypeExternalTemperature).to(equal(@"VEHICLEDATA_EXTERNTEMP")); + expect(SDLVehicleDataTypeVIN).to(equal(@"VEHICLEDATA_VIN")); + expect(SDLVehicleDataTypePRNDL).to(equal(@"VEHICLEDATA_PRNDL")); expect(SDLVehicleDataTypeTirePressure).to(equal(@"VEHICLEDATA_TIREPRESSURE")); expect(SDLVehicleDataTypeOdometer).to(equal(@"VEHICLEDATA_ODOMETER")); expect(SDLVehicleDataTypeBeltStatus).to(equal(@"VEHICLEDATA_BELTSTATUS")); expect(SDLVehicleDataTypeBodyInfo).to(equal(@"VEHICLEDATA_BODYINFO")); expect(SDLVehicleDataTypeDeviceStatus).to(equal(@"VEHICLEDATA_DEVICESTATUS")); - expect(SDLVehicleDataTypeEcallInfo).to(equal(@"VEHICLEDATA_ECALLINFO")); + expect(SDLVehicleDataTypeECallInfo).to(equal(@"VEHICLEDATA_ECALLINFO")); expect(SDLVehicleDataTypeAirbagStatus).to(equal(@"VEHICLEDATA_AIRBAGSTATUS")); expect(SDLVehicleDataTypeEmergencyEvent).to(equal(@"VEHICLEDATA_EMERGENCYEVENT")); expect(SDLVehicleDataTypeClusterModeStatus).to(equal(@"VEHICLEDATA_CLUSTERMODESTATUS")); diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLWiperStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLWiperStatusSpec.m index b896698d1..3e92b7970 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLWiperStatusSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLWiperStatusSpec.m @@ -15,18 +15,18 @@ QuickSpecBegin(SDLWiperStatusSpec) describe(@"Individual Enum Value Tests", ^ { it(@"Should match internal values", ^ { expect(SDLWiperStatusOff).to(equal(@"OFF")); - expect(SDLWiperStatusAutoOff).to(equal(@"AUTO_OFF")); + expect(SDLWiperStatusAutomaticOff).to(equal(@"AUTO_OFF")); expect(SDLWiperStatusOffMoving).to(equal(@"OFF_MOVING")); - expect(SDLWiperStatusManIntOff).to(equal(@"MAN_INT_OFF")); - expect(SDLWiperStatusManIntOn).to(equal(@"MAN_INT_ON")); - expect(SDLWiperStatusManLow).to(equal(@"MAN_LOW")); - expect(SDLWiperStatusManHigh).to(equal(@"MAN_HIGH")); - expect(SDLWiperStatusManFlick).to(equal(@"MAN_FLICK")); + expect(SDLWiperStatusManualIntervalOff).to(equal(@"MAN_INT_OFF")); + expect(SDLWiperStatusManualIntervalOn).to(equal(@"MAN_INT_ON")); + expect(SDLWiperStatusManualLow).to(equal(@"MAN_LOW")); + expect(SDLWiperStatusManualHigh).to(equal(@"MAN_HIGH")); + expect(SDLWiperStatusManualFlick).to(equal(@"MAN_FLICK")); expect(SDLWiperStatusWash).to(equal(@"WASH")); - expect(SDLWiperStatusAutoLow).to(equal(@"AUTO_LOW")); - expect(SDLWiperStatusAutoHigh).to(equal(@"AUTO_HIGH")); + expect(SDLWiperStatusAutomaticLow).to(equal(@"AUTO_LOW")); + expect(SDLWiperStatusAutomaticHigh).to(equal(@"AUTO_HIGH")); expect(SDLWiperStatusCourtesyWipe).to(equal(@"COURTESYWIPE")); - expect(SDLWiperStatusAutoAdjust).to(equal(@"AUTO_ADJUST")); + expect(SDLWiperStatusAutomaticAdjust).to(equal(@"AUTO_ADJUST")); expect(SDLWiperStatusStalled).to(equal(@"STALLED")); expect(SDLWiperStatusNoDataExists).to(equal(@"NO_DATA_EXISTS")); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/FactorySpecs/SDLRPCRequestFactorySpec.m b/SmartDeviceLinkTests/RPCSpecs/FactorySpecs/SDLRPCRequestFactorySpec.m index b496af272..5fafe4ba2 100644 --- a/SmartDeviceLinkTests/RPCSpecs/FactorySpecs/SDLRPCRequestFactorySpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/FactorySpecs/SDLRPCRequestFactorySpec.m @@ -371,16 +371,16 @@ describe(@"BuildGetVehicleData Tests", ^ { describe(@"BuildPerformAudioPassThru Tests", ^ { it(@"Should build correctly", ^ { SDLPerformAudioPassThru* message = [SDLRPCRequestFactory buildPerformAudioPassThruWithInitialPrompt:@"" audioPassThruDisplayText1:@"Display1" audioPassThruDisplayText2:@"Display2" - samplingRate:SDLSamplingRate44Khz maxDuration:@10 bitsPerSample:SDLBitsPerSample16Bit audioType:SDLAudioTypePcm + samplingRate:SDLSamplingRate44KHZ maxDuration:@10 bitsPerSample:SDLBitsPerSample16Bit audioType:SDLAudioTypePCM muteAudio:@NO correlationID:@2500]; expect(((SDLTTSChunk*)[message initialPrompt][0]).text).to(equal(@"")); expect(message.audioPassThruDisplayText1).to(equal(@"Display1")); expect(message.audioPassThruDisplayText2).to(equal(@"Display2")); - expect(message.samplingRate).to(equal(SDLSamplingRate44Khz)); + expect(message.samplingRate).to(equal(SDLSamplingRate44KHZ)); expect(message.maxDuration).to(equal(@10)); expect(message.bitsPerSample).to(equal(SDLBitsPerSample16Bit)); - expect(message.audioType).to(equal(SDLAudioTypePcm)); + expect(message.audioType).to(equal(SDLAudioTypePCM)); expect(message.muteAudio).to(equal(@NO)); expect(message.correlationID).to(equal(@2500)); }); @@ -414,7 +414,7 @@ describe(@"BuildPerformInteraction Tests", ^ { it(@"Should build correctly", ^ { NSArray* vrHelp = @[[[SDLVRHelpItem alloc] init]]; SDLPerformInteraction* message = [SDLRPCRequestFactory buildPerformInteractionWithInitialPrompt:@"Nothing" initialText:@"Still Nothing" interactionChoiceSetIDList:@[@4223, @1337] - helpPrompt:@"A Whole Lot of Nothing" timeoutPrompt:@"Time Remaining" interactionMode:SDLInteractionModeVrOnly + helpPrompt:@"A Whole Lot of Nothing" timeoutPrompt:@"Time Remaining" interactionMode:SDLInteractionModeVROnly timeout:@5600 vrHelp:vrHelp correlationID:@31564]; expect(((SDLTTSChunk*)[message initialPrompt][0]).text).to(equal(@"Nothing")); @@ -422,7 +422,7 @@ describe(@"BuildPerformInteraction Tests", ^ { expect(message.interactionChoiceSetIDList).to(equal(@[@4223, @1337])); expect(((SDLTTSChunk*)[message helpPrompt][0]).text).to(equal(@"A Whole Lot of Nothing")); expect(((SDLTTSChunk*)[message timeoutPrompt][0]).text).to(equal(@"Time Remaining")); - expect(message.interactionMode).to(equal(SDLInteractionModeVrOnly)); + expect(message.interactionMode).to(equal(SDLInteractionModeVROnly)); expect(message.timeout).to(equal(@5600)); expect(message.vrHelp).to(equal(vrHelp)); expect(message.interactionLayout).to(beNil()); @@ -474,10 +474,10 @@ describe(@"BuildPerformInteraction Tests", ^ { describe(@"BuildPutFile Tests", ^ { it(@"Should build correctly", ^ { - SDLPutFile *message = [SDLRPCRequestFactory buildPutFileWithFileName:@"YES!?" fileType:SDLFileTypeGraphicBmp persistentFile:@165636 correlationId:@147986]; + SDLPutFile *message = [SDLRPCRequestFactory buildPutFileWithFileName:@"YES!?" fileType:SDLFileTypeGraphicBMP persistentFile:@165636 correlationId:@147986]; expect(message.syncFileName).to(equal(@"YES!?")); - expect(message.fileType).to(equal(SDLFileTypeGraphicBmp)); + expect(message.fileType).to(equal(SDLFileTypeGraphicBMP)); expect(message.persistentFile).to(equal(@165636)); expect(message.correlationID).to(equal(@147986)); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnAppInterfaceUnregisteredSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnAppInterfaceUnregisteredSpec.m index 6f8b7ceeb..b35d34d9c 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnAppInterfaceUnregisteredSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnAppInterfaceUnregisteredSpec.m @@ -24,10 +24,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_notification: - @{NAMES_parameters: - @{NAMES_reason:SDLAppInterfaceUnregisteredReasonAppUnauthorized}, - NAMES_operation_name:NAMES_OnAppInterfaceUnregistered}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameNotification: + @{SDLNameParameters: + @{SDLNameReason:SDLAppInterfaceUnregisteredReasonAppUnauthorized}, + SDLNameOperationName:SDLNameOnAppInterfaceUnregistered}} mutableCopy]; SDLOnAppInterfaceUnregistered* testNotification = [[SDLOnAppInterfaceUnregistered alloc] initWithDictionary:dict]; expect(testNotification.reason).to(equal(SDLAppInterfaceUnregisteredReasonAppUnauthorized)); diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnButtonEventSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnButtonEventSpec.m index 55d4e564d..b303ffd1a 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnButtonEventSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnButtonEventSpec.m @@ -30,12 +30,12 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_notification: - @{NAMES_parameters: - @{NAMES_buttonName:SDLButtonNameCustomButton, - NAMES_buttonEventMode:SDLButtonEventModeButtonDown, - NAMES_customButtonID:@4252}, - NAMES_operation_name:NAMES_OnButtonEvent}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameNotification: + @{SDLNameParameters: + @{SDLNameButtonName:SDLButtonNameCustomButton, + SDLNameButtonEventMode:SDLButtonEventModeButtonDown, + SDLNameCustomButtonId:@4252}, + SDLNameOperationName:SDLNameOnButtonEvent}} 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 285060191..5737c2f81 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnButtonPressSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnButtonPressSpec.m @@ -30,12 +30,12 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_notification: - @{NAMES_parameters: - @{NAMES_buttonName:SDLButtonNameCustomButton, - NAMES_buttonPressMode:SDLButtonPressModeLong, - NAMES_customButtonID:@5642}, - NAMES_operation_name:NAMES_OnButtonPress}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameNotification: + @{SDLNameParameters: + @{SDLNameButtonName:SDLButtonNameCustomButton, + SDLNameButtonPressMode:SDLButtonPressModeLong, + SDLNameCustomButtonId:@5642}, + SDLNameOperationName:SDLNameOnButtonPress}} 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 07837c023..6257a13cb 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnCommandSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnCommandSpec.m @@ -26,11 +26,11 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_notification: - @{NAMES_parameters: - @{NAMES_cmdID:@5676544, - NAMES_triggerSource:SDLTriggerSourceKeyboard}, - NAMES_operation_name:NAMES_OnCommand}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameNotification: + @{SDLNameParameters: + @{SDLNameCommandId:@5676544, + SDLNameTriggerSource:SDLTriggerSourceKeyboard}, + SDLNameOperationName:SDLNameOnCommand}} 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 a66f0bd6d..b46e31ee6 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnDriverDistractionSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnDriverDistractionSpec.m @@ -24,10 +24,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_notification: - @{NAMES_parameters: - @{NAMES_state:SDLDriverDistractionStateOn}, - NAMES_operation_name:NAMES_OnDriverDistraction}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameNotification: + @{SDLNameParameters: + @{SDLNameState:SDLDriverDistractionStateOn}, + SDLNameOperationName:SDLNameOnDriverDistraction}} 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 a8844e22a..3e4b8878f 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnEncodedSyncPDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnEncodedSyncPDataSpec.m @@ -27,12 +27,12 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_notification: - @{NAMES_parameters: - @{NAMES_data:[@[@0] mutableCopy], - NAMES_URL:@"www.zombo.com", - NAMES_Timeout:@564}, - NAMES_operation_name:NAMES_OnEncodedSyncPData}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameNotification: + @{SDLNameParameters: + @{SDLNameData:[@[@0] mutableCopy], + SDLNameURLUppercase:@"www.zombo.com", + SDLNameTimeoutCapitalized:@564}, + SDLNameOperationName:SDLNameOnEncodedSyncPData}} mutableCopy]; SDLOnEncodedSyncPData* testNotification = [[SDLOnEncodedSyncPData alloc] initWithDictionary:dict]; expect(testNotification.data).to(equal([@[@0] mutableCopy])); @@ -49,4 +49,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnHMIStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnHMIStatusSpec.m index fb7546c3f..5f442276e 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnHMIStatusSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnHMIStatusSpec.m @@ -23,25 +23,25 @@ describe(@"Getter/Setter Tests", ^ { testNotification.hmiLevel = SDLHMILevelLimited; testNotification.audioStreamingState = SDLAudioStreamingStateAttenuated; - testNotification.systemContext = SDLSystemContextHmiObscured; + testNotification.systemContext = SDLSystemContextHMIObscured; expect(testNotification.hmiLevel).to(equal(SDLHMILevelLimited)); expect(testNotification.audioStreamingState).to(equal(SDLAudioStreamingStateAttenuated)); - expect(testNotification.systemContext).to(equal(SDLSystemContextHmiObscured)); + expect(testNotification.systemContext).to(equal(SDLSystemContextHMIObscured)); }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_notification: - @{NAMES_parameters: - @{NAMES_hmiLevel:SDLHMILevelLimited, - NAMES_audioStreamingState:SDLAudioStreamingStateAttenuated, - NAMES_systemContext:SDLSystemContextHmiObscured}, - NAMES_operation_name:NAMES_OnHMIStatus}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameNotification: + @{SDLNameParameters: + @{SDLNameHMILevel:SDLHMILevelLimited, + SDLNameAudioStreamingState:SDLAudioStreamingStateAttenuated, + SDLNameSystemContext:SDLSystemContextHMIObscured}, + SDLNameOperationName:SDLNameOnHMIStatus}} mutableCopy]; SDLOnHMIStatus* testNotification = [[SDLOnHMIStatus alloc] initWithDictionary:dict]; expect(testNotification.hmiLevel).to(equal(SDLHMILevelLimited)); expect(testNotification.audioStreamingState).to(equal(SDLAudioStreamingStateAttenuated)); - expect(testNotification.systemContext).to(equal(SDLSystemContextHmiObscured)); + expect(testNotification.systemContext).to(equal(SDLSystemContextHMIObscured)); }); it(@"Should return nil if not set", ^ { diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnHashChangeSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnHashChangeSpec.m index 308347c61..ea87449c6 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnHashChangeSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnHashChangeSpec.m @@ -23,10 +23,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_notification: - @{NAMES_parameters: - @{NAMES_hashID:@"hash"}, - NAMES_operation_name:NAMES_OnHashChange}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameNotification: + @{SDLNameParameters: + @{SDLNameHashId:@"hash"}, + SDLNameOperationName:SDLNameOnHashChange}} mutableCopy]; SDLOnHashChange* testNotification = [[SDLOnHashChange alloc] initWithDictionary:dict]; expect(testNotification.hashID).to(equal(@"hash")); @@ -39,4 +39,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnKeyboardInputSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnKeyboardInputSpec.m index c17c0c94c..c8b101f65 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnKeyboardInputSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnKeyboardInputSpec.m @@ -26,11 +26,11 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_notification: - @{NAMES_parameters: - @{NAMES_event:SDLKeyboardEventEntrySubmitted, - NAMES_data:@"qwertyg"}, - NAMES_operation_name:NAMES_OnKeyboardInput}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameNotification: + @{SDLNameParameters: + @{SDLNameEvent:SDLKeyboardEventEntrySubmitted, + SDLNameData:@"qwertyg"}, + SDLNameOperationName:SDLNameOnKeyboardInput}} mutableCopy]; SDLOnKeyboardInput* testNotification = [[SDLOnKeyboardInput alloc] initWithDictionary:dict]; expect(testNotification.event).to(equal(SDLKeyboardEventEntrySubmitted)); diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnLanguageChangeSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnLanguageChangeSpec.m index 3f2206917..6dfa256f6 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnLanguageChangeSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnLanguageChangeSpec.m @@ -27,11 +27,11 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_notification: - @{NAMES_parameters: - @{NAMES_language:SDLLanguageEsEs, - NAMES_hmiDisplayLanguage:SDLLanguageDeDe}, - NAMES_operation_name:NAMES_OnLanguageChange}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameNotification: + @{SDLNameParameters: + @{SDLNameLanguage:SDLLanguageEsEs, + SDLNameHMIDisplayLanguage:SDLLanguageDeDe}, + SDLNameOperationName:SDLNameOnLanguageChange}} 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 5a0383060..1cff1434c 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnLockScreenStatusSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnLockScreenStatusSpec.m @@ -31,13 +31,13 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_notification: - @{NAMES_parameters: + NSMutableDictionary* dict = [@{SDLNameNotification: + @{SDLNameParameters: @{@"driverdistractionstatus":@NO, @"userselected":@3, @"OnLockScreenStatus":SDLLockScreenStatusRequired, @"hmilevel":SDLHMILevelNone}, - NAMES_operation_name:@"OnLockScreenStatus"}} mutableCopy]; + SDLNameOperationName:@"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 5a5d349cc..9ad2026de 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnPermissionsChangeSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnPermissionsChangeSpec.m @@ -26,10 +26,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_notification: - @{NAMES_parameters: - @{NAMES_permissionItem:[@[item] mutableCopy]}, - NAMES_operation_name:NAMES_OnPermissionsChange}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameNotification: + @{SDLNameParameters: + @{SDLNamePermissionItem:[@[item] mutableCopy]}, + SDLNameOperationName:SDLNameOnPermissionsChange}} mutableCopy]; SDLOnPermissionsChange* testNotification = [[SDLOnPermissionsChange alloc] initWithDictionary:dict]; expect(testNotification.permissionItem).to(equal([@[item] mutableCopy])); @@ -42,4 +42,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnSyncPDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnSyncPDataSpec.m index 34ac9af9e..ff7f95509 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnSyncPDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnSyncPDataSpec.m @@ -25,11 +25,11 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_notification: - @{NAMES_parameters: - @{NAMES_URL:@"https://www.youtube.com/watch?v=ygr5AHufBN4", - NAMES_Timeout:@8357}, - NAMES_operation_name:NAMES_OnSyncPData}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameNotification: + @{SDLNameParameters: + @{SDLNameURLUppercase:@"https://www.youtube.com/watch?v=ygr5AHufBN4", + SDLNameTimeoutCapitalized:@8357}, + SDLNameOperationName:SDLNameOnSyncPData}} mutableCopy]; SDLOnSyncPData* testNotification = [[SDLOnSyncPData alloc] initWithDictionary:dict]; expect(testNotification.URL).to(equal(@"https://www.youtube.com/watch?v=ygr5AHufBN4")); @@ -44,4 +44,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnSystemRequestSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnSystemRequestSpec.m index e993a074b..5812d489d 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnSystemRequestSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnSystemRequestSpec.m @@ -23,34 +23,34 @@ describe(@"Getter/Setter Tests", ^ { testNotification.requestType = SDLRequestTypeFileResume; testNotification.url = [@[@"www.google.com"] mutableCopy]; testNotification.timeout = @52345; - testNotification.fileType = SDLFileTypeGraphicPng; + testNotification.fileType = SDLFileTypeGraphicPNG; testNotification.offset = @2532678684; testNotification.length = @50000000000; expect(testNotification.requestType).to(equal(SDLRequestTypeFileResume)); expect(testNotification.url).to(equal([@[@"www.google.com"] mutableCopy])); expect(testNotification.timeout).to(equal(@52345)); - expect(testNotification.fileType).to(equal(SDLFileTypeGraphicPng)); + expect(testNotification.fileType).to(equal(SDLFileTypeGraphicPNG)); expect(testNotification.offset).to(equal(@2532678684)); expect(testNotification.length).to(equal(@50000000000)); }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_notification: - @{NAMES_parameters: - @{NAMES_requestType:SDLRequestTypeFileResume, - NAMES_url:[@[@"www.google.com"] mutableCopy], - NAMES_timeout:@52345, - NAMES_fileType:SDLFileTypeGraphicPng, - NAMES_offset:@2532678684, - NAMES_length:@50000000000}, - NAMES_operation_name:NAMES_OnSystemRequest}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameNotification: + @{SDLNameParameters: + @{SDLNameRequestType:SDLRequestTypeFileResume, + SDLNameURL:[@[@"www.google.com"] mutableCopy], + SDLNameTimeout:@52345, + SDLNameFileType:SDLFileTypeGraphicPNG, + SDLNameOffset:@2532678684, + SDLNameLength:@50000000000}, + SDLNameOperationName:SDLNameOnSystemRequest}} mutableCopy]; SDLOnSystemRequest* testNotification = [[SDLOnSystemRequest alloc] initWithDictionary:dict]; expect(testNotification.requestType).to(equal(SDLRequestTypeFileResume)); expect(testNotification.url).to(equal([@[@"www.google.com"] mutableCopy])); expect(testNotification.timeout).to(equal(@52345)); - expect(testNotification.fileType).to(equal(SDLFileTypeGraphicPng)); + expect(testNotification.fileType).to(equal(SDLFileTypeGraphicPNG)); expect(testNotification.offset).to(equal(@2532678684)); expect(testNotification.length).to(equal(@50000000000)); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnTBTClientStateSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnTBTClientStateSpec.m index 78805a437..70ed4648b 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnTBTClientStateSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnTBTClientStateSpec.m @@ -19,19 +19,19 @@ describe(@"Getter/Setter Tests", ^ { it(@"Should set and get correctly", ^ { SDLOnTBTClientState* testNotification = [[SDLOnTBTClientState alloc] init]; - testNotification.state = SDLTBTStateEtaRequest; + testNotification.state = SDLTBTStateETARequest; - expect(testNotification.state).to(equal(SDLTBTStateEtaRequest)); + expect(testNotification.state).to(equal(SDLTBTStateETARequest)); }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_notification: - @{NAMES_parameters: - @{NAMES_state:SDLTBTStateEtaRequest}, - NAMES_operation_name:NAMES_OnTBTClientState}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameNotification: + @{SDLNameParameters: + @{SDLNameState:SDLTBTStateETARequest}, + SDLNameOperationName:SDLNameOnTBTClientState}} mutableCopy]; SDLOnTBTClientState* testNotification = [[SDLOnTBTClientState alloc] initWithDictionary:dict]; - expect(testNotification.state).to(equal(SDLTBTStateEtaRequest)); + expect(testNotification.state).to(equal(SDLTBTStateETARequest)); }); it(@"Should return nil if not set", ^ { diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnTouchEventSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnTouchEventSpec.m index daf236beb..930ed95f8 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnTouchEventSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnTouchEventSpec.m @@ -30,11 +30,11 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_notification: - @{NAMES_parameters: - @{NAMES_type:SDLTouchTypeBegin, - NAMES_event:[@[event] mutableCopy]}, - NAMES_operation_name:NAMES_OnTouchEvent}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameNotification: + @{SDLNameParameters: + @{SDLNameType:SDLTouchTypeBegin, + SDLNameEvent:[@[event] mutableCopy]}, + SDLNameOperationName:SDLNameOnTouchEvent}} 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 0d4219739..81d5a1a57 100644 --- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnVehicleDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnVehicleDataSpec.m @@ -84,34 +84,34 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_notification: - @{NAMES_parameters: - @{NAMES_gps:gps, - NAMES_speed:@70.1, - NAMES_rpm:@4242, - NAMES_fuelLevel:@10.3, - NAMES_fuelLevel_State:SDLComponentVolumeStatusAlert, - NAMES_instantFuelConsumption:@4000.63, - NAMES_externalTemperature:@-10, - NAMES_vin:@"222222222722", - NAMES_prndl:SDLPRNDLDrive, - NAMES_tirePressure:tires, - NAMES_odometer:@100050, - NAMES_beltStatus:belt, - NAMES_bodyInformation:body, - NAMES_deviceStatus:device, - NAMES_driverBraking:SDLVehicleDataEventStatusYes, - NAMES_wiperStatus:SDLWiperStatusStalled, - NAMES_headLampStatus:headLamp, - NAMES_engineTorque:@-200.124, - NAMES_accPedalPosition:@99.99999999, - NAMES_steeringWheelAngle:@0.000000001, - NAMES_eCallInfo:eCall, - NAMES_airbagStatus:airbag, - NAMES_emergencyEvent:event, - NAMES_clusterModeStatus:clusterMode, - NAMES_myKey:myKey}, - NAMES_operation_name:NAMES_OnVehicleData}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameNotification: + @{SDLNameParameters: + @{SDLNameGPS:gps, + SDLNameSpeed:@70.1, + SDLNameRPM:@4242, + SDLNameFuelLevel:@10.3, + SDLNameFuelLevelState:SDLComponentVolumeStatusAlert, + SDLNameInstantFuelConsumption:@4000.63, + SDLNameExternalTemperature:@-10, + SDLNameVIN:@"222222222722", + SDLNamePRNDL:SDLPRNDLDrive, + SDLNameTirePressure:tires, + SDLNameOdometer:@100050, + SDLNameBeltStatus:belt, + SDLNameBodyInformation:body, + SDLNameDeviceStatus:device, + SDLNameDriverBraking:SDLVehicleDataEventStatusYes, + SDLNameWiperStatus:SDLWiperStatusStalled, + SDLNameHeadLampStatus:headLamp, + SDLNameEngineTorque:@-200.124, + SDLNameAccelerationPedalPosition:@99.99999999, + SDLNameSteeringWheelAngle:@0.000000001, + SDLNameECallInfo:eCall, + SDLNameAirbagStatus:airbag, + SDLNameEmergencyEvent:event, + SDLNameClusterModeStatus:clusterMode, + SDLNameMyKey:myKey}, + SDLNameOperationName:SDLNameOnVehicleData}} mutableCopy]; SDLOnVehicleData* testNotification = [[SDLOnVehicleData alloc] initWithDictionary:dict]; expect(testNotification.gps).to(equal(gps)); diff --git a/SmartDeviceLinkTests/RPCSpecs/PayloadSpecs/SDLRPCPayloadSpec.m b/SmartDeviceLinkTests/RPCSpecs/PayloadSpecs/SDLRPCPayloadSpec.m index bab540151..f0632eb87 100644 --- a/SmartDeviceLinkTests/RPCSpecs/PayloadSpecs/SDLRPCPayloadSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/PayloadSpecs/SDLRPCPayloadSpec.m @@ -15,9 +15,9 @@ QuickSpecBegin(SDLRPCPayloadSpec) __block SDLRPCPayload* testPayload; -__block NSDictionary* dict = @{NAMES_response: - @{NAMES_parameters:@{}, - NAMES_operation_name:NAMES_DeleteCommand}}; +__block NSDictionary* dict = @{SDLNameResponse: + @{SDLNameParameters:@{}, + SDLNameOperationName:SDLNameDeleteCommand}}; NSData* (^testData)() = ^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 455552bad..5e6385cee 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAddCommandSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAddCommandSpec.m @@ -34,13 +34,13 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_cmdID:@434577, - NAMES_menuParams:menu, - NAMES_vrCommands:[@[@"name", @"anotherName"] mutableCopy], - NAMES_cmdIcon:image}, - NAMES_operation_name:NAMES_AddCommand}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameCommandId:@434577, + SDLNameMenuParams:menu, + SDLNameVRCommands:[@[@"name", @"anotherName"] mutableCopy], + SDLNameCommandIcon:image}, + SDLNameOperationName:SDLNameAddCommand}} mutableCopy]; SDLAddCommand* testRequest = [[SDLAddCommand alloc] initWithDictionary:dict]; expect(testRequest.cmdID).to(equal(@434577)); @@ -59,4 +59,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAddSubMenuSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAddSubMenuSpec.m index 04a6526a8..890049e5f 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAddSubMenuSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAddSubMenuSpec.m @@ -27,12 +27,12 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_menuID:@4345645, - NAMES_position:@27, - NAMES_menuName:@"Welcome to the menu"}, - NAMES_operation_name:NAMES_AddSubMenu}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameMenuId:@4345645, + SDLNamePosition:@27, + SDLNameMenuName:@"Welcome to the menu"}, + SDLNameOperationName:SDLNameAddSubMenu}} mutableCopy]; SDLAddSubMenu* testRequest = [[SDLAddSubMenu alloc] initWithDictionary:dict]; expect(testRequest.menuID).to(equal(@4345645)); @@ -49,4 +49,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAlertManeuverSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAlertManeuverSpec.m index 16d5aa0e6..48091794e 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAlertManeuverSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAlertManeuverSpec.m @@ -30,11 +30,11 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_ttsChunks:[@[tts] mutableCopy], - NAMES_softButtons:[@[button] mutableCopy]}, - NAMES_operation_name:NAMES_AlertManeuver}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameTTSChunks:[@[tts] mutableCopy], + SDLNameSoftButtons:[@[button] mutableCopy]}, + SDLNameOperationName:SDLNameAlertManeuver}} mutableCopy]; SDLAlertManeuver* testRequest = [[SDLAlertManeuver alloc] initWithDictionary:dict]; expect(testRequest.ttsChunks).to(equal([@[tts] mutableCopy])); @@ -49,4 +49,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAlertSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAlertSpec.m index b5725e168..158557002 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAlertSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLAlertSpec.m @@ -42,17 +42,17 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_alertText1:@"alert#1", - NAMES_alertText2:@"alert#2", - NAMES_alertText3:@"alert#3", - NAMES_ttsChunks:[@[tts] mutableCopy], - NAMES_duration:@4357, - NAMES_playTone:@YES, - NAMES_progressIndicator:@NO, - NAMES_softButtons:[@[button] mutableCopy]}, - NAMES_operation_name:NAMES_Alert}} mutableCopy]; + NSMutableDictionary* 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]; SDLAlert* testRequest = [[SDLAlert alloc] initWithDictionary:dict]; expect(testRequest.alertText1).to(equal(@"alert#1")); @@ -79,4 +79,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLChangeRegistrationSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLChangeRegistrationSpec.m index ff4bcc379..a7f73c8a1 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLChangeRegistrationSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLChangeRegistrationSpec.m @@ -112,15 +112,15 @@ describe(@"change registration", ^ { someNGNMediaAppName = @"some media app name"; someVRSynonyms = @[@"some1", @"some2"]; - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_language:someLanguage, - NAMES_hmiDisplayLanguage:someOtherLanguage, - NAMES_appName:someAppName, - NAMES_ttsName:someTTSChunks, - NAMES_ngnMediaScreenAppName:someNGNMediaAppName, - NAMES_vrSynonyms:someVRSynonyms}, - NAMES_operation_name:NAMES_ChangeRegistration}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameLanguage:someLanguage, + SDLNameHMIDisplayLanguage:someOtherLanguage, + SDLNameAppName:someAppName, + SDLNameTTSName:someTTSChunks, + SDLNameNGNMediaScreenAppName:someNGNMediaAppName, + SDLNameVRSynonyms:someVRSynonyms}, + SDLNameOperationName:SDLNameChangeRegistration}} mutableCopy]; testRequest = [[SDLChangeRegistration alloc] initWithDictionary:dict]; }); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLCreateInteractionChoiceSetSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLCreateInteractionChoiceSetSpec.m index 39cadb2d6..017b123f5 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLCreateInteractionChoiceSetSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLCreateInteractionChoiceSetSpec.m @@ -28,11 +28,11 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_interactionChoiceSetID:@141414, - NAMES_choiceSet:[@[choice] mutableCopy]}, - NAMES_operation_name:NAMES_CreateInteractionChoiceSet}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameInteractionChoiceSetId:@141414, + SDLNameChoiceSet:[@[choice] mutableCopy]}, + SDLNameOperationName:SDLNameCreateInteractionChoiceSet}} mutableCopy]; SDLCreateInteractionChoiceSet* testRequest = [[SDLCreateInteractionChoiceSet alloc] initWithDictionary:dict]; expect(testRequest.interactionChoiceSetID).to(equal(@141414)); @@ -47,4 +47,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteCommandSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteCommandSpec.m index 2d0be62d8..89ed13257 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteCommandSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteCommandSpec.m @@ -23,10 +23,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_cmdID:@11223344}, - NAMES_operation_name:NAMES_DeleteCommand}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameCommandId:@11223344}, + SDLNameOperationName:SDLNameDeleteCommand}} mutableCopy]; SDLDeleteCommand* testRequest = [[SDLDeleteCommand alloc] initWithDictionary:dict]; expect(testRequest.cmdID).to(equal(@11223344)); @@ -39,4 +39,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteFileSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteFileSpec.m index c6e471fc4..5946c7ec0 100755 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteFileSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteFileSpec.m @@ -23,10 +23,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_syncFileName:@"synchro"}, - NAMES_operation_name:NAMES_DeleteFile}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameSyncFileName:@"synchro"}, + SDLNameOperationName:SDLNameDeleteFile}} mutableCopy]; SDLDeleteFile* testRequest = [[SDLDeleteFile alloc] initWithDictionary:dict]; expect(testRequest.syncFileName).to(equal(@"synchro")); @@ -39,4 +39,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteInteractionChoiceSetSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteInteractionChoiceSetSpec.m index 6d42d114f..540c08cb4 100755 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteInteractionChoiceSetSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteInteractionChoiceSetSpec.m @@ -23,10 +23,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_interactionChoiceSetID:@20314}, - NAMES_operation_name:NAMES_DeleteInteractionChoiceSet}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameInteractionChoiceSetId:@20314}, + SDLNameOperationName:SDLNameDeleteInteractionChoiceSet}} mutableCopy]; SDLDeleteInteractionChoiceSet* testRequest = [[SDLDeleteInteractionChoiceSet alloc] initWithDictionary:dict]; expect(testRequest.interactionChoiceSetID).to(equal(@20314)); @@ -39,4 +39,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteSubMenuSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteSubMenuSpec.m index 9b2d6588d..3185391ec 100755 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteSubMenuSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDeleteSubMenuSpec.m @@ -23,10 +23,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_menuID:@25614}, - NAMES_operation_name:NAMES_DeleteSubMenu}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameMenuId:@25614}, + SDLNameOperationName:SDLNameDeleteSubMenu}} mutableCopy]; SDLDeleteSubMenu* testRequest = [[SDLDeleteSubMenu alloc] initWithDictionary:dict]; expect(testRequest.menuID).to(equal(@25614)); @@ -39,4 +39,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDiagnosticMessageSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDiagnosticMessageSpec.m index 965920f39..fd25fd099 100755 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDiagnosticMessageSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDiagnosticMessageSpec.m @@ -27,12 +27,12 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_targetID:@3562, - NAMES_messageLength:@55555, - NAMES_messageData:[@[@1, @4, @16, @64] mutableCopy]}, - NAMES_operation_name:NAMES_DiagnosticMessage}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameTargetId:@3562, + SDLNameMessageLength:@55555, + SDLNameMessageData:[@[@1, @4, @16, @64] mutableCopy]}, + SDLNameOperationName:SDLNameDiagnosticMessage}} mutableCopy]; SDLDiagnosticMessage* testRequest = [[SDLDiagnosticMessage alloc] initWithDictionary:dict]; expect(testRequest.targetID).to(equal(@3562)); @@ -49,4 +49,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDialNumberSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDialNumberSpec.m index 7371fedf3..a150144c1 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDialNumberSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLDialNumberSpec.m @@ -43,9 +43,9 @@ describe(@"Dial Number RPC", ^{ beforeEach(^{ somePhoneNumber = @"1234567890"; NSDictionary *initDict = @{ - NAMES_request: @{ - NAMES_parameters: @{ - NAMES_number: [somePhoneNumber copy] + SDLNameRequest: @{ + SDLNameParameters: @{ + SDLNameNumber: [somePhoneNumber copy] } } }; @@ -62,8 +62,8 @@ describe(@"Dial Number RPC", ^{ __block SDLDialNumber *testRequest = nil; beforeEach(^{ NSDictionary *initDict = @{ - NAMES_request: @{ - NAMES_parameters: @{ + SDLNameRequest: @{ + SDLNameParameters: @{ } } }; diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLEncodedSyncPDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLEncodedSyncPDataSpec.m index 753608940..accdd94a6 100755 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLEncodedSyncPDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLEncodedSyncPDataSpec.m @@ -23,10 +23,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_data:[@[@2, @2, @2] mutableCopy]}, - NAMES_operation_name:NAMES_EncodedSyncPData}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameData:[@[@2, @2, @2] mutableCopy]}, + SDLNameOperationName:SDLNameEncodedSyncPData}} mutableCopy]; SDLEncodedSyncPData* testRequest = [[SDLEncodedSyncPData alloc] initWithDictionary:dict]; expect(testRequest.data).to(equal([@[@2, @2, @2] mutableCopy])); @@ -39,4 +39,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetDTCsSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetDTCsSpec.m index 87f84fd4d..0c4ca3af7 100755 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetDTCsSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetDTCsSpec.m @@ -25,11 +25,11 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_ecuName:@4321, - NAMES_dtcMask:@22}, - NAMES_operation_name:NAMES_EndAudioPassThru}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameECUName:@4321, + SDLNameDTCMask:@22}, + SDLNameOperationName:SDLNameEndAudioPassThru}} mutableCopy]; SDLGetDTCs* testRequest = [[SDLGetDTCs alloc] initWithDictionary:dict]; expect(testRequest.ecuName).to(equal(@4321)); @@ -44,4 +44,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m index 936550ce7..7e45c4bd6 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m @@ -71,34 +71,34 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_gps:@NO, - NAMES_speed:@YES, - NAMES_rpm:@NO, - NAMES_fuelLevel:@YES, - NAMES_fuelLevel_State:@NO, - NAMES_instantFuelConsumption:@YES, - NAMES_externalTemperature:@NO, - NAMES_vin:@YES, - NAMES_prndl:@NO, - NAMES_tirePressure:@YES, - NAMES_odometer:@NO, - NAMES_beltStatus:@YES, - NAMES_bodyInformation:@NO, - NAMES_deviceStatus:@YES, - NAMES_driverBraking:@NO, - NAMES_wiperStatus:@YES, - NAMES_headLampStatus:@NO, - NAMES_engineTorque:@YES, - NAMES_accPedalPosition:@NO, - NAMES_steeringWheelAngle:@YES, - NAMES_eCallInfo:@NO, - NAMES_airbagStatus:@YES, - NAMES_emergencyEvent:@NO, - NAMES_clusterModeStatus:@YES, - NAMES_myKey:@NO}, - NAMES_operation_name:NAMES_GetVehicleData}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameGPS:@NO, + SDLNameSpeed:@YES, + SDLNameRPM:@NO, + SDLNameFuelLevel:@YES, + SDLNameFuelLevelState:@NO, + SDLNameInstantFuelConsumption:@YES, + SDLNameExternalTemperature:@NO, + SDLNameVIN:@YES, + SDLNamePRNDL:@NO, + SDLNameTirePressure:@YES, + SDLNameOdometer:@NO, + SDLNameBeltStatus:@YES, + SDLNameBodyInformation:@NO, + SDLNameDeviceStatus:@YES, + SDLNameDriverBraking:@NO, + SDLNameWiperStatus:@YES, + SDLNameHeadLampStatus:@NO, + SDLNameEngineTorque:@YES, + SDLNameAccelerationPedalPosition:@NO, + SDLNameSteeringWheelAngle:@YES, + SDLNameECallInfo:@NO, + SDLNameAirbagStatus:@YES, + SDLNameEmergencyEvent:@NO, + SDLNameClusterModeStatus:@YES, + SDLNameMyKey:@NO}, + SDLNameOperationName:SDLNameGetVehicleData}} mutableCopy]; SDLGetVehicleData* testRequest = [[SDLGetVehicleData alloc] initWithDictionary:dict]; expect(testRequest.gps).to(equal(@NO)); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPerformAudioPassThruSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPerformAudioPassThruSpec.m index 50de2bf85..e55cf86be 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPerformAudioPassThruSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPerformAudioPassThruSpec.m @@ -23,40 +23,40 @@ describe(@"Getter/Setter Tests", ^ { testRequest.audioPassThruDisplayText1 = @"passthru#1"; testRequest.audioPassThruDisplayText2 = @"passthru#2"; - testRequest.samplingRate = SDLSamplingRate22Khz; + testRequest.samplingRate = SDLSamplingRate22KHZ; testRequest.maxDuration = @34563; testRequest.bitsPerSample = SDLBitsPerSample16Bit; - testRequest.audioType = SDLAudioTypePcm; + testRequest.audioType = SDLAudioTypePCM; testRequest.muteAudio = @NO; expect(testRequest.audioPassThruDisplayText1).to(equal(@"passthru#1")); expect(testRequest.audioPassThruDisplayText2).to(equal(@"passthru#2")); - expect(testRequest.samplingRate).to(equal(SDLSamplingRate22Khz)); + expect(testRequest.samplingRate).to(equal(SDLSamplingRate22KHZ)); expect(testRequest.maxDuration).to(equal(@34563)); expect(testRequest.bitsPerSample).to(equal(SDLBitsPerSample16Bit)); - expect(testRequest.audioType).to(equal(SDLAudioTypePcm)); + expect(testRequest.audioType).to(equal(SDLAudioTypePCM)); expect(testRequest.muteAudio).to(equal(@NO)); }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_audioPassThruDisplayText1:@"passthru#1", - NAMES_audioPassThruDisplayText2:@"passthru#2", - NAMES_samplingRate:SDLSamplingRate22Khz, - NAMES_maxDuration:@34563, - NAMES_bitsPerSample:SDLBitsPerSample16Bit, - NAMES_audioType:SDLAudioTypePcm, - NAMES_muteAudio:@NO}, - NAMES_operation_name:NAMES_PerformAudioPassThru}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameAudioPassThruDisplayText1:@"passthru#1", + SDLNameAudioPassThruDisplayText2:@"passthru#2", + SDLNameSamplingRate:SDLSamplingRate22KHZ, + SDLNameMaxDuration:@34563, + SDLNameBitsPerSample:SDLBitsPerSample16Bit, + SDLNameAudioType:SDLAudioTypePCM, + SDLNameMuteAudio:@NO}, + SDLNameOperationName:SDLNamePerformAudioPassThru}} mutableCopy]; SDLPerformAudioPassThru* testRequest = [[SDLPerformAudioPassThru alloc] initWithDictionary:dict]; expect(testRequest.audioPassThruDisplayText1).to(equal(@"passthru#1")); expect(testRequest.audioPassThruDisplayText2).to(equal(@"passthru#2")); - expect(testRequest.samplingRate).to(equal(SDLSamplingRate22Khz)); + expect(testRequest.samplingRate).to(equal(SDLSamplingRate22KHZ)); expect(testRequest.maxDuration).to(equal(@34563)); expect(testRequest.bitsPerSample).to(equal(SDLBitsPerSample16Bit)); - expect(testRequest.audioType).to(equal(SDLAudioTypePcm)); + expect(testRequest.audioType).to(equal(SDLAudioTypePCM)); expect(testRequest.muteAudio).to(equal(@NO)); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPerformInteractionSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPerformInteractionSpec.m index e36842fc9..a5bed69ae 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPerformInteractionSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPerformInteractionSpec.m @@ -28,7 +28,7 @@ describe(@"Getter/Setter Tests", ^ { testRequest.initialText = @"a"; testRequest.initialPrompt = [@[chunk1] mutableCopy]; - testRequest.interactionMode = SDLInteractionModeVrOnly; + testRequest.interactionMode = SDLInteractionModeVROnly; testRequest.interactionChoiceSetIDList = [@[@1, @2, @3] mutableCopy]; testRequest.helpPrompt = [@[chunk2] mutableCopy]; testRequest.timeoutPrompt = [@[chunk3] mutableCopy]; @@ -38,7 +38,7 @@ describe(@"Getter/Setter Tests", ^ { expect(testRequest.initialText).to(equal(@"a")); expect(testRequest.initialPrompt).to(equal([@[chunk1] mutableCopy])); - expect(testRequest.interactionMode).to(equal(SDLInteractionModeVrOnly)); + expect(testRequest.interactionMode).to(equal(SDLInteractionModeVROnly)); expect(testRequest.interactionChoiceSetIDList).to(equal([@[@1, @2, @3] mutableCopy])); expect(testRequest.helpPrompt).to(equal([@[chunk2] mutableCopy])); expect(testRequest.timeoutPrompt).to(equal([@[chunk3] mutableCopy])); @@ -48,23 +48,23 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_initialText:@"a", - NAMES_initialPrompt:[@[chunk1] mutableCopy], - NAMES_interactionMode:SDLInteractionModeVrOnly, - NAMES_interactionChoiceSetIDList:[@[@1, @2, @3] mutableCopy], - NAMES_helpPrompt:[@[chunk2] mutableCopy], - NAMES_timeoutPrompt:[@[chunk3] mutableCopy], - NAMES_timeout:@42000, - NAMES_vrHelp:[@[helpItem] mutableCopy], - NAMES_interactionLayout:SDLLayoutModeIconWithSearch}, - NAMES_operation_name:NAMES_PerformInteraction}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameInitialText:@"a", + SDLNameInitialPrompt:[@[chunk1] mutableCopy], + SDLNameInteractionMode:SDLInteractionModeVROnly, + SDLNameInteractionChoiceSetIdList:[@[@1, @2, @3] mutableCopy], + SDLNameHelpPrompt:[@[chunk2] mutableCopy], + SDLNameTimeoutPrompt:[@[chunk3] mutableCopy], + SDLNameTimeout:@42000, + SDLNameVRHelp:[@[helpItem] mutableCopy], + SDLNameInteractionLayout:SDLLayoutModeIconWithSearch}, + SDLNameOperationName:SDLNamePerformInteraction}} mutableCopy]; SDLPerformInteraction* testRequest = [[SDLPerformInteraction alloc] initWithDictionary:dict]; expect(testRequest.initialText).to(equal(@"a")); expect(testRequest.initialPrompt).to(equal([@[chunk1] mutableCopy])); - expect(testRequest.interactionMode).to(equal(SDLInteractionModeVrOnly)); + expect(testRequest.interactionMode).to(equal(SDLInteractionModeVROnly)); expect(testRequest.interactionChoiceSetIDList).to(equal([@[@1, @2, @3] mutableCopy])); expect(testRequest.helpPrompt).to(equal([@[chunk2] mutableCopy])); expect(testRequest.timeoutPrompt).to(equal([@[chunk3] mutableCopy])); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPutFileSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPutFileSpec.m index 02f5a1db2..3e3bed897 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPutFileSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLPutFileSpec.m @@ -20,14 +20,14 @@ describe(@"Getter/Setter Tests", ^ { SDLPutFile* testRequest = [[SDLPutFile alloc] init]; testRequest.syncFileName = @"fileName"; - testRequest.fileType = SDLFileTypeGraphicJpeg; + testRequest.fileType = SDLFileTypeGraphicJPEG; testRequest.persistentFile = @YES; testRequest.systemFile = @NO; testRequest.offset = @987654321; testRequest.length = @123456789; expect(testRequest.syncFileName).to(equal(@"fileName")); - expect(testRequest.fileType).to(equal(SDLFileTypeGraphicJpeg)); + expect(testRequest.fileType).to(equal(SDLFileTypeGraphicJPEG)); expect(testRequest.persistentFile).to(equal(@YES)); expect(testRequest.systemFile).to(equal(@NO)); expect(testRequest.offset).to(equal(@987654321)); @@ -35,19 +35,19 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_syncFileName:@"fileName", - NAMES_fileType:SDLFileTypeGraphicJpeg, - NAMES_persistentFile:@YES, - NAMES_systemFile:@NO, - NAMES_offset:@987654321, - NAMES_length:@123456789}, - NAMES_operation_name:NAMES_PutFile}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameSyncFileName:@"fileName", + SDLNameFileType:SDLFileTypeGraphicJPEG, + SDLNamePersistentFile:@YES, + SDLNameSystemFile:@NO, + SDLNameOffset:@987654321, + SDLNameLength:@123456789}, + SDLNameOperationName:SDLNamePutFile}} mutableCopy]; SDLPutFile* testRequest = [[SDLPutFile alloc] initWithDictionary:dict]; expect(testRequest.syncFileName).to(equal(@"fileName")); - expect(testRequest.fileType).to(equal(SDLFileTypeGraphicJpeg)); + expect(testRequest.fileType).to(equal(SDLFileTypeGraphicJPEG)); expect(testRequest.persistentFile).to(equal(@YES)); expect(testRequest.systemFile).to(equal(@NO)); expect(testRequest.offset).to(equal(@987654321)); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLReadDIDSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLReadDIDSpec.m index 7c5598bbb..31b65061f 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLReadDIDSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLReadDIDSpec.m @@ -25,11 +25,11 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_ecuName:@33112, - NAMES_didLocation:[@[@200, @201, @205] mutableCopy]}, - NAMES_operation_name:NAMES_EndAudioPassThru}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameECUName:@33112, + SDLNameDIDLocation:[@[@200, @201, @205] mutableCopy]}, + SDLNameOperationName:SDLNameEndAudioPassThru}} mutableCopy]; SDLReadDID* testRequest = [[SDLReadDID alloc] initWithDictionary:dict]; expect(testRequest.ecuName).to(equal(@33112)); @@ -44,4 +44,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLRegisterAppInterfaceSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLRegisterAppInterfaceSpec.m index d4b88cf2b..b3e926715 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLRegisterAppInterfaceSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLRegisterAppInterfaceSpec.m @@ -59,22 +59,22 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_syncMsgVersion:version, - NAMES_appName:@"app56", - NAMES_ttsName:[@[chunk] mutableCopy], - NAMES_ngnMediaScreenAppName:@"whatisanngn", - NAMES_vrSynonyms:[@[@"paraphrase of the original name"] mutableCopy], - NAMES_isMediaApplication:@NO, - NAMES_languageDesired:SDLLanguageNoNo, - NAMES_hmiDisplayLanguageDesired:SDLLanguagePtPt, - NAMES_appHMIType:[@[SDLAppHMITypeMessaging, SDLAppHMITypeInformation] copy], - NAMES_hashID:@"gercd35grw2", - NAMES_deviceInfo:info, - NAMES_appID:@"123456789", - NAMES_appInfo:appInfo}, - NAMES_operation_name:NAMES_RegisterAppInterface}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameSyncMessageVersion:version, + SDLNameAppName:@"app56", + SDLNameTTSName:[@[chunk] mutableCopy], + SDLNameNGNMediaScreenAppName:@"whatisanngn", + SDLNameVRSynonyms:[@[@"paraphrase of the original name"] mutableCopy], + SDLNameIsMediaApplication:@NO, + SDLNameLanguageDesired:SDLLanguageNoNo, + SDLNameHMIDisplayLanguageDesired:SDLLanguagePtPt, + SDLNameAppHMIType:[@[SDLAppHMITypeMessaging, SDLAppHMITypeInformation] copy], + SDLNameHashId:@"gercd35grw2", + SDLNameDeviceInfo:info, + SDLNameAppId:@"123456789", + SDLNameAppInfo:appInfo}, + SDLNameOperationName:SDLNameRegisterAppInterface}} mutableCopy]; SDLRegisterAppInterface* testRequest = [[SDLRegisterAppInterface alloc] initWithDictionary:dict]; expect(testRequest.syncMsgVersion).to(equal(version)); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLResetGlobalPropertiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLResetGlobalPropertiesSpec.m index a71b8c4b1..6f9b03c44 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLResetGlobalPropertiesSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLResetGlobalPropertiesSpec.m @@ -18,19 +18,19 @@ describe(@"Getter/Setter Tests", ^ { it(@"Should set and get correctly", ^ { SDLResetGlobalProperties* testRequest = [[SDLResetGlobalProperties alloc] init]; - testRequest.properties = [@[SDLGlobalPropertyMenuName, SDLGlobalPropertyVrHelpTitle] copy]; + testRequest.properties = [@[SDLGlobalPropertyMenuName, SDLGlobalPropertyVRHelpTitle] copy]; - expect(testRequest.properties).to(equal([@[SDLGlobalPropertyMenuName, SDLGlobalPropertyVrHelpTitle] copy])); + expect(testRequest.properties).to(equal([@[SDLGlobalPropertyMenuName, SDLGlobalPropertyVRHelpTitle] copy])); }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_properties:[@[SDLGlobalPropertyMenuName, SDLGlobalPropertyVrHelpTitle] copy]}, - NAMES_operation_name:NAMES_ResetGlobalProperties}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameProperties:[@[SDLGlobalPropertyMenuName, SDLGlobalPropertyVRHelpTitle] copy]}, + SDLNameOperationName:SDLNameResetGlobalProperties}} mutableCopy]; SDLResetGlobalProperties* testRequest = [[SDLResetGlobalProperties alloc] initWithDictionary:dict]; - expect(testRequest.properties).to(equal([@[SDLGlobalPropertyMenuName, SDLGlobalPropertyVrHelpTitle] copy])); + expect(testRequest.properties).to(equal([@[SDLGlobalPropertyMenuName, SDLGlobalPropertyVRHelpTitle] copy])); }); it(@"Should return nil if not set", ^ { diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLScrollableMessageSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLScrollableMessageSpec.m index 6b1142d6b..0787d4e34 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLScrollableMessageSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLScrollableMessageSpec.m @@ -30,12 +30,12 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_scrollableMessageBody:@"thatmessagebody", - NAMES_timeout:@9182, - NAMES_softButtons:[@[button] mutableCopy]}, - NAMES_operation_name:NAMES_ScrollableMessage}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameScrollableMessageBody:@"thatmessagebody", + SDLNameTimeout:@9182, + SDLNameSoftButtons:[@[button] mutableCopy]}, + SDLNameOperationName:SDLNameScrollableMessage}} mutableCopy]; SDLScrollableMessage* testRequest = [[SDLScrollableMessage alloc] initWithDictionary:dict]; expect(testRequest.scrollableMessageBody).to(equal(@"thatmessagebody")); @@ -52,4 +52,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSendLocationSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSendLocationSpec.m index ccd4bafdb..c1532a4ec 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSendLocationSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSendLocationSpec.m @@ -124,15 +124,15 @@ describe(@"Send Location RPC", ^{ somePhoneNumber = @"248-591-0333"; someImage = [[SDLImage alloc] init]; NSDictionary *initDict = @{ - NAMES_request: @{ - NAMES_parameters: @{ - NAMES_longitudeDegrees: someLongitude, - NAMES_latitudeDegrees: someLatitude, - NAMES_locationName: someLocation, - NAMES_locationDescription: someLocationDescription, - NAMES_addressLines: someAddressLines, - NAMES_phoneNumber: somePhoneNumber, - NAMES_locationImage: someImage + SDLNameRequest: @{ + SDLNameParameters: @{ + SDLNameLongitudeDegrees: someLongitude, + SDLNameLatitudeDegrees: someLatitude, + SDLNameLocationName: someLocation, + SDLNameLocationDescription: someLocationDescription, + SDLNameAddressLines: someAddressLines, + SDLNamePhoneNumber: somePhoneNumber, + SDLNameLocationImage: someImage } } }; @@ -180,8 +180,8 @@ describe(@"Send Location RPC", ^{ context(@"when parameters are not set", ^{ beforeEach(^{ NSDictionary *initDict = @{ - NAMES_request: @{ - NAMES_parameters: @{} + SDLNameRequest: @{ + SDLNameParameters: @{} } }; diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetAppIconSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetAppIconSpec.m index 9c24c9e91..af6e55771 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetAppIconSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetAppIconSpec.m @@ -23,10 +23,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_syncFileName:@"A/File/Name"}, - NAMES_operation_name:NAMES_SetAppIcon}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameSyncFileName:@"A/File/Name"}, + SDLNameOperationName:SDLNameSetAppIcon}} mutableCopy]; SDLSetAppIcon* testRequest = [[SDLSetAppIcon alloc] initWithDictionary:dict]; expect(testRequest.syncFileName).to(equal(@"A/File/Name")); @@ -39,4 +39,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetDisplayLayoutSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetDisplayLayoutSpec.m index 41e63323a..74684e7a7 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetDisplayLayoutSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetDisplayLayoutSpec.m @@ -23,10 +23,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_displayLayout:@"wat"}, - NAMES_operation_name:NAMES_SetDisplayLayout}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameDisplayLayout:@"wat"}, + SDLNameOperationName:SDLNameSetDisplayLayout}} mutableCopy]; SDLSetDisplayLayout* testRequest = [[SDLSetDisplayLayout alloc] initWithDictionary:dict]; expect(testRequest.displayLayout).to(equal(@"wat")); @@ -39,4 +39,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetGlobalPropertiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetGlobalPropertiesSpec.m index 437218896..b5228cc0a 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetGlobalPropertiesSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetGlobalPropertiesSpec.m @@ -46,16 +46,16 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_helpPrompt:[@[chunk1] mutableCopy], - NAMES_timeoutPrompt:[@[chunk2] mutableCopy], - NAMES_vrHelpTitle:@"vr", - NAMES_vrHelp:[@[help] mutableCopy], - NAMES_menuTitle:@"TheNewMenu", - NAMES_menuIcon:image, - NAMES_keyboardProperties:keyboard}, - NAMES_operation_name:NAMES_SetGlobalProperties}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameHelpPrompt:[@[chunk1] mutableCopy], + SDLNameTimeoutPrompt:[@[chunk2] mutableCopy], + SDLNameVRHelpTitle:@"vr", + SDLNameVRHelp:[@[help] mutableCopy], + SDLNameMenuTitle:@"TheNewMenu", + SDLNameMenuIcon:image, + SDLNameKeyboardProperties:keyboard}, + SDLNameOperationName:SDLNameSetGlobalProperties}} mutableCopy]; SDLSetGlobalProperties* testRequest = [[SDLSetGlobalProperties alloc] initWithDictionary:dict]; expect(testRequest.helpPrompt).to(equal([@[chunk1] mutableCopy])); @@ -80,4 +80,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetMediaClockTimerSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetMediaClockTimerSpec.m index 46a278124..bf8243ab8 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetMediaClockTimerSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSetMediaClockTimerSpec.m @@ -33,12 +33,12 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_startTime:time1, - NAMES_endTime:time2, - NAMES_updateMode:SDLUpdateModeCountUp}, - NAMES_operation_name:NAMES_SetMediaClockTimer}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameStartTime:time1, + SDLNameEndTime:time2, + SDLNameUpdateMode:SDLUpdateModeCountUp}, + SDLNameOperationName:SDLNameSetMediaClockTimer}} 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 3af100462..8b8c0928b 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLShowConstantTBTSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLShowConstantTBTSpec.m @@ -50,20 +50,20 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_navigationText1:@"nav1", - NAMES_navigationText2:@"nav2", - NAMES_eta:@"4/1/7015", - NAMES_timeToDestination:@"5000 Years", - NAMES_totalDistance:@"1 parsec", - NAMES_turnIcon:image1, - NAMES_nextTurnIcon:image2, - NAMES_distanceToManeuver:@2, - NAMES_distanceToManeuverScale:@4, - NAMES_maneuverComplete:@NO, - NAMES_softButtons:[@[button] mutableCopy]}, - NAMES_operation_name:NAMES_ShowConstantTBT}} mutableCopy]; + NSMutableDictionary* 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]; SDLShowConstantTBT* testRequest = [[SDLShowConstantTBT alloc] initWithDictionary:dict]; expect(testRequest.navigationText1).to(equal(@"nav1")); @@ -96,4 +96,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLShowSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLShowSpec.m index fb2a91e86..1c4796bff 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLShowSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLShowSpec.m @@ -53,21 +53,21 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_mainField1:@"field1", - NAMES_mainField2:@"field2", - NAMES_mainField3:@"field3", - NAMES_mainField4:@"field4", - NAMES_alignment:SDLTextAlignmentLeftAligned, - NAMES_statusBar:@"status", - NAMES_mediaClock:@"TheTime", - NAMES_mediaTrack:@"In The Clear", - NAMES_graphic:image1, - NAMES_secondaryGraphic:image2, - NAMES_softButtons:[@[button] mutableCopy], - NAMES_customPresets:[@[@"preset1", @"preset2"] mutableCopy]}, - NAMES_operation_name:NAMES_Show}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameMainField1:@"field1", + SDLNameMainField2:@"field2", + SDLNameMainField3:@"field3", + SDLNameMainField4:@"field4", + SDLNameAlignment:SDLTextAlignmentLeftAligned, + SDLNameStatusBar:@"status", + SDLNameMediaClock:@"TheTime", + SDLNameMediaTrack:@"In The Clear", + SDLNameGraphic:image1, + SDLNameSecondaryGraphic:image2, + SDLNameSoftButtons:[@[button] mutableCopy], + SDLNameCustomPresets:[@[@"preset1", @"preset2"] mutableCopy]}, + SDLNameOperationName:SDLNameShow}} 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 7455bcf51..e0e49ca3c 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSliderSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSliderSpec.m @@ -31,14 +31,14 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_numTicks:@2, - NAMES_position:@1, - NAMES_sliderHeader:@"Head", - NAMES_sliderFooter:[@[@"LeftFoot", @"RightFoot"] mutableCopy], - NAMES_timeout:@2000}, - NAMES_operation_name:NAMES_Slider}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameNumberTicks:@2, + SDLNamePosition:@1, + SDLNameSliderHeader:@"Head", + SDLNameSliderFooter:[@[@"LeftFoot", @"RightFoot"] mutableCopy], + SDLNameTimeout:@2000}, + SDLNameOperationName:SDLNameSlider}} mutableCopy]; SDLSlider* testRequest = [[SDLSlider alloc] initWithDictionary:dict]; expect(testRequest.numTicks).to(equal(@2)); @@ -59,4 +59,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSpeakSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSpeakSpec.m index dd6b6a400..7781f4458 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSpeakSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSpeakSpec.m @@ -26,10 +26,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_ttsChunks:[@[chunk] mutableCopy]}, - NAMES_operation_name:NAMES_Speak}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameTTSChunks:[@[chunk] mutableCopy]}, + SDLNameOperationName:SDLNameSpeak}} mutableCopy]; SDLSpeak* testRequest = [[SDLSpeak alloc] initWithDictionary:dict]; expect(testRequest.ttsChunks).to(equal([@[chunk] mutableCopy])); @@ -42,4 +42,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeButtonSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeButtonSpec.m index 0b4d8d591..c541ccc40 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeButtonSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeButtonSpec.m @@ -25,10 +25,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_buttonName:SDLButtonNamePreset5}, - NAMES_operation_name:NAMES_SubscribeButton}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameButtonName:SDLButtonNamePreset5}, + SDLNameOperationName:SDLNameSubscribeButton}} 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 c35d45db3..25af6ca52 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeVehicleDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeVehicleDataSpec.m @@ -69,33 +69,33 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_gps:@YES, - NAMES_speed:@NO, - NAMES_rpm:@YES, - NAMES_fuelLevel:@NO, - NAMES_fuelLevel_State:@YES, - NAMES_instantFuelConsumption:@NO, - NAMES_externalTemperature:@YES, - NAMES_prndl:@YES, - NAMES_tirePressure:@NO, - NAMES_odometer:@YES, - NAMES_beltStatus:@NO, - NAMES_bodyInformation:@YES, - NAMES_deviceStatus:@NO, - NAMES_driverBraking:@YES, - NAMES_wiperStatus:@NO, - NAMES_headLampStatus:@YES, - NAMES_engineTorque:@NO, - NAMES_accPedalPosition:@YES, - NAMES_steeringWheelAngle:@NO, - NAMES_eCallInfo:@YES, - NAMES_airbagStatus:@NO, - NAMES_emergencyEvent:@YES, - NAMES_clusterModeStatus:@NO, - NAMES_myKey:@YES}, - NAMES_operation_name:NAMES_SubscribeVehicleData}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameGPS:@YES, + SDLNameSpeed:@NO, + SDLNameRPM:@YES, + SDLNameFuelLevel:@NO, + SDLNameFuelLevelState:@YES, + SDLNameInstantFuelConsumption:@NO, + SDLNameExternalTemperature:@YES, + SDLNamePRNDL:@YES, + SDLNameTirePressure:@NO, + SDLNameOdometer:@YES, + SDLNameBeltStatus:@NO, + SDLNameBodyInformation:@YES, + SDLNameDeviceStatus:@NO, + SDLNameDriverBraking:@YES, + SDLNameWiperStatus:@NO, + SDLNameHeadLampStatus:@YES, + SDLNameEngineTorque:@NO, + SDLNameAccelerationPedalPosition:@YES, + SDLNameSteeringWheelAngle:@NO, + SDLNameECallInfo:@YES, + SDLNameAirbagStatus:@NO, + SDLNameEmergencyEvent:@YES, + SDLNameClusterModeStatus:@NO, + SDLNameMyKey:@YES}, + SDLNameOperationName:SDLNameSubscribeVehicleData}} mutableCopy]; SDLSubscribeVehicleData* testRequest = [[SDLSubscribeVehicleData alloc] initWithDictionary:dict]; expect(testRequest.gps).to(equal(@YES)); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSystemRequestSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSystemRequestSpec.m index 4f7cb780c..d7ccade49 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSystemRequestSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSystemRequestSpec.m @@ -18,22 +18,22 @@ describe(@"Getter/Setter Tests", ^ { it(@"Should set and get correctly", ^ { SDLSystemRequest* testRequest = [[SDLSystemRequest alloc] init]; - testRequest.requestType = SDLRequestTypeAuthRequest; + testRequest.requestType = SDLRequestTypeAuthenticationRequest; testRequest.fileName = @"AnotherFile"; - expect(testRequest.requestType).to(equal(SDLRequestTypeAuthRequest)); + expect(testRequest.requestType).to(equal(SDLRequestTypeAuthenticationRequest)); expect(testRequest.fileName).to(equal(@"AnotherFile")); }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_requestType:SDLRequestTypeAuthRequest, - NAMES_fileName:@"AnotherFile"}, - NAMES_operation_name:NAMES_SystemRequest}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameRequestType:SDLRequestTypeAuthenticationRequest, + SDLNameFilename:@"AnotherFile"}, + SDLNameOperationName:SDLNameSystemRequest}} mutableCopy]; SDLSystemRequest* testRequest = [[SDLSystemRequest alloc] initWithDictionary:dict]; - expect(testRequest.requestType).to(equal(SDLRequestTypeAuthRequest)); + expect(testRequest.requestType).to(equal(SDLRequestTypeAuthenticationRequest)); expect(testRequest.fileName).to(equal(@"AnotherFile")); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeButtonSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeButtonSpec.m index 701263d6c..e4d693685 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeButtonSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeButtonSpec.m @@ -25,10 +25,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_buttonName:SDLButtonNamePreset0}, - NAMES_operation_name:NAMES_UnsubscribeButton}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameButtonName:SDLButtonNamePreset0}, + SDLNameOperationName:SDLNameUnsubscribeButton}} 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 1bb2cb125..f4efec0fc 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeVehicleDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeVehicleDataSpec.m @@ -69,33 +69,33 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_gps:@YES, - NAMES_speed:@YES, - NAMES_rpm:@YES, - NAMES_fuelLevel:@YES, - NAMES_fuelLevel_State:@YES, - NAMES_instantFuelConsumption:@YES, - NAMES_externalTemperature:@YES, - NAMES_prndl:@YES, - NAMES_tirePressure:@YES, - NAMES_odometer:@YES, - NAMES_beltStatus:@YES, - NAMES_bodyInformation:@YES, - NAMES_deviceStatus:@YES, - NAMES_driverBraking:@YES, - NAMES_wiperStatus:@YES, - NAMES_headLampStatus:@YES, - NAMES_engineTorque:@YES, - NAMES_accPedalPosition:@YES, - NAMES_steeringWheelAngle:@YES, - NAMES_eCallInfo:@YES, - NAMES_airbagStatus:@YES, - NAMES_emergencyEvent:@YES, - NAMES_clusterModeStatus:@YES, - NAMES_myKey:@YES}, - NAMES_operation_name:NAMES_UnsubscribeVehicleData}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameGPS:@YES, + SDLNameSpeed:@YES, + SDLNameRPM:@YES, + SDLNameFuelLevel:@YES, + SDLNameFuelLevelState:@YES, + SDLNameInstantFuelConsumption:@YES, + SDLNameExternalTemperature:@YES, + SDLNamePRNDL:@YES, + SDLNameTirePressure:@YES, + SDLNameOdometer:@YES, + SDLNameBeltStatus:@YES, + SDLNameBodyInformation:@YES, + SDLNameDeviceStatus:@YES, + SDLNameDriverBraking:@YES, + SDLNameWiperStatus:@YES, + SDLNameHeadLampStatus:@YES, + SDLNameEngineTorque:@YES, + SDLNameAccelerationPedalPosition:@YES, + SDLNameSteeringWheelAngle:@YES, + SDLNameECallInfo:@YES, + SDLNameAirbagStatus:@YES, + SDLNameEmergencyEvent:@YES, + SDLNameClusterModeStatus:@YES, + SDLNameMyKey:@YES}, + SDLNameOperationName:SDLNameUnsubscribeVehicleData}} mutableCopy]; SDLUnsubscribeVehicleData* testRequest = [[SDLUnsubscribeVehicleData alloc] initWithDictionary:dict]; expect(testRequest.gps).to(equal(@YES)); diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUpdateTurnListSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUpdateTurnListSpec.m index ae1d55823..4806ef21f 100644 --- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUpdateTurnListSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUpdateTurnListSpec.m @@ -30,11 +30,11 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_turnList:[@[turn] mutableCopy], - NAMES_softButtons:[@[button] mutableCopy]}, - NAMES_operation_name:NAMES_UpdateTurnList}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameTurnList:[@[turn] mutableCopy], + SDLNameSoftButtons:[@[button] mutableCopy]}, + SDLNameOperationName:SDLNameUpdateTurnList}} mutableCopy]; SDLUpdateTurnList* testRequest = [[SDLUpdateTurnList alloc] initWithDictionary:dict]; expect(testRequest.turnList).to(equal([@[turn] mutableCopy])); @@ -49,4 +49,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLDeleteFileResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLDeleteFileResponseSpec.m index 64e8522c9..a78d757c8 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLDeleteFileResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLDeleteFileResponseSpec.m @@ -23,10 +23,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_response: - @{NAMES_parameters: - @{NAMES_spaceAvailable:@0}, - NAMES_operation_name:NAMES_DeleteFile}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameResponse: + @{SDLNameParameters: + @{SDLNameSpaceAvailable:@0}, + SDLNameOperationName:SDLNameDeleteFile}} mutableCopy]; SDLDeleteFileResponse* testResponse = [[SDLDeleteFileResponse alloc] initWithDictionary:dict]; expect(testResponse.spaceAvailable).to(equal(@0)); @@ -39,4 +39,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLDiagnosticMessageResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLDiagnosticMessageResponseSpec.m index 7507bbe5a..b322f961d 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLDiagnosticMessageResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLDiagnosticMessageResponseSpec.m @@ -23,10 +23,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_response: - @{NAMES_parameters: - @{NAMES_messageDataResult:[@[@3, @9, @27, @81] mutableCopy]}, - NAMES_operation_name:NAMES_DiagnosticMessage}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameResponse: + @{SDLNameParameters: + @{SDLNameMessageDataResult:[@[@3, @9, @27, @81] mutableCopy]}, + SDLNameOperationName:SDLNameDiagnosticMessage}} mutableCopy]; SDLDiagnosticMessageResponse* testResponse = [[SDLDiagnosticMessageResponse alloc] initWithDictionary:dict]; expect(testResponse.messageDataResult).to(equal([@[@3, @9, @27, @81] mutableCopy])); @@ -39,4 +39,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetDTCsResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetDTCsResponseSpec.m index 150f9bd73..deb787b9a 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetDTCsResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetDTCsResponseSpec.m @@ -25,11 +25,11 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_response: - @{NAMES_parameters: - @{NAMES_ecuHeader:@404, - NAMES_dtc:[@[@"FFFF", @"FFFE", @"FFFD"] mutableCopy]}, - NAMES_operation_name:NAMES_GetDTCs}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameResponse: + @{SDLNameParameters: + @{SDLNameECUHeader:@404, + SDLNameDTC:[@[@"FFFF", @"FFFE", @"FFFD"] mutableCopy]}, + SDLNameOperationName:SDLNameGetDTCs}} mutableCopy]; SDLGetDTCsResponse* testResponse = [[SDLGetDTCsResponse alloc] initWithDictionary:dict]; expect(testResponse.ecuHeader).to(equal(@404)); @@ -44,4 +44,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetVehicleDataResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetVehicleDataResponseSpec.m index e9206bb9c..9831ec761 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetVehicleDataResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetVehicleDataResponseSpec.m @@ -45,7 +45,7 @@ describe(@"Getter/Setter Tests", ^ { testResponse.bodyInformation = body; testResponse.deviceStatus = device; testResponse.driverBraking = SDLVehicleDataEventStatusNoEvent; - testResponse.wiperStatus = SDLWiperStatusAutoHigh; + testResponse.wiperStatus = SDLWiperStatusAutomaticHigh; testResponse.headLampStatus = headLamp; testResponse.engineTorque = @630.4; testResponse.accPedalPosition = @0; @@ -71,7 +71,7 @@ describe(@"Getter/Setter Tests", ^ { expect(testResponse.bodyInformation).to(equal(body)); expect(testResponse.deviceStatus).to(equal(device)); expect(testResponse.driverBraking).to(equal(SDLVehicleDataEventStatusNoEvent)); - expect(testResponse.wiperStatus).to(equal(SDLWiperStatusAutoHigh)); + expect(testResponse.wiperStatus).to(equal(SDLWiperStatusAutomaticHigh)); expect(testResponse.headLampStatus).to(equal(headLamp)); expect(testResponse.engineTorque).to(equal(@630.4)); expect(testResponse.accPedalPosition).to(equal(@0)); @@ -84,34 +84,34 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_notification: - @{NAMES_parameters: - @{NAMES_gps:gps, - NAMES_speed:@100, - NAMES_rpm:@3, - NAMES_fuelLevel:@99.9999, - NAMES_fuelLevel_State:SDLComponentVolumeStatusFault, - NAMES_instantFuelConsumption:@40.7, - NAMES_externalTemperature:@0, - NAMES_vin:@"6574839201", - NAMES_prndl:SDLPRNDLPark, - NAMES_tirePressure:tires, - NAMES_odometer:@70000, - NAMES_beltStatus:belt, - NAMES_bodyInformation:body, - NAMES_deviceStatus:device, - NAMES_driverBraking:SDLVehicleDataEventStatusNoEvent, - NAMES_wiperStatus:SDLWiperStatusAutoHigh, - NAMES_headLampStatus:headLamp, - NAMES_engineTorque:@630.4, - NAMES_accPedalPosition:@0, - NAMES_steeringWheelAngle:@-1500, - NAMES_eCallInfo:eCall, - NAMES_airbagStatus:airbag, - NAMES_emergencyEvent:event, - NAMES_clusterModeStatus:clusterMode, - NAMES_myKey:myKey}, - NAMES_operation_name:NAMES_GetVehicleData}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameNotification: + @{SDLNameParameters: + @{SDLNameGPS:gps, + SDLNameSpeed:@100, + SDLNameRPM:@3, + SDLNameFuelLevel:@99.9999, + SDLNameFuelLevelState:SDLComponentVolumeStatusFault, + SDLNameInstantFuelConsumption:@40.7, + SDLNameExternalTemperature:@0, + SDLNameVIN:@"6574839201", + SDLNamePRNDL:SDLPRNDLPark, + SDLNameTirePressure:tires, + SDLNameOdometer:@70000, + SDLNameBeltStatus:belt, + SDLNameBodyInformation:body, + SDLNameDeviceStatus:device, + SDLNameDriverBraking:SDLVehicleDataEventStatusNoEvent, + SDLNameWiperStatus:SDLWiperStatusAutomaticHigh, + SDLNameHeadLampStatus:headLamp, + SDLNameEngineTorque:@630.4, + SDLNameAccelerationPedalPosition:@0, + SDLNameSteeringWheelAngle:@-1500, + SDLNameECallInfo:eCall, + SDLNameAirbagStatus:airbag, + SDLNameEmergencyEvent:event, + SDLNameClusterModeStatus:clusterMode, + SDLNameMyKey:myKey}, + SDLNameOperationName:SDLNameGetVehicleData}} mutableCopy]; SDLGetVehicleDataResponse* testResponse = [[SDLGetVehicleDataResponse alloc] initWithDictionary:dict]; expect(testResponse.gps).to(equal(gps)); @@ -129,7 +129,7 @@ describe(@"Getter/Setter Tests", ^ { expect(testResponse.bodyInformation).to(equal(body)); expect(testResponse.deviceStatus).to(equal(device)); expect(testResponse.driverBraking).to(equal(SDLVehicleDataEventStatusNoEvent)); - expect(testResponse.wiperStatus).to(equal(SDLWiperStatusAutoHigh)); + expect(testResponse.wiperStatus).to(equal(SDLWiperStatusAutomaticHigh)); expect(testResponse.headLampStatus).to(equal(headLamp)); expect(testResponse.engineTorque).to(equal(@630.4)); expect(testResponse.accPedalPosition).to(equal(@0)); diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLListFilesResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLListFilesResponseSpec.m index 824bc7517..8934562eb 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLListFilesResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLListFilesResponseSpec.m @@ -25,11 +25,11 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_response: - @{NAMES_parameters: - @{NAMES_filenames:[@[@"Music/music.mp3", @"Documents/document.txt", @"Downloads/format.exe"] mutableCopy], - NAMES_spaceAvailable:@500000000}, - NAMES_operation_name:NAMES_ListFiles}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameResponse: + @{SDLNameParameters: + @{SDLNameFilenames:[@[@"Music/music.mp3", @"Documents/document.txt", @"Downloads/format.exe"] mutableCopy], + SDLNameSpaceAvailable:@500000000}, + SDLNameOperationName:SDLNameListFiles}} mutableCopy]; SDLListFilesResponse* testResponse = [[SDLListFilesResponse alloc] initWithDictionary:dict]; expect(testResponse.filenames).to(equal([@[@"Music/music.mp3", @"Documents/document.txt", @"Downloads/format.exe"] mutableCopy])); @@ -44,4 +44,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLPerformInteractionResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLPerformInteractionResponseSpec.m index a7d595c0e..fc2219356 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLPerformInteractionResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLPerformInteractionResponseSpec.m @@ -29,12 +29,12 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_response: - @{NAMES_parameters: - @{NAMES_choiceID:@25, - NAMES_manualTextEntry:@"entry", - NAMES_triggerSource:SDLTriggerSourceKeyboard}, - NAMES_operation_name:NAMES_PerformInteraction}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameResponse: + @{SDLNameParameters: + @{SDLNameChoiceId:@25, + SDLNameManualTextEntry:@"entry", + SDLNameTriggerSource:SDLTriggerSourceKeyboard}, + SDLNameOperationName:SDLNamePerformInteraction}} mutableCopy]; SDLPerformInteractionResponse* testResponse = [[SDLPerformInteractionResponse alloc] initWithDictionary:dict]; expect(testResponse.choiceID).to(equal(@25)); diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLPutFileResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLPutFileResponseSpec.m index 565f97a79..52ed9bf7b 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLPutFileResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLPutFileResponseSpec.m @@ -23,10 +23,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_response: - @{NAMES_parameters: - @{NAMES_spaceAvailable:@1248}, - NAMES_operation_name:NAMES_PutFile}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameResponse: + @{SDLNameParameters: + @{SDLNameSpaceAvailable:@1248}, + SDLNameOperationName:SDLNamePutFile}} mutableCopy]; SDLPutFileResponse* testResponse = [[SDLPutFileResponse alloc] initWithDictionary:dict]; expect(testResponse.spaceAvailable).to(equal(@1248)); @@ -39,4 +39,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLReadDIDResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLReadDIDResponseSpec.m index 0ae2c5b9d..d5f080aba 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLReadDIDResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLReadDIDResponseSpec.m @@ -26,10 +26,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_response: - @{NAMES_parameters: - @{NAMES_didResult:[@[result] mutableCopy]}, - NAMES_operation_name:NAMES_ReadDID}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameResponse: + @{SDLNameParameters: + @{SDLNameDIDResult:[@[result] mutableCopy]}, + SDLNameOperationName:SDLNameReadDID}} mutableCopy]; SDLReadDIDResponse* testResponse = [[SDLReadDIDResponse alloc] initWithDictionary:dict]; expect(testResponse.didResult).to(equal([@[result] mutableCopy])); @@ -42,4 +42,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLRegisterAppInterfaceResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLRegisterAppInterfaceResponseSpec.m index 7dfefaad6..81f64528f 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLRegisterAppInterfaceResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLRegisterAppInterfaceResponseSpec.m @@ -35,11 +35,11 @@ describe(@"Getter/Setter Tests", ^ { testResponse.softButtonCapabilities = [@[softButton] mutableCopy]; testResponse.presetBankCapabilities = presetBank; testResponse.hmiZoneCapabilities = [@[SDLHMIZoneCapabilitiesBack, SDLHMIZoneCapabilitiesFront] copy]; - testResponse.speechCapabilities = [@[SDLSpeechCapabilitiesSapiPhonemes, SDLSpeechCapabilitiesSilence] copy]; + testResponse.speechCapabilities = [@[SDLSpeechCapabilitiesSAPIPhonemes, SDLSpeechCapabilitiesSilence] copy]; testResponse.vrCapabilities = [@[SDLVRCapabilitiesText] copy]; testResponse.audioPassThruCapabilities = [@[audioPassThru] mutableCopy]; testResponse.vehicleType = vehicle; - testResponse.prerecordedSpeech = [@[SDLPrerecordedSpeechListenJingle, SDLPrerecordedSpeechHelpJingle] copy]; + testResponse.prerecordedSpeech = [@[SDLPrerecordedSpeechListen, SDLPrerecordedSpeechHelp] copy]; testResponse.supportedDiagModes = [@[@67, @99, @111] mutableCopy]; testResponse.hmiCapabilities = hmiCapabilities; testResponse.sdlVersion = @"sdlVersion"; @@ -53,11 +53,11 @@ describe(@"Getter/Setter Tests", ^ { expect(testResponse.softButtonCapabilities).to(equal([@[softButton] mutableCopy])); expect(testResponse.presetBankCapabilities).to(equal(presetBank)); expect(testResponse.hmiZoneCapabilities).to(equal([@[SDLHMIZoneCapabilitiesBack, SDLHMIZoneCapabilitiesFront] copy])); - expect(testResponse.speechCapabilities).to(equal([@[SDLSpeechCapabilitiesSapiPhonemes, SDLSpeechCapabilitiesSilence] copy])); + expect(testResponse.speechCapabilities).to(equal([@[SDLSpeechCapabilitiesSAPIPhonemes, SDLSpeechCapabilitiesSilence] copy])); expect(testResponse.vrCapabilities).to(equal([@[SDLVRCapabilitiesText] copy])); expect(testResponse.audioPassThruCapabilities).to(equal([@[audioPassThru] mutableCopy])); expect(testResponse.vehicleType).to(equal(vehicle)); - expect(testResponse.prerecordedSpeech).to(equal([@[SDLPrerecordedSpeechListenJingle, SDLPrerecordedSpeechHelpJingle] copy])); + expect(testResponse.prerecordedSpeech).to(equal([@[SDLPrerecordedSpeechListen, SDLPrerecordedSpeechHelp] copy])); expect(testResponse.supportedDiagModes).to(equal([@[@67, @99, @111] mutableCopy])); expect(testResponse.hmiCapabilities).to(equal(hmiCapabilities)); expect(testResponse.sdlVersion).to(equal(@"sdlVersion")); @@ -65,26 +65,27 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_syncMsgVersion:version, - NAMES_language:SDLLanguageEsMx, - NAMES_hmiDisplayLanguage:SDLLanguageRuRu, NAMES_displayCapabilities:info, - NAMES_buttonCapabilities:[@[button] mutableCopy], - NAMES_softButtonCapabilities:[@[softButton] mutableCopy], - NAMES_presetBankCapabilities:presetBank, - NAMES_hmiZoneCapabilities:[@[SDLHMIZoneCapabilitiesBack, SDLHMIZoneCapabilitiesFront] copy], - NAMES_speechCapabilities:[@[SDLSpeechCapabilitiesSapiPhonemes, SDLSpeechCapabilitiesSilence] copy], - NAMES_vrCapabilities:[@[SDLVRCapabilitiesText] copy], - NAMES_audioPassThruCapabilities:[@[audioPassThru] mutableCopy], - NAMES_vehicleType:vehicle, - NAMES_prerecordedSpeech:[@[SDLPrerecordedSpeechListenJingle, SDLPrerecordedSpeechHelpJingle] mutableCopy], - NAMES_supportedDiagModes:[@[@67, @99, @111] mutableCopy], - NAMES_hmiCapabilities: hmiCapabilities, - NAMES_sdlVersion: @"sdlVersion", - NAMES_systemSoftwareVersion: @"systemSoftwareVersion" + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameSyncMessageVersion:version, + SDLNameLanguage:SDLLanguageEsMx, + SDLNameHMIDisplayLanguage:SDLLanguageRuRu, + SDLNameDisplayCapabilities:info, + SDLNameButtonCapabilities:[@[button] mutableCopy], + SDLNameSoftButtonCapabilities:[@[softButton] mutableCopy], + SDLNamePresetBankCapabilities:presetBank, + SDLNameHMIZoneCapabilities:[@[SDLHMIZoneCapabilitiesBack, SDLHMIZoneCapabilitiesFront] copy], + SDLNameSpeechCapabilities:[@[SDLSpeechCapabilitiesSAPIPhonemes, SDLSpeechCapabilitiesSilence] copy], + SDLNameVRCapabilities:[@[SDLVRCapabilitiesText] copy], + SDLNameAudioPassThruCapabilities:[@[audioPassThru] mutableCopy], + SDLNameVehicleType:vehicle, + SDLNamePrerecordedSpeech:[@[SDLPrerecordedSpeechListen, SDLPrerecordedSpeechHelp] mutableCopy], + SDLNameSupportedDiagnosticModes:[@[@67, @99, @111] mutableCopy], + SDLNameHMICapabilities: hmiCapabilities, + SDLNameSDLVersion: @"sdlVersion", + SDLNameSystemSoftwareVersion: @"systemSoftwareVersion" }, - NAMES_operation_name:NAMES_RegisterAppInterface}} mutableCopy]; + SDLNameOperationName:SDLNameRegisterAppInterface}} mutableCopy]; SDLRegisterAppInterfaceResponse* testResponse = [[SDLRegisterAppInterfaceResponse alloc] initWithDictionary:dict]; expect(testResponse.syncMsgVersion).to(equal(version)); @@ -95,11 +96,11 @@ describe(@"Getter/Setter Tests", ^ { expect(testResponse.softButtonCapabilities).to(equal([@[softButton] mutableCopy])); expect(testResponse.presetBankCapabilities).to(equal(presetBank)); expect(testResponse.hmiZoneCapabilities).to(equal([@[SDLHMIZoneCapabilitiesBack, SDLHMIZoneCapabilitiesFront] copy])); - expect(testResponse.speechCapabilities).to(equal([@[SDLSpeechCapabilitiesSapiPhonemes, SDLSpeechCapabilitiesSilence] copy])); + expect(testResponse.speechCapabilities).to(equal([@[SDLSpeechCapabilitiesSAPIPhonemes, SDLSpeechCapabilitiesSilence] copy])); expect(testResponse.vrCapabilities).to(equal([@[SDLVRCapabilitiesText] copy])); expect(testResponse.audioPassThruCapabilities).to(equal([@[audioPassThru] mutableCopy])); expect(testResponse.vehicleType).to(equal(vehicle)); - expect(testResponse.prerecordedSpeech).to(equal([@[SDLPrerecordedSpeechListenJingle, SDLPrerecordedSpeechHelpJingle] copy])); + expect(testResponse.prerecordedSpeech).to(equal([@[SDLPrerecordedSpeechListen, SDLPrerecordedSpeechHelp] copy])); expect(testResponse.supportedDiagModes).to(equal([@[@67, @99, @111] mutableCopy])); expect(testResponse.hmiCapabilities).to(equal(hmiCapabilities)); expect(testResponse.sdlVersion).to(equal(@"sdlVersion")); diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSetDisplayLayoutResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSetDisplayLayoutResponseSpec.m index 3eeab76a1..a589bfeea 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSetDisplayLayoutResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSetDisplayLayoutResponseSpec.m @@ -39,13 +39,13 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_request: - @{NAMES_parameters: - @{NAMES_displayCapabilities:info, - NAMES_buttonCapabilities:[@[button] mutableCopy], - NAMES_softButtonCapabilities:[@[softButton] mutableCopy], - NAMES_presetBankCapabilities:presetBank}, - NAMES_operation_name:NAMES_SetDisplayLayout}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRequest: + @{SDLNameParameters: + @{SDLNameDisplayCapabilities:info, + SDLNameButtonCapabilities:[@[button] mutableCopy], + SDLNameSoftButtonCapabilities:[@[softButton] mutableCopy], + SDLNamePresetBankCapabilities:presetBank}, + SDLNameOperationName:SDLNameSetDisplayLayout}} mutableCopy]; SDLSetDisplayLayoutResponse* testResponse = [[SDLSetDisplayLayoutResponse alloc] initWithDictionary:dict]; expect(testResponse.displayCapabilities).to(equal(info)); @@ -64,4 +64,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSliderResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSliderResponseSpec.m index 6f92c1e48..61666d57b 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSliderResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSliderResponseSpec.m @@ -24,10 +24,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_response: - @{NAMES_parameters: - @{NAMES_sliderPosition:@13}, - NAMES_operation_name:NAMES_Slider}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameResponse: + @{SDLNameParameters: + @{SDLNameSliderPosition:@13}, + SDLNameOperationName:SDLNameSlider}} mutableCopy]; SDLSliderResponse* testResponse = [[SDLSliderResponse alloc] initWithDictionary:dict]; expect(testResponse.sliderPosition).to(equal(@13)); @@ -40,4 +40,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m index d6c0dc6ac..6b6b93ddc 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m @@ -73,33 +73,33 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_response: - @{NAMES_parameters: - @{NAMES_gps:vehicleDataResult, - NAMES_speed:vehicleDataResult, - NAMES_rpm:vehicleDataResult, - NAMES_fuelLevel:vehicleDataResult, - NAMES_fuelLevel_State:vehicleDataResult, - NAMES_instantFuelConsumption:vehicleDataResult, - NAMES_externalTemperature:vehicleDataResult, - NAMES_prndl:vehicleDataResult, - NAMES_tirePressure:vehicleDataResult, - NAMES_odometer:vehicleDataResult, - NAMES_beltStatus:vehicleDataResult, - NAMES_bodyInformation:vehicleDataResult, - NAMES_deviceStatus:vehicleDataResult, - NAMES_driverBraking:vehicleDataResult, - NAMES_wiperStatus:vehicleDataResult, - NAMES_headLampStatus:vehicleDataResult, - NAMES_engineTorque:vehicleDataResult, - NAMES_accPedalPosition:vehicleDataResult, - NAMES_steeringWheelAngle:vehicleDataResult, - NAMES_eCallInfo:vehicleDataResult, - NAMES_airbagStatus:vehicleDataResult, - NAMES_emergencyEvent:vehicleDataResult, - NAMES_clusterModes:vehicleDataResult, - NAMES_myKey:vehicleDataResult}, - NAMES_operation_name:NAMES_SubscribeVehicleData}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameResponse: + @{SDLNameParameters: + @{SDLNameGPS:vehicleDataResult, + SDLNameSpeed:vehicleDataResult, + SDLNameRPM:vehicleDataResult, + SDLNameFuelLevel:vehicleDataResult, + SDLNameFuelLevelState:vehicleDataResult, + SDLNameInstantFuelConsumption:vehicleDataResult, + SDLNameExternalTemperature:vehicleDataResult, + SDLNamePRNDL:vehicleDataResult, + SDLNameTirePressure:vehicleDataResult, + SDLNameOdometer:vehicleDataResult, + SDLNameBeltStatus:vehicleDataResult, + SDLNameBodyInformation:vehicleDataResult, + SDLNameDeviceStatus:vehicleDataResult, + SDLNameDriverBraking:vehicleDataResult, + SDLNameWiperStatus:vehicleDataResult, + SDLNameHeadLampStatus:vehicleDataResult, + SDLNameEngineTorque:vehicleDataResult, + SDLNameAccelerationPedalPosition:vehicleDataResult, + SDLNameSteeringWheelAngle:vehicleDataResult, + SDLNameECallInfo:vehicleDataResult, + SDLNameAirbagStatus:vehicleDataResult, + SDLNameEmergencyEvent:vehicleDataResult, + SDLNameClusterModes:vehicleDataResult, + SDLNameMyKey:vehicleDataResult}, + SDLNameOperationName:SDLNameSubscribeVehicleData}} mutableCopy]; SDLSubscribeVehicleDataResponse* testResponse = [[SDLSubscribeVehicleDataResponse alloc] initWithDictionary:dict]; expect(testResponse.gps).to(equal(vehicleDataResult)); diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m index 29cb4e08c..022dd306f 100644 --- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m @@ -73,33 +73,33 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_response: - @{NAMES_parameters: - @{NAMES_gps:vehicleDataResult, - NAMES_speed:vehicleDataResult, - NAMES_rpm:vehicleDataResult, - NAMES_fuelLevel:vehicleDataResult, - NAMES_fuelLevel_State:vehicleDataResult, - NAMES_instantFuelConsumption:vehicleDataResult, - NAMES_externalTemperature:vehicleDataResult, - NAMES_prndl:vehicleDataResult, - NAMES_tirePressure:vehicleDataResult, - NAMES_odometer:vehicleDataResult, - NAMES_beltStatus:vehicleDataResult, - NAMES_bodyInformation:vehicleDataResult, - NAMES_deviceStatus:vehicleDataResult, - NAMES_driverBraking:vehicleDataResult, - NAMES_wiperStatus:vehicleDataResult, - NAMES_headLampStatus:vehicleDataResult, - NAMES_engineTorque:vehicleDataResult, - NAMES_accPedalPosition:vehicleDataResult, - NAMES_steeringWheelAngle:vehicleDataResult, - NAMES_eCallInfo:vehicleDataResult, - NAMES_airbagStatus:vehicleDataResult, - NAMES_emergencyEvent:vehicleDataResult, - NAMES_clusterModes:vehicleDataResult, - NAMES_myKey:vehicleDataResult}, - NAMES_operation_name:NAMES_UnsubscribeVehicleData}} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameResponse: + @{SDLNameParameters: + @{SDLNameGPS:vehicleDataResult, + SDLNameSpeed:vehicleDataResult, + SDLNameRPM:vehicleDataResult, + SDLNameFuelLevel:vehicleDataResult, + SDLNameFuelLevelState:vehicleDataResult, + SDLNameInstantFuelConsumption:vehicleDataResult, + SDLNameExternalTemperature:vehicleDataResult, + SDLNamePRNDL:vehicleDataResult, + SDLNameTirePressure:vehicleDataResult, + SDLNameOdometer:vehicleDataResult, + SDLNameBeltStatus:vehicleDataResult, + SDLNameBodyInformation:vehicleDataResult, + SDLNameDeviceStatus:vehicleDataResult, + SDLNameDriverBraking:vehicleDataResult, + SDLNameWiperStatus:vehicleDataResult, + SDLNameHeadLampStatus:vehicleDataResult, + SDLNameEngineTorque:vehicleDataResult, + SDLNameAccelerationPedalPosition:vehicleDataResult, + SDLNameSteeringWheelAngle:vehicleDataResult, + SDLNameECallInfo:vehicleDataResult, + SDLNameAirbagStatus:vehicleDataResult, + SDLNameEmergencyEvent:vehicleDataResult, + SDLNameClusterModes:vehicleDataResult, + SDLNameMyKey:vehicleDataResult}, + SDLNameOperationName:SDLNameUnsubscribeVehicleData}} mutableCopy]; SDLUnsubscribeVehicleDataResponse* testResponse = [[SDLUnsubscribeVehicleDataResponse alloc] initWithDictionary:dict]; expect(testResponse.gps).to(equal(vehicleDataResult)); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAirbagStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAirbagStatusSpec.m index d410bf112..01a535ce4 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAirbagStatusSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAirbagStatusSpec.m @@ -39,14 +39,14 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_driverAirbagDeployed:SDLVehicleDataEventStatusYes, - NAMES_driverSideAirbagDeployed:SDLVehicleDataEventStatusNoEvent, - NAMES_driverCurtainAirbagDeployed:SDLVehicleDataEventStatusNo, - NAMES_passengerAirbagDeployed:SDLVehicleDataEventStatusNotSupported, - NAMES_passengerCurtainAirbagDeployed:SDLVehicleDataEventStatusFault, - NAMES_driverKneeAirbagDeployed:SDLVehicleDataEventStatusNo, - NAMES_passengerSideAirbagDeployed:SDLVehicleDataEventStatusYes, - NAMES_passengerKneeAirbagDeployed:SDLVehicleDataEventStatusNoEvent} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameDriverAirbagDeployed:SDLVehicleDataEventStatusYes, + SDLNameDriverSideAirbagDeployed:SDLVehicleDataEventStatusNoEvent, + SDLNameDriverCurtainAirbagDeployed:SDLVehicleDataEventStatusNo, + SDLNamePassengerAirbagDeployed:SDLVehicleDataEventStatusNotSupported, + SDLNamePassengerCurtainAirbagDeployed:SDLVehicleDataEventStatusFault, + SDLNameDriverKneeAirbagDeployed:SDLVehicleDataEventStatusNo, + SDLNamePassengerSideAirbagDeployed:SDLVehicleDataEventStatusYes, + SDLNamePassengerKneeAirbagDeployed: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 424c299b8..73e2fc1bd 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAppInfoSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAppInfoSpec.m @@ -28,9 +28,9 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_appDisplayName:@"display name", - NAMES_appVersion:@"1.2.3.4", - NAMES_appBundleID:@"com.app.bundle"} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameAppDisplayName:@"display name", + SDLNameAppVersion:@"1.2.3.4", + SDLNameAppBundleId:@"com.app.bundle"} mutableCopy]; SDLAppInfo* testStruct = [[SDLAppInfo alloc] initWithDictionary:dict]; expect(testStruct.appDisplayName).to(equal(@"display name")); @@ -47,4 +47,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAudioPassThruCapabilitiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAudioPassThruCapabilitiesSpec.m index 5594325e8..5e2981852 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAudioPassThruCapabilitiesSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLAudioPassThruCapabilitiesSpec.m @@ -21,24 +21,24 @@ describe(@"Getter/Setter Tests", ^ { it(@"Should set and get correctly", ^ { SDLAudioPassThruCapabilities* testStruct = [[SDLAudioPassThruCapabilities alloc] init]; - testStruct.samplingRate = SDLSamplingRate22Khz; + testStruct.samplingRate = SDLSamplingRate22KHZ; testStruct.bitsPerSample = SDLBitsPerSample8Bit; - testStruct.audioType = SDLAudioTypePcm; + testStruct.audioType = SDLAudioTypePCM; - expect(testStruct.samplingRate).to(equal(SDLSamplingRate22Khz)); + expect(testStruct.samplingRate).to(equal(SDLSamplingRate22KHZ)); expect(testStruct.bitsPerSample).to(equal(SDLBitsPerSample8Bit)); - expect(testStruct.audioType).to(equal(SDLAudioTypePcm)); + expect(testStruct.audioType).to(equal(SDLAudioTypePCM)); }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_samplingRate:SDLSamplingRate22Khz, - NAMES_bitsPerSample:SDLBitsPerSample8Bit, - NAMES_audioType:SDLAudioTypePcm} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameSamplingRate:SDLSamplingRate22KHZ, + SDLNameBitsPerSample:SDLBitsPerSample8Bit, + SDLNameAudioType:SDLAudioTypePCM} mutableCopy]; SDLAudioPassThruCapabilities* testStruct = [[SDLAudioPassThruCapabilities alloc] initWithDictionary:dict]; - expect(testStruct.samplingRate).to(equal(SDLSamplingRate22Khz)); + expect(testStruct.samplingRate).to(equal(SDLSamplingRate22KHZ)); expect(testStruct.bitsPerSample).to(equal(SDLBitsPerSample8Bit)); - expect(testStruct.audioType).to(equal(SDLAudioTypePcm)); + expect(testStruct.audioType).to(equal(SDLAudioTypePCM)); }); it(@"Should return nil if not set", ^ { diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLBeltStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLBeltStatusSpec.m index a9d67e0a7..e6e9495c5 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLBeltStatusSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLBeltStatusSpec.m @@ -53,21 +53,21 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_driverBeltDeployed:SDLVehicleDataEventStatusNoEvent, - NAMES_passengerBeltDeployed:SDLVehicleDataEventStatusYes, - NAMES_passengerBuckleBelted:SDLVehicleDataEventStatusNo, - NAMES_driverBuckleBelted:SDLVehicleDataEventStatusFault, - NAMES_leftRow2BuckleBelted:SDLVehicleDataEventStatusYes, - NAMES_passengerChildDetected:SDLVehicleDataEventStatusNo, - NAMES_rightRow2BuckleBelted:SDLVehicleDataEventStatusNotSupported, - NAMES_middleRow2BuckleBelted:SDLVehicleDataEventStatusNoEvent, - NAMES_middleRow3BuckleBelted:SDLVehicleDataEventStatusYes, - NAMES_leftRow3BuckleBelted:SDLVehicleDataEventStatusFault, - NAMES_rightRow3BuckleBelted:SDLVehicleDataEventStatusNo, - NAMES_leftRearInflatableBelted:SDLVehicleDataEventStatusNotSupported, - NAMES_rightRearInflatableBelted:SDLVehicleDataEventStatusFault, - NAMES_middleRow1BeltDeployed:SDLVehicleDataEventStatusNoEvent, - NAMES_middleRow1BuckleBelted:SDLVehicleDataEventStatusNotSupported} mutableCopy]; + 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]; 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 eb2ac4b9c..6ed210075 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLBodyInformationSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLBodyInformationSpec.m @@ -37,13 +37,13 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_parkBrakeActive:@YES, - NAMES_ignitionStableStatus:SDLIgnitionStableStatusNotStable, - NAMES_ignitionStatus:SDLIgnitionStatusStart, - NAMES_driverDoorAjar:@NO, - NAMES_passengerDoorAjar:@NO, - NAMES_rearLeftDoorAjar:@NO, - NAMES_rearRightDoorAjar:@YES} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameParkBrakeActive:@YES, + SDLNameIgnitionStableStatus:SDLIgnitionStableStatusNotStable, + SDLNameIgnitionStatus:SDLIgnitionStatusStart, + SDLNameDriverDoorAjar:@NO, + SDLNamePassengerDoorAjar:@NO, + SDLNameRearLeftDoorAjar:@NO, + SDLNameRearRightDoorAjar:@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 602467baa..b10e0b094 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLButtonCapabilitiesSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLButtonCapabilitiesSpec.m @@ -31,10 +31,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_name:SDLButtonNameCustomButton, - NAMES_shortPressAvailable:@YES, - NAMES_longPressAvailable:@YES, - NAMES_upDownAvailable:@NO} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameName:SDLButtonNameCustomButton, + SDLNameShortPressAvailable:@YES, + SDLNameLongPressAvailable:@YES, + SDLNameUpDownAvailable:@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 63116976a..51405d639 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLChoiceSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLChoiceSpec.m @@ -40,13 +40,13 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_choiceID:@3, - NAMES_menuName:@"Hello", - NAMES_vrCommands:[@[@"1", @"2"] mutableCopy], - NAMES_image:image, - NAMES_secondaryText:@"Arbitrary", - NAMES_tertiaryText:@"qwerty", - NAMES_secondaryImage:secondaryImage} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameChoiceId:@3, + SDLNameMenuName:@"Hello", + SDLNameVRCommands:[@[@"1", @"2"] mutableCopy], + SDLNameImage:image, + SDLNameSecondaryText:@"Arbitrary", + SDLNameTertiaryText:@"qwerty", + SDLNameSecondaryImage:secondaryImage} mutableCopy]; SDLChoice* testStruct = [[SDLChoice alloc] initWithDictionary:dict]; expect(testStruct.choiceID).to(equal(@3)); @@ -71,4 +71,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLClusterModeStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLClusterModeStatusSpec.m index 790395244..f61afe79e 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLClusterModeStatusSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLClusterModeStatusSpec.m @@ -21,25 +21,25 @@ describe(@"Getter/Setter Tests", ^ { SDLClusterModeStatus* testStruct = [[SDLClusterModeStatus alloc] init]; testStruct.powerModeActive = @YES; - testStruct.powerModeQualificationStatus = SDLPowerModeQualificationStatusPowerModeEvaluationInProgress; + testStruct.powerModeQualificationStatus = SDLPowerModeQualificationStatusEvaluationInProgress; testStruct.carModeStatus = SDLCarModeStatusCrash; testStruct.powerModeStatus = SDLPowerModeStatusIgnitionOn; expect(testStruct.powerModeActive).to(equal(@YES)); - expect(testStruct.powerModeQualificationStatus).to(equal(SDLPowerModeQualificationStatusPowerModeEvaluationInProgress)); + expect(testStruct.powerModeQualificationStatus).to(equal(SDLPowerModeQualificationStatusEvaluationInProgress)); expect(testStruct.carModeStatus).to(equal(SDLCarModeStatusCrash)); expect(testStruct.powerModeStatus).to(equal(SDLPowerModeStatusIgnitionOn)); }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_powerModeActive:@NO, - NAMES_powerModeQualificationStatus:SDLPowerModeQualificationStatusPowerModeOk, - NAMES_carModeStatus:SDLCarModeStatusCrash, - NAMES_powerModeStatus:SDLPowerModeStatusKeyOut} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNamePowerModeActive:@NO, + SDLNamePowerModeQualificationStatus:SDLPowerModeQualificationStatusOk, + SDLNameCarModeStatus:SDLCarModeStatusCrash, + SDLNamePowerModeStatus:SDLPowerModeStatusKeyOut} mutableCopy]; SDLClusterModeStatus* testStruct = [[SDLClusterModeStatus alloc] initWithDictionary:dict]; expect(testStruct.powerModeActive).to(equal(@NO)); - expect(testStruct.powerModeQualificationStatus).to(equal(SDLPowerModeQualificationStatusPowerModeOk)); + expect(testStruct.powerModeQualificationStatus).to(equal(SDLPowerModeQualificationStatusOk)); expect(testStruct.carModeStatus).to(equal(SDLCarModeStatusCrash)); expect(testStruct.powerModeStatus).to(equal(SDLPowerModeStatusKeyOut)); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDIDResult.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDIDResult.m index e5f44532b..d0715bded 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDIDResult.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDIDResult.m @@ -29,9 +29,9 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_resultCode:SDLVehicleDataResultCodeDataNotSubscribed, - NAMES_didLocation:@300, - NAMES_data:@"gertwydhty4235tdhedt4tue"} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameResultCode:SDLVehicleDataResultCodeDataNotSubscribed, + SDLNameDIDLocation:@300, + SDLNameData:@"gertwydhty4235tdhedt4tue"} mutableCopy]; SDLDIDResult* testStruct = [[SDLDIDResult alloc] initWithDictionary:dict]; expect(testStruct.resultCode).to(equal(SDLVehicleDataResultCodeDataNotSubscribed)); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDeviceInfoSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDeviceInfoSpec.m index beb3b2d80..785a53877 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDeviceInfoSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDeviceInfoSpec.m @@ -33,12 +33,12 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_hardware:@"GDFR34F", - NAMES_firmwareRev:@"4.2a", - NAMES_os:@"Robot", - NAMES_osVersion:@"9.9", - NAMES_carrier:@"ThatOneWirelessCompany", - NAMES_maxNumberRFCOMMPorts:@20} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameHardware:@"GDFR34F", + SDLNameFirmwareRevision:@"4.2a", + SDLNameOS:@"Robot", + SDLNameOSVersion:@"9.9", + SDLNameCarrier:@"ThatOneWirelessCompany", + SDLNameMaxNumberRFCOMMPorts:@20} mutableCopy]; SDLDeviceInfo* testStruct = [[SDLDeviceInfo alloc] initWithDictionary:dict]; expect(testStruct.hardware).to(equal(@"GDFR34F")); @@ -61,4 +61,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDeviceStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDeviceStatusSpec.m index 5b5a52fb4..eb56a11a0 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDeviceStatusSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDeviceStatusSpec.m @@ -25,10 +25,10 @@ describe(@"Getter/Setter Tests", ^ { testStruct.callActive = @YES; testStruct.phoneRoaming = @NO; testStruct.textMsgAvailable = @YES; - testStruct.battLevelStatus = SDLDeviceLevelStatusFourLevelBars; + testStruct.battLevelStatus = SDLDeviceLevelStatusFourBars; testStruct.stereoAudioOutputMuted = @YES; testStruct.monoAudioOutputMuted = @YES; - testStruct.signalLevelStatus = SDLDeviceLevelStatusTwoLevelBars; + testStruct.signalLevelStatus = SDLDeviceLevelStatusTwoBars; testStruct.primaryAudioSource = SDLPrimaryAudioSourceBluetoothStereo; testStruct.eCallEventActive = @NO; @@ -37,26 +37,26 @@ describe(@"Getter/Setter Tests", ^ { expect(testStruct.callActive).to(equal(@YES)); expect(testStruct.phoneRoaming).to(equal(@NO)); expect(testStruct.textMsgAvailable).to(equal(@YES)); - expect(testStruct.battLevelStatus).to(equal(SDLDeviceLevelStatusFourLevelBars)); + expect(testStruct.battLevelStatus).to(equal(SDLDeviceLevelStatusFourBars)); expect(testStruct.stereoAudioOutputMuted).to(equal(@YES)); expect(testStruct.monoAudioOutputMuted).to(equal(@YES)); - expect(testStruct.signalLevelStatus).to(equal(SDLDeviceLevelStatusTwoLevelBars)); + expect(testStruct.signalLevelStatus).to(equal(SDLDeviceLevelStatusTwoBars)); expect(testStruct.primaryAudioSource).to(equal(SDLPrimaryAudioSourceBluetoothStereo)); expect(testStruct.eCallEventActive).to(equal(@NO)); }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_voiceRecOn:@NO, - NAMES_btIconOn:@NO, - NAMES_callActive:@YES, - NAMES_phoneRoaming:@NO, - NAMES_textMsgAvailable:@YES, - NAMES_battLevelStatus:SDLDeviceLevelStatusFourLevelBars, - NAMES_stereoAudioOutputMuted:@YES, - NAMES_monoAudioOutputMuted:@YES, - NAMES_signalLevelStatus:SDLDeviceLevelStatusTwoLevelBars, - NAMES_primaryAudioSource:SDLPrimaryAudioSourceBluetoothStereo, - NAMES_eCallEventActive:@NO} mutableCopy]; + 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]; SDLDeviceStatus* testStruct = [[SDLDeviceStatus alloc] initWithDictionary:dict]; expect(testStruct.voiceRecOn).to(equal(@NO)); @@ -64,10 +64,10 @@ describe(@"Getter/Setter Tests", ^ { expect(testStruct.callActive).to(equal(@YES)); expect(testStruct.phoneRoaming).to(equal(@NO)); expect(testStruct.textMsgAvailable).to(equal(@YES)); - expect(testStruct.battLevelStatus).to(equal(SDLDeviceLevelStatusFourLevelBars)); + expect(testStruct.battLevelStatus).to(equal(SDLDeviceLevelStatusFourBars)); expect(testStruct.stereoAudioOutputMuted).to(equal(@YES)); expect(testStruct.monoAudioOutputMuted).to(equal(@YES)); - expect(testStruct.signalLevelStatus).to(equal(SDLDeviceLevelStatusTwoLevelBars)); + expect(testStruct.signalLevelStatus).to(equal(SDLDeviceLevelStatusTwoBars)); expect(testStruct.primaryAudioSource).to(equal(SDLPrimaryAudioSourceBluetoothStereo)); expect(testStruct.eCallEventActive).to(equal(@NO)); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDisplayCapabilitiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDisplayCapabilitiesSpec.m index 6d1d101d8..32bbeb29d 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDisplayCapabilitiesSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLDisplayCapabilitiesSpec.m @@ -27,7 +27,7 @@ describe(@"Getter/Setter Tests", ^ { it(@"Should set and get correctly", ^ { SDLDisplayCapabilities* testStruct = [[SDLDisplayCapabilities alloc] init]; - testStruct.displayType = SDLDisplayTypeGen26Dma; + testStruct.displayType = SDLDisplayTypeGen26DMA; testStruct.textFields = [@[textField] mutableCopy]; testStruct.imageFields = [@[imageField] mutableCopy]; testStruct.mediaClockFormats = [@[SDLMediaClockFormatClockText1, SDLMediaClockFormatClock3, SDLMediaClockFormatClockText3] copy]; @@ -36,7 +36,7 @@ describe(@"Getter/Setter Tests", ^ { testStruct.screenParams = screenParams; testStruct.numCustomPresetsAvailable = @43; - expect(testStruct.displayType).to(equal(SDLDisplayTypeGen26Dma)); + expect(testStruct.displayType).to(equal(SDLDisplayTypeGen26DMA)); expect(testStruct.textFields).to(equal([@[textField] mutableCopy])); expect(testStruct.imageFields).to(equal([@[imageField] mutableCopy])); expect(testStruct.mediaClockFormats).to(equal([@[SDLMediaClockFormatClockText1, SDLMediaClockFormatClock3, SDLMediaClockFormatClockText3] copy])); @@ -47,17 +47,17 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_displayType:SDLDisplayTypeGen26Dma, - NAMES_textFields:[@[textField] mutableCopy], - NAMES_imageFields:[@[imageField] mutableCopy], - NAMES_mediaClockFormats:[@[SDLMediaClockFormatClockText1, SDLMediaClockFormatClock3, SDLMediaClockFormatClockText3] copy], - NAMES_graphicSupported:@YES, - NAMES_templatesAvailable:[@[@"String", @"String", @"String"] mutableCopy], - NAMES_screenParams:screenParams, - NAMES_numCustomPresetsAvailable:@43} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameDisplayType:SDLDisplayTypeGen26DMA, + SDLNameTextFields:[@[textField] mutableCopy], + SDLNameImageFields:[@[imageField] mutableCopy], + SDLNameMediaClockFormats:[@[SDLMediaClockFormatClockText1, SDLMediaClockFormatClock3, SDLMediaClockFormatClockText3] copy], + SDLNameGraphicSupported:@YES, + SDLNameTemplatesAvailable:[@[@"String", @"String", @"String"] mutableCopy], + SDLNameScreenParams:screenParams, + SDLNameNumberCustomPresetsAvailable:@43} mutableCopy]; SDLDisplayCapabilities* testStruct = [[SDLDisplayCapabilities alloc] initWithDictionary:dict]; - expect(testStruct.displayType).to(equal(SDLDisplayTypeGen26Dma)); + expect(testStruct.displayType).to(equal(SDLDisplayTypeGen26DMA)); expect(testStruct.textFields).to(equal([@[textField] mutableCopy])); expect(testStruct.imageFields).to(equal([@[imageField] mutableCopy])); expect(testStruct.mediaClockFormats).to(equal([@[SDLMediaClockFormatClockText1, SDLMediaClockFormatClock3, SDLMediaClockFormatClockText3] copy])); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLECallInfoSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLECallInfoSpec.m index 5e84d206c..c69c46b84 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLECallInfoSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLECallInfoSpec.m @@ -30,9 +30,9 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_eCallNotificationStatus:SDLVehicleDataNotificationStatusNormal, - NAMES_auxECallNotificationStatus:SDLVehicleDataNotificationStatusActive, - NAMES_eCallConfirmationStatus:SDLECallConfirmationStatusInProgress} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameECallNotificationStatus:SDLVehicleDataNotificationStatusNormal, + SDLNameAuxECallNotificationStatus:SDLVehicleDataNotificationStatusActive, + SDLNameECallConfirmationStatus: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 f955d5a90..0048ffdff 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLEmergencyEventSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLEmergencyEventSpec.m @@ -35,11 +35,11 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_emergencyEventType:SDLEmergencyEventTypeFrontal, - NAMES_fuelCutoffStatus:SDLFuelCutoffStatusNormalOperation, - NAMES_rolloverEvent:SDLVehicleDataEventStatusYes, - NAMES_maximumChangeVelocity:@33, - NAMES_multipleEvents:SDLVehicleDataEventStatusNo} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameEmergencyEventType:SDLEmergencyEventTypeFrontal, + SDLNameFuelCutoffStatus:SDLFuelCutoffStatusNormalOperation, + SDLNameRolloverEvent:SDLVehicleDataEventStatusYes, + SDLNameMaximumChangeVelocity:@33, + SDLNameMultipleEvents:SDLVehicleDataEventStatusNo} mutableCopy]; SDLEmergencyEvent* testStruct = [[SDLEmergencyEvent alloc] initWithDictionary:dict]; expect(testStruct.emergencyEventType).to(equal(SDLEmergencyEventTypeFrontal)); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLGPSDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLGPSDataSpec.m index 8ce756486..35cc2b659 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLGPSDataSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLGPSDataSpec.m @@ -34,7 +34,7 @@ describe(@"Getter/Setter Tests", ^ { testStruct.vdop = @0; testStruct.actual = @NO; testStruct.satellites = @12; - testStruct.dimension = SDLDimension3d; + testStruct.dimension = SDLDimension3D; testStruct.altitude = @3000; testStruct.heading = @96; testStruct.speed = @64; @@ -53,31 +53,31 @@ describe(@"Getter/Setter Tests", ^ { expect(testStruct.vdop).to(equal(@0)); expect(testStruct.actual).to(equal(@NO)); expect(testStruct.satellites).to(equal(@12)); - expect(testStruct.dimension).to(equal(SDLDimension3d)); + expect(testStruct.dimension).to(equal(SDLDimension3D)); expect(testStruct.altitude).to(equal(@3000)); expect(testStruct.heading).to(equal(@96)); expect(testStruct.speed).to(equal(@64)); }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_longitudeDegrees:@31.41592653589793, - NAMES_latitudeDegrees:@45, - NAMES_utcYear:@2015, - NAMES_utcMonth:@1, - NAMES_utcDay:@26, - NAMES_utcHours:@23, - NAMES_utcMinutes:@59, - NAMES_utcSeconds:@59, - NAMES_compassDirection:SDLCompassDirectionSoutheast, - NAMES_pdop:@3.4, - NAMES_hdop:@9.9, - NAMES_vdop:@0, - NAMES_actual:@NO, - NAMES_satellites:@12, - NAMES_dimension:SDLDimension3d, - NAMES_altitude:@3000, - NAMES_heading:@96, - NAMES_speed:@64} mutableCopy]; + 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]; SDLGPSData* testStruct = [[SDLGPSData alloc] initWithDictionary:dict]; expect(testStruct.longitudeDegrees).to(equal(@31.41592653589793)); @@ -94,7 +94,7 @@ describe(@"Getter/Setter Tests", ^ { expect(testStruct.vdop).to(equal(@0)); expect(testStruct.actual).to(equal(@NO)); expect(testStruct.satellites).to(equal(@12)); - expect(testStruct.dimension).to(equal(SDLDimension3d)); + expect(testStruct.dimension).to(equal(SDLDimension3D)); expect(testStruct.altitude).to(equal(@3000)); expect(testStruct.heading).to(equal(@96)); expect(testStruct.speed).to(equal(@64)); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHMICapabilitiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHMICapabilitiesSpec.m index e9935bedf..4121992df 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHMICapabilitiesSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHMICapabilitiesSpec.m @@ -36,8 +36,8 @@ describe(@"SDLHMICapabilities struct", ^{ context(@"When initialized with a dictionary", ^{ beforeEach(^{ NSDictionary *structInitDict = @{ - NAMES_navigation: someNavigationState, - NAMES_phoneCall: somePhoneCallState + SDLNameNavigation: someNavigationState, + SDLNamePhoneCall: somePhoneCallState }; testStruct = [[SDLHMICapabilities alloc] initWithDictionary:[structInitDict mutableCopy]]; }); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHMIPermissionsSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHMIPermissionsSpec.m index 3a9082c97..aed9830d4 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHMIPermissionsSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHMIPermissionsSpec.m @@ -26,8 +26,8 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_allowed:[@[SDLHMILevelBackground, SDLHMILevelFull] copy], - NAMES_userDisallowed:[@[SDLHMILevelNone, SDLHMILevelLimited] copy]} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameAllowed:[@[SDLHMILevelBackground, SDLHMILevelFull] copy], + SDLNameUserDisallowed:[@[SDLHMILevelNone, SDLHMILevelLimited] copy]} mutableCopy]; SDLHMIPermissions* testStruct = [[SDLHMIPermissions alloc] initWithDictionary:dict]; expect(testStruct.allowed).to(equal([@[SDLHMILevelBackground, SDLHMILevelFull] copy])); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHeadLampStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHeadLampStatusSpec.m index c588bb0f6..fe7a21198 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHeadLampStatusSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLHeadLampStatusSpec.m @@ -29,9 +29,9 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_lowBeamsOn:@YES, - NAMES_highBeamsOn:@NO, - NAMES_ambientLightSensorStatus:SDLAmbientLightStatusTwilight3} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameLowBeamsOn:@YES, + SDLNameHighBeamsOn:@NO, + SDLNameAmbientLightSensorStatus: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 f18520bf4..d555c8520 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLImageFieldSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLImageFieldSpec.m @@ -24,22 +24,22 @@ describe(@"Getter/Setter Tests", ^ { SDLImageField* testStruct = [[SDLImageField alloc] init]; testStruct.name = SDLImageFieldNameTurnIcon; - testStruct.imageTypeSupported = [@[SDLFileTypeGraphicPng, SDLFileTypeGraphicJpeg] copy]; + testStruct.imageTypeSupported = [@[SDLFileTypeGraphicPNG, SDLFileTypeGraphicJPEG] copy]; testStruct.imageResolution = resolution; expect(testStruct.name).to(equal(SDLImageFieldNameTurnIcon)); - expect(testStruct.imageTypeSupported).to(equal([@[SDLFileTypeGraphicPng, SDLFileTypeGraphicJpeg] copy])); + expect(testStruct.imageTypeSupported).to(equal([@[SDLFileTypeGraphicPNG, SDLFileTypeGraphicJPEG] copy])); expect(testStruct.imageResolution).to(equal(resolution)); }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_name:SDLImageFieldNameTurnIcon, - NAMES_imageTypeSupported:[@[SDLFileTypeGraphicPng, SDLFileTypeGraphicJpeg] copy], - NAMES_imageResolution:resolution} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameName:SDLImageFieldNameTurnIcon, + SDLNameImageTypeSupported:[@[SDLFileTypeGraphicPNG, SDLFileTypeGraphicJPEG] copy], + SDLNameImageResolution:resolution} mutableCopy]; SDLImageField* testStruct = [[SDLImageField alloc] initWithDictionary:dict]; expect(testStruct.name).to(equal(SDLImageFieldNameTurnIcon)); - expect(testStruct.imageTypeSupported).to(equal([@[SDLFileTypeGraphicPng, SDLFileTypeGraphicJpeg] copy])); + expect(testStruct.imageTypeSupported).to(equal([@[SDLFileTypeGraphicPNG, SDLFileTypeGraphicJPEG] copy])); expect(testStruct.imageResolution).to(equal(resolution)); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLImageSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLImageSpec.m index 7cd754b09..f1364c819 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLImageSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLImageSpec.m @@ -27,8 +27,8 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_value:@"value", - NAMES_imageType:SDLImageTypeStatic} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameValue:@"value", + SDLNameImageType:SDLImageTypeStatic} mutableCopy]; SDLImage* testStruct = [[SDLImage alloc] initWithDictionary:dict]; expect(testStruct.value).to(equal(@"value")); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLKeyboardPropertiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLKeyboardPropertiesSpec.m index b8eb3092a..4a8dc21bb 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLKeyboardPropertiesSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLKeyboardPropertiesSpec.m @@ -22,28 +22,28 @@ describe(@"Getter/Setter Tests", ^ { SDLKeyboardProperties* testStruct = [[SDLKeyboardProperties alloc] init]; testStruct.language = SDLLanguageDaDk; - testStruct.keyboardLayout = SDLKeyboardLayoutQwertz; + testStruct.keyboardLayout = SDLKeyboardLayoutQWERTZ; testStruct.keypressMode = SDLKeypressModeResendCurrentEntry; testStruct.limitedCharacterList = [@[@"s", @"r", @"f", @"q"] mutableCopy]; testStruct.autoCompleteText = @"Auto Carrot"; expect(testStruct.language).to(equal(SDLLanguageDaDk)); - expect(testStruct.keyboardLayout).to(equal(SDLKeyboardLayoutQwertz)); + expect(testStruct.keyboardLayout).to(equal(SDLKeyboardLayoutQWERTZ)); expect(testStruct.keypressMode).to(equal(SDLKeypressModeResendCurrentEntry)); expect(testStruct.limitedCharacterList).to(equal([@[@"s", @"r", @"f", @"q"] mutableCopy])); expect(testStruct.autoCompleteText).to(equal(@"Auto Carrot")); }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_language:SDLLanguageDaDk, - NAMES_keyboardLayout:SDLKeyboardLayoutQwertz, - NAMES_keypressMode:SDLKeypressModeResendCurrentEntry, - NAMES_limitedCharacterList:[@[@"s", @"r", @"f", @"q"] mutableCopy], - NAMES_autoCompleteText:@"Auto Carrot"} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameLanguage:SDLLanguageDaDk, + SDLNameKeyboardLayout:SDLKeyboardLayoutQWERTZ, + SDLNameKeypressMode:SDLKeypressModeResendCurrentEntry, + SDLNameLimitedCharacterList:[@[@"s", @"r", @"f", @"q"] mutableCopy], + SDLNameAutoCompleteText:@"Auto Carrot"} mutableCopy]; SDLKeyboardProperties* testStruct = [[SDLKeyboardProperties alloc] initWithDictionary:dict]; expect(testStruct.language).to(equal(SDLLanguageDaDk)); - expect(testStruct.keyboardLayout).to(equal(SDLKeyboardLayoutQwertz)); + expect(testStruct.keyboardLayout).to(equal(SDLKeyboardLayoutQWERTZ)); expect(testStruct.keypressMode).to(equal(SDLKeypressModeResendCurrentEntry)); expect(testStruct.limitedCharacterList).to(equal([@[@"s", @"r", @"f", @"q"] mutableCopy])); expect(testStruct.autoCompleteText).to(equal(@"Auto Carrot")); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLMenuParamsSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLMenuParamsSpec.m index 3d6bc6462..72b8029d4 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLMenuParamsSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLMenuParamsSpec.m @@ -27,9 +27,9 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_parentID:@504320489, - NAMES_position:@256, - NAMES_menuName:@"Menu"} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameParentId:@504320489, + SDLNamePosition:@256, + SDLNameMenuName:@"Menu"} mutableCopy]; SDLMenuParams* testStruct = [[SDLMenuParams alloc] initWithDictionary:dict]; expect(testStruct.parentID).to(equal(@504320489)); @@ -46,4 +46,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLMyKeySpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLMyKeySpec.m index bc0fb0448..6d0a462fb 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLMyKeySpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLMyKeySpec.m @@ -25,7 +25,7 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_e911Override:SDLVehicleDataStatusOn} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameE911Override:SDLVehicleDataStatusOn} mutableCopy]; SDLMyKey* testStruct = [[SDLMyKey alloc] initWithDictionary:dict]; expect(testStruct.e911Override).to(equal(SDLVehicleDataStatusOn)); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLParameterPermissionsSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLParameterPermissionsSpec.m index 5c1e36d11..92b6a5ef6 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLParameterPermissionsSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLParameterPermissionsSpec.m @@ -26,8 +26,8 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_allowed:[@[SDLHMILevelBackground, SDLHMILevelFull] copy], - NAMES_userDisallowed:[@[SDLHMILevelNone, SDLHMILevelLimited] copy]} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameAllowed:[@[SDLHMILevelBackground, SDLHMILevelFull] copy], + SDLNameUserDisallowed:[@[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 0e5b367d1..ee502ebf8 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLPermissionItemSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLPermissionItemSpec.m @@ -32,9 +32,9 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_rpcName:@"RPCNameThing", - NAMES_hmiPermissions:hmiPermissions, - NAMES_parameterPermissions:parameterPermissions} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameRPCName:@"RPCNameThing", + SDLNameHMIPermissions:hmiPermissions, + SDLNameParameterPermissions:parameterPermissions} mutableCopy]; SDLPermissionItem* testStruct = [[SDLPermissionItem alloc] initWithDictionary:dict]; expect(testStruct.rpcName).to(equal(@"RPCNameThing")); @@ -51,4 +51,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLPresetBankCapabilitiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLPresetBankCapabilitiesSpec.m index f473c60b6..16330022f 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLPresetBankCapabilitiesSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLPresetBankCapabilitiesSpec.m @@ -23,7 +23,7 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_onScreenPresetsAvailable:@YES} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameOnScreenPresetsAvailable:@YES} mutableCopy]; SDLPresetBankCapabilities* testStruct = [[SDLPresetBankCapabilities alloc] initWithDictionary:dict]; expect(testStruct.onScreenPresetsAvailable).to(equal(@YES)); @@ -36,4 +36,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLScreenParamsSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLScreenParamsSpec.m index 0438b8a21..e24ee7ee8 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLScreenParamsSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLScreenParamsSpec.m @@ -31,8 +31,8 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_resolution:resolution, - NAMES_touchEventAvailable:capabilities} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameResolution:resolution, + SDLNameTouchEventAvailable:capabilities} mutableCopy]; SDLScreenParams* testStruct = [[SDLScreenParams alloc] initWithDictionary:dict]; expect(testStruct.resolution).to(equal(resolution)); @@ -47,4 +47,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSingleTireStatusSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSingleTireStatusSpec.m index af6f85fbd..69c0d347d 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSingleTireStatusSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSingleTireStatusSpec.m @@ -24,7 +24,7 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_status:SDLComponentVolumeStatusLow} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameStatus:SDLComponentVolumeStatusLow} mutableCopy]; SDLSingleTireStatus* testStruct = [[SDLSingleTireStatus alloc] initWithDictionary:dict]; expect(testStruct.status).to(equal(SDLComponentVolumeStatusLow)); diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSoftButtonCapabilitiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSoftButtonCapabilitiesSpec.m index 0cb200414..6301272d6 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSoftButtonCapabilitiesSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSoftButtonCapabilitiesSpec.m @@ -29,10 +29,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_shortPressAvailable:@NO, - NAMES_longPressAvailable:@YES, - NAMES_upDownAvailable:@NO, - NAMES_imageSupported:@NO} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameShortPressAvailable:@NO, + SDLNameLongPressAvailable:@YES, + SDLNameUpDownAvailable:@NO, + SDLNameImageSupported:@NO} mutableCopy]; SDLSoftButtonCapabilities* testStruct = [[SDLSoftButtonCapabilities alloc] initWithDictionary:dict]; expect(testStruct.shortPressAvailable).to(equal(@NO)); @@ -51,4 +51,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSoftButtonSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSoftButtonSpec.m index d5b9fda4f..df938b7dc 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSoftButtonSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSoftButtonSpec.m @@ -39,12 +39,12 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_type:SDLSoftButtonTypeImage, - NAMES_text:@"Button", - NAMES_image:image, - NAMES_isHighlighted:@YES, - NAMES_softButtonID:@5423, - NAMES_systemAction:SDLSystemActionKeepContext} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameType:SDLSoftButtonTypeImage, + SDLNameText:@"Button", + SDLNameImage:image, + SDLNameIsHighlighted:@YES, + SDLNameSoftButtonId:@5423, + SDLNameSystemAction: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 476fc6500..201863048 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLStartTimeSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLStartTimeSpec.m @@ -27,9 +27,9 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_hours:@22, - NAMES_minutes:@39, - NAMES_seconds:@11} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameHours:@22, + SDLNameMinutes:@39, + SDLNameSeconds:@11} mutableCopy]; SDLStartTime* testStruct = [[SDLStartTime alloc] initWithDictionary:dict]; expect(testStruct.hours).to(equal(@22)); @@ -46,4 +46,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSyncMsgVersionSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSyncMsgVersionSpec.m index 56c74cd18..75e06f8de 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSyncMsgVersionSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLSyncMsgVersionSpec.m @@ -25,8 +25,8 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_majorVersion:@4, - NAMES_minorVersion:@532} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameMajorVersion:@4, + SDLNameMinorVersion:@532} mutableCopy]; SDLSyncMsgVersion* testStruct = [[SDLSyncMsgVersion alloc] initWithDictionary:dict]; expect(testStruct.majorVersion).to(equal(@4)); @@ -41,4 +41,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTTSChunkSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTTSChunkSpec.m index 1fceb2516..52fef2d53 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTTSChunkSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTTSChunkSpec.m @@ -20,19 +20,19 @@ describe(@"Getter/Setter Tests", ^ { SDLTTSChunk* testStruct = [[SDLTTSChunk alloc] init]; testStruct.text = @"TEXT"; - testStruct.type = SDLSpeechCapabilitiesPreRecorded; + testStruct.type = SDLSpeechCapabilitiesPrerecorded; expect(testStruct.text).to(equal(@"TEXT")); - expect(testStruct.type).to(equal(SDLSpeechCapabilitiesPreRecorded)); + expect(testStruct.type).to(equal(SDLSpeechCapabilitiesPrerecorded)); }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_text:@"TEXT", - NAMES_type:SDLSpeechCapabilitiesPreRecorded} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameText:@"TEXT", + SDLNameType:SDLSpeechCapabilitiesPrerecorded} mutableCopy]; SDLTTSChunk* testStruct = [[SDLTTSChunk alloc] initWithDictionary:dict]; expect(testStruct.text).to(equal(@"TEXT")); - expect(testStruct.type).to(equal(SDLSpeechCapabilitiesPreRecorded)); + expect(testStruct.type).to(equal(SDLSpeechCapabilitiesPrerecorded)); }); it(@"Should return nil if not set", ^ { diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTextFieldSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTextFieldSpec.m index d62fedc42..094c78994 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTextFieldSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTextFieldSpec.m @@ -32,10 +32,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_name:SDLTextFieldNameTertiaryText, - NAMES_characterSet:SDLCharacterSetType5Set, - NAMES_width:@111, - NAMES_rows:@4} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameName:SDLTextFieldNameTertiaryText, + SDLNameCharacterSet:SDLCharacterSetType5Set, + SDLNameWidth:@111, + SDLNameRows:@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 ed8353b8d..ebe9eb7e3 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTireStatusSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTireStatusSpec.m @@ -44,13 +44,13 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_pressureTelltale:SDLWarningLightStatusOff, - NAMES_leftFront:tire1, - NAMES_rightFront:tire2, - NAMES_leftRear:tire3, - NAMES_rightRear:tire4, - NAMES_innerLeftRear:tire5, - NAMES_innerRightRear:tire6} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNamePressureTelltale:SDLWarningLightStatusOff, + SDLNameLeftFront:tire1, + SDLNameRightFront:tire2, + SDLNameLeftRear:tire3, + SDLNameRightRear:tire4, + SDLNameInnerLeftRear:tire5, + SDLNameInnerRightRear: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 eedca3a9b..0431fe455 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchCoordSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchCoordSpec.m @@ -25,8 +25,8 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_x:@67, - NAMES_y:@362} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameX:@67, + SDLNameY:@362} mutableCopy]; SDLTouchCoord* testStruct = [[SDLTouchCoord alloc] initWithDictionary:dict]; expect(testStruct.x).to(equal(@67)); @@ -41,4 +41,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchEventCapabilitiesSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchEventCapabilitiesSpec.m index a8b8c73e0..cdda41afc 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchEventCapabilitiesSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchEventCapabilitiesSpec.m @@ -27,9 +27,9 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_pressAvailable:@YES, - NAMES_multiTouchAvailable:@NO, - NAMES_doublePressAvailable:@NO} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNamePressAvailable:@YES, + SDLNameMultiTouchAvailable:@NO, + SDLNameDoublePressAvailable:@NO} mutableCopy]; SDLTouchEventCapabilities* testStruct = [[SDLTouchEventCapabilities alloc] initWithDictionary:dict]; expect(testStruct.pressAvailable).to(equal(@YES)); @@ -46,4 +46,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchEventSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchEventSpec.m index c95cfb525..d21dedb97 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchEventSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTouchEventSpec.m @@ -30,9 +30,9 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_id:@3, - NAMES_ts:[@[@23, @52, @41345234] mutableCopy], - NAMES_c:[@[coord] mutableCopy]} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameId:@3, + SDLNameTimestamp:[@[@23, @52, @41345234] mutableCopy], + SDLNameCoordinate:[@[coord] mutableCopy]} mutableCopy]; SDLTouchEvent* testStruct = [[SDLTouchEvent alloc] initWithDictionary:dict]; expect(testStruct.touchEventId).to(equal(@3)); @@ -49,4 +49,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTurnSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTurnSpec.m index 07152ad92..7b44c251e 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTurnSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLTurnSpec.m @@ -28,8 +28,8 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_navigationText:@"NAVTEXT", - NAMES_turnIcon:image} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameNavigationText:@"NAVTEXT", + SDLNameTurnIcon:image} mutableCopy]; SDLTurn* testStruct = [[SDLTurn alloc] initWithDictionary:dict]; expect(testStruct.navigationText).to(equal(@"NAVTEXT")); @@ -44,4 +44,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVehicleDataResultSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVehicleDataResultSpec.m index 3d417dc32..fba4445bc 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVehicleDataResultSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVehicleDataResultSpec.m @@ -27,8 +27,8 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_dataType:SDLVehicleDataTypeAirbagStatus, - NAMES_resultCode:SDLVehicleDataResultCodeDisallowed} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameDataType:SDLVehicleDataTypeAirbagStatus, + SDLNameResultCode: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 9a282b72e..0eaa6e698 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVehicleTypeSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVehicleTypeSpec.m @@ -29,10 +29,10 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_make:@"Make", - NAMES_model:@"Model", - NAMES_modelYear:@"3.141*10^36", - NAMES_trim:@"AE"} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameMake:@"Make", + SDLNameModel:@"Model", + SDLNameModelYear:@"3.141*10^36", + SDLNameTrim:@"AE"} mutableCopy]; SDLVehicleType* testStruct = [[SDLVehicleType alloc] initWithDictionary:dict]; expect(testStruct.make).to(equal(@"Make")); @@ -51,4 +51,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVrHelpItemSpec.m b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVrHelpItemSpec.m index e76be2558..6afde1d0a 100644 --- a/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVrHelpItemSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/StructSpecs/SDLVrHelpItemSpec.m @@ -31,9 +31,9 @@ describe(@"Getter/Setter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - NSMutableDictionary* dict = [@{NAMES_text:@"DON'T PANIC", - NAMES_image:image, - NAMES_position:@42} mutableCopy]; + NSMutableDictionary* dict = [@{SDLNameText:@"DON'T PANIC", + SDLNameImage:image, + SDLNamePosition:@42} mutableCopy]; SDLVRHelpItem* testStruct = [[SDLVRHelpItem alloc] initWithDictionary:dict]; expect(testStruct.text).to(equal(@"DON'T PANIC")); @@ -50,4 +50,4 @@ describe(@"Getter/Setter Tests", ^ { }); }); -QuickSpecEnd
\ No newline at end of file +QuickSpecEnd diff --git a/SmartDeviceLinkTests/RPCSpecs/SuperclassSpecs/SDLRPCMessageSpec.m b/SmartDeviceLinkTests/RPCSpecs/SuperclassSpecs/SDLRPCMessageSpec.m index 477925141..57dbd3513 100644 --- a/SmartDeviceLinkTests/RPCSpecs/SuperclassSpecs/SDLRPCMessageSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/SuperclassSpecs/SDLRPCMessageSpec.m @@ -21,13 +21,13 @@ describe(@"Readonly Property Tests", ^ { }); it(@"Should get correctly when initialized with dictionary", ^ { - SDLRPCMessage* testMessage = [[SDLRPCMessage alloc] initWithDictionary:[@{NAMES_notification: - @{NAMES_parameters: + SDLRPCMessage* testMessage = [[SDLRPCMessage alloc] initWithDictionary:[@{SDLNameNotification: + @{SDLNameParameters: @{@"name":@"George"}, - NAMES_operation_name:@"Poorly Named"}} mutableCopy]]; + SDLNameOperationName:@"Poorly Named"}} mutableCopy]]; expect(testMessage.name).to(equal(@"Poorly Named")); - expect(testMessage.messageType).to(equal(NAMES_notification)); + expect(testMessage.messageType).to(equal(SDLNameNotification)); }); }); @@ -41,10 +41,10 @@ describe(@"Parameter Tests", ^ { }); it(@"Should get correctly when initialized", ^ { - SDLRPCMessage* testMessage = [[SDLRPCMessage alloc] initWithDictionary:[@{NAMES_response: - @{NAMES_parameters: + SDLRPCMessage* testMessage = [[SDLRPCMessage alloc] initWithDictionary:[@{SDLNameResponse: + @{SDLNameParameters: @{@"age":@25}, - NAMES_operation_name:@"Nameless"}} mutableCopy]]; + SDLNameOperationName:@"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:[@{NAMES_request: - @{NAMES_parameters: + SDLRPCMessage* testMessage = [[SDLRPCMessage alloc] initWithDictionary:[@{SDLNameRequest: + @{SDLNameParameters: @{@"age":@25}, - NAMES_operation_name:@"DoNothing"}} mutableCopy]]; + SDLNameOperationName:@"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:[@{NAMES_notification: - @{NAMES_parameters: + SDLRPCMessage* testMessage = [[SDLRPCMessage alloc] initWithDictionary:[@{SDLNameNotification: + @{SDLNameParameters: @{}}} mutableCopy]]; expect([testMessage getFunctionName]).to(beNil()); }); @@ -97,10 +97,10 @@ describe(@"BulkDataTests", ^ { }); it(@"Should get correctly when initialized", ^ { - SDLRPCMessage* testMessage = [[SDLRPCMessage alloc] initWithDictionary:[@{NAMES_notification: - @{NAMES_parameters: + SDLRPCMessage* testMessage = [[SDLRPCMessage alloc] initWithDictionary:[@{SDLNameNotification: + @{SDLNameParameters: @{}}, - NAMES_bulkData:[NSData dataWithBytes:"ImageData" length:strlen("ImageData")]} mutableCopy]]; + SDLNameBulkData:[NSData dataWithBytes:"ImageData" length:strlen("ImageData")]} mutableCopy]]; expect(testMessage.bulkData).to(equal([NSData dataWithBytes:"ImageData" length:strlen("ImageData")])); }); diff --git a/SmartDeviceLink_Example/Images.xcassets/AppIcon.appiconset/Contents.json b/SmartDeviceLink_Example/Images.xcassets/AppIcon.appiconset/Contents.json index 850051cb5..6ca49d84c 100644 --- a/SmartDeviceLink_Example/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/SmartDeviceLink_Example/Images.xcassets/AppIcon.appiconset/Contents.json @@ -1,6 +1,16 @@ { "images" : [ { + "idiom" : "iphone", + "size" : "20x20", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "20x20", + "scale" : "3x" + }, + { "size" : "29x29", "idiom" : "iphone", "filename" : "Icon-Small@2x.png", |
