summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2017-11-14 22:17:53 +0900
committerScott Murray <scott.murray@konsulko.com>2017-11-14 22:19:06 +0900
commit16ab0b453ac9a2341342b927c14ceb426e39ff05 (patch)
treeecd000b48a04fdad05570d17703973c0965dc661
parentc320e8202d3347b1513be57786d4d70b55551351 (diff)
Porting to new HMI Frameworkeel_4.99.3eel/4.99.34.99.3
Changes following guidelines given in "Kickstart: New HMI Framework" document at: https://wiki.automotivelinux.org/_media/kickstart_apps_migration_guide.pdf Change-Id: Icfea651ce77f800aab54fd43dfe7d1ca2906099b Signed-off-by: Scott Murray <scott.murray@konsulko.com>
-rw-r--r--app/app.pri7
-rw-r--r--app/app.pro3
-rw-r--r--app/main.cpp58
-rw-r--r--package/config.xml9
4 files changed, 55 insertions, 22 deletions
diff --git a/app/app.pri b/app/app.pri
index 014646f..e535cbc 100644
--- a/app/app.pri
+++ b/app/app.pri
@@ -1,12 +1,5 @@
TEMPLATE = app
load(configure)
-qtCompileTest(libhomescreen)
-
-config_libhomescreen {
- CONFIG += link_pkgconfig
- PKGCONFIG += homescreen
- DEFINES += HAVE_LIBHOMESCREEN
-}
DESTDIR = $${OUT_PWD}/../package/root/bin
diff --git a/app/app.pro b/app/app.pro
index 6e768d5..9599de1 100644
--- a/app/app.pro
+++ b/app/app.pro
@@ -3,6 +3,9 @@ QT = quickcontrols2
SOURCES = main.cpp
+CONFIG += link_pkgconfig
+PKGCONFIG += libhomescreen qlibwindowmanager
+
RESOURCES += \
dashboard.qrc \
images/images.qrc
diff --git a/app/main.cpp b/app/main.cpp
index 1d73689..9649b82 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -21,24 +21,16 @@
#include <QtGui/QGuiApplication>
#include <QtQml/QQmlApplicationEngine>
#include <QtQuickControls2/QQuickStyle>
-
-#ifdef HAVE_LIBHOMESCREEN
+#include <QQuickWindow>
#include <libhomescreen.hpp>
-#endif
+#include <qlibwindowmanager.h>
int main(int argc, char *argv[])
{
-#ifdef HAVE_LIBHOMESCREEN
- LibHomeScreen libHomeScreen;
-
- if (!libHomeScreen.renderAppToAreaAllowed(0, 1)) {
- qWarning() << "renderAppToAreaAllowed is denied";
- return -1;
- }
-#endif
+ QString myname = QString("Dashboard");
QGuiApplication app(argc, argv);
- app.setApplicationName(QStringLiteral("Dashboard"));
+ app.setApplicationName(myname);
app.setApplicationVersion(QStringLiteral("3.99.3"));
app.setOrganizationDomain(QStringLiteral("automotivelinux.org"));
app.setOrganizationName(QStringLiteral("AutomotiveGradeLinux"));
@@ -67,9 +59,47 @@ int main(int argc, char *argv[])
bindingAddress.setQuery(query);
QQmlContext *context = engine.rootContext();
context->setContextProperty(QStringLiteral("bindingAddress"), bindingAddress);
- }
- engine.load(QUrl(QStringLiteral("qrc:/Dashboard.qml")));
+ std::string token = secret.toStdString();
+ LibHomeScreen* hs = new LibHomeScreen();
+ QLibWindowmanager* qwm = new QLibWindowmanager();
+
+ // WindowManager
+ if(qwm->init(port,secret) != 0){
+ exit(EXIT_FAILURE);
+ }
+ // Request a surface as described in layers.json windowmanager’s file
+ if (qwm->requestSurface(myname) != 0) {
+ exit(EXIT_FAILURE);
+ }
+ // Create an event callback against an event type. Here a lambda is called when SyncDraw event occurs
+ qwm->set_event_handler(QLibWindowmanager::Event_SyncDraw, [qwm, myname](json_object *object) {
+ fprintf(stderr, "Surface got syncDraw!\n");
+ qwm->endDraw(myname);
+ });
+
+ // HomeScreen
+ hs->init(port, token.c_str());
+ // Set the event handler for Event_TapShortcut which will activate the surface for windowmanager
+ hs->set_event_handler(LibHomeScreen::Event_TapShortcut, [qwm, myname](json_object *object){
+ json_object *appnameJ = nullptr;
+ if(json_object_object_get_ex(object, "application_name", &appnameJ))
+ {
+ const char *appname = json_object_get_string(appnameJ);
+ if(myname == appname)
+ {
+ qDebug("Surface %s got tapShortcut\n", appname);
+ qwm->activateSurface(myname);
+ }
+ }
+ });
+
+ engine.load(QUrl(QStringLiteral("qrc:/Dashboard.qml")));
+ QObject *root = engine.rootObjects().first();
+ QQuickWindow *window = qobject_cast<QQuickWindow *>(root);
+ QObject::connect(window, SIGNAL(frameSwapped()), qwm, SLOT(slotActivateSurface()
+ ));
+ }
return app.exec();
}
diff --git a/package/config.xml b/package/config.xml
index 3a8bad8..e284a1a 100644
--- a/package/config.xml
+++ b/package/config.xml
@@ -2,10 +2,17 @@
<widget xmlns="http://www.w3.org/ns/widgets" id="dashboard" version="0.1">
<name>Dashboard</name>
<icon src="icon.svg"/>
- <content src="bin/dashboard" type="application/x-executable"/>
+ <content src="bin/dashboard" type="application/vnd.agl.native"/>
<description>This is a demo dashboard application</description>
<author>Qt</author>
<license>APL 2.0</license>
+ <feature name="urn:AGL:widget:required-api">
+ <param name="windowmanager" value="ws"/>
+ <param name="homescreen" value="ws"/>
+ </feature>
+ <feature name="urn:AGL:widget:required-permission">
+ <param name="urn:AGL:permission::public:no-htdocs" value="required"/>
+ </feature>
</widget>