use appid instead of appname in "tap_shortcut"

[src/libhomescreen.git] / src / libhomescreen.cpp

diff --git a/src/libhomescreen.cpp b/src/libhomescreen.cpp
index 2f3ef44..29ba7ef 100644 (file)
--- a/src/libhomescreen.cpp
+++ b/src/libhomescreen.cpp
@@ -38,6 +38,7 @@ const std::vector<std::string> LibHomeScreen::api_list {
        std::string("ping"), // debug do not use
        std::string("tap_shortcut"), // HomeScreen Application only
        std::string("on_screen_message"),
+       std::string("on_screen_reply"),
        std::string("subscribe"),
        std::string("unsubscribe")
 };
@@ -45,6 +46,7 @@ const std::vector<std::string> LibHomeScreen::api_list {
 const std::vector<std::string> LibHomeScreen::event_list {
        std::string("tap_shortcut"),
        std::string("on_screen_message"),
+       std::string("on_screen_reply"),
        std::string("none")
 };
 
@@ -173,7 +175,7 @@ int LibHomeScreen::initialize_websocket()
 
        /* Initialize interface from websocket */
        minterface.on_hangup = _on_hangup_static;
-       minterface.on_call = _on_call_static; /* Is this necessary? */
+       minterface.on_call = _on_call_static;
        minterface.on_event = _on_event_static;
        muri += "ws://localhost:" + to_string(mport) + "/api?token=" + mtoken; /*To be modified*/
        sp_websock = afb_ws_client_connect_wsj1(mploop, muri.c_str(), &minterface, this);
@@ -201,12 +203,12 @@ END:
  * 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)
        {
@@ -214,8 +216,8 @@ int LibHomeScreen::tapShortcut(const char* application_name)
        }
 
        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);
 }
 
@@ -243,6 +245,30 @@ int LibHomeScreen::onScreenMessage(const char* display_message)
        return this->call("on_screen_message", j_obj);
 }
 
+/**
+ * Sending onScreen reply event
+ *
+ * Sending OnScreen reply event to applications from HomeScreen
+ *
+ * #### Parameters
+ * - reply_message [in] : message for reply
+ *
+ * #### Return
+ * - Returns 0 on success or -1 in case of error.
+ */
+int LibHomeScreen::onScreenReply(const char* reply_message)
+{
+       if(!sp_websock)
+       {
+               return -1;
+       }
+
+       struct json_object* j_obj = json_object_new_object();
+       struct json_object* val = json_object_new_string(reply_message);
+       json_object_object_add(j_obj, "reply_message", val);
+       return this->call("on_screen_reply", j_obj);
+}
+
 /**
  * Setting Event Handler
  *
@@ -254,10 +280,14 @@ int LibHomeScreen::onScreenMessage(const char* display_message)
  *
  * #### Return
  * Nothing
+ *
+ * #### Note
+ * Don't release json_object by json_object_put in handler_func.
+ * The resource is released by libafbwsc library.
  */
 void LibHomeScreen::set_event_handler(enum EventType et, handler_func f)
 {
-       if (et >= 1 && et <= 2) {
+       if (et >= 1 && et <= 3) {
                switch (et) {
                        case Event_TapShortcut:
                                this->subscribe(LibHomeScreen::event_list[0]);
@@ -265,6 +295,9 @@ void LibHomeScreen::set_event_handler(enum EventType et, handler_func f)
                        case Event_OnScreenMessage:
                                this->subscribe(LibHomeScreen::event_list[1]);
                                break;
+                       case Event_OnScreenReply:
+                               this->subscribe(LibHomeScreen::event_list[2]);
+                               break;
                }
 
                this->handlers[et] = std::move(f);
@@ -412,8 +445,8 @@ void LibHomeScreen::on_call(void *closure, const char *api, const char *verb, st
 }
 
 /*
-* 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")
 */
@@ -426,7 +459,11 @@ void LibHomeScreen::on_event(void *closure, const char *event, struct afb_wsj1_m
        }
 
        struct json_object* ev_contents = afb_wsj1_msg_object_j(msg);
-       struct json_object *json_data = json_object_object_get(ev_contents, "data");
+       struct json_object *json_data;
+       if(!json_object_object_get_ex(ev_contents, "data", &json_data)) {
+               HMI_ERROR("libhomescreen", "got ev_contents error.");
+               return;
+       }
 
        if(onEvent != nullptr)
        {
@@ -434,25 +471,34 @@ void LibHomeScreen::on_event(void *closure, const char *event, struct afb_wsj1_m
                onEvent(ev, ev_contents);
        }
 
-       const char* event_only = strchr(event, '/');
-       if (event_only != nullptr) {
-               event_only = event_only + 1;
+       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);
                }
        }
-
-       json_object_put(ev_contents);
+       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);
+               }
+       }
 }
 
 /**
@@ -466,8 +512,6 @@ void LibHomeScreen::on_reply(void *closure, struct afb_wsj1_msg *msg)
        {
                struct json_object* reply = afb_wsj1_msg_object_j(msg);
                onReply(reply);
-
-               json_object_put(reply);
        }
 }