change frameswapped seqsandbox/wangzhiqiang/als2019

3 files changed, 23 insertions, 9 deletions

diff --git a/src/aglextras/aglextras.pro b/src/aglextras/aglextras.pro
index 8811e2a..6e05652 100644
--- a/src/aglextras/aglextras.pro
+++ b/src/aglextras/aglextras.pro
@@ -5,9 +5,16 @@ QT += gui-private
 
 include(hmi/hmi.pri)
 
-qtConfig(agl_hmi_framework) {
+#qtConfig(agl_hmi_framework) {
+#    DEFINES += USE_AGL_HMI_LOWLEVEL_API
+#    QMAKE_USE += libhomescreen libwindowmanager
+#}
+
+packagesExist(libhomescreen libwindowmanager) {
+    message(libhomescreen and libwindowmanager are existing.)
     DEFINES += USE_AGL_HMI_LOWLEVEL_API
-    QMAKE_USE += libhomescreen libwindowmanager
+    CONFIG += link_pkgconfig
+    PKGCONFIG += libhomescreen  libwindowmanager
 }
 
 load(qt_module)
diff --git a/src/aglextras/hmi/aglwmclient.cpp b/src/aglextras/hmi/aglwmclient.cpp
index a754763..aecf5b0 100644
--- a/src/aglextras/hmi/aglwmclient.cpp
+++ b/src/aglextras/hmi/aglwmclient.cpp
@@ -53,13 +53,19 @@ void AGLWmClient::activate_window (void)
 #endif  // USE_AGL_HMI_LOWLEVEL_API
 }
 
+void AGLWmClient::publishSubscription (void)
+{
+    h_ptr->publishSubscription();
+}
+
 void AGLWmClient::disconnect_frame_swapped (void)
 {
 #ifdef USE_AGL_HMI_LOWLEVEL_API
     qDebug("Disconnect!! SLOT disconnect_frame_swapped()");
     disconnect(d_ptr->loading);
 
-    activate_window();
+//    activate_window();
+    publishSubscription();
 #endif  // USE_AGL_HMI_LOWLEVEL_API
 }
 
@@ -71,13 +77,13 @@ double AGLWmClient::get_scale_factor (void)
 #ifdef USE_AGL_HMI_LOWLEVEL_API
 void AGLWmClient::attach (QQmlApplicationEngine* engine)
 {
-    if (d_ptr->binding) {
-        QQuickWindow *window = qobject_cast<QQuickWindow *>(engine->rootObjects().first());
+     if (d_ptr->binding) {
+         QQuickWindow *window = qobject_cast<QQuickWindow *>(engine->rootObjects().first());
 
-        qDebug("Connect!! frameSapped! (activate_window())");
-        d_ptr->loading = connect(window, SIGNAL(frameSwapped()),
-                                 this, SLOT(disconnect_frame_swapped()));
-    }
+         qDebug("Connect!! frameSapped! (activate_window())");
+         d_ptr->loading = connect(window, SIGNAL(frameSwapped()),
+                                  this, SLOT(disconnect_frame_swapped()));
+     }
 }
 #else
 void AGLWmClient::attach (QQmlApplicationEngine* engine)
diff --git a/src/aglextras/hmi/aglwmclient.h b/src/aglextras/hmi/aglwmclient.h
index ccfc86e..dac6f1f 100644
--- a/src/aglextras/hmi/aglwmclient.h
+++ b/src/aglextras/hmi/aglwmclient.h
@@ -40,6 +40,7 @@ private Q_SLOTS:
 
 private:
     void activate_window (void);
+    void publishSubscription (void);
     friend class AGLWmClientPrivate;
     QSharedPointer<AGLWmClientPrivate> d_ptr;
     QSharedPointer<LibHomeScreen> h_ptr;