From 117763d6555828b2765313bf5fd05e9b1a2ef042 Mon Sep 17 00:00:00 2001 From: zheng_wenlong Date: Mon, 23 Oct 2017 20:31:08 +0900 Subject: Change function argument from char to json in libhomescreen With the new libhomescreen event api also change the function argument from char to json in the homescreen-2017. Related Commit: https://gerrit.automotivelinux.org/gerrit/#/c/11449/ BUG-AGL: SPEC-992 Change-Id: I9b55e6f2b5b0fbeba64fd888db5662fc173d91b1 Signed-off-by: zheng_wenlong --- homescreen/src/homescreenhandler.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'homescreen/src/homescreenhandler.cpp') diff --git a/homescreen/src/homescreenhandler.cpp b/homescreen/src/homescreenhandler.cpp index 6034a5a..badb91f 100644 --- a/homescreen/src/homescreenhandler.cpp +++ b/homescreen/src/homescreenhandler.cpp @@ -41,17 +41,17 @@ void HomescreenHandler::init(int port, const char *token) myThis = this; -// mp_hs->registerCallback(HomescreenHandler::onEv_static, HomescreenHandler::onRep_static); -// mp_hs->subscribe(LibHomeScreen::event_list[0]); -// mp_hs->subscribe(LibHomeScreen::event_list[1]); - 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