summaryrefslogtreecommitdiff
path: root/src/components/hmi_message_handler/src/dbus_message_adapter.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/components/hmi_message_handler/src/dbus_message_adapter.cc')
-rw-r--r--src/components/hmi_message_handler/src/dbus_message_adapter.cc80
1 files changed, 48 insertions, 32 deletions
diff --git a/src/components/hmi_message_handler/src/dbus_message_adapter.cc b/src/components/hmi_message_handler/src/dbus_message_adapter.cc
index 7c540ad0c2..6a5bda5bfb 100644
--- a/src/components/hmi_message_handler/src/dbus_message_adapter.cc
+++ b/src/components/hmi_message_handler/src/dbus_message_adapter.cc
@@ -33,7 +33,7 @@
#include "hmi_message_handler/dbus_message_adapter.h"
#include <sstream>
#include "utils/logger.h"
-#include "formatters/CSmartFactory.hpp"
+#include "formatters/CSmartFactory.h"
namespace smart_objects = NsSmartDeviceLink::NsSmartObjects;
namespace sos = NsSmartDeviceLink::NsJSONHandler::strings;
@@ -43,29 +43,31 @@ namespace hmi_message_handler {
CREATE_LOGGERPTR_GLOBAL(logger_, "HMIMessageHandler")
const std::string DBusMessageAdapter::SDL_SERVICE_NAME = "com.ford.sdl.core";
-const std::string DBusMessageAdapter::SDL_OBJECT_PATH = "/";
+const std::string DBusMessageAdapter::SDL_OBJECT_PATH = "/";
const std::string DBusMessageAdapter::HMI_SERVICE_NAME = "com.ford.sdl.hmi";
-const std::string DBusMessageAdapter::HMI_OBJECT_PATH = "/";
-
-std::vector<std::string> &split(const std::string &s, char delim,
- std::vector<std::string> &elems) {
- std::stringstream ss(s);
- std::string item;
- while (std::getline(ss, item, delim)) {
- elems.push_back(item);
- }
- return elems;
+const std::string DBusMessageAdapter::HMI_OBJECT_PATH = "/";
+
+std::vector<std::string>& split(const std::string& s,
+ char delim,
+ std::vector<std::string>& elems) {
+ std::stringstream ss(s);
+ std::string item;
+ while (std::getline(ss, item, delim)) {
+ elems.push_back(item);
+ }
+ return elems;
}
DBusMessageAdapter::DBusMessageAdapter(HMIMessageHandler* hmi_msg_handler)
- : HMIMessageAdapter(hmi_msg_handler),
- DBusMessageController(SDL_SERVICE_NAME, SDL_OBJECT_PATH,
- HMI_SERVICE_NAME, HMI_OBJECT_PATH) {
+ : HMIMessageAdapterImpl(hmi_msg_handler)
+ , DBusMessageController(SDL_SERVICE_NAME,
+ SDL_OBJECT_PATH,
+ HMI_SERVICE_NAME,
+ HMI_OBJECT_PATH) {
LOG4CXX_INFO(logger_, "Created DBusMessageAdapter");
}
-DBusMessageAdapter::~DBusMessageAdapter() {
-}
+DBusMessageAdapter::~DBusMessageAdapter() {}
void DBusMessageAdapter::SendMessageToHMI(MessageSharedPointer message) {
LOG4CXX_INFO(logger_, "DBusMessageAdapter::sendMessageToHMI");
@@ -108,16 +110,22 @@ void DBusMessageAdapter::SubscribeTo() {
DBusMessageController::SubscribeTo("VR", "OnLanguageChange");
DBusMessageController::SubscribeTo("BasicCommunication", "OnReady");
DBusMessageController::SubscribeTo("BasicCommunication", "OnAppDeactivated");
- DBusMessageController::SubscribeTo("BasicCommunication", "OnStartDeviceDiscovery");
- DBusMessageController::SubscribeTo("BasicCommunication", "OnUpdateDeviceList");
- DBusMessageController::SubscribeTo("BasicCommunication", "OnFindApplications");
+ DBusMessageController::SubscribeTo("BasicCommunication",
+ "OnStartDeviceDiscovery");
+ DBusMessageController::SubscribeTo("BasicCommunication",
+ "OnUpdateDeviceList");
+ DBusMessageController::SubscribeTo("BasicCommunication",
+ "OnFindApplications");
DBusMessageController::SubscribeTo("BasicCommunication", "OnAppActivated");
DBusMessageController::SubscribeTo("BasicCommunication", "OnExitApplication");
- DBusMessageController::SubscribeTo("BasicCommunication", "OnExitAllApplications");
+ DBusMessageController::SubscribeTo("BasicCommunication",
+ "OnExitAllApplications");
DBusMessageController::SubscribeTo("BasicCommunication", "OnDeviceChosen");
- DBusMessageController::SubscribeTo("BasicCommunication", "OnIgnitionCycleOver");
+ DBusMessageController::SubscribeTo("BasicCommunication",
+ "OnIgnitionCycleOver");
DBusMessageController::SubscribeTo("BasicCommunication", "OnSystemRequest");
- DBusMessageController::SubscribeTo("BasicCommunication", "OnSystemInfoChanged");
+ DBusMessageController::SubscribeTo("BasicCommunication",
+ "OnSystemInfoChanged");
DBusMessageController::SubscribeTo("BasicCommunication", "OnPhoneCall");
DBusMessageController::SubscribeTo("BasicCommunication", "OnEmergencyEvent");
DBusMessageController::SubscribeTo("TTS", "Started");
@@ -144,7 +152,8 @@ void DBusMessageAdapter::SubscribeTo() {
DBusMessageController::SubscribeTo("VehicleInfo", "OnAccPedalPosition");
DBusMessageController::SubscribeTo("VehicleInfo", "OnSteeringWheelAngle");
DBusMessageController::SubscribeTo("VehicleInfo", "OnMyKey");
- DBusMessageController::SubscribeTo("Navigation", "OnTBTClientState");
+ DBusMessageController::SubscribeTo("Navigation", "OnTBTClientState");
+ DBusMessageController::SubscribeTo("Navigation", "OnWayPointChange");
DBusMessageController::SubscribeTo("SDL", "OnAllowSDLFunctionality");
DBusMessageController::SubscribeTo("SDL", "OnReceivedPolicyUpdate");
DBusMessageController::SubscribeTo("SDL", "OnPolicyUpdate");
@@ -156,7 +165,8 @@ void DBusMessageAdapter::SubscribeTo() {
LOG4CXX_INFO(logger_, "Subscribed to notifications.");
}
-void DBusMessageAdapter::SendMessageToCore(const smart_objects::SmartObject& obj) {
+void DBusMessageAdapter::SendMessageToCore(
+ const smart_objects::SmartObject& obj) {
LOG4CXX_AUTO_TRACE(logger_);
if (!handler()) {
@@ -164,7 +174,13 @@ void DBusMessageAdapter::SendMessageToCore(const smart_objects::SmartObject& obj
return;
}
- MessageSharedPointer message = new application_manager::Message(protocol_handler::MessagePriority::kDefault);//todo: ykazakov constant is a temp solution to finish merge MessagePriority::FromServiceType(message.servicetype) shall be used instead
+ MessageSharedPointer message = new application_manager::Message(
+ protocol_handler::MessagePriority::kDefault); // todo: ykazakov constant
+ // is a temp solution to
+ // finish
+ // merge
+ // MessagePriority::FromServiceType(message.servicetype)
+ // shall be used instead
message->set_protocol_version(application_manager::ProtocolVersion::kHMI);
message->set_smart_object(obj);
handler()->OnMessageReceived(message);
@@ -172,7 +188,7 @@ void DBusMessageAdapter::SendMessageToCore(const smart_objects::SmartObject& obj
}
void DBusMessageAdapter::Request(const smart_objects::SmartObject& obj) {
- LOG4CXX_DEBUG(logger_, "Request");
+ LOG4CXX_AUTO_TRACE(logger_);
dbus::MessageId func_id = static_cast<dbus::MessageId>(
obj[sos::S_PARAMS][sos::S_FUNCTION_ID].asInt());
dbus::MessageName name = get_schema().getMessageName(func_id);
@@ -180,8 +196,8 @@ void DBusMessageAdapter::Request(const smart_objects::SmartObject& obj) {
MethodCall(id, func_id, name, obj[sos::S_MSG_PARAMS]);
}
-void DBusMessageAdapter::Notification(const smart_objects::SmartObject &obj) {
- LOG4CXX_DEBUG(logger_, "Notification");
+void DBusMessageAdapter::Notification(const smart_objects::SmartObject& obj) {
+ LOG4CXX_AUTO_TRACE(logger_);
dbus::MessageId func_id = static_cast<dbus::MessageId>(
obj[sos::S_PARAMS][sos::S_FUNCTION_ID].asInt());
dbus::MessageName name = get_schema().getMessageName(func_id);
@@ -189,15 +205,15 @@ void DBusMessageAdapter::Notification(const smart_objects::SmartObject &obj) {
}
void DBusMessageAdapter::Response(const smart_objects::SmartObject& obj) {
- LOG4CXX_DEBUG(logger_, "Response");
+ LOG4CXX_AUTO_TRACE(logger_);
dbus::MessageId func_id = static_cast<dbus::MessageId>(
- obj[sos::S_PARAMS][sos::S_FUNCTION_ID].asInt());
+ obj[sos::S_PARAMS][sos::S_FUNCTION_ID].asInt());
dbus::MessageName name = get_schema().getMessageName(func_id);
uint id = obj[sos::S_PARAMS][sos::S_CORRELATION_ID].asInt();
MethodReturn(id, func_id, name, obj[sos::S_MSG_PARAMS]);
}
-void DBusMessageAdapter::ErrorResponse(const smart_objects::SmartObject &obj) {
+void DBusMessageAdapter::ErrorResponse(const smart_objects::SmartObject& obj) {
LOG4CXX_DEBUG(logger_, "Error");
std::string error = obj[sos::S_PARAMS][sos::kCode].asString();
std::string description = obj[sos::S_PARAMS][sos::kMessage].asString();
View Lorry Controller Status