X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=homescreen%2Fsrc%2Fhomescreenhandler.cpp;h=4db60fb9069e26a77b730a49a1969cf840de8872;hb=f3de2f5cad06a772ee55f58694d559a7cb012c02;hp=5da8b9e11d4075d458cdcc8af5a2f9ff84801677;hpb=85392e71f90a0322fdc08359ef1d829cdcf67381;p=apps%2Fhomescreen.git

diff --git a/homescreen/src/homescreenhandler.cpp b/homescreen/src/homescreenhandler.cpp
index 5da8b9e..4db60fb 100644
--- a/homescreen/src/homescreenhandler.cpp
+++ b/homescreen/src/homescreenhandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 TOYOTA MOTOR CORPORATION
+ * Copyright (c) 2017, 2018, 2019 TOYOTA MOTOR CORPORATION
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#include <QFileInfo>
 #include "homescreenhandler.h"
 #include <functional>
 #include "hmi-debug.h"
@@ -49,12 +50,44 @@ void HomescreenHandler::init(int port, const char *token)
         HMI_DEBUG("HomeScreen","set_event_handler Event_OnScreenMessage display_message = %s", display_message);
     });
 
+    mp_hs->set_event_handler(LibHomeScreen::Event_ShowNotification,[this](json_object *object){
+       json_object *p_obj = json_object_object_get(object, "parameter");
+       const char *icon = json_object_get_string(
+                   json_object_object_get(p_obj, "icon"));
+       const char *text = json_object_get_string(
+                   json_object_object_get(p_obj, "text"));
+       const char *app_id = json_object_get_string(
+                   json_object_object_get(p_obj, "caller"));
+       HMI_DEBUG("HomeScreen","Event_ShowNotification icon=%s, text=%s, caller=%s", icon, text, app_id);
+       QFileInfo icon_file(icon);
+       QString icon_path;
+       if (icon_file.isFile() && icon_file.exists()) {
+           icon_path = QString(QLatin1String(icon));
+       } else {
+           icon_path = "./images/Utility_Logo_Grey-01.svg";
+       }
+
+       emit showNotification(QString(QLatin1String(app_id)), icon_path, QString(QLatin1String(text)));
+    });
+
+    mp_hs->set_event_handler(LibHomeScreen::Event_ShowInformation,[this](json_object *object){
+       json_object *p_obj = json_object_object_get(object, "parameter");
+       const char *info = json_object_get_string(
+                   json_object_object_get(p_obj, "info"));
+
+       emit showInformation(QString(QLatin1String(info)));
+    });
 }
 
-void HomescreenHandler::tapShortcut(QString application_name)
+void HomescreenHandler::tapShortcut(QString application_id)
 {
-    HMI_DEBUG("HomeScreen","tapShortcut %s", application_name.toStdString().c_str());
-    mp_hs->tapShortcut(application_name.toStdString().c_str());
+    HMI_DEBUG("HomeScreen","tapShortcut %s", application_id.toStdString().c_str());
+    struct json_object* j_json = json_object_new_object();
+    struct json_object* value;
+    value = json_object_new_string("normal.full");
+    json_object_object_add(j_json, "area", value);
+
+    mp_hs->showWindow(application_id.toStdString().c_str(), j_json);
 }
 
 void HomescreenHandler::onRep_static(struct json_object* reply_contents)