aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwang_zhiqiang <wang_zhiqiang@dl.cn.nexty-ele.com>2019-04-12 15:05:23 +0800
committerwang_zhiqiang <wang_zhiqiang@dl.cn.nexty-ele.com>2019-04-13 10:55:43 +0800
commitdcc9db092ca49608bbd5d0800221b5ec6f55c318 (patch)
tree73bb499d3c42a14d765157dcd0578b2182e131a3
parent8dd6aa52a61106ee10c7426653ff9c64ab68b5f3 (diff)
temp
Change-Id: Ifca3ec47d75c750274b9ed0dd300722b67430f1e
-rw-r--r--src/homescreen.cpp33
1 files 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, &times_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;