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

Feature/sdl 0192 button subscription response from hmi #414

Merged
merged 21 commits into from
Aug 12, 2021
Merged

Feature/sdl 0192 button subscription response from hmi #414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
6f357d3
SDL-0192 OnButtonSubscription notification removed; SubscribeButton R…
Jul 9, 2021
1ec7869
SDL-0192 Added UnsubscribeButton RPC
Jul 13, 2021
47591e7
Review answers
YuriiYefimenko Aug 6, 2021
c1a08c3
Fixes according 5 comments from review
Aug 4, 2021
9e01960
Merge pull request #31 from LuxoftSDL/fix/SDL-0192-review-answers
YuriiYefimenko Aug 6, 2021
45d95bb
Merge branch 'feature/SDL-0192-Button-Subscription-response-from-HMI'…
LiliiaShlikhtLuxoft Aug 9, 2021
05c9f47
Merge pull request #26 from LuxoftSDL/fix/SDL-0192-fixes-for-ButtonSu…
LiliiaShlikhtLuxoft Aug 9, 2021
e7f9d87
Resolved error with GENERIC ERROR const
Aug 9, 2021
fb3114a
Merge pull request #33 from LuxoftSDL/fix/SDL-0192-fix-error
LiliiaShlikhtLuxoft Aug 9, 2021
b63825c
Extended capability
YuriiYefimenko Aug 9, 2021
63fbad6
Merge pull request #32 from LuxoftSDL/fix/SDL-0192-fix-buttonCapabili…
YuriiYefimenko Aug 9, 2021
54f0649
Restructure buttonCapabilities
YuriiYefimenko Aug 10, 2021
7d0050a
Merge pull request #36 from LuxoftSDL/fix/SDL-0192-review-answers
YuriiYefimenko Aug 10, 2021
bf394f1
Update src/js/Controllers/RpcFactory.js
YuriiYefimenko Aug 10, 2021
21ca49a
Merge remote-tracking branch 'origin/develop' into fix/SDL-0192-sync-…
YuriiYefimenko Aug 10, 2021
cb0bf3c
Review answers
YuriiYefimenko Aug 11, 2021
4587054
Merge pull request #38 from LuxoftSDL/fix/SDL-0192-sync-develop
YuriiYefimenko Aug 11, 2021
442bebf
Fix indentation
YuriiYefimenko Aug 11, 2021
fe7815b
Merge pull request #40 from LuxoftSDL/fix/SDL-0192-review-edits
YuriiYefimenko Aug 11, 2021
608df7f
Removed unused data
Aug 12, 2021
c6fac3c
Merge pull request #41 from LuxoftSDL/luxoft_sdl/fix/SDL-0192-changes…
LiliiaShlikhtLuxoft Aug 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/js/Controllers/Controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,6 @@ export default class Controller {
}
this.send(ready);
// register for all notifications
this.subscribeToNotification("Buttons.OnButtonSubscription")
this.subscribeToNotification("BasicCommunication.OnAppRegistered")
this.subscribeToNotification("BasicCommunication.OnAppUnregistered")
this.subscribeToNotification("BasicCommunication.OnPutFile")
Expand Down
97 changes: 61 additions & 36 deletions src/js/Controllers/DisplayCapabilities.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,44 @@ function imageField(name, width, height) {
}
}

const commonButtonCapabilities = [{
"shortPressAvailable": true,
"longPressAvailable": true,
"upDownAvailable": true,
"name": "CUSTOM_BUTTON"
}]

const mediaButtonCapabilities = [{
"shortPressAvailable": true,
"longPressAvailable": true,
"upDownAvailable": true,
"name": "OK"
},
{
"shortPressAvailable": true,
"longPressAvailable": true,
"upDownAvailable": true,
"name": "PLAY_PAUSE"
},
{
"shortPressAvailable": true,
"longPressAvailable": true,
"upDownAvailable": true,
"name": "SEEKLEFT"
},
{
"shortPressAvailable": true,
"longPressAvailable": true,
"upDownAvailable": true,
"name": "SEEKRIGHT"
},
{
"shortPressAvailable": true,
"longPressAvailable": true,
"upDownAvailable": true,
"name": "CUSTOM_BUTTON"
}]

// Store capabilities of mirrored templates
let textWithGraphicCapabilities = {
"displayCapabilities": {
Expand Down Expand Up @@ -109,7 +147,8 @@ let textWithGraphicCapabilities = {
"screenParams": screenParams,
"imageCapabilities": ["DYNAMIC", "STATIC"],
"menuLayoutsAvailable": ["LIST", "TILES"]
}
},
"buttonCapabilities": commonButtonCapabilities
}

let textbuttonsWithGraphicCapabilities = {
Expand Down Expand Up @@ -171,9 +210,11 @@ let textbuttonsWithGraphicCapabilities = {
softButtonCapability,
softButtonCapability,
softButtonCapability
]
],
"buttonCapabilities": commonButtonCapabilities
}


let capabilities = {
"TEXT_WITH_GRAPHIC": textWithGraphicCapabilities,
"GRAPHIC_WITH_TEXT": textWithGraphicCapabilities,
Expand Down Expand Up @@ -232,36 +273,12 @@ let capabilities = {
"screenParams": screenParams,
"imageCapabilities": ["DYNAMIC", "STATIC"],
"menuLayoutsAvailable": ["LIST", "TILES"]
},
},
"softButtonCapabilities": [
imageOnlySoftButtonCapability,
imageOnlySoftButtonCapability
],
"buttonCapabilities": [{
"shortPressAvailable": true,
"longPressAvailable": true,
"upDownAvailable": true,
"name": "OK"
},
{
"shortPressAvailable": true,
"longPressAvailable": true,
"upDownAvailable": true,
"name": "PLAY_PAUSE"
},
{
"shortPressAvailable": true,
"longPressAvailable": true,
"upDownAvailable": true,
"name": "SEEKLEFT"
},
{
"shortPressAvailable": true,
"longPressAvailable": true,
"upDownAvailable": true,
"name": "SEEKRIGHT"
}
]
"buttonCapabilities": mediaButtonCapabilities
},
"NON-MEDIA": {
"displayCapabilities": {
Expand Down Expand Up @@ -326,7 +343,8 @@ let capabilities = {
softButtonCapability,
softButtonCapability,
softButtonCapability
]
],
"buttonCapabilities": commonButtonCapabilities
},
"WEB_VIEW": {
"displayCapabilities": {
Expand All @@ -353,7 +371,8 @@ let capabilities = {
"screenParams": screenParams,
"imageCapabilities": ["DYNAMIC", "STATIC"],
"menuLayoutsAvailable": ["LIST", "TILES"]
}
},
"buttonCapabilities": commonButtonCapabilities
},
"LARGE_GRAPHIC_WITH_SOFTBUTTONS": {
"displayCapabilities": {
Expand Down Expand Up @@ -414,7 +433,8 @@ let capabilities = {
softButtonCapability,
softButtonCapability,
softButtonCapability
]
],
"buttonCapabilities": commonButtonCapabilities
},
"DOUBLE_GRAPHIC_WITH_SOFTBUTTONS": {
"displayCapabilities": {
Expand Down Expand Up @@ -476,7 +496,8 @@ let capabilities = {
softButtonCapability,
softButtonCapability,
softButtonCapability
]
],
"buttonCapabilities": commonButtonCapabilities
},
"LARGE_GRAPHIC_ONLY": {
"displayCapabilities": {
Expand Down Expand Up @@ -523,7 +544,8 @@ let capabilities = {
"screenParams": screenParams,
"imageCapabilities": ["DYNAMIC", "STATIC"],
"menuLayoutsAvailable": ["LIST", "TILES"]
}
},
"buttonCapabilities": commonButtonCapabilities
},
"TEXTBUTTONS_ONLY": {
"displayCapabilities": {
Expand Down Expand Up @@ -583,7 +605,8 @@ let capabilities = {
softButtonCapability,
softButtonCapability,
softButtonCapability
]
],
"buttonCapabilities": commonButtonCapabilities
},
"TILES_ONLY": {
"displayCapabilities": {
Expand Down Expand Up @@ -643,7 +666,8 @@ let capabilities = {
softButtonCapability,
softButtonCapability,
softButtonCapability
]
],
"buttonCapabilities": commonButtonCapabilities
},
"NAV_FULLSCREEN_MAP": {
"displayCapabilities": {
Expand Down Expand Up @@ -686,7 +710,8 @@ let capabilities = {
"screenParams": screenParams,
"imageCapabilities": ["DYNAMIC", "STATIC"],
"menuLayoutsAvailable": ["LIST", "TILES"]
}
},
"buttonCapabilities": commonButtonCapabilities
},
"COMMON": {
"audioPassThruCapabilities": {
Expand Down
31 changes: 31 additions & 0 deletions src/js/Controllers/RpcFactory.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,36 @@
import {capabilities, getDisplayCapability} from './DisplayCapabilities.js'
var rpcFactory_msgId = 5012

export const resultCode = {
'SUCCESS': 0,
'UNSUPPORTED_REQUEST': 1,
'UNSUPPORTED_RESOURCE': 2,
'DISALLOWED': 3,
'REJECTED': 4,
'ABORTED': 5,
'IGNORED': 6,
'RETRY': 7,
'IN_USE': 8,
'DATA_NOT_AVAILABLE': 9,
'TIMED_OUT': 10,
'INVALID_DATA': 11,
'CHAR_LIMIT_EXCEEDED': 12,
'INVALID_ID': 13,
'DUPLICATE_NAME': 14,
'APPLICATION_NOT_REGISTERED': 15,
'WRONG_LANGUAGE': 16,
'OUT_OF_MEMORY': 17,
'TOO_MANY_PENDING_REQUESTS': 18,
'NO_APPS_REGISTERED': 19,
'NO_DEVICES_CONNECTED': 20,
'WARNINGS': 21,
'GENERIC_ERROR': 22,
'USER_DISALLOWED': 23,
'TRUNCATED_DATA': 24,
'SAVED': 25,
'READ_ONLY': 26
};

class RpcFactory {
static SetAppProperties(properties) {
return {
Expand Down
16 changes: 11 additions & 5 deletions src/js/Controllers/UIController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import RpcFactory from './RpcFactory'
import { resultCode } from './RpcFactory'
import {
show,
setAppIcon,
Expand Down Expand Up @@ -190,13 +191,18 @@ class UIController {
))
this.onSystemContext("MENU", rpc.params.appID)
return true
case "OnButtonSubscription":
case "SubscribeButton":
case "UnsubscribeButton":
const isSubscribed = methodName === 'SubscribeButton';
if(!rpc.params.buttonName || !rpc.params.appID) {
return { "rpc": RpcFactory.ErrorResponse(rpc, resultCode.GENERIC_ERROR, `No button provided to ${isSubscribed} ? 'subscribe' : 'unsubscribe'`) };
};
store.dispatch(subscribeButton(
rpc.params.appID,
rpc.params.name,
rpc.params.isSubscribed
))
return null
rpc.params.buttonName,
isSubscribed
));
return {"rpc": RpcFactory.SuccessResponse(rpc)};
case "PerformInteraction":
if (!rpc.params.choiceSet) {
return {"rpc": RpcFactory.ErrorResponse(rpc, 11, "No UI choices provided, VR choices are not supported")};
Expand Down
4 changes: 2 additions & 2 deletions src/js/ScrollableMessageButtons.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export default class ScrollableMessageButtons extends React.Component {
this.getAction = this.getAction.bind(this);
}
getAction(softButton) {
uiController.onButtonPress(softButton.appID, softButton.buttonID, 'CUSTOM_BUTTON');
uiController.onButtonPress(softButton.appID, softButton.softButtonID, 'CUSTOM_BUTTON');
if(softButton.systemAction === "STEAL_FOCUS") {
uiController.onScrollableMessageStealFocus(softButton.msgID, softButton.appID);
} else if (softButton.systemAction === "KEEP_CONTEXT") {
Expand Down Expand Up @@ -38,6 +38,6 @@ export default class ScrollableMessageButtons extends React.Component {
</div>)
})}
</div>
)
)
}
}
2 changes: 1 addition & 1 deletion src/js/containers/Buttons.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,4 +275,4 @@ export const AlertButtons = connect(
mapDispatchToProps
)(AlertButtonsBody)

export default Buttons
export default Buttons