Change als-meter-demo by using low-canneedlefish_13.93.0needlefish/13.93.0marlin_12.93.0marlin_12.92.0marlin_12.91.0marlin_12.90.1marlin_12.90.0marlin/12.93.0marlin/12.92.0marlin/12.91.0marlin/12.90.1marlin/12.90.0lamprey_11.92.0lamprey_11.91.0lamprey/11.92.0lamprey/11.91.0koi_10.93.0koi_10.92.0koi_10.91.0koi/10.93.0koi/10.92.0koi/10.91.0jellyfish_9.99.4jellyfish_9.99.3jellyfish_9.99.2jellyfish_9.99.1jellyfish/9.99.4jellyfish/9.99.3jellyfish/9.99.2jellyfish/9.99.1icefish_8.99.5icefish_8.99.4icefish_8.99.3icefish_8.99.2icefish_8.99.1icefish/8.99.5icefish/8.99.4icefish/8.99.3icefish/8.99.2icefish/8.99.1halibut_8.0.6halibut_8.0.5halibut_8.0.4halibut_8.0.3halibut_8.0.2halibut_8.0.1halibut_8.0.0halibut_7.99.3halibut_7.99.2halibut_7.99.1halibut_7.90.0halibut/8.0.6halibut/8.0.5halibut/8.0.4halibut/8.0.3halibut/8.0.2halibut/8.0.1halibut/8.0.0halibut/7.99.3halibut/7.99.2halibut/7.99.1halibut/7.90.09.99.49.99.39.99.29.99.18.99.58.99.48.99.38.99.28.99.18.0.68.0.58.0.48.0.38.0.28.0.18.0.07.99.37.99.27.99.17.90.013.93.012.93.012.92.012.91.012.90.112.90.011.92.011.91.010.93.010.92.010.91.0halibut

Change als-meter-demo by using low-can data.
For m3ulcb/h3ulcb board, the usb camera device id is over 10,
Detect the camera device from 0 to 19.

Change-Id: Icbd0b4327c9c356f40cea320420d149d850e4347
Signed-off-by: zheng_wenlong <wenlong_zheng@nexty-ele.com>

1 files changed, 11 insertions, 80 deletions

diff --git a/app/main.cpp b/app/main.cpp
index 88a4978..91f39bb 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -18,77 +18,20 @@
 #include <QtCore/QDebug>
 #include <QtCore/QCommandLineParser>
 #include <QtCore/QUrlQuery>
-#include <QtCore/QFile>
-#include <QtDBus/QDBusInterface>
-#include <QtDBus/QDBusReply>
 #include <QtGui/QGuiApplication>
 #include <QtQml/QQmlApplicationEngine>
 #include <QtQml/QQmlContext>
 #include <QtQuickControls2/QQuickStyle>
-#include <QtDBus/QDBusConnection>
-#include <unistd.h>
-#include "camera.h"
 
-#include <QQuickWindow>
-#include <libhomescreen.hpp>
+#include <QtQuick/QQuickWindow>
+#include <qlibhomescreen.h>
 #include <qlibwindowmanager.h>
 
-class AppVisible : public QObject
-{
-    Q_OBJECT
-public:
-    AppVisible(QObject *parent = nullptr) : QObject(parent){
-        m_ppid = getppid();
-        m_visible = true;
-        QDBusConnection::sessionBus().connect("org.agl.windowmanager",
-                                              "/windowmanager",
-                                              "org.agl.windowmanager",
-                                              "appLayerVisibleChanged",
-                                              this,
-                                              SLOT(appLayerVisibleChanged(int,bool)));
-    }
-
-public slots:
-    void appLayerVisibleChanged(int pid, bool visible){
-        bool tempvis = visible;
-
-        if(tempvis && (m_ppid != pid))
-            tempvis = false;
-
-        if(m_visible != tempvis){
-            m_visible = tempvis;
-            emit visibleChanged(m_visible);
-        }
-    }
-
-signals:
-    void visibleChanged(const bool& visible);
-
-private:
-    int m_ppid;
-    bool m_visible;
-};
-
-class DBus : public QObject
-{
-    Q_OBJECT
-public:
-    DBus(QObject *parent = nullptr)
-        : QObject(parent)
-        , interface("org.agl.homescreen", "/StatusBar", "org.agl.statusbar", QDBusConnection::sessionBus())
-    {}
-
-    Q_INVOKABLE void setStatusIcon(int index, const QString &url) {
-        interface.call("setStatusIcon", index, url);
-    }
-
-private:
-    QDBusInterface interface;
-};
+#include "camera.h"
 
 int main(int argc, char *argv[])
 {
-    QString myname = QString("Als-meter-demo");
+    QString myname = QString("alsmeterdemo");
 
     QGuiApplication app(argc, argv);
     app.setApplicationName(myname);
@@ -123,12 +66,9 @@ int main(int argc, char *argv[])
     query.addQueryItem(QStringLiteral("token"), secret);
     bindingAddressWS.setQuery(query);
     QQmlContext *context = engine.rootContext();
-    AppVisible appVisible;
-    context->setContextProperty(QStringLiteral("appVisible"), &appVisible);
     context->setContextProperty(QStringLiteral("bindingAddressWS"), bindingAddressWS);
 
     std::string token = secret.toStdString();
-    LibHomeScreen* hs = new LibHomeScreen();
     QLibWindowmanager* qwm = new QLibWindowmanager();
 
     // WindowManager
@@ -146,23 +86,16 @@ int main(int argc, char *argv[])
     });
 
     // HomeScreen
-    hs->init(port, token.c_str());
+    QLibHomeScreen* qhs = new QLibHomeScreen();
+    qhs->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);
-            }
-        }
+    qhs->set_event_handler(QLibHomeScreen::Event_TapShortcut, [qwm, myname](json_object *object){
+        qDebug("Surface %s got tapShortcut\n", qPrintable(myname));
+        qwm->activateSurface(myname);
     });
+    AGLScreenInfo screenInfo(qwm->get_scale_factor());
+    engine.rootContext()->setContextProperty(QStringLiteral("screenInfo"), &screenInfo);
 
-    DBus dbus;
-    engine.rootContext()->setContextProperty("dbus", &dbus);
     engine.load(QUrl(QStringLiteral("qrc:/Als-meter-demo.qml")));
 
     QObject *root = engine.rootObjects().first();
@@ -172,5 +105,3 @@ int main(int argc, char *argv[])
 
     return app.exec();
 }
-
-#include "main.moc"