X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fhs-clientmanager.cpp;h=6e6397fb5161c8196cd085f4177cc831acd5969d;hb=2d1c8cc2f43d021ad75adc16f0606fb52615d9a6;hp=15897b7c91bf099e7c48203bc0aa804daec1b1cc;hpb=c6035c02992d874c1422cb279423017ca4c05eec;p=apps%2Fagl-service-homescreen.git

diff --git a/src/hs-clientmanager.cpp b/src/hs-clientmanager.cpp
index 15897b7..6e6397f 100644
--- a/src/hs-clientmanager.cpp
+++ b/src/hs-clientmanager.cpp
@@ -13,9 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+#include <cstring>
 #include <algorithm>
 #include "hs-clientmanager.h"
-#include "hmi-debug.h"
+
+static const char _homescreen[] = "homescreen";
 
 HS_ClientManager* HS_ClientManager::me = nullptr;
 
@@ -68,7 +71,6 @@ HS_ClientManager* HS_ClientManager::instance(void)
  */
 int HS_ClientManager::init(void)
 {
-    HMI_NOTICE("homescreen-service","called.");
 }
 
 /**
@@ -86,7 +88,7 @@ HS_ClientCtxt* HS_ClientManager::createClientCtxt(afb_req_t req, std::string app
     HS_ClientCtxt *ctxt = (HS_ClientCtxt *)afb_req_context_get(req);
     if (!ctxt)
     {
-        HMI_NOTICE("homescreen-service", "create new session for %s", appid.c_str());
+        AFB_INFO( "create new session for %s", appid.c_str());
         HS_ClientCtxt *ctxt = new HS_ClientCtxt(appid.c_str());
         afb_req_session_set_LOA(req, 1);
         afb_req_context_set(req, ctxt, cbRemoveClientCtxt);
@@ -140,11 +142,11 @@ void HS_ClientManager::removeClientCtxt(void *data)
     HS_ClientCtxt *ctxt = (HS_ClientCtxt *)data;
     if(ctxt == nullptr)
     {
-        HMI_ERROR("homescreen-service", "data is nullptr");
+        AFB_WARNING( "data is nullptr");
         return;
     }
 
-    HMI_NOTICE("homescreen-service", "remove app %s", ctxt->id.c_str());
+    AFB_INFO( "remove app %s", ctxt->id.c_str());
     std::lock_guard<std::mutex> lock(this->mtx);
     removeClient(ctxt->id);
     delete appid2ctxt[ctxt->id];
@@ -152,160 +154,80 @@ void HS_ClientManager::removeClientCtxt(void *data)
 }
 
 /**
- * tap_shortcut
+ * handle homescreen request
  *
  * #### Parameters
- *  - request: the request to bindings
+ *  - request : the request
+ *  - verb : the verb name
+ *  - appid : to which application
  *
  * #### Return
- * result
+ * 0 : success
+ * others : fail
  *
  */
-int HS_ClientManager::tap_shortcut(afb_req_t request)
+int HS_ClientManager::handleRequest(afb_req_t request, const char *verb, const char *appid)
 {
+    AFB_INFO("verb=[%s],appid=[%s].", verb, appid);
     int ret = 0;
-    const char* value = afb_req_value(request, _application_id);
-    if (value) {
-        HMI_NOTICE("homescreen-service","request params = %s.", value);
-        std::lock_guard<std::mutex> lock(this->mtx);
-        auto ip = client_list.find(std::string(value));
-        if(ip != client_list.end()) {
-            ip->second->tap_shortcut(value);
-        }
-    }
-    else {
-        HMI_NOTICE("homescreen-service","Please input application_id");
-        ret = AFB_EVENT_BAD_REQUEST;
-    }
-    return ret;
-}
-
-/**
- * on_screen_message
- *
- * #### Parameters
- *  - request: the request to bindings
- *
- * #### Return
- * result
- *
- */
-int HS_ClientManager::on_screen_message(afb_req_t request)
-{
-    int ret = 0;
-    const char* value = afb_req_value(request, _display_message);
-    if (value) {
-        HMI_NOTICE("homescreen-service","request params = %s.", value);
-        std::lock_guard<std::mutex> lock(this->mtx);
+    std::lock_guard<std::mutex> lock(this->mtx);
+    if(appid == nullptr) {
         for(auto m : client_list) {
-            m.second->on_screen_message(request, value);
+            m.second->handleRequest(request, verb);
         }
     }
     else {
-        HMI_NOTICE("homescreen-service","Please input display_message");
-        ret = AFB_EVENT_BAD_REQUEST;
-    }
-    return ret;
-}
-
-/**
- * on_screen_reply
- *
- * #### Parameters
- *  - request: the request to bindings
- *
- * #### Return
- * result
- *
- */
-int HS_ClientManager::on_screen_reply(afb_req_t request)
-{
-    int ret = 0;
-    const char* value = afb_req_value(request, _reply_message);
-    if (value) {
-      HMI_NOTICE("homescreen-service","request params = %s.", value);
-      std::lock_guard<std::mutex> lock(this->mtx);
-      for(auto m : client_list) {
-        m.second->on_screen_reply(request, value);
-      }
-    }
-    else {
-        HMI_NOTICE("homescreen-service","Please input reply_message");
-        ret = AFB_EVENT_BAD_REQUEST;
-    }
-    return ret;
-}
-
-/**
- * subscribe
- *
- * #### Parameters
- *  - request: the request to bindings
- *
- * #### Return
- * result
- *
- */
-int HS_ClientManager::subscribe(afb_req_t request)
-{
-    int ret = 0;
-    const char *value = afb_req_value(request, "event");
-    HMI_NOTICE("homescreen-service","value is %s", value);
-    if(value) {
-        std::string appid(afb_req_get_application_id(request));
-        std::lock_guard<std::mutex> lock(this->mtx);
-
-        HS_Client* client = nullptr;
-        auto ip = client_list.find(appid);
+        auto ip = client_list.find(std::string(appid));
         if(ip != client_list.end()) {
-            client = client_list[appid];
+            ret = ip->second->handleRequest(request, verb);
         }
         else {
-            appid2ctxt[appid] = createClientCtxt(request, appid);
-            client = addClient(request, appid);
+            if(!strcasecmp(verb, "subscribe")) {
+                appid2ctxt[appid] = createClientCtxt(request, appid);
+                HS_Client* client = addClient(request, appid);
+                ret = client->handleRequest(request, "subscribe");
+            }
+            else {
+                AFB_NOTICE("not exist session");
+                ret = AFB_REQ_NOT_STARTED_APPLICATION;
+            }
         }
-
-        if(client->subscribe(request, value) != 0) {
-            HMI_NOTICE("homescreen-service","subscribe failed");
-            ret = AFB_REQ_SUBSCRIBE_ERROR;
-        }
-    }
-    else {
-        HMI_NOTICE("homescreen-service","Please input event name");
-        ret = AFB_EVENT_BAD_REQUEST;
     }
     return ret;
 }
 
 /**
- * unsubscribe
+ * push event
  *
  * #### Parameters
- *  - request: the request to bindings
+ *  - event : the event want to push
+ *  - param : the parameter contents of event
+ *  - appid : the destination application's id
  *
  * #### Return
- * result
+ * 0 : success
+ * others : fail
  *
  */
-int HS_ClientManager::unsubscribe(afb_req_t request)
+int HS_ClientManager::pushEvent(const char *event, struct json_object *param, std::string appid)
 {
-    const char *value = afb_req_value(request, "event");
-    HMI_NOTICE("homescreen-service","value is %s", value);
-    int ret = 0;
-    if(value) {
-        std::string appid(afb_req_get_application_id(request));
-        std::lock_guard<std::mutex> lock(this->mtx);
+    if(event == nullptr) {
+        AFB_WARNING("event name is null.");
+        return -1;
+    }
 
-        auto ip = client_list.find(appid);
-        if(ip != client_list.end()
-        && ip->second->unsubscribe(request, value) != 0) {
-            HMI_NOTICE("homescreen-service","unsubscribe failed");
-            ret = AFB_REQ_UNSUBSCRIBE_ERROR;
+    std::lock_guard<std::mutex> lock(this->mtx);
+    if(appid.empty()) { // broadcast event to clients who subscribed this event
+        for(auto m : client_list) {
+            m.second->pushEvent(event, param);
         }
     }
-    else {
-        HMI_NOTICE("homescreen-service","Please input event name");
-        ret = AFB_EVENT_BAD_REQUEST;
+    else {  // push event to specific client
+        auto ip = client_list.find(appid);
+        if(ip != client_list.end()) {
+            ip->second->pushEvent(event, param);
+        }
     }
-    return ret;
-}
+
+    return 0;
+}
\ No newline at end of file