* When HomeScreen shortcut area is tapped, sending a event
*
* #### Parameters
- * - application_name [in] : Tapped application name (label)
+ * - application_id [in] : Tapped application id (label)
*
* #### Return
* - Returns 0 on success or -1 in case of error.
*/
-int LibHomeScreen::tapShortcut(const char* application_name)
+int LibHomeScreen::tapShortcut(const char* application_id)
{
if(!sp_websock)
{
}
struct json_object* j_obj = json_object_new_object();
- struct json_object* val = json_object_new_string(application_name);
- json_object_object_add(j_obj, "application_name", val);
+ struct json_object* val = json_object_new_string(application_id);
+ json_object_object_add(j_obj, "application_id", val);
return this->call("tap_shortcut", j_obj);
}
}
/*
-* event is like "homescreen/tap_shortcut"
-* msg is like {"event":"homescreen\/tap_shortcut","data":{"application_name":"hoge"},"jtype":"afb-event"}
+* event is like "homescreen/hvac"
+* msg is like {"event":"homescreen\/hvac","data":{"type":"tap_shortcut"},"jtype":"afb-event"}
* so you can get
event name : struct json_object obj = json_object_object_get(msg,"event")
*/
onEvent(ev, ev_contents);
}
- const char* event_only = strchr(event, '/');
- if (event_only != nullptr) {
- event_only = event_only + 1;
- }else{
- HMI_WARNING("libhomescreen","event_only is null.");
+ const char* event_type = nullptr;
+ struct json_object *json_event_type;
+ if(json_object_object_get_ex(json_data, "type", &json_event_type)) {
+ event_type = json_object_get_string(json_event_type);
+ }
+ else {
+ HMI_WARNING("libhomescreen","event_type is null.");
return;
}
- if (strcasecmp(event_only, LibHomeScreen::event_list[0].c_str()) == 0) {
+ if (strcasecmp(event_type, LibHomeScreen::event_list[0].c_str()) == 0) {
auto i = this->handlers.find(Event_TapShortcut);
if ( i != this->handlers.end() ) {
i->second(json_data);
}
}
- else if (strcasecmp(event_only, LibHomeScreen::event_list[1].c_str()) == 0) {
+ else if (strcasecmp(event_type, LibHomeScreen::event_list[1].c_str()) == 0) {
auto i = this->handlers.find(Event_OnScreenMessage);
if ( i != this->handlers.end() ) {
i->second(json_data);
}
}
- else if (strcasecmp(event_only, LibHomeScreen::event_list[2].c_str()) == 0) {
+ else if (strcasecmp(event_type, LibHomeScreen::event_list[2].c_str()) == 0) {
auto i = this->handlers.find(Event_OnScreenReply);
if ( i != this->handlers.end() ) {
i->second(json_data);