diff options
author | NicoleYarroch <nicole@livio.io> | 2019-07-09 15:54:55 -0400 |
---|---|---|
committer | NicoleYarroch <nicole@livio.io> | 2019-07-09 15:54:55 -0400 |
commit | ac015605a354a0bdcb608146395cc1256c22c428 (patch) | |
tree | 4b95b95f0729d6b260fa03aaaf8a5772b7f2776b | |
parent | 76d6cd10f715c0c4ca2df0e20df67727a8f5e3fe (diff) | |
download | sdl_ios-ac015605a354a0bdcb608146395cc1256c22c428.tar.gz |
Added CloseApplication request
-rw-r--r-- | SmartDeviceLink-iOS.podspec | 1 | ||||
-rw-r--r-- | SmartDeviceLink-iOS.xcodeproj/project.pbxproj | 8 | ||||
-rw-r--r-- | SmartDeviceLink.podspec | 1 | ||||
-rw-r--r-- | SmartDeviceLink/SDLCloseApplication.h | 20 | ||||
-rw-r--r-- | SmartDeviceLink/SDLCloseApplication.m | 28 | ||||
-rw-r--r-- | SmartDeviceLink/SDLFunctionID.m | 1 | ||||
-rw-r--r-- | SmartDeviceLink/SDLRPCFunctionNames.h | 1 | ||||
-rw-r--r-- | SmartDeviceLink/SDLRPCFunctionNames.m | 1 |
8 files changed, 61 insertions, 0 deletions
diff --git a/SmartDeviceLink-iOS.podspec b/SmartDeviceLink-iOS.podspec index 0b91c7649..92fb7b60a 100644 --- a/SmartDeviceLink-iOS.podspec +++ b/SmartDeviceLink-iOS.podspec @@ -69,6 +69,7 @@ ss.public_header_files = [ 'SmartDeviceLink/SDLChoiceSetDelegate.h', 'SmartDeviceLink/SDLClimateControlCapabilities.h', 'SmartDeviceLink/SDLClimateControlData.h', +'SmartDeviceLink/SDLCloseApplication.h', 'SmartDeviceLink/SDLCloudAppProperties.h', 'SmartDeviceLink/SDLClusterModeStatus.h', 'SmartDeviceLink/SDLCompassDirection.h', diff --git a/SmartDeviceLink-iOS.xcodeproj/project.pbxproj b/SmartDeviceLink-iOS.xcodeproj/project.pbxproj index 6c7379d26..23489917a 100644 --- a/SmartDeviceLink-iOS.xcodeproj/project.pbxproj +++ b/SmartDeviceLink-iOS.xcodeproj/project.pbxproj @@ -1337,6 +1337,8 @@ 8881AFBF2225E9BB00EA870B /* SDLGetCloudAppPropertiesResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 8881AFBD2225E9BB00EA870B /* SDLGetCloudAppPropertiesResponse.m */; }; 8881AFC12225EB9300EA870B /* SDLGetCloudAppPropertiesResponseSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 8881AFC02225EB9300EA870B /* SDLGetCloudAppPropertiesResponseSpec.m */; }; 8886EB982111F4FA008294A5 /* SDLFileManagerConfigurationSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 8886EB972111F4FA008294A5 /* SDLFileManagerConfigurationSpec.m */; }; + 888DBAEB22D52431002A0AE2 /* SDLCloseApplication.h in Headers */ = {isa = PBXBuildFile; fileRef = 888DBAE922D52431002A0AE2 /* SDLCloseApplication.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 888DBAEC22D52431002A0AE2 /* SDLCloseApplication.m in Sources */ = {isa = PBXBuildFile; fileRef = 888DBAEA22D52431002A0AE2 /* SDLCloseApplication.m */; }; 888F86FE221DEE200052FE4C /* SDLAsynchronousRPCOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 888F86FD221DEE1F0052FE4C /* SDLAsynchronousRPCOperation.m */; }; 888F8700221DF4880052FE4C /* SDLAsynchronousRPCOperationSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 888F86FF221DF4880052FE4C /* SDLAsynchronousRPCOperationSpec.m */; }; 88A1CF1E21669AC7001ACC75 /* SDLLifecycleConfigurationUpdateSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 88A1CF1D21669AC7001ACC75 /* SDLLifecycleConfigurationUpdateSpec.m */; }; @@ -2983,6 +2985,8 @@ 8881AFBD2225E9BB00EA870B /* SDLGetCloudAppPropertiesResponse.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLGetCloudAppPropertiesResponse.m; sourceTree = "<group>"; }; 8881AFC02225EB9300EA870B /* SDLGetCloudAppPropertiesResponseSpec.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLGetCloudAppPropertiesResponseSpec.m; sourceTree = "<group>"; }; 8886EB972111F4FA008294A5 /* SDLFileManagerConfigurationSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLFileManagerConfigurationSpec.m; sourceTree = "<group>"; }; + 888DBAE922D52431002A0AE2 /* SDLCloseApplication.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDLCloseApplication.h; sourceTree = "<group>"; }; + 888DBAEA22D52431002A0AE2 /* SDLCloseApplication.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLCloseApplication.m; sourceTree = "<group>"; }; 888F86FD221DEE1F0052FE4C /* SDLAsynchronousRPCOperation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLAsynchronousRPCOperation.m; sourceTree = "<group>"; }; 888F86FF221DF4880052FE4C /* SDLAsynchronousRPCOperationSpec.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLAsynchronousRPCOperationSpec.m; sourceTree = "<group>"; }; 88A1CF1D21669AC7001ACC75 /* SDLLifecycleConfigurationUpdateSpec.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLLifecycleConfigurationUpdateSpec.m; sourceTree = "<group>"; }; @@ -4139,6 +4143,8 @@ 1E5AD07F1F20B73E0029B8AF /* SDLButtonPress.m */, 5D61FA6E1A84238A00846EE7 /* SDLChangeRegistration.h */, 5D61FA6F1A84238A00846EE7 /* SDLChangeRegistration.m */, + 888DBAE922D52431002A0AE2 /* SDLCloseApplication.h */, + 888DBAEA22D52431002A0AE2 /* SDLCloseApplication.m */, 5D61FA7E1A84238A00846EE7 /* SDLCreateInteractionChoiceSet.h */, 5D61FA7F1A84238A00846EE7 /* SDLCreateInteractionChoiceSet.m */, 5D61FA851A84238A00846EE7 /* SDLDeleteCommand.h */, @@ -6695,6 +6701,7 @@ 5D9FC29E1FD8813900ACA5C2 /* SDLAudioStreamManager.h in Headers */, 5DD67CB01E65DDB7009CD394 /* SDLLogTargetAppleSystemLog.h in Headers */, 5D61FCBF1A84238C00846EE7 /* SDLHexUtility.h in Headers */, + 888DBAEB22D52431002A0AE2 /* SDLCloseApplication.h in Headers */, 5D00AC6B1F141339004000D9 /* SDLSystemCapability.h in Headers */, 5DCD7AE01FCCA8D200A0FC7F /* SDLCarWindow.h in Headers */, 88F89103221DE29A00E056AD /* SDLAsynchronousRPCOperation.h in Headers */, @@ -7094,6 +7101,7 @@ 884E702821FBAC5B008D53BA /* SDLServiceUpdateReason.m in Sources */, 5D61FD781A84238C00846EE7 /* SDLSamplingRate.m in Sources */, 1EAA472A2034388D000FE74B /* SDLAudioControlData.m in Sources */, + 888DBAEC22D52431002A0AE2 /* SDLCloseApplication.m in Sources */, 5D61FC681A84238C00846EE7 /* SDLComponentVolumeStatus.m in Sources */, 5D61FDB61A84238C00846EE7 /* SDLSyncMsgVersion.m in Sources */, 5D61FC501A84238C00846EE7 /* SDLBodyInformation.m in Sources */, diff --git a/SmartDeviceLink.podspec b/SmartDeviceLink.podspec index 17fa2cfc8..2d5eee9c9 100644 --- a/SmartDeviceLink.podspec +++ b/SmartDeviceLink.podspec @@ -70,6 +70,7 @@ sdefault.public_header_files = [ 'SmartDeviceLink/SDLChoiceSetDelegate.h', 'SmartDeviceLink/SDLClimateControlCapabilities.h', 'SmartDeviceLink/SDLClimateControlData.h', +'SmartDeviceLink/SDLCloseApplication.h', 'SmartDeviceLink/SDLCloudAppProperties.h', 'SmartDeviceLink/SDLClusterModeStatus.h', 'SmartDeviceLink/SDLCompassDirection.h', diff --git a/SmartDeviceLink/SDLCloseApplication.h b/SmartDeviceLink/SDLCloseApplication.h new file mode 100644 index 000000000..fd577d240 --- /dev/null +++ b/SmartDeviceLink/SDLCloseApplication.h @@ -0,0 +1,20 @@ +// +// SDLCloseApplication.h +// SmartDeviceLink +// +// Created by Nicole on 7/9/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import "SDLRPCRequest.h" + +NS_ASSUME_NONNULL_BEGIN + +/** + * Used by an app to set itself to a HMILevel of NONE. The app will close but is still registered. If the app is a navigation app it will not be used as the preferred mobile-nav application anymore. + */ +@interface SDLCloseApplication : SDLRPCRequest + +@end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLCloseApplication.m b/SmartDeviceLink/SDLCloseApplication.m new file mode 100644 index 000000000..c8957ff2d --- /dev/null +++ b/SmartDeviceLink/SDLCloseApplication.m @@ -0,0 +1,28 @@ +// +// SDLCloseApplication.m +// SmartDeviceLink +// +// Created by Nicole on 7/9/19. +// Copyright © 2019 smartdevicelink. All rights reserved. +// + +#import "SDLCloseApplication.h" +#import "SDLRPCFunctionNames.h" + + +NS_ASSUME_NONNULL_BEGIN + +@implementation SDLCloseApplication + +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" +- (instancetype)init { + if (self = [super initWithName:SDLRPCFunctionNameCloseApplication]) { + } + return self; +} +#pragma clang diagnostic pop + +@end + +NS_ASSUME_NONNULL_END diff --git a/SmartDeviceLink/SDLFunctionID.m b/SmartDeviceLink/SDLFunctionID.m index d90390132..e8e86991a 100644 --- a/SmartDeviceLink/SDLFunctionID.m +++ b/SmartDeviceLink/SDLFunctionID.m @@ -88,6 +88,7 @@ NS_ASSUME_NONNULL_BEGIN @53: SDLRPCFunctionNameGetAppServiceData, @54: SDLRPCFunctionNameGetFile, @55: SDLRPCFunctionNamePerformAppServiceInteraction, + @58: SDLRPCFunctionNameCloseApplication, @32768: SDLRPCFunctionNameOnHMIStatus, @32769: SDLRPCFunctionNameOnAppInterfaceUnregistered, @32770: SDLRPCFunctionNameOnButtonEvent, diff --git a/SmartDeviceLink/SDLRPCFunctionNames.h b/SmartDeviceLink/SDLRPCFunctionNames.h index 52318c3bd..1693d773c 100644 --- a/SmartDeviceLink/SDLRPCFunctionNames.h +++ b/SmartDeviceLink/SDLRPCFunctionNames.h @@ -19,6 +19,7 @@ extern SDLRPCFunctionName const SDLRPCFunctionNameAlert; extern SDLRPCFunctionName const SDLRPCFunctionNameAlertManeuver; extern SDLRPCFunctionName const SDLRPCFunctionNameButtonPress; extern SDLRPCFunctionName const SDLRPCFunctionNameChangeRegistration; +extern SDLRPCFunctionName const SDLRPCFunctionNameCloseApplication; extern SDLRPCFunctionName const SDLRPCFunctionNameCreateInteractionChoiceSet; extern SDLRPCFunctionName const SDLRPCFunctionNameDeleteCommand; extern SDLRPCFunctionName const SDLRPCFunctionNameDeleteFile; diff --git a/SmartDeviceLink/SDLRPCFunctionNames.m b/SmartDeviceLink/SDLRPCFunctionNames.m index c51e98be0..879ae943b 100644 --- a/SmartDeviceLink/SDLRPCFunctionNames.m +++ b/SmartDeviceLink/SDLRPCFunctionNames.m @@ -14,6 +14,7 @@ SDLRPCFunctionName const SDLRPCFunctionNameAlert = @"Alert"; SDLRPCFunctionName const SDLRPCFunctionNameAlertManeuver = @"AlertManeuver"; SDLRPCFunctionName const SDLRPCFunctionNameButtonPress = @"ButtonPress"; SDLRPCFunctionName const SDLRPCFunctionNameChangeRegistration = @"ChangeRegistration"; +SDLRPCFunctionName const SDLRPCFunctionNameCloseApplication = @"CloseApplication"; SDLRPCFunctionName const SDLRPCFunctionNameCreateInteractionChoiceSet = @"CreateInteractionChoiceSet"; SDLRPCFunctionName const SDLRPCFunctionNameDeleteCommand = @"DeleteCommand"; SDLRPCFunctionName const SDLRPCFunctionNameDeleteFile = @"DeleteFile"; |