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

Fix/fix hmi sends deprecated OnFindApplications notification #512

Merged
merged 4 commits into from
Mar 16, 2021
Merged

Fix/fix hmi sends deprecated OnFindApplications notification #512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4ee7de0
fix Apps button sends deprecated OnFindApplications notification
Mar 2, 2021
5cd55cd
fix Find New Apps button sends deprecated OnFindApplications notific…
Mar 3, 2021
5eb48be
Remove OnFindApplications from BasicCommunicationRPC
Mar 9, 2021
269db4d
fixup! fix Find New Apps button sends deprecated OnFindApplications …
Mar 16, 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 app/StateManager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,6 @@ var StateManager = Em.StateManager.extend(
*/
enter: function() {
this._super();
FFW.BasicCommunication.OnFindApplications();
}
}
),
Expand Down
8 changes: 1 addition & 7 deletions app/controller/sdl/Abstract/Controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1282,13 +1282,7 @@ SDL.SDLController = Em.Object.extend(
element.id
);
this.turnChangeDeviceViewBack();
},
/**
* Method call's request to get list of applications
*/
findNewApps: function() {
FFW.BasicCommunication.OnFindApplications();
},
},
/**
* Method activates selected registered application
*
Expand Down
17 changes: 1 addition & 16 deletions app/view/info/appsView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ SDL.InfoAppsView = Em.ContainerView.create({
childViews: [
'vehicleHealthReport',
'Asist911',
'findNewApps',
'getDeviceList',
'applicationsStore',
'listOfApplications'
Expand Down Expand Up @@ -126,19 +125,6 @@ SDL.InfoAppsView = Em.ContainerView.create({
}
),

findNewApps: SDL.Button.extend({
goToState: 'settings.system.installApplications',
icon: 'images/sdl/new_apps.png',
textBinding: 'SDL.locale.label.view_info_apps_vehicle_FindNewApplications',
elementId: 'infoAppsFindNewApps',
classNames: 'button findNewApps leftButtons',
arrow: true,
action: 'findNewApps',
target: 'SDL.SDLController',
onDown: false
}
),

getDeviceList: SDL.Button.extend({
icon: 'images/sdl/devices.png',
textBinding: 'SDL.locale.label.view_info_apps_vehicle_GetDeviceList',
Expand Down Expand Up @@ -177,8 +163,7 @@ SDL.InfoAppsView = Em.ContainerView.create({
/**
* @description Callback for display image mode change.
*/
imageModeChanged: function() {
SDL.InfoAppsView.findNewApps.setMode(SDL.SDLModel.data.imageMode);
imageModeChanged: function() {
SDL.InfoAppsView.Asist911.setMode(SDL.SDLModel.data.imageMode);
SDL.InfoAppsView.vehicleHealthReport.setMode(SDL.SDLModel.data.imageMode);
SDL.InfoAppsView.getDeviceList.setMode(SDL.SDLModel.data.imageMode);
Expand Down
13 changes: 2 additions & 11 deletions css/info.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -617,17 +617,8 @@
top: 122px;
}

#info_apps .findNewApps {
top: 174px;
}

#info_apps .findNewApps img {
margin: 9px;
width: 32px;
}

#info_apps .getDeviceList {
top: 226px;
top: 174px;
}

#info_apps .getDeviceList img {
Expand All @@ -636,7 +627,7 @@
}

#info_apps .appsStore {
top: 278px;
top: 226px;
}

#info_apps .appsStore img {
Expand Down
18 changes: 0 additions & 18 deletions ffw/BasicCommunicationRPC.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,7 +531,6 @@ FFW.BasicCommunication = FFW.RPCObserver
appModel, notification.params.vrSynonyms
);
FFW.RPCHelper.addApplication(notification.params.application.appID);
this.OnFindApplications();
const mainWindowID = 0;
let capability = SDL.SDLController.getDefaultCapabilities(mainWindowID, notification.params.application.appID);
FFW.BasicCommunication.OnSystemCapabilityUpdated(capability);
Expand Down Expand Up @@ -1319,23 +1318,6 @@ FFW.BasicCommunication = FFW.RPCObserver
};
this.sendMessage(JSONMessage);
},
/**
* This methos is request to get list of registered apps.
*/
OnFindApplications: function() {
Em.Logger.log('FFW.BasicCommunication.OnFindApplications');
var JSONMessage = {
'jsonrpc': '2.0',
'method': 'BasicCommunication.OnFindApplications'
};
if (SDL.SDLModel.data.CurrDeviceInfo.name ||
SDL.SDLModel.data.CurrDeviceInfo.id) {
JSONMessage.params = {
'deviceInfo': SDL.SDLModel.data.CurrDeviceInfo
};
}
this.sendMessage(JSONMessage);
},
/**
* Send notification to SDL Core about system errors
*/
Expand Down
1 change: 0 additions & 1 deletion locale/eng.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ SDL.eng = {
view_info_apps_vehicle_VehicleHealthReport: 'Vehicle Health Report',
view_info_apps_vehicle_InstallApplicationsUp: 'Install Applications/Up',
view_info_apps_vehicle_DeviceLocation: 'Device Location',
view_info_apps_vehicle_FindNewApplications: 'Find New Apps',
view_info_apps_vehicle_GetDeviceList: 'Change Devices',
view_info_apps_vehicle_ApplicationsStore: 'App Store',
view_info_calendar_date: 'Jul, 2012',
Expand Down