Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix slider / scrollable message time out message #1548

Merged
merged 3 commits into from Feb 10, 2020
Merged

Fix slider / scrollable message time out message #1548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1b88c6e
Fix slider / scrollable message time out
joeljfischer Feb 7, 2020
2d7992e
Add cancelled messages
joeljfischer Feb 10, 2020
37deece
Amend last commit with Obj-C code
joeljfischer Feb 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 15 additions & 3 deletions Example Apps/Example ObjC/MenuManager.m
View file
Open in desktop
Expand Up @@ -137,7 +137,13 @@ + (SDLMenuCell *)sdlex_sliderMenuCellWithManager:(SDLManager *)manager {
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]];
}
}
}];
}];
Expand All @@ -148,8 +154,14 @@ + (SDLMenuCell *)sdlex_scrollableMessageMenuCellWithManager:(SDLManager *)manage
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]];
}
}
}];
}];
}
Expand Down
22 changes: 18 additions & 4 deletions Example Apps/Example Swift/MenuManager.swift
View file
Open in desktop
Expand Up @@ -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
}
})
Expand All @@ -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
}
})
Expand Down