#ifndef _GNU_SOURCE
#define _GNU_SOURCE
#endif
+#include <unistd.h>
#include <memory>
#include <algorithm>
#include <unordered_map>
#include <list>
+#include <thread>
#include "hs-helper.h"
#include "hs-clientmanager.h"
#include "hs-appinfo.h"
#include "hs-config.h"
-#include <unistd.h>
+#include "hs-apprecover.h"
+
const char _error[] = "error";
struct hs_handshake {
hs_handshake(int times, int sleep) : m_times(times), m_sleep(sleep) {}
- void start(afb_api_t api) const;
+ int start(afb_api_t api);
+ void handshake_loop(afb_api_t api);
enum HandshakeStatus {
Handshake_Idle = 0,
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;
}
}
}
+/**
+ * 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;
}
-void hs_handshake::start(afb_api_t api) const
+/**
+ * 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);
+ th.detach();
+ return 0;
+}
+
+/**
+ * handshake loop
+ *
+ * #### Parameters
+ * - api : the api
+ *
+ * #### Return
+ * None
+ *
+ */
+void hs_handshake::handshake_loop(afb_api_t api)
+{
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 = new HS_WmProxy();
- wm_proxy->subscribe(api, HS_WmProxy::Event_Handshake, handshake_subscribe_callback);
+ HS_WmProxy wm_proxy;
+ wm_proxy.subscribe(api, HS_WmProxy::Event_Handshake, handshake_subscribe_callback);
}
// wait handshake event
++count;
usleep(m_sleep*1000);
} while(count < m_times);
- AFB_WARNING("wait count is %d.", count);
+ AFB_NOTICE("handshake over, count=%d.", 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);
std::unordered_map<std::string, std::list<event_hook_func>> event_hook_list;
};
+static struct hs_instance *g_hs_instance;
+
/**
* init function
*
return -1;
}
- // const struct handshake_info *h = hs_config.getHandshakeInfo();
- // struct hs_handshake handshake(h->times, h->sleep);
- // handshake.start(api);
-
- // recover application
+ 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;
+ }
return 0;
}
}
}
-static struct hs_instance *g_hs_instance;
-
/**
* set event hook
*
AFB_INFO("request appid = %s.", value);
ret = g_hs_instance->client_manager->handleRequest(request, __FUNCTION__, value);
if(ret == AFB_REQ_NOT_STARTED_APPLICATION) {
+ g_hs_instance->client_manager->setStartupAppid(std::string(value));
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;
}
}
if (value) {
ret = g_hs_instance->client_manager->handleRequest(request, __FUNCTION__, value);
if(ret == AFB_REQ_NOT_STARTED_APPLICATION) {
+ g_hs_instance->client_manager->setStartupAppid(std::string(value));
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;
}
}
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
*/
{ .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 */
};
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;
}
Code Review / apps / agl-service-homescreen.git / blobdiff