From dcc9db092ca49608bbd5d0800221b5ec6f55c318 Mon Sep 17 00:00:00 2001 From: wang_zhiqiang Date: Fri, 12 Apr 2019 15:05:23 +0800 Subject: [PATCH] temp Change-Id: Ifca3ec47d75c750274b9ed0dd300722b67430f1e --- src/homescreen.cpp | 33 +++++++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/src/homescreen.cpp b/src/homescreen.cpp index eeba767..c9ad6ef 100644 --- a/src/homescreen.cpp +++ b/src/homescreen.cpp @@ -32,8 +32,11 @@ 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 _keyHandshake[] = "handshake"; +const char _keyTimes[] = "times"; +const char _keySleep[] = "sleep"; +const char _hs_conf_json[] = "hs-conf.json"; +const char _lastmode_json[] = "lastmode.json"; struct hs_config { struct json_object *hs_conf; @@ -41,6 +44,12 @@ struct hs_config { }; static struct hs_config g_hs_config; +const char _wm_event[] = "windowmanager/screenUpdated"; +static void screenUpdateCb(void *closure, const char *event, struct json_object* obj, afb_api_t api) +{ + AFB_WARNING("windowmanager/screenUpdated callback. obj=%s.", json_object_to_json_string(obj)); +} + struct hs_instance { HS_ClientManager *client_manager; // the connection session manager HS_AppInfo *app_info; // application info @@ -78,6 +87,18 @@ int hs_instance::init(afb_api_t api) } app_info->init(api); + struct json_object *handshake_obj; + if(json_object_object_get_ex(g_hs_config.hs_conf, _keyHandshake, &handshake_obj) == 0) { + AFB_ERROR("get handshake failed."); + return -1; + } + else { + struct json_object *times_obj, *sleep_obj; + json_object_object_get_ex(handshake_obj, _keyTimes, ×_obj); + json_object_object_get_ex(handshake_obj, _keySleep, &sleep_obj); + AFB_WARNING("get handshake times=%d, sleep=%d", json_object_get_int(times_obj), json_object_get_int(sleep_obj)); + } + return 0; } @@ -543,15 +564,15 @@ 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; + 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); + AFB_ERROR("read %s failed.", _hs_conf_json); return -1; } - path = rootdir + "/etc/" + _LASTMODE_JSON; + path = rootdir + "/etc/" + _lastmode_json; if(readJsonFile(path.c_str(), &g_hs_config.lastmode) < 0) { - AFB_ERROR("read %s failed.", _LASTMODE_JSON); + AFB_ERROR("read %s failed.", _lastmode_json); return -1; } return 0; -- 2.16.6