X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fhomescreen.cpp;h=ae986439e58c1886b0807285336c740084c2a987;hb=690bef15acbffe7245b8a0b15ee4372f1ccea5d3;hp=eeba7677c8ea95ae71cdecaf8dcdc1a5cc18d6cc;hpb=1df2ef6a38ad21d34353dc4728964055d0a1c986;p=apps%2Fagl-service-homescreen.git diff --git a/src/homescreen.cpp b/src/homescreen.cpp index eeba767..ae98643 100644 --- a/src/homescreen.cpp +++ b/src/homescreen.cpp @@ -17,13 +17,18 @@ #ifndef _GNU_SOURCE #define _GNU_SOURCE #endif +#include #include #include #include #include +#include #include "hs-helper.h" #include "hs-clientmanager.h" #include "hs-appinfo.h" +#include "hs-config.h" +#include "hs-apprecover.h" +#include "hs-vuiadapter.h" const char _error[] = "error"; @@ -32,27 +37,147 @@ const char _display_message[] = "display_message"; const char _reply_message[] = "reply_message"; const char _keyData[] = "data"; const char _keyId[] = "id"; -const char _HS_CONF_JSON[] = "hs-conf.json"; -const char _LASTMODE_JSON[] = "lastmode.json"; +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); + void handshake_loop(afb_api_t api, int times, int sleeps); + + enum HandshakeStatus { + Handshake_Idle = 0, + Handshake_Subscribing, + Handshake_Subscribe_Fail, + Handshake_WaitEvent, + Handshake_Over + }; + static int hs_sts; -struct hs_config { - struct json_object *hs_conf; - struct json_object *lastmode; +private: + const std::string sub_event = "windowmanager/handshake"; + const int m_times; + const int m_sleep; }; -static struct hs_config g_hs_config; -struct hs_instance { - HS_ClientManager *client_manager; // the connection session manager - HS_AppInfo *app_info; // application info +int hs_handshake::hs_sts = hs_handshake::Handshake_Idle; + +/** + * handshake callback function + * + * #### Parameters + * - obj : reply json object + * - error : api_call error + * - info : api_call information + * + * #### Return + * None + * + */ +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; + } + else { + hs_handshake::hs_sts = hs_handshake::Handshake_Subscribe_Fail; + } +} - hs_instance() : client_manager(HS_ClientManager::instance()), app_info(HS_AppInfo::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); +/** + * handshake event function + * + * #### Parameters + * - api : the api + * - event : received event name + * - object : received json object + * + * #### Return + * 0 : event can transfer to others + * 1 : event not transfer to others + */ +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; +} + +/** + * start handshake function + * + * #### Parameters + * - api : the api + * + * #### Return + * 0 : handshake success + * other : handshake fail + * + */ +int hs_handshake::start(afb_api_t api) +{ + 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 + if(hs_handshake::hs_sts == hs_handshake::Handshake_Idle + || hs_handshake::hs_sts == hs_handshake::Handshake_Subscribe_Fail) { + hs_handshake::hs_sts = Handshake_Subscribing; + HS_WmProxy wm_proxy; + wm_proxy.subscribe(api, HS_WmProxy::Event_Handshake, handshake_subscribe_callback); + } + + // wait handshake event + if(hs_handshake::hs_sts == hs_handshake::Handshake_Over) { + break; + } + + ++count; + 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; // application recover + HS_VuiAdapter * vui_adapter; // vui function adapter + + hs_instance() : client_manager(HS_ClientManager::instance()), app_info(HS_AppInfo::instance()), app_recover(HS_AppRecover::instance()), vui_adapter(HS_VuiAdapter::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); private: - std::unordered_map> event_hook_list; + std::unordered_map> event_hook_list; }; +static struct hs_instance *g_hs_instance; + /** * init function * @@ -67,17 +192,42 @@ private: int hs_instance::init(afb_api_t api) { if(client_manager == nullptr) { - AFB_ERROR("FATAL ERROR: client_manager is nullptr."); + AFB_ERROR("client_manager is nullptr."); return -1; } client_manager->init(); if(app_info == nullptr) { - AFB_ERROR("FATAL ERROR: app_info is nullptr."); + AFB_ERROR("app_info is nullptr."); return -1; } app_info->init(api); + HS_Config hs_config; + if(hs_config.readConfig() < 0) { + AFB_ERROR("read config file failed."); + 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) { + AFB_ERROR("handshake with windowmanager failed."); + return -1; + } + + if(vui_adapter == nullptr) { + AFB_ERROR("vui_adapter is nullptr."); + } + vui_adapter->init(api); + return 0; } @@ -93,6 +243,7 @@ int hs_instance::init(afb_api_t api) */ void hs_instance::setEventHook(const char *event, const event_hook_func f) { + AFB_INFO("hook event %s", event); if(event == nullptr || f == nullptr) { AFB_WARNING("argument is null."); return; @@ -131,10 +282,11 @@ void hs_instance::onEvent(afb_api_t api, const char *event, struct json_object * break; } } + else { + AFB_INFO("don't find hook event %s", event); + } } -static struct hs_instance *g_hs_instance; - /** * set event hook * @@ -181,16 +333,20 @@ static void pingSample(afb_req_t request) */ 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, id); + afm_proxy.start(request->api, id); ret = 0; } } @@ -222,7 +378,6 @@ static void tap_shortcut (afb_req_t request) */ static void on_screen_message (afb_req_t request) { - AFB_DEBUG("called."); int ret = g_hs_instance->client_manager->handleRequest(request, __FUNCTION__); if (ret) { afb_req_fail_f(request, "failed", "called %s, Unknown parameter", __FUNCTION__); @@ -248,7 +403,6 @@ static void on_screen_message (afb_req_t request) */ static void on_screen_reply (afb_req_t request) { - AFB_DEBUG("called."); int ret = g_hs_instance->client_manager->handleRequest(request, __FUNCTION__); if (ret) { afb_req_fail_f(request, "failed", "called %s, Unknown parameter", __FUNCTION__); @@ -273,7 +427,6 @@ static void on_screen_reply (afb_req_t request) */ static void subscribe(afb_req_t request) { - AFB_DEBUG("called."); int ret = 0; std::string req_appid = std::move(get_application_id(request)); if(!req_appid.empty()) { @@ -306,7 +459,6 @@ static void subscribe(afb_req_t request) */ static void unsubscribe(afb_req_t request) { - AFB_DEBUG("called."); int ret = 0; std::string req_appid = std::move(get_application_id(request)); if(!req_appid.empty()) { @@ -339,15 +491,19 @@ static void unsubscribe(afb_req_t request) */ 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, id); + afm_proxy.start(request->api, id); ret = 0; } } @@ -378,7 +534,6 @@ static void showWindow(afb_req_t request) */ static void hideWindow(afb_req_t request) { - AFB_DEBUG("called."); int ret = 0; const char* value = afb_req_value(request, _application_id); if (value) { @@ -411,7 +566,6 @@ static void hideWindow(afb_req_t request) */ static void replyShowWindow(afb_req_t request) { - AFB_DEBUG("called."); int ret = 0; const char* value = afb_req_value(request, _application_id); if (value) { @@ -446,7 +600,6 @@ static void replyShowWindow(afb_req_t request) */ static void showNotification(afb_req_t request) { - AFB_DEBUG("called."); int ret = g_hs_instance->client_manager->handleRequest(request, __FUNCTION__, "homescreen"); if (ret) { afb_req_fail_f(request, "failed", "called %s, Unknown parameter", __FUNCTION__); @@ -473,7 +626,6 @@ static void showNotification(afb_req_t request) */ static void showInformation(afb_req_t request) { - AFB_DEBUG("called."); int ret = g_hs_instance->client_manager->handleRequest(request, __FUNCTION__, "homescreen"); if (ret) { afb_req_fail_f(request, "failed", "called %s, Unknown parameter", __FUNCTION__); @@ -498,7 +650,6 @@ static void showInformation(afb_req_t request) */ static void getRunnables(afb_req_t request) { - AFB_DEBUG("called."); struct json_object* j_runnable = json_object_new_array(); g_hs_instance->app_info->getRunnables(&j_runnable); @@ -509,6 +660,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 */ @@ -526,6 +743,8 @@ static const afb_verb_t verbs[]= { { .verb="showNotification", .callback=showNotification }, { .verb="showInformation", .callback=showInformation }, { .verb="getRunnables", .callback=getRunnables }, + { .verb="registerShortcut", .callback=registerShortcut }, + { .verb="updateShortcut", .callback=updateShortcut }, {NULL } /* marker for end of the array */ }; @@ -542,18 +761,6 @@ static const afb_verb_t verbs[]= { static int preinit(afb_api_t api) { AFB_DEBUG("binding preinit (was register)"); - auto rootdir = std::string(getenv("AFM_APP_INSTALL_DIR")); - auto path = rootdir + "/etc/" + _HS_CONF_JSON; - if(readJsonFile(path.c_str(), &g_hs_config.hs_conf) < 0) { - AFB_ERROR("read %s failed.", _HS_CONF_JSON); - return -1; - } - - path = rootdir + "/etc/" + _LASTMODE_JSON; - if(readJsonFile(path.c_str(), &g_hs_config.lastmode) < 0) { - AFB_ERROR("read %s failed.", _LASTMODE_JSON); - return -1; - } return 0; } @@ -575,12 +782,14 @@ 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->vui_adapter; delete g_hs_instance; g_hs_instance = nullptr; } g_hs_instance = new hs_instance(); if(g_hs_instance == nullptr) { - AFB_ERROR( "Fatal Error: new g_hs_instance failed."); + AFB_ERROR( "new g_hs_instance failed."); return -1; } @@ -601,7 +810,7 @@ static int init(afb_api_t api) */ static void onevent(afb_api_t api, const char *event, struct json_object *object) { - AFB_INFO("on_event %s", event); + AFB_INFO("on_event %s, object %s", event, json_object_to_json_string(object)); g_hs_instance->onEvent(api, event, object); }