diff options
author | zheng_wenlong <wenlong_zheng@nexty-ele.com> | 2019-04-05 19:31:22 +0900 |
---|---|---|
committer | zheng_wenlong <wenlong_zheng@nexty-ele.com> | 2019-04-05 19:37:59 +0900 |
commit | 6b1af79bf6dfaee2ba479ea2e575d7c7c59ee145 (patch) | |
tree | 2ecd54f3fca46f85975d5ab6a0120f6ee57f6cad /homescreen/src/main.cpp | |
parent | ff86f7a823bf7b592e1011f6f31d89673ec725e6 (diff) |
try fix bugsandbox/zheng_wenlong/ces2019_vertical2
Diffstat (limited to 'homescreen/src/main.cpp')
-rw-r--r-- | homescreen/src/main.cpp | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/homescreen/src/main.cpp b/homescreen/src/main.cpp index 176bcec..f4866b1 100644 --- a/homescreen/src/main.cpp +++ b/homescreen/src/main.cpp @@ -110,26 +110,6 @@ int main(int argc, char *argv[]) layoutHandler->endDraw(graphic_role); }); - layoutHandler->set_event_handler(QLibWindowmanager::Event_ScreenUpdated, [layoutHandler, launcher, homescreenHandler, root](json_object *object) { - json_object *jarray = json_object_object_get(object, "ids"); - HMI_DEBUG("HomeScreen","ids=%s", json_object_to_json_string(object)); - int arrLen = json_object_array_length(jarray); - QString label = QString(""); - for( int idx = 0; idx < arrLen; idx++) - { - label = QString(json_object_get_string( json_object_array_get_idx(jarray, idx) )); - HMI_DEBUG("HomeScreen","Event_ScreenUpdated application: %s.", label.toStdString().c_str()); - homescreenHandler->setCurrentApplication(label); - QMetaObject::invokeMethod(launcher, "setCurrent", Qt::QueuedConnection, Q_ARG(QString, label)); - } - if((arrLen == 1) && (QString("navigation") == label)){ - QMetaObject::invokeMethod(root, "changeSwitchState", Q_ARG(QVariant, true)); - }else{ - QMetaObject::invokeMethod(root, "changeSwitchState", Q_ARG(QVariant, false)); - } - - }); - HomescreenHandler* homescreenHandler = new HomescreenHandler(); homescreenHandler->init(port, token.toStdString().c_str()); @@ -160,6 +140,26 @@ int main(int argc, char *argv[]) QObject *root = engine.rootObjects().first(); QQuickWindow *window = qobject_cast<QQuickWindow *>(root); + layoutHandler->set_event_handler(QLibWindowmanager::Event_ScreenUpdated, [layoutHandler, launcher, homescreenHandler, root](json_object *object) { + json_object *jarray = json_object_object_get(object, "ids"); + HMI_DEBUG("HomeScreen","ids=%s", json_object_to_json_string(object)); + int arrLen = json_object_array_length(jarray); + QString label = QString(""); + for( int idx = 0; idx < arrLen; idx++) + { + label = QString(json_object_get_string( json_object_array_get_idx(jarray, idx) )); + HMI_DEBUG("HomeScreen","Event_ScreenUpdated application: %s.", label.toStdString().c_str()); + homescreenHandler->setCurrentApplication(label); + QMetaObject::invokeMethod(launcher, "setCurrent", Qt::QueuedConnection, Q_ARG(QString, label)); + } + if((arrLen == 1) && (QString("navigation") == label)){ + QMetaObject::invokeMethod(root, "changeSwitchState", Q_ARG(QVariant, true)); + }else{ + QMetaObject::invokeMethod(root, "changeSwitchState", Q_ARG(QVariant, false)); + } + + }); + touchArea->setWindow(window); QThread* thread = new QThread; touchArea->moveToThread(thread); |