/*
- * 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.
HomescreenHandler::HomescreenHandler(QObject *parent) :
QObject(parent),
- mp_hs(NULL)
+ mp_qhs(NULL)
{
-
}
HomescreenHandler::~HomescreenHandler()
{
- if (mp_hs != NULL) {
- delete mp_hs;
+ if (mp_qhs != NULL) {
+ delete mp_qhs;
}
}
-void HomescreenHandler::init(int port, const char *token)
+void HomescreenHandler::init(int port, const char *token, QLibWindowmanager *qwm, QString myname)
{
- mp_hs = new LibHomeScreen();
- mp_hs->init(port, token);
+ mp_qhs = new QLibHomeScreen();
+ mp_qhs->init(port, token);
myThis = this;
+ mp_qwm = qwm;
+ m_myname = myname;
+
+ mp_qhs->registerCallback(nullptr, HomescreenHandler::onRep_static);
- mp_hs->registerCallback(nullptr, HomescreenHandler::onRep_static);
+ mp_qhs->set_event_handler(QLibHomeScreen::Event_ShowWindow,[this](json_object *object){
+ HMI_DEBUG("Launcher","Surface launcher got Event_ShowWindow\n");
+ mp_qwm->activateWindow(m_myname);
+ });
- mp_hs->set_event_handler(LibHomeScreen::Event_OnScreenMessage, [this](json_object *object){
+ mp_qhs->set_event_handler(QLibHomeScreen::Event_OnScreenMessage, [this](json_object *object){
const char *display_message = json_object_get_string(
json_object_object_get(object, "display_message"));
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){
- const char *application_id = json_object_get_string(
- json_object_object_get(object, "application_id"));
-
+ mp_qhs->set_event_handler(QLibHomeScreen::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 = "./images/Utility_Logo_Grey-01.svg";
}
- emit showNotification(QString(QLatin1String(application_id)), icon_path, QString(QLatin1String(text)));
+ emit showNotification(QString(QLatin1String(app_id)), icon_path, QString(QLatin1String(text)));
});
- mp_hs->set_event_handler(LibHomeScreen::Event_ShowInformation,[this](json_object *object){
+ mp_qhs->set_event_handler(QLibHomeScreen::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"));
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");
+ 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);
+ mp_qhs->showWindow(application_id.toStdString().c_str(), j_json);
}
void HomescreenHandler::onRep_static(struct json_object* reply_contents)
HMI_DEBUG("HomeScreen","display_message = %s", display_message);
}
}
+
+void HomescreenHandler::setQuickWindow(QQuickWindow *qw)
+{
+ mp_qhs->setQuickWindow(qw);
+}