summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzheng_wenlong <wenlong_zheng@nexty-ele.com>2017-11-17 17:49:24 +0900
committerzheng_wenlong <wenlong_zheng@nexty-ele.com>2017-11-17 17:50:30 +0900
commit0b0ce69a07a977707d77169cf7e061bb9c429b67 (patch)
tree262387c36e43e1ae888798fa8a0be1e9fd4827a8
parentaa15796ee333339673a8b4ac5468050a9a5b7f93 (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: Ib1a2f85dec9224c02f5b8b1875c6cb02eb560ee9 Signed-off-by: zheng_wenlong <wenlong_zheng@nexty-ele.com>
-rw-r--r--app/app.pri7
-rw-r--r--app/app.pro3
-rw-r--r--app/main.cpp54
-rw-r--r--package/config.xml2
4 files changed, 48 insertions, 18 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 a836400..035807c 100644
--- a/app/app.pro
+++ b/app/app.pro
@@ -15,6 +15,9 @@ SOURCES += \
main.cpp \
camera.cpp
+CONFIG += link_pkgconfig
+PKGCONFIG += libhomescreen qlibwindowmanager
+
RESOURCES += \
als-meter-demo.qrc \
images/images.qrc
diff --git a/app/main.cpp b/app/main.cpp
index 17bbe81..c119d60 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -29,9 +29,9 @@
#include <unistd.h>
#include "camera.h"
-#ifdef HAVE_LIBHOMESCREEN
+#include <QQuickWindow>
#include <libhomescreen.hpp>
-#endif
+#include <qlibwindowmanager.h>
class AppVisible : public QObject
{
@@ -88,17 +88,10 @@ private:
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("AlsMeterDemo");
QGuiApplication app(argc, argv);
- app.setApplicationName(QStringLiteral("als-meter-demo"));
+ app.setApplicationName(myname);
app.setApplicationVersion(QStringLiteral("0.1.0"));
app.setOrganizationDomain(QStringLiteral("automotivelinux.org"));
app.setOrganizationName(QStringLiteral("AutomotiveGradeLinux"));
@@ -134,10 +127,49 @@ int main(int argc, char *argv[])
context->setContextProperty(QStringLiteral("appVisible"), &appVisible);
context->setContextProperty(QStringLiteral("bindingAddressWS"), bindingAddressWS);
+ 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);
+ }
+ }
+ });
+
DBus dbus;
engine.rootContext()->setContextProperty("dbus", &dbus);
engine.load(QUrl(QStringLiteral("qrc:/Als-meter-demo.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 9ff2ba3..a8047f7 100644
--- a/package/config.xml
+++ b/package/config.xml
@@ -8,6 +8,8 @@
<license>APL 2.0</license>
<feature name="urn:AGL:widget:required-api">
<param name="steering-wheel" value="ws" />
+ <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" />