From 26ca4e9a62f31d1c40a25c11e70ba825bf967b8f Mon Sep 17 00:00:00 2001 From: Alexander Kutsan Date: Wed, 7 Feb 2018 14:42:43 +0200 Subject: SDL RPC plugin CMAKElist --- .../commands/hmi/ui_add_submenu_request.h | 73 ++++++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_add_submenu_request.h (limited to 'src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_add_submenu_request.h') diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_add_submenu_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_add_submenu_request.h new file mode 100644 index 0000000000..96fa0557ae --- /dev/null +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_add_submenu_request.h @@ -0,0 +1,73 @@ +/* + * 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. + */ + +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_ADD_SUBMENU_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_ADD_SUBMENU_REQUEST_H_ + +#include "application_manager/commands/hmi/request_to_hmi.h" + +namespace application_manager { + +namespace commands { + +/** + * @brief UIAddSubmenuRequest command class + **/ +class UIAddSubmenuRequest : public RequestToHMI { + public: + /** + * @brief UIAddSubmenuRequest class constructor + * + * @param message Incoming SmartObject message + **/ + UIAddSubmenuRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); + + /** + * @brief UIAddSubmenuRequest class destructor + **/ + virtual ~UIAddSubmenuRequest(); + + /** + * @brief Execute command + **/ + virtual void Run(); + + private: + DISALLOW_COPY_AND_ASSIGN(UIAddSubmenuRequest); +}; + +} // namespace commands + +} // namespace application_manager + +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_ADD_SUBMENU_REQUEST_H_ -- 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 --- .../include/sdl_rpc_plugin/commands/hmi/ui_add_submenu_request.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_add_submenu_request.h') diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_add_submenu_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_add_submenu_request.h index 96fa0557ae..d5f9ed3caa 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_add_submenu_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_add_submenu_request.h @@ -33,7 +33,7 @@ #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_ADD_SUBMENU_REQUEST_H_ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_ADD_SUBMENU_REQUEST_H_ -#include "application_manager/commands/hmi/request_to_hmi.h" +#include "application_manager/commands/request_to_hmi.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/commands/hmi/ui_add_submenu_request.h | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_add_submenu_request.h') diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_add_submenu_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_add_submenu_request.h index d5f9ed3caa..816596055d 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_add_submenu_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_add_submenu_request.h @@ -30,27 +30,28 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_ADD_SUBMENU_REQUEST_H_ -#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_ADD_SUBMENU_REQUEST_H_ +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_ADD_SUBMENU_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_ADD_SUBMENU_REQUEST_H_ #include "application_manager/commands/request_to_hmi.h" -namespace application_manager { +namespace sdl_rpc_plugin { +namespace app_mngr = application_manager; namespace commands { /** * @brief UIAddSubmenuRequest command class **/ -class UIAddSubmenuRequest : public RequestToHMI { +class UIAddSubmenuRequest : public app_mngr::commands::RequestToHMI { public: /** * @brief UIAddSubmenuRequest class constructor * * @param message Incoming SmartObject message **/ - UIAddSubmenuRequest(const MessageSharedPtr& message, - ApplicationManager& application_manager); + UIAddSubmenuRequest(const app_mngr::commands::MessageSharedPtr& message, + app_mngr::ApplicationManager& application_manager); /** * @brief UIAddSubmenuRequest class destructor @@ -70,4 +71,4 @@ class UIAddSubmenuRequest : public RequestToHMI { } // namespace application_manager -#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UI_ADD_SUBMENU_REQUEST_H_ +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_ADD_SUBMENU_REQUEST_H_ -- 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. --- .../include/sdl_rpc_plugin/commands/hmi/ui_add_submenu_request.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_add_submenu_request.h') diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_add_submenu_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_add_submenu_request.h index 816596055d..a7686cadf7 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_add_submenu_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_add_submenu_request.h @@ -51,7 +51,10 @@ class UIAddSubmenuRequest : public app_mngr::commands::RequestToHMI { * @param message Incoming SmartObject message **/ UIAddSubmenuRequest(const app_mngr::commands::MessageSharedPtr& message, - app_mngr::ApplicationManager& application_manager); + app_mngr::ApplicationManager& application_manager, + app_mngr::rpc_service::RPCService& rpc_service, + app_mngr::HMICapabilities& hmi_capabilities, + policy::PolicyHandlerInterface& policy_handle); /** * @brief UIAddSubmenuRequest class destructor -- 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. --- .../include/sdl_rpc_plugin/commands/hmi/ui_add_submenu_request.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_add_submenu_request.h') diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_add_submenu_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_add_submenu_request.h index a7686cadf7..5de5e41cd6 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_add_submenu_request.h +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_add_submenu_request.h @@ -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