From f7fe722fc79809a967a2321326e53925780659e6 Mon Sep 17 00:00:00 2001 From: zheng_wenlong Date: Mon, 23 Oct 2017 20:31:08 +0900 Subject: Change argument char to json for libhomescreen With change libhomescreen event api from char to json. Modified the homescreen-2017 where use these. Relative Commit: https://gerrit.automotivelinux.org/gerrit/#/c/11449/ Change-Id: I9b55e6f2b5b0fbeba64fd888db5662fc173d91b1 Signed-off-by: zheng_wenlong --- homescreen/src/homescreenhandler.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/homescreen/src/homescreenhandler.cpp b/homescreen/src/homescreenhandler.cpp index 6034a5a..bc9400d 100644 --- a/homescreen/src/homescreenhandler.cpp +++ b/homescreen/src/homescreenhandler.cpp @@ -47,11 +47,15 @@ void HomescreenHandler::init(int port, const char *token) mp_hs->registerCallback(nullptr, HomescreenHandler::onRep_static); - mp_hs->set_event_handler(LibHomeScreen::Event_OnScreenMessage, [this](const char* display_message){ - qDebug("set_event_handler Event_OnScreenMessage display_message = %s", display_message); + mp_hs->set_event_handler(LibHomeScreen::Event_OnScreenMessage, [this](json_object *object){ + const char *display_message = json_object_get_string( + json_object_object_get(object, "display_message")); + HMI_DEBUG("HomeScreen","set_event_handler Event_OnScreenMessage display_message = %s", display_message); }); - mp_hs->set_event_handler(LibHomeScreen::Event_TapShortcut, [this](const char* application_name){ + mp_hs->set_event_handler(LibHomeScreen::Event_TapShortcut, [this](json_object *object){ + const char *application_name = json_object_get_string( + json_object_object_get(object, "application_name")); if(strcmp(application_name, "Home") == 0){ emit this->homeButton(); } -- cgit 1.2.3-korg