X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fhs-clientmanager.cpp;h=913e9b671444c2cd9c13709f9fd93005aa4b6fc1;hb=c1dfe704bffedc07c5272cd84fb882bb196eb841;hp=83d6bb304deebd6238c7c0f0d42c15a45f60b69b;hpb=46ac770dd55f51bc5d611ba3e5dd883e5f51edfa;p=apps%2Fagl-service-homescreen.git diff --git a/src/hs-clientmanager.cpp b/src/hs-clientmanager.cpp index 83d6bb3..913e9b6 100644 --- a/src/hs-clientmanager.cpp +++ b/src/hs-clientmanager.cpp @@ -17,8 +17,11 @@ #include #include #include "hs-clientmanager.h" +#include "hs-apprecover.h" static const char _homescreen[] = "homescreen"; +static const char _area[] = "area"; +static const char _parameter[] = "parameter"; HS_ClientManager* HS_ClientManager::me = nullptr; @@ -71,7 +74,7 @@ HS_ClientManager* HS_ClientManager::instance(void) */ int HS_ClientManager::init(void) { - AFB_NOTICE("called."); + listener_list.clear(); } /** @@ -171,13 +174,15 @@ int HS_ClientManager::handleRequest(afb_req_t request, const char *verb, const c { AFB_INFO("verb=[%s],appid=[%s].", verb, appid); int ret = 0; - std::lock_guard lock(this->mtx); + bool isRegisterApp = false; if(appid == nullptr) { + std::lock_guard lock(this->mtx); for(auto m : client_list) { m.second->handleRequest(request, verb); } } else { + std::lock_guard lock(this->mtx); auto ip = client_list.find(std::string(appid)); if(ip != client_list.end()) { ret = ip->second->handleRequest(request, verb); @@ -187,7 +192,7 @@ int HS_ClientManager::handleRequest(afb_req_t request, const char *verb, const c appid2ctxt[appid] = createClientCtxt(request, appid); HS_Client* client = addClient(request, appid); ret = client->handleRequest(request, "subscribe"); - registerApplication(appid); + isRegisterApp = true; } else { AFB_NOTICE("not exist session"); @@ -195,6 +200,9 @@ int HS_ClientManager::handleRequest(afb_req_t request, const char *verb, const c } } } + if(isRegisterApp) { + notifyListener(request->api, std::string(appid)); + } return ret; } @@ -213,6 +221,7 @@ int HS_ClientManager::handleRequest(afb_req_t request, const char *verb, const c */ int HS_ClientManager::pushEvent(const char *event, struct json_object *param, std::string appid) { + AFB_INFO("event=[%s], appid=[%s].", event, appid.c_str()); if(event == nullptr) { AFB_WARNING("event name is null."); return -1; @@ -235,16 +244,77 @@ int HS_ClientManager::pushEvent(const char *event, struct json_object *param, st } /** - * register recovered application + * check whether application was started * * #### Parameters - * - appid : application id + * - appid : application's id + * + * #### Return + * true : started + * false : not start + * + */ +bool HS_ClientManager::isAppStarted(const std::string &appid) +{ + auto it = client_list.find(appid); + return it != client_list.end() ? true : false; +} + +/** + * add app register listener + * + * #### Parameters + * - listener_interface : listener interface * * #### Return * None * */ -void HS_ClientManager::registerApplication(std::string appid) +void HS_ClientManager::addListener(listener_interface* listener) { + listener_list[listener->myUid()] = listener; +} +/** + * remove app register listener + * + * #### Parameters + * - listener_interface : listener interface + * + * #### Return + * None + * + */ +void HS_ClientManager::removeListener(listener_interface* listener) +{ + listener_list.erase(listener->myUid()); +} + +/** + * notify listener + * + * #### Parameters + * - api : the api + * - appid : register application's id + * + * #### Return + * None + * + */ +void HS_ClientManager::notifyListener(afb_api_t api, const std::string &appid) +{ + AFB_INFO("listen %s, notified", appid.c_str()); + for(auto &it : listener_list) { + if(it.second->isListenAppId(appid)) { + it.second->notify(api, appid); + } + } + + if(startup_appid == appid) { + struct json_object* json_param = json_object_new_object(); + json_object_object_add(json_param, _area, json_object_new_string(startup_area.c_str())); + startup_area.clear(); + startup_appid.clear(); + pushEvent("showWindow", json_param, appid); + } } \ No newline at end of file