X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fhomescreen.cpp;h=b11663b942d2be47dd2742bff378db7a6c27978e;hb=aa43a07d4e86421aefec8c603018d14f5e249087;hp=e921febc4554b14271f811a1e501960dca5fc15c;hpb=53ae85dc62875fc92f1d24e25359beda8787826d;p=apps%2Fagl-service-homescreen.git diff --git a/src/homescreen.cpp b/src/homescreen.cpp index e921feb..b11663b 100644 --- a/src/homescreen.cpp +++ b/src/homescreen.cpp @@ -20,16 +20,54 @@ #include #include #include "hs-helper.h" -#include "hmi-debug.h" #include "hs-clientmanager.h" +#include "hs-appinfo.h" const char _error[] = "error"; const char _application_id[] = "application_id"; const char _display_message[] = "display_message"; const char _reply_message[] = "reply_message"; +const char _keyData[] = "data"; +const char _keyId[] = "id"; -static HS_ClientManager* g_client_manager = HS_ClientManager::instance(); +struct hs_instance { + HS_ClientManager *client_manager; // the connection session manager + HS_AppInfo *app_info; // application info + + hs_instance() : client_manager(HS_ClientManager::instance()), app_info(HS_AppInfo::instance()) {} + int init(afb_api_t api); +}; + +/** + * init function + * + * #### Parameters + * - api : the api serving the request + * + * #### Return + * 0 : init success + * 1 : init fail + * + */ +int hs_instance::init(afb_api_t api) +{ + if(client_manager == nullptr) { + AFB_ERROR("client_manager is nullptr."); + return -1; + } + client_manager->init(); + + if(app_info == nullptr) { + AFB_ERROR("app_info is nullptr."); + return -1; + } + app_info->init(api); + + return 0; +} + +static struct hs_instance *g_hs_instance; /* ********** Method of HomeScreen Service (API) ********** @@ -39,7 +77,7 @@ static void pingSample(afb_req_t request) { static int pingcount = 0; afb_req_success_f(request, json_object_new_int(pingcount), "Ping count = %d", pingcount); - HMI_NOTICE("homescreen-service","Verbosity macro at level notice invoked at ping invocation count = %d", pingcount); + AFB_DEBUG("Verbosity macro at level notice invoked at ping invocation count = %d", pingcount); pingcount++; } @@ -57,12 +95,17 @@ static void pingSample(afb_req_t request) */ static void tap_shortcut (afb_req_t request) { - HMI_NOTICE("homescreen-service","called."); int ret = 0; const char* value = afb_req_value(request, _application_id); if (value) { - HMI_NOTICE("homescreen-service","request appid = %s.", value); - ret = g_client_manager->handleRequest(request, __FUNCTION__, value); + AFB_INFO("request appid = %s.", value); + ret = g_hs_instance->client_manager->handleRequest(request, __FUNCTION__, value); + if(ret == AFB_REQ_NOT_STARTED_APPLICATION) { + std::string id = g_hs_instance->app_info->getAppProperty(value, _keyId); + HS_AfmMainProxy afm_proxy; + afm_proxy.start(request, id); + ret = 0; + } } else { ret = AFB_EVENT_BAD_REQUEST; @@ -92,8 +135,7 @@ static void tap_shortcut (afb_req_t request) */ static void on_screen_message (afb_req_t request) { - HMI_NOTICE("homescreen-service","called."); - int ret = g_client_manager->handleRequest(request, __FUNCTION__); + int ret = g_hs_instance->client_manager->handleRequest(request, __FUNCTION__); if (ret) { afb_req_fail_f(request, "failed", "called %s, Unknown parameter", __FUNCTION__); } @@ -118,8 +160,7 @@ static void on_screen_message (afb_req_t request) */ static void on_screen_reply (afb_req_t request) { - HMI_NOTICE("homescreen-service","called."); - int ret = g_client_manager->handleRequest(request, __FUNCTION__); + int ret = g_hs_instance->client_manager->handleRequest(request, __FUNCTION__); if (ret) { afb_req_fail_f(request, "failed", "called %s, Unknown parameter", __FUNCTION__); } @@ -143,11 +184,10 @@ static void on_screen_reply (afb_req_t request) */ static void subscribe(afb_req_t request) { - HMI_NOTICE("homescreen-service","called."); int ret = 0; std::string req_appid = std::move(get_application_id(request)); if(!req_appid.empty()) { - ret = g_client_manager->handleRequest(request, __FUNCTION__, req_appid.c_str()); + ret = g_hs_instance->client_manager->handleRequest(request, __FUNCTION__, req_appid.c_str()); } else { ret = AFB_EVENT_BAD_REQUEST; @@ -176,11 +216,10 @@ static void subscribe(afb_req_t request) */ static void unsubscribe(afb_req_t request) { - HMI_NOTICE("homescreen-service","called."); int ret = 0; std::string req_appid = std::move(get_application_id(request)); if(!req_appid.empty()) { - ret = g_client_manager->handleRequest(request, __FUNCTION__, req_appid.c_str()); + ret = g_hs_instance->client_manager->handleRequest(request, __FUNCTION__, req_appid.c_str()); } else { ret = AFB_EVENT_BAD_REQUEST; @@ -209,11 +248,16 @@ static void unsubscribe(afb_req_t request) */ static void showWindow(afb_req_t request) { - HMI_NOTICE("homescreen-service","called."); int ret = 0; const char* value = afb_req_value(request, _application_id); if (value) { - ret = g_client_manager->handleRequest(request, __FUNCTION__, value); + ret = g_hs_instance->client_manager->handleRequest(request, __FUNCTION__, value); + if(ret == AFB_REQ_NOT_STARTED_APPLICATION) { + std::string id = g_hs_instance->app_info->getAppProperty(value, _keyId); + HS_AfmMainProxy afm_proxy; + afm_proxy.start(request, id); + ret = 0; + } } else { ret = AFB_EVENT_BAD_REQUEST; @@ -242,11 +286,10 @@ static void showWindow(afb_req_t request) */ static void hideWindow(afb_req_t request) { - HMI_NOTICE("homescreen-service","called."); int ret = 0; const char* value = afb_req_value(request, _application_id); if (value) { - ret = g_client_manager->handleRequest(request, __FUNCTION__, value); + ret = g_hs_instance->client_manager->handleRequest(request, __FUNCTION__, value); } else { ret = AFB_EVENT_BAD_REQUEST; @@ -275,11 +318,10 @@ static void hideWindow(afb_req_t request) */ static void replyShowWindow(afb_req_t request) { - HMI_NOTICE("homescreen-service","called."); int ret = 0; const char* value = afb_req_value(request, _application_id); if (value) { - ret = g_client_manager->handleRequest(request, __FUNCTION__, value); + ret = g_hs_instance->client_manager->handleRequest(request, __FUNCTION__, value); } else { ret = AFB_EVENT_BAD_REQUEST; @@ -310,8 +352,7 @@ static void replyShowWindow(afb_req_t request) */ static void showNotification(afb_req_t request) { - HMI_NOTICE("homescreen-service","called."); - int ret = g_client_manager->handleRequest(request, __FUNCTION__, "homescreen"); + int ret = g_hs_instance->client_manager->handleRequest(request, __FUNCTION__, "homescreen"); if (ret) { afb_req_fail_f(request, "failed", "called %s, Unknown parameter", __FUNCTION__); } @@ -337,8 +378,7 @@ static void showNotification(afb_req_t request) */ static void showInformation(afb_req_t request) { - HMI_NOTICE("homescreen-service","called."); - int ret = g_client_manager->handleRequest(request, __FUNCTION__, "homescreen"); + int ret = g_hs_instance->client_manager->handleRequest(request, __FUNCTION__, "homescreen"); if (ret) { afb_req_fail_f(request, "failed", "called %s, Unknown parameter", __FUNCTION__); } @@ -350,6 +390,28 @@ static void showInformation(afb_req_t request) } } +/** + * get runnables list + * + * #### Parameters + * - request : the request + * + * #### Return + * None + * + */ +static void getRunnables(afb_req_t request) +{ + struct json_object* j_runnable = json_object_new_array(); + g_hs_instance->app_info->getRunnables(&j_runnable); + + /*create response json object*/ + struct json_object *res = json_object_new_object(); + hs_add_object_to_json_object_func(res, __FUNCTION__, 2, _error, 0); + json_object_object_add(res, _keyData, j_runnable); + afb_req_success_f(request, res, "homescreen binder unsubscribe success."); +} + /* * array of the verbs exported to afb-daemon */ @@ -366,6 +428,7 @@ static const afb_verb_t verbs[]= { { .verb="unsubscribe", .callback=unsubscribe }, { .verb="showNotification", .callback=showNotification }, { .verb="showInformation", .callback=showInformation }, + { .verb="getRunnables", .callback=getRunnables }, {NULL } /* marker for end of the array */ }; @@ -381,7 +444,7 @@ static const afb_verb_t verbs[]= { */ static int preinit(afb_api_t api) { - HMI_NOTICE("homescreen-service","binding preinit (was register)"); + AFB_DEBUG("binding preinit (was register)"); return 0; } @@ -397,11 +460,21 @@ static int preinit(afb_api_t api) */ static int init(afb_api_t api) { - HMI_NOTICE("homescreen-service","binding init"); + AFB_DEBUG("binding init"); - g_client_manager->init(); + if(g_hs_instance != nullptr) { + AFB_WARNING( "g_hs_instance isn't null."); + delete g_hs_instance->client_manager; + delete g_hs_instance->app_info; + delete g_hs_instance; + g_hs_instance = nullptr; + } + g_hs_instance = new hs_instance(); + if(g_hs_instance == nullptr) { + return -1; + } - return 0; + return g_hs_instance->init(api); } /** @@ -418,7 +491,8 @@ static int init(afb_api_t api) */ static void onevent(afb_api_t api, const char *event, struct json_object *object) { - HMI_NOTICE("homescreen-service","on_event %s", event); + AFB_DEBUG("on_event %s", event); + g_hs_instance->app_info->onEvent(api, event, object); } const afb_binding_t afbBindingExport = {