X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fhs-client.cpp;h=d6e771c1f87059d67ff2530d5725ef8f1203c884;hb=2f7789558c98d8b79b41d62ac97f5bd6de557dc9;hp=c927442de64f3ee81709ebb73c08e5ff1c0734cb;hpb=6c3015a7607c45313fa10792b9914864f8c25831;p=apps%2Fagl-service-homescreen.git

diff --git a/src/hs-client.cpp b/src/hs-client.cpp
index c927442..d6e771c 100644
--- a/src/hs-client.cpp
+++ b/src/hs-client.cpp
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
+#include <cstring>
 #include "hs-client.h"
 #include "hs-helper.h"
-#include "hmi-debug.h"
 
 static const char _event[] = "event";
 static const char _type[] = "type";
@@ -54,7 +54,7 @@ const std::unordered_map<std::string, HS_Client::func_handler> HS_Client::func_l
  */
 HS_Client::HS_Client(afb_req_t request, std::string id) : my_id(id)
 {
-    HMI_NOTICE("homescreen-service","called.");
+    AFB_DEBUG("called.");
     my_event = afb_api_make_event(request->api, id.c_str());
 }
 
@@ -70,7 +70,7 @@ HS_Client::HS_Client(afb_req_t request, std::string id) : my_id(id)
  */
 HS_Client::~HS_Client()
 {
-    HMI_NOTICE("homescreen-service","called.");
+    AFB_DEBUG("called.");
     afb_event_unref(my_event);
 }
 
@@ -87,7 +87,7 @@ HS_Client::~HS_Client()
  */
 int HS_Client::tap_shortcut(afb_req_t request)
 {
-    HMI_NOTICE("homescreen-service","request appid = %s.", my_id.c_str());
+    AFB_INFO("request appid = %s.", my_id.c_str());
     struct json_object* push_obj = json_object_new_object();
     hs_add_object_to_json_object_str( push_obj, 4, _application_id, my_id.c_str(),
     _type, __FUNCTION__);
@@ -111,14 +111,14 @@ int HS_Client::on_screen_message(afb_req_t request)
     int ret = 0;
     const char* value = afb_req_value(request, _display_message);
     if (value) {
-        HMI_NOTICE("homescreen-service","push %s event message [%s].", __FUNCTION__, value);
+        AFB_INFO("push %s event message [%s].", __FUNCTION__, value);
         struct json_object* push_obj = json_object_new_object();
         hs_add_object_to_json_object_str( push_obj, 4, _display_message, value,
         _type, __FUNCTION__);
         afb_event_push(my_event, push_obj);
     }
     else {
-        HMI_NOTICE("homescreen-service","Please input display_message");
+        AFB_WARNING("Please input display_message");
         ret = AFB_EVENT_BAD_REQUEST;
     }
     return ret;
@@ -140,14 +140,14 @@ int HS_Client::on_screen_reply(afb_req_t request)
     int ret = 0;
     const char* value = afb_req_value(request, _reply_message);
     if (value) {
-        HMI_NOTICE("homescreen-service","push %s event message [%s].", __FUNCTION__, value);
+        AFB_INFO("push %s event message [%s].", __FUNCTION__, value);
         struct json_object* push_obj = json_object_new_object();
         hs_add_object_to_json_object_str( push_obj, 4, _reply_message, value,
         _type, __FUNCTION__);
         afb_event_push(my_event, push_obj);
     }
     else {
-        HMI_NOTICE("homescreen-service","Please input reply_message");
+        AFB_WARNING("Please input reply_message");
         ret = AFB_EVENT_BAD_REQUEST;
     }
     return ret;
@@ -166,13 +166,13 @@ int HS_Client::on_screen_reply(afb_req_t request)
  */
 int HS_Client::subscribe(afb_req_t request)
 {
-    HMI_NOTICE("homescreen-service"," called.");
+    AFB_DEBUG(" called.");
     int ret = 0;
     const char *value = afb_req_value(request, _event);
     if(value) {
-        HMI_NOTICE("homescreen-service","subscribe event %s", value);
+        AFB_INFO("subscribe event %s", value);
         if(!isSupportEvent(value)) {
-            HMI_NOTICE("homescreen-service","subscibe event isn't existing.");
+            AFB_WARNING("subscibe event isn't existing.");
             ret = AFB_EVENT_BAD_REQUEST;
         }
         else {
@@ -186,7 +186,7 @@ int HS_Client::subscribe(afb_req_t request)
         }
     }
     else {
-        HMI_NOTICE("homescreen-service","Please input event name");
+        AFB_WARNING("Please input event name");
         ret = AFB_EVENT_BAD_REQUEST;
     }
     return ret;
@@ -205,18 +205,18 @@ int HS_Client::subscribe(afb_req_t request)
  */
 int HS_Client::unsubscribe(afb_req_t request)
 {
-    HMI_NOTICE("homescreen-service"," called.");
+    AFB_DEBUG(" called.");
     int ret = 0;
     const char *value = afb_req_value(request, _event);
     if(value) {
-        HMI_NOTICE("homescreen-service","unsubscribe %s event", value);
+        AFB_INFO("unsubscribe %s event", value);
         event_list.erase(std::string(value));
         if(event_list.empty()) {
             ret = afb_req_unsubscribe(request, my_event);
         }
     }
     else {
-        HMI_NOTICE("homescreen-service","Please input event name");
+        AFB_WARNING("Please input event name");
         ret = AFB_EVENT_BAD_REQUEST;
     }
     return ret;
@@ -235,7 +235,7 @@ int HS_Client::unsubscribe(afb_req_t request)
  */
 int HS_Client::showWindow(afb_req_t request)
 {
-    HMI_NOTICE("homescreen-service","%s application_id = %s.", __FUNCTION__, my_id.c_str());
+    AFB_INFO("%s application_id = %s.", __FUNCTION__, my_id.c_str());
     int ret = 0;
     struct json_object* push_obj = json_object_new_object();
     hs_add_object_to_json_object_str( push_obj, 4, _application_id, my_id.c_str(), _type, __FUNCTION__);
@@ -243,7 +243,7 @@ int HS_Client::showWindow(afb_req_t request)
     if(param) {
         std::string req_appid = std::move(get_application_id(request));
         if(req_appid.empty()) {
-            HMI_NOTICE("homescreen-service","can't get application identifier");
+            AFB_WARNING("can't get application identifier");
             return AFB_REQ_GETAPPLICATIONID_ERROR;
         }
 
@@ -253,7 +253,7 @@ int HS_Client::showWindow(afb_req_t request)
         afb_event_push(my_event, push_obj);
     }
     else {
-        HMI_ERROR("homescreen-service","please input correct parameter.");
+        AFB_WARNING("please input correct parameter.");
         ret = AFB_EVENT_BAD_REQUEST;
     }
     return ret;
@@ -272,10 +272,10 @@ int HS_Client::showWindow(afb_req_t request)
  */
 int HS_Client::hideWindow(afb_req_t request)
 {
-    HMI_NOTICE("homescreen-service"," called.");
+    AFB_DEBUG(" called.");
     std::string req_appid = std::move(get_application_id(request));
     if(req_appid.empty()) {
-        HMI_NOTICE("homescreen-service","can't get application identifier");
+        AFB_WARNING("can't get application identifier");
         return AFB_REQ_GETAPPLICATIONID_ERROR;
     }
 
@@ -302,7 +302,7 @@ int HS_Client::hideWindow(afb_req_t request)
  */
 int HS_Client::replyShowWindow(afb_req_t request)
 {
-    HMI_NOTICE("homescreen-service","%s application_id = %s.", __FUNCTION__, my_id.c_str());
+    AFB_INFO("%s application_id = %s.", __FUNCTION__, my_id.c_str());
     int ret = 0;
     struct json_object* push_obj = json_object_new_object();
     hs_add_object_to_json_object_str( push_obj, 4, _application_id, my_id.c_str(), _type, __FUNCTION__);
@@ -312,7 +312,7 @@ int HS_Client::replyShowWindow(afb_req_t request)
         afb_event_push(my_event, push_obj);
     }
     else {
-        HMI_ERROR("homescreen-service","please input correct parameter.");
+        AFB_WARNING("please input correct parameter.");
         ret = AFB_EVENT_BAD_REQUEST;
     }
     return ret;
@@ -331,14 +331,14 @@ int HS_Client::replyShowWindow(afb_req_t request)
  */
 int HS_Client::showNotification(afb_req_t request)
 {
-    HMI_NOTICE("homescreen-service"," called.");
+    AFB_DEBUG(" called.");
     int ret = 0;
     const char *value = afb_req_value(request, _text);
     if(value) {
-        HMI_NOTICE("homescreen-service","text is %s", value);
+        AFB_INFO("text is %s", value);
         std::string appid =std::move(get_application_id(request));
         if(appid.empty()) {
-            HMI_NOTICE("homescreen-service","can't get application identifier");
+            AFB_WARNING("can't get application identifier");
             return AFB_REQ_GETAPPLICATIONID_ERROR;
         }
 
@@ -354,12 +354,12 @@ int HS_Client::showNotification(afb_req_t request)
             afb_event_push(my_event, push_obj);
         }
         else {
-            HMI_NOTICE("homescreen-service","please input icon.");
+            AFB_WARNING("please input icon.");
             ret = AFB_REQ_SHOWNOTIFICATION_ERROR;
         }
     }
     else {
-        HMI_NOTICE("homescreen-service","please input text.");
+        AFB_WARNING("please input text.");
         ret = AFB_REQ_SHOWNOTIFICATION_ERROR;
     }
 
@@ -379,14 +379,14 @@ int HS_Client::showNotification(afb_req_t request)
  */
 int HS_Client::showInformation(afb_req_t request)
 {
-    HMI_NOTICE("homescreen-service"," called.");
+    AFB_DEBUG(" called.");
     int ret = 0;
     const char *value = afb_req_value(request, _info);
     if(value) {
-        HMI_NOTICE("homescreen-service","info is %s", value);
+        AFB_INFO("info is %s", value);
         std::string appid = std::move(get_application_id(request));
         if(appid.empty()) {
-            HMI_NOTICE("homescreen-service","can't get application identifier");
+            AFB_WARNING("can't get application identifier");
             return AFB_REQ_GETAPPLICATIONID_ERROR;
         }
 
@@ -398,7 +398,7 @@ int HS_Client::showInformation(afb_req_t request)
         afb_event_push(my_event, push_obj);
     }
     else {
-        HMI_NOTICE("homescreen-service","please input information.");
+        AFB_WARNING("please input information.");
         ret = AFB_REQ_SHOWINFORMATION_ERROR;
     }
 
@@ -459,14 +459,14 @@ bool HS_Client::isSupportEvent(const char* event)
  */
 int HS_Client::handleRequest(afb_req_t request, const char *verb)
 {
-    HMI_NOTICE("homescreen-service","called.");
+    AFB_DEBUG("called.");
     if((strcasecmp(verb, "subscribe") && strcasecmp(verb, "unsubscribe")) && !checkEvent(verb))
         return 0;
 
     int ret = AFB_EVENT_BAD_REQUEST;
     auto ip = func_list.find(std::string(verb));
     if(ip != func_list.end() && ip->second != nullptr) {
-        HMI_NOTICE("homescreen-service","[%s]verb found", verb);
+        AFB_INFO("[%s]verb found", verb);
         ret = (this->*(ip->second))(request);
     }
     return ret;
@@ -489,7 +489,7 @@ int HS_Client::pushEvent(const char *event, struct json_object *param)
     if(!checkEvent(event))
         return 0;
 
-    HMI_NOTICE("homescreen-service","called, event=%s.",event);
+    AFB_INFO("called, event=%s.",event);
     struct json_object* push_obj = json_object_new_object();
     hs_add_object_to_json_object_str( push_obj, 4, _application_id, my_id.c_str(), _type, event);
     if(param != nullptr)