summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicoleYarroch <nicole@livio.io>2017-10-19 13:54:29 -0400
committerNicoleYarroch <nicole@livio.io>2017-10-19 13:54:29 -0400
commit6b5aa120e6af0d97e546432b65cdfae22a922e61 (patch)
tree9534b74077f937b27b9613a1234d5d0e09c6d72f
parent11d51cf85353b9cf5590576df3ede99b7a60cf64 (diff)
downloadsdl_ios-6b5aa120e6af0d97e546432b65cdfae22a922e61.tar.gz
Testing
-rw-r--r--SmartDeviceLink_Example/Classes/ProxyManager.m6
-rw-r--r--SmartDeviceLink_Example/Managers/SoftButtonManager.m4
-rw-r--r--SmartDeviceLink_Example/ProxyMenuManager.m10
3 files changed, 16 insertions, 4 deletions
diff --git a/SmartDeviceLink_Example/Classes/ProxyManager.m b/SmartDeviceLink_Example/Classes/ProxyManager.m
index 6cde7f703..00afa0206 100644
--- a/SmartDeviceLink_Example/Classes/ProxyManager.m
+++ b/SmartDeviceLink_Example/Classes/ProxyManager.m
@@ -10,8 +10,10 @@
#import "SoftButtonManager.h"
#import "TemplateManager.h"
-NSString *const SDLAppName = @"SDL Example App";
-NSString *const SDLAppId = @"9999";
+NSString *const SDLAppName = @"Antelope";
+// @"SDL Example App";
+NSString *const SDLAppId = @"2626965156";
+// @"9999";
typedef NS_ENUM(NSUInteger, SDLHMIFirstState) {
SDLHMIFirstStateNone,
diff --git a/SmartDeviceLink_Example/Managers/SoftButtonManager.m b/SmartDeviceLink_Example/Managers/SoftButtonManager.m
index a020e1abb..3271b3d36 100644
--- a/SmartDeviceLink_Example/Managers/SoftButtonManager.m
+++ b/SmartDeviceLink_Example/Managers/SoftButtonManager.m
@@ -73,7 +73,9 @@ NS_ASSUME_NONNULL_BEGIN
duration:5
withManager:manager];
};
- [softButtons addObject:[self.class createSoftButtonWithText:[NSString stringWithFormat:@"Button%d", i] softButtonId:i manager:manager handler:softButtonHandler]];
+ [softButtons addObject:[self.class createSoftButtonWithImageName:[ImageManager hexagonOnImageName] softButtonId:i manager:manager handler:softButtonHandler]];
+// [softButtons addObject:[self.class createSoftButtonWithTextAndImage:[NSString stringWithFormat:@"Button%d", i] imageName:[ImageManager starImageName] softButtonId:i manager:manager handler:softButtonHandler]];
+// [softButtons addObject:[self.class createSoftButtonWithText:[NSString stringWithFormat:@"Button%d", i] softButtonId:i manager:manager handler:softButtonHandler]];
}
return softButtons;
}
diff --git a/SmartDeviceLink_Example/ProxyMenuManager.m b/SmartDeviceLink_Example/ProxyMenuManager.m
index 217ea962c..8def1fb42 100644
--- a/SmartDeviceLink_Example/ProxyMenuManager.m
+++ b/SmartDeviceLink_Example/ProxyMenuManager.m
@@ -308,7 +308,10 @@ static const int choiceId = 10005;
#pragma mark - Vehicle Data
+ (void)sdlex_subscribeVehicleData:(SDLManager *)manager {
- SDLSubscribeVehicleData *subscribeVehicleData = [[SDLSubscribeVehicleData alloc] initWithAccelerationPedalPosition:YES airbagStatus:YES beltStatus:YES bodyInformation:YES clusterModeStatus:YES deviceStatus:YES driverBraking:YES eCallInfo:YES emergencyEvent:YES engineTorque:YES externalTemperature:YES fuelLevel:YES fuelLevelState:YES gps:YES headLampStatus:YES instantFuelConsumption:YES myKey:YES odometer:YES prndl:YES rpm:YES speed:YES steeringWheelAngle:YES tirePressure:YES wiperStatus:YES];
+ SDLSubscribeVehicleData *subscribeVehicleData = [[SDLSubscribeVehicleData alloc] init];
+ subscribeVehicleData.accPedalPosition = @YES;
+ subscribeVehicleData.gps = @YES;
+ // [[SDLSubscribeVehicleData alloc] initWithAccelerationPedalPosition:YES airbagStatus:YES beltStatus:YES bodyInformation:YES clusterModeStatus:YES deviceStatus:YES driverBraking:YES eCallInfo:YES emergencyEvent:YES engineTorque:YES externalTemperature:YES fuelLevel:YES fuelLevelState:YES gps:YES headLampStatus:YES instantFuelConsumption:YES myKey:YES odometer:YES prndl:YES rpm:YES speed:YES steeringWheelAngle:YES tirePressure:YES wiperStatus:YES];
[manager sendRequest:subscribeVehicleData withResponseHandler:^(__kindof SDLRPCRequest * _Nullable request, __kindof SDLRPCResponse * _Nullable response, NSError * _Nullable error) {
[self.class sdlex_sendAlert:manager message:[NSString stringWithFormat:@"Subscribe Vehicle Data RPC sent. Response: %@", response.resultCode]];
}];
@@ -316,6 +319,11 @@ static const int choiceId = 10005;
+ (void)sdlex_unsubscribeVehicleData:(SDLManager *)manager {
SDLUnsubscribeVehicleData *unsubscribeVehicleData = [[SDLUnsubscribeVehicleData alloc] init];
+ unsubscribeVehicleData.accPedalPosition = @YES;
+ // [[SDLUnsubscribeVehicleData alloc] initWithAccelerationPedalPosition:YES airbagStatus:YES beltStatus:YES bodyInformation:YES clusterModeStatus:YES deviceStatus:YES driverBraking:YES eCallInfo:YES emergencyEvent:YES engineTorque:YES externalTemperature:NO fuelLevel:YES fuelLevelState:YES gps:YES headLampStatus:YES instantFuelConsumption:YES myKey:YES odometer:YES prndl:YES rpm:YES speed:YES steeringWheelAngle:YES tirePressure:YES wiperStatus:YES];
+
+ // [[SDLUnsubscribeVehicleData alloc] initWithAccelerationPedalPosition:YES airbagStatus:NO beltStatus:NO bodyInformation:NO clusterModeStatus:NO deviceStatus:NO driverBraking:NO eCallInfo:NO emergencyEvent:NO engineTorque:NO externalTemperature:NO fuelLevel:NO fuelLevelState:NO gps:NO headLampStatus:NO instantFuelConsumption:NO myKey:NO odometer:NO prndl:NO rpm:NO speed:NO steeringWheelAngle:NO tirePressure:NO wiperStatus:NO];
+ // unsubscribeVehicleData.accPedalPosition = @YES;
[manager sendRequest:unsubscribeVehicleData withResponseHandler:^(__kindof SDLRPCRequest * _Nullable request, __kindof SDLRPCResponse * _Nullable response, NSError * _Nullable error) {
[self.class sdlex_sendAlert:manager message:[NSString stringWithFormat:@"Unsubscribe Vehicle Data RPC sent. Response: %@", response.resultCode]];
}];