X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fhomescreen.cpp;h=8470635fabaeea7e7d4edf4b24850d1eced2c580;hb=refs%2Fheads%2Fkoi;hp=10cc9bccc8a2a76d7334ad674db0760e446ee348;hpb=211769e800f3a57de55b3774de82af55d2a0160a;p=apps%2Fagl-service-homescreen.git

diff --git a/src/homescreen.cpp b/src/homescreen.cpp
index 10cc9bc..8470635 100644
--- a/src/homescreen.cpp
+++ b/src/homescreen.cpp
@@ -17,13 +17,8 @@
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE
 #endif
-#include <memory>
-#include <algorithm>
-#include "hs-helper.h"
-#include "hmi-debug.h"
-#include "hs-clientmanager.h"
-#include "hs-appinfo.h"
 
+#include "homescreen.h"
 
 const char _error[] = "error";
 const char _application_id[] = "application_id";
@@ -32,14 +27,6 @@ const char _reply_message[] = "reply_message";
 const char _keyData[] = "data";
 const char _keyId[] = "id";
 
-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
  *
@@ -54,13 +41,13 @@ struct hs_instance {
 int hs_instance::init(afb_api_t api)
 {
     if(client_manager == nullptr) {
-        HMI_ERROR("homescreen-service","FATAL ERROR: client_manager is nullptr.");
+        AFB_ERROR("client_manager is nullptr.");
         return -1;
     }
     client_manager->init();
 
     if(app_info == nullptr) {
-        HMI_ERROR("homescreen-service","FATAL ERROR: app_info is nullptr.");
+        AFB_ERROR("app_info is nullptr.");
         return -1;
     }
     app_info->init(api);
@@ -68,8 +55,80 @@ int hs_instance::init(afb_api_t api)
     return 0;
 }
 
+/**
+ * set event hook
+ *
+ * #### Parameters
+ *  - event  : event name
+ *  - f : hook function
+ *
+ * #### Return
+ * Nothing
+ */
+void hs_instance::setEventHook(const char *event, const event_hook_func f)
+{
+    if(event == nullptr || f == nullptr) {
+        AFB_WARNING("argument is null.");
+        return;
+    }
+
+    std::string ev(event);
+    auto it = event_hook_list.find(ev);
+    if(it != event_hook_list.end()) {
+        it->second.push_back(f);
+    }
+    else {
+        std::list<event_hook_func> l;
+        l.push_back(f);
+        event_hook_list[ev] = std::move(l);
+    }
+}
+
+/**
+ * onEvent function
+ *
+ * #### Parameters
+ *  - api : the api serving the request
+ *  - event  : event name
+ *  - object : event json object
+ *
+ * #### Return
+ * Nothing
+ */
+void hs_instance::onEvent(afb_api_t api, const char *event, struct json_object *object)
+{
+    std::string ev(event);
+    auto it = event_hook_list.find(ev);
+    if(it != event_hook_list.end()) {
+        for(auto &ref : it->second) {
+            if(ref(api, event, object))
+                break;
+        }
+    }
+}
+
 static struct hs_instance *g_hs_instance;
 
+/**
+ * set event hook
+ *
+ * #### Parameters
+ *  - event  : event name
+ *  - f : hook function pointer
+ *
+ * #### Return
+ * Nothing
+ */
+void setEventHook(const char *event, const event_hook_func f)
+{
+    if(g_hs_instance == nullptr) {
+        AFB_ERROR("g_hs_instance is null.");
+        return;
+    }
+
+    g_hs_instance->setEventHook(event, f);
+}
+
 /*
 ********** Method of HomeScreen Service (API) **********
 */
@@ -78,7 +137,7 @@ static void pingSample(afb_req_t request)
 {
    static int pingcount = 0;
    afb_req_success_f(request, json_object_new_int(pingcount), "Ping count = %d", pingcount);
-   HMI_NOTICE("homescreen-service","Verbosity macro at level notice invoked at ping invocation count = %d", pingcount);
+   AFB_DEBUG("Verbosity macro at level notice invoked at ping invocation count = %d", pingcount);
    pingcount++;
 }
 
@@ -96,16 +155,15 @@ static void pingSample(afb_req_t request)
  */
 static void tap_shortcut (afb_req_t request)
 {
-    HMI_NOTICE("homescreen-service","called.");
     int ret = 0;
     const char* value = afb_req_value(request, _application_id);
     if (value) {
-        HMI_NOTICE("homescreen-service","request appid = %s.", value);
+        AFB_INFO("request appid = %s.", 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);
+            afm_proxy.start(g_hs_instance, request, id);
             ret = 0;
         }
     }
@@ -137,7 +195,6 @@ 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_hs_instance->client_manager->handleRequest(request, __FUNCTION__);
     if (ret) {
         afb_req_fail_f(request, "failed", "called %s, Unknown parameter", __FUNCTION__);
@@ -163,7 +220,6 @@ 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_hs_instance->client_manager->handleRequest(request, __FUNCTION__);
     if (ret) {
         afb_req_fail_f(request, "failed", "called %s, Unknown parameter", __FUNCTION__);
@@ -188,7 +244,6 @@ static void on_screen_reply (afb_req_t request)
  */
 static void subscribe(afb_req_t request)
 {
-    HMI_NOTICE("homescreen-service","called.");
     int ret = 0;
     std::string req_appid = std::move(get_application_id(request));
     if(!req_appid.empty()) {
@@ -221,7 +276,6 @@ static void subscribe(afb_req_t request)
  */
 static void unsubscribe(afb_req_t request)
 {
-    HMI_NOTICE("homescreen-service","called.");
     int ret = 0;
     std::string req_appid = std::move(get_application_id(request));
     if(!req_appid.empty()) {
@@ -254,7 +308,6 @@ static void unsubscribe(afb_req_t request)
  */
 static void showWindow(afb_req_t request)
 {
-    HMI_NOTICE("homescreen-service","called.");
     int ret = 0;
     const char* value = afb_req_value(request, _application_id);
     if (value) {
@@ -262,7 +315,7 @@ static void showWindow(afb_req_t request)
         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);
+            afm_proxy.start(g_hs_instance, request, id);
             ret = 0;
         }
     }
@@ -293,7 +346,6 @@ static void showWindow(afb_req_t request)
  */
 static void hideWindow(afb_req_t request)
 {
-    HMI_NOTICE("homescreen-service","called.");
     int ret = 0;
     const char* value = afb_req_value(request, _application_id);
     if (value) {
@@ -326,7 +378,6 @@ static void hideWindow(afb_req_t request)
  */
 static void replyShowWindow(afb_req_t request)
 {
-    HMI_NOTICE("homescreen-service","called.");
     int ret = 0;
     const char* value = afb_req_value(request, _application_id);
     if (value) {
@@ -361,7 +412,6 @@ static void replyShowWindow(afb_req_t request)
  */
 static void showNotification(afb_req_t request)
 {
-    HMI_NOTICE("homescreen-service","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__);
@@ -388,7 +438,6 @@ static void showNotification(afb_req_t request)
  */
 static void showInformation(afb_req_t request)
 {
-    HMI_NOTICE("homescreen-service","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__);
@@ -413,7 +462,6 @@ static void showInformation(afb_req_t request)
  */
 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);
 
@@ -456,7 +504,8 @@ static const afb_verb_t verbs[]= {
  */
 static int preinit(afb_api_t api)
 {
-   HMI_NOTICE("homescreen-service","binding preinit (was register)");
+   (void)  api;
+   AFB_DEBUG("binding preinit (was register)");
    return 0;
 }
 
@@ -472,10 +521,10 @@ static int preinit(afb_api_t api)
  */
 static int init(afb_api_t api)
 {
-    HMI_NOTICE("homescreen-service","binding init");
+    AFB_DEBUG("binding init");
 
     if(g_hs_instance != nullptr) {
-        HMI_WARNING("homescreen-service", "g_hs_instance isn't null.");
+        AFB_WARNING( "g_hs_instance isn't null.");
         delete g_hs_instance->client_manager;
         delete g_hs_instance->app_info;
         delete g_hs_instance;
@@ -483,7 +532,6 @@ static int init(afb_api_t api)
     }
     g_hs_instance = new hs_instance();
     if(g_hs_instance == nullptr) {
-        HMI_ERROR("homescreen-service", "Fatal Error: new g_hs_instance failed.");
         return -1;
     }
 
@@ -504,8 +552,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);
-    g_hs_instance->app_info->onEvent(api, event, object);
+    AFB_INFO("on_event %s", event);
+    g_hs_instance->onEvent(api, event, object);
 }
 
 const afb_binding_t afbBindingExport = {