X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fhomescreen.c;h=f1a8fcd233489c210bc4712f47bddd76c52f4e5b;hb=refs%2Ftags%2Feel_4.99.2;hp=98631c8b18da3d0a9c4feb7aa1a6dda5a8156247;hpb=914d0f27288333184cbecdb0a4c2b2ce4e4e963a;p=apps%2Fagl-service-homescreen.git

diff --git a/src/homescreen.c b/src/homescreen.c
index 98631c8..f1a8fcd 100644
--- a/src/homescreen.c
+++ b/src/homescreen.c
@@ -27,8 +27,9 @@
 #include <glib.h>
 #include <pthread.h>
 #include "hs-helper.h"
+#include "hmi-debug.h"
 
-#define COMMAND_EVENT_NUM 3
+#define COMMAND_EVENT_NUM 4
 #define EVENT_SUBSCRIBE_ERROR_CODE 100
 
 /* To Do hash table is better */
@@ -41,12 +42,14 @@ static struct event event_list[COMMAND_EVENT_NUM];
 
 static struct afb_event ev_tap_shortcut;
 static struct afb_event ev_on_screen_message;
+static struct afb_event ev_on_screen_reply;
 static struct afb_event ev_reserved;
 
 static const char _error[] = "error";
 
 static const char _application_name[] = "application_name";
 static const char _display_message[] = "display_message";
+static const char _reply_message[] = "reply_message";
 
 /*
 ********** Method of HomeScreen Service (API) **********
@@ -56,7 +59,7 @@ static void pingSample(struct afb_req request)
 {
    static int pingcount = 0;
    afb_req_success_f(request, json_object_new_int(pingcount), "Ping count = %d", pingcount);
-   AFB_NOTICE("Verbosity macro at level notice invoked at ping invocation count = %d", pingcount);
+   HMI_NOTICE("homescreen-service","Verbosity macro at level notice invoked at ping invocation count = %d", pingcount);
    pingcount++;
 }
 
@@ -74,13 +77,13 @@ static void pingSample(struct afb_req request)
  */
 static void tap_shortcut (struct afb_req request)
 {
-    AFB_NOTICE("%s is called.", __FUNCTION__);
+    HMI_NOTICE("homescreen-service","called.");
 
     int ret = 0;
     const char* value = afb_req_value(request, _application_name);
     if (value) {
 
-      AFB_NOTICE("request params = %s.", value);
+      HMI_NOTICE("homescreen-service","request params = %s.", value);
 
       struct json_object* push_obj = json_object_new_object();
       hs_add_object_to_json_object_str( push_obj, 2,
@@ -111,13 +114,13 @@ static void tap_shortcut (struct afb_req request)
  */
 static void on_screen_message (struct afb_req request)
 {
-    AFB_NOTICE("%s is called.", __FUNCTION__);
+    HMI_NOTICE("homescreen-service","called.");
 
     int ret = 0;
     const char* value = afb_req_value(request, _display_message);
     if (value) {
 
-      AFB_NOTICE("request params = %s.", value);
+      HMI_NOTICE("homescreen-service","request params = %s.", value);
 
       struct json_object* push_obj = json_object_new_object();
       hs_add_object_to_json_object_str( push_obj, 2,
@@ -135,6 +138,43 @@ static void on_screen_message (struct afb_req request)
     afb_req_success(request, res, "afb_event_push event [on_screen_message]");
 }
 
+/**
+ * HomeScreen OnScreen Reply
+ *
+ * #### Parameters
+ * Request key
+ * - reply_message   : message for reply
+ *
+ * #### Return
+ * Nothing
+ *
+ */
+static void on_screen_reply (struct afb_req request)
+{
+    HMI_NOTICE("homescreen-service","called.");
+
+    int ret = 0;
+    const char* value = afb_req_value(request, _reply_message);
+    if (value) {
+
+      HMI_NOTICE("homescreen-service","request params = %s.", value);
+
+      struct json_object* push_obj = json_object_new_object();
+      hs_add_object_to_json_object_str( push_obj, 2,
+      _reply_message, value);
+      afb_event_push(ev_on_screen_reply, push_obj);
+    } else {
+      afb_req_fail_f(request, "failed", "called %s, Unknown palameter", __FUNCTION__);
+      return;
+    }
+
+  // response to HomeScreen
+    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 [on_screen_reply]");
+}
+
 /**
  * Subscribe event
  *
@@ -150,13 +190,13 @@ static void on_screen_message (struct afb_req request)
 static void subscribe(struct afb_req request)
 {
     const char *value = afb_req_value(request, "event");
-    AFB_NOTICE("value is %s", value);
+    HMI_NOTICE("homescreen-service","value is %s", value);
     int ret = 0;
     if(value) {
         int index = hs_search_event_name_index(value);
         if(index < 0)
         {
-            AFB_NOTICE("dedicated event doesn't exist");
+            HMI_NOTICE("homescreen-service","dedicated event doesn't exist");
             ret = EVENT_SUBSCRIBE_ERROR_CODE;
         }
         else
@@ -165,7 +205,7 @@ static void subscribe(struct afb_req request)
         }
     }
     else{
-        AFB_NOTICE("Please input event name");
+        HMI_NOTICE("homescreen-service","Please input event name");
         ret = EVENT_SUBSCRIBE_ERROR_CODE;
     }
     /*create response json object*/
@@ -190,13 +230,13 @@ static void subscribe(struct afb_req request)
 static void unsubscribe(struct afb_req request)
 {
     const char *value = afb_req_value(request, "event");
-    AFB_NOTICE("value is %s", value);
+    HMI_NOTICE("homescreen-service","value is %s", value);
     int ret = 0;
     if(value) {
         int index = hs_search_event_name_index(value);
         if(index < 0)
         {
-            AFB_NOTICE("dedicated event doesn't exist");
+            HMI_NOTICE("homescreen-service","dedicated event doesn't exist");
             ret = EVENT_SUBSCRIBE_ERROR_CODE;
         }
         else
@@ -205,7 +245,7 @@ static void unsubscribe(struct afb_req request)
         }
     }
     else{
-        AFB_NOTICE("Please input event name");
+        HMI_NOTICE("homescreen-service","Please input event name");
         ret = EVENT_SUBSCRIBE_ERROR_CODE;
     }
     /*create response json object*/
@@ -223,6 +263,7 @@ static const struct afb_verb_v2 verbs[]= {
     { .verb = "ping",              .session = AFB_SESSION_NONE,    .callback = pingSample,        .auth = NULL },
     { .verb = "tap_shortcut",      .session = AFB_SESSION_NONE,    .callback = tap_shortcut,      .auth = NULL },
     { .verb = "on_screen_message", .session = AFB_SESSION_NONE,    .callback = on_screen_message, .auth = NULL },
+    { .verb = "on_screen_reply",   .session = AFB_SESSION_NONE,    .callback = on_screen_reply,   .auth = NULL },
     { .verb = "subscribe",         .session = AFB_SESSION_NONE,    .callback = subscribe,         .auth = NULL },
     { .verb = "unsubscribe",       .session = AFB_SESSION_NONE,    .callback = unsubscribe,       .auth = NULL },
     {NULL } /* marker for end of the array */
@@ -230,17 +271,18 @@ static const struct afb_verb_v2 verbs[]= {
 
 static int preinit()
 {
-   AFB_NOTICE("binding preinit (was register)");
+   HMI_NOTICE("homescreen-service","binding preinit (was register)");
    return 0;
 }
 
 static int init()
 {
-   AFB_NOTICE("binding init");
+   HMI_NOTICE("homescreen-service","binding init");
 
    ev_tap_shortcut = afb_daemon_make_event(evlist[0]);
    ev_on_screen_message = afb_daemon_make_event(evlist[1]);
-   ev_reserved = afb_daemon_make_event(evlist[2]);
+   ev_on_screen_reply = afb_daemon_make_event(evlist[2]);
+   ev_reserved = afb_daemon_make_event(evlist[3]);
 
    event_list[0].name = evlist[0];
    event_list[0].event = &ev_tap_shortcut;
@@ -249,14 +291,17 @@ static int init()
    event_list[1].event = &ev_on_screen_message;
 
    event_list[2].name = evlist[2];
-   event_list[2].event = &ev_reserved;
+   event_list[2].event = &ev_on_screen_reply;
+
+   event_list[3].name = evlist[3];
+   event_list[3].event = &ev_reserved;
 
    return 0;
 }
 
 static void onevent(const char *event, struct json_object *object)
 {
-   AFB_NOTICE("on_event %s", event);
+   HMI_NOTICE("homescreen-service","on_event %s", event);
 }
 
 const struct afb_binding_v2 afbBindingV2 = {