X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fhomescreen.cpp;h=fce25ee6585c2644e1b66ff7bf1e20bd9ef4710f;hb=b1dafe3d72940f158927bddf0c35aea34aa675e7;hp=744535b0e26e6e10a00949b49bb3d6b71be2bc12;hpb=be6dd71ae4f9de1b1151f419aef39b6196903db9;p=apps%2Fagl-service-homescreen.git diff --git a/src/homescreen.cpp b/src/homescreen.cpp index 744535b..fce25ee 100644 --- a/src/homescreen.cpp +++ b/src/homescreen.cpp @@ -17,30 +17,25 @@ #ifndef _GNU_SOURCE #define _GNU_SOURCE #endif +#include +#include #include "hs-helper.h" #include "hmi-debug.h" +#include "hs-clientmanager.h" -#define COMMAND_EVENT_NUM 4 -#define EVENT_SUBSCRIBE_ERROR_CODE 100 -/* To Do hash table is better */ -struct event{ - const char* name; - struct afb_event event; -}; - -static struct event event_list[COMMAND_EVENT_NUM]; +const char _error[] = "error"; +const char _application_id[] = "application_id"; +const char _display_message[] = "display_message"; +const char _reply_message[] = "reply_message"; -static const char _error[] = "error"; -static const char _application_name[] = "application_name"; -static const char _display_message[] = "display_message"; -static const char _reply_message[] = "reply_message"; +static HS_ClientManager* g_client_manager = HS_ClientManager::instance(); /* ********** Method of HomeScreen Service (API) ********** */ -static void pingSample(struct afb_req request) +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); @@ -54,32 +49,22 @@ static void pingSample(struct afb_req request) * * #### Parameters * Request key - * - application_name : application name + * - application_id : application id * * #### Return * None * */ -static void tap_shortcut (struct afb_req 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_name); - if (value) { - - HMI_NOTICE("homescreen-service","request params = %s.", value); - - struct json_object* push_obj = json_object_new_object(); - hs_add_object_to_json_object_str( push_obj, 2, - _application_name, value); - afb_event_push(event_list[hs_search_event_name_index(__FUNCTION__)].event, push_obj); - } else { - afb_req_fail_f(request, "failed", "called %s, Unknown palameter", __FUNCTION__); + int ret = g_client_manager->tap_shortcut(request); + if (ret != 0) { + afb_req_fail_f(request, "failed", "called %s, Unknown parameter", __FUNCTION__); return; } - // response to HomeScreen + // response to HomeScreen struct json_object *res = json_object_new_object(); hs_add_object_to_json_object_func(res, __FUNCTION__, 2, _error, ret); @@ -97,22 +82,13 @@ static void tap_shortcut (struct afb_req request) * None * */ -static void on_screen_message (struct afb_req request) +static void on_screen_message (afb_req_t request) { HMI_NOTICE("homescreen-service","called."); - int ret = 0; - const char* value = afb_req_value(request, _display_message); - if (value) { - - HMI_NOTICE("homescreen-service","request params = %s.", value); - - struct json_object* push_obj = json_object_new_object(); - hs_add_object_to_json_object_str( push_obj, 2, - _display_message, value); - afb_event_push(event_list[hs_search_event_name_index(__FUNCTION__)].event, push_obj); - } else { - afb_req_fail_f(request, "failed", "called %s, Unknown palameter", __FUNCTION__); + int ret = g_client_manager->on_screen_message(request); + if (ret != 0) { + afb_req_fail_f(request, "failed", "called %s, Unknown parameter", __FUNCTION__); return; } @@ -134,22 +110,13 @@ static void on_screen_message (struct afb_req request) * None * */ -static void on_screen_reply (struct afb_req request) +static void on_screen_reply (afb_req_t request) { HMI_NOTICE("homescreen-service","called."); - int ret = 0; - const char* value = afb_req_value(request, _reply_message); - if (value) { - - HMI_NOTICE("homescreen-service","request params = %s.", value); - - struct json_object* push_obj = json_object_new_object(); - hs_add_object_to_json_object_str( push_obj, 2, - _reply_message, value); - afb_event_push(event_list[hs_search_event_name_index(__FUNCTION__)].event, push_obj); - } else { - afb_req_fail_f(request, "failed", "called %s, Unknown palameter", __FUNCTION__); + int ret = g_client_manager->on_screen_reply(request); + if (ret != 0) { + afb_req_fail_f(request, "failed", "called %s, Unknown parameter", __FUNCTION__); return; } @@ -170,32 +137,21 @@ static void on_screen_reply (struct afb_req request) * None * */ -static void subscribe(struct afb_req request) +static void subscribe(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) { - int index = hs_search_event_name_index(value); - if(index < 0) - { - HMI_NOTICE("homescreen-service","dedicated event doesn't exist"); - ret = EVENT_SUBSCRIBE_ERROR_CODE; - } - else - { - afb_req_subscribe(request, event_list[index].event); - } - } - else{ - HMI_NOTICE("homescreen-service","Please input event name"); - ret = EVENT_SUBSCRIBE_ERROR_CODE; + HMI_NOTICE("homescreen-service","called."); + + int ret = g_client_manager->subscribe(request); + if(ret) { + afb_req_fail_f(request, "afb_req_subscribe failed", "called %s.", __FUNCTION__); + return; } + /*create response json object*/ struct json_object *res = json_object_new_object(); hs_add_object_to_json_object_func(res, __FUNCTION__, 2, _error, ret); - afb_req_success_f(request, res, "homescreen binder subscribe event name [%s]", value); + afb_req_success_f(request, res, "homescreen binder subscribe."); } /** @@ -208,45 +164,178 @@ static void subscribe(struct afb_req request) * None * */ -static void unsubscribe(struct afb_req request) +static void 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) { - int index = hs_search_event_name_index(value); - if(index < 0) - { - HMI_NOTICE("homescreen-service","dedicated event doesn't exist"); - ret = EVENT_SUBSCRIBE_ERROR_CODE; - } - else - { - afb_req_unsubscribe(request, event_list[index].event); - } - } - else{ - HMI_NOTICE("homescreen-service","Please input event name"); - ret = EVENT_SUBSCRIBE_ERROR_CODE; + HMI_NOTICE("homescreen-service","called."); + + int ret = g_client_manager->unsubscribe(request); + if(ret) { + afb_req_fail_f(request, "afb_req_unsubscribe failed", "called %s.", __FUNCTION__); + return; } + /*create response json object*/ struct json_object *res = json_object_new_object(); hs_add_object_to_json_object_func(res, __FUNCTION__, 2, _error, ret); - afb_req_success_f(request, res, "homescreen binder unsubscribe event name [%s]", value); + afb_req_success_f(request, res, "homescreen binder unsubscribe success."); +} + +/** + * showWindow event + * + * #### Parameters + * - request : the request + * + * #### Return + * None + * + */ +static void showWindow(afb_req_t request) +{ + HMI_NOTICE("homescreen-service","called."); + + int ret = g_client_manager->showWindow(request); + if (ret != 0) { + afb_req_fail_f(request, "failed", "called %s, Unknown parameter", __FUNCTION__); + return; + } + + // response to HomeScreen + struct json_object *res = json_object_new_object(); + hs_add_object_to_json_object_func(res, __FUNCTION__, 2, + _error, ret); + afb_req_success(request, res, "afb_event_push event [showWindow]"); +} + +/** + * hideWindow event + * + * #### Parameters + * - request : the request + * + * #### Return + * None + * + */ +static void hideWindow(afb_req_t request) +{ + HMI_NOTICE("homescreen-service","called."); + + int ret = g_client_manager->hideWindow(request); + if (ret != 0) { + afb_req_fail_f(request, "failed", "called %s, Unknown parameter", __FUNCTION__); + return; + } + + // response to HomeScreen + struct json_object *res = json_object_new_object(); + hs_add_object_to_json_object_func(res, __FUNCTION__, 2, + _error, ret); + afb_req_success(request, res, "afb_event_push event [hideWindow]"); +} + +/** + * replyShowWindow event + * + * #### Parameters + * - request : the request + * + * #### Return + * None + * + */ +static void replyShowWindow(afb_req_t request) +{ + HMI_NOTICE("homescreen-service","called."); + + int ret = g_client_manager->replyShowWindow(request); + if (ret != 0) { + afb_req_fail_f(request, "failed", "called %s, Unknown parameter", __FUNCTION__); + return; + } + + // response to HomeScreen + struct json_object *res = json_object_new_object(); + hs_add_object_to_json_object_func(res, __FUNCTION__, 2, + _error, ret); + afb_req_success(request, res, "afb_event_push event [replyShowWindow]"); +} + +/** + * showNotification event + * + * the contents to homescreen which display at top area. + * + * #### Parameters + * - request : the request + * + * #### Return + * None + * + */ +static void showNotification(afb_req_t request) +{ + HMI_NOTICE("homescreen-service","called."); + + int ret = g_client_manager->showNotification(request); + if (ret != 0) { + afb_req_fail_f(request, "failed", "called %s, Unknown parameter", __FUNCTION__); + return; + } + + // response to Application + struct json_object *res = json_object_new_object(); + hs_add_object_to_json_object_func(res, __FUNCTION__, 2, + _error, ret); + afb_req_success(request, res, "afb_event_push event [showNotification]"); +} + +/** + * showInformation event + * + * the contents to homescreen which display at bottom area. + * + * #### Parameters + * - request : the request + * + * #### Return + * None + * + */ +static void showInformation(afb_req_t request) +{ + HMI_NOTICE("homescreen-service","called."); + + int ret = g_client_manager->showInformation(request); + if (ret != 0) { + afb_req_fail_f(request, "failed", "called %s, Unknown parameter", __FUNCTION__); + return; + } + + // response to Application + struct json_object *res = json_object_new_object(); + hs_add_object_to_json_object_func(res, __FUNCTION__, 2, + _error, ret); + afb_req_success(request, res, "afb_event_push event [showInformation]"); } /* * array of the verbs exported to afb-daemon */ -static const struct afb_verb_v2 verbs[]= { - /* VERB'S NAME FUNCTION TO CALL authorisation some info SESSION MANAGEMENT */ - { .verb = "ping", .callback = pingSample, .auth = NULL, .info = NULL, .session = AFB_SESSION_NONE }, - { .verb = "tap_shortcut", .callback = tap_shortcut, .auth = NULL, .info = NULL, .session = AFB_SESSION_NONE }, - { .verb = "on_screen_message", .callback = on_screen_message, .auth = NULL, .info = NULL, .session = AFB_SESSION_NONE }, - { .verb = "on_screen_reply", .callback = on_screen_reply, .auth = NULL, .info = NULL, .session = AFB_SESSION_NONE }, - { .verb = "subscribe", .callback = subscribe, .auth = NULL, .info = NULL, .session = AFB_SESSION_NONE }, - { .verb = "unsubscribe", .callback = unsubscribe, .auth = NULL, .info = NULL, .session = AFB_SESSION_NONE }, +static const afb_verb_t verbs[]= { + /* VERB'S NAME FUNCTION TO CALL */ + { .verb="ping", .callback=pingSample }, + { .verb="tap_shortcut", .callback=tap_shortcut }, + { .verb="showWindow", .callback=showWindow }, + { .verb="hideWindow", .callback=hideWindow }, + { .verb="replyShowWindow", .callback=replyShowWindow }, + { .verb="on_screen_message", .callback=on_screen_message }, + { .verb="on_screen_reply", .callback=on_screen_reply }, + { .verb="subscribe", .callback=subscribe }, + { .verb="unsubscribe", .callback=unsubscribe }, + { .verb="showNotification", .callback=showNotification }, + { .verb="showInformation", .callback=showInformation }, {NULL } /* marker for end of the array */ }; @@ -254,13 +343,13 @@ static const struct afb_verb_v2 verbs[]= { * homescreen binding preinit function * * #### Parameters - * - null + * - api : the api serving the request * * #### Return * None * */ -static int preinit() +static int preinit(afb_api_t api) { HMI_NOTICE("homescreen-service","binding preinit (was register)"); return 0; @@ -270,20 +359,17 @@ static int preinit() * homescreen binding init function * * #### Parameters - * - null + * - api : the api serving the request * * #### Return * None * */ -static int init() +static int init(afb_api_t api) { HMI_NOTICE("homescreen-service","binding init"); - for(int i = 0; i < COMMAND_EVENT_NUM; ++i) { - event_list[i].name = evlist[i]; - event_list[i].event = afb_daemon_make_event(evlist[i]); - } + g_client_manager->init(); return 0; } @@ -292,6 +378,7 @@ static int init() * homescreen binding event function * * #### Parameters + * - api : the api serving the request * - event : event name * - object : event json object * @@ -299,12 +386,12 @@ static int init() * None * */ -static void onevent(const char *event, struct json_object *object) +static void onevent(afb_api_t api, const char *event, struct json_object *object) { HMI_NOTICE("homescreen-service","on_event %s", event); } -const struct afb_binding_v2 afbBindingV2 = { +const afb_binding_t afbBindingExport = { .api = "homescreen", .specification = NULL, .info = NULL,