diff options
author | wang_zhiqiang <wang_zhiqiang@dl.cn.nexty-ele.com> | 2019-01-16 14:05:52 +0800 |
---|---|---|
committer | wang_zhiqiang <wang_zhiqiang@dl.cn.nexty-ele.com> | 2019-02-14 10:52:23 +0800 |
commit | 4e2fa7ef659a2a8c5894a4856ce043a73249e323 (patch) | |
tree | 132c1a07f49e83807abc5ea37420febd6694f853 | |
parent | b2252a15c7f26fd4a7787068ea00e9a2d4b1761a (diff) |
Modify notification event callback function
HomeScreen-Service unified event pattern, so in homescreen
got caller application id in "parameter".
BUG-AGL: SPEC-2120
Change-Id: I3a491cbc3b1ccf109409ed9b065111706fe6be5e
Signed-off-by: wang_zhiqiang <wang_zhiqiang@dl.cn.nexty-ele.com>
-rw-r--r-- | homescreen/src/homescreenhandler.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/homescreen/src/homescreenhandler.cpp b/homescreen/src/homescreenhandler.cpp index 3aaef26..d3338be 100644 --- a/homescreen/src/homescreenhandler.cpp +++ b/homescreen/src/homescreenhandler.cpp @@ -51,14 +51,14 @@ void HomescreenHandler::init(int port, const char *token) }); mp_hs->set_event_handler(LibHomeScreen::Event_ShowNotification,[this](json_object *object){ - const char *application_id = json_object_get_string( - json_object_object_get(object, "application_id")); - json_object *p_obj = json_object_object_get(object, "parameter"); const char *icon = json_object_get_string( json_object_object_get(p_obj, "icon")); const char *text = json_object_get_string( json_object_object_get(p_obj, "text")); + const char *app_id = json_object_get_string( + json_object_object_get(p_obj, "caller")); + HMI_DEBUG("HomeScreen","Event_ShowNotification icon=%s, text=%s, caller=%s", icon, text, app_id); QFileInfo icon_file(icon); QString icon_path; if (icon_file.isFile() && icon_file.exists()) { @@ -67,7 +67,7 @@ void HomescreenHandler::init(int port, const char *token) icon_path = "./images/Utility_Logo_Grey-01.svg"; } - emit showNotification(QString(QLatin1String(application_id)), icon_path, QString(QLatin1String(text))); + emit showNotification(QString(QLatin1String(app_id)), icon_path, QString(QLatin1String(text))); }); mp_hs->set_event_handler(LibHomeScreen::Event_ShowInformation,[this](json_object *object){ |