1 files changed, 140 insertions, 97 deletions

diff --git a/app/main.cpp b/app/main.cpp
index 202b25c..e609dda 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2018 TOYOTA MOTOR CORPORATION
+ * Copyright (C) 2016 The Qt Company Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *	  http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,116 +13,159 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <QQmlApplicationEngine>
 
+#define USE_QTAGLEXTRAS			0
+#define USE_QLIBWINDOWMANAGER	1
+
+#if	USE_QTAGLEXTRAS
+#include <QtAGLExtras/AGLApplication>
+#elif USE_QLIBWINDOWMANAGER
+#include <qlibwindowmanager.h>
+#include <qlibhomescreen.h>
+#include <string>
+#include <ilm/ivi-application-client-protocol.h>
+#include <wayland-client.h>
+#endif
 #include <QtCore/QDebug>
 #include <QtCore/QCommandLineParser>
 #include <QtCore/QUrlQuery>
+#include <QtCore/QSettings>
 #include <QtGui/QGuiApplication>
+#include <QtQml/QQmlApplicationEngine>
 #include <QtQml/QQmlContext>
-#include <QtQuick/QQuickWindow>
-
-#include "qcheapruler.hpp"
-
-#ifdef HAVE_LIBHOMESCREEN
-#include <libhomescreen.hpp>
-#endif
-#ifdef HAVE_QLIBWINDOWMANAGER
-#include <qlibwindowmanager.h>
-#endif
+#include <QtQuickControls2/QQuickStyle>
+#include <QQuickWindow>
+#include <QtDBus/QDBusConnection>
+#include "markermodel.h"
+#include "dbus_server.h"
+#include "guidance_module.h"
+#include "file_operation.h"
 
 int main(int argc, char *argv[])
 {
-    QString myname = QString("navigation");
-
-    QGuiApplication app(argc, argv);
-    app.setApplicationName(myname);
-    app.setApplicationVersion(QStringLiteral("0.1.0"));
-    app.setOrganizationDomain(QStringLiteral("automotivelinux.org"));
-    app.setOrganizationName(QStringLiteral("AutomotiveGradeLinux"));
-
-    QCommandLineParser parser;
-    parser.addPositionalArgument("port", app.translate("main", "port for binding"));
-    parser.addPositionalArgument("secret", app.translate("main", "secret for binding"));
-    parser.addHelpOption();
-    parser.addVersionOption();
-    parser.process(app);
-    QStringList positionalArguments = parser.positionalArguments();
-
-    QQmlApplicationEngine engine;
-    QQmlContext *context = engine.rootContext();
-    QUrl bindingAddress;
-    int port = 0;
-    QString secret;
-    if (positionalArguments.length() == 2) {
-        port = positionalArguments.takeFirst().toInt();
-        secret = positionalArguments.takeFirst();
-        bindingAddress.setScheme(QStringLiteral("ws"));
-        bindingAddress.setHost(QStringLiteral("localhost"));
-        bindingAddress.setPort(port);
-        bindingAddress.setPath(QStringLiteral("/api"));
-        QUrlQuery query;
-        query.addQueryItem(QStringLiteral("token"), secret);
-        bindingAddress.setQuery(query);
-        context->setContextProperty(QStringLiteral("bindingAddress"), bindingAddress);
-    } else {
-        context->setContextProperty(QStringLiteral("bindingAddress"), bindingAddress);
-    }
+	
+    // for dbusIF
+    QString pathBase = "org.agl.";
+    QString objBase = "/org/agl/";
+    QString	serverName = "naviapi";
 
-#ifdef HAVE_QLIBWINDOWMANAGER
-    // WindowManager
-    QLibWindowmanager* qwm = new QLibWindowmanager();
-    if(qwm->init(port,secret) != 0){
-        exit(EXIT_FAILURE);
+    if (!QDBusConnection::sessionBus().isConnected()) {
+        qWarning("Cannot connect to the D-Bus session bus.\n"
+                 "Please check your system settings and try again.\n");
+        return 1;
     }
-    // Request a surface as described in layers.json windowmanager’s file
-    if(qwm->requestSurface(myname) != 0){
-        exit(EXIT_FAILURE);
+	
+#if	USE_QTAGLEXTRAS
+	AGLApplication app(argc, argv);
+	app.setApplicationName("navigation");
+	app.setupApplicationRole("navigation");
+ 	app.load(QUrl(QStringLiteral("qrc:/navigation.qml")));
+	
+#elif USE_QLIBWINDOWMANAGER
+	QGuiApplication app(argc, argv);
+	QString myname = QString("navigation");
+	int port = 1700;
+	QString token = "hello";
+	QCoreApplication::setOrganizationDomain("LinuxFoundation");
+	QCoreApplication::setOrganizationName("AutomotiveGradeLinux");
+	QCoreApplication::setApplicationName(myname);
+	QCoreApplication::setApplicationVersion("0.1.0");
+	QCommandLineParser parser;
+	parser.addPositionalArgument("port", app.translate("main", "port for binding"));
+	parser.addPositionalArgument("secret", app.translate("main", "secret for binding"));
+	parser.addHelpOption();
+	parser.addVersionOption();
+	parser.process(app);
+	QStringList positionalArguments = parser.positionalArguments();
+	if (positionalArguments.length() == 2) {
+		port = positionalArguments.takeFirst().toInt();
+		token = positionalArguments.takeFirst();
     }
-    // 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);
+	fprintf(stderr, "[navigation]app_name: %s, port: %d, token: %s.\n",
+					myname.toStdString().c_str(),
+					port,
+					token.toStdString().c_str());
+	// QLibWM
+	QLibWindowmanager* qwmHandler = new QLibWindowmanager();
+	int res;
+	if((res = qwmHandler->init(port,token)) != 0){
+		fprintf(stderr, "[navigation]init qlibwm err(%d)\n", res);
+		return -1;
+	}
+	if((res = qwmHandler->requestSurface(myname)) != 0) {
+		fprintf(stderr, "[navigation]request surface err(%d)\n", res);
+		return -1;
+	}
+    qwmHandler->set_event_handler(QLibWindowmanager::Event_SyncDraw, [qwmHandler, myname](json_object *object) {
+		qwmHandler->endDraw(myname);
+	});
+    qwmHandler->set_event_handler(QLibWindowmanager::Event_Visible, [qwmHandler, myname](json_object *object) {
+        ;
     });
-#endif
-
-#ifdef HAVE_LIBHOMESCREEN
-    // HomeScreen
-    LibHomeScreen* hs = new LibHomeScreen();
-    std::string token = secret.toStdString();
-    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(QString::compare(myname, appname, Qt::CaseInsensitive) == 0)
-            {
-                qDebug("Surface %s got tapShortcut\n", appname);
-                json_object *para, *area;
-                json_object_object_get_ex(object, "parameter", &para);
-                json_object_object_get_ex(para, "area", &area);
-                const char *displayArea = json_object_get_string(area);
-                qDebug("Surface %s got tapShortcut area\n", displayArea);
-                qwm->activateWindow(myname, QString(QLatin1String(displayArea)));
-            }
-        }
+    qwmHandler->set_event_handler(QLibWindowmanager::Event_Invisible, [qwmHandler, myname](json_object *object) {
+        ;
     });
-#endif
-    qmlRegisterType<QCheapRuler>("com.mapbox.cheap_ruler", 1, 0, "CheapRuler");
+	// QLibHS
+	QLibHomeScreen* qhsHandler = new QLibHomeScreen();
+	qhsHandler->init(port, token.toStdString().c_str());
+	qhsHandler->set_event_handler(QLibHomeScreen::Event_TapShortcut, [qwmHandler, 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(QString::compare(myname, appname, Qt::CaseInsensitive) == 0)
+			{
+				qDebug("Surface %s got tapShortcut\n", appname);
+				json_object *para, *area;
+				json_object_object_get_ex(object, "parameter", &para);
+				json_object_object_get_ex(para, "area", &area);
+				const char *displayArea = json_object_get_string(area);
+				qDebug("Surface %s got tapShortcut area\n", displayArea);
+				qwmHandler->activateWindow(myname, QString(QLatin1String(displayArea)));
+			}
+		}
+	});
+	// Load qml
+	QQmlApplicationEngine engine;
 
-    engine.load(QUrl(QStringLiteral("qrc:qml/Main.qml")));
+    MarkerModel model;
+	engine.rootContext()->setContextProperty("markerModel", &model);
 
-    QObject *root = engine.rootObjects().first();
-    QQuickWindow *window = qobject_cast<QQuickWindow *>(root);
-#ifdef HAVE_QLIBWINDOWMANAGER
-    QObject::connect(window, SIGNAL(frameSwapped()), qwm, SLOT(slotActivateSurface()));
-#else
-    window->resize(1024, 768);
-    window->setVisible(true);
-#endif
+    Guidance_Module guidance;
+	engine.rootContext()->setContextProperty("guidanceModule", &guidance);
+
+    File_Operation file;
+    engine.rootContext()->setContextProperty("fileOperation", &file);
+
+	engine.load(QUrl(QStringLiteral("qrc:/navigation.qml")));
+ 	QObject *root = engine.rootObjects().first();
+	QQuickWindow *window = qobject_cast<QQuickWindow *>(root);
+	QObject::connect(window, SIGNAL(frameSwapped()), qwmHandler, SLOT(slotActivateSurface()));
+    QObject *map = engine.rootObjects().first()->findChild<QObject*>("map");
+    DBus_Server dbus(pathBase,objBase,serverName,map);
+
+#else	// for only libwindowmanager
+	QGuiApplication app(argc, argv);
+    app.setApplicationName("navigation");
+
+	// Load qml
+	QQmlApplicationEngine engine;
+
+    MarkerModel model;
+    engine.rootContext()->setContextProperty("markerModel", &model);
 
-    return app.exec();
+    Guidance_Module guidance;
+    engine.rootContext()->setContextProperty("guidanceModule", &guidance);
+
+    File_Operation file;
+    engine.rootContext()->setContextProperty("fileOperation", &file);
+
+    engine.load(QUrl(QStringLiteral("qrc:/navigation.qml")));
+    QObject *map = engine.rootObjects().first()->findChild<QObject*>("map");
+    DBus_Server dbus(pathBase,objBase,serverName,map);
+
+#endif
+	
+	return app.exec();
 }
+