1 files changed, 22 insertions, 290 deletions

diff --git a/src/hs-clientmanager.cpp b/src/hs-clientmanager.cpp
index 1355c99..7d658e4 100644
--- a/src/hs-clientmanager.cpp
+++ b/src/hs-clientmanager.cpp
@@ -154,312 +154,44 @@ void HS_ClientManager::removeClientCtxt(void *data)
 }
 
 /**
- * tap_shortcut
- *
- * #### Parameters
- *  - request: the request to bindings
- *
- * #### Return
- * result
- *
- */
-int HS_ClientManager::tap_shortcut(afb_req_t request)
-{
-    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);
-        for(auto m : client_list) {
-            m.second->on_screen_message(request, value);
-        }
-    }
-    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 =std::move(get_application_id(request));
-        if(appid.empty()) {
-            HMI_NOTICE("homescreen-service","can't get application identifier");
-            return AFB_REQ_GETAPPLICATIONID_ERROR;
-        }
-
-        std::lock_guard<std::mutex> lock(this->mtx);
-        HS_Client* client = nullptr;
-        auto ip = client_list.find(appid);
-        if(ip != client_list.end()) {
-            client = client_list[appid];
-        }
-        else {
-            appid2ctxt[appid] = createClientCtxt(request, appid);
-            client = addClient(request, appid);
-        }
-
-        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
- *
- * #### Parameters
- *  - request: the request to bindings
- *
- * #### Return
- * result
- *
- */
-int HS_ClientManager::unsubscribe(afb_req_t request)
-{
-    const char *value = afb_req_value(request, "event");
-    HMI_NOTICE("homescreen-service","value is %s", value);
-    int ret = 0;
-    if(value) {
-        std::string appid = std::move(get_application_id(request));
-        if(appid.empty()) {
-            HMI_NOTICE("homescreen-service","can't get application identifier");
-            return AFB_REQ_GETAPPLICATIONID_ERROR;
-        }
-
-        std::lock_guard<std::mutex> lock(this->mtx);
-        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;
-        }
-    }
-    else {
-        HMI_NOTICE("homescreen-service","Please input event name");
-        ret = AFB_EVENT_BAD_REQUEST;
-    }
-    return ret;
-}
-
-/**
- * showWindow event
+ * handle homescreen request
  *
  * #### Parameters
  *  - request : the request
+ *  - verb : the verb name
+ *  - appid : to which application
  *
  * #### Return
  * 0 : success
  * others : fail
  *
  */
-int HS_ClientManager::showWindow(afb_req_t request)
+int HS_ClientManager::handleRequest(afb_req_t request, const char *verb, const char *appid)
 {
+    HMI_NOTICE("homescreen-service","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()) {
-            ret = ip->second->showWindow(request, value);
+    std::lock_guard<std::mutex> lock(this->mtx);
+    if(appid == nullptr) {
+        for(auto m : client_list) {
+            m.second->handleRequest(request, verb);
         }
     }
     else {
-        HMI_NOTICE("homescreen-service","Please input application_id");
-        ret = AFB_EVENT_BAD_REQUEST;
-    }
-    return ret;
-}
-
-/**
- * hideWindow event
- *
- * #### Parameters
- *  - request : the request
- *
- * #### Return
- * 0 : success
- * others : fail
- *
- */
-int HS_ClientManager::hideWindow(afb_req_t request)
-{
-    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));
+        auto ip = client_list.find(std::string(appid));
         if(ip != client_list.end()) {
-            ret = ip->second->hideWindow(request);
+            ret = ip->second->handleRequest(request, verb);
         }
-    }
-    else {
-        HMI_NOTICE("homescreen-service","Please input application_id");
-        ret = AFB_EVENT_BAD_REQUEST;
-    }
-    return ret;
-}
-
-/**
- * replyShowWindow event
- *
- * #### Parameters
- *  - request : the request
- *
- * #### Return
- * 0 : success
- * others : fail
- *
- */
-int HS_ClientManager::replyShowWindow(afb_req_t request)
-{
-    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()) {
-            ret = ip->second->replyShowWindow(request, value);
+        else {
+            if(!strcasecmp(verb, "subscribe")) {
+                appid2ctxt[appid] = createClientCtxt(request, appid);
+                HS_Client* client = addClient(request, appid);
+                ret = client->handleRequest(request, "subscribe");
+            }
+            else {
+                HMI_NOTICE("homescreen-service","not exist session");
+                ret = AFB_EVENT_BAD_REQUEST;
+            }
         }
     }
-    else {
-        HMI_NOTICE("homescreen-service","Please input application_id");
-        ret = AFB_EVENT_BAD_REQUEST;
-    }
-    return ret;
-}
-
-/**
- * showNotification event
- *
- * #### Parameters
- *  - request : the request
- *
- * #### Return
- * 0 : success
- * others : fail
- *
- */
-int HS_ClientManager::showNotification(afb_req_t request)
-{
-    int ret = 0;
-    std::lock_guard<std::mutex> lock(this->mtx);
-    auto ip = client_list.find(_homescreen);
-    if(ip != client_list.end()) {
-        ret = ip->second->showNotification(request);
-    }
-    else {
-        HMI_NOTICE("homescreen-service","not exist sessiion with homescreen");
-        ret = AFB_REQ_SHOWNOTIFICATION_ERROR;
-    }
-
     return ret;
-}
-
-/**
- * showInformation event
- *
- * #### Parameters
- *  - request : the request
- *
- * #### Return
- * 0 : success
- * others : fail
- *
- */
-int HS_ClientManager::showInformation(afb_req_t request)
-{
-    int ret = 0;
-    std::lock_guard<std::mutex> lock(this->mtx);
-    auto ip = client_list.find(_homescreen);
-    if(ip != client_list.end()) {
-        ret = ip->second->showInformation(request);
-    }
-    else {
-        HMI_NOTICE("homescreen-service","not exist sessiion with homescreen");
-        ret = AFB_REQ_SHOWINFORMATION_ERROR;
-    }
-
-    return ret;
-}
+}
\ No newline at end of file