#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 "hs-apprecover.h"
-
+#include "hs-vuiadapter.h"
const char _error[] = "error";
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,
*/
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;
}
*/
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;
}
* - 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
// 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_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()) {}
+ 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);
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) {
return -1;
}
- if(app_recover == nullptr) {
- AFB_ERROR("app_recover is nullptr.");
- return -1;
+ if(vui_adapter == nullptr) {
+ AFB_ERROR("vui_adapter is nullptr.");
}
- app_recover->init(api);
- app_recover->startRecovery(api, hs_config.getRecoverMap());
+ vui_adapter->init(api);
return 0;
}
*/
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;
break;
}
}
+ else {
+ AFB_INFO("don't find hook event %s", event);
+ }
}
/**
*/
static void tap_shortcut (afb_req_t request)
{
- AFB_DEBUG("called.");
int ret = 0;
const char* value = afb_req_value(request, _application_id);
if (value) {
*/
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__);
*/
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__);
*/
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()) {
*/
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()) {
*/
static void showWindow(afb_req_t request)
{
- AFB_DEBUG("called.");
int ret = 0;
const char* value = afb_req_value(request, _application_id);
if (value) {
*/
static void hideWindow(afb_req_t request)
{
- AFB_DEBUG("called.");
int ret = 0;
const char* value = afb_req_value(request, _application_id);
if (value) {
*/
static void replyShowWindow(afb_req_t request)
{
- AFB_DEBUG("called.");
int ret = 0;
const char* value = afb_req_value(request, _application_id);
if (value) {
*/
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__);
*/
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__);
*/
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);
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="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 */
};
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;
}
*/
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);
}
Code Review / apps / agl-service-homescreen.git / blobdiff