diff options
author | Joel Fischer <joeljfischer@gmail.com> | 2020-02-10 13:06:25 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-10 13:06:25 -0500 |
commit | 9e389ad7668b8ac5d47873f26cf314459a670d15 (patch) | |
tree | 5b660a801cbc968f291fe2dc156bf29470e0272b | |
parent | 42f8e834c22d8356b7b46c8ae9d666e28ae7b0aa (diff) | |
parent | 37deecea1f1d6f1477fecc0a5c0cc722302d5353 (diff) | |
download | sdl_ios-9e389ad7668b8ac5d47873f26cf314459a670d15.tar.gz |
Merge pull request #1548 from smartdevicelink/bugfix/issue-1526-swift-example-app-slider-warning-alert
Fix slider / scrollable message time out message
-rw-r--r-- | Example Apps/Example ObjC/MenuManager.m | 18 | ||||
-rw-r--r-- | Example Apps/Example Swift/MenuManager.swift | 22 |
2 files changed, 33 insertions, 7 deletions
diff --git a/Example Apps/Example ObjC/MenuManager.m b/Example Apps/Example ObjC/MenuManager.m index e81f0c2e3..8e68d91b6 100644 --- a/Example Apps/Example ObjC/MenuManager.m +++ b/Example Apps/Example ObjC/MenuManager.m @@ -137,7 +137,13 @@ NS_ASSUME_NONNULL_BEGIN SDLSlider *sliderRPC = [[SDLSlider alloc] initWithNumTicks:3 position:1 sliderHeader:@"Select a letter" sliderFooters:@[@"A", @"B", @"C"] timeout:10000]; [manager sendRequest:sliderRPC withResponseHandler:^(__kindof SDLRPCRequest * _Nullable request, __kindof SDLRPCResponse * _Nullable response, NSError * _Nullable error) { if(![response.resultCode isEqualToEnum:SDLResultSuccess]) { - [manager sendRequest:[AlertManager alertWithMessageAndCloseButton:@"Slider could not be displayed" textField2:nil iconName:nil]]; + if ([response.resultCode isEqualToEnum:SDLResultTimedOut]) { + [manager sendRequest:[AlertManager alertWithMessageAndCloseButton:@"Slider timed out" textField2:nil iconName:nil]]; + } else if ([response.resultCode isEqualToEnum:SDLResultAborted]) { + [manager sendRequest:[AlertManager alertWithMessageAndCloseButton:@"Slider cancelled" textField2:nil iconName:nil]]; + } else { + [manager sendRequest:[AlertManager alertWithMessageAndCloseButton:@"Slider could not be displayed" textField2:nil iconName:nil]]; + } } }]; }]; @@ -148,8 +154,14 @@ NS_ASSUME_NONNULL_BEGIN SDLScrollableMessage *messageRPC = [[SDLScrollableMessage alloc] initWithMessage:@"This is a scrollable message\nIt can contain many lines"]; [manager sendRequest:messageRPC withResponseHandler:^(__kindof SDLRPCRequest * _Nullable request, __kindof SDLRPCResponse * _Nullable response, NSError * _Nullable error) { if(![response.resultCode isEqualToEnum:SDLResultSuccess]) { - [manager sendRequest:[AlertManager alertWithMessageAndCloseButton:@"Scrollable Message could not be displayed" textField2:nil iconName:nil]]; - } + if ([response.resultCode isEqualToEnum:SDLResultTimedOut]) { + [manager sendRequest:[AlertManager alertWithMessageAndCloseButton:@"Scrollable Message timed out" textField2:nil iconName:nil]]; + } else if ([response.resultCode isEqualToEnum:SDLResultAborted]) { + [manager sendRequest:[AlertManager alertWithMessageAndCloseButton:@"Scrollable Message cancelled" textField2:nil iconName:nil]]; + } else { + [manager sendRequest:[AlertManager alertWithMessageAndCloseButton:@"Scrollable Message could not be displayed" textField2:nil iconName:nil]]; + } + } }]; }]; } diff --git a/Example Apps/Example Swift/MenuManager.swift b/Example Apps/Example Swift/MenuManager.swift index e014fa44b..2f1b92ec5 100644 --- a/Example Apps/Example Swift/MenuManager.swift +++ b/Example Apps/Example Swift/MenuManager.swift @@ -181,8 +181,15 @@ private extension MenuManager { return SDLMenuCell(title: ACSliderMenuName, icon: nil, voiceCommands: [ACSliderMenuName], handler: { _ in let slider = SDLSlider(numTicks: 3, position: 1, sliderHeader: "Select a letter", sliderFooters: ["A", "B", "C"], timeout: 3000) manager.send(request: slider, responseHandler: { (request, response, error) in - guard let response = response, response.resultCode == .success else { - manager.send(AlertManager.alertWithMessageAndCloseButton("Slider could not be displayed")) + guard let response = response else { return } + guard response.resultCode == .success else { + if response.resultCode == .timedOut { + manager.send(AlertManager.alertWithMessageAndCloseButton("Slider timed out")) + } else if response.resultCode == .aborted { + manager.send(AlertManager.alertWithMessageAndCloseButton("Slider cancelled")) + } else { + manager.send(AlertManager.alertWithMessageAndCloseButton("Slider could not be displayed")) + } return } }) @@ -193,8 +200,15 @@ private extension MenuManager { return SDLMenuCell(title: ACScrollableMessageMenuName, icon: nil, voiceCommands: [ACScrollableMessageMenuName], handler: { _ in let scrollableMessage = SDLScrollableMessage(message: "This is a scrollable message\nIt can contain many lines") manager.send(request: scrollableMessage, responseHandler: { (request, response, error) in - guard let response = response, response.resultCode == .success else { - manager.send(AlertManager.alertWithMessageAndCloseButton("Scrollable could not be displayed")) + guard let response = response else { return } + guard response.resultCode == .success else { + if response.resultCode == .timedOut { + manager.send(AlertManager.alertWithMessageAndCloseButton("Scrollable Message timed out")) + } else if response.resultCode == .aborted { + manager.send(AlertManager.alertWithMessageAndCloseButton("Scrollable Message cancelled")) + } else { + manager.send(AlertManager.alertWithMessageAndCloseButton("Scrollable Message could not be displayed")) + } return } }) |