X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=homescreen%2Fsrc%2Fhomescreenhandler.cpp;h=bf98a53af09daed1b21c24cf0a1b3c2f86a1da37;hb=refs%2Fchanges%2F19%2F24819%2F2;hp=5da8b9e11d4075d458cdcc8af5a2f9ff84801677;hpb=33d31b5bac3c8c9105d43d6566174f39ef7a4ea4;p=apps%2Fhomescreen.git

diff --git a/homescreen/src/homescreenhandler.cpp b/homescreen/src/homescreenhandler.cpp
index 5da8b9e..bf98a53 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,15 +14,19 @@
  * limitations under the License.
  */
 
+#include <QGuiApplication>
+#include <QFileInfo>
 #include "homescreenhandler.h"
 #include <functional>
 #include "hmi-debug.h"
 
+#include <qpa/qplatformnativeinterface.h>
+
 void* HomescreenHandler::myThis = 0;
 
-HomescreenHandler::HomescreenHandler(QObject *parent) :
+HomescreenHandler::HomescreenHandler(Shell *_aglShell, QObject *parent) :
     QObject(parent),
-    mp_hs(NULL)
+    aglShell(_aglShell)
 {
 
 }
@@ -41,6 +45,7 @@ void HomescreenHandler::init(int port, const char *token)
 
     myThis = this;
 
+
     mp_hs->registerCallback(nullptr, HomescreenHandler::onRep_static);
 
     mp_hs->set_event_handler(LibHomeScreen::Event_OnScreenMessage, [this](json_object *object){
@@ -49,12 +54,65 @@ void HomescreenHandler::init(int port, const char *token)
         HMI_DEBUG("HomeScreen","set_event_handler Event_OnScreenMessage display_message = %s", display_message);
     });
 
+    // should be handled in the top panel
+    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)));
+    });
+
+    // should be handled in the bottom panel
+    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)));
+    });
+}
+
+static struct wl_output *
+getWlOutput(QPlatformNativeInterface *native, QScreen *screen)
+{
+	void *output = native->nativeResourceForScreen("output", screen);
+	return static_cast<struct ::wl_output*>(output);
 }
 
-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;
+
+	struct agl_shell *agl_shell = aglShell->shell.get();
+	QPlatformNativeInterface *native = qApp->platformNativeInterface();
+	struct wl_output *output = getWlOutput(native, qApp->screens().first());
+
+	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);
+
+	// this works (and it is redundant the first time), due to the default
+	// policy engine installed which actives the application, when starting
+	// the first time. Later calls to HomescreenHandler::tapShortcut will
+	// require calling 'agl_shell_activate_app'
+	agl_shell_activate_app(agl_shell, application_id.toStdString().c_str(), output);
 }
 
 void HomescreenHandler::onRep_static(struct json_object* reply_contents)