From eabd10ffe2f9cb5c31262ad3152b037eb2286857 Mon Sep 17 00:00:00 2001 From: zheng_wenlong Date: Mon, 23 Oct 2017 14:46:17 +0900 Subject: Modify function argument from char to json Change libhomescreen event api from char to json. Also modify samples who use this. BUG-AGL: SPEC-992 Change-Id: Id3986d413f9494019f6b175488dd73de226ba020 Signed-off-by: zheng_wenlong --- src/libhomescreen.cpp | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'src/libhomescreen.cpp') diff --git a/src/libhomescreen.cpp b/src/libhomescreen.cpp index 42ab8b1..2f3ef44 100644 --- a/src/libhomescreen.cpp +++ b/src/libhomescreen.cpp @@ -441,25 +441,15 @@ void LibHomeScreen::on_event(void *closure, const char *event, struct afb_wsj1_m if (strcasecmp(event_only, LibHomeScreen::event_list[0].c_str()) == 0) { auto i = this->handlers.find(Event_TapShortcut); - - struct json_object *json_application_name = json_object_object_get(json_data, "application_name"); - const char* application_name = json_object_get_string(json_application_name); - if ( i != this->handlers.end() ) { - i->second(application_name); + i->second(json_data); } } else if (strcasecmp(event_only, LibHomeScreen::event_list[1].c_str()) == 0) { - auto i = this->handlers.find(Event_OnScreenMessage); - - struct json_object *json_display_message = json_object_object_get(json_data, "display_message"); - const char* display_message = json_object_get_string(json_display_message); - if ( i != this->handlers.end() ) { - i->second(display_message); + i->second(json_data); } - } json_object_put(ev_contents); -- cgit 1.2.3-korg