summaryrefslogtreecommitdiffstats
path: root/src/homescreen.cpp
diff options
context:
space:
mode:
authorwang_zhiqiang <wang_zhiqiang@dl.cn.nexty-ele.com>2019-02-20 13:52:59 +0800
committerwang_zhiqiang <wang_zhiqiang@dl.cn.nexty-ele.com>2019-03-25 19:42:35 +0800
commit211769e800f3a57de55b3774de82af55d2a0160a (patch)
tree07325ab1aeacb9a0c349e1927812e8080ff8744c /src/homescreen.cpp
parent25299ef60fa4df5f590ff364cff004e90376a4bf (diff)
Start app and get runnables list by homescreen
1.start application in showWindow. 2.add "getRunnables" verb. 3.handle "application-list-changed" event from afm-main and add "application-list-changed" event. Bug-AGL: SPEC-2188 Change-Id: I619b97424d20af373a945ff502a8133339916923 Signed-off-by: wang_zhiqiang <wang_zhiqiang@dl.cn.nexty-ele.com>
Diffstat (limited to 'src/homescreen.cpp')
-rw-r--r--src/homescreen.cpp115
1 files changed, 101 insertions, 14 deletions
diff --git a/src/homescreen.cpp b/src/homescreen.cpp
index e921feb..10cc9bc 100644
--- a/src/homescreen.cpp
+++ b/src/homescreen.cpp
@@ -22,14 +22,53 @@
#include "hs-helper.h"
#include "hmi-debug.h"
#include "hs-clientmanager.h"
+#include "hs-appinfo.h"
const char _error[] = "error";
const char _application_id[] = "application_id";
const char _display_message[] = "display_message";
const char _reply_message[] = "reply_message";
+const char _keyData[] = "data";
+const char _keyId[] = "id";
-static HS_ClientManager* g_client_manager = HS_ClientManager::instance();
+struct hs_instance {
+ HS_ClientManager *client_manager; // the connection session manager
+ HS_AppInfo *app_info; // application info
+
+ hs_instance() : client_manager(HS_ClientManager::instance()), app_info(HS_AppInfo::instance()) {}
+ int init(afb_api_t api);
+};
+
+/**
+ * init function
+ *
+ * #### Parameters
+ * - api : the api serving the request
+ *
+ * #### Return
+ * 0 : init success
+ * 1 : init fail
+ *
+ */
+int hs_instance::init(afb_api_t api)
+{
+ if(client_manager == nullptr) {
+ HMI_ERROR("homescreen-service","FATAL ERROR: client_manager is nullptr.");
+ return -1;
+ }
+ client_manager->init();
+
+ if(app_info == nullptr) {
+ HMI_ERROR("homescreen-service","FATAL ERROR: app_info is nullptr.");
+ return -1;
+ }
+ app_info->init(api);
+
+ return 0;
+}
+
+static struct hs_instance *g_hs_instance;
/*
********** Method of HomeScreen Service (API) **********
@@ -62,7 +101,13 @@ static void tap_shortcut (afb_req_t request)
const char* value = afb_req_value(request, _application_id);
if (value) {
HMI_NOTICE("homescreen-service","request appid = %s.", value);
- ret = g_client_manager->handleRequest(request, __FUNCTION__, value);
+ ret = g_hs_instance->client_manager->handleRequest(request, __FUNCTION__, value);
+ if(ret == AFB_REQ_NOT_STARTED_APPLICATION) {
+ std::string id = g_hs_instance->app_info->getAppProperty(value, _keyId);
+ HS_AfmMainProxy afm_proxy;
+ afm_proxy.start(request, id);
+ ret = 0;
+ }
}
else {
ret = AFB_EVENT_BAD_REQUEST;
@@ -93,7 +138,7 @@ static void tap_shortcut (afb_req_t request)
static void on_screen_message (afb_req_t request)
{
HMI_NOTICE("homescreen-service","called.");
- int ret = g_client_manager->handleRequest(request, __FUNCTION__);
+ int ret = g_hs_instance->client_manager->handleRequest(request, __FUNCTION__);
if (ret) {
afb_req_fail_f(request, "failed", "called %s, Unknown parameter", __FUNCTION__);
}
@@ -119,7 +164,7 @@ static void on_screen_message (afb_req_t request)
static void on_screen_reply (afb_req_t request)
{
HMI_NOTICE("homescreen-service","called.");
- int ret = g_client_manager->handleRequest(request, __FUNCTION__);
+ int ret = g_hs_instance->client_manager->handleRequest(request, __FUNCTION__);
if (ret) {
afb_req_fail_f(request, "failed", "called %s, Unknown parameter", __FUNCTION__);
}
@@ -147,7 +192,7 @@ static void subscribe(afb_req_t request)
int ret = 0;
std::string req_appid = std::move(get_application_id(request));
if(!req_appid.empty()) {
- ret = g_client_manager->handleRequest(request, __FUNCTION__, req_appid.c_str());
+ ret = g_hs_instance->client_manager->handleRequest(request, __FUNCTION__, req_appid.c_str());
}
else {
ret = AFB_EVENT_BAD_REQUEST;
@@ -180,7 +225,7 @@ static void unsubscribe(afb_req_t request)
int ret = 0;
std::string req_appid = std::move(get_application_id(request));
if(!req_appid.empty()) {
- ret = g_client_manager->handleRequest(request, __FUNCTION__, req_appid.c_str());
+ ret = g_hs_instance->client_manager->handleRequest(request, __FUNCTION__, req_appid.c_str());
}
else {
ret = AFB_EVENT_BAD_REQUEST;
@@ -213,7 +258,13 @@ static void showWindow(afb_req_t request)
int ret = 0;
const char* value = afb_req_value(request, _application_id);
if (value) {
- ret = g_client_manager->handleRequest(request, __FUNCTION__, value);
+ ret = g_hs_instance->client_manager->handleRequest(request, __FUNCTION__, value);
+ if(ret == AFB_REQ_NOT_STARTED_APPLICATION) {
+ std::string id = g_hs_instance->app_info->getAppProperty(value, _keyId);
+ HS_AfmMainProxy afm_proxy;
+ afm_proxy.start(request, id);
+ ret = 0;
+ }
}
else {
ret = AFB_EVENT_BAD_REQUEST;
@@ -246,7 +297,7 @@ static void hideWindow(afb_req_t request)
int ret = 0;
const char* value = afb_req_value(request, _application_id);
if (value) {
- ret = g_client_manager->handleRequest(request, __FUNCTION__, value);
+ ret = g_hs_instance->client_manager->handleRequest(request, __FUNCTION__, value);
}
else {
ret = AFB_EVENT_BAD_REQUEST;
@@ -279,7 +330,7 @@ static void replyShowWindow(afb_req_t request)
int ret = 0;
const char* value = afb_req_value(request, _application_id);
if (value) {
- ret = g_client_manager->handleRequest(request, __FUNCTION__, value);
+ ret = g_hs_instance->client_manager->handleRequest(request, __FUNCTION__, value);
}
else {
ret = AFB_EVENT_BAD_REQUEST;
@@ -311,7 +362,7 @@ static void replyShowWindow(afb_req_t request)
static void showNotification(afb_req_t request)
{
HMI_NOTICE("homescreen-service","called.");
- int ret = g_client_manager->handleRequest(request, __FUNCTION__, "homescreen");
+ int ret = g_hs_instance->client_manager->handleRequest(request, __FUNCTION__, "homescreen");
if (ret) {
afb_req_fail_f(request, "failed", "called %s, Unknown parameter", __FUNCTION__);
}
@@ -338,7 +389,7 @@ static void showNotification(afb_req_t request)
static void showInformation(afb_req_t request)
{
HMI_NOTICE("homescreen-service","called.");
- int ret = g_client_manager->handleRequest(request, __FUNCTION__, "homescreen");
+ int ret = g_hs_instance->client_manager->handleRequest(request, __FUNCTION__, "homescreen");
if (ret) {
afb_req_fail_f(request, "failed", "called %s, Unknown parameter", __FUNCTION__);
}
@@ -350,6 +401,29 @@ static void showInformation(afb_req_t request)
}
}
+/**
+ * get runnables list
+ *
+ * #### Parameters
+ * - request : the request
+ *
+ * #### Return
+ * None
+ *
+ */
+static void getRunnables(afb_req_t request)
+{
+ HMI_NOTICE("homescreen-service","called.");
+ struct json_object* j_runnable = json_object_new_array();
+ g_hs_instance->app_info->getRunnables(&j_runnable);
+
+ /*create response json object*/
+ struct json_object *res = json_object_new_object();
+ hs_add_object_to_json_object_func(res, __FUNCTION__, 2, _error, 0);
+ json_object_object_add(res, _keyData, j_runnable);
+ afb_req_success_f(request, res, "homescreen binder unsubscribe success.");
+}
+
/*
* array of the verbs exported to afb-daemon
*/
@@ -366,6 +440,7 @@ static const afb_verb_t verbs[]= {
{ .verb="unsubscribe", .callback=unsubscribe },
{ .verb="showNotification", .callback=showNotification },
{ .verb="showInformation", .callback=showInformation },
+ { .verb="getRunnables", .callback=getRunnables },
{NULL } /* marker for end of the array */
};
@@ -399,9 +474,20 @@ static int init(afb_api_t api)
{
HMI_NOTICE("homescreen-service","binding init");
- g_client_manager->init();
+ if(g_hs_instance != nullptr) {
+ HMI_WARNING("homescreen-service", "g_hs_instance isn't null.");
+ delete g_hs_instance->client_manager;
+ delete g_hs_instance->app_info;
+ delete g_hs_instance;
+ g_hs_instance = nullptr;
+ }
+ g_hs_instance = new hs_instance();
+ if(g_hs_instance == nullptr) {
+ HMI_ERROR("homescreen-service", "Fatal Error: new g_hs_instance failed.");
+ return -1;
+ }
- return 0;
+ return g_hs_instance->init(api);
}
/**
@@ -418,7 +504,8 @@ static int init(afb_api_t api)
*/
static void onevent(afb_api_t api, const char *event, struct json_object *object)
{
- HMI_NOTICE("homescreen-service","on_event %s", event);
+ HMI_NOTICE("homescreen-service","on_event %s", event);
+ g_hs_instance->app_info->onEvent(api, event, object);
}
const afb_binding_t afbBindingExport = {