Merge branch 'develop'

Author: joeljfischer

Podfile.lock

@@ -1,9 +1,9 @@
 PODS:
-  - BiSON (1.2.2)
-  - SmartDeviceLink (7.1.1):
+  - BiSON (1.2.5)
+  - SmartDeviceLink (7.2.0):
     - BiSON (~> 1.2)
-    - SmartDeviceLink/Default (= 7.1.1)
-  - SmartDeviceLink/Default (7.1.1):
+    - SmartDeviceLink/Default (= 7.2.0)
+  - SmartDeviceLink/Default (7.2.0):
     - BiSON (~> 1.2)
 
 DEPENDENCIES:
@@ -15,8 +15,8 @@ SPEC REPOS:
     - SmartDeviceLink
 
 SPEC CHECKSUMS:
-  BiSON: efb26805ec99f4ad516b77e9a32ced05f1c0985d
-  SmartDeviceLink: 9f00196ee6b4fc2f9bd2e8321de2b47a1258109e
+  BiSON: 232dc4fdbe825301742963f27a78f10f13bca68b
+  SmartDeviceLink: 9fa89b2d7eff9f7abe7e40fe609f57b06f8b73da
 
 PODFILE CHECKSUM: 6458ae1192665bc1781ad13cb2576fa31d74fc25
 

SmartDeviceLinkService.m

@@ -137,8 +137,8 @@ - (void)hmiLevel:(SDLHMILevel)oldLevel didChangeToLevel:(SDLHMILevel)newLevel {
     // check current HMI level of the app
     if ([SDLHMILevelFull isEqualToEnum:newLevel] && !self.hasFirstHMIFullOccurred) {
         self.firstHMIFullOccurred = YES;
-        // the app is just started by the user. Send everything needed to be done once
-        [self sendWelcomeMessageWithSpeak:YES];
+        // The app is just started by the user. Send everything needed to be done once and start on the current weather screen
+        [self sendWeatherConditions:[WeatherDataManager sharedManager].weatherConditions withSpeak:YES firstWindow:YES];
         [self sendDefaultGlobalProperties];
         [self preloadChangeUnitsChoices];
 
@@ -215,7 +215,7 @@ - (void)handleWeatherDataUpdate:(NSNotification *)notification {
     MWInfoType infoType = self.currentInfoType;
     if ([MWInfoTypeWeatherConditions isEqualToString:infoType]) {
         WeatherConditions *conditions = notification.userInfo[@"weatherConditions"];
-        [self sendWeatherConditions:conditions withSpeak:NO];
+        [self sendWeatherConditions:conditions withSpeak:NO firstWindow:NO];
     } else if ([MWInfoTypeDailyForecast isEqualToString:infoType]) {
         NSArray *forecast = notification.userInfo[@"dailyForecast"];
         [self sendForecastList:forecast infoType:infoType withSpeak:NO];
@@ -299,24 +299,7 @@ - (void)presentForecastInteractionWithList:(NSArray *)forecasts ofType:(MWInfoTy
 
 #pragma mark - Template updates
 
-- (void)sendWelcomeMessageWithSpeak:(BOOL)withSpeak {
-    self.currentInfoType = MWInfoTypeNone;
-    [self.manager.screenManager beginUpdates];
-    self.manager.screenManager.textField1 = self.localization[@"show.welcome.field1"];
-    self.manager.screenManager.textField2 = self.localization[@"show.welcome.field2"];
-    self.manager.screenManager.textField3 = self.localization[@"show.welcome.field3"];
-    self.manager.screenManager.textField4 = self.localization[@"show.welcome.field4"];
-    self.manager.screenManager.textAlignment = SDLTextAlignmentCenter;
-    self.manager.screenManager.softButtonObjects = [self buildDefaultSoftButtons];
-    [self.manager.screenManager endUpdatesWithCompletionHandler:nil];
-    
-    if (withSpeak) {
-        SDLSpeak *speak = [[SDLSpeak alloc] initWithTTS:self.localization[@"speak.welcome"]];
-        [self.manager sendRequest:speak];
-    }
-}
-
-- (void)sendWeatherConditions:(WeatherConditions *)conditions withSpeak:(BOOL)withSpeak {
+- (void)sendWeatherConditions:(WeatherConditions *)conditions withSpeak:(BOOL)withSpeak firstWindow:(BOOL)firstWindow {
     if (conditions == nil) {
         SDLAlertView *alertRequest = [[SDLAlertView alloc] initWithText:self.localization[@"alert.no-conditions.field1"] secondaryText:self.localization[@"alert.no-conditions.field2"] tertiaryText:nil timeout:@(10) showWaitIndicator:nil audioIndication:[[SDLAlertAudioData alloc] initWithSpeechSynthesizerString:self.localization[@"alert.no-forecast.prompt"]] buttons:nil icon:nil];
         [self.manager.screenManager presentAlert:alertRequest withCompletionHandler:nil];
@@ -353,7 +336,15 @@ - (void)sendWeatherConditions:(WeatherConditions *)conditions withSpeak:(BOOL)wi
     [self.manager.screenManager endUpdatesWithCompletionHandler:nil];
 
     if (withSpeak) {
-        SDLSpeak *speakRequest = [[SDLSpeak alloc] initWithTTS:[self.localization stringForKey:@"conditions.speak", conditions.conditionTitle, [conditions.temperature stringValueForUnit:temperatureType shortened:NO localization:self.localization], [conditions.humidity stringValueForUnit:percentageType shortened:NO localization:self.localization], [conditions.windSpeed stringValueForUnit:speedType shortened:NO localization:self.localization]]];
+        SDLSpeak *speakRequest;
+        SDLTTSChunk *welcomeTTS = [[SDLTTSChunk alloc] initWithText:self.localization[@"speak.welcome"] type: SDLSpeechCapabilitiesText];
+        SDLTTSChunk *weatherConditionTTS = [[SDLTTSChunk alloc] initWithText:[self.localization stringForKey:@"conditions.speak", conditions.conditionTitle, [conditions.temperature stringValueForUnit:temperatureType shortened:NO localization:self.localization], [conditions.humidity stringValueForUnit:percentageType shortened:NO localization:self.localization], [conditions.windSpeed stringValueForUnit:speedType shortened:NO localization:self.localization]] type:SDLSpeechCapabilitiesText];
+        if (firstWindow) {
+            speakRequest = [[SDLSpeak alloc] initWithTTSChunks:@[welcomeTTS, weatherConditionTTS]];
+        } else {
+            speakRequest = [[SDLSpeak alloc] initWithTTSChunks:@[weatherConditionTTS]];
+        }
+
         [self.manager sendRequest:speakRequest];
     }
 }
@@ -593,7 +584,7 @@ - (void)closeListInfoType:(MWInfoType)infoType {
     [self setCurrentInfoTypeList:nil];
     self.currentInfoTypeListIndex = -1;
 
-    [self sendWelcomeMessageWithSpeak:NO];
+    [self sendWeatherConditions:[WeatherDataManager sharedManager].weatherConditions withSpeak:NO firstWindow:NO];
     [self sendDefaultGlobalProperties];
 
     self.manager.screenManager.menu = [self weatherMenuCells];
@@ -602,7 +593,7 @@ - (void)closeListInfoType:(MWInfoType)infoType {
 - (void)repeatWeatherInformation {
     MWInfoType infoType = self.currentInfoType;
     if ([MWInfoTypeWeatherConditions isEqualToString:infoType]) {
-        [self sendWeatherConditions:[WeatherDataManager sharedManager].weatherConditions withSpeak:YES];
+        [self sendWeatherConditions:[WeatherDataManager sharedManager].weatherConditions withSpeak:YES firstWindow:NO];
     } else if ([MWInfoTypeDailyForecast isEqualToString:infoType] || [MWInfoTypeHourlyForecast isEqualToString:infoType]) {
         [self showForecastAtIndex:self.currentInfoTypeListIndex fromList:self.currentInfoTypeList infoType:infoType withSpeak:YES];
     } else if ([MWInfoTypeAlerts isEqualToString:infoType]) {
@@ -620,7 +611,7 @@ - (void)repeatWeatherInformation {
             return;
         }
 
-        [weakSelf sendWeatherConditions:[WeatherDataManager sharedManager].weatherConditions withSpeak:YES];
+        [weakSelf sendWeatherConditions:[WeatherDataManager sharedManager].weatherConditions withSpeak:YES firstWindow:NO];
     }];
 
     SDLSoftButtonState *dailyForecastState = [[SDLSoftButtonState alloc] initWithStateName:@"state" text:self.localization[@"sb.daily"] image:[[UIImage imageNamed:@"menu-day"] imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate]];
@@ -722,7 +713,7 @@ - (void)repeatWeatherInformation {
 - (NSArray<SDLMenuCell *> *)weatherMenuCells {
     __weak typeof(self) weakSelf = self;
     SDLMenuCell *showWeatherConditions = [[SDLMenuCell alloc] initWithTitle:self.localization[@"cmd.current-conditions"] secondaryText:nil tertiaryText:nil icon:[[SDLArtwork alloc] initWithImage:[[UIImage imageNamed:@"clear-day"] imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate] persistent:YES asImageFormat:SDLArtworkImageFormatPNG] secondaryArtwork:nil voiceCommands:@[self.localization[@"vr.current"],self.localization[@"vr.conditions"], self.localization[@"vr.current-conditions"], self.localization[@"vr.show-conditions"], self.localization[@"vr.show-current-conditions"]] handler:^(SDLTriggerSource _Nonnull triggerSource) {
-        [weakSelf sendWeatherConditions:[WeatherDataManager sharedManager].weatherConditions withSpeak:YES];
+        [weakSelf sendWeatherConditions:[WeatherDataManager sharedManager].weatherConditions withSpeak:YES firstWindow:NO];
     }];
 
     SDLMenuCell *showDailyForecast = [[SDLMenuCell alloc] initWithTitle:self.localization[@"cmd.daily-forecast"] secondaryText:nil tertiaryText:nil icon:[[SDLArtwork alloc] initWithImage:[[UIImage imageNamed:@"menu-day"] imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate] persistent:YES asImageFormat:SDLArtworkImageFormatPNG] secondaryArtwork:nil voiceCommands:@[self.localization[@"vr.daily"], self.localization[@"vr.daily-forecast"], self.localization[@"vr.show-daily-forecast"]] handler:^(SDLTriggerSource _Nonnull triggerSource) {