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){
+ 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"));
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"));
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);
+}
#define HOMESCREENHANDLER_H
#include <QObject>
-#include <libhomescreen.hpp>
+#include <QQuickWindow>
+#include <qlibhomescreen.h>
+#include <qlibwindowmanager.h>
#include <string>
using namespace std;
explicit HomescreenHandler(QObject *parent = 0);
~HomescreenHandler();
- void init(int port, const char* token);
+ void init(int port, const char* token, QLibWindowmanager *qwm, QString myname);
Q_INVOKABLE void tapShortcut(QString application_id);
static void* myThis;
static void onRep_static(struct json_object* reply_contents);
static void onEv_static(const string& event, struct json_object* event_contents);
+ void setQuickWindow(QQuickWindow *qw);
signals:
void showNotification(QString application_id, QString icon_path, QString text);
void showInformation(QString info);
private:
- LibHomeScreen *mp_hs;
+ QLibHomeScreen *mp_qhs;
+ QLibWindowmanager *mp_qwm;
+ QString m_myname;
};
#endif // HOMESCREENHANDLER_H
});
HomescreenHandler* homescreenHandler = new HomescreenHandler();
- homescreenHandler->init(port, token.toStdString().c_str());
+ homescreenHandler->init(port, token.toStdString().c_str(), layoutHandler, graphic_role);
QUrl bindingAddress;
bindingAddress.setScheme(QStringLiteral("ws"));
QObject *root = engine.rootObjects().first();
QQuickWindow *window = qobject_cast<QQuickWindow *>(root);
- QObject::connect(window, SIGNAL(frameSwapped()), layoutHandler, SLOT(slotActivateSurface()));
+ homescreenHandler->setQuickWindow(window);
QList<QObject *> sobjs = engine.rootObjects();
StatusBarModel *statusBar = sobjs.first()->findChild<StatusBarModel *>("statusBar");