diff options
author | leonid lokhmatov, Luxoft <zaqqqqqqqq@gmail.com> | 2020-08-11 16:39:15 +0300 |
---|---|---|
committer | leonid lokhmatov, Luxoft <zaqqqqqqqq@gmail.com> | 2020-08-11 16:39:15 +0300 |
commit | ace1f4e81f7ce5a251cc809395637e94066ff1fe (patch) | |
tree | 7f2be6a3a838cb6bc5a8612030c665fc6fac8a0c /Example Apps | |
parent | 8cdba98545db7e9efc9b29002b8be7115b52552f (diff) | |
download | sdl_ios-ace1f4e81f7ce5a251cc809395637e94066ff1fe.tar.gz |
0266 "New vehicle data GearStatus": code review 4, fix obj-c example app.
Diffstat (limited to 'Example Apps')
-rw-r--r-- | Example Apps/Example ObjC/MenuManager.m | 2 | ||||
-rw-r--r-- | Example Apps/Example ObjC/VehicleDataManager.m | 7 | ||||
-rw-r--r-- | Example Apps/Example Swift/MenuManager.swift | 2 | ||||
-rw-r--r-- | Example Apps/Shared/AppConstants.h | 1 | ||||
-rw-r--r-- | Example Apps/Shared/AppConstants.m | 1 |
5 files changed, 10 insertions, 3 deletions
diff --git a/Example Apps/Example ObjC/MenuManager.m b/Example Apps/Example ObjC/MenuManager.m index 00a05b377..6ed1f1f2c 100644 --- a/Example Apps/Example ObjC/MenuManager.m +++ b/Example Apps/Example ObjC/MenuManager.m @@ -62,7 +62,7 @@ NS_ASSUME_NONNULL_BEGIN } + (NSArray<NSString *> *)sdlex_allVehicleDataTypes { - return @[ACAccelerationPedalPositionMenuName, ACAirbagStatusMenuName, ACBeltStatusMenuName, ACBodyInformationMenuName, ACClusterModeStatusMenuName, ACDeviceStatusMenuName, ACDriverBrakingMenuName, ACECallInfoMenuName, ACElectronicParkBrakeStatus, ACEmergencyEventMenuName, ACEngineOilLifeMenuName, ACEngineTorqueMenuName, ACExternalTemperatureMenuName, ACFuelLevelMenuName, ACFuelLevelStateMenuName, ACFuelRangeMenuName, ACGPSMenuName, ACHeadLampStatusMenuName, ACInstantFuelConsumptionMenuName, ACMyKeyMenuName, ACOdometerMenuName, ACPRNDLMenuName, ACRPMMenuName, ACSpeedMenuName, ACSteeringWheelAngleMenuName, ACTirePressureMenuName, ACTurnSignalMenuName, ACVINMenuName, ACWiperStatusMenuName]; + return @[ACAccelerationPedalPositionMenuName, ACAirbagStatusMenuName, ACBeltStatusMenuName, ACBodyInformationMenuName, ACClusterModeStatusMenuName, ACDeviceStatusMenuName, ACDriverBrakingMenuName, ACECallInfoMenuName, ACElectronicParkBrakeStatus, ACEmergencyEventMenuName, ACEngineOilLifeMenuName, ACEngineTorqueMenuName, ACExternalTemperatureMenuName, ACFuelLevelMenuName, ACFuelLevelStateMenuName, ACFuelRangeMenuName, ACGearStatusMenuName, ACGPSMenuName, ACHeadLampStatusMenuName, ACInstantFuelConsumptionMenuName, ACMyKeyMenuName, ACOdometerMenuName, ACPRNDLMenuName, ACRPMMenuName, ACSpeedMenuName, ACSteeringWheelAngleMenuName, ACTirePressureMenuName, ACTurnSignalMenuName, ACVINMenuName, ACWiperStatusMenuName]; } + (SDLMenuCell *)sdlex_menuCellShowPerformInteractionWithManager:(SDLManager *)manager performManager:(PerformInteractionManager *)performManager { diff --git a/Example Apps/Example ObjC/VehicleDataManager.m b/Example Apps/Example ObjC/VehicleDataManager.m index 0b0d983fe..bd1a2fd3a 100644 --- a/Example Apps/Example ObjC/VehicleDataManager.m +++ b/Example Apps/Example ObjC/VehicleDataManager.m @@ -224,6 +224,8 @@ NS_ASSUME_NONNULL_BEGIN vehicleDataDescription = vehicleData.fuelLevel_State.description; } else if ([vehicleDataType isEqualToString:ACFuelRangeMenuName]) { vehicleDataDescription = vehicleData.fuelRange.description; + } else if ([vehicleDataType isEqualToString:ACGearStatusMenuName]) { + vehicleDataDescription = vehicleData.gearStatus.description; } else if ([vehicleDataType isEqualToString:ACGPSMenuName]) { vehicleDataDescription = vehicleData.gps.description; } else if ([vehicleDataType isEqualToString:ACHeadLampStatusMenuName]) { @@ -235,7 +237,10 @@ NS_ASSUME_NONNULL_BEGIN } else if ([vehicleDataType isEqualToString:ACOdometerMenuName]) { vehicleDataDescription = vehicleData.odometer.description; } else if ([vehicleDataType isEqualToString:ACPRNDLMenuName]) { - vehicleDataDescription = vehicleData.gearStatus.actualGear.description; +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" + vehicleDataDescription = vehicleData.prndl.description; +#pragma clang diagnostic pop } else if ([vehicleDataType isEqualToString:ACSpeedMenuName]) { vehicleDataDescription = vehicleData.speed.description; } else if ([vehicleDataType isEqualToString:ACSteeringWheelAngleMenuName]) { diff --git a/Example Apps/Example Swift/MenuManager.swift b/Example Apps/Example Swift/MenuManager.swift index cdf478149..397fa38b2 100644 --- a/Example Apps/Example Swift/MenuManager.swift +++ b/Example Apps/Example Swift/MenuManager.swift @@ -72,7 +72,7 @@ private extension MenuManager { /// A list of all possible vehicle data types static var allVehicleDataTypes: [String] { - return [ACAccelerationPedalPositionMenuName, ACAirbagStatusMenuName, ACBeltStatusMenuName, ACBodyInformationMenuName, ACClusterModeStatusMenuName, ACDeviceStatusMenuName, ACDriverBrakingMenuName, ACECallInfoMenuName, ACElectronicParkBrakeStatus, ACEmergencyEventMenuName, ACEngineOilLifeMenuName, ACEngineTorqueMenuName, ACExternalTemperatureMenuName, ACFuelLevelMenuName, ACFuelLevelStateMenuName, ACFuelRangeMenuName, ACGPSMenuName, ACHeadLampStatusMenuName, ACInstantFuelConsumptionMenuName, ACMyKeyMenuName, ACOdometerMenuName, ACPRNDLMenuName, ACRPMMenuName, ACSpeedMenuName, ACSteeringWheelAngleMenuName, ACTirePressureMenuName, ACTurnSignalMenuName, ACVINMenuName, ACWiperStatusMenuName] + return [ACAccelerationPedalPositionMenuName, ACAirbagStatusMenuName, ACBeltStatusMenuName, ACBodyInformationMenuName, ACClusterModeStatusMenuName, ACDeviceStatusMenuName, ACDriverBrakingMenuName, ACECallInfoMenuName, ACElectronicParkBrakeStatus, ACEmergencyEventMenuName, ACEngineOilLifeMenuName, ACEngineTorqueMenuName, ACExternalTemperatureMenuName, ACFuelLevelMenuName, ACFuelLevelStateMenuName, ACFuelRangeMenuName, ACGearStatusMenuName, ACGPSMenuName, ACHeadLampStatusMenuName, ACInstantFuelConsumptionMenuName, ACMyKeyMenuName, ACOdometerMenuName, ACPRNDLMenuName, ACRPMMenuName, ACSpeedMenuName, ACSteeringWheelAngleMenuName, ACTirePressureMenuName, ACTurnSignalMenuName, ACVINMenuName, ACWiperStatusMenuName] } /// Menu item that shows a custom menu (i.e. a Perform Interaction Choice Set) when selected diff --git a/Example Apps/Shared/AppConstants.h b/Example Apps/Shared/AppConstants.h index 5fb4b25b0..8f2e27fb6 100644 --- a/Example Apps/Shared/AppConstants.h +++ b/Example Apps/Shared/AppConstants.h @@ -101,6 +101,7 @@ extern NSString * const ACExternalTemperatureMenuName; extern NSString * const ACFuelLevelMenuName; extern NSString * const ACFuelLevelStateMenuName; extern NSString * const ACFuelRangeMenuName; +extern NSString * const ACGearStatusMenuName; extern NSString * const ACGPSMenuName; extern NSString * const ACHeadLampStatusMenuName; extern NSString * const ACInstantFuelConsumptionMenuName; diff --git a/Example Apps/Shared/AppConstants.m b/Example Apps/Shared/AppConstants.m index ffe4762d1..9ef0c0e8b 100644 --- a/Example Apps/Shared/AppConstants.m +++ b/Example Apps/Shared/AppConstants.m @@ -98,6 +98,7 @@ NSString * const ACExternalTemperatureMenuName = @"External Temperature"; NSString * const ACFuelLevelMenuName = @"Fuel Level"; NSString * const ACFuelLevelStateMenuName = @"Fuel Level State"; NSString * const ACFuelRangeMenuName = @"Fuel Range"; +NSString * const ACGearStatusMenuName = @"Gear Status"; NSString * const ACGPSMenuName = @"GPS"; NSString * const ACHeadLampStatusMenuName = @"Head Lamp Status"; NSString * const ACInstantFuelConsumptionMenuName = @"Instant Fuel Consumption"; |