From 33c89065c315edd838873116bec8723326f43488 Mon Sep 17 00:00:00 2001 From: wang_zhiqiang Date: Mon, 20 May 2019 11:12:28 +0800 Subject: [PATCH] change seq Change-Id: I4555953ca6d2ff9bddcb1dc981fa6b8db8525aad --- homescreen/homescreen.pro | 4 +--- homescreen/src/homescreenhandler.cpp | 35 +++++++++++++++++++++++------------ homescreen/src/homescreenhandler.h | 11 ++++++++--- homescreen/src/main.cpp | 4 ++-- 4 files changed, 34 insertions(+), 20 deletions(-) diff --git a/homescreen/homescreen.pro b/homescreen/homescreen.pro index 8baa90d..4fcfb31 100644 --- a/homescreen/homescreen.pro +++ b/homescreen/homescreen.pro @@ -18,9 +18,7 @@ TARGET = HomeScreen QT = qml quick dbus websockets CONFIG += c++11 link_pkgconfig DESTDIR = $${OUT_PWD}/../package/root/bin -PKGCONFIG += qlibwindowmanager qtappfw afb-helpers-qt - -LIBS += -lhomescreen +PKGCONFIG += qlibwindowmanager qlibhomescreen qtappfw afb-helpers-qt include(../interfaces/interfaces.pri) diff --git a/homescreen/src/homescreenhandler.cpp b/homescreen/src/homescreenhandler.cpp index 4db60fb..865f6a5 100644 --- a/homescreen/src/homescreenhandler.cpp +++ b/homescreen/src/homescreenhandler.cpp @@ -23,34 +23,40 @@ void* HomescreenHandler::myThis = 0; HomescreenHandler::HomescreenHandler(QObject *parent) : QObject(parent), - mp_hs(NULL) + mp_qhs(NULL) { - } HomescreenHandler::~HomescreenHandler() { - if (mp_hs != NULL) { - delete mp_hs; + if (mp_qhs != NULL) { + delete mp_qhs; } } -void HomescreenHandler::init(int port, const char *token) +void HomescreenHandler::init(int port, const char *token, QLibWindowmanager *qwm, QString myname) { - mp_hs = new LibHomeScreen(); - mp_hs->init(port, token); + mp_qhs = new QLibHomeScreen(); + mp_qhs->init(port, token); myThis = this; + mp_qwm = qwm; + m_myname = myname; + + mp_qhs->registerCallback(nullptr, HomescreenHandler::onRep_static); - mp_hs->registerCallback(nullptr, HomescreenHandler::onRep_static); + mp_qhs->set_event_handler(QLibHomeScreen::Event_ShowWindow,[this](json_object *object){ + HMI_DEBUG("Launcher","Surface launcher got Event_ShowWindow\n"); + mp_qwm->activateWindow(m_myname); + }); - mp_hs->set_event_handler(LibHomeScreen::Event_OnScreenMessage, [this](json_object *object){ + mp_qhs->set_event_handler(QLibHomeScreen::Event_OnScreenMessage, [this](json_object *object){ const char *display_message = json_object_get_string( json_object_object_get(object, "display_message")); HMI_DEBUG("HomeScreen","set_event_handler Event_OnScreenMessage display_message = %s", display_message); }); - mp_hs->set_event_handler(LibHomeScreen::Event_ShowNotification,[this](json_object *object){ + mp_qhs->set_event_handler(QLibHomeScreen::Event_ShowNotification,[this](json_object *object){ json_object *p_obj = json_object_object_get(object, "parameter"); const char *icon = json_object_get_string( json_object_object_get(p_obj, "icon")); @@ -70,7 +76,7 @@ void HomescreenHandler::init(int port, const char *token) emit showNotification(QString(QLatin1String(app_id)), icon_path, QString(QLatin1String(text))); }); - mp_hs->set_event_handler(LibHomeScreen::Event_ShowInformation,[this](json_object *object){ + mp_qhs->set_event_handler(QLibHomeScreen::Event_ShowInformation,[this](json_object *object){ json_object *p_obj = json_object_object_get(object, "parameter"); const char *info = json_object_get_string( json_object_object_get(p_obj, "info")); @@ -87,7 +93,7 @@ void HomescreenHandler::tapShortcut(QString application_id) value = json_object_new_string("normal.full"); json_object_object_add(j_json, "area", value); - mp_hs->showWindow(application_id.toStdString().c_str(), j_json); + mp_qhs->showWindow(application_id.toStdString().c_str(), j_json); } void HomescreenHandler::onRep_static(struct json_object* reply_contents) @@ -119,3 +125,8 @@ void HomescreenHandler::onEv(const string& event, struct json_object* event_cont HMI_DEBUG("HomeScreen","display_message = %s", display_message); } } + +void HomescreenHandler::setQuickWindow(QQuickWindow *qw) +{ + mp_qhs->setQuickWindow(qw); +} diff --git a/homescreen/src/homescreenhandler.h b/homescreen/src/homescreenhandler.h index 5dfe041..d617737 100644 --- a/homescreen/src/homescreenhandler.h +++ b/homescreen/src/homescreenhandler.h @@ -18,7 +18,9 @@ #define HOMESCREENHANDLER_H #include -#include +#include +#include +#include #include using namespace std; @@ -30,7 +32,7 @@ public: explicit HomescreenHandler(QObject *parent = 0); ~HomescreenHandler(); - void init(int port, const char* token); + void init(int port, const char* token, QLibWindowmanager *qwm, QString myname); Q_INVOKABLE void tapShortcut(QString application_id); @@ -40,12 +42,15 @@ public: static void* myThis; static void onRep_static(struct json_object* reply_contents); static void onEv_static(const string& event, struct json_object* event_contents); + void setQuickWindow(QQuickWindow *qw); signals: void showNotification(QString application_id, QString icon_path, QString text); void showInformation(QString info); private: - LibHomeScreen *mp_hs; + QLibHomeScreen *mp_qhs; + QLibWindowmanager *mp_qwm; + QString m_myname; }; #endif // HOMESCREENHANDLER_H diff --git a/homescreen/src/main.cpp b/homescreen/src/main.cpp index 5f283fb..ec0a76b 100644 --- a/homescreen/src/main.cpp +++ b/homescreen/src/main.cpp @@ -120,7 +120,7 @@ int main(int argc, char *argv[]) }); HomescreenHandler* homescreenHandler = new HomescreenHandler(); - homescreenHandler->init(port, token.toStdString().c_str()); + homescreenHandler->init(port, token.toStdString().c_str(), layoutHandler, graphic_role); QUrl bindingAddress; bindingAddress.setScheme(QStringLiteral("ws")); @@ -145,7 +145,7 @@ int main(int argc, char *argv[]) QObject *root = engine.rootObjects().first(); QQuickWindow *window = qobject_cast(root); - QObject::connect(window, SIGNAL(frameSwapped()), layoutHandler, SLOT(slotActivateSurface())); + homescreenHandler->setQuickWindow(window); QList sobjs = engine.rootObjects(); StatusBarModel *statusBar = sobjs.first()->findChild("statusBar"); -- 2.16.6