From b2fbde8198dff08193d362cde69ce836e4fbc11b Mon Sep 17 00:00:00 2001 From: Alexander Kutsan Date: Wed, 7 Feb 2018 13:19:28 +0200 Subject: Move commands to sdl rpc plugin --- .../src/commands/hmi/on_vi_speed_notification.cc | 58 ++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_speed_notification.cc (limited to 'src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_speed_notification.cc') diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_speed_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_speed_notification.cc new file mode 100644 index 0000000000..aacafb71c9 --- /dev/null +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_speed_notification.cc @@ -0,0 +1,58 @@ +/* + * Copyright (c) 2013, Ford Motor Company + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following + * disclaimer in the documentation and/or other materials provided with the + * distribution. + * + * Neither the name of the Ford Motor Company nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#include "application_manager/commands/hmi/on_vi_speed_notification.h" +#include "interfaces/MOBILE_API.h" + +namespace application_manager { + +namespace commands { + +OnVISpeedNotification::OnVISpeedNotification( + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) {} + +OnVISpeedNotification::~OnVISpeedNotification() {} + +void OnVISpeedNotification::Run() { + LOG4CXX_AUTO_TRACE(logger_); + + // prepare SmartObject for mobile factory + (*message_)[strings::params][strings::function_id] = + static_cast(mobile_apis::FunctionID::eType::OnVehicleDataID); + + SendNotificationToMobile(message_); +} + +} // namespace commands + +} // namespace application_manager -- cgit v1.2.1 From 691e6018cf1a09eb6aeb5f2c4fa4b93bc3ffb429 Mon Sep 17 00:00:00 2001 From: Ira Lytvynenko Date: Wed, 7 Feb 2018 17:35:58 +0200 Subject: move commands factory to rpc plugin Replace include path of the commands Fix some things Fixing compile of applicaiton manager Move Commands interface part back to application_manager Use unique ptr for plugin manager Fix style in RPC services and factories Remove redunsant includes of factories in application manager Remove include of functional module --- .../sdl_rpc_plugin/src/commands/hmi/on_vi_speed_notification.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_speed_notification.cc') diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_speed_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_speed_notification.cc index aacafb71c9..a5abd73b7e 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_speed_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_speed_notification.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/on_vi_speed_notification.h" +#include "sdl_rpc_plugin/commands/hmi/on_vi_speed_notification.h" #include "interfaces/MOBILE_API.h" namespace application_manager { -- cgit v1.2.1 From c25d13465f7e0984f217a9f6c50d7c88c446eaf4 Mon Sep 17 00:00:00 2001 From: Ira Lytvynenko Date: Thu, 8 Feb 2018 13:51:15 +0200 Subject: Load plugins in app manager, init plugin with params cory library to install dir Fix build Fix header guards Fix namespaces Fix build --- .../sdl_rpc_plugin/src/commands/hmi/on_vi_speed_notification.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_speed_notification.cc') diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_speed_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_speed_notification.cc index a5abd73b7e..bfa13c4d95 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_speed_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_speed_notification.cc @@ -33,12 +33,14 @@ #include "sdl_rpc_plugin/commands/hmi/on_vi_speed_notification.h" #include "interfaces/MOBILE_API.h" -namespace application_manager { +namespace sdl_rpc_plugin { +using namespace application_manager; namespace commands { OnVISpeedNotification::OnVISpeedNotification( - const MessageSharedPtr& message, ApplicationManager& application_manager) + const application_manager::commands::MessageSharedPtr& message, + ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) {} OnVISpeedNotification::~OnVISpeedNotification() {} -- cgit v1.2.1 From 085c51581ec4f0683db480c0de4be01bc7e88d6d Mon Sep 17 00:00:00 2001 From: BSolonenko Date: Mon, 12 Feb 2018 13:44:02 +0200 Subject: Refactoring all hmi commands. In all hmi command added rpc_service_, hmi_capabilities_ and policy_handler_ fields. Also changed all constructors. --- .../src/commands/hmi/on_vi_speed_notification.cc | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_speed_notification.cc') diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_speed_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_speed_notification.cc index bfa13c4d95..c454660fb0 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_speed_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_speed_notification.cc @@ -40,8 +40,15 @@ namespace commands { OnVISpeedNotification::OnVISpeedNotification( const application_manager::commands::MessageSharedPtr& message, - ApplicationManager& application_manager) - : NotificationFromHMI(message, application_manager) {} + ApplicationManager& application_manager, + rpc_service::RPCService& rpc_service, + HMICapabilities& hmi_capabilities, + policy::PolicyHandlerInterface& policy_handle) + : NotificationFromHMI(message, + application_manager, + rpc_service, + hmi_capabilities, + policy_handle) {} OnVISpeedNotification::~OnVISpeedNotification() {} -- cgit v1.2.1 From 7a9f54e29be2e4090689c3da4ee144f8d6e73744 Mon Sep 17 00:00:00 2001 From: BSolonenko Date: Wed, 23 May 2018 15:07:59 +0300 Subject: Answer review comments. --- .../sdl_rpc_plugin/src/commands/hmi/on_vi_speed_notification.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_speed_notification.cc') diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_speed_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_speed_notification.cc index c454660fb0..e5860c9eec 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_speed_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vi_speed_notification.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, Ford Motor Company + * Copyright (c) 2018, Ford Motor Company * All rights reserved. * * Redistribution and use in source and binary forms, with or without -- cgit v1.2.1