diff options
134 files changed, 777 insertions, 774 deletions
diff --git a/SmartDeviceLink/SDLAddCommand.h b/SmartDeviceLink/SDLAddCommand.h index 86b30bab9..8cd64e1c6 100644 --- a/SmartDeviceLink/SDLAddCommand.h +++ b/SmartDeviceLink/SDLAddCommand.h @@ -59,7 +59,7 @@ * * Required, Integer, 0 - 2,000,000,000 */ -@property (strong) NSNumber *cmdID; +@property (strong) NSNumber<SDLInt> *cmdID; /** * @abstract a *SDLMenuParams* pointer which will defined the command and how it is added to the Command Menu diff --git a/SmartDeviceLink/SDLAddCommand.m b/SmartDeviceLink/SDLAddCommand.m index b87d8ec4c..d9a39a5ba 100644 --- a/SmartDeviceLink/SDLAddCommand.m +++ b/SmartDeviceLink/SDLAddCommand.m @@ -27,7 +27,7 @@ return self; } -- (void)setCmdID:(NSNumber *)cmdID { +- (void)setCmdID:(NSNumber<SDLInt> *)cmdID { if (cmdID != nil) { [parameters setObject:cmdID forKey:SDLNameCommandId]; } else { @@ -35,7 +35,7 @@ } } -- (NSNumber *)cmdID { +- (NSNumber<SDLInt> *)cmdID { return [parameters objectForKey:SDLNameCommandId]; } diff --git a/SmartDeviceLink/SDLAddSubMenu.h b/SmartDeviceLink/SDLAddSubMenu.h index 623757916..13f33db6a 100644 --- a/SmartDeviceLink/SDLAddSubMenu.h +++ b/SmartDeviceLink/SDLAddSubMenu.h @@ -24,7 +24,7 @@ * <i>SDLAddCommand</i> to which SDLSubMenu is the parent of the command being added * <p> */ -@property (strong) NSNumber *menuID; +@property (strong) NSNumber<SDLInt> *menuID; /** * @abstract a position of menu * @discussion An NSNumber pointer representing the position within the items @@ -43,7 +43,7 @@ * the end of the list</li> * </ul> */ -@property (strong) NSNumber *position; +@property (strong) NSNumber<SDLInt> *position; /** * @abstract a menuName which is displayed representing this submenu item * @discussion NSString which will be displayed representing this submenu item diff --git a/SmartDeviceLink/SDLAddSubMenu.m b/SmartDeviceLink/SDLAddSubMenu.m index 0ddd4aa46..117eea4d4 100644 --- a/SmartDeviceLink/SDLAddSubMenu.m +++ b/SmartDeviceLink/SDLAddSubMenu.m @@ -12,7 +12,7 @@ return self; } -- (void)setMenuID:(NSNumber *)menuID { +- (void)setMenuID:(NSNumber<SDLInt> *)menuID { if (menuID != nil) { [parameters setObject:menuID forKey:SDLNameMenuId]; } else { @@ -20,11 +20,11 @@ } } -- (NSNumber *)menuID { +- (NSNumber<SDLInt> *)menuID { return [parameters objectForKey:SDLNameMenuId]; } -- (void)setPosition:(NSNumber *)position { +- (void)setPosition:(NSNumber<SDLInt> *)position { if (position != nil) { [parameters setObject:position forKey:SDLNamePosition]; } else { @@ -32,7 +32,7 @@ } } -- (NSNumber *)position { +- (NSNumber<SDLInt> *)position { return [parameters objectForKey:SDLNamePosition]; } diff --git a/SmartDeviceLink/SDLAlert.h b/SmartDeviceLink/SDLAlert.h index 97cc6c7ea..7ba32c20d 100644 --- a/SmartDeviceLink/SDLAlert.h +++ b/SmartDeviceLink/SDLAlert.h @@ -99,7 +99,7 @@ * * Optional, Integer, 3000 - 10000 */ -@property (strong) NSNumber *duration; +@property (strong) NSNumber<SDLInt> *duration; /** * @abstract Whether the alert tone should be played before the TTS (if any) is spoken. @@ -108,7 +108,7 @@ * * Optional, Boolean */ -@property (strong) NSNumber *playTone; +@property (strong) NSNumber<SDLBool> *playTone; /** * @abstract If supported on the given platform, the alert GUI will include some sort of animation indicating that loading of a feature is progressing. e.g. a spinning wheel or hourglass, etc. @@ -117,7 +117,7 @@ * * @since SmartDeviceLink 2.0 */ -@property (strong) NSNumber *progressIndicator; +@property (strong) NSNumber<SDLBool> *progressIndicator; /** * @abstract App defined SoftButtons. diff --git a/SmartDeviceLink/SDLAlert.m b/SmartDeviceLink/SDLAlert.m index d9f8cc5fb..028f81d90 100644 --- a/SmartDeviceLink/SDLAlert.m +++ b/SmartDeviceLink/SDLAlert.m @@ -71,7 +71,7 @@ } } -- (void)setDuration:(NSNumber *)duration { +- (void)setDuration:(NSNumber<SDLInt> *)duration { if (duration != nil) { [parameters setObject:duration forKey:SDLNameDuration]; } else { @@ -79,11 +79,11 @@ } } -- (NSNumber *)duration { +- (NSNumber<SDLInt> *)duration { return [parameters objectForKey:SDLNameDuration]; } -- (void)setPlayTone:(NSNumber *)playTone { +- (void)setPlayTone:(NSNumber<SDLBool> *)playTone { if (playTone != nil) { [parameters setObject:playTone forKey:SDLNamePlayTone]; } else { @@ -91,11 +91,11 @@ } } -- (NSNumber *)playTone { +- (NSNumber<SDLBool> *)playTone { return [parameters objectForKey:SDLNamePlayTone]; } -- (void)setProgressIndicator:(NSNumber *)progressIndicator { +- (void)setProgressIndicator:(NSNumber<SDLBool> *)progressIndicator { if (progressIndicator != nil) { [parameters setObject:progressIndicator forKey:SDLNameProgressIndicator]; } else { @@ -103,7 +103,7 @@ } } -- (NSNumber *)progressIndicator { +- (NSNumber<SDLBool> *)progressIndicator { return [parameters objectForKey:SDLNameProgressIndicator]; } diff --git a/SmartDeviceLink/SDLAlertResponse.h b/SmartDeviceLink/SDLAlertResponse.h index b2c4fb500..beca991f1 100644 --- a/SmartDeviceLink/SDLAlertResponse.h +++ b/SmartDeviceLink/SDLAlertResponse.h @@ -10,6 +10,6 @@ */ @interface SDLAlertResponse : SDLRPCResponse -@property (strong) NSNumber *tryAgainTime; +@property (strong) NSNumber<SDLInt> *tryAgainTime; @end diff --git a/SmartDeviceLink/SDLAlertResponse.m b/SmartDeviceLink/SDLAlertResponse.m index a7f76a9a9..e2a3af5e1 100644 --- a/SmartDeviceLink/SDLAlertResponse.m +++ b/SmartDeviceLink/SDLAlertResponse.m @@ -13,7 +13,7 @@ return self; } -- (void)setTryAgainTime:(NSNumber *)tryAgainTime { +- (void)setTryAgainTime:(NSNumber<SDLInt> *)tryAgainTime { if (tryAgainTime != nil) { [parameters setObject:tryAgainTime forKey:SDLNameTryAgainTime]; } else { @@ -21,7 +21,7 @@ } } -- (NSNumber *)tryAgainTime { +- (NSNumber<SDLInt> *)tryAgainTime { return [parameters objectForKey:SDLNameTryAgainTime]; } diff --git a/SmartDeviceLink/SDLBodyInformation.h b/SmartDeviceLink/SDLBodyInformation.h index ad933e6ae..4729ffc6c 100644 --- a/SmartDeviceLink/SDLBodyInformation.h +++ b/SmartDeviceLink/SDLBodyInformation.h @@ -15,7 +15,7 @@ /** * @abstract References signal "PrkBrkActv_B_Actl". */ -@property (strong) NSNumber *parkBrakeActive; +@property (strong) NSNumber<SDLBool> *parkBrakeActive; /** * @abstract References signal "Ignition_Switch_Stable". See IgnitionStableStatus. @@ -30,21 +30,21 @@ /** * @abstract References signal "DrStatDrv_B_Actl". */ -@property (strong) NSNumber *driverDoorAjar; +@property (strong) NSNumber<SDLBool> *driverDoorAjar; /** * @abstract References signal "DrStatPsngr_B_Actl". */ -@property (strong) NSNumber *passengerDoorAjar; +@property (strong) NSNumber<SDLBool> *passengerDoorAjar; /** * @abstract References signal "DrStatRl_B_Actl". */ -@property (strong) NSNumber *rearLeftDoorAjar; +@property (strong) NSNumber<SDLBool> *rearLeftDoorAjar; /** * @abstract References signal "DrStatRr_B_Actl". */ -@property (strong) NSNumber *rearRightDoorAjar; +@property (strong) NSNumber<SDLBool> *rearRightDoorAjar; @end diff --git a/SmartDeviceLink/SDLBodyInformation.m b/SmartDeviceLink/SDLBodyInformation.m index b7e6702d4..db54f6264 100644 --- a/SmartDeviceLink/SDLBodyInformation.m +++ b/SmartDeviceLink/SDLBodyInformation.m @@ -10,7 +10,7 @@ @implementation SDLBodyInformation -- (void)setParkBrakeActive:(NSNumber *)parkBrakeActive { +- (void)setParkBrakeActive:(NSNumber<SDLBool> *)parkBrakeActive { if (parkBrakeActive != nil) { [store setObject:parkBrakeActive forKey:SDLNameParkBrakeActive]; } else { @@ -18,7 +18,7 @@ } } -- (NSNumber *)parkBrakeActive { +- (NSNumber<SDLBool> *)parkBrakeActive { return [store objectForKey:SDLNameParkBrakeActive]; } @@ -48,7 +48,7 @@ return (SDLIgnitionStatus)obj; } -- (void)setDriverDoorAjar:(NSNumber *)driverDoorAjar { +- (void)setDriverDoorAjar:(NSNumber<SDLBool> *)driverDoorAjar { if (driverDoorAjar != nil) { [store setObject:driverDoorAjar forKey:SDLNameDriverDoorAjar]; } else { @@ -56,11 +56,11 @@ } } -- (NSNumber *)driverDoorAjar { +- (NSNumber<SDLBool> *)driverDoorAjar { return [store objectForKey:SDLNameDriverDoorAjar]; } -- (void)setPassengerDoorAjar:(NSNumber *)passengerDoorAjar { +- (void)setPassengerDoorAjar:(NSNumber<SDLBool> *)passengerDoorAjar { if (passengerDoorAjar != nil) { [store setObject:passengerDoorAjar forKey:SDLNamePassengerDoorAjar]; } else { @@ -68,11 +68,11 @@ } } -- (NSNumber *)passengerDoorAjar { +- (NSNumber<SDLBool> *)passengerDoorAjar { return [store objectForKey:SDLNamePassengerDoorAjar]; } -- (void)setRearLeftDoorAjar:(NSNumber *)rearLeftDoorAjar { +- (void)setRearLeftDoorAjar:(NSNumber<SDLBool> *)rearLeftDoorAjar { if (rearLeftDoorAjar != nil) { [store setObject:rearLeftDoorAjar forKey:SDLNameRearLeftDoorAjar]; } else { @@ -80,11 +80,11 @@ } } -- (NSNumber *)rearLeftDoorAjar { +- (NSNumber<SDLBool> *)rearLeftDoorAjar { return [store objectForKey:SDLNameRearLeftDoorAjar]; } -- (void)setRearRightDoorAjar:(NSNumber *)rearRightDoorAjar { +- (void)setRearRightDoorAjar:(NSNumber<SDLBool> *)rearRightDoorAjar { if (rearRightDoorAjar != nil) { [store setObject:rearRightDoorAjar forKey:SDLNameRearRightDoorAjar]; } else { @@ -92,7 +92,7 @@ } } -- (NSNumber *)rearRightDoorAjar { +- (NSNumber<SDLBool> *)rearRightDoorAjar { return [store objectForKey:SDLNameRearRightDoorAjar]; } diff --git a/SmartDeviceLink/SDLButtonCapabilities.h b/SmartDeviceLink/SDLButtonCapabilities.h index 33e8e8dcb..f73416239 100644 --- a/SmartDeviceLink/SDLButtonCapabilities.h +++ b/SmartDeviceLink/SDLButtonCapabilities.h @@ -23,20 +23,20 @@ * * Required, Boolean */ -@property (strong) NSNumber *shortPressAvailable; +@property (strong) NSNumber<SDLBool> *shortPressAvailable; /** * @abstract A NSNumber value indicates whether the button supports a LONG press * * Required, Boolean */ -@property (strong) NSNumber *longPressAvailable; +@property (strong) NSNumber<SDLBool> *longPressAvailable; /** * @abstract A NSNumber value indicates whether the button supports "button down" and "button up" * * Required, Boolean */ -@property (strong) NSNumber *upDownAvailable; +@property (strong) NSNumber<SDLBool> *upDownAvailable; @end diff --git a/SmartDeviceLink/SDLButtonCapabilities.m b/SmartDeviceLink/SDLButtonCapabilities.m index 3cd46f12f..3786a6534 100644 --- a/SmartDeviceLink/SDLButtonCapabilities.m +++ b/SmartDeviceLink/SDLButtonCapabilities.m @@ -20,7 +20,7 @@ return (SDLButtonName)obj; } -- (void)setShortPressAvailable:(NSNumber *)shortPressAvailable { +- (void)setShortPressAvailable:(NSNumber<SDLBool> *)shortPressAvailable { if (shortPressAvailable != nil) { [store setObject:shortPressAvailable forKey:SDLNameShortPressAvailable]; } else { @@ -28,11 +28,11 @@ } } -- (NSNumber *)shortPressAvailable { +- (NSNumber<SDLBool> *)shortPressAvailable { return [store objectForKey:SDLNameShortPressAvailable]; } -- (void)setLongPressAvailable:(NSNumber *)longPressAvailable { +- (void)setLongPressAvailable:(NSNumber<SDLBool> *)longPressAvailable { if (longPressAvailable != nil) { [store setObject:longPressAvailable forKey:SDLNameLongPressAvailable]; } else { @@ -40,11 +40,11 @@ } } -- (NSNumber *)longPressAvailable { +- (NSNumber<SDLBool> *)longPressAvailable { return [store objectForKey:SDLNameLongPressAvailable]; } -- (void)setUpDownAvailable:(NSNumber *)upDownAvailable { +- (void)setUpDownAvailable:(NSNumber<SDLBool> *)upDownAvailable { if (upDownAvailable != nil) { [store setObject:upDownAvailable forKey:SDLNameUpDownAvailable]; } else { @@ -52,7 +52,7 @@ } } -- (NSNumber *)upDownAvailable { +- (NSNumber<SDLBool> *)upDownAvailable { return [store objectForKey:SDLNameUpDownAvailable]; } diff --git a/SmartDeviceLink/SDLChoice.h b/SmartDeviceLink/SDLChoice.h index 81e8433f4..6e34d605b 100644 --- a/SmartDeviceLink/SDLChoice.h +++ b/SmartDeviceLink/SDLChoice.h @@ -57,7 +57,7 @@ * * Required, Integer 0 - 65535 */ -@property (strong) NSNumber *choiceID; +@property (strong) NSNumber<SDLInt> *choiceID; /** * @abstract Text which appears in menu, representing this choice diff --git a/SmartDeviceLink/SDLChoice.m b/SmartDeviceLink/SDLChoice.m index fa1035868..17b5a8778 100644 --- a/SmartDeviceLink/SDLChoice.m +++ b/SmartDeviceLink/SDLChoice.m @@ -8,7 +8,7 @@ @implementation SDLChoice -- (void)setChoiceID:(NSNumber *)choiceID { +- (void)setChoiceID:(NSNumber<SDLInt> *)choiceID { if (choiceID != nil) { [store setObject:choiceID forKey:SDLNameChoiceId]; } else { @@ -16,7 +16,7 @@ } } -- (NSNumber *)choiceID { +- (NSNumber<SDLInt> *)choiceID { return [store objectForKey:SDLNameChoiceId]; } diff --git a/SmartDeviceLink/SDLClusterModeStatus.h b/SmartDeviceLink/SDLClusterModeStatus.h index b22370ec3..5970fc69f 100644 --- a/SmartDeviceLink/SDLClusterModeStatus.h +++ b/SmartDeviceLink/SDLClusterModeStatus.h @@ -10,7 +10,7 @@ @interface SDLClusterModeStatus : SDLRPCStruct -@property (strong) NSNumber *powerModeActive; +@property (strong) NSNumber<SDLBool> *powerModeActive; @property (strong) SDLPowerModeQualificationStatus powerModeQualificationStatus; @property (strong) SDLCarModeStatus carModeStatus; @property (strong) SDLPowerModeStatus powerModeStatus; diff --git a/SmartDeviceLink/SDLClusterModeStatus.m b/SmartDeviceLink/SDLClusterModeStatus.m index 499a6a21f..194cc9aff 100644 --- a/SmartDeviceLink/SDLClusterModeStatus.m +++ b/SmartDeviceLink/SDLClusterModeStatus.m @@ -7,7 +7,7 @@ @implementation SDLClusterModeStatus -- (void)setPowerModeActive:(NSNumber *)powerModeActive { +- (void)setPowerModeActive:(NSNumber<SDLBool> *)powerModeActive { if (powerModeActive != nil) { [store setObject:powerModeActive forKey:SDLNamePowerModeActive]; } else { @@ -15,7 +15,7 @@ } } -- (NSNumber *)powerModeActive { +- (NSNumber<SDLBool> *)powerModeActive { return [store objectForKey:SDLNamePowerModeActive]; } diff --git a/SmartDeviceLink/SDLCreateInteractionChoiceSet.h b/SmartDeviceLink/SDLCreateInteractionChoiceSet.h index beb893ed8..a1e8fd937 100644 --- a/SmartDeviceLink/SDLCreateInteractionChoiceSet.h +++ b/SmartDeviceLink/SDLCreateInteractionChoiceSet.h @@ -26,7 +26,7 @@ * * Required, Integer, 0 - 2,000,000,000 */ -@property (strong) NSNumber *interactionChoiceSetID; +@property (strong) NSNumber<SDLInt> *interactionChoiceSetID; /** * @abstract Array of choices, which the user can select by menu or voice recognition diff --git a/SmartDeviceLink/SDLCreateInteractionChoiceSet.m b/SmartDeviceLink/SDLCreateInteractionChoiceSet.m index 3d443d719..c3d3d9463 100644 --- a/SmartDeviceLink/SDLCreateInteractionChoiceSet.m +++ b/SmartDeviceLink/SDLCreateInteractionChoiceSet.m @@ -15,7 +15,7 @@ return self; } -- (void)setInteractionChoiceSetID:(NSNumber *)interactionChoiceSetID { +- (void)setInteractionChoiceSetID:(NSNumber<SDLInt> *)interactionChoiceSetID { if (interactionChoiceSetID != nil) { [parameters setObject:interactionChoiceSetID forKey:SDLNameInteractionChoiceSetId]; } else { @@ -23,7 +23,7 @@ } } -- (NSNumber *)interactionChoiceSetID { +- (NSNumber<SDLInt> *)interactionChoiceSetID { return [parameters objectForKey:SDLNameInteractionChoiceSetId]; } diff --git a/SmartDeviceLink/SDLDIDResult.h b/SmartDeviceLink/SDLDIDResult.h index ee0811e5b..60eec5184 100644 --- a/SmartDeviceLink/SDLDIDResult.h +++ b/SmartDeviceLink/SDLDIDResult.h @@ -9,7 +9,7 @@ @interface SDLDIDResult : SDLRPCStruct @property (strong) SDLVehicleDataResultCode resultCode; -@property (strong) NSNumber *didLocation; +@property (strong) NSNumber<SDLInt> *didLocation; @property (strong) NSString *data; @end diff --git a/SmartDeviceLink/SDLDIDResult.m b/SmartDeviceLink/SDLDIDResult.m index 8c1a19b1c..3e441fbbe 100644 --- a/SmartDeviceLink/SDLDIDResult.m +++ b/SmartDeviceLink/SDLDIDResult.m @@ -20,7 +20,7 @@ return (SDLVehicleDataResultCode)obj; } -- (void)setDidLocation:(NSNumber *)didLocation { +- (void)setDidLocation:(NSNumber<SDLInt> *)didLocation { if (didLocation != nil) { [store setObject:didLocation forKey:SDLNameDIDLocation]; } else { @@ -28,7 +28,7 @@ } } -- (NSNumber *)didLocation { +- (NSNumber<SDLInt> *)didLocation { return [store objectForKey:SDLNameDIDLocation]; } diff --git a/SmartDeviceLink/SDLDeleteCommand.h b/SmartDeviceLink/SDLDeleteCommand.h index bf5e076dd..c804fecd8 100644 --- a/SmartDeviceLink/SDLDeleteCommand.h +++ b/SmartDeviceLink/SDLDeleteCommand.h @@ -24,6 +24,6 @@ * <p> * <b>Notes: </b>Min Value: 0; Max Value: 2000000000 */ -@property (strong) NSNumber *cmdID; +@property (strong) NSNumber<SDLInt> *cmdID; @end diff --git a/SmartDeviceLink/SDLDeleteCommand.m b/SmartDeviceLink/SDLDeleteCommand.m index ee80ee98c..ef671d07e 100644 --- a/SmartDeviceLink/SDLDeleteCommand.m +++ b/SmartDeviceLink/SDLDeleteCommand.m @@ -14,7 +14,7 @@ return self; } -- (void)setCmdID:(NSNumber *)cmdID { +- (void)setCmdID:(NSNumber<SDLInt> *)cmdID { if (cmdID != nil) { [parameters setObject:cmdID forKey:SDLNameCommandId]; } else { @@ -22,7 +22,7 @@ } } -- (NSNumber *)cmdID { +- (NSNumber<SDLInt> *)cmdID { return [parameters objectForKey:SDLNameCommandId]; } diff --git a/SmartDeviceLink/SDLDeleteFileResponse.h b/SmartDeviceLink/SDLDeleteFileResponse.h index 5fa17495f..dc2a91f4d 100644 --- a/SmartDeviceLink/SDLDeleteFileResponse.h +++ b/SmartDeviceLink/SDLDeleteFileResponse.h @@ -11,6 +11,6 @@ */ @interface SDLDeleteFileResponse : SDLRPCResponse -@property (strong) NSNumber *spaceAvailable; +@property (strong) NSNumber<SDLInt> *spaceAvailable; @end diff --git a/SmartDeviceLink/SDLDeleteFileResponse.m b/SmartDeviceLink/SDLDeleteFileResponse.m index 0711ba7e2..f2a77b19e 100644 --- a/SmartDeviceLink/SDLDeleteFileResponse.m +++ b/SmartDeviceLink/SDLDeleteFileResponse.m @@ -14,7 +14,7 @@ return self; } -- (void)setSpaceAvailable:(NSNumber *)spaceAvailable { +- (void)setSpaceAvailable:(NSNumber<SDLInt> *)spaceAvailable { if (spaceAvailable != nil) { [parameters setObject:spaceAvailable forKey:SDLNameSpaceAvailable]; } else { @@ -22,7 +22,7 @@ } } -- (NSNumber *)spaceAvailable { +- (NSNumber<SDLInt> *)spaceAvailable { return [parameters objectForKey:SDLNameSpaceAvailable]; } diff --git a/SmartDeviceLink/SDLDeleteInteractionChoiceSet.h b/SmartDeviceLink/SDLDeleteInteractionChoiceSet.h index 4b7100a05..48810cf33 100644 --- a/SmartDeviceLink/SDLDeleteInteractionChoiceSet.h +++ b/SmartDeviceLink/SDLDeleteInteractionChoiceSet.h @@ -26,6 +26,6 @@ * <p> * <b>Notes: </b>Min Value: 0; Max Value: 2000000000 */ -@property (strong) NSNumber *interactionChoiceSetID; +@property (strong) NSNumber<SDLInt> *interactionChoiceSetID; @end diff --git a/SmartDeviceLink/SDLDeleteInteractionChoiceSet.m b/SmartDeviceLink/SDLDeleteInteractionChoiceSet.m index d278965f4..43a48b353 100644 --- a/SmartDeviceLink/SDLDeleteInteractionChoiceSet.m +++ b/SmartDeviceLink/SDLDeleteInteractionChoiceSet.m @@ -14,7 +14,7 @@ return self; } -- (void)setInteractionChoiceSetID:(NSNumber *)interactionChoiceSetID { +- (void)setInteractionChoiceSetID:(NSNumber<SDLInt> *)interactionChoiceSetID { if (interactionChoiceSetID != nil) { [parameters setObject:interactionChoiceSetID forKey:SDLNameInteractionChoiceSetId]; } else { @@ -22,7 +22,7 @@ } } -- (NSNumber *)interactionChoiceSetID { +- (NSNumber<SDLInt> *)interactionChoiceSetID { return [parameters objectForKey:SDLNameInteractionChoiceSetId]; } diff --git a/SmartDeviceLink/SDLDeleteSubMenu.h b/SmartDeviceLink/SDLDeleteSubMenu.h index 0cddf67bb..e52ff956e 100644 --- a/SmartDeviceLink/SDLDeleteSubMenu.h +++ b/SmartDeviceLink/SDLDeleteSubMenu.h @@ -22,6 +22,6 @@ * @abstract the MenuID that identifies the SDLSubMenu to be delete * @discussion <b>Notes: </b>Min Value: 0; Max Value: 2000000000 */ -@property (strong) NSNumber *menuID; +@property (strong) NSNumber<SDLInt> *menuID; @end diff --git a/SmartDeviceLink/SDLDeleteSubMenu.m b/SmartDeviceLink/SDLDeleteSubMenu.m index 2c2320944..f71f72eee 100644 --- a/SmartDeviceLink/SDLDeleteSubMenu.m +++ b/SmartDeviceLink/SDLDeleteSubMenu.m @@ -14,7 +14,7 @@ return self; } -- (void)setMenuID:(NSNumber *)menuID { +- (void)setMenuID:(NSNumber<SDLInt> *)menuID { if (menuID != nil) { [parameters setObject:menuID forKey:SDLNameMenuId]; } else { @@ -22,7 +22,7 @@ } } -- (NSNumber *)menuID { +- (NSNumber<SDLInt> *)menuID { return [parameters objectForKey:SDLNameMenuId]; } diff --git a/SmartDeviceLink/SDLDeviceInfo.h b/SmartDeviceLink/SDLDeviceInfo.h index f85c5666e..a45e3f6fd 100644 --- a/SmartDeviceLink/SDLDeviceInfo.h +++ b/SmartDeviceLink/SDLDeviceInfo.h @@ -11,6 +11,6 @@ @property (strong) NSString *os; @property (strong) NSString *osVersion; @property (strong) NSString *carrier; -@property (strong) NSNumber *maxNumberRFCOMMPorts; +@property (strong) NSNumber<SDLInt> *maxNumberRFCOMMPorts; @end diff --git a/SmartDeviceLink/SDLDeviceInfo.m b/SmartDeviceLink/SDLDeviceInfo.m index 861e8c209..80fbcf907 100644 --- a/SmartDeviceLink/SDLDeviceInfo.m +++ b/SmartDeviceLink/SDLDeviceInfo.m @@ -67,7 +67,7 @@ return [store objectForKey:SDLNameCarrier]; } -- (void)setMaxNumberRFCOMMPorts:(NSNumber *)maxNumberRFCOMMPorts { +- (void)setMaxNumberRFCOMMPorts:(NSNumber<SDLInt> *)maxNumberRFCOMMPorts { if (maxNumberRFCOMMPorts != nil) { [store setObject:maxNumberRFCOMMPorts forKey:SDLNameMaxNumberRFCOMMPorts]; } else { @@ -75,7 +75,7 @@ } } -- (NSNumber *)maxNumberRFCOMMPorts { +- (NSNumber<SDLInt> *)maxNumberRFCOMMPorts { return [store objectForKey:SDLNameMaxNumberRFCOMMPorts]; } diff --git a/SmartDeviceLink/SDLDeviceStatus.h b/SmartDeviceLink/SDLDeviceStatus.h index a2a589181..0a81176e3 100644 --- a/SmartDeviceLink/SDLDeviceStatus.h +++ b/SmartDeviceLink/SDLDeviceStatus.h @@ -105,35 +105,35 @@ * * Required, Boolean */ -@property (strong) NSNumber *voiceRecOn; +@property (strong) NSNumber<SDLBool> *voiceRecOn; /** * @abstract Indicates whether the bluetooth connection established * * Required, Boolean */ -@property (strong) NSNumber *btIconOn; +@property (strong) NSNumber<SDLBool> *btIconOn; /** * @abstract Indicates whether a call is being active * * Required, Boolean */ -@property (strong) NSNumber *callActive; +@property (strong) NSNumber<SDLBool> *callActive; /** * @abstract Indicates whether the phone is in roaming mode * * Required, Boolean */ -@property (strong) NSNumber *phoneRoaming; +@property (strong) NSNumber<SDLBool> *phoneRoaming; /** * @abstract Indicates whether a textmessage is available * * Required, Boolean */ -@property (strong) NSNumber *textMsgAvailable; +@property (strong) NSNumber<SDLBool> *textMsgAvailable; /** * @abstract Battery level status @@ -149,14 +149,14 @@ * * Required, Boolean */ -@property (strong) NSNumber *stereoAudioOutputMuted; +@property (strong) NSNumber<SDLBool> *stereoAudioOutputMuted; /** * @abstract The status of the mono audio output channel * * Required, Boolean */ -@property (strong) NSNumber *monoAudioOutputMuted; +@property (strong) NSNumber<SDLBool> *monoAudioOutputMuted; /** * @abstract Signal level status @@ -181,6 +181,6 @@ * * Required, Boolean */ -@property (strong) NSNumber *eCallEventActive; +@property (strong) NSNumber<SDLBool> *eCallEventActive; @end diff --git a/SmartDeviceLink/SDLDeviceStatus.m b/SmartDeviceLink/SDLDeviceStatus.m index 1041c22d7..fb5f1e853 100644 --- a/SmartDeviceLink/SDLDeviceStatus.m +++ b/SmartDeviceLink/SDLDeviceStatus.m @@ -9,7 +9,7 @@ @implementation SDLDeviceStatus -- (void)setVoiceRecOn:(NSNumber *)voiceRecOn { +- (void)setVoiceRecOn:(NSNumber<SDLBool> *)voiceRecOn { if (voiceRecOn != nil) { [store setObject:voiceRecOn forKey:SDLNameVoiceRecognitionOn]; } else { @@ -17,11 +17,11 @@ } } -- (NSNumber *)voiceRecOn { +- (NSNumber<SDLBool> *)voiceRecOn { return [store objectForKey:SDLNameVoiceRecognitionOn]; } -- (void)setBtIconOn:(NSNumber *)btIconOn { +- (void)setBtIconOn:(NSNumber<SDLBool> *)btIconOn { if (btIconOn != nil) { [store setObject:btIconOn forKey:SDLNameBluetoothIconOn]; } else { @@ -29,11 +29,11 @@ } } -- (NSNumber *)btIconOn { +- (NSNumber<SDLBool> *)btIconOn { return [store objectForKey:SDLNameBluetoothIconOn]; } -- (void)setCallActive:(NSNumber *)callActive { +- (void)setCallActive:(NSNumber<SDLBool> *)callActive { if (callActive != nil) { [store setObject:callActive forKey:SDLNameCallActive]; } else { @@ -41,11 +41,11 @@ } } -- (NSNumber *)callActive { +- (NSNumber<SDLBool> *)callActive { return [store objectForKey:SDLNameCallActive]; } -- (void)setPhoneRoaming:(NSNumber *)phoneRoaming { +- (void)setPhoneRoaming:(NSNumber<SDLBool> *)phoneRoaming { if (phoneRoaming != nil) { [store setObject:phoneRoaming forKey:SDLNamePhoneRoaming]; } else { @@ -53,11 +53,11 @@ } } -- (NSNumber *)phoneRoaming { +- (NSNumber<SDLBool> *)phoneRoaming { return [store objectForKey:SDLNamePhoneRoaming]; } -- (void)setTextMsgAvailable:(NSNumber *)textMsgAvailable { +- (void)setTextMsgAvailable:(NSNumber<SDLBool> *)textMsgAvailable { if (textMsgAvailable != nil) { [store setObject:textMsgAvailable forKey:SDLNameTextMessageAvailable]; } else { @@ -65,7 +65,7 @@ } } -- (NSNumber *)textMsgAvailable { +- (NSNumber<SDLBool> *)textMsgAvailable { return [store objectForKey:SDLNameTextMessageAvailable]; } @@ -82,7 +82,7 @@ return (SDLDeviceLevelStatus)obj; } -- (void)setStereoAudioOutputMuted:(NSNumber *)stereoAudioOutputMuted { +- (void)setStereoAudioOutputMuted:(NSNumber<SDLBool> *)stereoAudioOutputMuted { if (stereoAudioOutputMuted != nil) { [store setObject:stereoAudioOutputMuted forKey:SDLNameStereoAudioOutputMuted]; } else { @@ -90,11 +90,11 @@ } } -- (NSNumber *)stereoAudioOutputMuted { +- (NSNumber<SDLBool> *)stereoAudioOutputMuted { return [store objectForKey:SDLNameStereoAudioOutputMuted]; } -- (void)setMonoAudioOutputMuted:(NSNumber *)monoAudioOutputMuted { +- (void)setMonoAudioOutputMuted:(NSNumber<SDLBool> *)monoAudioOutputMuted { if (monoAudioOutputMuted != nil) { [store setObject:monoAudioOutputMuted forKey:SDLNameMonoAudioOutputMuted]; } else { @@ -102,7 +102,7 @@ } } -- (NSNumber *)monoAudioOutputMuted { +- (NSNumber<SDLBool> *)monoAudioOutputMuted { return [store objectForKey:SDLNameMonoAudioOutputMuted]; } @@ -132,7 +132,7 @@ return (SDLPrimaryAudioSource)obj; } -- (void)setECallEventActive:(NSNumber *)eCallEventActive { +- (void)setECallEventActive:(NSNumber<SDLBool> *)eCallEventActive { if (eCallEventActive != nil) { [store setObject:eCallEventActive forKey:SDLNameECallEventActive]; } else { @@ -140,7 +140,7 @@ } } -- (NSNumber *)eCallEventActive { +- (NSNumber<SDLBool> *)eCallEventActive { return [store objectForKey:SDLNameECallEventActive]; } diff --git a/SmartDeviceLink/SDLDiagnosticMessage.h b/SmartDeviceLink/SDLDiagnosticMessage.h index 8a0a009f1..08416925a 100644 --- a/SmartDeviceLink/SDLDiagnosticMessage.h +++ b/SmartDeviceLink/SDLDiagnosticMessage.h @@ -16,20 +16,20 @@ * * Required, Integer, 0 - 65535 */ -@property (strong) NSNumber *targetID; +@property (strong) NSNumber<SDLInt> *targetID; /** * Length of message (in bytes) * * Required, Integer, 65535 */ -@property (strong) NSNumber *messageLength; +@property (strong) NSNumber<SDLInt> *messageLength; /** * Array of bytes comprising CAN message. * * Required, Array of NSNumber (Integers), Array size 1 - 65535, Integer Size 0 - 255 */ -@property (strong) NSMutableArray<NSNumber *> *messageData; +@property (strong) NSMutableArray<NSNumber<SDLInt> *> *messageData; @end diff --git a/SmartDeviceLink/SDLDiagnosticMessage.m b/SmartDeviceLink/SDLDiagnosticMessage.m index d7b69a800..0c70f81b8 100644 --- a/SmartDeviceLink/SDLDiagnosticMessage.m +++ b/SmartDeviceLink/SDLDiagnosticMessage.m @@ -14,7 +14,7 @@ return self; } -- (void)setTargetID:(NSNumber *)targetID { +- (void)setTargetID:(NSNumber<SDLInt> *)targetID { if (targetID != nil) { [parameters setObject:targetID forKey:SDLNameTargetId]; } else { @@ -22,11 +22,11 @@ } } -- (NSNumber *)targetID { +- (NSNumber<SDLInt> *)targetID { return [parameters objectForKey:SDLNameTargetId]; } -- (void)setMessageLength:(NSNumber *)messageLength { +- (void)setMessageLength:(NSNumber<SDLInt> *)messageLength { if (messageLength != nil) { [parameters setObject:messageLength forKey:SDLNameMessageLength]; } else { @@ -34,11 +34,11 @@ } } -- (NSNumber *)messageLength { +- (NSNumber<SDLInt> *)messageLength { return [parameters objectForKey:SDLNameMessageLength]; } -- (void)setMessageData:(NSMutableArray<NSNumber *> *)messageData { +- (void)setMessageData:(NSMutableArray<NSNumber<SDLInt> *> *)messageData { if (messageData != nil) { [parameters setObject:messageData forKey:SDLNameMessageData]; } else { @@ -46,7 +46,7 @@ } } -- (NSMutableArray<NSNumber *> *)messageData { +- (NSMutableArray<NSNumber<SDLInt> *> *)messageData { return [parameters objectForKey:SDLNameMessageData]; } diff --git a/SmartDeviceLink/SDLDiagnosticMessageResponse.h b/SmartDeviceLink/SDLDiagnosticMessageResponse.h index 81bfa67ec..7021a91ed 100644 --- a/SmartDeviceLink/SDLDiagnosticMessageResponse.h +++ b/SmartDeviceLink/SDLDiagnosticMessageResponse.h @@ -9,6 +9,6 @@ */ @interface SDLDiagnosticMessageResponse : SDLRPCResponse -@property (strong) NSMutableArray<NSNumber *> *messageDataResult; +@property (strong) NSMutableArray<NSNumber<SDLInt> *> *messageDataResult; @end diff --git a/SmartDeviceLink/SDLDiagnosticMessageResponse.m b/SmartDeviceLink/SDLDiagnosticMessageResponse.m index 3261c8d98..46c077f7a 100644 --- a/SmartDeviceLink/SDLDiagnosticMessageResponse.m +++ b/SmartDeviceLink/SDLDiagnosticMessageResponse.m @@ -13,7 +13,7 @@ return self; } -- (void)setMessageDataResult:(NSMutableArray<NSNumber *> *)messageDataResult { +- (void)setMessageDataResult:(NSMutableArray<NSNumber<SDLInt> *> *)messageDataResult { if (messageDataResult != nil) { [parameters setObject:messageDataResult forKey:SDLNameMessageDataResult]; } else { @@ -21,7 +21,7 @@ } } -- (NSMutableArray<NSNumber *> *)messageDataResult { +- (NSMutableArray<NSNumber<SDLInt> *> *)messageDataResult { return [parameters objectForKey:SDLNameMessageDataResult]; } diff --git a/SmartDeviceLink/SDLDisplayCapabilities.h b/SmartDeviceLink/SDLDisplayCapabilities.h index b38d7b54d..0e12ff682 100644 --- a/SmartDeviceLink/SDLDisplayCapabilities.h +++ b/SmartDeviceLink/SDLDisplayCapabilities.h @@ -62,7 +62,7 @@ * * Required, Boolean */ -@property (strong) NSNumber *graphicSupported; +@property (strong) NSNumber<SDLBool> *graphicSupported; /** * @abstract Number of presets the screen supports @@ -85,6 +85,6 @@ * * Optional, Integer 1 - 100 */ -@property (strong) NSNumber *numCustomPresetsAvailable; +@property (strong) NSNumber<SDLInt> *numCustomPresetsAvailable; @end diff --git a/SmartDeviceLink/SDLDisplayCapabilities.m b/SmartDeviceLink/SDLDisplayCapabilities.m index ab34887fd..f3e3f5cfb 100644 --- a/SmartDeviceLink/SDLDisplayCapabilities.m +++ b/SmartDeviceLink/SDLDisplayCapabilities.m @@ -86,7 +86,7 @@ } } -- (void)setGraphicSupported:(NSNumber *)graphicSupported { +- (void)setGraphicSupported:(NSNumber<SDLBool> *)graphicSupported { if (graphicSupported != nil) { [store setObject:graphicSupported forKey:SDLNameGraphicSupported]; } else { @@ -94,7 +94,7 @@ } } -- (NSNumber *)graphicSupported { +- (NSNumber<SDLBool> *)graphicSupported { return [store objectForKey:SDLNameGraphicSupported]; } @@ -127,7 +127,7 @@ } } -- (void)setNumCustomPresetsAvailable:(NSNumber *)numCustomPresetsAvailable { +- (void)setNumCustomPresetsAvailable:(NSNumber<SDLInt> *)numCustomPresetsAvailable { if (numCustomPresetsAvailable != nil) { [store setObject:numCustomPresetsAvailable forKey:SDLNameNumberCustomPresetsAvailable]; } else { @@ -135,7 +135,7 @@ } } -- (NSNumber *)numCustomPresetsAvailable { +- (NSNumber<SDLInt> *)numCustomPresetsAvailable { return [store objectForKey:SDLNameNumberCustomPresetsAvailable]; } diff --git a/SmartDeviceLink/SDLEmergencyEvent.h b/SmartDeviceLink/SDLEmergencyEvent.h index 088abd774..4fbf15a44 100644 --- a/SmartDeviceLink/SDLEmergencyEvent.h +++ b/SmartDeviceLink/SDLEmergencyEvent.h @@ -13,7 +13,7 @@ @property (strong) SDLEmergencyEventType emergencyEventType; @property (strong) SDLFuelCutoffStatus fuelCutoffStatus; @property (strong) SDLVehicleDataEventStatus rolloverEvent; -@property (strong) NSNumber *maximumChangeVelocity; +@property (strong) NSNumber<SDLInt> *maximumChangeVelocity; @property (strong) SDLVehicleDataEventStatus multipleEvents; @end diff --git a/SmartDeviceLink/SDLEmergencyEvent.m b/SmartDeviceLink/SDLEmergencyEvent.m index 5a4eb3812..0207cf3f9 100644 --- a/SmartDeviceLink/SDLEmergencyEvent.m +++ b/SmartDeviceLink/SDLEmergencyEvent.m @@ -46,7 +46,7 @@ return (SDLVehicleDataEventStatus)obj; } -- (void)setMaximumChangeVelocity:(NSNumber *)maximumChangeVelocity { +- (void)setMaximumChangeVelocity:(NSNumber<SDLInt> *)maximumChangeVelocity { if (maximumChangeVelocity != nil) { [store setObject:maximumChangeVelocity forKey:SDLNameMaximumChangeVelocity]; } else { @@ -54,7 +54,7 @@ } } -- (NSNumber *)maximumChangeVelocity { +- (NSNumber<SDLInt> *)maximumChangeVelocity { return [store objectForKey:SDLNameMaximumChangeVelocity]; } diff --git a/SmartDeviceLink/SDLFunctionID.h b/SmartDeviceLink/SDLFunctionID.h index c9cd4afb7..edd72485d 100644 --- a/SmartDeviceLink/SDLFunctionID.h +++ b/SmartDeviceLink/SDLFunctionID.h @@ -5,12 +5,13 @@ #import <Foundation/Foundation.h> #import "SDLNames.h" +#import "NSNumber+NumberType.h" @interface SDLFunctionID : NSObject + (instancetype)sharedInstance; - (SDLName)functionNameForId:(int)functionID; -- (NSNumber *)functionIdForName:(SDLName)functionName; +- (NSNumber<SDLInt> *)functionIdForName:(SDLName)functionName; @end diff --git a/SmartDeviceLink/SDLFunctionID.m b/SmartDeviceLink/SDLFunctionID.m index f03826df4..e5d81776c 100644 --- a/SmartDeviceLink/SDLFunctionID.m +++ b/SmartDeviceLink/SDLFunctionID.m @@ -94,7 +94,7 @@ } -- (NSNumber *)functionIdForName:(SDLName)functionName { +- (NSNumber<SDLInt> *)functionIdForName:(SDLName)functionName { return [[self.functionIds allKeysForObject:functionName] firstObject]; } diff --git a/SmartDeviceLink/SDLGPSData.h b/SmartDeviceLink/SDLGPSData.h index 34d1d8c28..8a1a9a5d1 100644 --- a/SmartDeviceLink/SDLGPSData.h +++ b/SmartDeviceLink/SDLGPSData.h @@ -19,56 +19,56 @@ * * Required, Float, -180 - 180 */ -@property (strong) NSNumber *longitudeDegrees; +@property (strong) NSNumber<SDLFloat> *longitudeDegrees; /** * @abstract latitude degrees * * Required, Float, -90 - 90 */ -@property (strong) NSNumber *latitudeDegrees; +@property (strong) NSNumber<SDLFloat> *latitudeDegrees; /** * @abstract utc year * * Required, Integer, 2010 - 2100 */ -@property (strong) NSNumber *utcYear; +@property (strong) NSNumber<SDLInt> *utcYear; /** * @abstract utc month * * Required, Integer, 1 - 12 */ -@property (strong) NSNumber *utcMonth; +@property (strong) NSNumber<SDLInt> *utcMonth; /** * @abstract utc day * * Required, Integer, 1 - 31 */ -@property (strong) NSNumber *utcDay; +@property (strong) NSNumber<SDLInt> *utcDay; /** * @abstract utc hours * * Required, Integer, 0 - 23 */ -@property (strong) NSNumber *utcHours; +@property (strong) NSNumber<SDLInt> *utcHours; /** * @abstract utc minutes * * Required, Integer, 0 - 59 */ -@property (strong) NSNumber *utcMinutes; +@property (strong) NSNumber<SDLInt> *utcMinutes; /** * @abstract utc seconds * * Required, Integer, 0 - 59 */ -@property (strong) NSNumber *utcSeconds; +@property (strong) NSNumber<SDLInt> *utcSeconds; /** * Potential Compass Directions @@ -82,7 +82,7 @@ * * Required, Float, 0.0 - 10.0 */ -@property (strong) NSNumber *pdop; +@property (strong) NSNumber<SDLFloat> *pdop; /** * @abstract The horizontal dilution of precision @@ -91,7 +91,7 @@ * * Required, Float, 0.0 - 10.0 */ -@property (strong) NSNumber *hdop; +@property (strong) NSNumber<SDLFloat> *hdop; /** * @abstract the vertical dilution of precision @@ -100,7 +100,7 @@ * * Required, Float, 0.0 - 10.0 */ -@property (strong) NSNumber *vdop; +@property (strong) NSNumber<SDLFloat> *vdop; /** * @abstract What the coordinates are based on @@ -109,14 +109,14 @@ * * Required, Boolean */ -@property (strong) NSNumber *actual; +@property (strong) NSNumber<SDLBool> *actual; /** * @abstract The number of satellites in view * * Required, Integer, 0 - 31 */ -@property (strong) NSNumber *satellites; +@property (strong) NSNumber<SDLInt> *satellites; /** * The supported dimensions of the GPS @@ -130,7 +130,7 @@ * * Required, Float, -10000.0 - 10000.0 */ -@property (strong) NSNumber *altitude; +@property (strong) NSNumber<SDLFloat> *altitude; /** * @abstract Heading based on the GPS data. @@ -139,13 +139,13 @@ * * Required, Float, 0.0 - 359.99 */ -@property (strong) NSNumber *heading; +@property (strong) NSNumber<SDLFloat> *heading; /** * @abstract speed in KPH * * Required, Float, 0.0 - 500.0 */ -@property (strong) NSNumber *speed; +@property (strong) NSNumber<SDLFloat> *speed; @end diff --git a/SmartDeviceLink/SDLGPSData.m b/SmartDeviceLink/SDLGPSData.m index 345df1695..63cdeb550 100644 --- a/SmartDeviceLink/SDLGPSData.m +++ b/SmartDeviceLink/SDLGPSData.m @@ -7,7 +7,7 @@ @implementation SDLGPSData -- (void)setLongitudeDegrees:(NSNumber *)longitudeDegrees { +- (void)setLongitudeDegrees:(NSNumber<SDLFloat> *)longitudeDegrees { if (longitudeDegrees != nil) { [store setObject:longitudeDegrees forKey:SDLNameLongitudeDegrees]; } else { @@ -15,11 +15,11 @@ } } -- (NSNumber *)longitudeDegrees { +- (NSNumber<SDLFloat> *)longitudeDegrees { return [store objectForKey:SDLNameLongitudeDegrees]; } -- (void)setLatitudeDegrees:(NSNumber *)latitudeDegrees { +- (void)setLatitudeDegrees:(NSNumber<SDLFloat> *)latitudeDegrees { if (latitudeDegrees != nil) { [store setObject:latitudeDegrees forKey:SDLNameLatitudeDegrees]; } else { @@ -27,11 +27,11 @@ } } -- (NSNumber *)latitudeDegrees { +- (NSNumber<SDLFloat> *)latitudeDegrees { return [store objectForKey:SDLNameLatitudeDegrees]; } -- (void)setUtcYear:(NSNumber *)utcYear { +- (void)setUtcYear:(NSNumber<SDLInt> *)utcYear { if (utcYear != nil) { [store setObject:utcYear forKey:SDLNameUTCYear]; } else { @@ -39,11 +39,11 @@ } } -- (NSNumber *)utcYear { +- (NSNumber<SDLInt> *)utcYear { return [store objectForKey:SDLNameUTCYear]; } -- (void)setUtcMonth:(NSNumber *)utcMonth { +- (void)setUtcMonth:(NSNumber<SDLInt> *)utcMonth { if (utcMonth != nil) { [store setObject:utcMonth forKey:SDLNameUTCMonth]; } else { @@ -51,11 +51,11 @@ } } -- (NSNumber *)utcMonth { +- (NSNumber<SDLInt> *)utcMonth { return [store objectForKey:SDLNameUTCMonth]; } -- (void)setUtcDay:(NSNumber *)utcDay { +- (void)setUtcDay:(NSNumber<SDLInt> *)utcDay { if (utcDay != nil) { [store setObject:utcDay forKey:SDLNameUTCDay]; } else { @@ -63,11 +63,11 @@ } } -- (NSNumber *)utcDay { +- (NSNumber<SDLInt> *)utcDay { return [store objectForKey:SDLNameUTCDay]; } -- (void)setUtcHours:(NSNumber *)utcHours { +- (void)setUtcHours:(NSNumber<SDLInt> *)utcHours { if (utcHours != nil) { [store setObject:utcHours forKey:SDLNameUTCHours]; } else { @@ -75,11 +75,11 @@ } } -- (NSNumber *)utcHours { +- (NSNumber<SDLInt> *)utcHours { return [store objectForKey:SDLNameUTCHours]; } -- (void)setUtcMinutes:(NSNumber *)utcMinutes { +- (void)setUtcMinutes:(NSNumber<SDLInt> *)utcMinutes { if (utcMinutes != nil) { [store setObject:utcMinutes forKey:SDLNameUTCMinutes]; } else { @@ -87,11 +87,11 @@ } } -- (NSNumber *)utcMinutes { +- (NSNumber<SDLInt> *)utcMinutes { return [store objectForKey:SDLNameUTCMinutes]; } -- (void)setUtcSeconds:(NSNumber *)utcSeconds { +- (void)setUtcSeconds:(NSNumber<SDLInt> *)utcSeconds { if (utcSeconds != nil) { [store setObject:utcSeconds forKey:SDLNameUTCSeconds]; } else { @@ -99,7 +99,7 @@ } } -- (NSNumber *)utcSeconds { +- (NSNumber<SDLInt> *)utcSeconds { return [store objectForKey:SDLNameUTCSeconds]; } @@ -116,7 +116,7 @@ return (SDLCompassDirection)obj; } -- (void)setPdop:(NSNumber *)pdop { +- (void)setPdop:(NSNumber<SDLFloat> *)pdop { if (pdop != nil) { [store setObject:pdop forKey:SDLNamePDOP]; } else { @@ -124,11 +124,11 @@ } } -- (NSNumber *)pdop { +- (NSNumber<SDLFloat> *)pdop { return [store objectForKey:SDLNamePDOP]; } -- (void)setHdop:(NSNumber *)hdop { +- (void)setHdop:(NSNumber<SDLFloat> *)hdop { if (hdop != nil) { [store setObject:hdop forKey:SDLNameHDOP]; } else { @@ -136,11 +136,11 @@ } } -- (NSNumber *)hdop { +- (NSNumber<SDLFloat> *)hdop { return [store objectForKey:SDLNameHDOP]; } -- (void)setVdop:(NSNumber *)vdop { +- (void)setVdop:(NSNumber<SDLFloat> *)vdop { if (vdop != nil) { [store setObject:vdop forKey:SDLNameVDOP]; } else { @@ -148,11 +148,11 @@ } } -- (NSNumber *)vdop { +- (NSNumber<SDLFloat> *)vdop { return [store objectForKey:SDLNameVDOP]; } -- (void)setActual:(NSNumber *)actual { +- (void)setActual:(NSNumber<SDLBool> *)actual { if (actual != nil) { [store setObject:actual forKey:SDLNameActual]; } else { @@ -160,11 +160,11 @@ } } -- (NSNumber *)actual { +- (NSNumber<SDLBool> *)actual { return [store objectForKey:SDLNameActual]; } -- (void)setSatellites:(NSNumber *)satellites { +- (void)setSatellites:(NSNumber<SDLInt> *)satellites { if (satellites != nil) { [store setObject:satellites forKey:SDLNameSatellites]; } else { @@ -172,7 +172,7 @@ } } -- (NSNumber *)satellites { +- (NSNumber<SDLInt> *)satellites { return [store objectForKey:SDLNameSatellites]; } @@ -189,7 +189,7 @@ return (SDLDimension)obj; } -- (void)setAltitude:(NSNumber *)altitude { +- (void)setAltitude:(NSNumber<SDLFloat> *)altitude { if (altitude != nil) { [store setObject:altitude forKey:SDLNameAltitude]; } else { @@ -197,11 +197,11 @@ } } -- (NSNumber *)altitude { +- (NSNumber<SDLFloat> *)altitude { return [store objectForKey:SDLNameAltitude]; } -- (void)setHeading:(NSNumber *)heading { +- (void)setHeading:(NSNumber<SDLFloat> *)heading { if (heading != nil) { [store setObject:heading forKey:SDLNameHeading]; } else { @@ -209,11 +209,11 @@ } } -- (NSNumber *)heading { +- (NSNumber<SDLFloat> *)heading { return [store objectForKey:SDLNameHeading]; } -- (void)setSpeed:(NSNumber *)speed { +- (void)setSpeed:(NSNumber<SDLFloat> *)speed { if (speed != nil) { [store setObject:speed forKey:SDLNameSpeed]; } else { @@ -221,7 +221,7 @@ } } -- (NSNumber *)speed { +- (NSNumber<SDLFloat> *)speed { return [store objectForKey:SDLNameSpeed]; } diff --git a/SmartDeviceLink/SDLGetDTCs.h b/SmartDeviceLink/SDLGetDTCs.h index 67367dae2..74a9fb7dd 100644 --- a/SmartDeviceLink/SDLGetDTCs.h +++ b/SmartDeviceLink/SDLGetDTCs.h @@ -22,9 +22,9 @@ * <p> * <b>Notes: </b>Minvalue:0; Maxvalue:65535 */ -@property (strong) NSNumber *ecuName; +@property (strong) NSNumber<SDLInt> *ecuName; /** * @abstract DTC Mask Byte to be sent in diagnostic request to module. NSNumber* dtcMask Minvalue:0; Maxvalue:255 */ -@property (strong) NSNumber *dtcMask; +@property (strong) NSNumber<SDLInt> *dtcMask; @end diff --git a/SmartDeviceLink/SDLGetDTCs.m b/SmartDeviceLink/SDLGetDTCs.m index 58db2e529..b07979f9d 100644 --- a/SmartDeviceLink/SDLGetDTCs.m +++ b/SmartDeviceLink/SDLGetDTCs.m @@ -14,7 +14,7 @@ return self; } -- (void)setEcuName:(NSNumber *)ecuName { +- (void)setEcuName:(NSNumber<SDLInt> *)ecuName { if (ecuName != nil) { [parameters setObject:ecuName forKey:SDLNameECUName]; } else { @@ -22,11 +22,11 @@ } } -- (NSNumber *)ecuName { +- (NSNumber<SDLInt> *)ecuName { return [parameters objectForKey:SDLNameECUName]; } -- (void)setDtcMask:(NSNumber *)dtcMask { +- (void)setDtcMask:(NSNumber<SDLInt> *)dtcMask { if (dtcMask != nil) { [parameters setObject:dtcMask forKey:SDLNameDTCMask]; } else { @@ -34,7 +34,7 @@ } } -- (NSNumber *)dtcMask { +- (NSNumber<SDLInt> *)dtcMask { return [parameters objectForKey:SDLNameDTCMask]; } diff --git a/SmartDeviceLink/SDLGetDTCsResponse.h b/SmartDeviceLink/SDLGetDTCsResponse.h index ae7ff2b40..a07d9ced6 100644 --- a/SmartDeviceLink/SDLGetDTCsResponse.h +++ b/SmartDeviceLink/SDLGetDTCsResponse.h @@ -11,7 +11,7 @@ */ @interface SDLGetDTCsResponse : SDLRPCResponse -@property (strong) NSNumber *ecuHeader; +@property (strong) NSNumber<SDLInt> *ecuHeader; @property (strong) NSMutableArray<NSString *> *dtc; @end diff --git a/SmartDeviceLink/SDLGetDTCsResponse.m b/SmartDeviceLink/SDLGetDTCsResponse.m index 246a4174a..0f77b48ec 100644 --- a/SmartDeviceLink/SDLGetDTCsResponse.m +++ b/SmartDeviceLink/SDLGetDTCsResponse.m @@ -14,7 +14,7 @@ return self; } -- (void)setEcuHeader:(NSNumber *)ecuHeader { +- (void)setEcuHeader:(NSNumber<SDLInt> *)ecuHeader { if (ecuHeader != nil) { [parameters setObject:ecuHeader forKey:SDLNameECUHeader]; } else { @@ -22,7 +22,7 @@ } } -- (NSNumber *)ecuHeader { +- (NSNumber<SDLInt> *)ecuHeader { return [parameters objectForKey:SDLNameECUHeader]; } diff --git a/SmartDeviceLink/SDLGetVehicleData.h b/SmartDeviceLink/SDLGetVehicleData.h index b73298e68..ce5ee4736 100644 --- a/SmartDeviceLink/SDLGetVehicleData.h +++ b/SmartDeviceLink/SDLGetVehicleData.h @@ -20,108 +20,108 @@ /** * @abstract A boolean value. If true, requests Gps data */ -@property (strong) NSNumber *gps; +@property (strong) NSNumber<SDLBool> *gps; /** * @abstract A boolean value. If true, requests speed data */ -@property (strong) NSNumber *speed; +@property (strong) NSNumber<SDLBool> *speed; /** * @abstract A boolean value. If true, requests rpm data */ -@property (strong) NSNumber *rpm; +@property (strong) NSNumber<SDLBool> *rpm; /** * @abstract A boolean value. If true, requests FuelLevel data */ -@property (strong) NSNumber *fuelLevel; +@property (strong) NSNumber<SDLBool> *fuelLevel; /** * @abstract A boolean value. If true, requests fuelLevel_State data */ -@property (strong) NSNumber *fuelLevel_State; +@property (strong) NSNumber<SDLBool> *fuelLevel_State; /** * @abstract A boolean value. If true, requests instantFuelConsumption data */ -@property (strong) NSNumber *instantFuelConsumption; +@property (strong) NSNumber<SDLBool> *instantFuelConsumption; /** * @abstract A boolean value. If true, requests externalTemperature data */ -@property (strong) NSNumber *externalTemperature; +@property (strong) NSNumber<SDLBool> *externalTemperature; /** * @abstract A boolean value. If true, requests Vehicle Identification Number */ -@property (strong) NSNumber *vin; +@property (strong) NSNumber<SDLBool> *vin; /** * @abstract A boolean value. If true, requests Currently selected gear data */ -@property (strong) NSNumber *prndl; +@property (strong) NSNumber<SDLBool> *prndl; /** * @abstract A boolean value. If true, requests tire pressure status data */ -@property (strong) NSNumber *tirePressure; +@property (strong) NSNumber<SDLBool> *tirePressure; /** * @abstract A boolean value. If true, requests odometer data */ -@property (strong) NSNumber *odometer; +@property (strong) NSNumber<SDLBool> *odometer; /** * @abstract A boolean value. If true, requests belt Status data */ -@property (strong) NSNumber *beltStatus; +@property (strong) NSNumber<SDLBool> *beltStatus; /** * @abstract A boolean value. If true, requests body Information data */ -@property (strong) NSNumber *bodyInformation; +@property (strong) NSNumber<SDLBool> *bodyInformation; /** * @abstract A boolean value. If true, requests device Status data */ -@property (strong) NSNumber *deviceStatus; +@property (strong) NSNumber<SDLBool> *deviceStatus; /** * @abstract A boolean value. If true, requests driver Braking data */ -@property (strong) NSNumber *driverBraking; +@property (strong) NSNumber<SDLBool> *driverBraking; /** * @abstract A boolean value. If true, requests wiper Status data */ -@property (strong) NSNumber *wiperStatus; +@property (strong) NSNumber<SDLBool> *wiperStatus; /** * @abstract A boolean value. If true, requests Head Lamp Status data */ -@property (strong) NSNumber *headLampStatus; +@property (strong) NSNumber<SDLBool> *headLampStatus; /** * @abstract A boolean value. If true, requests Engine Torque data */ -@property (strong) NSNumber *engineTorque; +@property (strong) NSNumber<SDLBool> *engineTorque; /** * @abstract A boolean value. If true, means the accPedalPosition data has been * subscribed. */ -@property (strong) NSNumber *accPedalPosition; +@property (strong) NSNumber<SDLBool> *accPedalPosition; /** * @abstract A boolean value. If true, means the steeringWheelAngle data has been * subscribed. */ -@property (strong) NSNumber *steeringWheelAngle; -@property (strong) NSNumber *eCallInfo; -@property (strong) NSNumber *airbagStatus; -@property (strong) NSNumber *emergencyEvent; -@property (strong) NSNumber *clusterModeStatus; -@property (strong) NSNumber *myKey; +@property (strong) NSNumber<SDLBool> *steeringWheelAngle; +@property (strong) NSNumber<SDLBool> *eCallInfo; +@property (strong) NSNumber<SDLBool> *airbagStatus; +@property (strong) NSNumber<SDLBool> *emergencyEvent; +@property (strong) NSNumber<SDLBool> *clusterModeStatus; +@property (strong) NSNumber<SDLBool> *myKey; @end diff --git a/SmartDeviceLink/SDLGetVehicleData.m b/SmartDeviceLink/SDLGetVehicleData.m index 157fdd615..384cadf0a 100644 --- a/SmartDeviceLink/SDLGetVehicleData.m +++ b/SmartDeviceLink/SDLGetVehicleData.m @@ -14,7 +14,7 @@ return self; } -- (void)setGps:(NSNumber *)gps { +- (void)setGps:(NSNumber<SDLBool> *)gps { if (gps != nil) { [parameters setObject:gps forKey:SDLNameGPS]; } else { @@ -22,11 +22,11 @@ } } -- (NSNumber *)gps { +- (NSNumber<SDLBool> *)gps { return [parameters objectForKey:SDLNameGPS]; } -- (void)setSpeed:(NSNumber *)speed { +- (void)setSpeed:(NSNumber<SDLBool> *)speed { if (speed != nil) { [parameters setObject:speed forKey:SDLNameSpeed]; } else { @@ -34,11 +34,11 @@ } } -- (NSNumber *)speed { +- (NSNumber<SDLBool> *)speed { return [parameters objectForKey:SDLNameSpeed]; } -- (void)setRpm:(NSNumber *)rpm { +- (void)setRpm:(NSNumber<SDLBool> *)rpm { if (rpm != nil) { [parameters setObject:rpm forKey:SDLNameRPM]; } else { @@ -46,11 +46,11 @@ } } -- (NSNumber *)rpm { +- (NSNumber<SDLBool> *)rpm { return [parameters objectForKey:SDLNameRPM]; } -- (void)setFuelLevel:(NSNumber *)fuelLevel { +- (void)setFuelLevel:(NSNumber<SDLBool> *)fuelLevel { if (fuelLevel != nil) { [parameters setObject:fuelLevel forKey:SDLNameFuelLevel]; } else { @@ -58,11 +58,11 @@ } } -- (NSNumber *)fuelLevel { +- (NSNumber<SDLBool> *)fuelLevel { return [parameters objectForKey:SDLNameFuelLevel]; } -- (void)setFuelLevel_State:(NSNumber *)fuelLevel_State { +- (void)setFuelLevel_State:(NSNumber<SDLBool> *)fuelLevel_State { if (fuelLevel_State != nil) { [parameters setObject:fuelLevel_State forKey:SDLNameFuelLevelState]; } else { @@ -70,11 +70,11 @@ } } -- (NSNumber *)fuelLevel_State { +- (NSNumber<SDLBool> *)fuelLevel_State { return [parameters objectForKey:SDLNameFuelLevelState]; } -- (void)setInstantFuelConsumption:(NSNumber *)instantFuelConsumption { +- (void)setInstantFuelConsumption:(NSNumber<SDLBool> *)instantFuelConsumption { if (instantFuelConsumption != nil) { [parameters setObject:instantFuelConsumption forKey:SDLNameInstantFuelConsumption]; } else { @@ -82,11 +82,11 @@ } } -- (NSNumber *)instantFuelConsumption { +- (NSNumber<SDLBool> *)instantFuelConsumption { return [parameters objectForKey:SDLNameInstantFuelConsumption]; } -- (void)setExternalTemperature:(NSNumber *)externalTemperature { +- (void)setExternalTemperature:(NSNumber<SDLBool> *)externalTemperature { if (externalTemperature != nil) { [parameters setObject:externalTemperature forKey:SDLNameExternalTemperature]; } else { @@ -94,11 +94,11 @@ } } -- (NSNumber *)externalTemperature { +- (NSNumber<SDLBool> *)externalTemperature { return [parameters objectForKey:SDLNameExternalTemperature]; } -- (void)setVin:(NSNumber *)vin { +- (void)setVin:(NSNumber<SDLBool> *)vin { if (vin != nil) { [parameters setObject:vin forKey:SDLNameVIN]; } else { @@ -106,11 +106,11 @@ } } -- (NSNumber *)vin { +- (NSNumber<SDLBool> *)vin { return [parameters objectForKey:SDLNameVIN]; } -- (void)setPrndl:(NSNumber *)prndl { +- (void)setPrndl:(NSNumber<SDLBool> *)prndl { if (prndl != nil) { [parameters setObject:prndl forKey:SDLNamePRNDL]; } else { @@ -118,11 +118,11 @@ } } -- (NSNumber *)prndl { +- (NSNumber<SDLBool> *)prndl { return [parameters objectForKey:SDLNamePRNDL]; } -- (void)setTirePressure:(NSNumber *)tirePressure { +- (void)setTirePressure:(NSNumber<SDLBool> *)tirePressure { if (tirePressure != nil) { [parameters setObject:tirePressure forKey:SDLNameTirePressure]; } else { @@ -130,11 +130,11 @@ } } -- (NSNumber *)tirePressure { +- (NSNumber<SDLBool> *)tirePressure { return [parameters objectForKey:SDLNameTirePressure]; } -- (void)setOdometer:(NSNumber *)odometer { +- (void)setOdometer:(NSNumber<SDLBool> *)odometer { if (odometer != nil) { [parameters setObject:odometer forKey:SDLNameOdometer]; } else { @@ -142,11 +142,11 @@ } } -- (NSNumber *)odometer { +- (NSNumber<SDLBool> *)odometer { return [parameters objectForKey:SDLNameOdometer]; } -- (void)setBeltStatus:(NSNumber *)beltStatus { +- (void)setBeltStatus:(NSNumber<SDLBool> *)beltStatus { if (beltStatus != nil) { [parameters setObject:beltStatus forKey:SDLNameBeltStatus]; } else { @@ -154,11 +154,11 @@ } } -- (NSNumber *)beltStatus { +- (NSNumber<SDLBool> *)beltStatus { return [parameters objectForKey:SDLNameBeltStatus]; } -- (void)setBodyInformation:(NSNumber *)bodyInformation { +- (void)setBodyInformation:(NSNumber<SDLBool> *)bodyInformation { if (bodyInformation != nil) { [parameters setObject:bodyInformation forKey:SDLNameBodyInformation]; } else { @@ -166,11 +166,11 @@ } } -- (NSNumber *)bodyInformation { +- (NSNumber<SDLBool> *)bodyInformation { return [parameters objectForKey:SDLNameBodyInformation]; } -- (void)setDeviceStatus:(NSNumber *)deviceStatus { +- (void)setDeviceStatus:(NSNumber<SDLBool> *)deviceStatus { if (deviceStatus != nil) { [parameters setObject:deviceStatus forKey:SDLNameDeviceStatus]; } else { @@ -178,11 +178,11 @@ } } -- (NSNumber *)deviceStatus { +- (NSNumber<SDLBool> *)deviceStatus { return [parameters objectForKey:SDLNameDeviceStatus]; } -- (void)setDriverBraking:(NSNumber *)driverBraking { +- (void)setDriverBraking:(NSNumber<SDLBool> *)driverBraking { if (driverBraking != nil) { [parameters setObject:driverBraking forKey:SDLNameDriverBraking]; } else { @@ -190,11 +190,11 @@ } } -- (NSNumber *)driverBraking { +- (NSNumber<SDLBool> *)driverBraking { return [parameters objectForKey:SDLNameDriverBraking]; } -- (void)setWiperStatus:(NSNumber *)wiperStatus { +- (void)setWiperStatus:(NSNumber<SDLBool> *)wiperStatus { if (wiperStatus != nil) { [parameters setObject:wiperStatus forKey:SDLNameWiperStatus]; } else { @@ -202,11 +202,11 @@ } } -- (NSNumber *)wiperStatus { +- (NSNumber<SDLBool> *)wiperStatus { return [parameters objectForKey:SDLNameWiperStatus]; } -- (void)setHeadLampStatus:(NSNumber *)headLampStatus { +- (void)setHeadLampStatus:(NSNumber<SDLBool> *)headLampStatus { if (headLampStatus != nil) { [parameters setObject:headLampStatus forKey:SDLNameHeadLampStatus]; } else { @@ -214,11 +214,11 @@ } } -- (NSNumber *)headLampStatus { +- (NSNumber<SDLBool> *)headLampStatus { return [parameters objectForKey:SDLNameHeadLampStatus]; } -- (void)setEngineTorque:(NSNumber *)engineTorque { +- (void)setEngineTorque:(NSNumber<SDLBool> *)engineTorque { if (engineTorque != nil) { [parameters setObject:engineTorque forKey:SDLNameEngineTorque]; } else { @@ -226,11 +226,11 @@ } } -- (NSNumber *)engineTorque { +- (NSNumber<SDLBool> *)engineTorque { return [parameters objectForKey:SDLNameEngineTorque]; } -- (void)setAccPedalPosition:(NSNumber *)accPedalPosition { +- (void)setAccPedalPosition:(NSNumber<SDLBool> *)accPedalPosition { if (accPedalPosition != nil) { [parameters setObject:accPedalPosition forKey:SDLNameAccelerationPedalPosition]; } else { @@ -238,11 +238,11 @@ } } -- (NSNumber *)accPedalPosition { +- (NSNumber<SDLBool> *)accPedalPosition { return [parameters objectForKey:SDLNameAccelerationPedalPosition]; } -- (void)setSteeringWheelAngle:(NSNumber *)steeringWheelAngle { +- (void)setSteeringWheelAngle:(NSNumber<SDLBool> *)steeringWheelAngle { if (steeringWheelAngle != nil) { [parameters setObject:steeringWheelAngle forKey:SDLNameSteeringWheelAngle]; } else { @@ -250,11 +250,11 @@ } } -- (NSNumber *)steeringWheelAngle { +- (NSNumber<SDLBool> *)steeringWheelAngle { return [parameters objectForKey:SDLNameSteeringWheelAngle]; } -- (void)setECallInfo:(NSNumber *)eCallInfo { +- (void)setECallInfo:(NSNumber<SDLBool> *)eCallInfo { if (eCallInfo != nil) { [parameters setObject:eCallInfo forKey:SDLNameECallInfo]; } else { @@ -262,11 +262,11 @@ } } -- (NSNumber *)eCallInfo { +- (NSNumber<SDLBool> *)eCallInfo { return [parameters objectForKey:SDLNameECallInfo]; } -- (void)setAirbagStatus:(NSNumber *)airbagStatus { +- (void)setAirbagStatus:(NSNumber<SDLBool> *)airbagStatus { if (airbagStatus != nil) { [parameters setObject:airbagStatus forKey:SDLNameAirbagStatus]; } else { @@ -274,11 +274,11 @@ } } -- (NSNumber *)airbagStatus { +- (NSNumber<SDLBool> *)airbagStatus { return [parameters objectForKey:SDLNameAirbagStatus]; } -- (void)setEmergencyEvent:(NSNumber *)emergencyEvent { +- (void)setEmergencyEvent:(NSNumber<SDLBool> *)emergencyEvent { if (emergencyEvent != nil) { [parameters setObject:emergencyEvent forKey:SDLNameEmergencyEvent]; } else { @@ -286,11 +286,11 @@ } } -- (NSNumber *)emergencyEvent { +- (NSNumber<SDLBool> *)emergencyEvent { return [parameters objectForKey:SDLNameEmergencyEvent]; } -- (void)setClusterModeStatus:(NSNumber *)clusterModeStatus { +- (void)setClusterModeStatus:(NSNumber<SDLBool> *)clusterModeStatus { if (clusterModeStatus != nil) { [parameters setObject:clusterModeStatus forKey:SDLNameClusterModeStatus]; } else { @@ -298,11 +298,11 @@ } } -- (NSNumber *)clusterModeStatus { +- (NSNumber<SDLBool> *)clusterModeStatus { return [parameters objectForKey:SDLNameClusterModeStatus]; } -- (void)setMyKey:(NSNumber *)myKey { +- (void)setMyKey:(NSNumber<SDLBool> *)myKey { if (myKey != nil) { [parameters setObject:myKey forKey:SDLNameMyKey]; } else { @@ -310,7 +310,7 @@ } } -- (NSNumber *)myKey { +- (NSNumber<SDLBool> *)myKey { return [parameters objectForKey:SDLNameMyKey]; } diff --git a/SmartDeviceLink/SDLGetVehicleDataResponse.h b/SmartDeviceLink/SDLGetVehicleDataResponse.h index 5c4a3e62c..d8a4c64ca 100644 --- a/SmartDeviceLink/SDLGetVehicleDataResponse.h +++ b/SmartDeviceLink/SDLGetVehicleDataResponse.h @@ -37,17 +37,17 @@ /** * @abstract The vehicle speed in kilometers per hour. */ -@property (strong) NSNumber *speed; +@property (strong) NSNumber<SDLFloat> *speed; /** * @abstract The number of revolutions per minute of the engine. */ -@property (strong) NSNumber *rpm; +@property (strong) NSNumber<SDLInt> *rpm; /** * @abstract The fuel level in the tank (percentage) */ -@property (strong) NSNumber *fuelLevel; +@property (strong) NSNumber<SDLFloat> *fuelLevel; /** * @abstract A SDLComponentVolumeStatus* value. The fuel level state. @@ -57,12 +57,12 @@ /** * @abstract The instantaneous fuel consumption in microlitres. */ -@property (strong) NSNumber *instantFuelConsumption; +@property (strong) NSNumber<SDLFloat> *instantFuelConsumption; /** * @abstract The external temperature in degrees celsius. */ -@property (strong) NSNumber *externalTemperature; +@property (strong) NSNumber<SDLFloat> *externalTemperature; /** * @abstract The Vehicle Identification Number @@ -82,7 +82,7 @@ /** * @abstract Odometer reading in km. */ -@property (strong) NSNumber *odometer; +@property (strong) NSNumber<SDLInt> *odometer; /** * @abstract A SDLBeltStatus* value. The status of the seat belts. @@ -117,17 +117,17 @@ /** * @abstract Torque value for engine (in Nm) on non-diesel variants. */ -@property (strong) NSNumber *engineTorque; +@property (strong) NSNumber<SDLFloat> *engineTorque; /** * @abstract Accelerator pedal position (percentage depressed) */ -@property (strong) NSNumber *accPedalPosition; +@property (strong) NSNumber<SDLFloat> *accPedalPosition; /** * @abstract Current angle of the steering wheel (in deg) */ -@property (strong) NSNumber *steeringWheelAngle; +@property (strong) NSNumber<SDLFloat> *steeringWheelAngle; @property (strong) SDLECallInfo *eCallInfo; @property (strong) SDLAirbagStatus *airbagStatus; @property (strong) SDLEmergencyEvent *emergencyEvent; diff --git a/SmartDeviceLink/SDLGetVehicleDataResponse.m b/SmartDeviceLink/SDLGetVehicleDataResponse.m index 4b9732b20..ea798a430 100644 --- a/SmartDeviceLink/SDLGetVehicleDataResponse.m +++ b/SmartDeviceLink/SDLGetVehicleDataResponse.m @@ -43,7 +43,7 @@ } } -- (void)setSpeed:(NSNumber *)speed { +- (void)setSpeed:(NSNumber<SDLFloat> *)speed { if (speed != nil) { [parameters setObject:speed forKey:SDLNameSpeed]; } else { @@ -51,11 +51,11 @@ } } -- (NSNumber *)speed { +- (NSNumber<SDLFloat> *)speed { return [parameters objectForKey:SDLNameSpeed]; } -- (void)setRpm:(NSNumber *)rpm { +- (void)setRpm:(NSNumber<SDLInt> *)rpm { if (rpm != nil) { [parameters setObject:rpm forKey:SDLNameRPM]; } else { @@ -63,11 +63,11 @@ } } -- (NSNumber *)rpm { +- (NSNumber<SDLInt> *)rpm { return [parameters objectForKey:SDLNameRPM]; } -- (void)setFuelLevel:(NSNumber *)fuelLevel { +- (void)setFuelLevel:(NSNumber<SDLFloat> *)fuelLevel { if (fuelLevel != nil) { [parameters setObject:fuelLevel forKey:SDLNameFuelLevel]; } else { @@ -75,7 +75,7 @@ } } -- (NSNumber *)fuelLevel { +- (NSNumber<SDLFloat> *)fuelLevel { return [parameters objectForKey:SDLNameFuelLevel]; } @@ -92,7 +92,7 @@ return (SDLComponentVolumeStatus)obj; } -- (void)setInstantFuelConsumption:(NSNumber *)instantFuelConsumption { +- (void)setInstantFuelConsumption:(NSNumber<SDLFloat> *)instantFuelConsumption { if (instantFuelConsumption != nil) { [parameters setObject:instantFuelConsumption forKey:SDLNameInstantFuelConsumption]; } else { @@ -100,11 +100,11 @@ } } -- (NSNumber *)instantFuelConsumption { +- (NSNumber<SDLFloat> *)instantFuelConsumption { return [parameters objectForKey:SDLNameInstantFuelConsumption]; } -- (void)setExternalTemperature:(NSNumber *)externalTemperature { +- (void)setExternalTemperature:(NSNumber<SDLFloat> *)externalTemperature { if (externalTemperature != nil) { [parameters setObject:externalTemperature forKey:SDLNameExternalTemperature]; } else { @@ -112,7 +112,7 @@ } } -- (NSNumber *)externalTemperature { +- (NSNumber<SDLFloat> *)externalTemperature { return [parameters objectForKey:SDLNameExternalTemperature]; } @@ -158,7 +158,7 @@ } } -- (void)setOdometer:(NSNumber *)odometer { +- (void)setOdometer:(NSNumber<SDLInt> *)odometer { if (odometer != nil) { [parameters setObject:odometer forKey:SDLNameOdometer]; } else { @@ -166,7 +166,7 @@ } } -- (NSNumber *)odometer { +- (NSNumber<SDLInt> *)odometer { return [parameters objectForKey:SDLNameOdometer]; } @@ -264,7 +264,7 @@ } } -- (void)setEngineTorque:(NSNumber *)engineTorque { +- (void)setEngineTorque:(NSNumber<SDLFloat> *)engineTorque { if (engineTorque != nil) { [parameters setObject:engineTorque forKey:SDLNameEngineTorque]; } else { @@ -272,11 +272,11 @@ } } -- (NSNumber *)engineTorque { +- (NSNumber<SDLFloat> *)engineTorque { return [parameters objectForKey:SDLNameEngineTorque]; } -- (void)setAccPedalPosition:(NSNumber *)accPedalPosition { +- (void)setAccPedalPosition:(NSNumber<SDLFloat> *)accPedalPosition { if (accPedalPosition != nil) { [parameters setObject:accPedalPosition forKey:SDLNameAccelerationPedalPosition]; } else { @@ -284,11 +284,11 @@ } } -- (NSNumber *)accPedalPosition { +- (NSNumber<SDLFloat> *)accPedalPosition { return [parameters objectForKey:SDLNameAccelerationPedalPosition]; } -- (void)setSteeringWheelAngle:(NSNumber *)steeringWheelAngle { +- (void)setSteeringWheelAngle:(NSNumber<SDLFloat> *)steeringWheelAngle { if (steeringWheelAngle != nil) { [parameters setObject:steeringWheelAngle forKey:SDLNameSteeringWheelAngle]; } else { @@ -296,7 +296,7 @@ } } -- (NSNumber *)steeringWheelAngle { +- (NSNumber<SDLFloat> *)steeringWheelAngle { return [parameters objectForKey:SDLNameSteeringWheelAngle]; } diff --git a/SmartDeviceLink/SDLHMICapabilities.h b/SmartDeviceLink/SDLHMICapabilities.h index 3680dbec4..b20e5b27d 100644 --- a/SmartDeviceLink/SDLHMICapabilities.h +++ b/SmartDeviceLink/SDLHMICapabilities.h @@ -11,13 +11,13 @@ Boolean value. Optional. */ -@property (copy, nonatomic) NSNumber *navigation; +@property (copy, nonatomic) NSNumber<SDLBool> *navigation; /** Availability of build in phone. True: Available, False: Not Available Boolean value. Optional. */ -@property (copy, nonatomic) NSNumber *phoneCall; +@property (copy, nonatomic) NSNumber<SDLBool> *phoneCall; @end diff --git a/SmartDeviceLink/SDLHMICapabilities.m b/SmartDeviceLink/SDLHMICapabilities.m index 5b9eff46f..677ff8e84 100644 --- a/SmartDeviceLink/SDLHMICapabilities.m +++ b/SmartDeviceLink/SDLHMICapabilities.m @@ -8,7 +8,7 @@ @implementation SDLHMICapabilities -- (void)setNavigation:(NSNumber *)navigation { +- (void)setNavigation:(NSNumber<SDLBool> *)navigation { if (navigation != nil) { store[SDLNameNavigation] = navigation; } else { @@ -16,11 +16,11 @@ } } -- (NSNumber *)navigation { +- (NSNumber<SDLBool> *)navigation { return store[SDLNameNavigation]; } -- (void)setPhoneCall:(NSNumber *)phoneCall { +- (void)setPhoneCall:(NSNumber<SDLBool> *)phoneCall { if (phoneCall != nil) { store[SDLNamePhoneCall] = phoneCall; } else { @@ -28,7 +28,7 @@ } } -- (NSNumber *)phoneCall { +- (NSNumber<SDLBool> *)phoneCall { return store[SDLNamePhoneCall]; } diff --git a/SmartDeviceLink/SDLHeadLampStatus.h b/SmartDeviceLink/SDLHeadLampStatus.h index 4664259f1..7ec8c14e3 100644 --- a/SmartDeviceLink/SDLHeadLampStatus.h +++ b/SmartDeviceLink/SDLHeadLampStatus.h @@ -14,11 +14,11 @@ /** * @abstract A boolean value. Status of the low beam lamps. */ -@property (strong) NSNumber *lowBeamsOn; +@property (strong) NSNumber<SDLBool> *lowBeamsOn; /** * @abstract A boolean value. Status of the high beam lamps. */ -@property (strong) NSNumber *highBeamsOn; +@property (strong) NSNumber<SDLBool> *highBeamsOn; @property (strong) SDLAmbientLightStatus ambientLightSensorStatus; diff --git a/SmartDeviceLink/SDLHeadLampStatus.m b/SmartDeviceLink/SDLHeadLampStatus.m index 26ed9ae35..68936b8b0 100644 --- a/SmartDeviceLink/SDLHeadLampStatus.m +++ b/SmartDeviceLink/SDLHeadLampStatus.m @@ -8,7 +8,7 @@ @implementation SDLHeadLampStatus -- (void)setLowBeamsOn:(NSNumber *)lowBeamsOn { +- (void)setLowBeamsOn:(NSNumber<SDLBool> *)lowBeamsOn { if (lowBeamsOn != nil) { [store setObject:lowBeamsOn forKey:SDLNameLowBeamsOn]; } else { @@ -16,11 +16,11 @@ } } -- (NSNumber *)lowBeamsOn { +- (NSNumber<SDLBool> *)lowBeamsOn { return [store objectForKey:SDLNameLowBeamsOn]; } -- (void)setHighBeamsOn:(NSNumber *)highBeamsOn { +- (void)setHighBeamsOn:(NSNumber<SDLBool> *)highBeamsOn { if (highBeamsOn != nil) { [store setObject:highBeamsOn forKey:SDLNameHighBeamsOn]; } else { @@ -28,7 +28,7 @@ } } -- (NSNumber *)highBeamsOn { +- (NSNumber<SDLBool> *)highBeamsOn { return [store objectForKey:SDLNameHighBeamsOn]; } diff --git a/SmartDeviceLink/SDLImageResolution.h b/SmartDeviceLink/SDLImageResolution.h index 884f9fe76..ca086ea61 100644 --- a/SmartDeviceLink/SDLImageResolution.h +++ b/SmartDeviceLink/SDLImageResolution.h @@ -6,7 +6,7 @@ @interface SDLImageResolution : SDLRPCStruct -@property (strong) NSNumber *resolutionWidth; -@property (strong) NSNumber *resolutionHeight; +@property (strong) NSNumber<SDLInt> *resolutionWidth; +@property (strong) NSNumber<SDLInt> *resolutionHeight; @end diff --git a/SmartDeviceLink/SDLImageResolution.m b/SmartDeviceLink/SDLImageResolution.m index 0e87c5248..61b7f1eaf 100644 --- a/SmartDeviceLink/SDLImageResolution.m +++ b/SmartDeviceLink/SDLImageResolution.m @@ -8,7 +8,7 @@ @implementation SDLImageResolution -- (void)setResolutionWidth:(NSNumber *)resolutionWidth { +- (void)setResolutionWidth:(NSNumber<SDLInt> *)resolutionWidth { if (resolutionWidth != nil) { [store setObject:resolutionWidth forKey:SDLNameResolutionWidth]; } else { @@ -16,11 +16,11 @@ } } -- (NSNumber *)resolutionWidth { +- (NSNumber<SDLInt> *)resolutionWidth { return [store objectForKey:SDLNameResolutionWidth]; } -- (void)setResolutionHeight:(NSNumber *)resolutionHeight { +- (void)setResolutionHeight:(NSNumber<SDLInt> *)resolutionHeight { if (resolutionHeight != nil) { [store setObject:resolutionHeight forKey:SDLNameResolutionHeight]; } else { @@ -28,7 +28,7 @@ } } -- (NSNumber *)resolutionHeight { +- (NSNumber<SDLInt> *)resolutionHeight { return [store objectForKey:SDLNameResolutionHeight]; } diff --git a/SmartDeviceLink/SDLListFilesResponse.h b/SmartDeviceLink/SDLListFilesResponse.h index 3e011ad08..47e6b3176 100644 --- a/SmartDeviceLink/SDLListFilesResponse.h +++ b/SmartDeviceLink/SDLListFilesResponse.h @@ -12,6 +12,6 @@ @interface SDLListFilesResponse : SDLRPCResponse @property (strong) NSMutableArray<NSString *> *filenames; -@property (strong) NSNumber *spaceAvailable; +@property (strong) NSNumber<SDLInt> *spaceAvailable; @end diff --git a/SmartDeviceLink/SDLListFilesResponse.m b/SmartDeviceLink/SDLListFilesResponse.m index 4b9643449..2e7f0dc8f 100644 --- a/SmartDeviceLink/SDLListFilesResponse.m +++ b/SmartDeviceLink/SDLListFilesResponse.m @@ -26,7 +26,7 @@ return [parameters objectForKey:SDLNameFilenames]; } -- (void)setSpaceAvailable:(NSNumber *)spaceAvailable { +- (void)setSpaceAvailable:(NSNumber<SDLInt> *)spaceAvailable { if (spaceAvailable != nil) { [parameters setObject:spaceAvailable forKey:SDLNameSpaceAvailable]; } else { @@ -34,7 +34,7 @@ } } -- (NSNumber *)spaceAvailable { +- (NSNumber<SDLInt> *)spaceAvailable { return [parameters objectForKey:SDLNameSpaceAvailable]; } diff --git a/SmartDeviceLink/SDLMenuParams.h b/SmartDeviceLink/SDLMenuParams.h index df7e394af..364fc4ba4 100644 --- a/SmartDeviceLink/SDLMenuParams.h +++ b/SmartDeviceLink/SDLMenuParams.h @@ -17,7 +17,7 @@ * * Optional, Integer, 0 - 2,000,000,000 */ -@property (strong) NSNumber *parentID; +@property (strong) NSNumber<SDLInt> *parentID; /** * @abstract The position within the items of the parent Command Menu @@ -31,7 +31,7 @@ * * Optional, Integer, 0 - 1000 */ -@property (strong) NSNumber *position; +@property (strong) NSNumber<SDLInt> *position; /** * @abstract the menu name which appears in menu, representing this command diff --git a/SmartDeviceLink/SDLMenuParams.m b/SmartDeviceLink/SDLMenuParams.m index bfebfdb76..c0fae572a 100644 --- a/SmartDeviceLink/SDLMenuParams.m +++ b/SmartDeviceLink/SDLMenuParams.m @@ -8,7 +8,7 @@ @implementation SDLMenuParams -- (void)setParentID:(NSNumber *)parentID { +- (void)setParentID:(NSNumber<SDLInt> *)parentID { if (parentID != nil) { [store setObject:parentID forKey:SDLNameParentId]; } else { @@ -16,11 +16,11 @@ } } -- (NSNumber *)parentID { +- (NSNumber<SDLInt> *)parentID { return [store objectForKey:SDLNameParentId]; } -- (void)setPosition:(NSNumber *)position { +- (void)setPosition:(NSNumber<SDLInt> *)position { if (position != nil) { [store setObject:position forKey:SDLNamePosition]; } else { @@ -28,7 +28,7 @@ } } -- (NSNumber *)position { +- (NSNumber<SDLInt> *)position { return [store objectForKey:SDLNamePosition]; } diff --git a/SmartDeviceLink/SDLOnButtonEvent.h b/SmartDeviceLink/SDLOnButtonEvent.h index 498412ab0..a4c380608 100644 --- a/SmartDeviceLink/SDLOnButtonEvent.h +++ b/SmartDeviceLink/SDLOnButtonEvent.h @@ -62,6 +62,6 @@ * * Optional, Integer, 0 - 65536 */ -@property (strong) NSNumber *customButtonID; +@property (strong) NSNumber<SDLInt> *customButtonID; @end diff --git a/SmartDeviceLink/SDLOnButtonEvent.m b/SmartDeviceLink/SDLOnButtonEvent.m index 89237fb53..f3ff12291 100644 --- a/SmartDeviceLink/SDLOnButtonEvent.m +++ b/SmartDeviceLink/SDLOnButtonEvent.m @@ -39,7 +39,7 @@ return (SDLButtonEventMode)obj; } -- (void)setCustomButtonID:(NSNumber *)customButtonID { +- (void)setCustomButtonID:(NSNumber<SDLInt> *)customButtonID { if (customButtonID != nil) { [parameters setObject:customButtonID forKey:SDLNameCustomButtonId]; } else { @@ -47,7 +47,7 @@ } } -- (NSNumber *)customButtonID { +- (NSNumber<SDLInt> *)customButtonID { return [parameters objectForKey:SDLNameCustomButtonId]; } diff --git a/SmartDeviceLink/SDLOnButtonPress.h b/SmartDeviceLink/SDLOnButtonPress.h index 75da2cb65..7aee6a4e4 100644 --- a/SmartDeviceLink/SDLOnButtonPress.h +++ b/SmartDeviceLink/SDLOnButtonPress.h @@ -75,6 +75,6 @@ * * Optional, Integer 0 - 65536 */ -@property (strong) NSNumber *customButtonID; +@property (strong) NSNumber<SDLInt> *customButtonID; @end diff --git a/SmartDeviceLink/SDLOnButtonPress.m b/SmartDeviceLink/SDLOnButtonPress.m index dca2d6e17..4cea2a77a 100644 --- a/SmartDeviceLink/SDLOnButtonPress.m +++ b/SmartDeviceLink/SDLOnButtonPress.m @@ -39,7 +39,7 @@ return (SDLButtonPressMode)obj; } -- (void)setCustomButtonID:(NSNumber *)customButtonID { +- (void)setCustomButtonID:(NSNumber<SDLInt> *)customButtonID { if (customButtonID != nil) { [parameters setObject:customButtonID forKey:SDLNameCustomButtonId]; } else { @@ -47,7 +47,7 @@ } } -- (NSNumber *)customButtonID { +- (NSNumber<SDLInt> *)customButtonID { return [parameters objectForKey:SDLNameCustomButtonId]; } diff --git a/SmartDeviceLink/SDLOnCommand.h b/SmartDeviceLink/SDLOnCommand.h index a421dac80..fe52f29cc 100644 --- a/SmartDeviceLink/SDLOnCommand.h +++ b/SmartDeviceLink/SDLOnCommand.h @@ -19,7 +19,7 @@ /** * @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. */ -@property (strong) NSNumber *cmdID; +@property (strong) NSNumber<SDLInt> *cmdID; /** * @abstract Indicates whether command was selected via voice or via a menu selection (using the OK button). diff --git a/SmartDeviceLink/SDLOnCommand.m b/SmartDeviceLink/SDLOnCommand.m index b354b08be..ee9e729a9 100644 --- a/SmartDeviceLink/SDLOnCommand.m +++ b/SmartDeviceLink/SDLOnCommand.m @@ -13,7 +13,7 @@ return self; } -- (void)setCmdID:(NSNumber *)cmdID { +- (void)setCmdID:(NSNumber<SDLInt> *)cmdID { if (cmdID != nil) { [parameters setObject:cmdID forKey:SDLNameCommandId]; } else { @@ -21,7 +21,7 @@ } } -- (NSNumber *)cmdID { +- (NSNumber<SDLInt> *)cmdID { return [parameters objectForKey:SDLNameCommandId]; } diff --git a/SmartDeviceLink/SDLOnEncodedSyncPData.h b/SmartDeviceLink/SDLOnEncodedSyncPData.h index 0f7bca36d..d0a2b218c 100644 --- a/SmartDeviceLink/SDLOnEncodedSyncPData.h +++ b/SmartDeviceLink/SDLOnEncodedSyncPData.h @@ -8,6 +8,6 @@ @property (strong) NSMutableArray<NSString *> *data; @property (strong) NSString *URL; -@property (strong) NSNumber *Timeout; +@property (strong) NSNumber<SDLInt> *Timeout; @end diff --git a/SmartDeviceLink/SDLOnEncodedSyncPData.m b/SmartDeviceLink/SDLOnEncodedSyncPData.m index adea0d8b1..ab2edfe63 100644 --- a/SmartDeviceLink/SDLOnEncodedSyncPData.m +++ b/SmartDeviceLink/SDLOnEncodedSyncPData.m @@ -37,7 +37,7 @@ return [parameters objectForKey:SDLNameURLUppercase]; } -- (void)setTimeout:(NSNumber *)Timeout { +- (void)setTimeout:(NSNumber<SDLInt> *)Timeout { if (Timeout != nil) { [parameters setObject:Timeout forKey:SDLNameTimeoutCapitalized]; } else { @@ -45,7 +45,7 @@ } } -- (NSNumber *)Timeout { +- (NSNumber<SDLInt> *)Timeout { return [parameters objectForKey:SDLNameTimeoutCapitalized]; } diff --git a/SmartDeviceLink/SDLOnLockScreenStatus.h b/SmartDeviceLink/SDLOnLockScreenStatus.h index 3a867ba81..c0b0896a8 100644 --- a/SmartDeviceLink/SDLOnLockScreenStatus.h +++ b/SmartDeviceLink/SDLOnLockScreenStatus.h @@ -23,13 +23,13 @@ * <p>Get the current driver distraction status(i.e. whether driver distraction rules are in effect, or not)</p> * @return String */ -@property (strong) NSNumber *driverDistractionStatus; +@property (strong) NSNumber<SDLBool> *driverDistractionStatus; /** * <p>Get user selection status for the application (has the app been selected via hmi or voice command)</p> * @return Boolean the current user selection status */ -@property (strong) NSNumber *userSelected; +@property (strong) NSNumber<SDLBool> *userSelected; /** * <p>Get the {@linkplain LockScreenStatus} enumeration, indicating if the lockscreen should be required, optional or off </p> * @return {@linkplain LockScreenStatus} diff --git a/SmartDeviceLink/SDLOnLockScreenStatus.m b/SmartDeviceLink/SDLOnLockScreenStatus.m index 9d2260a0b..437cee85c 100644 --- a/SmartDeviceLink/SDLOnLockScreenStatus.m +++ b/SmartDeviceLink/SDLOnLockScreenStatus.m @@ -43,7 +43,7 @@ return (SDLHMILevel)obj; } -- (void)setUserSelected:(NSNumber *)userSelected { +- (void)setUserSelected:(NSNumber<SDLBool> *)userSelected { if (userSelected != nil) { [parameters setObject:userSelected forKey:@"userselected"]; } else { @@ -51,11 +51,11 @@ } } -- (NSNumber *)userSelected { +- (NSNumber<SDLBool> *)userSelected { return [parameters objectForKey:@"userselected"]; } -- (void)setDriverDistractionStatus:(NSNumber *)driverDistractionStatus { +- (void)setDriverDistractionStatus:(NSNumber<SDLBool> *)driverDistractionStatus { if (driverDistractionStatus != nil) { [parameters setObject:driverDistractionStatus forKey:@"driverdistractionstatus"]; } else { @@ -63,7 +63,7 @@ } } -- (NSNumber *)driverDistractionStatus { +- (NSNumber<SDLBool> *)driverDistractionStatus { return [parameters objectForKey:@"driverdistractionstatus"]; } diff --git a/SmartDeviceLink/SDLOnSyncPData.h b/SmartDeviceLink/SDLOnSyncPData.h index 86d3c466d..a7dd55d4d 100644 --- a/SmartDeviceLink/SDLOnSyncPData.h +++ b/SmartDeviceLink/SDLOnSyncPData.h @@ -7,6 +7,6 @@ @interface SDLOnSyncPData : SDLRPCNotification @property (strong) NSString *URL; -@property (strong) NSNumber *Timeout; +@property (strong) NSNumber<SDLInt> *Timeout; @end diff --git a/SmartDeviceLink/SDLOnSyncPData.m b/SmartDeviceLink/SDLOnSyncPData.m index 8e58ab144..bde0b3ff5 100644 --- a/SmartDeviceLink/SDLOnSyncPData.m +++ b/SmartDeviceLink/SDLOnSyncPData.m @@ -26,7 +26,7 @@ return [parameters objectForKey:SDLNameURLUppercase]; } -- (void)setTimeout:(NSNumber *)Timeout { +- (void)setTimeout:(NSNumber<SDLInt> *)Timeout { if (Timeout != nil) { [parameters setObject:Timeout forKey:SDLNameTimeoutCapitalized]; } else { @@ -34,7 +34,7 @@ } } -- (NSNumber *)Timeout { +- (NSNumber<SDLInt> *)Timeout { return [parameters objectForKey:SDLNameTimeoutCapitalized]; } diff --git a/SmartDeviceLink/SDLOnSystemRequest.h b/SmartDeviceLink/SDLOnSystemRequest.h index 37b81fb8e..3b09ed9fd 100644 --- a/SmartDeviceLink/SDLOnSystemRequest.h +++ b/SmartDeviceLink/SDLOnSystemRequest.h @@ -11,9 +11,9 @@ @property (strong) SDLRequestType requestType; @property (strong) NSString *url; -@property (strong) NSNumber *timeout; +@property (strong) NSNumber<SDLInt> *timeout; @property (strong) SDLFileType fileType; -@property (strong) NSNumber *offset; -@property (strong) NSNumber *length; +@property (strong) NSNumber<SDLUInt> *offset; +@property (strong) NSNumber<SDLUInt> *length; @end diff --git a/SmartDeviceLink/SDLOnSystemRequest.m b/SmartDeviceLink/SDLOnSystemRequest.m index 1ddb24f5d..8e91fcd5d 100644 --- a/SmartDeviceLink/SDLOnSystemRequest.m +++ b/SmartDeviceLink/SDLOnSystemRequest.m @@ -38,7 +38,7 @@ return [parameters objectForKey:SDLNameURL]; } -- (void)setTimeout:(NSNumber *)timeout { +- (void)setTimeout:(NSNumber<SDLInt> *)timeout { if (timeout != nil) { [parameters setObject:timeout forKey:SDLNameTimeout]; } else { @@ -46,7 +46,7 @@ } } -- (NSNumber *)timeout { +- (NSNumber<SDLInt> *)timeout { return [parameters objectForKey:SDLNameTimeout]; } @@ -63,7 +63,7 @@ return (SDLFileType)obj; } -- (void)setOffset:(NSNumber *)offset { +- (void)setOffset:(NSNumber<SDLInt> *)offset { if (offset != nil) { [parameters setObject:offset forKey:SDLNameOffset]; } else { @@ -71,11 +71,11 @@ } } -- (NSNumber *)offset { +- (NSNumber<SDLInt> *)offset { return [parameters objectForKey:SDLNameOffset]; } -- (void)setLength:(NSNumber *)length { +- (void)setLength:(NSNumber<SDLInt> *)length { if (length != nil) { [parameters setObject:length forKey:SDLNameLength]; } else { @@ -83,7 +83,7 @@ } } -- (NSNumber *)length { +- (NSNumber<SDLInt> *)length { return [parameters objectForKey:SDLNameLength]; } diff --git a/SmartDeviceLink/SDLOnVehicleData.h b/SmartDeviceLink/SDLOnVehicleData.h index 19be2f79b..2e5bf3a13 100644 --- a/SmartDeviceLink/SDLOnVehicleData.h +++ b/SmartDeviceLink/SDLOnVehicleData.h @@ -36,17 +36,17 @@ /** * @abstract The vehicle speed in kilometers per hour. */ -@property (strong) NSNumber *speed; +@property (strong) NSNumber<SDLFloat> *speed; /** * @abstract The number of revolutions per minute of the engine. */ -@property (strong) NSNumber *rpm; +@property (strong) NSNumber<SDLInt> *rpm; /** * @abstract The fuel level in the tank (percentage) */ -@property (strong) NSNumber *fuelLevel; +@property (strong) NSNumber<SDLFloat> *fuelLevel; /** * @abstract A SDLComponentVolumeStatus* value. The fuel level state. @@ -56,12 +56,12 @@ /** * @abstract The instantaneous fuel consumption in microlitres. */ -@property (strong) NSNumber *instantFuelConsumption; +@property (strong) NSNumber<SDLFloat> *instantFuelConsumption; /** * @abstract The external temperature in degrees celsius. */ -@property (strong) NSNumber *externalTemperature; +@property (strong) NSNumber<SDLFloat> *externalTemperature; /** * @abstract The Vehicle Identification Number @@ -81,7 +81,7 @@ /** * @abstract Odometer reading in km. */ -@property (strong) NSNumber *odometer; +@property (strong) NSNumber<SDLInt> *odometer; /** * @abstract A SDLBeltStatus* value. The status of the seat belts. @@ -116,17 +116,17 @@ /** * @abstract Torque value for engine (in Nm) on non-diesel variants. */ -@property (strong) NSNumber *engineTorque; +@property (strong) NSNumber<SDLFloat> *engineTorque; /** * @abstract Accelerator pedal position (percentage depressed) */ -@property (strong) NSNumber *accPedalPosition; +@property (strong) NSNumber<SDLFloat> *accPedalPosition; /** * @abstract Current angle of the steering wheel (in deg) */ -@property (strong) NSNumber *steeringWheelAngle; +@property (strong) NSNumber<SDLFloat> *steeringWheelAngle; @property (strong) SDLECallInfo *eCallInfo; @property (strong) SDLAirbagStatus *airbagStatus; @property (strong) SDLEmergencyEvent *emergencyEvent; diff --git a/SmartDeviceLink/SDLOnVehicleData.m b/SmartDeviceLink/SDLOnVehicleData.m index 2f1c78fdb..9d750efbd 100644 --- a/SmartDeviceLink/SDLOnVehicleData.m +++ b/SmartDeviceLink/SDLOnVehicleData.m @@ -42,7 +42,7 @@ } } -- (void)setSpeed:(NSNumber *)speed { +- (void)setSpeed:(NSNumber<SDLFloat> *)speed { if (speed != nil) { [parameters setObject:speed forKey:SDLNameSpeed]; } else { @@ -50,11 +50,11 @@ } } -- (NSNumber *)speed { +- (NSNumber<SDLFloat> *)speed { return [parameters objectForKey:SDLNameSpeed]; } -- (void)setRpm:(NSNumber *)rpm { +- (void)setRpm:(NSNumber<SDLInt> *)rpm { if (rpm != nil) { [parameters setObject:rpm forKey:SDLNameRPM]; } else { @@ -62,11 +62,11 @@ } } -- (NSNumber *)rpm { +- (NSNumber<SDLInt> *)rpm { return [parameters objectForKey:SDLNameRPM]; } -- (void)setFuelLevel:(NSNumber *)fuelLevel { +- (void)setFuelLevel:(NSNumber<SDLFloat> *)fuelLevel { if (fuelLevel != nil) { [parameters setObject:fuelLevel forKey:SDLNameFuelLevel]; } else { @@ -74,7 +74,7 @@ } } -- (NSNumber *)fuelLevel { +- (NSNumber<SDLFloat> *)fuelLevel { return [parameters objectForKey:SDLNameFuelLevel]; } @@ -91,7 +91,7 @@ return (SDLComponentVolumeStatus)obj; } -- (void)setInstantFuelConsumption:(NSNumber *)instantFuelConsumption { +- (void)setInstantFuelConsumption:(NSNumber<SDLFloat> *)instantFuelConsumption { if (instantFuelConsumption != nil) { [parameters setObject:instantFuelConsumption forKey:SDLNameInstantFuelConsumption]; } else { @@ -99,11 +99,11 @@ } } -- (NSNumber *)instantFuelConsumption { +- (NSNumber<SDLFloat> *)instantFuelConsumption { return [parameters objectForKey:SDLNameInstantFuelConsumption]; } -- (void)setExternalTemperature:(NSNumber *)externalTemperature { +- (void)setExternalTemperature:(NSNumber<SDLFloat> *)externalTemperature { if (externalTemperature != nil) { [parameters setObject:externalTemperature forKey:SDLNameExternalTemperature]; } else { @@ -111,7 +111,7 @@ } } -- (NSNumber *)externalTemperature { +- (NSNumber<SDLFloat> *)externalTemperature { return [parameters objectForKey:SDLNameExternalTemperature]; } @@ -157,7 +157,7 @@ } } -- (void)setOdometer:(NSNumber *)odometer { +- (void)setOdometer:(NSNumber<SDLInt> *)odometer { if (odometer != nil) { [parameters setObject:odometer forKey:SDLNameOdometer]; } else { @@ -165,7 +165,7 @@ } } -- (NSNumber *)odometer { +- (NSNumber<SDLInt> *)odometer { return [parameters objectForKey:SDLNameOdometer]; } @@ -263,7 +263,7 @@ } } -- (void)setEngineTorque:(NSNumber *)engineTorque { +- (void)setEngineTorque:(NSNumber<SDLFloat> *)engineTorque { if (engineTorque != nil) { [parameters setObject:engineTorque forKey:SDLNameEngineTorque]; } else { @@ -271,11 +271,11 @@ } } -- (NSNumber *)engineTorque { +- (NSNumber<SDLFloat> *)engineTorque { return [parameters objectForKey:SDLNameEngineTorque]; } -- (void)setAccPedalPosition:(NSNumber *)accPedalPosition { +- (void)setAccPedalPosition:(NSNumber<SDLFloat> *)accPedalPosition { if (accPedalPosition != nil) { [parameters setObject:accPedalPosition forKey:SDLNameAccelerationPedalPosition]; } else { @@ -283,11 +283,11 @@ } } -- (NSNumber *)accPedalPosition { +- (NSNumber<SDLFloat> *)accPedalPosition { return [parameters objectForKey:SDLNameAccelerationPedalPosition]; } -- (void)setSteeringWheelAngle:(NSNumber *)steeringWheelAngle { +- (void)setSteeringWheelAngle:(NSNumber<SDLFloat> *)steeringWheelAngle { if (steeringWheelAngle != nil) { [parameters setObject:steeringWheelAngle forKey:SDLNameSteeringWheelAngle]; } else { @@ -295,7 +295,7 @@ } } -- (NSNumber *)steeringWheelAngle { +- (NSNumber<SDLFloat> *)steeringWheelAngle { return [parameters objectForKey:SDLNameSteeringWheelAngle]; } diff --git a/SmartDeviceLink/SDLPerformAudioPassThru.h b/SmartDeviceLink/SDLPerformAudioPassThru.h index 421cff124..1754fe732 100644 --- a/SmartDeviceLink/SDLPerformAudioPassThru.h +++ b/SmartDeviceLink/SDLPerformAudioPassThru.h @@ -74,7 +74,7 @@ * <p> * <b>Notes: </b>Minvalue:1; Maxvalue:1000000 */ -@property (strong) NSNumber *maxDuration; +@property (strong) NSNumber<SDLInt> *maxDuration; /** * @abstract the quality the audio is recorded - 8 bit or 16 bit * @@ -89,6 +89,6 @@ * @abstract a Boolean value representing if the current audio source should be * muted during the APT session<br/> */ -@property (strong) NSNumber *muteAudio; +@property (strong) NSNumber<SDLBool> *muteAudio; @end diff --git a/SmartDeviceLink/SDLPerformAudioPassThru.m b/SmartDeviceLink/SDLPerformAudioPassThru.m index 351cc4230..a7f6079c9 100644 --- a/SmartDeviceLink/SDLPerformAudioPassThru.m +++ b/SmartDeviceLink/SDLPerformAudioPassThru.m @@ -73,7 +73,7 @@ return (SDLSamplingRate )obj; } -- (void)setMaxDuration:(NSNumber *)maxDuration { +- (void)setMaxDuration:(NSNumber<SDLInt> *)maxDuration { if (maxDuration != nil) { [parameters setObject:maxDuration forKey:SDLNameMaxDuration]; } else { @@ -81,7 +81,7 @@ } } -- (NSNumber *)maxDuration { +- (NSNumber<SDLInt> *)maxDuration { return [parameters objectForKey:SDLNameMaxDuration]; } @@ -111,7 +111,7 @@ return (SDLAudioType)obj; } -- (void)setMuteAudio:(NSNumber *)muteAudio { +- (void)setMuteAudio:(NSNumber<SDLBool> *)muteAudio { if (muteAudio != nil) { [parameters setObject:muteAudio forKey:SDLNameMuteAudio]; } else { @@ -119,7 +119,7 @@ } } -- (NSNumber *)muteAudio { +- (NSNumber<SDLBool> *)muteAudio { return [parameters objectForKey:SDLNameMuteAudio]; } diff --git a/SmartDeviceLink/SDLPerformInteraction.h b/SmartDeviceLink/SDLPerformInteraction.h index 0ee46e6e2..5d15ad163 100644 --- a/SmartDeviceLink/SDLPerformInteraction.h +++ b/SmartDeviceLink/SDLPerformInteraction.h @@ -49,7 +49,7 @@ * @abstract A Vector<Integer> value representing an Array of one or more Choice * Set IDs */ -@property (strong) NSMutableArray<NSNumber *> *interactionChoiceSetIDList; +@property (strong) NSMutableArray<NSNumber<SDLInt> *> *interactionChoiceSetIDList; /** * @abstract A Vector<TTSChunk> which taken together, specify the help phrase to * be spoken when the user says "help" during the VR session @@ -64,7 +64,7 @@ * @abstract An Integer value representing the amount of time, in milliseconds, * SDL will wait for the user to make a choice (VR or Menu) */ -@property (strong) NSNumber *timeout; +@property (strong) NSNumber<SDLInt> *timeout; /** * @abstract A Voice recognition Help, which is a suggested VR Help Items to * display on-screen during Perform Interaction diff --git a/SmartDeviceLink/SDLPerformInteraction.m b/SmartDeviceLink/SDLPerformInteraction.m index ec603cf69..29773ba93 100644 --- a/SmartDeviceLink/SDLPerformInteraction.m +++ b/SmartDeviceLink/SDLPerformInteraction.m @@ -62,7 +62,7 @@ return (SDLInteractionMode)obj; } -- (void)setInteractionChoiceSetIDList:(NSMutableArray<NSNumber *> *)interactionChoiceSetIDList { +- (void)setInteractionChoiceSetIDList:(NSMutableArray<NSNumber<SDLInt> *> *)interactionChoiceSetIDList { if (interactionChoiceSetIDList != nil) { [parameters setObject:interactionChoiceSetIDList forKey:SDLNameInteractionChoiceSetIdList]; } else { @@ -70,7 +70,7 @@ } } -- (NSMutableArray<NSNumber *> *)interactionChoiceSetIDList { +- (NSMutableArray<NSNumber<SDLInt> *> *)interactionChoiceSetIDList { return [parameters objectForKey:SDLNameInteractionChoiceSetIdList]; } @@ -116,7 +116,7 @@ } } -- (void)setTimeout:(NSNumber *)timeout { +- (void)setTimeout:(NSNumber<SDLInt> *)timeout { if (timeout != nil) { [parameters setObject:timeout forKey:SDLNameTimeout]; } else { @@ -124,7 +124,7 @@ } } -- (NSNumber *)timeout { +- (NSNumber<SDLInt> *)timeout { return [parameters objectForKey:SDLNameTimeout]; } diff --git a/SmartDeviceLink/SDLPerformInteractionResponse.h b/SmartDeviceLink/SDLPerformInteractionResponse.h index 6f9b40459..b04bd0f7f 100644 --- a/SmartDeviceLink/SDLPerformInteractionResponse.h +++ b/SmartDeviceLink/SDLPerformInteractionResponse.h @@ -20,7 +20,7 @@ * * Optional, Integer, 0 - 2,000,000,000 */ -@property (strong) NSNumber *choiceID; +@property (strong) NSNumber<SDLInt> *choiceID; /** * @abstract Manually entered text selection, e.g. through keyboard diff --git a/SmartDeviceLink/SDLPerformInteractionResponse.m b/SmartDeviceLink/SDLPerformInteractionResponse.m index 84eb12fb5..077fd7386 100644 --- a/SmartDeviceLink/SDLPerformInteractionResponse.m +++ b/SmartDeviceLink/SDLPerformInteractionResponse.m @@ -14,7 +14,7 @@ return self; } -- (void)setChoiceID:(NSNumber *)choiceID { +- (void)setChoiceID:(NSNumber<SDLInt> *)choiceID { if (choiceID != nil) { [parameters setObject:choiceID forKey:SDLNameChoiceId]; } else { @@ -22,7 +22,7 @@ } } -- (NSNumber *)choiceID { +- (NSNumber<SDLInt> *)choiceID { return [parameters objectForKey:SDLNameChoiceId]; } diff --git a/SmartDeviceLink/SDLPresetBankCapabilities.h b/SmartDeviceLink/SDLPresetBankCapabilities.h index 4bc582191..8c0cdda32 100644 --- a/SmartDeviceLink/SDLPresetBankCapabilities.h +++ b/SmartDeviceLink/SDLPresetBankCapabilities.h @@ -16,6 +16,6 @@ * * Required, Boolean */ -@property (strong) NSNumber *onScreenPresetsAvailable; +@property (strong) NSNumber<SDLBool> *onScreenPresetsAvailable; @end diff --git a/SmartDeviceLink/SDLPresetBankCapabilities.m b/SmartDeviceLink/SDLPresetBankCapabilities.m index 4e9490a4c..8ad3a63ee 100644 --- a/SmartDeviceLink/SDLPresetBankCapabilities.m +++ b/SmartDeviceLink/SDLPresetBankCapabilities.m @@ -8,7 +8,7 @@ @implementation SDLPresetBankCapabilities -- (void)setOnScreenPresetsAvailable:(NSNumber *)onScreenPresetsAvailable { +- (void)setOnScreenPresetsAvailable:(NSNumber<SDLBool> *)onScreenPresetsAvailable { if (onScreenPresetsAvailable != nil) { [store setObject:onScreenPresetsAvailable forKey:SDLNameOnScreenPresetsAvailable]; } else { @@ -16,7 +16,7 @@ } } -- (NSNumber *)onScreenPresetsAvailable { +- (NSNumber<SDLBool> *)onScreenPresetsAvailable { return [store objectForKey:SDLNameOnScreenPresetsAvailable]; } diff --git a/SmartDeviceLink/SDLPutFile.h b/SmartDeviceLink/SDLPutFile.h index a0d6eb364..d8a80048c 100644 --- a/SmartDeviceLink/SDLPutFile.h +++ b/SmartDeviceLink/SDLPutFile.h @@ -40,27 +40,27 @@ * * Boolean, Optional, default = NO */ -@property (strong) NSNumber *persistentFile; +@property (strong) NSNumber<SDLBool> *persistentFile; /** * Indicates if the file is meant to be passed through core to elsewhere on the system. If set to TRUE, then the system will instead pass the data thru as it arrives to a predetermined area outside of core. * * Boolean, Optional, default = NO */ -@property (strong) NSNumber *systemFile; +@property (strong) NSNumber<SDLBool> *systemFile; /** * Offset in bytes for resuming partial data chunks. * * Integer, Optional, 0 - 100,000,000,000 */ -@property (strong) NSNumber *offset; +@property (strong) NSNumber<SDLUInt> *offset; /** * Length in bytes for resuming partial data chunks. If offset is set to 0, then length is the total length of the file to be downloaded * * Integer, Optional, 0 - 100,000,000,000 */ -@property (strong) NSNumber *length; +@property (strong) NSNumber<SDLUInt> *length; @end diff --git a/SmartDeviceLink/SDLPutFile.m b/SmartDeviceLink/SDLPutFile.m index 32b88a08c..806488004 100644 --- a/SmartDeviceLink/SDLPutFile.m +++ b/SmartDeviceLink/SDLPutFile.m @@ -38,7 +38,7 @@ return (SDLFileType)obj; } -- (void)setPersistentFile:(NSNumber *)persistentFile { +- (void)setPersistentFile:(NSNumber<SDLBool> *)persistentFile { if (persistentFile != nil) { [parameters setObject:persistentFile forKey:SDLNamePersistentFile]; } else { @@ -46,11 +46,11 @@ } } -- (NSNumber *)persistentFile { +- (NSNumber<SDLBool> *)persistentFile { return [parameters objectForKey:SDLNamePersistentFile]; } -- (void)setSystemFile:(NSNumber *)systemFile { +- (void)setSystemFile:(NSNumber<SDLBool> *)systemFile { if (systemFile != nil) { [parameters setObject:systemFile forKey:SDLNameSystemFile]; } else { @@ -58,11 +58,11 @@ } } -- (NSNumber *)systemFile { +- (NSNumber<SDLBool> *)systemFile { return [parameters objectForKey:SDLNameSystemFile]; } -- (void)setOffset:(NSNumber *)offset { +- (void)setOffset:(NSNumber<SDLUInt> *)offset { if (offset != nil) { [parameters setObject:offset forKey:SDLNameOffset]; } else { @@ -70,11 +70,11 @@ } } -- (NSNumber *)offset { +- (NSNumber<SDLUInt> *)offset { return [parameters objectForKey:SDLNameOffset]; } -- (void)setLength:(NSNumber *)length { +- (void)setLength:(NSNumber<SDLUInt> *)length { if (length != nil) { [parameters setObject:length forKey:SDLNameLength]; } else { @@ -82,7 +82,7 @@ } } -- (NSNumber *)length { +- (NSNumber<SDLUInt> *)length { return [parameters objectForKey:SDLNameLength]; } diff --git a/SmartDeviceLink/SDLPutFileResponse.h b/SmartDeviceLink/SDLPutFileResponse.h index 2140a0e2d..408ac87a8 100644 --- a/SmartDeviceLink/SDLPutFileResponse.h +++ b/SmartDeviceLink/SDLPutFileResponse.h @@ -11,5 +11,5 @@ */ @interface SDLPutFileResponse : SDLRPCResponse -@property (strong) NSNumber *spaceAvailable; +@property (strong) NSNumber<SDLInt> *spaceAvailable; @end diff --git a/SmartDeviceLink/SDLPutFileResponse.m b/SmartDeviceLink/SDLPutFileResponse.m index 1b2e7a4f0..d4d458c65 100644 --- a/SmartDeviceLink/SDLPutFileResponse.m +++ b/SmartDeviceLink/SDLPutFileResponse.m @@ -14,7 +14,7 @@ return self; } -- (void)setSpaceAvailable:(NSNumber *)spaceAvailable { +- (void)setSpaceAvailable:(NSNumber<SDLInt> *)spaceAvailable { if (spaceAvailable != nil) { [parameters setObject:spaceAvailable forKey:SDLNameSpaceAvailable]; } else { @@ -22,7 +22,7 @@ } } -- (NSNumber *)spaceAvailable { +- (NSNumber<SDLInt> *)spaceAvailable { return [parameters objectForKey:SDLNameSpaceAvailable]; } diff --git a/SmartDeviceLink/SDLRPCRequest.h b/SmartDeviceLink/SDLRPCRequest.h index cbac10ab8..fe7fb639d 100644 --- a/SmartDeviceLink/SDLRPCRequest.h +++ b/SmartDeviceLink/SDLRPCRequest.h @@ -6,6 +6,6 @@ @interface SDLRPCRequest : SDLRPCMessage -@property (strong) NSNumber *correlationID; +@property (strong) NSNumber<SDLInt> *correlationID; @end diff --git a/SmartDeviceLink/SDLRPCRequestFactory.h b/SmartDeviceLink/SDLRPCRequestFactory.h index 5439c5e83..9631339c0 100644 --- a/SmartDeviceLink/SDLRPCRequestFactory.h +++ b/SmartDeviceLink/SDLRPCRequestFactory.h @@ -67,164 +67,164 @@ } //***** AddCommand ***** -+ (SDLAddCommand *)buildAddCommandWithID:(NSNumber *)cmdID menuName:(NSString *)menuName parentID:(NSNumber *)parentID position:(NSNumber *)position vrCommands:(NSArray<NSString *> *)vrCommands iconValue:(NSString *)iconValue iconType:(SDLImageType)iconType correlationID:(NSNumber *)correlationID __deprecated_msg("use buildAddCommandWithID:menuName:parentID:position:vrCommands:iconValue:iconType:handler: with SDLManager instead"); ++ (SDLAddCommand *)buildAddCommandWithID:(NSNumber<SDLInt> *)cmdID menuName:(NSString *)menuName parentID:(NSNumber<SDLInt> *)parentID position:(NSNumber<SDLInt> *)position vrCommands:(NSArray<NSString *> *)vrCommands iconValue:(NSString *)iconValue iconType:(SDLImageType)iconType correlationID:(NSNumber<SDLInt> *)correlationID __deprecated_msg("use buildAddCommandWithID:menuName:parentID:position:vrCommands:iconValue:iconType:handler: with SDLManager instead"); ; -+ (SDLAddCommand *)buildAddCommandWithID:(NSNumber *)cmdID menuName:(NSString *)menuName vrCommands:(NSArray<NSString *> *)vrCommands correlationID:(NSNumber *)correlationID __deprecated_msg("use buildAddCommandWithID:menuName:vrCommands:handler: with SDLManager instead"); ++ (SDLAddCommand *)buildAddCommandWithID:(NSNumber<SDLInt> *)cmdID menuName:(NSString *)menuName vrCommands:(NSArray<NSString *> *)vrCommands correlationID:(NSNumber<SDLInt> *)correlationID __deprecated_msg("use buildAddCommandWithID:menuName:vrCommands:handler: with SDLManager instead"); -+ (SDLAddCommand *)buildAddCommandWithID:(NSNumber *)cmdID vrCommands:(NSArray<NSString *> *)vrCommands correlationID:(NSNumber *)correlationID __deprecated_msg("use buildAddCommandWithID:vrCommands:handler: with SDLManager instead"); ++ (SDLAddCommand *)buildAddCommandWithID:(NSNumber<SDLInt> *)cmdID vrCommands:(NSArray<NSString *> *)vrCommands correlationID:(NSNumber<SDLInt> *)correlationID __deprecated_msg("use buildAddCommandWithID:vrCommands:handler: with SDLManager instead"); -+ (SDLAddCommand *)buildAddCommandWithID:(NSNumber *)cmdID menuName:(NSString *)menuName parentID:(NSNumber *)parentID position:(NSNumber *)position vrCommands:(NSArray<NSString *> *)vrCommands iconValue:(NSString *)iconValue iconType:(SDLImageType)iconType handler:(SDLRPCNotificationHandler)handler; ++ (SDLAddCommand *)buildAddCommandWithID:(NSNumber<SDLInt> *)cmdID menuName:(NSString *)menuName parentID:(NSNumber<SDLInt> *)parentID position:(NSNumber<SDLInt> *)position vrCommands:(NSArray<NSString *> *)vrCommands iconValue:(NSString *)iconValue iconType:(SDLImageType)iconType handler:(SDLRPCNotificationHandler)handler; -+ (SDLAddCommand *)buildAddCommandWithID:(NSNumber *)cmdID menuName:(NSString *)menuName vrCommands:(NSArray<NSString *> *)vrCommands handler:(SDLRPCNotificationHandler)handler; ++ (SDLAddCommand *)buildAddCommandWithID:(NSNumber<SDLInt> *)cmdID menuName:(NSString *)menuName vrCommands:(NSArray<NSString *> *)vrCommands handler:(SDLRPCNotificationHandler)handler; -+ (SDLAddCommand *)buildAddCommandWithID:(NSNumber *)cmdID vrCommands:(NSArray<NSString *> *)vrCommands handler:(SDLRPCNotificationHandler)handler; ++ (SDLAddCommand *)buildAddCommandWithID:(NSNumber<SDLInt> *)cmdID vrCommands:(NSArray<NSString *> *)vrCommands handler:(SDLRPCNotificationHandler)handler; //***** //***** AddSubMenu ***** -+ (SDLAddSubMenu *)buildAddSubMenuWithID:(NSNumber *)menuID menuName:(NSString *)menuName position:(NSNumber *)position correlationID:(NSNumber *)correlationID; ++ (SDLAddSubMenu *)buildAddSubMenuWithID:(NSNumber<SDLInt> *)menuID menuName:(NSString *)menuName position:(NSNumber<SDLInt> *)position correlationID:(NSNumber<SDLInt> *)correlationID; -+ (SDLAddSubMenu *)buildAddSubMenuWithID:(NSNumber *)menuID menuName:(NSString *)menuName correlationID:(NSNumber *)correlationID; ++ (SDLAddSubMenu *)buildAddSubMenuWithID:(NSNumber<SDLInt> *)menuID menuName:(NSString *)menuName correlationID:(NSNumber<SDLInt> *)correlationID; //***** //***** Alert ***** -+ (SDLAlert *)buildAlertWithTTS:(NSString *)ttsText alertText1:(NSString *)alertText1 alertText2:(NSString *)alertText2 alertText3:(NSString *)alertText3 playTone:(NSNumber *)playTone duration:(NSNumber *)duration correlationID:(NSNumber *)correlationID; ++ (SDLAlert *)buildAlertWithTTS:(NSString *)ttsText alertText1:(NSString *)alertText1 alertText2:(NSString *)alertText2 alertText3:(NSString *)alertText3 playTone:(NSNumber<SDLBool> *)playTone duration:(NSNumber<SDLInt> *)duration correlationID:(NSNumber<SDLInt> *)correlationID; -+ (SDLAlert *)buildAlertWithTTS:(NSString *)ttsText alertText1:(NSString *)alertText1 alertText2:(NSString *)alertText2 playTone:(NSNumber *)playTone duration:(NSNumber *)duration correlationID:(NSNumber *)correlationID; ++ (SDLAlert *)buildAlertWithTTS:(NSString *)ttsText alertText1:(NSString *)alertText1 alertText2:(NSString *)alertText2 playTone:(NSNumber<SDLBool> *)playTone duration:(NSNumber<SDLInt> *)duration correlationID:(NSNumber<SDLInt> *)correlationID; -+ (SDLAlert *)buildAlertWithTTS:(NSString *)ttsText playTone:(NSNumber *)playTone correlationID:(NSNumber *) ++ (SDLAlert *)buildAlertWithTTS:(NSString *)ttsText playTone:(NSNumber<SDLBool> *)playTone correlationID:(NSNumber<SDLInt> *) correlationID; //*** -+ (SDLAlert *)buildAlertWithTTSChunks:(NSArray<SDLTTSChunk *> *)ttsChunks alertText1:(NSString *)alertText1 alertText2:(NSString *)alertText2 alertText3:(NSString *)alertText3 playTone:(NSNumber *)playTone duration:(NSNumber *)duration softButtons:(NSArray<SDLSoftButton *> *)softButtons correlationID:(NSNumber *)correlationID; ++ (SDLAlert *)buildAlertWithTTSChunks:(NSArray<SDLTTSChunk *> *)ttsChunks alertText1:(NSString *)alertText1 alertText2:(NSString *)alertText2 alertText3:(NSString *)alertText3 playTone:(NSNumber<SDLBool> *)playTone duration:(NSNumber<SDLInt> *)duration softButtons:(NSArray<SDLSoftButton *> *)softButtons correlationID:(NSNumber<SDLInt> *)correlationID; -+ (SDLAlert *)buildAlertWithTTSChunks:(NSArray<SDLTTSChunk *> *)ttsChunks playTone:(NSNumber *)playTone correlationID:(NSNumber *)correlationID; ++ (SDLAlert *)buildAlertWithTTSChunks:(NSArray<SDLTTSChunk *> *)ttsChunks playTone:(NSNumber<SDLBool> *)playTone correlationID:(NSNumber<SDLInt> *)correlationID; //*** -+ (SDLAlert *)buildAlertWithAlertText1:(NSString *)alertText1 alertText2:(NSString *)alertText2 alertText3:(NSString *)alertText3 duration:(NSNumber *)duration softButtons:(NSArray<SDLSoftButton *> *)softButtons correlationID:(NSNumber *)correlationID; ++ (SDLAlert *)buildAlertWithAlertText1:(NSString *)alertText1 alertText2:(NSString *)alertText2 alertText3:(NSString *)alertText3 duration:(NSNumber<SDLInt> *)duration softButtons:(NSArray<SDLSoftButton *> *)softButtons correlationID:(NSNumber<SDLInt> *)correlationID; -+ (SDLAlert *)buildAlertWithAlertText1:(NSString *)alertText1 alertText2:(NSString *)alertText2 alertText3:(NSString *)alertText3 duration:(NSNumber *)duration correlationID:(NSNumber *)correlationID; ++ (SDLAlert *)buildAlertWithAlertText1:(NSString *)alertText1 alertText2:(NSString *)alertText2 alertText3:(NSString *)alertText3 duration:(NSNumber<SDLInt> *)duration correlationID:(NSNumber<SDLInt> *)correlationID; -+ (SDLAlert *)buildAlertWithAlertText1:(NSString *)alertText1 alertText2:(NSString *)alertText2 duration:(NSNumber *)duration correlationID:(NSNumber *)correlationID; ++ (SDLAlert *)buildAlertWithAlertText1:(NSString *)alertText1 alertText2:(NSString *)alertText2 duration:(NSNumber<SDLInt> *)duration correlationID:(NSNumber<SDLInt> *)correlationID; //***** -+ (SDLAlertManeuver *)buildAlertManeuverwithTTSchunks:(NSMutableArray<SDLTTSChunk *> *)ttsChunks softButtons:(NSMutableArray<SDLSoftButton *> *)softButtons correlationID:(NSNumber *)correlationID; ++ (SDLAlertManeuver *)buildAlertManeuverwithTTSchunks:(NSMutableArray<SDLTTSChunk *> *)ttsChunks softButtons:(NSMutableArray<SDLSoftButton *> *)softButtons correlationID:(NSNumber<SDLInt> *)correlationID; -+ (SDLChangeRegistration *)buildChangeRegistrationWithLanguage:(SDLLanguage)language hmiDisplayLanguage:(SDLLanguage)hmiDisplayLanguage correlationID:(NSNumber *)correlationID; ++ (SDLChangeRegistration *)buildChangeRegistrationWithLanguage:(SDLLanguage)language hmiDisplayLanguage:(SDLLanguage)hmiDisplayLanguage correlationID:(NSNumber<SDLInt> *)correlationID; -+ (SDLCreateInteractionChoiceSet *)buildCreateInteractionChoiceSetWithID:(NSNumber *)interactionChoiceSetID choiceSet:(NSArray<SDLChoice *> *)choices correlationID:(NSNumber *)correlationID; ++ (SDLCreateInteractionChoiceSet *)buildCreateInteractionChoiceSetWithID:(NSNumber<SDLInt> *)interactionChoiceSetID choiceSet:(NSArray<SDLChoice *> *)choices correlationID:(NSNumber<SDLInt> *)correlationID; -+ (SDLDeleteCommand *)buildDeleteCommandWithID:(NSNumber *)cmdID correlationID:(NSNumber *)correlationID; ++ (SDLDeleteCommand *)buildDeleteCommandWithID:(NSNumber<SDLInt> *)cmdID correlationID:(NSNumber<SDLInt> *)correlationID; -+ (SDLDeleteFile *)buildDeleteFileWithName:(NSString *)syncFileName correlationID:(NSNumber *)correlationID; ++ (SDLDeleteFile *)buildDeleteFileWithName:(NSString *)syncFileName correlationID:(NSNumber<SDLInt> *)correlationID; + (SDLDialNumber *)buildDialNumberWithNumber:(NSString *)phoneNumber; -+ (SDLListFiles *)buildListFilesWithCorrelationID:(NSNumber *)correlationID; ++ (SDLListFiles *)buildListFilesWithCorrelationID:(NSNumber<SDLInt> *)correlationID; -+ (SDLDeleteInteractionChoiceSet *)buildDeleteInteractionChoiceSetWithID:(NSNumber *)interactionChoiceSetID correlationID:(NSNumber *)correlationID; ++ (SDLDeleteInteractionChoiceSet *)buildDeleteInteractionChoiceSetWithID:(NSNumber<SDLInt> *)interactionChoiceSetID correlationID:(NSNumber<SDLInt> *)correlationID; -+ (SDLDeleteSubMenu *)buildDeleteSubMenuWithID:(NSNumber *)menuID correlationID:(NSNumber *)correlationID; ++ (SDLDeleteSubMenu *)buildDeleteSubMenuWithID:(NSNumber<SDLInt> *)menuID correlationID:(NSNumber<SDLInt> *)correlationID; -+ (SDLEndAudioPassThru *)buildEndAudioPassThruWithCorrelationID:(NSNumber *)correlationID; ++ (SDLEndAudioPassThru *)buildEndAudioPassThruWithCorrelationID:(NSNumber<SDLInt> *)correlationID; -+ (SDLGetDTCs *)buildGetDTCsWithECUName:(NSNumber *)ecuName correlationID:(NSNumber *)correlationID; ++ (SDLGetDTCs *)buildGetDTCsWithECUName:(NSNumber<SDLInt> *)ecuName correlationID:(NSNumber<SDLInt> *)correlationID; -+ (SDLGetVehicleData *)buildGetVehicleDataWithGPS:(NSNumber *)gps speed:(NSNumber *)speed rpm:(NSNumber *)rpm fuelLevel:(NSNumber *)fuelLevel fuelLevelState:(NSNumber *)fuelLevelState instantFuelConsumption:(NSNumber *)instantFuelConsumption externalTemperature:(NSNumber *)externalTemperature vin:(NSNumber *)vin prndl:(NSNumber *)prndl tirePressure:(NSNumber *)tirePressure odometer:(NSNumber *)odometer beltStatus:(NSNumber *)beltStatus bodyInformation:(NSNumber *)bodyInformation deviceStatus:(NSNumber *)deviceStatus driverBraking:(NSNumber *)driverBraking wiperStatus:(NSNumber *)wiperStatus headLampStatus:(NSNumber *)headLampStatus engineTorque:(NSNumber *)engineTorque accPedalPosition:(NSNumber *)accPedalPosition steeringWheelAngle:(NSNumber *)steeringWheelAngle correlationID:(NSNumber *)correlationID; ++ (SDLGetVehicleData *)buildGetVehicleDataWithGPS:(NSNumber<SDLBool> *)gps speed:(NSNumber<SDLBool> *)speed rpm:(NSNumber<SDLBool> *)rpm fuelLevel:(NSNumber<SDLBool> *)fuelLevel fuelLevelState:(NSNumber<SDLBool> *)fuelLevelState instantFuelConsumption:(NSNumber<SDLBool> *)instantFuelConsumption externalTemperature:(NSNumber<SDLBool> *)externalTemperature vin:(NSNumber<SDLBool> *)vin prndl:(NSNumber<SDLBool> *)prndl tirePressure:(NSNumber<SDLBool> *)tirePressure odometer:(NSNumber<SDLBool> *)odometer beltStatus:(NSNumber<SDLBool> *)beltStatus bodyInformation:(NSNumber<SDLBool> *)bodyInformation deviceStatus:(NSNumber<SDLBool> *)deviceStatus driverBraking:(NSNumber<SDLBool> *)driverBraking wiperStatus:(NSNumber<SDLBool> *)wiperStatus headLampStatus:(NSNumber<SDLBool> *)headLampStatus engineTorque:(NSNumber<SDLBool> *)engineTorque accPedalPosition:(NSNumber<SDLBool> *)accPedalPosition steeringWheelAngle:(NSNumber<SDLBool> *)steeringWheelAngle correlationID:(NSNumber<SDLInt> *)correlationID; -+ (SDLPerformAudioPassThru *)buildPerformAudioPassThruWithInitialPrompt:(NSString *)initialPrompt audioPassThruDisplayText1:(NSString *)audioPassThruDisplayText1 audioPassThruDisplayText2:(NSString *)audioPassThruDisplayText2 samplingRate:(SDLSamplingRate)samplingRate maxDuration:(NSNumber *)maxDuration bitsPerSample:(SDLBitsPerSample)bitsPerSample audioType:(SDLAudioType)audioType muteAudio:(NSNumber *)muteAudio correlationID:(NSNumber *)correlationID; ++ (SDLPerformAudioPassThru *)buildPerformAudioPassThruWithInitialPrompt:(NSString *)initialPrompt audioPassThruDisplayText1:(NSString *)audioPassThruDisplayText1 audioPassThruDisplayText2:(NSString *)audioPassThruDisplayText2 samplingRate:(SDLSamplingRate)samplingRate maxDuration:(NSNumber<SDLInt> *)maxDuration bitsPerSample:(SDLBitsPerSample)bitsPerSample audioType:(SDLAudioType)audioType muteAudio:(NSNumber<SDLBool> *)muteAudio correlationID:(NSNumber<SDLInt> *)correlationID; //***** PerformInteraction ***** -+ (SDLPerformInteraction *)buildPerformInteractionWithInitialChunks:(NSArray<SDLTTSChunk *> *)initialChunks initialText:(NSString *)initialText interactionChoiceSetIDList:(NSArray<NSNumber *> *)interactionChoiceSetIDList helpChunks:(NSArray<SDLTTSChunk *> *)helpChunks timeoutChunks:(NSArray<SDLTTSChunk *> *)timeoutChunks interactionMode:(SDLInteractionMode)interactionMode timeout:(NSNumber *)timeout vrHelp:(NSArray<SDLVRHelpItem *> *)vrHelp correlationID:(NSNumber *)correlationID; ++ (SDLPerformInteraction *)buildPerformInteractionWithInitialChunks:(NSArray<SDLTTSChunk *> *)initialChunks initialText:(NSString *)initialText interactionChoiceSetIDList:(NSArray<NSNumber *> *)interactionChoiceSetIDList helpChunks:(NSArray<SDLTTSChunk *> *)helpChunks timeoutChunks:(NSArray<SDLTTSChunk *> *)timeoutChunks interactionMode:(SDLInteractionMode)interactionMode timeout:(NSNumber<SDLInt> *)timeout vrHelp:(NSArray<SDLVRHelpItem *> *)vrHelp correlationID:(NSNumber<SDLInt> *)correlationID; //*** -+ (SDLPerformInteraction *)buildPerformInteractionWithInitialPrompt:(NSString *)initialPrompt initialText:(NSString *)initialText interactionChoiceSetIDList:(NSArray<NSNumber *> *)interactionChoiceSetIDList helpPrompt:(NSString *)helpPrompt timeoutPrompt:(NSString *)timeoutPrompt interactionMode:(SDLInteractionMode)interactionMode timeout:(NSNumber *)timeout vrHelp:(NSArray<SDLVRHelpItem *> *)vrHelp correlationID:(NSNumber *)correlationID; ++ (SDLPerformInteraction *)buildPerformInteractionWithInitialPrompt:(NSString *)initialPrompt initialText:(NSString *)initialText interactionChoiceSetIDList:(NSArray<NSNumber *> *)interactionChoiceSetIDList helpPrompt:(NSString *)helpPrompt timeoutPrompt:(NSString *)timeoutPrompt interactionMode:(SDLInteractionMode)interactionMode timeout:(NSNumber<SDLInt> *)timeout vrHelp:(NSArray<SDLVRHelpItem *> *)vrHelp correlationID:(NSNumber<SDLInt> *)correlationID; -+ (SDLPerformInteraction *)buildPerformInteractionWithInitialPrompt:(NSString *)initialPrompt initialText:(NSString *)initialText interactionChoiceSetID:(NSNumber *)interactionChoiceSetID vrHelp:(NSArray<SDLVRHelpItem *> *)vrHelp correlationID:(NSNumber *)correlationID; ++ (SDLPerformInteraction *)buildPerformInteractionWithInitialPrompt:(NSString *)initialPrompt initialText:(NSString *)initialText interactionChoiceSetID:(NSNumber<SDLInt> *)interactionChoiceSetID vrHelp:(NSArray<SDLVRHelpItem *> *)vrHelp correlationID:(NSNumber<SDLInt> *)correlationID; -+ (SDLPerformInteraction *)buildPerformInteractionWithInitialPrompt:(NSString *)initialPrompt initialText:(NSString *)initialText interactionChoiceSetIDList:(NSArray<NSNumber *> *)interactionChoiceSetIDList helpPrompt:(NSString *)helpPrompt timeoutPrompt:(NSString *)timeoutPrompt interactionMode:(SDLInteractionMode)interactionMode timeout:(NSNumber *)timeout correlationID:(NSNumber *)correlationID; ++ (SDLPerformInteraction *)buildPerformInteractionWithInitialPrompt:(NSString *)initialPrompt initialText:(NSString *)initialText interactionChoiceSetIDList:(NSArray<NSNumber<SDLInt> *> *)interactionChoiceSetIDList helpPrompt:(NSString *)helpPrompt timeoutPrompt:(NSString *)timeoutPrompt interactionMode:(SDLInteractionMode)interactionMode timeout:(NSNumber<SDLInt> *)timeout correlationID:(NSNumber<SDLInt> *)correlationID; -+ (SDLPerformInteraction *)buildPerformInteractionWithInitialPrompt:(NSString *)initialPrompt initialText:(NSString *)initialText interactionChoiceSetID:(NSNumber *)interactionChoiceSetID correlationID:(NSNumber *)correlationID; ++ (SDLPerformInteraction *)buildPerformInteractionWithInitialPrompt:(NSString *)initialPrompt initialText:(NSString *)initialText interactionChoiceSetID:(NSNumber<SDLInt> *)interactionChoiceSetID correlationID:(NSNumber<SDLInt> *)correlationID; //***** -+ (SDLPutFile *)buildPutFileWithFileName:(NSString *)fileName fileType:(SDLFileType)fileType persistentFile:(NSNumber *)persistentFile correlationId:(NSNumber *)correlationID; -+ (SDLPutFile *)buildPutFileWithFileName:(NSString *)syncFileName fileType:(SDLFileType)fileType persisistentFile:(NSNumber *)persistentFile correlationID:(NSNumber *)correlationID __deprecated_msg("use buildPutFileWithFileName:fileType:persistentFile:correlationID: instead"); ++ (SDLPutFile *)buildPutFileWithFileName:(NSString *)fileName fileType:(SDLFileType)fileType persistentFile:(NSNumber<SDLBool> *)persistentFile correlationID:(NSNumber<SDLInt> *)correlationID; ++ (SDLPutFile *)buildPutFileWithFileName:(NSString *)syncFileName fileType:(SDLFileType)fileType persisistentFile:(NSNumber<SDLBool> *)persistentFile correlationID:(NSNumber<SDLInt> *)correlationID __deprecated_msg("use buildPutFileWithFileName:fileType:persistentFile:correlationID: instead"); -+ (SDLReadDID *)buildReadDIDWithECUName:(NSNumber *)ecuName didLocation:(NSArray<NSNumber *> *)didLocation correlationID:(NSNumber *)correlationID; ++ (SDLReadDID *)buildReadDIDWithECUName:(NSNumber<SDLInt> *)ecuName didLocation:(NSArray<NSNumber<SDLInt> *> *)didLocation correlationID:(NSNumber<SDLInt> *)correlationID; //***** RegisterAppInterface ***** -+ (SDLRegisterAppInterface *)buildRegisterAppInterfaceWithAppName:(NSString *)appName ttsName:(NSMutableArray<SDLTTSChunk *> *)ttsName vrSynonyms:(NSMutableArray<NSString *> *)vrSynonyms isMediaApp:(NSNumber *)isMediaApp languageDesired:(SDLLanguage)languageDesired hmiDisplayLanguageDesired:(SDLLanguage)hmiDisplayLanguageDesired appID:(NSString *)appID; ++ (SDLRegisterAppInterface *)buildRegisterAppInterfaceWithAppName:(NSString *)appName ttsName:(NSMutableArray<SDLTTSChunk *> *)ttsName vrSynonyms:(NSMutableArray<NSString *> *)vrSynonyms isMediaApp:(NSNumber<SDLBool> *)isMediaApp languageDesired:(SDLLanguage)languageDesired hmiDisplayLanguageDesired:(SDLLanguage)hmiDisplayLanguageDesired appID:(NSString *)appID; -+ (SDLRegisterAppInterface *)buildRegisterAppInterfaceWithAppName:(NSString *)appName isMediaApp:(NSNumber *)isMediaApp languageDesired:(SDLLanguage)languageDesired appID:(NSString *)appID; ++ (SDLRegisterAppInterface *)buildRegisterAppInterfaceWithAppName:(NSString *)appName isMediaApp:(NSNumber<SDLBool> *)isMediaApp languageDesired:(SDLLanguage)languageDesired appID:(NSString *)appID; + (SDLRegisterAppInterface *)buildRegisterAppInterfaceWithAppName:(NSString *)appName languageDesired:(SDLLanguage)languageDesired appID:(NSString *)appID; //***** -+ (SDLResetGlobalProperties *)buildResetGlobalPropertiesWithProperties:(NSArray<SDLGlobalProperty> *)properties correlationID:(NSNumber *)correlationID; ++ (SDLResetGlobalProperties *)buildResetGlobalPropertiesWithProperties:(NSArray<SDLGlobalProperty> *)properties correlationID:(NSNumber<SDLInt> *)correlationID; -+ (SDLSendLocation *)buildSendLocationWithLongitude:(NSNumber *)longitude latitude:(NSNumber *)latitude locationName:(NSString *)locationName locationDescription:(NSString *)locationDescription address:(NSArray<NSString *> *)address phoneNumber:(NSString *)phoneNumber image:(SDLImage *)image; ++ (SDLSendLocation *)buildSendLocationWithLongitude:(NSNumber<SDLFloat> *)longitude latitude:(NSNumber<SDLFloat> *)latitude locationName:(NSString *)locationName locationDescription:(NSString *)locationDescription address:(NSArray<NSString *> *)address phoneNumber:(NSString *)phoneNumber image:(SDLImage *)image; -+ (SDLScrollableMessage *)buildScrollableMessage:(NSString *)scrollableMessageBody timeout:(NSNumber *)timeout softButtons:(NSArray<SDLSoftButton *> *)softButtons correlationID:(NSNumber *)correlationID; ++ (SDLScrollableMessage *)buildScrollableMessage:(NSString *)scrollableMessageBody timeout:(NSNumber<SDLInt> *)timeout softButtons:(NSArray<SDLSoftButton *> *)softButtons correlationID:(NSNumber<SDLInt> *)correlationID; -+ (SDLSetAppIcon *)buildSetAppIconWithFileName:(NSString *)syncFileName correlationID:(NSNumber *)correlationID; ++ (SDLSetAppIcon *)buildSetAppIconWithFileName:(NSString *)syncFileName correlationID:(NSNumber<SDLInt> *)correlationID; -+ (SDLSetDisplayLayout *)buildSetDisplayLayout:(NSString *)displayLayout correlationID:(NSNumber *)correlationID; ++ (SDLSetDisplayLayout *)buildSetDisplayLayout:(NSString *)displayLayout correlationID:(NSNumber<SDLInt> *)correlationID; //***** SetGlobalProperties ***** -+ (SDLSetGlobalProperties *)buildSetGlobalPropertiesWithHelpText:(NSString *)helpText timeoutText:(NSString *)timeoutText vrHelpTitle:(NSString *)vrHelpTitle vrHelp:(NSArray<SDLVRHelpItem *> *)vrHelp correlationID:(NSNumber *)correlationID; ++ (SDLSetGlobalProperties *)buildSetGlobalPropertiesWithHelpText:(NSString *)helpText timeoutText:(NSString *)timeoutText vrHelpTitle:(NSString *)vrHelpTitle vrHelp:(NSArray<SDLVRHelpItem *> *)vrHelp correlationID:(NSNumber<SDLInt> *)correlationID; -+ (SDLSetGlobalProperties *)buildSetGlobalPropertiesWithHelpText:(NSString *)helpText timeoutText:(NSString *)timeoutText correlationID:(NSNumber *)correlationID; ++ (SDLSetGlobalProperties *)buildSetGlobalPropertiesWithHelpText:(NSString *)helpText timeoutText:(NSString *)timeoutText correlationID:(NSNumber<SDLInt> *)correlationID; //***** //***** SetMediaClockTimer ***** -+ (SDLSetMediaClockTimer *)buildSetMediaClockTimerWithHours:(NSNumber *)hours minutes:(NSNumber *)minutes seconds:(NSNumber *)seconds updateMode:(SDLUpdateMode)updateMode correlationID:(NSNumber *)correlationID; ++ (SDLSetMediaClockTimer *)buildSetMediaClockTimerWithHours:(NSNumber<SDLInt> *)hours minutes:(NSNumber<SDLInt> *)minutes seconds:(NSNumber<SDLInt> *)seconds updateMode:(SDLUpdateMode)updateMode correlationID:(NSNumber<SDLInt> *)correlationID; -+ (SDLSetMediaClockTimer *)buildSetMediaClockTimerWithUpdateMode:(SDLUpdateMode)updateMode correlationID:(NSNumber *)correlationID; ++ (SDLSetMediaClockTimer *)buildSetMediaClockTimerWithUpdateMode:(SDLUpdateMode)updateMode correlationID:(NSNumber<SDLInt> *)correlationID; //***** //***** Show ***** -+ (SDLShow *)buildShowWithMainField1:(NSString *)mainField1 mainField2:(NSString *)mainField2 mainField3:(NSString *)mainField3 mainField4:(NSString *)mainField4 statusBar:(NSString *)statusBar mediaClock:(NSString *)mediaClock mediaTrack:(NSString *)mediaTrack alignment:(SDLTextAlignment)textAlignment graphic:(SDLImage *)graphic softButtons:(NSArray<SDLSoftButton *> *)softButtons customPresets:(NSArray<NSString *> *)customPresets correlationID:(NSNumber *)correlationID; ++ (SDLShow *)buildShowWithMainField1:(NSString *)mainField1 mainField2:(NSString *)mainField2 mainField3:(NSString *)mainField3 mainField4:(NSString *)mainField4 statusBar:(NSString *)statusBar mediaClock:(NSString *)mediaClock mediaTrack:(NSString *)mediaTrack alignment:(SDLTextAlignment)textAlignment graphic:(SDLImage *)graphic softButtons:(NSArray<SDLSoftButton *> *)softButtons customPresets:(NSArray<NSString *> *)customPresets correlationID:(NSNumber<SDLInt> *)correlationID; -+ (SDLShow *)buildShowWithMainField1:(NSString *)mainField1 mainField2:(NSString *)mainField2 statusBar:(NSString *)statusBar mediaClock:(NSString *)mediaClock mediaTrack:(NSString *)mediaTrack alignment:(SDLTextAlignment)textAlignment correlationID:(NSNumber *)correlationID; ++ (SDLShow *)buildShowWithMainField1:(NSString *)mainField1 mainField2:(NSString *)mainField2 statusBar:(NSString *)statusBar mediaClock:(NSString *)mediaClock mediaTrack:(NSString *)mediaTrack alignment:(SDLTextAlignment)textAlignment correlationID:(NSNumber<SDLInt> *)correlationID; -+ (SDLShow *)buildShowWithMainField1:(NSString *)mainField1 mainField2:(NSString *)mainField2 alignment:(SDLTextAlignment)alignment correlationID:(NSNumber *)correlationID; ++ (SDLShow *)buildShowWithMainField1:(NSString *)mainField1 mainField2:(NSString *)mainField2 alignment:(SDLTextAlignment)alignment correlationID:(NSNumber<SDLInt> *)correlationID; //***** //***** Slider ***** -+ (SDLSlider *)buildSliderDynamicFooterWithNumTicks:(NSNumber *)numTicks position:(NSNumber *)position sliderHeader:(NSString *)sliderHeader sliderFooter:(NSArray<NSString *> *)sliderFooter timeout:(NSNumber *)timeout correlationID:(NSNumber *)correlationID; ++ (SDLSlider *)buildSliderDynamicFooterWithNumTicks:(NSNumber<SDLInt> *)numTicks position:(NSNumber<SDLInt> *)position sliderHeader:(NSString *)sliderHeader sliderFooter:(NSArray<NSString *> *)sliderFooter timeout:(NSNumber<SDLInt> *)timeout correlationID:(NSNumber<SDLInt> *)correlationID; -+ (SDLSlider *)buildSliderStaticFooterWithNumTicks:(NSNumber *)numTicks position:(NSNumber *)position sliderHeader:(NSString *)sliderHeader sliderFooter:(NSString *)sliderFooter timeout:(NSNumber *)timeout correlationID:(NSNumber *)correlationID; ++ (SDLSlider *)buildSliderStaticFooterWithNumTicks:(NSNumber<SDLInt> *)numTicks position:(NSNumber<SDLInt> *)position sliderHeader:(NSString *)sliderHeader sliderFooter:(NSString *)sliderFooter timeout:(NSNumber<SDLInt> *)timeout correlationID:(NSNumber<SDLInt> *)correlationID; //***** + (SDLSoftButton *)buildSoftButtonWithType:(SDLSoftButtonType)type text:(NSString *)text image:(SDLImage *)image highlighted:(BOOL)highlighted buttonID:(UInt16)buttonID systemAction:(SDLSystemAction)systemAction handler:(SDLRPCNotificationHandler)handler; //***** Speak ***** -+ (SDLSpeak *)buildSpeakWithTTSChunks:(NSArray<SDLTTSChunk *> *)ttsChunks correlationID:(NSNumber *)correlationID; ++ (SDLSpeak *)buildSpeakWithTTSChunks:(NSArray<SDLTTSChunk *> *)ttsChunks correlationID:(NSNumber<SDLInt> *)correlationID; //*** -+ (SDLSpeak *)buildSpeakWithTTS:(NSString *)ttsText correlationID:(NSNumber *)correlationID; ++ (SDLSpeak *)buildSpeakWithTTS:(NSString *)ttsText correlationID:(NSNumber<SDLInt> *)correlationID; //***** -+ (SDLSubscribeButton *)buildSubscribeButtonWithName:(SDLButtonName)buttonName correlationID:(NSNumber *)correlationID __deprecated_msg("use buildSubscribeButtonWithName:handler: with SDLManager instead"); ++ (SDLSubscribeButton *)buildSubscribeButtonWithName:(SDLButtonName)buttonName correlationID:(NSNumber<SDLInt> *)correlationID __deprecated_msg("use buildSubscribeButtonWithName:handler: with SDLManager instead"); + (SDLSubscribeButton *)buildSubscribeButtonWithName:(SDLButtonName)buttonName handler:(SDLRPCNotificationHandler)handler; -+ (SDLSubscribeVehicleData *)buildSubscribeVehicleDataWithGPS:(NSNumber *)gps speed:(NSNumber *)speed rpm:(NSNumber *)rpm fuelLevel:(NSNumber *)fuelLevel fuelLevelState:(NSNumber *)fuelLevelState instantFuelConsumption:(NSNumber *)instantFuelConsumption externalTemperature:(NSNumber *)externalTemperature prndl:(NSNumber *)prndl tirePressure:(NSNumber *)tirePressure odometer:(NSNumber *)odometer beltStatus:(NSNumber *)beltStatus bodyInformation:(NSNumber *)bodyInformation deviceStatus:(NSNumber *)deviceStatus driverBraking:(NSNumber *)driverBraking wiperStatus:(NSNumber *)wiperStatus headLampStatus:(NSNumber *)headLampStatus engineTorque:(NSNumber *)engineTorque accPedalPosition:(NSNumber *)accPedalPosition steeringWheelAngle:(NSNumber *)steeringWheelAngle correlationID:(NSNumber *)correlationID; ++ (SDLSubscribeVehicleData *)buildSubscribeVehicleDataWithGPS:(NSNumber<SDLBool> *)gps speed:(NSNumber<SDLBool> *)speed rpm:(NSNumber<SDLBool> *)rpm fuelLevel:(NSNumber<SDLBool> *)fuelLevel fuelLevelState:(NSNumber<SDLBool> *)fuelLevelState instantFuelConsumption:(NSNumber<SDLBool> *)instantFuelConsumption externalTemperature:(NSNumber<SDLBool> *)externalTemperature prndl:(NSNumber<SDLBool> *)prndl tirePressure:(NSNumber<SDLBool> *)tirePressure odometer:(NSNumber<SDLBool> *)odometer beltStatus:(NSNumber<SDLBool> *)beltStatus bodyInformation:(NSNumber<SDLBool> *)bodyInformation deviceStatus:(NSNumber<SDLBool> *)deviceStatus driverBraking:(NSNumber<SDLBool> *)driverBraking wiperStatus:(NSNumber<SDLBool> *)wiperStatus headLampStatus:(NSNumber<SDLBool> *)headLampStatus engineTorque:(NSNumber<SDLBool> *)engineTorque accPedalPosition:(NSNumber<SDLBool> *)accPedalPosition steeringWheelAngle:(NSNumber<SDLBool> *)steeringWheelAngle correlationID:(NSNumber<SDLInt> *)correlationID; -+ (SDLShowConstantTBT *)buildShowConstantTBTWithString:(NSString *)navigationText1 navigationText2:(NSString *)navigationText2 eta:(NSString *)eta timeToDestination:(NSString *)timeToDestination totalDistance:(NSString *)totalDistance turnIcon:(SDLImage *)turnIcon nextTurnIcon:(SDLImage *)nextTurnIcon distanceToManeuver:(NSNumber *)distanceToManeuver distanceToManeuverScale:(NSNumber *)distanceToManeuverScale maneuverComplete:(NSNumber *)maneuverComplete softButtons:(NSMutableArray<SDLSoftButton *> *)softButtons correlationID:(NSNumber *)correlationID; ++ (SDLShowConstantTBT *)buildShowConstantTBTWithString:(NSString *)navigationText1 navigationText2:(NSString *)navigationText2 eta:(NSString *)eta timeToDestination:(NSString *)timeToDestination totalDistance:(NSString *)totalDistance turnIcon:(SDLImage *)turnIcon nextTurnIcon:(SDLImage *)nextTurnIcon distanceToManeuver:(NSNumber<SDLFloat> *)distanceToManeuver distanceToManeuverScale:(NSNumber<SDLFloat> *)distanceToManeuverScale maneuverComplete:(NSNumber<SDLBool> *)maneuverComplete softButtons:(NSMutableArray<SDLSoftButton *> *)softButtons correlationID:(NSNumber<SDLInt> *)correlationID; -+ (SDLUnregisterAppInterface *)buildUnregisterAppInterfaceWithCorrelationID:(NSNumber *)correlationID; ++ (SDLUnregisterAppInterface *)buildUnregisterAppInterfaceWithCorrelationID:(NSNumber<SDLInt> *)correlationID; -+ (SDLUnsubscribeButton *)buildUnsubscribeButtonWithName:(SDLButtonName)buttonName correlationID:(NSNumber *)correlationID; ++ (SDLUnsubscribeButton *)buildUnsubscribeButtonWithName:(SDLButtonName)buttonName correlationID:(NSNumber<SDLInt> *)correlationID; -+ (SDLUnsubscribeVehicleData *)buildUnsubscribeVehicleDataWithGPS:(NSNumber *)gps speed:(NSNumber *)speed rpm:(NSNumber *)rpm fuelLevel:(NSNumber *)fuelLevel fuelLevelState:(NSNumber *)fuelLevelState instantFuelConsumption:(NSNumber *)instantFuelConsumption externalTemperature:(NSNumber *)externalTemperature prndl:(NSNumber *)prndl tirePressure:(NSNumber *)tirePressure odometer:(NSNumber *)odometer beltStatus:(NSNumber *)beltStatus bodyInformation:(NSNumber *)bodyInformation deviceStatus:(NSNumber *)deviceStatus driverBraking:(NSNumber *)driverBraking wiperStatus:(NSNumber *)wiperStatus headLampStatus:(NSNumber *)headLampStatus engineTorque:(NSNumber *)engineTorque accPedalPosition:(NSNumber *)accPedalPosition steeringWheelAngle:(NSNumber *)steeringWheelAngle correlationID:(NSNumber *)correlationID; ++ (SDLUnsubscribeVehicleData *)buildUnsubscribeVehicleDataWithGPS:(NSNumber<SDLBool> *)gps speed:(NSNumber<SDLBool> *)speed rpm:(NSNumber<SDLBool> *)rpm fuelLevel:(NSNumber<SDLBool> *)fuelLevel fuelLevelState:(NSNumber<SDLBool> *)fuelLevelState instantFuelConsumption:(NSNumber<SDLBool> *)instantFuelConsumption externalTemperature:(NSNumber<SDLBool> *)externalTemperature prndl:(NSNumber<SDLBool> *)prndl tirePressure:(NSNumber<SDLBool> *)tirePressure odometer:(NSNumber<SDLBool> *)odometer beltStatus:(NSNumber<SDLBool> *)beltStatus bodyInformation:(NSNumber<SDLBool> *)bodyInformation deviceStatus:(NSNumber<SDLBool> *)deviceStatus driverBraking:(NSNumber<SDLBool> *)driverBraking wiperStatus:(NSNumber<SDLBool> *)wiperStatus headLampStatus:(NSNumber<SDLBool> *)headLampStatus engineTorque:(NSNumber<SDLBool> *)engineTorque accPedalPosition:(NSNumber<SDLBool> *)accPedalPosition steeringWheelAngle:(NSNumber<SDLBool> *)steeringWheelAngle correlationID:(NSNumber<SDLInt> *)correlationID; -+ (SDLUpdateTurnList *)buildUpdateTurnListWithTurnList:(NSMutableArray<SDLTurn *> *)turnList softButtons:(NSMutableArray<SDLSoftButton *> *)softButtons correlationID:(NSNumber *)correlationID; ++ (SDLUpdateTurnList *)buildUpdateTurnListWithTurnList:(NSMutableArray<SDLTurn *> *)turnList softButtons:(NSMutableArray<SDLSoftButton *> *)softButtons correlationID:(NSNumber<SDLInt> *)correlationID; @end diff --git a/SmartDeviceLink/SDLRPCRequestFactory.m b/SmartDeviceLink/SDLRPCRequestFactory.m index d6f458d91..c9bede0f5 100644 --- a/SmartDeviceLink/SDLRPCRequestFactory.m +++ b/SmartDeviceLink/SDLRPCRequestFactory.m @@ -61,7 +61,7 @@ static NSString *const SDLBundleShortVersionStringKey = @"CFBundleShortVersionSt @implementation SDLRPCRequestFactory //***** AddCommand ***** -+ (SDLAddCommand *)buildAddCommandWithID:(NSNumber *)cmdID menuName:(NSString *)menuName parentID:(NSNumber *)parentID position:(NSNumber *)position vrCommands:(NSArray<NSString *> *)vrCommands iconValue:(NSString *)iconValue iconType:(SDLImageType)iconType correlationID:(NSNumber *)correlationID { ++ (SDLAddCommand *)buildAddCommandWithID:(NSNumber<SDLInt> *)cmdID menuName:(NSString *)menuName parentID:(NSNumber<SDLInt> *)parentID position:(NSNumber<SDLInt> *)position vrCommands:(NSArray<NSString *> *)vrCommands iconValue:(NSString *)iconValue iconType:(SDLImageType)iconType correlationID:(NSNumber<SDLInt> *)correlationID { SDLAddCommand *msg = [[SDLAddCommand alloc] init]; msg.cmdID = cmdID; @@ -87,7 +87,7 @@ static NSString *const SDLBundleShortVersionStringKey = @"CFBundleShortVersionSt return msg; } -+ (SDLAddCommand *)buildAddCommandWithID:(NSNumber *)cmdID menuName:(NSString *)menuName parentID:(NSNumber *)parentID position:(NSNumber *)position vrCommands:(NSArray<NSString *> *)vrCommands iconValue:(NSString *)iconValue iconType:(SDLImageType)iconType handler:(SDLRPCNotificationHandler)handler { ++ (SDLAddCommand *)buildAddCommandWithID:(NSNumber<SDLInt> *)cmdID menuName:(NSString *)menuName parentID:(NSNumber<SDLInt> *)parentID position:(NSNumber<SDLInt> *)position vrCommands:(NSArray<NSString *> *)vrCommands iconValue:(NSString *)iconValue iconType:(SDLImageType)iconType handler:(SDLRPCNotificationHandler)handler { SDLAddCommand *msg = [[SDLAddCommand alloc] initWithHandler:handler]; msg.cmdID = cmdID; @@ -111,26 +111,26 @@ static NSString *const SDLBundleShortVersionStringKey = @"CFBundleShortVersionSt return msg; } -+ (SDLAddCommand *)buildAddCommandWithID:(NSNumber *)cmdID menuName:(NSString *)menuName vrCommands:(NSArray<NSString *> *)vrCommands correlationID:(NSNumber *)correlationID { ++ (SDLAddCommand *)buildAddCommandWithID:(NSNumber<SDLInt> *)cmdID menuName:(NSString *)menuName vrCommands:(NSArray<NSString *> *)vrCommands correlationID:(NSNumber<SDLInt> *)correlationID { return [SDLRPCRequestFactory buildAddCommandWithID:cmdID menuName:menuName parentID:nil position:nil vrCommands:vrCommands iconValue:nil iconType:nil correlationID:correlationID]; } -+ (SDLAddCommand *)buildAddCommandWithID:(NSNumber *)cmdID menuName:(NSString *)menuName vrCommands:(NSArray<NSString *> *)vrCommands handler:(SDLRPCNotificationHandler)handler { ++ (SDLAddCommand *)buildAddCommandWithID:(NSNumber<SDLInt> *)cmdID menuName:(NSString *)menuName vrCommands:(NSArray<NSString *> *)vrCommands handler:(SDLRPCNotificationHandler)handler { return [SDLRPCRequestFactory buildAddCommandWithID:cmdID menuName:menuName parentID:nil position:nil vrCommands:vrCommands iconValue:nil iconType:nil handler:handler]; } -+ (SDLAddCommand *)buildAddCommandWithID:(NSNumber *)cmdID vrCommands:(NSArray<NSString *> *)vrCommands correlationID:(NSNumber *)correlationID { ++ (SDLAddCommand *)buildAddCommandWithID:(NSNumber<SDLInt> *)cmdID vrCommands:(NSArray<NSString *> *)vrCommands correlationID:(NSNumber<SDLInt> *)correlationID { return [SDLRPCRequestFactory buildAddCommandWithID:cmdID menuName:nil vrCommands:vrCommands correlationID:correlationID]; } -+ (SDLAddCommand *)buildAddCommandWithID:(NSNumber *)cmdID vrCommands:(NSArray<NSString *> *)vrCommands handler:(SDLRPCNotificationHandler)handler { ++ (SDLAddCommand *)buildAddCommandWithID:(NSNumber<SDLInt> *)cmdID vrCommands:(NSArray<NSString *> *)vrCommands handler:(SDLRPCNotificationHandler)handler { return [SDLRPCRequestFactory buildAddCommandWithID:cmdID menuName:nil vrCommands:vrCommands handler:handler]; } //***** //***** AddSubMenu ***** -+ (SDLAddSubMenu *)buildAddSubMenuWithID:(NSNumber *)menuID menuName:(NSString *)menuName position:(NSNumber *)position correlationID:(NSNumber *)correlationID { ++ (SDLAddSubMenu *)buildAddSubMenuWithID:(NSNumber<SDLInt> *)menuID menuName:(NSString *)menuName position:(NSNumber<SDLInt> *)position correlationID:(NSNumber<SDLInt> *)correlationID { SDLAddSubMenu *msg = [[SDLAddSubMenu alloc] init]; msg.correlationID = correlationID; msg.menuID = menuID; @@ -139,14 +139,14 @@ static NSString *const SDLBundleShortVersionStringKey = @"CFBundleShortVersionSt return msg; } -+ (SDLAddSubMenu *)buildAddSubMenuWithID:(NSNumber *)menuID menuName:(NSString *)menuName correlationID:(NSNumber *)correlationID { ++ (SDLAddSubMenu *)buildAddSubMenuWithID:(NSNumber<SDLInt> *)menuID menuName:(NSString *)menuName correlationID:(NSNumber<SDLInt> *)correlationID { return [SDLRPCRequestFactory buildAddSubMenuWithID:menuID menuName:menuName position:nil correlationID:correlationID]; } //***** //***** Alert ***** -+ (SDLAlert *)buildAlertWithTTS:(NSString *)ttsText alertText1:(NSString *)alertText1 alertText2:(NSString *)alertText2 alertText3:(NSString *)alertText3 playTone:(NSNumber *)playTone duration:(NSNumber *)duration correlationID:(NSNumber *)correlationID { ++ (SDLAlert *)buildAlertWithTTS:(NSString *)ttsText alertText1:(NSString *)alertText1 alertText2:(NSString *)alertText2 alertText3:(NSString *)alertText3 playTone:(NSNumber<SDLBool> *)playTone duration:(NSNumber<SDLInt> *)duration correlationID:(NSNumber<SDLInt> *)correlationID { SDLTTSChunk *simpleChunk = [[SDLTTSChunk alloc] init]; simpleChunk.text = ttsText; simpleChunk.type = SDLSpeechCapabilitiesText; @@ -155,16 +155,16 @@ static NSString *const SDLBundleShortVersionStringKey = @"CFBundleShortVersionSt return [SDLRPCRequestFactory buildAlertWithTTSChunks:ttsChunks alertText1:alertText1 alertText2:alertText2 alertText3:alertText3 playTone:playTone duration:duration softButtons:nil correlationID:correlationID]; } -+ (SDLAlert *)buildAlertWithTTS:(NSString *)ttsText alertText1:(NSString *)alertText1 alertText2:(NSString *)alertText2 playTone:(NSNumber *)playTone duration:(NSNumber *)duration correlationID:(NSNumber *)correlationID { ++ (SDLAlert *)buildAlertWithTTS:(NSString *)ttsText alertText1:(NSString *)alertText1 alertText2:(NSString *)alertText2 playTone:(NSNumber<SDLBool> *)playTone duration:(NSNumber<SDLInt> *)duration correlationID:(NSNumber<SDLInt> *)correlationID { return [SDLRPCRequestFactory buildAlertWithTTS:ttsText alertText1:alertText1 alertText2:alertText2 alertText3:nil playTone:playTone duration:duration correlationID:correlationID]; } -+ (SDLAlert *)buildAlertWithTTS:(NSString *)ttsText playTone:(NSNumber *)playTone correlationID:(NSNumber *)correlationID { ++ (SDLAlert *)buildAlertWithTTS:(NSString *)ttsText playTone:(NSNumber<SDLBool> *)playTone correlationID:(NSNumber<SDLInt> *)correlationID { return [SDLRPCRequestFactory buildAlertWithTTS:ttsText alertText1:nil alertText2:nil alertText3:nil playTone:playTone duration:nil correlationID:correlationID]; } //*** -+ (SDLAlert *)buildAlertWithTTSChunks:(NSArray<SDLTTSChunk *> *)ttsChunks alertText1:(NSString *)alertText1 alertText2:(NSString *)alertText2 alertText3:(NSString *)alertText3 playTone:(NSNumber *)playTone duration:(NSNumber *)duration softButtons:(NSArray<SDLSoftButton *> *)softButtons correlationID:(NSNumber *)correlationID { ++ (SDLAlert *)buildAlertWithTTSChunks:(NSArray<SDLTTSChunk *> *)ttsChunks alertText1:(NSString *)alertText1 alertText2:(NSString *)alertText2 alertText3:(NSString *)alertText3 playTone:(NSNumber<SDLBool> *)playTone duration:(NSNumber<SDLInt> *)duration softButtons:(NSArray<SDLSoftButton *> *)softButtons correlationID:(NSNumber<SDLInt> *)correlationID { SDLAlert *msg = [[SDLAlert alloc] init]; msg.correlationID = correlationID; msg.alertText1 = alertText1; @@ -177,26 +177,26 @@ static NSString *const SDLBundleShortVersionStringKey = @"CFBundleShortVersionSt return msg; } -+ (SDLAlert *)buildAlertWithTTSChunks:(NSArray<SDLTTSChunk *> *)ttsChunks playTone:(NSNumber *)playTone correlationID:(NSNumber *)correlationID { ++ (SDLAlert *)buildAlertWithTTSChunks:(NSArray<SDLTTSChunk *> *)ttsChunks playTone:(NSNumber<SDLBool> *)playTone correlationID:(NSNumber<SDLInt> *)correlationID { return [SDLRPCRequestFactory buildAlertWithTTSChunks:ttsChunks alertText1:nil alertText2:nil alertText3:nil playTone:playTone duration:nil softButtons:nil correlationID:correlationID]; } //*** -+ (SDLAlert *)buildAlertWithAlertText1:(NSString *)alertText1 alertText2:(NSString *)alertText2 alertText3:(NSString *)alertText3 duration:(NSNumber *)duration softButtons:(NSMutableArray<SDLSoftButton *> *)softButtons correlationID:(NSNumber *)correlationID { ++ (SDLAlert *)buildAlertWithAlertText1:(NSString *)alertText1 alertText2:(NSString *)alertText2 alertText3:(NSString *)alertText3 duration:(NSNumber<SDLInt> *)duration softButtons:(NSMutableArray<SDLSoftButton *> *)softButtons correlationID:(NSNumber<SDLInt> *)correlationID { return [SDLRPCRequestFactory buildAlertWithTTSChunks:nil alertText1:alertText1 alertText2:alertText2 alertText3:alertText3 playTone:nil duration:duration softButtons:softButtons correlationID:correlationID]; } -+ (SDLAlert *)buildAlertWithAlertText1:(NSString *)alertText1 alertText2:(NSString *)alertText2 alertText3:(NSString *)alertText3 duration:(NSNumber *)duration correlationID:(NSNumber *)correlationID { ++ (SDLAlert *)buildAlertWithAlertText1:(NSString *)alertText1 alertText2:(NSString *)alertText2 alertText3:(NSString *)alertText3 duration:(NSNumber<SDLInt> *)duration correlationID:(NSNumber<SDLInt> *)correlationID { return [SDLRPCRequestFactory buildAlertWithTTSChunks:nil alertText1:alertText1 alertText2:alertText2 alertText3:alertText3 playTone:nil duration:duration softButtons:nil correlationID:correlationID]; } -+ (SDLAlert *)buildAlertWithAlertText1:(NSString *)alertText1 alertText2:(NSString *)alertText2 duration:(NSNumber *)duration correlationID:(NSNumber *)correlationID { ++ (SDLAlert *)buildAlertWithAlertText1:(NSString *)alertText1 alertText2:(NSString *)alertText2 duration:(NSNumber<SDLInt> *)duration correlationID:(NSNumber<SDLInt> *)correlationID { return [SDLRPCRequestFactory buildAlertWithTTSChunks:nil alertText1:alertText1 alertText2:alertText2 alertText3:nil playTone:nil duration:duration softButtons:nil correlationID:correlationID]; } //***** -+ (SDLAlertManeuver *)buildAlertManeuverwithTTSchunks:(NSMutableArray<SDLTTSChunk *> *)ttsChunks softButtons:(NSMutableArray<SDLSoftButton *> *)softButtons correlationID:(NSNumber *)correlationID { ++ (SDLAlertManeuver *)buildAlertManeuverwithTTSchunks:(NSMutableArray<SDLTTSChunk *> *)ttsChunks softButtons:(NSMutableArray<SDLSoftButton *> *)softButtons correlationID:(NSNumber<SDLInt> *)correlationID { SDLAlertManeuver *msg = [[SDLAlertManeuver alloc] init]; msg.ttsChunks = ttsChunks; msg.softButtons = softButtons; @@ -204,7 +204,7 @@ static NSString *const SDLBundleShortVersionStringKey = @"CFBundleShortVersionSt return msg; } -+ (SDLChangeRegistration *)buildChangeRegistrationWithLanguage:(SDLLanguage)language hmiDisplayLanguage:(SDLLanguage)hmiDisplayLanguage correlationID:(NSNumber *)correlationID { ++ (SDLChangeRegistration *)buildChangeRegistrationWithLanguage:(SDLLanguage)language hmiDisplayLanguage:(SDLLanguage)hmiDisplayLanguage correlationID:(NSNumber<SDLInt> *)correlationID { SDLChangeRegistration *msg = [[SDLChangeRegistration alloc] init]; msg.language = language; msg.hmiDisplayLanguage = hmiDisplayLanguage; @@ -213,7 +213,7 @@ static NSString *const SDLBundleShortVersionStringKey = @"CFBundleShortVersionSt return msg; } -+ (SDLCreateInteractionChoiceSet *)buildCreateInteractionChoiceSetWithID:(NSNumber *)interactionChoiceSetID choiceSet:(NSArray<SDLChoice *> *)choices correlationID:(NSNumber *)correlationID { ++ (SDLCreateInteractionChoiceSet *)buildCreateInteractionChoiceSetWithID:(NSNumber<SDLInt> *)interactionChoiceSetID choiceSet:(NSArray<SDLChoice *> *)choices correlationID:(NSNumber<SDLInt> *)correlationID { SDLCreateInteractionChoiceSet *msg = [[SDLCreateInteractionChoiceSet alloc] init]; msg.interactionChoiceSetID = interactionChoiceSetID; msg.choiceSet = [choices mutableCopy]; @@ -222,7 +222,7 @@ static NSString *const SDLBundleShortVersionStringKey = @"CFBundleShortVersionSt return msg; } -+ (SDLDeleteCommand *)buildDeleteCommandWithID:(NSNumber *)cmdID correlationID:(NSNumber *)correlationID { ++ (SDLDeleteCommand *)buildDeleteCommandWithID:(NSNumber<SDLInt> *)cmdID correlationID:(NSNumber<SDLInt> *)correlationID { SDLDeleteCommand *msg = [[SDLDeleteCommand alloc] init]; msg.cmdID = cmdID; msg.correlationID = correlationID; @@ -230,7 +230,7 @@ static NSString *const SDLBundleShortVersionStringKey = @"CFBundleShortVersionSt return msg; } -+ (SDLDeleteFile *)buildDeleteFileWithName:(NSString *)syncFileName correlationID:(NSNumber *)correlationID { ++ (SDLDeleteFile *)buildDeleteFileWithName:(NSString *)syncFileName correlationID:(NSNumber<SDLInt> *)correlationID { SDLDeleteFile *msg = [[SDLDeleteFile alloc] init]; msg.syncFileName = syncFileName; msg.correlationID = correlationID; @@ -245,14 +245,14 @@ static NSString *const SDLBundleShortVersionStringKey = @"CFBundleShortVersionSt return msg; } -+ (SDLListFiles *)buildListFilesWithCorrelationID:(NSNumber *)correlationID { ++ (SDLListFiles *)buildListFilesWithCorrelationID:(NSNumber<SDLInt> *)correlationID { SDLListFiles *msg = [[SDLListFiles alloc] init]; msg.correlationID = correlationID; return msg; } -+ (SDLDeleteInteractionChoiceSet *)buildDeleteInteractionChoiceSetWithID:(NSNumber *)interactionChoiceSetID correlationID:(NSNumber *)correlationID { ++ (SDLDeleteInteractionChoiceSet *)buildDeleteInteractionChoiceSetWithID:(NSNumber<SDLInt> *)interactionChoiceSetID correlationID:(NSNumber<SDLInt> *)correlationID { SDLDeleteInteractionChoiceSet *msg = [[SDLDeleteInteractionChoiceSet alloc] init]; msg.interactionChoiceSetID = interactionChoiceSetID; msg.correlationID = correlationID; @@ -260,7 +260,7 @@ static NSString *const SDLBundleShortVersionStringKey = @"CFBundleShortVersionSt return msg; } -+ (SDLDeleteSubMenu *)buildDeleteSubMenuWithID:(NSNumber *)menuID correlationID:(NSNumber *)correlationID { ++ (SDLDeleteSubMenu *)buildDeleteSubMenuWithID:(NSNumber<SDLInt> *)menuID correlationID:(NSNumber<SDLInt> *)correlationID { SDLDeleteSubMenu *msg = [[SDLDeleteSubMenu alloc] init]; msg.menuID = menuID; msg.correlationID = correlationID; @@ -268,14 +268,14 @@ static NSString *const SDLBundleShortVersionStringKey = @"CFBundleShortVersionSt return msg; } -+ (SDLEndAudioPassThru *)buildEndAudioPassThruWithCorrelationID:(NSNumber *)correlationID { ++ (SDLEndAudioPassThru *)buildEndAudioPassThruWithCorrelationID:(NSNumber<SDLInt> *)correlationID { SDLEndAudioPassThru *msg = [[SDLEndAudioPassThru alloc] init]; msg.correlationID = correlationID; return msg; } -+ (SDLGetDTCs *)buildGetDTCsWithECUName:(NSNumber *)ecuName correlationID:(NSNumber *)correlationID { ++ (SDLGetDTCs *)buildGetDTCsWithECUName:(NSNumber<SDLInt> *)ecuName correlationID:(NSNumber<SDLInt> *)correlationID { SDLGetDTCs *msg = [[SDLGetDTCs alloc] init]; msg.ecuName = ecuName; msg.correlationID = correlationID; @@ -283,7 +283,7 @@ static NSString *const SDLBundleShortVersionStringKey = @"CFBundleShortVersionSt return msg; } -+ (SDLGetVehicleData *)buildGetVehicleDataWithGPS:(NSNumber *)gps speed:(NSNumber *)speed rpm:(NSNumber *)rpm fuelLevel:(NSNumber *)fuelLevel fuelLevelState:(NSNumber *)fuelLevelState instantFuelConsumption:(NSNumber *)instantFuelConsumption externalTemperature:(NSNumber *)externalTemperature vin:(NSNumber *)vin prndl:(NSNumber *)prndl tirePressure:(NSNumber *)tirePressure odometer:(NSNumber *)odometer beltStatus:(NSNumber *)beltStatus bodyInformation:(NSNumber *)bodyInformation deviceStatus:(NSNumber *)deviceStatus driverBraking:(NSNumber *)driverBraking wiperStatus:(NSNumber *)wiperStatus headLampStatus:(NSNumber *)headLampStatus engineTorque:(NSNumber *)engineTorque accPedalPosition:(NSNumber *)accPedalPosition steeringWheelAngle:(NSNumber *)steeringWheelAngle correlationID:(NSNumber *)correlationID { ++ (SDLGetVehicleData *)buildGetVehicleDataWithGPS:(NSNumber<SDLBool> *)gps speed:(NSNumber<SDLBool> *)speed rpm:(NSNumber<SDLBool> *)rpm fuelLevel:(NSNumber<SDLBool> *)fuelLevel fuelLevelState:(NSNumber<SDLBool> *)fuelLevelState instantFuelConsumption:(NSNumber<SDLBool> *)instantFuelConsumption externalTemperature:(NSNumber<SDLBool> *)externalTemperature vin:(NSNumber<SDLBool> *)vin prndl:(NSNumber<SDLBool> *)prndl tirePressure:(NSNumber<SDLBool> *)tirePressure odometer:(NSNumber<SDLBool> *)odometer beltStatus:(NSNumber<SDLBool> *)beltStatus bodyInformation:(NSNumber<SDLBool> *)bodyInformation deviceStatus:(NSNumber<SDLBool> *)deviceStatus driverBraking:(NSNumber<SDLBool> *)driverBraking wiperStatus:(NSNumber<SDLBool> *)wiperStatus headLampStatus:(NSNumber<SDLBool> *)headLampStatus engineTorque:(NSNumber<SDLBool> *)engineTorque accPedalPosition:(NSNumber<SDLBool> *)accPedalPosition steeringWheelAngle:(NSNumber<SDLBool> *)steeringWheelAngle correlationID:(NSNumber<SDLInt> *)correlationID { SDLGetVehicleData *msg = [[SDLGetVehicleData alloc] init]; msg.gps = gps; msg.speed = speed; @@ -310,7 +310,7 @@ static NSString *const SDLBundleShortVersionStringKey = @"CFBundleShortVersionSt return msg; } -+ (SDLPerformAudioPassThru *)buildPerformAudioPassThruWithInitialPrompt:(NSString *)initialPrompt audioPassThruDisplayText1:(NSString *)audioPassThruDisplayText1 audioPassThruDisplayText2:(NSString *)audioPassThruDisplayText2 samplingRate:(SDLSamplingRate)samplingRate maxDuration:(NSNumber *)maxDuration bitsPerSample:(SDLBitsPerSample)bitsPerSample audioType:(SDLAudioType)audioType muteAudio:(NSNumber *)muteAudio correlationID:(NSNumber *)correlationID { ++ (SDLPerformAudioPassThru *)buildPerformAudioPassThruWithInitialPrompt:(NSString *)initialPrompt audioPassThruDisplayText1:(NSString *)audioPassThruDisplayText1 audioPassThruDisplayText2:(NSString *)audioPassThruDisplayText2 samplingRate:(SDLSamplingRate)samplingRate maxDuration:(NSNumber<SDLInt> *)maxDuration bitsPerSample:(SDLBitsPerSample)bitsPerSample audioType:(SDLAudioType)audioType muteAudio:(NSNumber<SDLBool> *)muteAudio correlationID:(NSNumber<SDLInt> *)correlationID { NSArray<SDLTTSChunk *> *initialChunks = [SDLTTSChunkFactory buildTTSChunksFromSimple:initialPrompt]; SDLPerformAudioPassThru *msg = [[SDLPerformAudioPassThru alloc] init]; @@ -329,7 +329,7 @@ static NSString *const SDLBundleShortVersionStringKey = @"CFBundleShortVersionSt //***** PerformInteraction ***** -+ (SDLPerformInteraction *)buildPerformInteractionWithInitialChunks:(NSArray<SDLTTSChunk *> *)initialChunks initialText:(NSString *)initialText interactionChoiceSetIDList:(NSArray<NSNumber *> *)interactionChoiceSetIDList helpChunks:(NSArray<SDLTTSChunk *> *)helpChunks timeoutChunks:(NSArray<SDLTTSChunk *> *)timeoutChunks interactionMode:(SDLInteractionMode)interactionMode timeout:(NSNumber *)timeout vrHelp:(NSArray<SDLVRHelpItem *> *)vrHelp correlationID:(NSNumber *)correlationID { ++ (SDLPerformInteraction *)buildPerformInteractionWithInitialChunks:(NSArray<SDLTTSChunk *> *)initialChunks initialText:(NSString *)initialText interactionChoiceSetIDList:(NSArray<NSNumber *> *)interactionChoiceSetIDList helpChunks:(NSArray<SDLTTSChunk *> *)helpChunks timeoutChunks:(NSArray<SDLTTSChunk *> *)timeoutChunks interactionMode:(SDLInteractionMode)interactionMode timeout:(NSNumber<SDLInt> *)timeout vrHelp:(NSArray<SDLVRHelpItem *> *)vrHelp correlationID:(NSNumber<SDLInt> *)correlationID { SDLPerformInteraction *msg = [[SDLPerformInteraction alloc] init]; msg.initialPrompt = [initialChunks mutableCopy]; msg.initialText = initialText; @@ -345,7 +345,7 @@ static NSString *const SDLBundleShortVersionStringKey = @"CFBundleShortVersionSt } //*** -+ (SDLPerformInteraction *)buildPerformInteractionWithInitialPrompt:(NSString *)initialPrompt initialText:(NSString *)initialText interactionChoiceSetIDList:(NSArray<NSNumber *> *)interactionChoiceSetIDList helpPrompt:(NSString *)helpPrompt timeoutPrompt:(NSString *)timeoutPrompt interactionMode:(SDLInteractionMode)interactionMode timeout:(NSNumber *)timeout vrHelp:(NSArray<SDLVRHelpItem *> *)vrHelp correlationID:(NSNumber *)correlationID { ++ (SDLPerformInteraction *)buildPerformInteractionWithInitialPrompt:(NSString *)initialPrompt initialText:(NSString *)initialText interactionChoiceSetIDList:(NSArray<NSNumber *> *)interactionChoiceSetIDList helpPrompt:(NSString *)helpPrompt timeoutPrompt:(NSString *)timeoutPrompt interactionMode:(SDLInteractionMode)interactionMode timeout:(NSNumber<SDLInt> *)timeout vrHelp:(NSArray<SDLVRHelpItem *> *)vrHelp correlationID:(NSNumber<SDLInt> *)correlationID { NSArray<SDLTTSChunk *> *initialChunks = [SDLTTSChunkFactory buildTTSChunksFromSimple:initialPrompt]; NSArray<SDLTTSChunk *> *helpChunks = [SDLTTSChunkFactory buildTTSChunksFromSimple:helpPrompt]; NSArray<SDLTTSChunk *> *timeoutChunks = [SDLTTSChunkFactory buildTTSChunksFromSimple:timeoutPrompt]; @@ -353,23 +353,23 @@ static NSString *const SDLBundleShortVersionStringKey = @"CFBundleShortVersionSt return [SDLRPCRequestFactory buildPerformInteractionWithInitialChunks:initialChunks initialText:initialText interactionChoiceSetIDList:interactionChoiceSetIDList helpChunks:helpChunks timeoutChunks:timeoutChunks interactionMode:interactionMode timeout:timeout vrHelp:vrHelp correlationID:correlationID]; } -+ (SDLPerformInteraction *)buildPerformInteractionWithInitialPrompt:(NSString *)initialPrompt initialText:(NSString *)initialText interactionChoiceSetID:(NSNumber *)interactionChoiceSetID vrHelp:(NSArray<SDLVRHelpItem *> *)vrHelp correlationID:(NSNumber *)correlationID { ++ (SDLPerformInteraction *)buildPerformInteractionWithInitialPrompt:(NSString *)initialPrompt initialText:(NSString *)initialText interactionChoiceSetID:(NSNumber<SDLInt> *)interactionChoiceSetID vrHelp:(NSArray<SDLVRHelpItem *> *)vrHelp correlationID:(NSNumber<SDLInt> *)correlationID { NSArray<NSNumber *> *interactionChoiceSetIDList = [NSArray arrayWithObject:interactionChoiceSetID]; NSArray<SDLTTSChunk *> *initialChunks = [SDLTTSChunkFactory buildTTSChunksFromSimple:initialPrompt]; return [SDLRPCRequestFactory buildPerformInteractionWithInitialChunks:initialChunks initialText:initialText interactionChoiceSetIDList:interactionChoiceSetIDList helpChunks:nil timeoutChunks:nil interactionMode:SDLInteractionModeBoth timeout:nil vrHelp:vrHelp correlationID:correlationID]; } -+ (SDLPerformInteraction *)buildPerformInteractionWithInitialPrompt:(NSString *)initialPrompt initialText:(NSString *)initialText interactionChoiceSetIDList:(NSArray<NSNumber *> *)interactionChoiceSetIDList helpPrompt:(NSString *)helpPrompt timeoutPrompt:(NSString *)timeoutPrompt interactionMode:(SDLInteractionMode)interactionMode timeout:(NSNumber *)timeout correlationID:(NSNumber *)correlationID { - return [SDLRPCRequestFactory buildPerformInteractionWithInitialPrompt:initialPrompt initialText:initialText interactionChoiceSetIDList:interactionChoiceSetIDList helpPrompt:helpPrompt timeoutPrompt:timeoutPrompt interactionMode:interactionMode timeout:timeout vrHelp:nil correlationID:(NSNumber *)correlationID]; ++ (SDLPerformInteraction *)buildPerformInteractionWithInitialPrompt:(NSString *)initialPrompt initialText:(NSString *)initialText interactionChoiceSetIDList:(NSArray<NSNumber *> *)interactionChoiceSetIDList helpPrompt:(NSString *)helpPrompt timeoutPrompt:(NSString *)timeoutPrompt interactionMode:(SDLInteractionMode)interactionMode timeout:(NSNumber<SDLInt> *)timeout correlationID:(NSNumber<SDLInt> *)correlationID { + return [SDLRPCRequestFactory buildPerformInteractionWithInitialPrompt:initialPrompt initialText:initialText interactionChoiceSetIDList:interactionChoiceSetIDList helpPrompt:helpPrompt timeoutPrompt:timeoutPrompt interactionMode:interactionMode timeout:timeout vrHelp:nil correlationID:(NSNumber<SDLInt> *)correlationID]; } -+ (SDLPerformInteraction *)buildPerformInteractionWithInitialPrompt:(NSString *)initialPrompt initialText:(NSString *)initialText interactionChoiceSetID:(NSNumber *)interactionChoiceSetID correlationID:(NSNumber *)correlationID { ++ (SDLPerformInteraction *)buildPerformInteractionWithInitialPrompt:(NSString *)initialPrompt initialText:(NSString *)initialText interactionChoiceSetID:(NSNumber<SDLInt> *)interactionChoiceSetID correlationID:(NSNumber<SDLInt> *)correlationID { return [SDLRPCRequestFactory buildPerformInteractionWithInitialPrompt:initialPrompt initialText:initialText interactionChoiceSetID:interactionChoiceSetID vrHelp:nil correlationID:correlationID]; } //***** -+ (SDLPutFile *)buildPutFileWithFileName:(NSString *)fileName fileType:(SDLFileType)fileType persistentFile:(NSNumber *)persistentFile correlationId:(NSNumber *)correlationID { ++ (SDLPutFile *)buildPutFileWithFileName:(NSString *)fileName fileType:(SDLFileType)fileType persistentFile:(NSNumber<SDLBool> *)persistentFile correlationID:(NSNumber<SDLInt> *)correlationID { SDLPutFile *msg = [[SDLPutFile alloc] init]; msg.syncFileName = fileName; @@ -380,11 +380,11 @@ static NSString *const SDLBundleShortVersionStringKey = @"CFBundleShortVersionSt return msg; } -+ (SDLPutFile *)buildPutFileWithFileName:(NSString *)syncFileName fileType:(SDLFileType)fileType persisistentFile:(NSNumber *)persistentFile correlationID:(NSNumber *)correlationID { ++ (SDLPutFile *)buildPutFileWithFileName:(NSString *)syncFileName fileType:(SDLFileType)fileType persisistentFile:(NSNumber<SDLBool> *)persistentFile correlationID:(NSNumber<SDLInt> *)correlationID { return [self buildPutFileWithFileName:syncFileName fileType:fileType persistentFile:persistentFile correlationId:correlationID]; } -+ (SDLReadDID *)buildReadDIDWithECUName:(NSNumber *)ecuName didLocation:(NSArray<NSNumber *> *)didLocation correlationID:(NSNumber *)correlationID { ++ (SDLReadDID *)buildReadDIDWithECUName:(NSNumber<SDLInt> *)ecuName didLocation:(NSArray<NSNumber *> *)didLocation correlationID:(NSNumber<SDLInt> *)correlationID { SDLReadDID *msg = [[SDLReadDID alloc] init]; msg.ecuName = ecuName; msg.didLocation = [didLocation mutableCopy]; @@ -394,7 +394,7 @@ static NSString *const SDLBundleShortVersionStringKey = @"CFBundleShortVersionSt } //***** RegisterAppInterface ***** -+ (SDLRegisterAppInterface *)buildRegisterAppInterfaceWithAppName:(NSString *)appName ttsName:(NSArray<SDLTTSChunk *> *)ttsName vrSynonyms:(NSArray<NSString *> *)vrSynonyms isMediaApp:(NSNumber *)isMediaApp languageDesired:(SDLLanguage)languageDesired hmiDisplayLanguageDesired:(SDLLanguage)hmiDisplayLanguageDesired appID:(NSString *)appID { ++ (SDLRegisterAppInterface *)buildRegisterAppInterfaceWithAppName:(NSString *)appName ttsName:(NSArray<SDLTTSChunk *> *)ttsName vrSynonyms:(NSArray<NSString *> *)vrSynonyms isMediaApp:(NSNumber<SDLFloat> *)isMediaApp languageDesired:(SDLLanguage)languageDesired hmiDisplayLanguageDesired:(SDLLanguage)hmiDisplayLanguageDesired appID:(NSString *)appID { SDLRegisterAppInterface *msg = [[SDLRegisterAppInterface alloc] init]; SDLSyncMsgVersion *version = [[SDLSyncMsgVersion alloc] init]; version.majorVersion = [NSNumber numberWithInt:1]; @@ -438,7 +438,7 @@ static NSString *const SDLBundleShortVersionStringKey = @"CFBundleShortVersionSt return appInfo; } -+ (SDLRegisterAppInterface *)buildRegisterAppInterfaceWithAppName:(NSString *)appName isMediaApp:(NSNumber *)isMediaApp languageDesired:(SDLLanguage)languageDesired appID:(NSString *)appID { ++ (SDLRegisterAppInterface *)buildRegisterAppInterfaceWithAppName:(NSString *)appName isMediaApp:(NSNumber<SDLFloat> *)isMediaApp languageDesired:(SDLLanguage)languageDesired appID:(NSString *)appID { NSMutableArray<NSString *> *syns = [NSMutableArray arrayWithObject:appName]; return [SDLRPCRequestFactory buildRegisterAppInterfaceWithAppName:appName ttsName:nil vrSynonyms:syns isMediaApp:isMediaApp languageDesired:languageDesired hmiDisplayLanguageDesired:languageDesired appID:appID]; } @@ -449,7 +449,7 @@ static NSString *const SDLBundleShortVersionStringKey = @"CFBundleShortVersionSt //***** -+ (SDLResetGlobalProperties *)buildResetGlobalPropertiesWithProperties:(NSArray<SDLGlobalProperty> *)properties correlationID:(NSNumber *)correlationID { ++ (SDLResetGlobalProperties *)buildResetGlobalPropertiesWithProperties:(NSArray<SDLGlobalProperty> *)properties correlationID:(NSNumber<SDLInt> *)correlationID { SDLResetGlobalProperties *msg = [[SDLResetGlobalProperties alloc] init]; msg.properties = [properties mutableCopy]; msg.correlationID = correlationID; @@ -457,7 +457,7 @@ static NSString *const SDLBundleShortVersionStringKey = @"CFBundleShortVersionSt return msg; } -+ (SDLScrollableMessage *)buildScrollableMessage:(NSString *)scrollableMessageBody timeout:(NSNumber *)timeout softButtons:(NSArray<SDLSoftButton *> *)softButtons correlationID:(NSNumber *)correlationID { ++ (SDLScrollableMessage *)buildScrollableMessage:(NSString *)scrollableMessageBody timeout:(NSNumber<SDLInt> *)timeout softButtons:(NSArray<SDLSoftButton *> *)softButtons correlationID:(NSNumber<SDLInt> *)correlationID { SDLScrollableMessage *msg = [[SDLScrollableMessage alloc] init]; msg.scrollableMessageBody = scrollableMessageBody; msg.timeout = timeout; @@ -467,7 +467,7 @@ static NSString *const SDLBundleShortVersionStringKey = @"CFBundleShortVersionSt return msg; } -+ (SDLSendLocation *)buildSendLocationWithLongitude:(NSNumber *)longitude latitude:(NSNumber *)latitude locationName:(NSString *)locationName locationDescription:(NSString *)locationDescription address:(NSArray<NSString *> *)address phoneNumber:(NSString *)phoneNumber image:(SDLImage *)image { ++ (SDLSendLocation *)buildSendLocationWithLongitude:(NSNumber<SDLFloat> *)longitude latitude:(NSNumber<SDLFloat> *)latitude locationName:(NSString *)locationName locationDescription:(NSString *)locationDescription address:(NSArray<NSString *> *)address phoneNumber:(NSString *)phoneNumber image:(SDLImage *)image { SDLSendLocation *msg = [[SDLSendLocation alloc] init]; msg.longitudeDegrees = longitude; msg.latitudeDegrees = latitude; @@ -480,7 +480,7 @@ static NSString *const SDLBundleShortVersionStringKey = @"CFBundleShortVersionSt return msg; } -+ (SDLSetAppIcon *)buildSetAppIconWithFileName:(NSString *)syncFileName correlationID:(NSNumber *)correlationID { ++ (SDLSetAppIcon *)buildSetAppIconWithFileName:(NSString *)syncFileName correlationID:(NSNumber<SDLInt> *)correlationID { SDLSetAppIcon *msg = [[SDLSetAppIcon alloc] init]; msg.syncFileName = syncFileName; msg.correlationID = correlationID; @@ -488,7 +488,7 @@ static NSString *const SDLBundleShortVersionStringKey = @"CFBundleShortVersionSt return msg; } -+ (SDLSetDisplayLayout *)buildSetDisplayLayout:(NSString *)displayLayout correlationID:(NSNumber *)correlationID { ++ (SDLSetDisplayLayout *)buildSetDisplayLayout:(NSString *)displayLayout correlationID:(NSNumber<SDLInt> *)correlationID { SDLSetDisplayLayout *msg = [[SDLSetDisplayLayout alloc] init]; msg.displayLayout = displayLayout; msg.correlationID = correlationID; @@ -498,7 +498,7 @@ static NSString *const SDLBundleShortVersionStringKey = @"CFBundleShortVersionSt //***** SetGlobalProperties ***** -+ (SDLSetGlobalProperties *)buildSetGlobalPropertiesWithHelpText:(NSString *)helpText timeoutText:(NSString *)timeoutText vrHelpTitle:(NSString *)vrHelpTitle vrHelp:(NSArray<SDLVRHelpItem *> *)vrHelp correlationID:(NSNumber *)correlationID { ++ (SDLSetGlobalProperties *)buildSetGlobalPropertiesWithHelpText:(NSString *)helpText timeoutText:(NSString *)timeoutText vrHelpTitle:(NSString *)vrHelpTitle vrHelp:(NSArray<SDLVRHelpItem *> *)vrHelp correlationID:(NSNumber<SDLInt> *)correlationID { SDLSetGlobalProperties *msg = [[SDLSetGlobalProperties alloc] init]; msg.helpPrompt = [SDLTTSChunkFactory buildTTSChunksFromSimple:helpText]; msg.timeoutPrompt = [SDLTTSChunkFactory buildTTSChunksFromSimple:timeoutText]; @@ -509,7 +509,7 @@ static NSString *const SDLBundleShortVersionStringKey = @"CFBundleShortVersionSt return msg; } -+ (SDLSetGlobalProperties *)buildSetGlobalPropertiesWithHelpText:(NSString *)helpText timeoutText:(NSString *)timeoutText correlationID:(NSNumber *)correlationID { ++ (SDLSetGlobalProperties *)buildSetGlobalPropertiesWithHelpText:(NSString *)helpText timeoutText:(NSString *)timeoutText correlationID:(NSNumber<SDLInt> *)correlationID { SDLSetGlobalProperties *msg = [[SDLSetGlobalProperties alloc] init]; msg.helpPrompt = [SDLTTSChunkFactory buildTTSChunksFromSimple:helpText]; msg.timeoutPrompt = [SDLTTSChunkFactory buildTTSChunksFromSimple:timeoutText]; @@ -521,7 +521,7 @@ static NSString *const SDLBundleShortVersionStringKey = @"CFBundleShortVersionSt //***** SetMediaClockTimer ***** -+ (SDLSetMediaClockTimer *)buildSetMediaClockTimerWithHours:(NSNumber *)hours minutes:(NSNumber *)minutes seconds:(NSNumber *)seconds updateMode:(SDLUpdateMode)updateMode correlationID:(NSNumber *)correlationID { ++ (SDLSetMediaClockTimer *)buildSetMediaClockTimerWithHours:(NSNumber<SDLInt> *)hours minutes:(NSNumber<SDLInt> *)minutes seconds:(NSNumber<SDLInt> *)seconds updateMode:(SDLUpdateMode)updateMode correlationID:(NSNumber<SDLInt> *)correlationID { SDLSetMediaClockTimer *msg = [[SDLSetMediaClockTimer alloc] init]; SDLStartTime *startTime = [[SDLStartTime alloc] init]; startTime.hours = hours; @@ -534,7 +534,7 @@ static NSString *const SDLBundleShortVersionStringKey = @"CFBundleShortVersionSt return msg; } -+ (SDLSetMediaClockTimer *)buildSetMediaClockTimerWithUpdateMode:(SDLUpdateMode)updateMode correlationID:(NSNumber *)correlationID { ++ (SDLSetMediaClockTimer *)buildSetMediaClockTimerWithUpdateMode:(SDLUpdateMode)updateMode correlationID:(NSNumber<SDLInt> *)correlationID { SDLSetMediaClockTimer *msg = [[SDLSetMediaClockTimer alloc] init]; msg.updateMode = updateMode; msg.correlationID = correlationID; @@ -545,7 +545,7 @@ static NSString *const SDLBundleShortVersionStringKey = @"CFBundleShortVersionSt //***** Show ***** -+ (SDLShow *)buildShowWithMainField1:(NSString *)mainField1 mainField2:(NSString *)mainField2 mainField3:(NSString *)mainField3 mainField4:(NSString *)mainField4 statusBar:(NSString *)statusBar mediaClock:(NSString *)mediaClock mediaTrack:(NSString *)mediaTrack alignment:(SDLTextAlignment)textAlignment graphic:(SDLImage *)graphic softButtons:(NSArray<SDLSoftButton *> *)softButtons customPresets:(NSArray<NSString *> *)customPresets correlationID:(NSNumber *)correlationID { ++ (SDLShow *)buildShowWithMainField1:(NSString *)mainField1 mainField2:(NSString *)mainField2 mainField3:(NSString *)mainField3 mainField4:(NSString *)mainField4 statusBar:(NSString *)statusBar mediaClock:(NSString *)mediaClock mediaTrack:(NSString *)mediaTrack alignment:(SDLTextAlignment)textAlignment graphic:(SDLImage *)graphic softButtons:(NSArray<SDLSoftButton *> *)softButtons customPresets:(NSArray<NSString *> *)customPresets correlationID:(NSNumber<SDLInt> *)correlationID { SDLShow *msg = [[SDLShow alloc] init]; msg.correlationID = correlationID; msg.mainField1 = mainField1; @@ -563,7 +563,7 @@ static NSString *const SDLBundleShortVersionStringKey = @"CFBundleShortVersionSt return msg; } -+ (SDLShow *)buildShowWithMainField1:(NSString *)mainField1 mainField2:(NSString *)mainField2 statusBar:(NSString *)statusBar mediaClock:(NSString *)mediaClock mediaTrack:(NSString *)mediaTrack alignment:(SDLTextAlignment)textAlignment correlationID:(NSNumber *)correlationID { ++ (SDLShow *)buildShowWithMainField1:(NSString *)mainField1 mainField2:(NSString *)mainField2 statusBar:(NSString *)statusBar mediaClock:(NSString *)mediaClock mediaTrack:(NSString *)mediaTrack alignment:(SDLTextAlignment)textAlignment correlationID:(NSNumber<SDLInt> *)correlationID { SDLShow *msg = [[SDLShow alloc] init]; msg.correlationID = correlationID; msg.mainField1 = mainField1; @@ -576,11 +576,11 @@ static NSString *const SDLBundleShortVersionStringKey = @"CFBundleShortVersionSt return msg; } -+ (SDLShow *)buildShowWithMainField1:(NSString *)mainField1 mainField2:(NSString *)mainField2 alignment:(SDLTextAlignment)alignment correlationID:(NSNumber *)correlationID { ++ (SDLShow *)buildShowWithMainField1:(NSString *)mainField1 mainField2:(NSString *)mainField2 alignment:(SDLTextAlignment)alignment correlationID:(NSNumber<SDLInt> *)correlationID { return [SDLRPCRequestFactory buildShowWithMainField1:mainField1 mainField2:mainField2 statusBar:nil mediaClock:nil mediaTrack:nil alignment:alignment correlationID:correlationID]; } -+ (SDLShowConstantTBT *)buildShowConstantTBTWithString:(NSString *)navigationText1 navigationText2:(NSString *)navigationText2 eta:(NSString *)eta timeToDestination:(NSString *)timeToDestination totalDistance:(NSString *)totalDistance turnIcon:(SDLImage *)turnIcon nextTurnIcon:(SDLImage *)nextTurnIcon distanceToManeuver:(NSNumber *)distanceToManeuver distanceToManeuverScale:(NSNumber *)distanceToManeuverScale maneuverComplete:(NSNumber *)maneuverComplete softButtons:(NSMutableArray<SDLSoftButton *> *)softButtons correlationID:(NSNumber *)correlationID { ++ (SDLShowConstantTBT *)buildShowConstantTBTWithString:(NSString *)navigationText1 navigationText2:(NSString *)navigationText2 eta:(NSString *)eta timeToDestination:(NSString *)timeToDestination totalDistance:(NSString *)totalDistance turnIcon:(SDLImage *)turnIcon nextTurnIcon:(SDLImage *)nextTurnIcon distanceToManeuver:(NSNumber<SDLFloat> *)distanceToManeuver distanceToManeuverScale:(NSNumber<SDLFloat> *)distanceToManeuverScale maneuverComplete:(NSNumber<SDLBool> *)maneuverComplete softButtons:(NSMutableArray<SDLSoftButton *> *)softButtons correlationID:(NSNumber<SDLInt> *)correlationID { SDLShowConstantTBT *msg = [[SDLShowConstantTBT alloc] init]; msg.navigationText1 = navigationText1; msg.navigationText2 = navigationText2; @@ -601,7 +601,7 @@ static NSString *const SDLBundleShortVersionStringKey = @"CFBundleShortVersionSt //***** Slider ***** -+ (SDLSlider *)buildSliderDynamicFooterWithNumTicks:(NSNumber *)numTicks position:(NSNumber *)position sliderHeader:(NSString *)sliderHeader sliderFooter:(NSArray<NSString *> *)sliderFooter timeout:(NSNumber *)timeout correlationID:(NSNumber *)correlationID { ++ (SDLSlider *)buildSliderDynamicFooterWithNumTicks:(NSNumber<SDLInt> *)numTicks position:(NSNumber<SDLInt> *)position sliderHeader:(NSString *)sliderHeader sliderFooter:(NSArray<NSString *> *)sliderFooter timeout:(NSNumber<SDLInt> *)timeout correlationID:(NSNumber<SDLInt> *)correlationID { SDLSlider *msg = [[SDLSlider alloc] init]; msg.correlationID = correlationID; msg.numTicks = numTicks; @@ -613,7 +613,7 @@ static NSString *const SDLBundleShortVersionStringKey = @"CFBundleShortVersionSt return msg; } -+ (SDLSlider *)buildSliderStaticFooterWithNumTicks:(NSNumber *)numTicks position:(NSNumber *)position sliderHeader:(NSString *)sliderHeader sliderFooter:(NSString *)sliderFooter timeout:(NSNumber *)timeout correlationID:(NSNumber *)correlationID { ++ (SDLSlider *)buildSliderStaticFooterWithNumTicks:(NSNumber<SDLInt> *)numTicks position:(NSNumber<SDLInt> *)position sliderHeader:(NSString *)sliderHeader sliderFooter:(NSString *)sliderFooter timeout:(NSNumber<SDLInt> *)timeout correlationID:(NSNumber<SDLInt> *)correlationID { NSArray<NSString *> *sliderFooters = [NSArray arrayWithObject:sliderFooter]; // Populates array with the same footer value for each position @@ -639,7 +639,7 @@ static NSString *const SDLBundleShortVersionStringKey = @"CFBundleShortVersionSt //***** Speak ***** -+ (SDLSpeak *)buildSpeakWithTTSChunks:(NSArray<SDLTTSChunk *> *)ttsChunks correlationID:(NSNumber *)correlationID { ++ (SDLSpeak *)buildSpeakWithTTSChunks:(NSArray<SDLTTSChunk *> *)ttsChunks correlationID:(NSNumber<SDLInt> *)correlationID { SDLSpeak *msg = [[SDLSpeak alloc] init]; msg.correlationID = correlationID; msg.ttsChunks = [ttsChunks mutableCopy]; @@ -648,7 +648,7 @@ static NSString *const SDLBundleShortVersionStringKey = @"CFBundleShortVersionSt } //*** -+ (SDLSpeak *)buildSpeakWithTTS:(NSString *)ttsText correlationID:(NSNumber *)correlationID { ++ (SDLSpeak *)buildSpeakWithTTS:(NSString *)ttsText correlationID:(NSNumber<SDLInt> *)correlationID { SDLTTSChunk *simpleChunk = [[SDLTTSChunk alloc] init]; simpleChunk.text = ttsText; simpleChunk.type = SDLSpeechCapabilitiesText; @@ -658,7 +658,7 @@ static NSString *const SDLBundleShortVersionStringKey = @"CFBundleShortVersionSt } //***** -+ (SDLSubscribeButton *)buildSubscribeButtonWithName:(SDLButtonName)buttonName correlationID:(NSNumber *)correlationID { ++ (SDLSubscribeButton *)buildSubscribeButtonWithName:(SDLButtonName)buttonName correlationID:(NSNumber<SDLInt> *)correlationID { SDLSubscribeButton *msg = [[SDLSubscribeButton alloc] init]; msg.buttonName = buttonName; msg.correlationID = correlationID; @@ -673,7 +673,7 @@ static NSString *const SDLBundleShortVersionStringKey = @"CFBundleShortVersionSt return msg; } -+ (SDLSubscribeVehicleData *)buildSubscribeVehicleDataWithGPS:(NSNumber *)gps speed:(NSNumber *)speed rpm:(NSNumber *)rpm fuelLevel:(NSNumber *)fuelLevel fuelLevelState:(NSNumber *)fuelLevelState instantFuelConsumption:(NSNumber *)instantFuelConsumption externalTemperature:(NSNumber *)externalTemperature prndl:(NSNumber *)prndl tirePressure:(NSNumber *)tirePressure odometer:(NSNumber *)odometer beltStatus:(NSNumber *)beltStatus bodyInformation:(NSNumber *)bodyInformation deviceStatus:(NSNumber *)deviceStatus driverBraking:(NSNumber *)driverBraking wiperStatus:(NSNumber *)wiperStatus headLampStatus:(NSNumber *)headLampStatus engineTorque:(NSNumber *)engineTorque accPedalPosition:(NSNumber *)accPedalPosition steeringWheelAngle:(NSNumber *)steeringWheelAngle correlationID:(NSNumber *)correlationID { ++ (SDLSubscribeVehicleData *)buildSubscribeVehicleDataWithGPS:(NSNumber<SDLBool> *)gps speed:(NSNumber<SDLBool> *)speed rpm:(NSNumber<SDLBool> *)rpm fuelLevel:(NSNumber<SDLBool> *)fuelLevel fuelLevelState:(NSNumber<SDLBool> *)fuelLevelState instantFuelConsumption:(NSNumber<SDLBool> *)instantFuelConsumption externalTemperature:(NSNumber<SDLBool> *)externalTemperature prndl:(NSNumber<SDLBool> *)prndl tirePressure:(NSNumber<SDLBool> *)tirePressure odometer:(NSNumber<SDLBool> *)odometer beltStatus:(NSNumber<SDLBool> *)beltStatus bodyInformation:(NSNumber<SDLBool> *)bodyInformation deviceStatus:(NSNumber<SDLBool> *)deviceStatus driverBraking:(NSNumber<SDLBool> *)driverBraking wiperStatus:(NSNumber<SDLBool> *)wiperStatus headLampStatus:(NSNumber<SDLBool> *)headLampStatus engineTorque:(NSNumber<SDLBool> *)engineTorque accPedalPosition:(NSNumber<SDLBool> *)accPedalPosition steeringWheelAngle:(NSNumber<SDLBool> *)steeringWheelAngle correlationID:(NSNumber<SDLInt> *)correlationID { SDLSubscribeVehicleData *msg = [[SDLSubscribeVehicleData alloc] init]; msg.gps = gps; msg.speed = speed; @@ -699,14 +699,14 @@ static NSString *const SDLBundleShortVersionStringKey = @"CFBundleShortVersionSt return msg; } -+ (SDLUnregisterAppInterface *)buildUnregisterAppInterfaceWithCorrelationID:(NSNumber *)correlationID { ++ (SDLUnregisterAppInterface *)buildUnregisterAppInterfaceWithCorrelationID:(NSNumber<SDLInt> *)correlationID { SDLUnregisterAppInterface *msg = [[SDLUnregisterAppInterface alloc] init]; msg.correlationID = correlationID; return msg; } -+ (SDLUnsubscribeButton *)buildUnsubscribeButtonWithName:(SDLButtonName)buttonName correlationID:(NSNumber *)correlationID { ++ (SDLUnsubscribeButton *)buildUnsubscribeButtonWithName:(SDLButtonName)buttonName correlationID:(NSNumber<SDLInt> *)correlationID { SDLUnsubscribeButton *msg = [[SDLUnsubscribeButton alloc] init]; msg.buttonName = buttonName; msg.correlationID = correlationID; @@ -714,7 +714,7 @@ static NSString *const SDLBundleShortVersionStringKey = @"CFBundleShortVersionSt return msg; } -+ (SDLUnsubscribeVehicleData *)buildUnsubscribeVehicleDataWithGPS:(NSNumber *)gps speed:(NSNumber *)speed rpm:(NSNumber *)rpm fuelLevel:(NSNumber *)fuelLevel fuelLevelState:(NSNumber *)fuelLevelState instantFuelConsumption:(NSNumber *)instantFuelConsumption externalTemperature:(NSNumber *)externalTemperature prndl:(NSNumber *)prndl tirePressure:(NSNumber *)tirePressure odometer:(NSNumber *)odometer beltStatus:(NSNumber *)beltStatus bodyInformation:(NSNumber *)bodyInformation deviceStatus:(NSNumber *)deviceStatus driverBraking:(NSNumber *)driverBraking wiperStatus:(NSNumber *)wiperStatus headLampStatus:(NSNumber *)headLampStatus engineTorque:(NSNumber *)engineTorque accPedalPosition:(NSNumber *)accPedalPosition steeringWheelAngle:(NSNumber *)steeringWheelAngle correlationID:(NSNumber *)correlationID { ++ (SDLUnsubscribeVehicleData *)buildUnsubscribeVehicleDataWithGPS:(NSNumber<SDLBool> *)gps speed:(NSNumber<SDLBool> *)speed rpm:(NSNumber<SDLBool> *)rpm fuelLevel:(NSNumber<SDLBool> *)fuelLevel fuelLevelState:(NSNumber<SDLBool> *)fuelLevelState instantFuelConsumption:(NSNumber<SDLBool> *)instantFuelConsumption externalTemperature:(NSNumber<SDLBool> *)externalTemperature prndl:(NSNumber<SDLBool> *)prndl tirePressure:(NSNumber<SDLBool> *)tirePressure odometer:(NSNumber<SDLBool> *)odometer beltStatus:(NSNumber<SDLBool> *)beltStatus bodyInformation:(NSNumber<SDLBool> *)bodyInformation deviceStatus:(NSNumber<SDLBool> *)deviceStatus driverBraking:(NSNumber<SDLBool> *)driverBraking wiperStatus:(NSNumber<SDLBool> *)wiperStatus headLampStatus:(NSNumber<SDLBool> *)headLampStatus engineTorque:(NSNumber<SDLBool> *)engineTorque accPedalPosition:(NSNumber<SDLBool> *)accPedalPosition steeringWheelAngle:(NSNumber<SDLBool> *)steeringWheelAngle correlationID:(NSNumber<SDLInt> *)correlationID { SDLUnsubscribeVehicleData *msg = [[SDLUnsubscribeVehicleData alloc] init]; msg.gps = gps; msg.speed = speed; @@ -740,7 +740,7 @@ static NSString *const SDLBundleShortVersionStringKey = @"CFBundleShortVersionSt return msg; } -+ (SDLUpdateTurnList *)buildUpdateTurnListWithTurnList:(NSMutableArray<SDLTurn *> *)turnList softButtons:(NSMutableArray<SDLSoftButton *> *)softButtons correlationID:(NSNumber *)correlationID { ++ (SDLUpdateTurnList *)buildUpdateTurnListWithTurnList:(NSMutableArray<SDLTurn *> *)turnList softButtons:(NSMutableArray<SDLSoftButton *> *)softButtons correlationID:(NSNumber<SDLInt> *)correlationID { SDLUpdateTurnList *msg = [[SDLUpdateTurnList alloc] init]; msg.turnList = [turnList mutableCopy]; msg.softButtons = [softButtons mutableCopy]; diff --git a/SmartDeviceLink/SDLRPCResponse.h b/SmartDeviceLink/SDLRPCResponse.h index d6bc4ba4f..92d573cdf 100644 --- a/SmartDeviceLink/SDLRPCResponse.h +++ b/SmartDeviceLink/SDLRPCResponse.h @@ -8,8 +8,8 @@ @interface SDLRPCResponse : SDLRPCMessage -@property (strong) NSNumber *correlationID; -@property (strong) NSNumber *success; +@property (strong) NSNumber<SDLInt> *correlationID; +@property (strong) NSNumber<SDLBool> *success; @property (strong) SDLResult resultCode; @property (strong) NSString *info; diff --git a/SmartDeviceLink/SDLRPCResponse.m b/SmartDeviceLink/SDLRPCResponse.m index dcfe04a78..10deae928 100644 --- a/SmartDeviceLink/SDLRPCResponse.m +++ b/SmartDeviceLink/SDLRPCResponse.m @@ -33,11 +33,11 @@ return self; } -- (NSNumber *)correlationID { +- (NSNumber<SDLInt> *)correlationID { return [function objectForKey:SDLNameCorrelationId]; } -- (void)setCorrelationID:(NSNumber *)corrID { +- (void)setCorrelationID:(NSNumber<SDLInt> *)corrID { if (corrID != nil) { [function setObject:corrID forKey:SDLNameCorrelationId]; } else { @@ -45,7 +45,7 @@ } } -- (void)setSuccess:(NSNumber *)success { +- (void)setSuccess:(NSNumber<SDLBool> *)success { if (success != nil) { [parameters setObject:success forKey:SDLNameSuccess]; } else { @@ -53,7 +53,7 @@ } } -- (NSNumber *)success { +- (NSNumber<SDLBool> *)success { return [parameters objectForKey:SDLNameSuccess]; } diff --git a/SmartDeviceLink/SDLRPCStruct.h b/SmartDeviceLink/SDLRPCStruct.h index 9041d73b9..f69b11dcb 100644 --- a/SmartDeviceLink/SDLRPCStruct.h +++ b/SmartDeviceLink/SDLRPCStruct.h @@ -4,6 +4,8 @@ #import <Foundation/Foundation.h> +#import "NSNumber+NumberType.h" + @interface SDLRPCStruct : NSObject { NSMutableDictionary<NSString *, id> *store; } diff --git a/SmartDeviceLink/SDLReadDID.h b/SmartDeviceLink/SDLReadDID.h index 96d0d3972..a6a738340 100644 --- a/SmartDeviceLink/SDLReadDID.h +++ b/SmartDeviceLink/SDLReadDID.h @@ -22,7 +22,7 @@ * @abstract An ID of the vehicle module * <br/><b>Notes: </b>Minvalue:0; Maxvalue:65535 */ -@property (strong) NSNumber *ecuName; +@property (strong) NSNumber<SDLInt> *ecuName; /** * @abstract Raw data from vehicle data DID location(s) @@ -35,6 +35,6 @@ * <li>ArrayMin:0; ArrayMax:1000</li> * </ul> */ -@property (strong) NSMutableArray<NSNumber *> *didLocation; +@property (strong) NSMutableArray<NSNumber<SDLInt> *> *didLocation; @end diff --git a/SmartDeviceLink/SDLReadDID.m b/SmartDeviceLink/SDLReadDID.m index addb5c3df..4aa462337 100644 --- a/SmartDeviceLink/SDLReadDID.m +++ b/SmartDeviceLink/SDLReadDID.m @@ -14,7 +14,7 @@ return self; } -- (void)setEcuName:(NSNumber *)ecuName { +- (void)setEcuName:(NSNumber<SDLInt> *)ecuName { if (ecuName != nil) { [parameters setObject:ecuName forKey:SDLNameECUName]; } else { @@ -22,11 +22,11 @@ } } -- (NSNumber *)ecuName { +- (NSNumber<SDLInt> *)ecuName { return [parameters objectForKey:SDLNameECUName]; } -- (void)setDidLocation:(NSMutableArray<NSNumber *> *)didLocation { +- (void)setDidLocation:(NSMutableArray<NSNumber<SDLInt> *> *)didLocation { if (didLocation != nil) { [parameters setObject:didLocation forKey:SDLNameDIDLocation]; } else { @@ -34,7 +34,7 @@ } } -- (NSMutableArray<NSNumber *> *)didLocation { +- (NSMutableArray<NSNumber<SDLInt> *> *)didLocation { return [parameters objectForKey:SDLNameDIDLocation]; } diff --git a/SmartDeviceLink/SDLRegisterAppInterface.h b/SmartDeviceLink/SDLRegisterAppInterface.h index 7333b9c13..cfae58e56 100644 --- a/SmartDeviceLink/SDLRegisterAppInterface.h +++ b/SmartDeviceLink/SDLRegisterAppInterface.h @@ -145,7 +145,7 @@ * * Required, Boolean */ -@property (strong) NSNumber *isMediaApplication; +@property (strong) NSNumber<SDLBool> *isMediaApplication; /** * @abstract A Language enumeration indicating what language the application intends to use for user interaction (TTS and VR). diff --git a/SmartDeviceLink/SDLRegisterAppInterface.m b/SmartDeviceLink/SDLRegisterAppInterface.m index 6ad1dcc33..a69d56b4a 100644 --- a/SmartDeviceLink/SDLRegisterAppInterface.m +++ b/SmartDeviceLink/SDLRegisterAppInterface.m @@ -95,7 +95,7 @@ return [parameters objectForKey:SDLNameVRSynonyms]; } -- (void)setIsMediaApplication:(NSNumber *)isMediaApplication { +- (void)setIsMediaApplication:(NSNumber<SDLBool> *)isMediaApplication { if (isMediaApplication != nil) { [parameters setObject:isMediaApplication forKey:SDLNameIsMediaApplication]; } else { @@ -103,7 +103,7 @@ } } -- (NSNumber *)isMediaApplication { +- (NSNumber<SDLBool> *)isMediaApplication { return [parameters objectForKey:SDLNameIsMediaApplication]; } diff --git a/SmartDeviceLink/SDLRegisterAppInterfaceResponse.h b/SmartDeviceLink/SDLRegisterAppInterfaceResponse.h index 79a11dbd3..aac85c457 100644 --- a/SmartDeviceLink/SDLRegisterAppInterfaceResponse.h +++ b/SmartDeviceLink/SDLRegisterAppInterfaceResponse.h @@ -134,7 +134,7 @@ * * Optional, Array of length 1 - 100, Integer 0 - 255 */ -@property (strong) NSMutableArray<NSNumber *> *supportedDiagModes; +@property (strong) NSMutableArray<NSNumber<SDLInt> *> *supportedDiagModes; /** * @see SDLHMICapabilities diff --git a/SmartDeviceLink/SDLRegisterAppInterfaceResponse.m b/SmartDeviceLink/SDLRegisterAppInterfaceResponse.m index 6f338eaf0..fb65628ca 100644 --- a/SmartDeviceLink/SDLRegisterAppInterfaceResponse.m +++ b/SmartDeviceLink/SDLRegisterAppInterfaceResponse.m @@ -263,7 +263,7 @@ } } -- (void)setSupportedDiagModes:(NSMutableArray<NSNumber *> *)supportedDiagModes { +- (void)setSupportedDiagModes:(NSMutableArray<NSNumber<SDLInt> *> *)supportedDiagModes { if (supportedDiagModes != nil) { [parameters setObject:supportedDiagModes forKey:SDLNameSupportedDiagnosticModes]; } else { @@ -271,7 +271,7 @@ } } -- (NSMutableArray<NSNumber *> *)supportedDiagModes { +- (NSMutableArray<NSNumber<SDLInt> *> *)supportedDiagModes { return [parameters objectForKey:SDLNameSupportedDiagnosticModes]; } diff --git a/SmartDeviceLink/SDLScrollableMessage.h b/SmartDeviceLink/SDLScrollableMessage.h index 87e86000b..a4ce53302 100644 --- a/SmartDeviceLink/SDLScrollableMessage.h +++ b/SmartDeviceLink/SDLScrollableMessage.h @@ -32,7 +32,7 @@ * <p> * <b>Notes</b>:Minval=0; Maxval=65535;Default=30000 */ -@property (strong) NSNumber *timeout; +@property (strong) NSNumber<SDLInt> *timeout; /** * @abstract Gets/Sets App defined SoftButtons.If omitted on supported displays, only the * system defined "Close" SoftButton will be displayed diff --git a/SmartDeviceLink/SDLScrollableMessage.m b/SmartDeviceLink/SDLScrollableMessage.m index 83d0fee95..101c47299 100644 --- a/SmartDeviceLink/SDLScrollableMessage.m +++ b/SmartDeviceLink/SDLScrollableMessage.m @@ -27,7 +27,7 @@ return [parameters objectForKey:SDLNameScrollableMessageBody]; } -- (void)setTimeout:(NSNumber *)timeout { +- (void)setTimeout:(NSNumber<SDLInt> *)timeout { if (timeout != nil) { [parameters setObject:timeout forKey:SDLNameTimeout]; } else { @@ -35,7 +35,7 @@ } } -- (NSNumber *)timeout { +- (NSNumber<SDLInt> *)timeout { return [parameters objectForKey:SDLNameTimeout]; } diff --git a/SmartDeviceLink/SDLSendLocation.h b/SmartDeviceLink/SDLSendLocation.h index a1b3fd638..a816f5a51 100644 --- a/SmartDeviceLink/SDLSendLocation.h +++ b/SmartDeviceLink/SDLSendLocation.h @@ -15,14 +15,14 @@ * * Float, Required, -180.0 - 180.0 */ -@property (copy, nonatomic) NSNumber *longitudeDegrees; +@property (copy, nonatomic) NSNumber<SDLFloat> *longitudeDegrees; /** * The latitudinal coordinate of the location. * * Float, Required, -90.0 - 90.0 */ -@property (copy, nonatomic) NSNumber *latitudeDegrees; +@property (copy, nonatomic) NSNumber<SDLFloat> *latitudeDegrees; /** * Name / title of intended location diff --git a/SmartDeviceLink/SDLSendLocation.m b/SmartDeviceLink/SDLSendLocation.m index 601e94a08..a73983bd3 100644 --- a/SmartDeviceLink/SDLSendLocation.m +++ b/SmartDeviceLink/SDLSendLocation.m @@ -17,7 +17,7 @@ return self; } -- (void)setLongitudeDegrees:(NSNumber *)longitudeDegrees { +- (void)setLongitudeDegrees:(NSNumber<SDLFloat> *)longitudeDegrees { if (longitudeDegrees != nil) { parameters[SDLNameLongitudeDegrees] = longitudeDegrees; } else { @@ -25,11 +25,11 @@ } } -- (NSNumber *)longitudeDegrees { +- (NSNumber<SDLFloat> *)longitudeDegrees { return parameters[SDLNameLongitudeDegrees]; } -- (void)setLatitudeDegrees:(NSNumber *)latitudeDegrees { +- (void)setLatitudeDegrees:(NSNumber<SDLFloat> *)latitudeDegrees { if (latitudeDegrees != nil) { parameters[SDLNameLatitudeDegrees] = latitudeDegrees; } else { @@ -37,7 +37,7 @@ } } -- (NSNumber *)latitudeDegrees { +- (NSNumber<SDLFloat> *)latitudeDegrees { return parameters[SDLNameLatitudeDegrees]; } diff --git a/SmartDeviceLink/SDLShowConstantTBT.h b/SmartDeviceLink/SDLShowConstantTBT.h index 136f71ded..f46c822bc 100644 --- a/SmartDeviceLink/SDLShowConstantTBT.h +++ b/SmartDeviceLink/SDLShowConstantTBT.h @@ -21,9 +21,9 @@ @property (strong) NSString *totalDistance; @property (strong) SDLImage *turnIcon; @property (strong) SDLImage *nextTurnIcon; -@property (strong) NSNumber *distanceToManeuver; -@property (strong) NSNumber *distanceToManeuverScale; -@property (strong) NSNumber *maneuverComplete; +@property (strong) NSNumber<SDLFloat> *distanceToManeuver; +@property (strong) NSNumber<SDLFloat> *distanceToManeuverScale; +@property (strong) NSNumber<SDLBool> *maneuverComplete; @property (strong) NSMutableArray<SDLSoftButton *> *softButtons; @end diff --git a/SmartDeviceLink/SDLShowConstantTBT.m b/SmartDeviceLink/SDLShowConstantTBT.m index 79134b47b..faac90f2d 100644 --- a/SmartDeviceLink/SDLShowConstantTBT.m +++ b/SmartDeviceLink/SDLShowConstantTBT.m @@ -110,7 +110,7 @@ } } -- (void)setDistanceToManeuver:(NSNumber *)distanceToManeuver { +- (void)setDistanceToManeuver:(NSNumber<SDLFloat> *)distanceToManeuver { if (distanceToManeuver != nil) { [parameters setObject:distanceToManeuver forKey:SDLNameDistanceToManeuver]; } else { @@ -118,11 +118,11 @@ } } -- (NSNumber *)distanceToManeuver { +- (NSNumber<SDLFloat> *)distanceToManeuver { return [parameters objectForKey:SDLNameDistanceToManeuver]; } -- (void)setDistanceToManeuverScale:(NSNumber *)distanceToManeuverScale { +- (void)setDistanceToManeuverScale:(NSNumber<SDLFloat> *)distanceToManeuverScale { if (distanceToManeuverScale != nil) { [parameters setObject:distanceToManeuverScale forKey:SDLNameDistanceToManeuverScale]; } else { @@ -130,11 +130,11 @@ } } -- (NSNumber *)distanceToManeuverScale { +- (NSNumber<SDLFloat> *)distanceToManeuverScale { return [parameters objectForKey:SDLNameDistanceToManeuverScale]; } -- (void)setManeuverComplete:(NSNumber *)maneuverComplete { +- (void)setManeuverComplete:(NSNumber<SDLBool> *)maneuverComplete { if (maneuverComplete != nil) { [parameters setObject:maneuverComplete forKey:SDLNameManeuverComplete]; } else { @@ -142,7 +142,7 @@ } } -- (NSNumber *)maneuverComplete { +- (NSNumber<SDLBool> *)maneuverComplete { return [parameters objectForKey:SDLNameManeuverComplete]; } diff --git a/SmartDeviceLink/SDLSlider.h b/SmartDeviceLink/SDLSlider.h index 7513e025a..1f8e0e215 100644 --- a/SmartDeviceLink/SDLSlider.h +++ b/SmartDeviceLink/SDLSlider.h @@ -18,14 +18,14 @@ * * Required, Integer, 2 - 26 */ -@property (strong) NSNumber *numTicks; +@property (strong) NSNumber<SDLInt> *numTicks; /** * @abstract An Initial position of slider control * * Required, Integer, 1 - 26 */ -@property (strong) NSNumber *position; +@property (strong) NSNumber<SDLInt> *position; /** * @abstract A text header to display @@ -58,6 +58,6 @@ * * Optional, Integer, 1000 - 65535 */ -@property (strong) NSNumber *timeout; +@property (strong) NSNumber<SDLInt> *timeout; @end diff --git a/SmartDeviceLink/SDLSlider.m b/SmartDeviceLink/SDLSlider.m index 4c95ebcfd..8712fc30e 100644 --- a/SmartDeviceLink/SDLSlider.m +++ b/SmartDeviceLink/SDLSlider.m @@ -14,7 +14,7 @@ return self; } -- (void)setNumTicks:(NSNumber *)numTicks { +- (void)setNumTicks:(NSNumber<SDLInt> *)numTicks { if (numTicks != nil) { [parameters setObject:numTicks forKey:SDLNameNumberTicks]; } else { @@ -22,11 +22,11 @@ } } -- (NSNumber *)numTicks { +- (NSNumber<SDLInt> *)numTicks { return [parameters objectForKey:SDLNameNumberTicks]; } -- (void)setPosition:(NSNumber *)position { +- (void)setPosition:(NSNumber<SDLInt> *)position { if (position != nil) { [parameters setObject:position forKey:SDLNamePosition]; } else { @@ -34,7 +34,7 @@ } } -- (NSNumber *)position { +- (NSNumber<SDLInt> *)position { return [parameters objectForKey:SDLNamePosition]; } @@ -62,7 +62,7 @@ return [parameters objectForKey:SDLNameSliderFooter]; } -- (void)setTimeout:(NSNumber *)timeout { +- (void)setTimeout:(NSNumber<SDLInt> *)timeout { if (timeout != nil) { [parameters setObject:timeout forKey:SDLNameTimeout]; } else { @@ -70,7 +70,7 @@ } } -- (NSNumber *)timeout { +- (NSNumber<SDLInt> *)timeout { return [parameters objectForKey:SDLNameTimeout]; } diff --git a/SmartDeviceLink/SDLSliderResponse.h b/SmartDeviceLink/SDLSliderResponse.h index 74baba292..f31a74a6e 100644 --- a/SmartDeviceLink/SDLSliderResponse.h +++ b/SmartDeviceLink/SDLSliderResponse.h @@ -14,6 +14,6 @@ /** * @abstract The selected position of the slider. */ -@property (strong) NSNumber *sliderPosition; +@property (strong) NSNumber<SDLInt> *sliderPosition; @end diff --git a/SmartDeviceLink/SDLSliderResponse.m b/SmartDeviceLink/SDLSliderResponse.m index 681b0f8c9..9d5872393 100644 --- a/SmartDeviceLink/SDLSliderResponse.m +++ b/SmartDeviceLink/SDLSliderResponse.m @@ -14,7 +14,7 @@ return self; } -- (void)setSliderPosition:(NSNumber *)sliderPosition { +- (void)setSliderPosition:(NSNumber<SDLInt> *)sliderPosition { if (sliderPosition != nil) { [parameters setObject:sliderPosition forKey:SDLNameSliderPosition]; } else { @@ -22,7 +22,7 @@ } } -- (NSNumber *)sliderPosition { +- (NSNumber<SDLInt> *)sliderPosition { return [parameters objectForKey:SDLNameSliderPosition]; } diff --git a/SmartDeviceLink/SDLSoftButton.h b/SmartDeviceLink/SDLSoftButton.h index f7cfcca25..14af3fefd 100644 --- a/SmartDeviceLink/SDLSoftButton.h +++ b/SmartDeviceLink/SDLSoftButton.h @@ -20,8 +20,8 @@ @property (strong) SDLSoftButtonType type; @property (strong) NSString *text; @property (strong) SDLImage *image; -@property (strong) NSNumber *isHighlighted; -@property (strong) NSNumber *softButtonID; +@property (strong) NSNumber<SDLBool> *isHighlighted; +@property (strong) NSNumber<SDLInt> *softButtonID; @property (strong) SDLSystemAction systemAction; @end diff --git a/SmartDeviceLink/SDLSoftButton.m b/SmartDeviceLink/SDLSoftButton.m index b66464d36..6b31b060a 100644 --- a/SmartDeviceLink/SDLSoftButton.m +++ b/SmartDeviceLink/SDLSoftButton.m @@ -61,7 +61,7 @@ } } -- (void)setIsHighlighted:(NSNumber *)isHighlighted { +- (void)setIsHighlighted:(NSNumber<SDLBool> *)isHighlighted { if (isHighlighted != nil) { [store setObject:isHighlighted forKey:SDLNameIsHighlighted]; } else { @@ -69,11 +69,11 @@ } } -- (NSNumber *)isHighlighted { +- (NSNumber<SDLBool> *)isHighlighted { return [store objectForKey:SDLNameIsHighlighted]; } -- (void)setSoftButtonID:(NSNumber *)softButtonID { +- (void)setSoftButtonID:(NSNumber<SDLInt> *)softButtonID { if (softButtonID != nil) { [store setObject:softButtonID forKey:SDLNameSoftButtonId]; } else { @@ -81,7 +81,7 @@ } } -- (NSNumber *)softButtonID { +- (NSNumber<SDLInt> *)softButtonID { return [store objectForKey:SDLNameSoftButtonId]; } diff --git a/SmartDeviceLink/SDLSoftButtonCapabilities.h b/SmartDeviceLink/SDLSoftButtonCapabilities.h index c699ba17e..0fb85c301 100644 --- a/SmartDeviceLink/SDLSoftButtonCapabilities.h +++ b/SmartDeviceLink/SDLSoftButtonCapabilities.h @@ -18,7 +18,7 @@ * * Required, Boolean */ -@property (strong) NSNumber *shortPressAvailable; +@property (strong) NSNumber<SDLBool> *shortPressAvailable; /** * @abstract The button supports a LONG press. @@ -27,7 +27,7 @@ * * Required, Boolean */ -@property (strong) NSNumber *longPressAvailable; +@property (strong) NSNumber<SDLBool> *longPressAvailable; /** * @abstract The button supports "button down" and "button up". @@ -36,13 +36,13 @@ * * Required, Boolean */ -@property (strong) NSNumber *upDownAvailable; +@property (strong) NSNumber<SDLBool> *upDownAvailable; /** * @abstract The button supports referencing a static or dynamic image. * * Required, Boolean */ -@property (strong) NSNumber *imageSupported; +@property (strong) NSNumber<SDLBool> *imageSupported; @end diff --git a/SmartDeviceLink/SDLSoftButtonCapabilities.m b/SmartDeviceLink/SDLSoftButtonCapabilities.m index c64c6fa86..ed2171b1f 100644 --- a/SmartDeviceLink/SDLSoftButtonCapabilities.m +++ b/SmartDeviceLink/SDLSoftButtonCapabilities.m @@ -8,7 +8,7 @@ @implementation SDLSoftButtonCapabilities -- (void)setShortPressAvailable:(NSNumber *)shortPressAvailable { +- (void)setShortPressAvailable:(NSNumber<SDLBool> *)shortPressAvailable { if (shortPressAvailable != nil) { [store setObject:shortPressAvailable forKey:SDLNameShortPressAvailable]; } else { @@ -16,11 +16,11 @@ } } -- (NSNumber *)shortPressAvailable { +- (NSNumber<SDLBool> *)shortPressAvailable { return [store objectForKey:SDLNameShortPressAvailable]; } -- (void)setLongPressAvailable:(NSNumber *)longPressAvailable { +- (void)setLongPressAvailable:(NSNumber<SDLBool> *)longPressAvailable { if (longPressAvailable != nil) { [store setObject:longPressAvailable forKey:SDLNameLongPressAvailable]; } else { @@ -28,11 +28,11 @@ } } -- (NSNumber *)longPressAvailable { +- (NSNumber<SDLBool> *)longPressAvailable { return [store objectForKey:SDLNameLongPressAvailable]; } -- (void)setUpDownAvailable:(NSNumber *)upDownAvailable { +- (void)setUpDownAvailable:(NSNumber<SDLBool> *)upDownAvailable { if (upDownAvailable != nil) { [store setObject:upDownAvailable forKey:SDLNameUpDownAvailable]; } else { @@ -40,11 +40,11 @@ } } -- (NSNumber *)upDownAvailable { +- (NSNumber<SDLBool> *)upDownAvailable { return [store objectForKey:SDLNameUpDownAvailable]; } -- (void)setImageSupported:(NSNumber *)imageSupported { +- (void)setImageSupported:(NSNumber<SDLBool> *)imageSupported { if (imageSupported != nil) { [store setObject:imageSupported forKey:SDLNameImageSupported]; } else { @@ -52,7 +52,7 @@ } } -- (NSNumber *)imageSupported { +- (NSNumber<SDLBool> *)imageSupported { return [store objectForKey:SDLNameImageSupported]; } diff --git a/SmartDeviceLink/SDLStartTime.h b/SmartDeviceLink/SDLStartTime.h index 47c10674e..b3c47a827 100644 --- a/SmartDeviceLink/SDLStartTime.h +++ b/SmartDeviceLink/SDLStartTime.h @@ -18,20 +18,20 @@ * * Required, Integer, 0 - 59 */ -@property (strong) NSNumber *hours; +@property (strong) NSNumber<SDLInt> *hours; /** * @abstract The minute of the media clock * * Required, Integer, 0 - 59 */ -@property (strong) NSNumber *minutes; +@property (strong) NSNumber<SDLInt> *minutes; /** * @abstract The second of the media clock * * Required, Integer, 0 - 59 */ -@property (strong) NSNumber *seconds; +@property (strong) NSNumber<SDLInt> *seconds; @end diff --git a/SmartDeviceLink/SDLStartTime.m b/SmartDeviceLink/SDLStartTime.m index d0de254ec..bc6ebe2a8 100644 --- a/SmartDeviceLink/SDLStartTime.m +++ b/SmartDeviceLink/SDLStartTime.m @@ -8,7 +8,7 @@ @implementation SDLStartTime -- (void)setHours:(NSNumber *)hours { +- (void)setHours:(NSNumber<SDLInt> *)hours { if (hours != nil) { [store setObject:hours forKey:SDLNameHours]; } else { @@ -16,11 +16,11 @@ } } -- (NSNumber *)hours { +- (NSNumber<SDLInt> *)hours { return [store objectForKey:SDLNameHours]; } -- (void)setMinutes:(NSNumber *)minutes { +- (void)setMinutes:(NSNumber<SDLInt> *)minutes { if (minutes != nil) { [store setObject:minutes forKey:SDLNameMinutes]; } else { @@ -28,11 +28,11 @@ } } -- (NSNumber *)minutes { +- (NSNumber<SDLInt> *)minutes { return [store objectForKey:SDLNameMinutes]; } -- (void)setSeconds:(NSNumber *)seconds { +- (void)setSeconds:(NSNumber<SDLInt> *)seconds { if (seconds != nil) { [store setObject:seconds forKey:SDLNameSeconds]; } else { @@ -40,7 +40,7 @@ } } -- (NSNumber *)seconds { +- (NSNumber<SDLInt> *)seconds { return [store objectForKey:SDLNameSeconds]; } diff --git a/SmartDeviceLink/SDLSubscribeVehicleData.h b/SmartDeviceLink/SDLSubscribeVehicleData.h index 0e978329c..963564199 100644 --- a/SmartDeviceLink/SDLSubscribeVehicleData.h +++ b/SmartDeviceLink/SDLSubscribeVehicleData.h @@ -24,103 +24,103 @@ /** * @abstract A boolean value. If true, subscribes Gps data */ -@property (strong) NSNumber *gps; +@property (strong) NSNumber<SDLBool> *gps; /** * @abstract A boolean value. If true, subscribes speed data */ -@property (strong) NSNumber *speed; +@property (strong) NSNumber<SDLBool> *speed; /** * @abstract A boolean value. If true, subscribes rpm data */ -@property (strong) NSNumber *rpm; +@property (strong) NSNumber<SDLBool> *rpm; /** * @abstract A boolean value. If true, subscribes FuelLevel data */ -@property (strong) NSNumber *fuelLevel; +@property (strong) NSNumber<SDLBool> *fuelLevel; /** * @abstract A boolean value. If true, subscribes fuelLevel_State data */ -@property (strong) NSNumber *fuelLevel_State; +@property (strong) NSNumber<SDLBool> *fuelLevel_State; /** * @abstract A boolean value. If true, subscribes instantFuelConsumption data */ -@property (strong) NSNumber *instantFuelConsumption; +@property (strong) NSNumber<SDLBool> *instantFuelConsumption; /** * @abstract A boolean value. If true, subscribes externalTemperature data */ -@property (strong) NSNumber *externalTemperature; +@property (strong) NSNumber<SDLBool> *externalTemperature; /** * @abstract A boolean value. If true, subscribes Currently selected gear data */ -@property (strong) NSNumber *prndl; +@property (strong) NSNumber<SDLBool> *prndl; /** * @abstract A boolean value. If true, subscribes tire pressure status data */ -@property (strong) NSNumber *tirePressure; +@property (strong) NSNumber<SDLBool> *tirePressure; /** * @abstract A boolean value. If true, subscribes odometer data */ -@property (strong) NSNumber *odometer; +@property (strong) NSNumber<SDLBool> *odometer; /** * @abstract A boolean value. If true, subscribes belt Status data */ -@property (strong) NSNumber *beltStatus; +@property (strong) NSNumber<SDLBool> *beltStatus; /** * @abstract A boolean value. If true, subscribes body Information data */ -@property (strong) NSNumber *bodyInformation; +@property (strong) NSNumber<SDLBool> *bodyInformation; /** * @abstract A boolean value. If true, subscribes device Status data */ -@property (strong) NSNumber *deviceStatus; +@property (strong) NSNumber<SDLBool> *deviceStatus; /** * @abstract A boolean value. If true, subscribes driver Braking data */ -@property (strong) NSNumber *driverBraking; +@property (strong) NSNumber<SDLBool> *driverBraking; /** * @abstract A boolean value. If true, subscribes wiper Status data */ -@property (strong) NSNumber *wiperStatus; +@property (strong) NSNumber<SDLBool> *wiperStatus; /** * @abstract A boolean value. If true, subscribes Head Lamp Status data */ -@property (strong) NSNumber *headLampStatus; +@property (strong) NSNumber<SDLBool> *headLampStatus; /** * @abstract A boolean value. If true, subscribes Engine Torque data */ -@property (strong) NSNumber *engineTorque; +@property (strong) NSNumber<SDLBool> *engineTorque; /** * @abstract A boolean value. If true, means the accPedalPosition data has been * subscribed. */ -@property (strong) NSNumber *accPedalPosition; +@property (strong) NSNumber<SDLBool> *accPedalPosition; /** * @abstract A boolean value. If true, means the steeringWheelAngle data has been * subscribed. */ -@property (strong) NSNumber *steeringWheelAngle; -@property (strong) NSNumber *eCallInfo; -@property (strong) NSNumber *airbagStatus; -@property (strong) NSNumber *emergencyEvent; -@property (strong) NSNumber *clusterModeStatus; -@property (strong) NSNumber *myKey; +@property (strong) NSNumber<SDLBool> *steeringWheelAngle; +@property (strong) NSNumber<SDLBool> *eCallInfo; +@property (strong) NSNumber<SDLBool> *airbagStatus; +@property (strong) NSNumber<SDLBool> *emergencyEvent; +@property (strong) NSNumber<SDLBool> *clusterModeStatus; +@property (strong) NSNumber<SDLBool> *myKey; @end diff --git a/SmartDeviceLink/SDLSubscribeVehicleData.m b/SmartDeviceLink/SDLSubscribeVehicleData.m index 616540c0e..982773319 100644 --- a/SmartDeviceLink/SDLSubscribeVehicleData.m +++ b/SmartDeviceLink/SDLSubscribeVehicleData.m @@ -14,7 +14,7 @@ return self; } -- (void)setGps:(NSNumber *)gps { +- (void)setGps:(NSNumber<SDLBool> *)gps { if (gps != nil) { [parameters setObject:gps forKey:SDLNameGPS]; } else { @@ -22,11 +22,11 @@ } } -- (NSNumber *)gps { +- (NSNumber<SDLBool> *)gps { return [parameters objectForKey:SDLNameGPS]; } -- (void)setSpeed:(NSNumber *)speed { +- (void)setSpeed:(NSNumber<SDLBool> *)speed { if (speed != nil) { [parameters setObject:speed forKey:SDLNameSpeed]; } else { @@ -34,11 +34,11 @@ } } -- (NSNumber *)speed { +- (NSNumber<SDLBool> *)speed { return [parameters objectForKey:SDLNameSpeed]; } -- (void)setRpm:(NSNumber *)rpm { +- (void)setRpm:(NSNumber<SDLBool> *)rpm { if (rpm != nil) { [parameters setObject:rpm forKey:SDLNameRPM]; } else { @@ -46,11 +46,11 @@ } } -- (NSNumber *)rpm { +- (NSNumber<SDLBool> *)rpm { return [parameters objectForKey:SDLNameRPM]; } -- (void)setFuelLevel:(NSNumber *)fuelLevel { +- (void)setFuelLevel:(NSNumber<SDLBool> *)fuelLevel { if (fuelLevel != nil) { [parameters setObject:fuelLevel forKey:SDLNameFuelLevel]; } else { @@ -58,11 +58,11 @@ } } -- (NSNumber *)fuelLevel { +- (NSNumber<SDLBool> *)fuelLevel { return [parameters objectForKey:SDLNameFuelLevel]; } -- (void)setFuelLevel_State:(NSNumber *)fuelLevel_State { +- (void)setFuelLevel_State:(NSNumber<SDLBool> *)fuelLevel_State { if (fuelLevel_State != nil) { [parameters setObject:fuelLevel_State forKey:SDLNameFuelLevelState]; } else { @@ -70,11 +70,11 @@ } } -- (NSNumber *)fuelLevel_State { +- (NSNumber<SDLBool> *)fuelLevel_State { return [parameters objectForKey:SDLNameFuelLevelState]; } -- (void)setInstantFuelConsumption:(NSNumber *)instantFuelConsumption { +- (void)setInstantFuelConsumption:(NSNumber<SDLBool> *)instantFuelConsumption { if (instantFuelConsumption != nil) { [parameters setObject:instantFuelConsumption forKey:SDLNameInstantFuelConsumption]; } else { @@ -82,11 +82,11 @@ } } -- (NSNumber *)instantFuelConsumption { +- (NSNumber<SDLBool> *)instantFuelConsumption { return [parameters objectForKey:SDLNameInstantFuelConsumption]; } -- (void)setExternalTemperature:(NSNumber *)externalTemperature { +- (void)setExternalTemperature:(NSNumber<SDLBool> *)externalTemperature { if (externalTemperature != nil) { [parameters setObject:externalTemperature forKey:SDLNameExternalTemperature]; } else { @@ -94,11 +94,11 @@ } } -- (NSNumber *)externalTemperature { +- (NSNumber<SDLBool> *)externalTemperature { return [parameters objectForKey:SDLNameExternalTemperature]; } -- (void)setPrndl:(NSNumber *)prndl { +- (void)setPrndl:(NSNumber<SDLBool> *)prndl { if (prndl != nil) { [parameters setObject:prndl forKey:SDLNamePRNDL]; } else { @@ -106,11 +106,11 @@ } } -- (NSNumber *)prndl { +- (NSNumber<SDLBool> *)prndl { return [parameters objectForKey:SDLNamePRNDL]; } -- (void)setTirePressure:(NSNumber *)tirePressure { +- (void)setTirePressure:(NSNumber<SDLBool> *)tirePressure { if (tirePressure != nil) { [parameters setObject:tirePressure forKey:SDLNameTirePressure]; } else { @@ -118,11 +118,11 @@ } } -- (NSNumber *)tirePressure { +- (NSNumber<SDLBool> *)tirePressure { return [parameters objectForKey:SDLNameTirePressure]; } -- (void)setOdometer:(NSNumber *)odometer { +- (void)setOdometer:(NSNumber<SDLBool> *)odometer { if (odometer != nil) { [parameters setObject:odometer forKey:SDLNameOdometer]; } else { @@ -130,11 +130,11 @@ } } -- (NSNumber *)odometer { +- (NSNumber<SDLBool> *)odometer { return [parameters objectForKey:SDLNameOdometer]; } -- (void)setBeltStatus:(NSNumber *)beltStatus { +- (void)setBeltStatus:(NSNumber<SDLBool> *)beltStatus { if (beltStatus != nil) { [parameters setObject:beltStatus forKey:SDLNameBeltStatus]; } else { @@ -142,11 +142,11 @@ } } -- (NSNumber *)beltStatus { +- (NSNumber<SDLBool> *)beltStatus { return [parameters objectForKey:SDLNameBeltStatus]; } -- (void)setBodyInformation:(NSNumber *)bodyInformation { +- (void)setBodyInformation:(NSNumber<SDLBool> *)bodyInformation { if (bodyInformation != nil) { [parameters setObject:bodyInformation forKey:SDLNameBodyInformation]; } else { @@ -154,11 +154,11 @@ } } -- (NSNumber *)bodyInformation { +- (NSNumber<SDLBool> *)bodyInformation { return [parameters objectForKey:SDLNameBodyInformation]; } -- (void)setDeviceStatus:(NSNumber *)deviceStatus { +- (void)setDeviceStatus:(NSNumber<SDLBool> *)deviceStatus { if (deviceStatus != nil) { [parameters setObject:deviceStatus forKey:SDLNameDeviceStatus]; } else { @@ -166,11 +166,11 @@ } } -- (NSNumber *)deviceStatus { +- (NSNumber<SDLBool> *)deviceStatus { return [parameters objectForKey:SDLNameDeviceStatus]; } -- (void)setDriverBraking:(NSNumber *)driverBraking { +- (void)setDriverBraking:(NSNumber<SDLBool> *)driverBraking { if (driverBraking != nil) { [parameters setObject:driverBraking forKey:SDLNameDriverBraking]; } else { @@ -178,11 +178,11 @@ } } -- (NSNumber *)driverBraking { +- (NSNumber<SDLBool> *)driverBraking { return [parameters objectForKey:SDLNameDriverBraking]; } -- (void)setWiperStatus:(NSNumber *)wiperStatus { +- (void)setWiperStatus:(NSNumber<SDLBool> *)wiperStatus { if (wiperStatus != nil) { [parameters setObject:wiperStatus forKey:SDLNameWiperStatus]; } else { @@ -190,11 +190,11 @@ } } -- (NSNumber *)wiperStatus { +- (NSNumber<SDLBool> *)wiperStatus { return [parameters objectForKey:SDLNameWiperStatus]; } -- (void)setHeadLampStatus:(NSNumber *)headLampStatus { +- (void)setHeadLampStatus:(NSNumber<SDLBool> *)headLampStatus { if (headLampStatus != nil) { [parameters setObject:headLampStatus forKey:SDLNameHeadLampStatus]; } else { @@ -202,11 +202,11 @@ } } -- (NSNumber *)headLampStatus { +- (NSNumber<SDLBool> *)headLampStatus { return [parameters objectForKey:SDLNameHeadLampStatus]; } -- (void)setEngineTorque:(NSNumber *)engineTorque { +- (void)setEngineTorque:(NSNumber<SDLBool> *)engineTorque { if (engineTorque != nil) { [parameters setObject:engineTorque forKey:SDLNameEngineTorque]; } else { @@ -214,11 +214,11 @@ } } -- (NSNumber *)engineTorque { +- (NSNumber<SDLBool> *)engineTorque { return [parameters objectForKey:SDLNameEngineTorque]; } -- (void)setAccPedalPosition:(NSNumber *)accPedalPosition { +- (void)setAccPedalPosition:(NSNumber<SDLBool> *)accPedalPosition { if (accPedalPosition != nil) { [parameters setObject:accPedalPosition forKey:SDLNameAccelerationPedalPosition]; } else { @@ -226,11 +226,11 @@ } } -- (NSNumber *)accPedalPosition { +- (NSNumber<SDLBool> *)accPedalPosition { return [parameters objectForKey:SDLNameAccelerationPedalPosition]; } -- (void)setSteeringWheelAngle:(NSNumber *)steeringWheelAngle { +- (void)setSteeringWheelAngle:(NSNumber<SDLBool> *)steeringWheelAngle { if (steeringWheelAngle != nil) { [parameters setObject:steeringWheelAngle forKey:SDLNameSteeringWheelAngle]; } else { @@ -238,11 +238,11 @@ } } -- (NSNumber *)steeringWheelAngle { +- (NSNumber<SDLBool> *)steeringWheelAngle { return [parameters objectForKey:SDLNameSteeringWheelAngle]; } -- (void)setECallInfo:(NSNumber *)eCallInfo { +- (void)setECallInfo:(NSNumber<SDLBool> *)eCallInfo { if (eCallInfo != nil) { [parameters setObject:eCallInfo forKey:SDLNameECallInfo]; } else { @@ -250,11 +250,11 @@ } } -- (NSNumber *)eCallInfo { +- (NSNumber<SDLBool> *)eCallInfo { return [parameters objectForKey:SDLNameECallInfo]; } -- (void)setAirbagStatus:(NSNumber *)airbagStatus { +- (void)setAirbagStatus:(NSNumber<SDLBool> *)airbagStatus { if (airbagStatus != nil) { [parameters setObject:airbagStatus forKey:SDLNameAirbagStatus]; } else { @@ -262,11 +262,11 @@ } } -- (NSNumber *)airbagStatus { +- (NSNumber<SDLBool> *)airbagStatus { return [parameters objectForKey:SDLNameAirbagStatus]; } -- (void)setEmergencyEvent:(NSNumber *)emergencyEvent { +- (void)setEmergencyEvent:(NSNumber<SDLBool> *)emergencyEvent { if (emergencyEvent != nil) { [parameters setObject:emergencyEvent forKey:SDLNameEmergencyEvent]; } else { @@ -274,11 +274,11 @@ } } -- (NSNumber *)emergencyEvent { +- (NSNumber<SDLBool> *)emergencyEvent { return [parameters objectForKey:SDLNameEmergencyEvent]; } -- (void)setClusterModeStatus:(NSNumber *)clusterModeStatus { +- (void)setClusterModeStatus:(NSNumber<SDLBool> *)clusterModeStatus { if (clusterModeStatus != nil) { [parameters setObject:clusterModeStatus forKey:SDLNameClusterModeStatus]; } else { @@ -286,11 +286,11 @@ } } -- (NSNumber *)clusterModeStatus { +- (NSNumber<SDLBool> *)clusterModeStatus { return [parameters objectForKey:SDLNameClusterModeStatus]; } -- (void)setMyKey:(NSNumber *)myKey { +- (void)setMyKey:(NSNumber<SDLBool> *)myKey { if (myKey != nil) { [parameters setObject:myKey forKey:SDLNameMyKey]; } else { @@ -298,7 +298,7 @@ } } -- (NSNumber *)myKey { +- (NSNumber<SDLBool> *)myKey { return [parameters objectForKey:SDLNameMyKey]; } diff --git a/SmartDeviceLink/SDLSyncMsgVersion.h b/SmartDeviceLink/SDLSyncMsgVersion.h index 92973daf7..3017af1f8 100644 --- a/SmartDeviceLink/SDLSyncMsgVersion.h +++ b/SmartDeviceLink/SDLSyncMsgVersion.h @@ -16,12 +16,12 @@ * * Required, Integer, 1 - 10 */ -@property (strong) NSNumber *majorVersion; +@property (strong) NSNumber<SDLInt> *majorVersion; /** * @abstract The minor version indicates a change to a previous version that should still allow to be run on an older version (with limited functionality) * * Required, Integer, 0 - 1000 */ -@property (strong) NSNumber *minorVersion; +@property (strong) NSNumber<SDLInt> *minorVersion; @end diff --git a/SmartDeviceLink/SDLSyncMsgVersion.m b/SmartDeviceLink/SDLSyncMsgVersion.m index 8bc6cfd1c..445584fb4 100644 --- a/SmartDeviceLink/SDLSyncMsgVersion.m +++ b/SmartDeviceLink/SDLSyncMsgVersion.m @@ -8,7 +8,7 @@ @implementation SDLSyncMsgVersion -- (void)setMajorVersion:(NSNumber *)majorVersion { +- (void)setMajorVersion:(NSNumber<SDLInt> *)majorVersion { if (majorVersion != nil) { [store setObject:majorVersion forKey:SDLNameMajorVersion]; } else { @@ -16,11 +16,11 @@ } } -- (NSNumber *)majorVersion { +- (NSNumber<SDLInt> *)majorVersion { return [store objectForKey:SDLNameMajorVersion]; } -- (void)setMinorVersion:(NSNumber *)minorVersion { +- (void)setMinorVersion:(NSNumber<SDLInt> *)minorVersion { if (minorVersion != nil) { [store setObject:minorVersion forKey:SDLNameMinorVersion]; } else { @@ -28,7 +28,7 @@ } } -- (NSNumber *)minorVersion { +- (NSNumber<SDLInt> *)minorVersion { return [store objectForKey:SDLNameMinorVersion]; } diff --git a/SmartDeviceLink/SDLTextField.h b/SmartDeviceLink/SDLTextField.h index efa61184a..b4ba0ea4f 100644 --- a/SmartDeviceLink/SDLTextField.h +++ b/SmartDeviceLink/SDLTextField.h @@ -81,13 +81,13 @@ * * Required, Integer 1 - 500 */ -@property (strong) NSNumber *width; +@property (strong) NSNumber<SDLInt> *width; /** * @abstract The number of rows for this text field. * * Required, Integer 1 - 8 */ -@property (strong) NSNumber *rows; +@property (strong) NSNumber<SDLInt> *rows; @end diff --git a/SmartDeviceLink/SDLTextField.m b/SmartDeviceLink/SDLTextField.m index 3e12369d0..21d2bca7c 100644 --- a/SmartDeviceLink/SDLTextField.m +++ b/SmartDeviceLink/SDLTextField.m @@ -36,7 +36,7 @@ return (SDLCharacterSet)obj; } -- (void)setWidth:(NSNumber *)width { +- (void)setWidth:(NSNumber<SDLInt> *)width { if (width != nil) { [store setObject:width forKey:SDLNameWidth]; } else { @@ -44,11 +44,11 @@ } } -- (NSNumber *)width { +- (NSNumber<SDLInt> *)width { return [store objectForKey:SDLNameWidth]; } -- (void)setRows:(NSNumber *)rows { +- (void)setRows:(NSNumber<SDLInt> *)rows { if (rows != nil) { [store setObject:rows forKey:SDLNameRows]; } else { @@ -56,7 +56,7 @@ } } -- (NSNumber *)rows { +- (NSNumber<SDLInt> *)rows { return [store objectForKey:SDLNameRows]; } diff --git a/SmartDeviceLink/SDLTouchCoord.h b/SmartDeviceLink/SDLTouchCoord.h index f3dbda487..8e719e3a8 100644 --- a/SmartDeviceLink/SDLTouchCoord.h +++ b/SmartDeviceLink/SDLTouchCoord.h @@ -6,7 +6,7 @@ @interface SDLTouchCoord : SDLRPCStruct -@property (strong) NSNumber *x; -@property (strong) NSNumber *y; +@property (strong) NSNumber<SDLFloat> *x; +@property (strong) NSNumber<SDLFloat> *y; @end diff --git a/SmartDeviceLink/SDLTouchCoord.m b/SmartDeviceLink/SDLTouchCoord.m index 7a788582a..40a842140 100644 --- a/SmartDeviceLink/SDLTouchCoord.m +++ b/SmartDeviceLink/SDLTouchCoord.m @@ -8,7 +8,7 @@ @implementation SDLTouchCoord -- (void)setX:(NSNumber *)x { +- (void)setX:(NSNumber<SDLFloat> *)x { if (x != nil) { [store setObject:x forKey:SDLNameX]; } else { @@ -16,11 +16,11 @@ } } -- (NSNumber *)x { +- (NSNumber<SDLFloat> *)x { return [store objectForKey:SDLNameX]; } -- (void)setY:(NSNumber *)y { +- (void)setY:(NSNumber<SDLFloat> *)y { if (y != nil) { [store setObject:y forKey:SDLNameY]; } else { @@ -28,7 +28,7 @@ } } -- (NSNumber *)y { +- (NSNumber<SDLFloat> *)y { return [store objectForKey:SDLNameY]; } diff --git a/SmartDeviceLink/SDLTouchEvent.h b/SmartDeviceLink/SDLTouchEvent.h index 4ac027f10..83a090b50 100644 --- a/SmartDeviceLink/SDLTouchEvent.h +++ b/SmartDeviceLink/SDLTouchEvent.h @@ -15,7 +15,7 @@ Mandatory, 0-9 */ -@property (strong) NSNumber *touchEventId; +@property (strong) NSNumber<SDLInt> *touchEventId; /** The time that the touch was recorded. This number can the time since the beginning of the session or something else as long as the units are in milliseconds. @@ -28,7 +28,7 @@ Mandatory, array size 1-1000, contains <NSNumber> size 0-5000000000 */ -@property (strong) NSMutableArray<NSNumber *> *timeStamp; +@property (strong) NSMutableArray<NSNumber<SDLInt> *> *timeStamp; /** * Mandatory, array size 1-1000, contains SDLTouchCoord diff --git a/SmartDeviceLink/SDLTouchEvent.m b/SmartDeviceLink/SDLTouchEvent.m index 6548372c3..632bc6994 100644 --- a/SmartDeviceLink/SDLTouchEvent.m +++ b/SmartDeviceLink/SDLTouchEvent.m @@ -9,7 +9,7 @@ @implementation SDLTouchEvent -- (void)setTouchEventId:(NSNumber *)touchEventId { +- (void)setTouchEventId:(NSNumber<SDLInt> *)touchEventId { if (touchEventId != nil) { [store setObject:touchEventId forKey:SDLNameId]; } else { @@ -17,11 +17,11 @@ } } -- (NSNumber *)touchEventId { +- (NSNumber<SDLInt> *)touchEventId { return [store objectForKey:SDLNameId]; } -- (void)setTimeStamp:(NSMutableArray<NSNumber *> *)timeStamp { +- (void)setTimeStamp:(NSMutableArray<NSNumber<SDLInt> *> *)timeStamp { if (timeStamp != nil) { [store setObject:timeStamp forKey:SDLNameTimestamp]; } else { @@ -29,7 +29,7 @@ } } -- (NSMutableArray<NSNumber *> *)timeStamp { +- (NSMutableArray<NSNumber<SDLInt> *> *)timeStamp { return [store objectForKey:SDLNameTimestamp]; } diff --git a/SmartDeviceLink/SDLTouchEventCapabilities.h b/SmartDeviceLink/SDLTouchEventCapabilities.h index e8aadf97f..40f37801a 100644 --- a/SmartDeviceLink/SDLTouchEventCapabilities.h +++ b/SmartDeviceLink/SDLTouchEventCapabilities.h @@ -6,8 +6,8 @@ @interface SDLTouchEventCapabilities : SDLRPCStruct -@property (strong) NSNumber *pressAvailable; -@property (strong) NSNumber *multiTouchAvailable; -@property (strong) NSNumber *doublePressAvailable; +@property (strong) NSNumber<SDLBool> *pressAvailable; +@property (strong) NSNumber<SDLBool> *multiTouchAvailable; +@property (strong) NSNumber<SDLBool> *doublePressAvailable; @end diff --git a/SmartDeviceLink/SDLTouchEventCapabilities.m b/SmartDeviceLink/SDLTouchEventCapabilities.m index 3d3869332..1f307ede6 100644 --- a/SmartDeviceLink/SDLTouchEventCapabilities.m +++ b/SmartDeviceLink/SDLTouchEventCapabilities.m @@ -8,7 +8,7 @@ @implementation SDLTouchEventCapabilities -- (void)setPressAvailable:(NSNumber *)pressAvailable { +- (void)setPressAvailable:(NSNumber<SDLBool> *)pressAvailable { if (pressAvailable != nil) { [store setObject:pressAvailable forKey:SDLNamePressAvailable]; } else { @@ -16,11 +16,11 @@ } } -- (NSNumber *)pressAvailable { +- (NSNumber<SDLBool> *)pressAvailable { return [store objectForKey:SDLNamePressAvailable]; } -- (void)setMultiTouchAvailable:(NSNumber *)multiTouchAvailable { +- (void)setMultiTouchAvailable:(NSNumber<SDLBool> *)multiTouchAvailable { if (multiTouchAvailable != nil) { [store setObject:multiTouchAvailable forKey:SDLNameMultiTouchAvailable]; } else { @@ -28,11 +28,11 @@ } } -- (NSNumber *)multiTouchAvailable { +- (NSNumber<SDLBool> *)multiTouchAvailable { return [store objectForKey:SDLNameMultiTouchAvailable]; } -- (void)setDoublePressAvailable:(NSNumber *)doublePressAvailable { +- (void)setDoublePressAvailable:(NSNumber<SDLBool> *)doublePressAvailable { if (doublePressAvailable != nil) { [store setObject:doublePressAvailable forKey:SDLNameDoublePressAvailable]; } else { @@ -40,7 +40,7 @@ } } -- (NSNumber *)doublePressAvailable { +- (NSNumber<SDLBool> *)doublePressAvailable { return [store objectForKey:SDLNameDoublePressAvailable]; } diff --git a/SmartDeviceLink/SDLUnsubscribeVehicleData.h b/SmartDeviceLink/SDLUnsubscribeVehicleData.h index 2b6d2ee8b..f72b58dd6 100644 --- a/SmartDeviceLink/SDLUnsubscribeVehicleData.h +++ b/SmartDeviceLink/SDLUnsubscribeVehicleData.h @@ -21,97 +21,97 @@ /** * @abstract A boolean value. If true, unsubscribes Gps data */ -@property (strong) NSNumber *gps; +@property (strong) NSNumber<SDLBool> *gps; /** * @abstract A boolean value. If true, unsubscribes speed data */ -@property (strong) NSNumber *speed; +@property (strong) NSNumber<SDLBool> *speed; /** * @abstract A boolean value. If true, unsubscribe data */ -@property (strong) NSNumber *rpm; +@property (strong) NSNumber<SDLBool> *rpm; /** * @abstract A boolean value. If true, unsubscribes FuelLevel data */ -@property (strong) NSNumber *fuelLevel; +@property (strong) NSNumber<SDLBool> *fuelLevel; /** * @abstract A boolean value. If true, unsubscribes fuelLevel_State data */ -@property (strong) NSNumber *fuelLevel_State; +@property (strong) NSNumber<SDLBool> *fuelLevel_State; /** * @abstract A boolean value. If true, unsubscribes instantFuelConsumption data */ -@property (strong) NSNumber *instantFuelConsumption; +@property (strong) NSNumber<SDLBool> *instantFuelConsumption; /** * @abstract A boolean value. If true, unsubscribes externalTemperature data */ -@property (strong) NSNumber *externalTemperature; +@property (strong) NSNumber<SDLBool> *externalTemperature; /** * @abstract A boolean value. If true, unsubscribes Currently selected gear data */ -@property (strong) NSNumber *prndl; +@property (strong) NSNumber<SDLBool> *prndl; /** * @abstract A boolean value. If true, unsubscribes tire pressure status data */ -@property (strong) NSNumber *tirePressure; +@property (strong) NSNumber<SDLBool> *tirePressure; /** * @abstract A boolean value. If true, unsubscribes odometer data */ -@property (strong) NSNumber *odometer; +@property (strong) NSNumber<SDLBool> *odometer; /** * @abstract A boolean value. If true, unsubscribes belt Status data */ -@property (strong) NSNumber *beltStatus; +@property (strong) NSNumber<SDLBool> *beltStatus; /** * @abstract A boolean value. If true, unsubscribes body Information data */ -@property (strong) NSNumber *bodyInformation; +@property (strong) NSNumber<SDLBool> *bodyInformation; /** * @abstract A boolean value. If true, unsubscribes device Status data */ -@property (strong) NSNumber *deviceStatus; +@property (strong) NSNumber<SDLBool> *deviceStatus; /** * @abstract A boolean value. If true, unsubscribes driver Braking data */ -@property (strong) NSNumber *driverBraking; +@property (strong) NSNumber<SDLBool> *driverBraking; /** * @abstract A boolean value. If true, unsubscribes wiper Status data */ -@property (strong) NSNumber *wiperStatus; +@property (strong) NSNumber<SDLBool> *wiperStatus; /** * @abstract A boolean value. If true, unsubscribes Head Lamp Status data */ -@property (strong) NSNumber *headLampStatus; +@property (strong) NSNumber<SDLBool> *headLampStatus; /** * @abstract A boolean value. If true, unsubscribes Engine Torque data */ -@property (strong) NSNumber *engineTorque; +@property (strong) NSNumber<SDLBool> *engineTorque; /** * @abstract A boolean value. If true, unsubscribes accPedalPosition data */ -@property (strong) NSNumber *accPedalPosition; -@property (strong) NSNumber *steeringWheelAngle; -@property (strong) NSNumber *eCallInfo; -@property (strong) NSNumber *airbagStatus; -@property (strong) NSNumber *emergencyEvent; -@property (strong) NSNumber *clusterModeStatus; -@property (strong) NSNumber *myKey; +@property (strong) NSNumber<SDLBool> *accPedalPosition; +@property (strong) NSNumber<SDLBool> *steeringWheelAngle; +@property (strong) NSNumber<SDLBool> *eCallInfo; +@property (strong) NSNumber<SDLBool> *airbagStatus; +@property (strong) NSNumber<SDLBool> *emergencyEvent; +@property (strong) NSNumber<SDLBool> *clusterModeStatus; +@property (strong) NSNumber<SDLBool> *myKey; @end diff --git a/SmartDeviceLink/SDLUnsubscribeVehicleData.m b/SmartDeviceLink/SDLUnsubscribeVehicleData.m index ed0e0d407..68659adec 100644 --- a/SmartDeviceLink/SDLUnsubscribeVehicleData.m +++ b/SmartDeviceLink/SDLUnsubscribeVehicleData.m @@ -14,7 +14,7 @@ return self; } -- (void)setGps:(NSNumber *)gps { +- (void)setGps:(NSNumber<SDLBool> *)gps { if (gps != nil) { [parameters setObject:gps forKey:SDLNameGPS]; } else { @@ -22,11 +22,11 @@ } } -- (NSNumber *)gps { +- (NSNumber<SDLBool> *)gps { return [parameters objectForKey:SDLNameGPS]; } -- (void)setSpeed:(NSNumber *)speed { +- (void)setSpeed:(NSNumber<SDLBool> *)speed { if (speed != nil) { [parameters setObject:speed forKey:SDLNameSpeed]; } else { @@ -34,11 +34,11 @@ } } -- (NSNumber *)speed { +- (NSNumber<SDLBool> *)speed { return [parameters objectForKey:SDLNameSpeed]; } -- (void)setRpm:(NSNumber *)rpm { +- (void)setRpm:(NSNumber<SDLBool> *)rpm { if (rpm != nil) { [parameters setObject:rpm forKey:SDLNameRPM]; } else { @@ -46,11 +46,11 @@ } } -- (NSNumber *)rpm { +- (NSNumber<SDLBool> *)rpm { return [parameters objectForKey:SDLNameRPM]; } -- (void)setFuelLevel:(NSNumber *)fuelLevel { +- (void)setFuelLevel:(NSNumber<SDLBool> *)fuelLevel { if (fuelLevel != nil) { [parameters setObject:fuelLevel forKey:SDLNameFuelLevel]; } else { @@ -58,11 +58,11 @@ } } -- (NSNumber *)fuelLevel { +- (NSNumber<SDLBool> *)fuelLevel { return [parameters objectForKey:SDLNameFuelLevel]; } -- (void)setFuelLevel_State:(NSNumber *)fuelLevel_State { +- (void)setFuelLevel_State:(NSNumber<SDLBool> *)fuelLevel_State { if (fuelLevel_State != nil) { [parameters setObject:fuelLevel_State forKey:SDLNameFuelLevelState]; } else { @@ -70,11 +70,11 @@ } } -- (NSNumber *)fuelLevel_State { +- (NSNumber<SDLBool> *)fuelLevel_State { return [parameters objectForKey:SDLNameFuelLevelState]; } -- (void)setInstantFuelConsumption:(NSNumber *)instantFuelConsumption { +- (void)setInstantFuelConsumption:(NSNumber<SDLBool> *)instantFuelConsumption { if (instantFuelConsumption != nil) { [parameters setObject:instantFuelConsumption forKey:SDLNameInstantFuelConsumption]; } else { @@ -82,11 +82,11 @@ } } -- (NSNumber *)instantFuelConsumption { +- (NSNumber<SDLBool> *)instantFuelConsumption { return [parameters objectForKey:SDLNameInstantFuelConsumption]; } -- (void)setExternalTemperature:(NSNumber *)externalTemperature { +- (void)setExternalTemperature:(NSNumber<SDLBool> *)externalTemperature { if (externalTemperature != nil) { [parameters setObject:externalTemperature forKey:SDLNameExternalTemperature]; } else { @@ -94,11 +94,11 @@ } } -- (NSNumber *)externalTemperature { +- (NSNumber<SDLBool> *)externalTemperature { return [parameters objectForKey:SDLNameExternalTemperature]; } -- (void)setPrndl:(NSNumber *)prndl { +- (void)setPrndl:(NSNumber<SDLBool> *)prndl { if (prndl != nil) { [parameters setObject:prndl forKey:SDLNamePRNDL]; } else { @@ -106,11 +106,11 @@ } } -- (NSNumber *)prndl { +- (NSNumber<SDLBool> *)prndl { return [parameters objectForKey:SDLNamePRNDL]; } -- (void)setTirePressure:(NSNumber *)tirePressure { +- (void)setTirePressure:(NSNumber<SDLBool> *)tirePressure { if (tirePressure != nil) { [parameters setObject:tirePressure forKey:SDLNameTirePressure]; } else { @@ -118,11 +118,11 @@ } } -- (NSNumber *)tirePressure { +- (NSNumber<SDLBool> *)tirePressure { return [parameters objectForKey:SDLNameTirePressure]; } -- (void)setOdometer:(NSNumber *)odometer { +- (void)setOdometer:(NSNumber<SDLBool> *)odometer { if (odometer != nil) { [parameters setObject:odometer forKey:SDLNameOdometer]; } else { @@ -130,11 +130,11 @@ } } -- (NSNumber *)odometer { +- (NSNumber<SDLBool> *)odometer { return [parameters objectForKey:SDLNameOdometer]; } -- (void)setBeltStatus:(NSNumber *)beltStatus { +- (void)setBeltStatus:(NSNumber<SDLBool> *)beltStatus { if (beltStatus != nil) { [parameters setObject:beltStatus forKey:SDLNameBeltStatus]; } else { @@ -142,11 +142,11 @@ } } -- (NSNumber *)beltStatus { +- (NSNumber<SDLBool> *)beltStatus { return [parameters objectForKey:SDLNameBeltStatus]; } -- (void)setBodyInformation:(NSNumber *)bodyInformation { +- (void)setBodyInformation:(NSNumber<SDLBool> *)bodyInformation { if (bodyInformation != nil) { [parameters setObject:bodyInformation forKey:SDLNameBodyInformation]; } else { @@ -154,11 +154,11 @@ } } -- (NSNumber *)bodyInformation { +- (NSNumber<SDLBool> *)bodyInformation { return [parameters objectForKey:SDLNameBodyInformation]; } -- (void)setDeviceStatus:(NSNumber *)deviceStatus { +- (void)setDeviceStatus:(NSNumber<SDLBool> *)deviceStatus { if (deviceStatus != nil) { [parameters setObject:deviceStatus forKey:SDLNameDeviceStatus]; } else { @@ -166,11 +166,11 @@ } } -- (NSNumber *)deviceStatus { +- (NSNumber<SDLBool> *)deviceStatus { return [parameters objectForKey:SDLNameDeviceStatus]; } -- (void)setDriverBraking:(NSNumber *)driverBraking { +- (void)setDriverBraking:(NSNumber<SDLBool> *)driverBraking { if (driverBraking != nil) { [parameters setObject:driverBraking forKey:SDLNameDriverBraking]; } else { @@ -178,11 +178,11 @@ } } -- (NSNumber *)driverBraking { +- (NSNumber<SDLBool> *)driverBraking { return [parameters objectForKey:SDLNameDriverBraking]; } -- (void)setWiperStatus:(NSNumber *)wiperStatus { +- (void)setWiperStatus:(NSNumber<SDLBool> *)wiperStatus { if (wiperStatus != nil) { [parameters setObject:wiperStatus forKey:SDLNameWiperStatus]; } else { @@ -190,11 +190,11 @@ } } -- (NSNumber *)wiperStatus { +- (NSNumber<SDLBool> *)wiperStatus { return [parameters objectForKey:SDLNameWiperStatus]; } -- (void)setHeadLampStatus:(NSNumber *)headLampStatus { +- (void)setHeadLampStatus:(NSNumber<SDLBool> *)headLampStatus { if (headLampStatus != nil) { [parameters setObject:headLampStatus forKey:SDLNameHeadLampStatus]; } else { @@ -202,11 +202,11 @@ } } -- (NSNumber *)headLampStatus { +- (NSNumber<SDLBool> *)headLampStatus { return [parameters objectForKey:SDLNameHeadLampStatus]; } -- (void)setEngineTorque:(NSNumber *)engineTorque { +- (void)setEngineTorque:(NSNumber<SDLBool> *)engineTorque { if (engineTorque != nil) { [parameters setObject:engineTorque forKey:SDLNameEngineTorque]; } else { @@ -214,11 +214,11 @@ } } -- (NSNumber *)engineTorque { +- (NSNumber<SDLBool> *)engineTorque { return [parameters objectForKey:SDLNameEngineTorque]; } -- (void)setAccPedalPosition:(NSNumber *)accPedalPosition { +- (void)setAccPedalPosition:(NSNumber<SDLBool> *)accPedalPosition { if (accPedalPosition != nil) { [parameters setObject:accPedalPosition forKey:SDLNameAccelerationPedalPosition]; } else { @@ -226,11 +226,11 @@ } } -- (NSNumber *)accPedalPosition { +- (NSNumber<SDLBool> *)accPedalPosition { return [parameters objectForKey:SDLNameAccelerationPedalPosition]; } -- (void)setSteeringWheelAngle:(NSNumber *)steeringWheelAngle { +- (void)setSteeringWheelAngle:(NSNumber<SDLBool> *)steeringWheelAngle { if (steeringWheelAngle != nil) { [parameters setObject:steeringWheelAngle forKey:SDLNameSteeringWheelAngle]; } else { @@ -238,11 +238,11 @@ } } -- (NSNumber *)steeringWheelAngle { +- (NSNumber<SDLBool> *)steeringWheelAngle { return [parameters objectForKey:SDLNameSteeringWheelAngle]; } -- (void)setECallInfo:(NSNumber *)eCallInfo { +- (void)setECallInfo:(NSNumber<SDLBool> *)eCallInfo { if (eCallInfo != nil) { [parameters setObject:eCallInfo forKey:SDLNameECallInfo]; } else { @@ -250,11 +250,11 @@ } } -- (NSNumber *)eCallInfo { +- (NSNumber<SDLBool> *)eCallInfo { return [parameters objectForKey:SDLNameECallInfo]; } -- (void)setAirbagStatus:(NSNumber *)airbagStatus { +- (void)setAirbagStatus:(NSNumber<SDLBool> *)airbagStatus { if (airbagStatus != nil) { [parameters setObject:airbagStatus forKey:SDLNameAirbagStatus]; } else { @@ -262,11 +262,11 @@ } } -- (NSNumber *)airbagStatus { +- (NSNumber<SDLBool> *)airbagStatus { return [parameters objectForKey:SDLNameAirbagStatus]; } -- (void)setEmergencyEvent:(NSNumber *)emergencyEvent { +- (void)setEmergencyEvent:(NSNumber<SDLBool> *)emergencyEvent { if (emergencyEvent != nil) { [parameters setObject:emergencyEvent forKey:SDLNameEmergencyEvent]; } else { @@ -274,11 +274,11 @@ } } -- (NSNumber *)emergencyEvent { +- (NSNumber<SDLBool> *)emergencyEvent { return [parameters objectForKey:SDLNameEmergencyEvent]; } -- (void)setClusterModeStatus:(NSNumber *)clusterModeStatus { +- (void)setClusterModeStatus:(NSNumber<SDLBool> *)clusterModeStatus { if (clusterModeStatus != nil) { [parameters setObject:clusterModeStatus forKey:SDLNameClusterModeStatus]; } else { @@ -286,11 +286,11 @@ } } -- (NSNumber *)clusterModeStatus { +- (NSNumber<SDLBool> *)clusterModeStatus { return [parameters objectForKey:SDLNameClusterModeStatus]; } -- (void)setMyKey:(NSNumber *)myKey { +- (void)setMyKey:(NSNumber<SDLBool> *)myKey { if (myKey != nil) { [parameters setObject:myKey forKey:SDLNameMyKey]; } else { @@ -298,7 +298,7 @@ } } -- (NSNumber *)myKey { +- (NSNumber<SDLBool> *)myKey { return [parameters objectForKey:SDLNameMyKey]; } diff --git a/SmartDeviceLink/SDLVrHelpItem.h b/SmartDeviceLink/SDLVrHelpItem.h index de4fb6088..1203269aa 100644 --- a/SmartDeviceLink/SDLVrHelpItem.h +++ b/SmartDeviceLink/SDLVrHelpItem.h @@ -10,6 +10,6 @@ @property (strong) NSString *text; @property (strong) SDLImage *image; -@property (strong) NSNumber *position; +@property (strong) NSNumber<SDLInt> *position; @end diff --git a/SmartDeviceLink/SDLVrHelpItem.m b/SmartDeviceLink/SDLVrHelpItem.m index e47067f16..97d26d2cd 100644 --- a/SmartDeviceLink/SDLVrHelpItem.m +++ b/SmartDeviceLink/SDLVrHelpItem.m @@ -38,7 +38,7 @@ } } -- (void)setPosition:(NSNumber *)position { +- (void)setPosition:(NSNumber<SDLInt> *)position { if (position != nil) { [store setObject:position forKey:SDLNamePosition]; } else { @@ -46,7 +46,7 @@ } } -- (NSNumber *)position { +- (NSNumber<SDLInt> *)position { return [store objectForKey:SDLNamePosition]; } |