X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fhomescreen.cpp;h=403fdf2de9ae94edb787fa6a1967f2f8ffbb54ce;hb=b20509dec7cca94ca4e6bd87f6d6f27320983d19;hp=cb8a633a6cee8b4e7975a392daab15fd724c47d9;hpb=f16e0728c0c9806d9a7c3766028428ed73b5a8cf;p=apps%2Fagl-service-homescreen.git diff --git a/src/homescreen.cpp b/src/homescreen.cpp index cb8a633..403fdf2 100644 --- a/src/homescreen.cpp +++ b/src/homescreen.cpp @@ -22,6 +22,7 @@ #include #include #include +#include #include "hs-helper.h" #include "hs-clientmanager.h" #include "hs-appinfo.h" @@ -36,10 +37,13 @@ const char _display_message[] = "display_message"; const char _reply_message[] = "reply_message"; const char _keyData[] = "data"; const char _keyId[] = "id"; +const char _parameter[] = "parameter"; +const char _area[] = "area"; struct hs_handshake { hs_handshake(int times, int sleep) : m_times(times), m_sleep(sleep) {} - int start(afb_api_t api) const; + int start(afb_api_t api); + void handshake_loop(afb_api_t api, int times, int sleeps); enum HandshakeStatus { Handshake_Idle = 0, @@ -72,6 +76,10 @@ int hs_handshake::hs_sts = hs_handshake::Handshake_Idle; */ void handshake_subscribe_callback(struct json_object *obj, const char *error, const char *info) { + AFB_NOTICE("subscribe handshake reply: obj=%s, error=%s, info=%s", json_object_to_json_string(obj), error, info); + if(hs_handshake::hs_sts == hs_handshake::Handshake_Over) { + return; + } if(error == nullptr) { hs_handshake::hs_sts = hs_handshake::Handshake_WaitEvent; } @@ -94,6 +102,7 @@ void handshake_subscribe_callback(struct json_object *obj, const char *error, co */ int on_handshake_event(afb_api_t api, const char *event, struct json_object *object) { + AFB_NOTICE("received handshake event from windowmanager."); hs_handshake::hs_sts = hs_handshake::Handshake_Over; return 1; } @@ -105,15 +114,32 @@ int on_handshake_event(afb_api_t api, const char *event, struct json_object *obj * - api : the api * * #### Return - * None * 0 : handshake success - * -1 : handshake fail + * other : handshake fail * */ -int hs_handshake::start(afb_api_t api) const +int hs_handshake::start(afb_api_t api) { - int ret = -1; + AFB_NOTICE("start handshake with windowmanager."); setEventHook(sub_event.c_str(), on_handshake_event); + + std::thread th(&hs_handshake::handshake_loop, this, api, m_times, m_sleep); + th.detach(); + return 0; +} + +/** + * handshake loop + * + * #### Parameters + * - api : the api + * + * #### Return + * None + * + */ +void hs_handshake::handshake_loop(afb_api_t api, int times, int sleeps) +{ int count = 0; do { // try to subscribe handshake event @@ -126,22 +152,22 @@ int hs_handshake::start(afb_api_t api) const // wait handshake event if(hs_handshake::hs_sts == hs_handshake::Handshake_Over) { - ret = 0; break; } ++count; - usleep(m_sleep*1000); - } while(count < m_times); - - return ret; + usleep(sleeps*1000); + } while(count < times); + AFB_NOTICE("handshake over, m_times=%d, m_sleep=%d, count=%d.", times, sleeps, count); + HS_AppRecover::instance()->startRecovery(api); } struct hs_instance { HS_ClientManager *client_manager; // the connection session manager HS_AppInfo *app_info; // application info + HS_AppRecover *app_recover; - hs_instance() : client_manager(HS_ClientManager::instance()), app_info(HS_AppInfo::instance()) {} + hs_instance() : client_manager(HS_ClientManager::instance()), app_info(HS_AppInfo::instance()), app_recover(HS_AppRecover::instance()) {} int init(afb_api_t api); void setEventHook(const char *event, const event_hook_func f); void onEvent(afb_api_t api, const char *event, struct json_object *object); @@ -182,6 +208,13 @@ int hs_instance::init(afb_api_t api) return -1; } + if(app_recover == nullptr) { + AFB_ERROR("app_recover is nullptr."); + return -1; + } + app_recover->init(api); + app_recover->setRecoverMap(hs_config.getRecoverMap()); + const struct handshake_info *h = hs_config.getHandshakeInfo(); struct hs_handshake handshake(h->times, h->sleep); if(handshake.start(api) < 0) { @@ -189,14 +222,6 @@ int hs_instance::init(afb_api_t api) return -1; } - HS_AppRecover *app_recover = new HS_AppRecover(); - if(app_recover == nullptr) { - AFB_ERROR("app_recover is nullptr."); - return -1; - } - app_recover->startRecovery(api, hs_config.getRecoverMap()); - client_manager->setAppRecover(app_recover); - return 0; } @@ -300,11 +325,16 @@ static void tap_shortcut (afb_req_t request) { AFB_DEBUG("called."); int ret = 0; + struct json_object *param_obj, *area_obj; const char* value = afb_req_value(request, _application_id); - if (value) { + if (value + && json_object_object_get_ex(afb_req_json(request), _parameter, ¶m_obj) + && json_object_object_get_ex(param_obj, _area, &area_obj)) { AFB_INFO("request appid = %s.", value); + const char* area = json_object_get_string(area_obj); ret = g_hs_instance->client_manager->handleRequest(request, __FUNCTION__, value); if(ret == AFB_REQ_NOT_STARTED_APPLICATION) { + g_hs_instance->client_manager->setStartupAppidAndArea(make_pair(std::string(value), std::string(area))); std::string id = g_hs_instance->app_info->getAppProperty(value, _keyId); HS_AfmMainProxy afm_proxy; afm_proxy.start(request->api, id); @@ -458,10 +488,15 @@ static void showWindow(afb_req_t request) { AFB_DEBUG("called."); int ret = 0; + struct json_object *param_obj, *area_obj; const char* value = afb_req_value(request, _application_id); - if (value) { + if (value + && json_object_object_get_ex(afb_req_json(request), _parameter, ¶m_obj) + && json_object_object_get_ex(param_obj, _area, &area_obj)) { + const char* area = json_object_get_string(area_obj); ret = g_hs_instance->client_manager->handleRequest(request, __FUNCTION__, value); if(ret == AFB_REQ_NOT_STARTED_APPLICATION) { + g_hs_instance->client_manager->setStartupAppidAndArea(make_pair(std::string(value), std::string(area))); std::string id = g_hs_instance->app_info->getAppProperty(value, _keyId); HS_AfmMainProxy afm_proxy; afm_proxy.start(request->api, id); @@ -626,6 +661,72 @@ static void getRunnables(afb_req_t request) afb_req_success_f(request, res, "homescreen binder unsubscribe success."); } +/** + * registerShortcut event + * + * #### Parameters + * - value : the json contents to MenuBar. + * {"application_id":"homescreen","parameter":{"shortcut_id":"dashboard@0.1","shortcut_name":"Dashboard","postion": 1}} + * + * #### Return + * None + * + */ +static void registerShortcut(afb_req_t request) +{ + int ret = 0; + const char* value = afb_req_value(request, _application_id); + if (value) { + ret = g_hs_instance->client_manager->handleRequest(request, __FUNCTION__, value); + } + else { + ret = AFB_EVENT_BAD_REQUEST; + } + + if (ret) { + afb_req_fail_f(request, "failed", "called %s, Unknown parameter", __FUNCTION__); + } + else { + 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 [registerShortcut]"); + } +} + +/** + * updateShortcut event + * + * #### Parameters + * - value : homescreen shortcut json contents. + * {"application_id":"launcher","parameter":{"shortcut":[{"shortcut_id":"hvac","shortcut_name":"HVAC"},...]}} + * + * #### Return + * None + * + */ +static void updateShortcut(afb_req_t request) +{ + int ret = 0; + const char* value = afb_req_value(request, _application_id); + if (value) { + ret = g_hs_instance->client_manager->handleRequest(request, __FUNCTION__, value); + } + else { + ret = AFB_EVENT_BAD_REQUEST; + } + + if (ret) { + afb_req_fail_f(request, "failed", "called %s, Unknown parameter", __FUNCTION__); + } + else { + 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 [updateShortcut]"); + } +} + /* * array of the verbs exported to afb-daemon */ @@ -642,7 +743,9 @@ static const afb_verb_t verbs[]= { { .verb="unsubscribe", .callback=unsubscribe }, { .verb="showNotification", .callback=showNotification }, { .verb="showInformation", .callback=showInformation }, + { .verb="registerShortcut", .callback=registerShortcut }, { .verb="getRunnables", .callback=getRunnables }, + { .verb="updateShortcut", .callback=updateShortcut }, {NULL } /* marker for end of the array */ }; @@ -680,6 +783,7 @@ static int init(afb_api_t api) AFB_WARNING( "g_hs_instance isn't null."); delete g_hs_instance->client_manager; delete g_hs_instance->app_info; + delete g_hs_instance->app_recover; delete g_hs_instance; g_hs_instance = nullptr; }